chore: merge from nightly branch into release branch in prep for next beta

346 files changed, 8040 insertions, 16254 deletions

diff --git a/src/actions/index.js b/src/actions/index.js
index 6f32732b9..ed8283d6c 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -7,15 +7,12 @@ import recipePreview from './recipePreview';
 import ui from './ui';
 import app from './app';
 import user from './user';
-import payment from './payment';
 import news from './news';
 import settings from './settings';
 import requests from './requests';
 import announcements from '../features/announcements/actions';
 import workspaces from '../features/workspaces/actions';
 import todos from '../features/todos/actions';
-import planSelection from '../features/planSelection/actions';
-import trialStatusBar from '../features/trialStatusBar/actions';
 
 const actions = {
   service,
@@ -24,7 +21,6 @@ const actions = {
   ui,
   app,
   user,
-  payment,
   news,
   settings,
   requests,
@@ -35,6 +31,4 @@ export default Object.assign(
   { announcements },
   { workspaces },
   { todos },
-  { planSelection },
-  { trialStatusBar },
 );
diff --git a/src/actions/lib/actions.js b/src/actions/lib/actions.js
index b38db9946..7be40f1cf 100644
--- a/src/actions/lib/actions.js
+++ b/src/actions/lib/actions.js
@@ -8,12 +8,12 @@ export const createActionsFromDefinitions = (actionDefinitions, validate) => {
     };
     actions[actionName] = action;
     action.listeners = [];
-    action.listen = listener => action.listeners.push(listener);
+    action.listen = (listener) => action.listeners.push(listener);
     action.off = (listener) => {
       const { listeners } = action;
       listeners.splice(listeners.indexOf(listener), 1);
     };
-    action.notify = params => action.listeners.forEach(listener => listener(params));
+    action.notify = (params) => action.listeners.forEach((listener) => listener(params));
   });
   return actions;
 };
diff --git a/src/actions/payment.js b/src/actions/payment.js
deleted file mode 100644
index f61faf197..000000000
--- a/src/actions/payment.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import PropTypes from 'prop-types';
-
-export default {
-  createHostedPage: {
-    planId: PropTypes.string.isRequired,
-  },
-  upgradeAccount: {
-    planId: PropTypes.string.isRequired,
-    onCloseWindow: PropTypes.func,
-  },
-  createDashboardUrl: {},
-};
diff --git a/src/actions/service.js b/src/actions/service.js
index 578fdeca8..e56513f8f 100644
--- a/src/actions/service.js
+++ b/src/actions/service.js
@@ -91,6 +91,9 @@ export default {
   toggleAudio: {
     serviceId: PropTypes.string.isRequired,
   },
+  toggleDarkMode: {
+    serviceId: PropTypes.string.isRequired,
+  },
   openDevTools: {
     serviceId: PropTypes.string.isRequired,
   },
diff --git a/src/actions/user.js b/src/actions/user.js
index 7061a367a..20d27ee53 100644
--- a/src/actions/user.js
+++ b/src/actions/user.js
@@ -13,15 +13,11 @@ export default {
     password: PropTypes.string.isRequired,
     accountType: PropTypes.string,
     company: PropTypes.string,
-    plan: PropTypes.string,
     currency: PropTypes.string,
   },
   retrievePassword: {
     email: PropTypes.string.isRequired,
   },
-  activateTrial: {
-    planId: PropTypes.string.isRequired,
-  },
   invite: {
     invites: PropTypes.array.isRequired,
   },
diff --git a/src/api/PaymentApi.js b/src/api/PaymentApi.js
deleted file mode 100644
index 7325151e9..000000000
--- a/src/api/PaymentApi.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export default class PaymentApi {
-  constructor(server, local) {
-    this.server = server;
-    this.local = local;
-  }
-
-  plans() {
-    return this.server.getPlans();
-  }
-
-  getHostedPage(planId) {
-    return this.server.getHostedPage(planId);
-  }
-}
diff --git a/src/api/ServicesApi.js b/src/api/ServicesApi.js
index 36ed9482f..85efd26a6 100644
--- a/src/api/ServicesApi.js
+++ b/src/api/ServicesApi.js
@@ -8,14 +8,6 @@ export default class ServicesApi {
     return this.server.getServices();
   }
 
-  // one(customerId) {
-  //   return this.server.getCustomer(customerId);
-  // }
-  //
-  // search(needle) {
-  //   return this.server.searchCustomers(needle);
-  // }
-  //
   create(recipeId, data) {
     return this.server.createService(recipeId, data);
   }
diff --git a/src/api/UserApi.js b/src/api/UserApi.js
index 8ba8cd1e9..edfb88988 100644
--- a/src/api/UserApi.js
+++ b/src/api/UserApi.js
@@ -25,10 +25,6 @@ export default class UserApi {
     return this.server.retrievePassword(email);
   }
 
-  activateTrial(data) {
-    return this.server.activateTrial(data);
-  }
-
   invite(data) {
     return this.server.inviteUser(data);
   }
diff --git a/src/api/apiBase.js b/src/api/apiBase.js
index 842c85e56..ad37ca02c 100644
--- a/src/api/apiBase.js
+++ b/src/api/apiBase.js
@@ -5,6 +5,9 @@ import {
   API_VERSION,
 } from '../environment';
 import {
+  DEV_API_FRANZ_WEBSITE,
+  LIVE_FRANZ_API,
+  LOCAL_HOSTNAME,
   LOCAL_SERVER,
   SERVER_NOT_LOADED,
 } from '../config';
@@ -21,16 +24,18 @@ const apiBase = (withVersion = true) => {
   }
   if (window.ferdi.stores.settings.all.app.server === LOCAL_SERVER) {
     // Use URL for local server
-    url = `http://127.0.0.1:${window.ferdi.stores.requests.localServerPort}`;
+    url = `http://${LOCAL_HOSTNAME}:${window.ferdi.stores.requests.localServerPort}`;
   } else {
     // Load URL from store
     url = window.ferdi.stores.settings.all.app.server;
   }
 
-  if (withVersion) {
-    return `${url}/${API_VERSION}`;
-  }
-  return url;
+  return withVersion ? `${url}/${API_VERSION}` : url;
 };
 
 export default apiBase;
+
+export function termsBase() {
+  // TODO: This needs to handle local vs ferdi vs franz servers
+  return window.ferdi.stores.settings.all.app.server !== LIVE_FRANZ_API ? window.ferdi.stores.settings.all.app.server : DEV_API_FRANZ_WEBSITE;
+}
diff --git a/src/api/index.js b/src/api/index.js
index 3c87cc087..ed6c13488 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -4,7 +4,6 @@ import RecipePreviewsApi from './RecipePreviewsApi';
 import RecipesApi from './RecipesApi';
 import UserApi from './UserApi';
 import LocalApi from './LocalApi';
-import PaymentApi from './PaymentApi';
 import NewsApi from './NewsApi';
 import FeaturesApi from './FeaturesApi';
 
@@ -16,6 +15,5 @@ export default (server, local) => ({
   features: new FeaturesApi(server, local),
   user: new UserApi(server, local),
   local: new LocalApi(server, local),
-  payment: new PaymentApi(server, local),
   news: new NewsApi(server, local),
 });
diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js
index 4b1f03f22..644f15b93 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.js
@@ -2,14 +2,14 @@ import { ipcRenderer } from 'electron';
 import { session } from '@electron/remote';
 import du from 'du';
 
-import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js';
+import { getServicePartitionsDirectory } from '../../helpers/service-helpers';
 
 const debug = require('debug')('Ferdi:LocalApi');
 
 export default class LocalApi {
   // Settings
   getAppSettings(type) {
-    return new Promise((resolve) => {
+    return new Promise(resolve => {
       ipcRenderer.once('appSettings', (event, resp) => {
         debug('LocalApi::getAppSettings resolves', resp.type, resp.data);
         resolve(resp);
@@ -41,11 +41,21 @@ export default class LocalApi {
   }
 
   async clearCache(serviceId = null) {
-    const s = serviceId ? session.fromPartition(`persist:service-${serviceId}`) : session.defaultSession;
+    const s = serviceId
+      ? session.fromPartition(`persist:service-${serviceId}`)
+      : session.defaultSession;
 
-    debug('LocalApi::clearCache resolves', (serviceId || 'clearAppCache'));
+    debug('LocalApi::clearCache resolves', serviceId || 'clearAppCache');
     await s.clearStorageData({
-      storages: ['appcache', 'cookies', 'filesystem', 'indexdb', 'localstorage', 'shadercache', 'websql', 'serviceworkers', 'cachestorage'],
+      storages: [
+        'appcache',
+        'filesystem',
+        'indexdb',
+        'shadercache',
+        'websql',
+        'serviceworkers',
+        'cachestorage',
+      ],
       quotas: ['temporary', 'persistent', 'syncable'],
     });
     return s.clearCache();
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index c63aa7dda..bc0b0dff9 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -1,12 +1,11 @@
-import path from 'path';
+import { join } from 'path';
 import tar from 'tar';
-import fs from 'fs-extra';
+import { readdirSync, statSync, writeFileSync, copySync, ensureDirSync, pathExistsSync, readJsonSync, removeSync } from 'fs-extra';
 import { app, require as remoteRequire } from '@electron/remote';
 
 import ServiceModel from '../../models/Service';
 import RecipePreviewModel from '../../models/RecipePreview';
 import RecipeModel from '../../models/Recipe';
-import PlanModel from '../../models/Plan';
 import NewsModel from '../../models/News';
 import UserModel from '../../models/User';
 import OrderModel from '../../models/Order';
@@ -14,7 +13,7 @@ import OrderModel from '../../models/Order';
 import { sleep } from '../../helpers/async-helpers';
 
 import { SERVER_NOT_LOADED } from '../../config';
-import { osArch, osPlatform, RECIPES_PATH } from '../../environment';
+import { osArch, osPlatform, asarRecipesPath, userDataRecipesPath, userDataPath } from '../../environment';
 import apiBase from '../apiBase';
 import { prepareAuthRequest, sendAuthRequest } from '../utils/auth';
 
@@ -24,16 +23,11 @@ import {
   loadRecipeConfig,
 } from '../../helpers/recipe-helpers';
 
-import {
-  removeServicePartitionDirectory,
-} from '../../helpers/service-helpers.js';
+import { removeServicePartitionDirectory } from '../../helpers/service-helpers';
 
 const debug = require('debug')('Ferdi:ServerApi');
 
-module.paths.unshift(
-  getDevRecipeDirectory(),
-  getRecipeDirectory(),
-);
+module.paths.unshift(getDevRecipeDirectory(), getRecipeDirectory());
 
 const { default: fetch } = remoteRequire('electron-fetch');
 
@@ -44,12 +38,16 @@ export default class ServerApi {
 
   // User
   async login(email, passwordHash) {
-    const request = await sendAuthRequest(`${apiBase()}/auth/login`, {
-      method: 'POST',
-      headers: {
-        Authorization: `Basic ${window.btoa(`${email}:${passwordHash}`)}`,
+    const request = await sendAuthRequest(
+      `${apiBase()}/auth/login`,
+      {
+        method: 'POST',
+        headers: {
+          Authorization: `Basic ${window.btoa(`${email}:${passwordHash}`)}`,
+        },
       },
-    }, false);
+      false,
+    );
     if (!request.ok) {
       throw request;
     }
@@ -60,10 +58,14 @@ export default class ServerApi {
   }
 
   async signup(data) {
-    const request = await sendAuthRequest(`${apiBase()}/auth/signup`, {
-      method: 'POST',
-      body: JSON.stringify(data),
-    }, false);
+    const request = await sendAuthRequest(
+      `${apiBase()}/auth/signup`,
+      {
+        method: 'POST',
+        body: JSON.stringify(data),
+      },
+      false,
+    );
     if (!request.ok) {
       throw request;
     }
@@ -73,20 +75,6 @@ export default class ServerApi {
     return u.token;
   }
 
-  async activateTrial(data) {
-    const request = await sendAuthRequest(`${apiBase()}/payment/trial`, {
-      method: 'POST',
-      body: JSON.stringify(data),
-    });
-    if (!request.ok) {
-      throw request;
-    }
-    const trial = await request.json();
-
-    debug('ServerApi::activateTrial resolves', trial);
-    return true;
-  }
-
   async inviteUser(data) {
     const request = await sendAuthRequest(`${apiBase()}/invite`, {
       method: 'POST',
@@ -101,12 +89,16 @@ export default class ServerApi {
   }
 
   async retrievePassword(email) {
-    const request = await sendAuthRequest(`${apiBase()}/auth/password`, {
-      method: 'POST',
-      body: JSON.stringify({
-        email,
-      }),
-    }, false);
+    const request = await sendAuthRequest(
+      `${apiBase()}/auth/password`,
+      {
+        method: 'POST',
+        body: JSON.stringify({
+          email,
+        }),
+      },
+      false,
+    );
     if (!request.ok) {
       throw request;
     }
@@ -143,7 +135,9 @@ export default class ServerApi {
     }
     const updatedData = await request.json();
 
-    const user = Object.assign(updatedData, { data: new UserModel(updatedData.data) });
+    const user = Object.assign(updatedData, {
+      data: new UserModel(updatedData.data),
+    });
     debug('ServerApi::updateUserInfo resolves', user);
     return user;
   }
@@ -173,10 +167,10 @@ export default class ServerApi {
     }
     const data = await request.json();
 
-    let services = await this._mapServiceModels(data);
-    services = services.filter(service => service !== null);
-    debug('ServerApi::getServices resolves', services);
-    return services;
+    const services = await this._mapServiceModels(data);
+    const filteredServices = services.filter(service => !!service);
+    debug('ServerApi::getServices resolves', filteredServices);
+    return filteredServices;
   }
 
   async createService(recipeId, data) {
@@ -190,12 +184,17 @@ export default class ServerApi {
     const serviceData = await request.json();
 
     if (data.iconFile) {
-      const iconData = await this.uploadServiceIcon(serviceData.data.id, data.iconFile);
+      const iconData = await this.uploadServiceIcon(
+        serviceData.data.id,
+        data.iconFile,
+      );
 
       serviceData.data = iconData;
     }
 
-    const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) });
+    const service = Object.assign(serviceData, {
+      data: await this._prepareServiceModel(serviceData.data),
+    });
 
     debug('ServerApi::createService resolves', service);
     return service;
@@ -219,7 +218,9 @@ export default class ServerApi {
 
     const serviceData = await request.json();
 
-    const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) });
+    const service = Object.assign(serviceData, {
+      data: await this._prepareServiceModel(serviceData.data),
+    });
 
     debug('ServerApi::updateService resolves', service);
     return service;
@@ -236,7 +237,10 @@ export default class ServerApi {
 
     delete requestData.headers['Content-Type'];
 
-    const request = await window.fetch(`${apiBase()}/service/${serviceId}`, requestData);
+    const request = await window.fetch(
+      `${apiBase()}/service/${serviceId}`,
+      requestData,
+    );
 
     if (!request.ok) {
       throw request;
@@ -307,18 +311,21 @@ export default class ServerApi {
   // Recipes
   async getInstalledRecipes() {
     const recipesDirectory = getRecipeDirectory();
-    const paths = fs.readdirSync(recipesDirectory)
-      .filter(file => (
-        fs.statSync(path.join(recipesDirectory, file)).isDirectory()
-        && file !== 'temp'
-        && file !== 'dev'
-      ));
-
-    this.recipes = paths.map((id) => {
-      // eslint-disable-next-line
-      const Recipe = require(id)(RecipeModel);
-      return new Recipe(loadRecipeConfig(id));
-    }).filter(recipe => recipe.id);
+    const paths = readdirSync(recipesDirectory)
+      .filter(
+        file =>
+          statSync(join(recipesDirectory, file)).isDirectory() &&
+          file !== 'temp' &&
+          file !== 'dev',
+      );
+
+    this.recipes = paths
+      .map(id => {
+        // eslint-disable-next-line
+        const Recipe = require(id)(RecipeModel);
+        return new Recipe(loadRecipeConfig(id));
+      })
+      .filter(recipe => recipe.id);
 
     this.recipes = this.recipes.concat(this._getDevRecipes());
 
@@ -350,12 +357,11 @@ export default class ServerApi {
   }
 
   async getFeaturedRecipePreviews() {
+    // TODO: If we are hitting the internal-server, we need to return an empty list, else we can hit the remote server and get the data
     const request = await sendAuthRequest(`${apiBase()}/recipes/popular`);
     if (!request.ok) throw request;
 
     const data = await request.json();
-    // data = this._addLocalRecipesToPreviews(data);
-
     const recipePreviews = this._mapRecipePreviewModel(data);
     debug('ServerApi::getFeaturedRecipes resolves', recipePreviews);
     return recipePreviews;
@@ -374,21 +380,21 @@ export default class ServerApi {
 
   async getRecipePackage(recipeId) {
     try {
-      const recipesDirectory = path.join(app.getPath('userData'), 'recipes');
-      const recipeTempDirectory = path.join(recipesDirectory, 'temp', recipeId);
-      const tempArchivePath = path.join(recipeTempDirectory, 'recipe.tar.gz');
+      const recipesDirectory = userDataRecipesPath();
+      const recipeTempDirectory = join(recipesDirectory, 'temp', recipeId);
+      const tempArchivePath = join(recipeTempDirectory, 'recipe.tar.gz');
 
-      const internalRecipeFile = path.join(RECIPES_PATH, `${recipeId}.tar.gz`);
+      const internalRecipeFile = asarRecipesPath(`${recipeId}.tar.gz`);
 
-      fs.ensureDirSync(recipeTempDirectory);
+      ensureDirSync(recipeTempDirectory);
 
       let archivePath;
 
-      if (await fs.exists(internalRecipeFile)) {
-        console.log('[ServerApi::getRecipePackage] Using internal recipe file');
+      if (pathExistsSync(internalRecipeFile)) {
+        debug('[ServerApi::getRecipePackage] Using internal recipe file');
         archivePath = internalRecipeFile;
       } else {
-        console.log('[ServerApi::getRecipePackage] Downloading recipe from server');
+        debug('[ServerApi::getRecipePackage] Downloading recipe from server');
         archivePath = tempArchivePath;
 
         const packageUrl = `${apiBase()}/recipes/download/${recipeId}`;
@@ -396,9 +402,9 @@ export default class ServerApi {
         const res = await fetch(packageUrl);
         debug('Recipe downloaded', recipeId);
         const buffer = await res.buffer();
-        fs.writeFileSync(archivePath, buffer);
+        writeFileSync(archivePath, buffer);
       }
-      console.log(archivePath);
+      debug(archivePath);
 
       await sleep(10);
 
@@ -408,16 +414,16 @@ export default class ServerApi {
         preservePaths: true,
         unlink: true,
         preserveOwner: false,
-        onwarn: x => console.log('warn', recipeId, x),
+        onwarn: x => debug('warn', recipeId, x),
       });
 
       await sleep(10);
 
-      const { id } = fs.readJsonSync(path.join(recipeTempDirectory, 'package.json'));
-      const recipeDirectory = path.join(recipesDirectory, id);
-      fs.copySync(recipeTempDirectory, recipeDirectory);
-      fs.remove(recipeTempDirectory);
-      fs.remove(path.join(recipesDirectory, recipeId, 'recipe.tar.gz'));
+      const { id } = readJsonSync(join(recipeTempDirectory, 'package.json'));
+      const recipeDirectory = join(recipesDirectory, id);
+      copySync(recipeTempDirectory, recipeDirectory);
+      removeSync(recipeTempDirectory);
+      removeSync(join(recipesDirectory, recipeId, 'recipe.tar.gz'));
 
       return id;
     } catch (err) {
@@ -427,35 +433,11 @@ export default class ServerApi {
     }
   }
 
-  // Payment
-  async getPlans() {
-    const request = await sendAuthRequest(`${apiBase()}/payment/plans`);
-    if (!request.ok) throw request;
-    const data = await request.json();
-    const plan = new PlanModel(data);
-    debug('ServerApi::getPlans resolves', plan);
-    return plan;
-  }
-
-  async getHostedPage(planId) {
-    const request = await sendAuthRequest(`${apiBase()}/payment/init`, {
-      method: 'POST',
-      body: JSON.stringify({
-        planId,
-      }),
-    });
-    if (!request.ok) {
-      throw request;
-    }
-    const data = await request.json();
-
-    debug('ServerApi::getHostedPage resolves', data);
-    return data;
-  }
-
   // News
   async getLatestNews() {
-    const url = `${apiBase(true)}/news?platform=${osPlatform}&arch=${osArch}&version=${app.getVersion()}`;
+    const url = `${apiBase(
+      true,
+    )}/news?platform=${osPlatform}&arch=${osArch}&version=${app.getVersion()}`;
     const request = await sendAuthRequest(url);
     if (!request.ok) throw request;
     const data = await request.json();
@@ -465,7 +447,7 @@ export default class ServerApi {
   }
 
   async hideNews(id) {
-    const request = await sendAuthRequest(`${apiBase(true)}/news/${id}/read`);
+    const request = await sendAuthRequest(`${apiBase()}/news/${id}/read`);
     if (!request.ok) throw request;
     debug('ServerApi::hideNews resolves', id);
   }
@@ -476,9 +458,13 @@ export default class ServerApi {
       throw new Error('Server not loaded');
     }
 
-    const request = await sendAuthRequest(`${apiBase(false)}/health`, {
-      method: 'GET',
-    }, false);
+    const request = await sendAuthRequest(
+      `${apiBase(false)}/health`,
+      {
+        method: 'GET',
+      },
+      false,
+    );
     if (!request.ok) {
       throw request;
     }
@@ -486,23 +472,27 @@ export default class ServerApi {
   }
 
   async getLegacyServices() {
-    const file = path.join(app.getPath('userData'), 'settings', 'services.json');
+    const file = userDataPath('settings', 'services.json');
 
     try {
-      const config = fs.readJsonSync(file);
+      const config = readJsonSync(file);
 
       if (Object.prototype.hasOwnProperty.call(config, 'services')) {
-        const services = await Promise.all(config.services.map(async (s) => {
-          const service = s;
-          const request = await sendAuthRequest(`${apiBase()}/recipes/${s.service}`);
-
-          if (request.status === 200) {
-            const data = await request.json();
-            service.recipe = new RecipePreviewModel(data);
-          }
-
-          return service;
-        }));
+        const services = await Promise.all(
+          config.services.map(async s => {
+            const service = s;
+            const request = await sendAuthRequest(
+              `${apiBase()}/recipes/${s.service}`,
+            );
+
+            if (request.status === 200) {
+              const data = await request.json();
+              service.recipe = new RecipePreviewModel(data);
+            }
+
+            return service;
+          }),
+        );
 
         debug('ServerApi::getLegacyServices resolves', services);
         return services;
@@ -519,7 +509,9 @@ export default class ServerApi {
     const recipes = services.map(s => s.recipeId);
     await this._bulkRecipeCheck(recipes);
     /* eslint-disable no-return-await */
-    return Promise.all(services.map(async service => await this._prepareServiceModel(service)));
+    return Promise.all(
+      services.map(async service => await this._prepareServiceModel(service)),
+    );
     /* eslint-enable no-return-await */
   }
 
@@ -542,14 +534,18 @@ export default class ServerApi {
 
   async _bulkRecipeCheck(unfilteredRecipes) {
     // Filter recipe duplicates as we don't need to download 3 Slack recipes
-    const recipes = unfilteredRecipes.filter((elem, pos, arr) => arr.indexOf(elem) === pos);
+    const recipes = unfilteredRecipes.filter(
+      (elem, pos, arr) => arr.indexOf(elem) === pos,
+    );
 
-    return Promise.all(recipes
-      .map(async (recipeId) => {
+    return Promise.all(
+      recipes.map(async recipeId => {
         let recipe = this.recipes.find(r => r.id === recipeId);
 
         if (!recipe) {
-          console.warn(`Recipe '${recipeId}' not installed, trying to fetch from server`);
+          console.warn(
+            `Recipe '${recipeId}' not installed, trying to fetch from server`,
+          );
 
           await this.getRecipePackage(recipeId);
 
@@ -565,69 +561,83 @@ export default class ServerApi {
         }
 
         return recipe;
-      })).catch(err => console.error('Can\'t load recipe', err));
+      }),
+    ).catch(err => console.error("Can't load recipe", err));
   }
 
   _mapRecipePreviewModel(recipes) {
-    return recipes.map((recipe) => {
-      try {
-        return new RecipePreviewModel(recipe);
-      } catch (e) {
-        console.error(e);
-        return null;
-      }
-    }).filter(recipe => recipe !== null);
+    return recipes
+      .map(recipe => {
+        try {
+          return new RecipePreviewModel(recipe);
+        } catch (e) {
+          console.error(e);
+          return null;
+        }
+      })
+      .filter(recipe => recipe !== null);
   }
 
   _mapNewsModels(news) {
-    return news.map((newsItem) => {
-      try {
-        return new NewsModel(newsItem);
-      } catch (e) {
-        console.error(e);
-        return null;
-      }
-    }).filter(newsItem => newsItem !== null);
+    return news
+      .map(newsItem => {
+        try {
+          return new NewsModel(newsItem);
+        } catch (e) {
+          console.error(e);
+          return null;
+        }
+      })
+      .filter(newsItem => newsItem !== null);
   }
 
   _mapOrderModels(orders) {
-    return orders.map((orderItem) => {
-      try {
-        return new OrderModel(orderItem);
-      } catch (e) {
-        console.error(e);
-        return null;
-      }
-    }).filter(orderItem => orderItem !== null);
+    return orders
+      .map(orderItem => {
+        try {
+          return new OrderModel(orderItem);
+        } catch (e) {
+          console.error(e);
+          return null;
+        }
+      })
+      .filter(orderItem => orderItem !== null);
   }
 
   _getDevRecipes() {
     const recipesDirectory = getDevRecipeDirectory();
     try {
-      const paths = fs.readdirSync(recipesDirectory)
-        .filter(file => fs.statSync(path.join(recipesDirectory, file)).isDirectory() && file !== 'temp');
-
-      const recipes = paths.map((id) => {
-        let Recipe;
-        try {
-          // eslint-disable-next-line
-          Recipe = require(id)(RecipeModel);
-          return new Recipe(loadRecipeConfig(id));
-        } catch (err) {
-          console.error(err);
-        }
+      const paths = readdirSync(recipesDirectory)
+        .filter(
+          file =>
+            statSync(join(recipesDirectory, file)).isDirectory() &&
+            file !== 'temp',
+        );
+
+      const recipes = paths
+        .map(id => {
+          let Recipe;
+          try {
+            // eslint-disable-next-line
+            Recipe = require(id)(RecipeModel);
+            return new Recipe(loadRecipeConfig(id));
+          } catch (err) {
+            console.error(err);
+          }
 
-        return false;
-      }).filter(recipe => recipe.id).map((data) => {
-        const recipe = data;
+          return false;
+        })
+        .filter(recipe => recipe.id)
+        .map(data => {
+          const recipe = data;
 
-        recipe.icons = {
-          svg: `${recipe.path}/icon.svg`,
-        };
-        recipe.local = true;
+          recipe.icons = {
+            svg: `${recipe.path}/icon.svg`,
+          };
+          recipe.local = true;
 
-        return data;
-      });
+          return data;
+        });
 
       return recipes;
     } catch (err) {
diff --git a/src/app.js b/src/app.js
index aab1729d7..39b50cb33 100644
--- a/src/app.js
+++ b/src/app.js
@@ -4,11 +4,8 @@ import React from 'react';
 import { render } from 'react-dom';
 import { Provider } from 'mobx-react';
 import { syncHistoryWithStore, RouterStore } from 'mobx-react-router';
-import {
-  hashHistory,
-} from 'react-router';
+import { hashHistory } from 'react-router';
 
-import '@babel/polyfill';
 import smoothScroll from 'smoothscroll-polyfill';
 
 import ServerApi from './api/server/ServerApi';
diff --git a/src/assets/themeInfo.json b/src/assets/themeInfo.json
index 0791cf459..54e833789 100644
--- a/src/assets/themeInfo.json
+++ b/src/assets/themeInfo.json
@@ -1 +1 @@
-{"color":".theme__dark .app .sidebar .sidebar__button.is-muted, .theme__dark .app .sidebar .sidebar__button.is-active, .sidebar .sidebar__button.is-muted, .sidebar .sidebar__button.is-active, .tab-item.is-active, .settings .account .invoices .invoices__action button, .settings-navigation .settings-navigation__link.is-active .badge, a.link, button.link, .auth .welcome .button:hover, .auth .welcome .button__inverted, .franz-form .franz-form__radio.is-selected, .theme__dark .franz-form__button.franz-form__button--inverted, .franz-form__button.franz-form__button--inverted","border-color":".theme__dark .settings .premium-info, .franz-form .franz-form__radio.is-selected","background":".settings .settings__header, .settings .settings__close, .settings-navigation .settings-navigation__link.is-active, a.button, button.button, .auth, .info-bar, .info-bar.info-bar--primary, .infobox.infobox--primary, .theme__dark .badge.badge--primary, .theme__dark .badge.badge--premium, .badge.badge--primary, .badge.badge--premium, .content-tabs .content-tabs__tabs .content-tabs__item.is-active, #electron-app-title-bar .toolbar-dropdown:not(.open) > .toolbar-button > button:hover, #electron-app-title-bar .list-item.selected .menu-item, #electron-app-title-bar .list-item.selected:focus .menu-item, .theme__dark .quick-switch .active, .franz-form .franz-form__toggle-wrapper .franz-form__toggle.is-active .franz-form__toggle-button, .theme__dark .franz-form__button, .franz-form__button, .ferdi__fab, .franz-form .franz-form__slider-wrapper .slider::-webkit-slider-thumb","border-right-color":".settings .settings__header .separator"}
\ No newline at end of file
+{"color":".theme__dark .app .sidebar .sidebar__button.is-muted, .theme__dark .app .sidebar .sidebar__button.is-active, .sidebar .sidebar__button.is-muted, .sidebar .sidebar__button.is-active, .tab-item.is-active, .settings .account .invoices .invoices__action button, .settings-navigation .settings-navigation__link.is-active .badge, a.link, button.link, .auth .welcome .button:hover, .auth .welcome .button__inverted, .franz-form .franz-form__radio.is-selected, .theme__dark .franz-form__button.franz-form__button--inverted, .franz-form__button.franz-form__button--inverted","border-color":".theme__dark .settings, .franz-form .franz-form__radio.is-selected","background":".settings .settings__header, .settings .settings__close, .settings-navigation .settings-navigation__link.is-active, a.button, button.button, .auth, .info-bar, .info-bar.info-bar--primary, .infobox.infobox--primary, .theme__dark .badge.badge--primary, .theme__dark, .badge.badge--primary, .content-tabs .content-tabs__tabs .content-tabs__item.is-active, #electron-app-title-bar .toolbar-dropdown:not(.open) > .toolbar-button > button:hover, #electron-app-title-bar .list-item.selected .menu-item, #electron-app-title-bar .list-item.selected:focus .menu-item, .theme__dark .quick-switch .active, .franz-form .franz-form__toggle-wrapper .franz-form__toggle.is-active .franz-form__toggle-button, .theme__dark .franz-form__button, .franz-form__button, .ferdi__fab, .franz-form .franz-form__slider-wrapper .slider::-webkit-slider-thumb","border-right-color":".settings .settings__header .separator"}
diff --git a/src/components/TrialActivationInfoBar.js b/src/components/TrialActivationInfoBar.js
deleted file mode 100644
index 77ab97565..000000000
--- a/src/components/TrialActivationInfoBar.js
+++ /dev/null
@@ -1,94 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { defineMessages, intlShape } from 'react-intl';
-import ms from 'ms';
-import injectSheet from 'react-jss';
-import classnames from 'classnames';
-
-import InfoBar from './ui/InfoBar';
-
-const messages = defineMessages({
-  message: {
-    id: 'infobar.trialActivated',
-    defaultMessage: '!!!Your trial was successfully activated. Happy messaging!',
-  },
-});
-
-const styles = {
-  notification: {
-    height: 'auto',
-    position: 'absolute',
-    top: -50,
-    transition: 'top 0.3s',
-    zIndex: 500,
-    width: 'calc(100% - 300px)',
-  },
-  show: {
-    top: 0,
-  },
-};
-
-@injectSheet(styles)
-class TrialActivationInfoBar extends Component {
-  static propTypes = {
-    // eslint-disable-next-line
-    classes: PropTypes.object.isRequired,
-  };
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  state = {
-    showing: false,
-    removed: false,
-  }
-
-  componentDidMount() {
-    setTimeout(() => {
-      this.setState({
-        showing: true,
-      });
-    }, 0);
-
-    setTimeout(() => {
-      this.setState({
-        showing: false,
-      });
-    }, ms('6s'));
-
-    setTimeout(() => {
-      this.setState({
-        removed: true,
-      });
-    }, ms('7s'));
-  }
-
-  render() {
-    const { classes } = this.props;
-    const { showing, removed } = this.state;
-    const { intl } = this.context;
-
-    if (removed) return null;
-
-    return (
-      <div
-        className={classnames({
-          [classes.notification]: true,
-          [classes.show]: showing,
-        })}
-      >
-        <InfoBar
-          type="primary"
-          position="top"
-          sticky
-        >
-          <span className="mdi mdi-information" />
-          {intl.formatMessage(messages.message)}
-        </InfoBar>
-      </div>
-    );
-  }
-}
-
-export default TrialActivationInfoBar;
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js
index 6fa3adf92..c0e6b982b 100644
--- a/src/components/auth/AuthLayout.js
+++ b/src/components/auth/AuthLayout.js
@@ -7,14 +7,19 @@ import { TitleBar } from 'electron-react-titlebar';
 import Link from '../ui/Link';
 import InfoBar from '../ui/InfoBar';
 
-import { oneOrManyChildElements, globalError as globalErrorPropType } from '../../prop-types';
+import {
+  oneOrManyChildElements,
+  globalError as globalErrorPropType,
+} from '../../prop-types';
 import globalMessages from '../../i18n/globalMessages';
 
 import { isWindows } from '../../environment';
 import AppUpdateInfoBar from '../AppUpdateInfoBar';
 import { GITHUB_FERDI_URL } from '../../config';
 
-export default @observer class AuthLayout extends Component {
+export default
+@observer
+class AuthLayout extends Component {
   static propTypes = {
     children: oneOrManyChildElements.isRequired,
     error: globalErrorPropType.isRequired,
@@ -30,7 +35,7 @@ export default @observer class AuthLayout extends Component {
 
   state = {
     shouldShowAppUpdateInfoBar: true,
-  }
+  };
 
   static defaultProps = {
     nextAppReleaseVersion: null,
@@ -57,12 +62,15 @@ export default @observer class AuthLayout extends Component {
 
     return (
       <>
-        {isWindows && !isFullScreen && <TitleBar menu={window.ferdi.menu.template} icon="assets/images/logo.svg" />}
+        {isWindows && !isFullScreen && (
+          <TitleBar
+            menu={window.ferdi.menu.template}
+            icon="assets/images/logo.svg"
+          />
+        )}
         <div className="auth">
           {!isOnline && (
-            <InfoBar
-              type="warning"
-            >
+            <InfoBar type="warning">
               <span className="mdi mdi-flash" />
               {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
             </InfoBar>
@@ -95,7 +103,11 @@ export default @observer class AuthLayout extends Component {
             })}
           </div>
           {/* </div> */}
-          <Link to={`${GITHUB_FERDI_URL}/ferdi`} className="auth__adlk" target="_blank">
+          <Link
+            to={`${GITHUB_FERDI_URL}/ferdi`}
+            className="auth__adlk"
+            target="_blank"
+          >
             <img src="./assets/images/adlk.svg" alt="" />
           </Link>
         </div>
diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js
index 0dedd825a..7bab80280 100644
--- a/src/components/auth/ChangeServer.js
+++ b/src/components/auth/ChangeServer.js
@@ -100,7 +100,7 @@ export default @observer class ChangeServer extends Component {
     const { intl } = this.context;
     return (
       <div className="auth__container">
-        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
+        <form className="franz-form auth__form" onSubmit={(e) => this.submit(e)}>
           <h1>{intl.formatMessage(messages.headline)}</h1>
           {form.$('server').value === this.franzServer
           && (
@@ -113,7 +113,7 @@ export default @observer class ChangeServer extends Component {
           && (
             <Input
               placeholder="Custom Server"
-              onChange={e => this.submit(e)}
+              onChange={(e) => this.submit(e)}
               field={form.$('customServer')}
             />
           )}
diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js
index 1fdbea595..2ad8a2409 100644
--- a/src/components/auth/Locked.js
+++ b/src/components/auth/Locked.js
@@ -102,7 +102,7 @@ export default @observer class Locked extends Component {
 
     return (
       <div className="auth__container">
-        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
+        <form className="franz-form auth__form" onSubmit={(e) => this.submit(e)}>
           <img
             src="./assets/images/logo.svg"
             className="auth__logo"
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index 52b09eab6..9e6a8d046 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -135,7 +135,7 @@ export default @inject('actions') @observer class Login extends Component {
 
     return (
       <div className="auth__container">
-        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
+        <form className="franz-form auth__form" onSubmit={(e) => this.submit(e)}>
           <img
             src="./assets/images/logo.svg"
             className="auth__logo"
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js
index ad34e39af..eafc48502 100644
--- a/src/components/auth/Password.js
+++ b/src/components/auth/Password.js
@@ -86,7 +86,7 @@ export default @observer class Password extends Component {
 
     return (
       <div className="auth__container">
-        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
+        <form className="franz-form auth__form" onSubmit={(e) => this.submit(e)}>
           <img
             src="./assets/images/logo.svg"
             className="auth__logo"
diff --git a/src/components/auth/Pricing.js b/src/components/auth/Pricing.js
deleted file mode 100644
index 2fcabe54d..000000000
--- a/src/components/auth/Pricing.js
+++ /dev/null
@@ -1,270 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
-import injectSheet from 'react-jss';
-import { H2, Loader } from '@meetfranz/ui';
-import classnames from 'classnames';
-
-import { Button } from '@meetfranz/forms';
-import { FeatureItem } from '../ui/FeatureItem';
-import { FeatureList } from '../ui/FeatureList';
-
-const messages = defineMessages({
-  headline: {
-    id: 'pricing.trial.headline.pro',
-    defaultMessage: '!!!Hi {name}, welcome to Franz',
-  },
-  specialTreat: {
-    id: 'pricing.trial.intro.specialTreat',
-    defaultMessage: '!!!We have a special treat for you.',
-  },
-  tryPro: {
-    id: 'pricing.trial.intro.tryPro',
-    defaultMessage: '!!!Enjoy the full Franz Professional experience completely free for 14 days.',
-  },
-  happyMessaging: {
-    id: 'pricing.trial.intro.happyMessaging',
-    defaultMessage: '!!!Happy messaging,',
-  },
-  noStringsAttachedHeadline: {
-    id: 'pricing.trial.terms.headline',
-    defaultMessage: '!!!No strings attached',
-  },
-  noCreditCard: {
-    id: 'pricing.trial.terms.noCreditCard',
-    defaultMessage: '!!!No credit card required',
-  },
-  automaticTrialEnd: {
-    id: 'pricing.trial.terms.automaticTrialEnd',
-    defaultMessage: '!!!Your free trial ends automatically after 14 days',
-  },
-  trialWorth: {
-    id: 'pricing.trial.terms.trialWorth',
-    defaultMessage: '!!!Free trial (normally {currency}{price} per month)',
-  },
-  activationError: {
-    id: 'pricing.trial.error',
-    defaultMessage: '!!!Sorry, we could not activate your trial!',
-  },
-  ctaAccept: {
-    id: 'pricing.trial.cta.accept',
-    defaultMessage: '!!!Start my 14-day Franz Professional Trial ',
-  },
-  ctaStart: {
-    id: 'pricing.trial.cta.start',
-    defaultMessage: '!!!Start using Franz',
-  },
-  ctaSkip: {
-    id: 'pricing.trial.cta.skip',
-    defaultMessage: '!!!Continue to Ferdi',
-  },
-  featuresHeadline: {
-    id: 'pricing.trial.features.headline',
-    defaultMessage: '!!!Franz Professional includes:',
-  },
-});
-
-const styles = theme => ({
-  root: {
-    width: '500px !important',
-    textAlign: 'center',
-    padding: 20,
-    zIndex: 100,
-
-    '& h1': {
-    },
-  },
-  container: {
-    position: 'relative',
-    marginLeft: -150,
-  },
-  welcomeOffer: {
-    textAlign: 'center',
-    fontWeight: 'bold',
-    marginBottom: '6 !important',
-  },
-  keyTerms: {
-    textAlign: 'center',
-  },
-  content: {
-    position: 'relative',
-    zIndex: 20,
-  },
-  featureContainer: {
-    width: 300,
-    position: 'absolute',
-    left: 'calc(100% / 2 + 250px)',
-    marginTop: 20,
-    background: theme.signup.pricing.feature.background,
-    height: 'auto',
-    padding: 20,
-    borderTopRightRadius: theme.borderRadius,
-    borderBottomRightRadius: theme.borderRadius,
-    zIndex: 10,
-  },
-  featureItem: {
-    borderBottom: [1, 'solid', theme.signup.pricing.feature.border],
-  },
-  cta: {
-    marginTop: 40,
-    width: '100%',
-  },
-  skipLink: {
-    textAlign: 'center',
-    marginTop: 10,
-  },
-  error: {
-    margin: [20, 0, 0],
-    color: theme.styleTypes.danger.accent,
-  },
-  priceContainer: {
-    display: 'flex',
-    justifyContent: 'space-evenly',
-    margin: [10, 0, 15],
-  },
-  price: {
-    '& sup': {
-      verticalAlign: 14,
-      fontSize: 20,
-    },
-  },
-  figure: {
-    fontSize: 40,
-  },
-  regularPrice: {
-    position: 'relative',
-
-    '&:before': {
-      content: '" "',
-      position: 'absolute',
-      width: '130%',
-      height: 1,
-      top: 14,
-      left: -12,
-      borderBottom: [3, 'solid', 'red'],
-      transform: 'rotateZ(-20deg)',
-    },
-  },
-});
-
-export default @injectSheet(styles) @observer class Signup extends Component {
-  static propTypes = {
-    onSubmit: PropTypes.func.isRequired,
-    isLoadingRequiredData: PropTypes.bool.isRequired,
-    isActivatingTrial: PropTypes.bool.isRequired,
-    trialActivationError: PropTypes.bool.isRequired,
-    canSkipTrial: PropTypes.bool.isRequired,
-    classes: PropTypes.object.isRequired,
-    currency: PropTypes.string.isRequired,
-    price: PropTypes.number.isRequired,
-    name: PropTypes.string.isRequired,
-  };
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  render() {
-    const {
-      onSubmit,
-      isLoadingRequiredData,
-      isActivatingTrial,
-      trialActivationError,
-      canSkipTrial,
-      classes,
-      currency,
-      price,
-      name,
-    } = this.props;
-    const { intl } = this.context;
-
-    const [intPart, fractionPart] = (price).toString().split('.');
-
-    return (
-      <>
-        <div className={classnames('auth__container', classes.root, classes.container)}>
-          <form className="franz-form auth__form">
-            {isLoadingRequiredData ? <Loader /> : (
-              <img
-                src="./assets/images/sm.png"
-                className="auth__logo auth__logo--sm"
-                alt=""
-              />
-            )}
-            <h1>{intl.formatMessage(messages.headline, { name })}</h1>
-            <div className="auth__letter">
-              <p>
-                {intl.formatMessage(messages.specialTreat)}
-                <br />
-              </p>
-              <p>
-                {intl.formatMessage(messages.tryPro)}
-                <br />
-              </p>
-              <p>
-                {intl.formatMessage(messages.happyMessaging)}
-              </p>
-              <p>
-                <strong>Stefan Malzner</strong>
-              </p>
-            </div>
-            <div className={classes.priceContainer}>
-              <p className={classnames(classes.price, classes.regularPrice)}>
-                <span className={classes.figure}>
-                  {currency}
-                  {intPart}
-                </span>
-                <sup>{fractionPart}</sup>
-              </p>
-              <p className={classnames(classes.price, classes.trialPrice)}>
-                <span className={classes.figure}>
-                  {currency}
-                  0
-                </span>
-                <sup>00</sup>
-              </p>
-            </div>
-            <div className={classes.keyTerms}>
-              <H2>
-                {intl.formatMessage(messages.noStringsAttachedHeadline)}
-              </H2>
-              <ul className={classes.keyTermsList}>
-                <FeatureItem
-                  icon="👉"
-                  name={intl.formatMessage(messages.trialWorth, {
-                    currency,
-                    price,
-                  })}
-                />
-                <FeatureItem icon="👉" name={intl.formatMessage(messages.noCreditCard)} />
-                <FeatureItem icon="👉" name={intl.formatMessage(messages.automaticTrialEnd)} />
-              </ul>
-            </div>
-            {trialActivationError && (
-            <p className={classes.error}>{intl.formatMessage(messages.activationError)}</p>
-            )}
-            <Button
-              label={intl.formatMessage(!canSkipTrial ? messages.ctaStart : messages.ctaAccept)}
-              className={classes.cta}
-              onClick={onSubmit}
-              busy={isActivatingTrial}
-              disabled={isLoadingRequiredData || isActivatingTrial}
-            />
-            {canSkipTrial && (
-            <p className={classes.skipLink}>
-              <a href="#/">{intl.formatMessage(messages.ctaSkip)}</a>
-            </p>
-            )}
-          </form>
-        </div>
-        <div className={classes.featureContainer}>
-          <H2>
-            {intl.formatMessage(messages.featuresHeadline)}
-          </H2>
-          <FeatureList />
-        </div>
-      </>
-    );
-  }
-}
diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js
index e03cf9101..0f821d4fc 100644
--- a/src/components/auth/SetupAssistant.js
+++ b/src/components/auth/SetupAssistant.js
@@ -18,15 +18,16 @@ const SLACK_ID = 'slack';
 const messages = defineMessages({
   headline: {
     id: 'setupAssistant.headline',
-    defaultMessage: '!!!Let\'s get started',
+    defaultMessage: "!!!Let's get started",
   },
   subHeadline: {
     id: 'setupAssistant.subheadline',
-    defaultMessage: '!!!Choose from our most used services and get back on top of your messaging now.',
+    defaultMessage:
+      '!!!Choose from our most used services and get back on top of your messaging now.',
   },
   submitButtonLabel: {
     id: 'setupAssistant.submit.label',
-    defaultMessage: '!!!Let\'s go',
+    defaultMessage: "!!!Let's go",
   },
   inviteSuccessInfo: {
     id: 'invite.successInfo',
@@ -34,14 +35,19 @@ const messages = defineMessages({
   },
 });
 
+let transition = 'none';
+
+if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) {
+  transition = 'all 0.25s';
+}
+
 const styles = theme => ({
   root: {
     width: '500px !important',
     textAlign: 'center',
     padding: 20,
 
-    '& h1': {
-    },
+    '& h1': {},
   },
   servicesGrid: {
     display: 'flex',
@@ -60,7 +66,7 @@ const styles = theme => ({
     borderRadius: theme.borderRadius,
     marginBottom: 10,
     opacity: 0.5,
-    transition: 'all 0.25s',
+    transition,
     border: [3, 'solid', 'transparent'],
 
     '& h2': {
@@ -70,10 +76,8 @@ const styles = theme => ({
 
     '&:hover': {
       border: [3, 'solid', theme.brandPrimary],
-      '& $serviceIcon': {
-      },
+      '& $serviceIcon': {},
     },
-
   },
   selected: {
     border: [3, 'solid', theme.brandPrimary],
@@ -82,7 +86,7 @@ const styles = theme => ({
   },
   serviceIcon: {
     width: 50,
-    transition: 'all 0.25s',
+    transition,
   },
 
   slackModalContent: {
@@ -125,7 +129,8 @@ const styles = theme => ({
   },
 });
 
-@injectSheet(styles) @observer
+@injectSheet(styles)
+@observer
 class SetupAssistant extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
@@ -144,13 +149,17 @@ class SetupAssistant extends Component {
   };
 
   state = {
-    services: [{
-      id: 'whatsapp',
-    }, {
-      id: 'messenger',
-    }, {
-      id: 'gmail',
-    }],
+    services: [
+      {
+        id: 'whatsapp',
+      },
+      {
+        id: 'messenger',
+      },
+      {
+        id: 'gmail',
+      },
+    ],
     isSlackModalOpen: false,
     slackWorkspace: '',
   };
@@ -158,7 +167,9 @@ class SetupAssistant extends Component {
   slackWorkspaceHandler() {
     const { slackWorkspace = '', services } = this.state;
 
-    const sanitizedWorkspace = slackWorkspace.trim().replace(/^https?:\/\//, '');
+    const sanitizedWorkspace = slackWorkspace
+      .trim()
+      .replace(/^https?:\/\//, '');
 
     if (sanitizedWorkspace) {
       const index = services.findIndex(s => s.id === SLACK_ID);
@@ -179,9 +190,17 @@ class SetupAssistant extends Component {
   render() {
     const { intl } = this.context;
     const {
-      classes, isInviteSuccessful, onSubmit, services, isSettingUpServices,
+      classes,
+      isInviteSuccessful,
+      onSubmit,
+      services,
+      isSettingUpServices,
     } = this.props;
-    const { isSlackModalOpen, slackWorkspace, services: addedServices } = this.state;
+    const {
+      isSlackModalOpen,
+      slackWorkspace,
+      services: addedServices,
+    } = this.state;
 
     return (
       <div className={`auth__container ${classes.root}`}>
@@ -197,25 +216,18 @@ class SetupAssistant extends Component {
           </Appear>
         )}
 
-        <img
-          src="./assets/images/logo.svg"
-          className="auth__logo"
-          alt=""
-        />
-        <h1>
-          {intl.formatMessage(messages.headline)}
-        </h1>
-        <h2>
-          {intl.formatMessage(messages.subHeadline)}
-        </h2>
+        <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
+        <h1>{intl.formatMessage(messages.headline)}</h1>
+        <h2>{intl.formatMessage(messages.subHeadline)}</h2>
         <div className={classnames('grid', classes.servicesGrid)}>
-          {Object.keys(services).map((id) => {
+          {Object.keys(services).map(id => {
             const service = services[id];
             return (
               <button
                 className={classnames({
                   [classes.serviceContainer]: true,
-                  [classes.selected]: this.state.services.findIndex(s => s.id === id) !== -1,
+                  [classes.selected]:
+                    this.state.services.findIndex(s => s.id === id) !== -1,
                 })}
                 key={id}
                 onClick={() => {
@@ -244,9 +256,7 @@ class SetupAssistant extends Component {
                   className={classes.serviceIcon}
                   alt=""
                 />
-                <h2>
-                  {service.name}
-                </h2>
+                <h2>{service.name}</h2>
                 {id === SLACK_ID && slackWorkspace && (
                   <Badge type="secondary" className={classes.slackBadge}>
                     {slackWorkspace}
@@ -275,22 +285,22 @@ class SetupAssistant extends Component {
           <div className={classes.slackModalContent}>
             <img src={`${CDN_URL}/recipes/dist/slack/src/icon.svg`} alt="" />
             <h1>Create your first Slack workspace</h1>
-            <form onSubmit={(e) => {
-              e.preventDefault();
-              this.slackWorkspaceHandler();
-            }}
+            <form
+              onSubmit={e => {
+                e.preventDefault();
+                this.slackWorkspaceHandler();
+              }}
             >
               <Input
                 suffix=".slack.com"
                 placeholder="workspace-url"
-                onChange={e => this.setState({ slackWorkspace: e.target.value })}
+                onChange={e =>
+                  this.setState({ slackWorkspace: e.target.value })
+                }
                 value={slackWorkspace}
               />
               <div className={classes.modalActionContainer}>
-                <Button
-                  type="submit"
-                  label="Save"
-                />
+                <Button type="submit" label="Save" />
                 <Button
                   type="link"
                   buttonType="secondary"
@@ -305,7 +315,7 @@ class SetupAssistant extends Component {
         <Button
           type="button"
           className="auth__button"
-            // disabled={!atLeastOneEmailAddress}
+          // disabled={!atLeastOneEmailAddress}
           label={intl.formatMessage(messages.submitButtonLabel)}
           onClick={() => onSubmit(this.state.services)}
           busy={isSettingUpServices}
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 140867ea1..6fb41a164 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 
-import { isDevMode, termsBase, useLiveAPI } from '../../environment';
+import { isDevMode, useLiveAPI } from '../../environment';
 import Form from '../../lib/Form';
 import { required, email, minLength } from '../../helpers/validation-helpers';
 import serverlessLogin from '../../helpers/serverless-helpers';
@@ -14,6 +14,7 @@ import Link from '../ui/Link';
 import Infobox from '../ui/Infobox';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
+import { termsBase } from '../../api/apiBase';
 
 const messages = defineMessages({
   headline: {
@@ -138,7 +139,7 @@ export default @inject('actions') @observer class Signup extends Component {
     return (
       <div className="auth__scroll-container">
         <div className="auth__container auth__container--signup">
-          <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
+          <form className="franz-form auth__form" onSubmit={(e) => this.submit(e)}>
             <img
               src="./assets/images/logo.svg"
               className="auth__logo"
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js
index 5f2fac64b..cb522e26e 100644
--- a/src/components/auth/Welcome.js
+++ b/src/components/auth/Welcome.js
@@ -84,7 +84,7 @@ export default @inject('actions') @observer class Login extends Component {
           </Link>
         </div>
         <div className="welcome__featured-services">
-          {recipes.map(recipe => (
+          {recipes.map((recipe) => (
             <div
               key={recipe.id}
               className="welcome__featured-service"
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index a60270a6f..d5e1deb39 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -19,10 +19,7 @@ import { isWindows } from '../../environment';
 import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator';
 import { workspaceStore } from '../../features/workspaces';
 import AppUpdateInfoBar from '../AppUpdateInfoBar';
-import TrialActivationInfoBar from '../TrialActivationInfoBar';
 import Todos from '../../features/todos/containers/TodosScreen';
-import PlanSelection from '../../features/planSelection/containers/PlanSelectionScreen';
-import TrialStatusBar from '../../features/trialStatusBar/containers/TrialStatusBarScreen';
 
 function createMarkup(HTMLString) {
   return { __html: HTMLString };
@@ -43,22 +40,32 @@ const messages = defineMessages({
   },
   authRequestFailed: {
     id: 'infobar.authRequestFailed',
-    defaultMessage: '!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.',
+    defaultMessage:
+      '!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.',
   },
 });
 
+let transition = 'none';
+
+if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) {
+  transition = 'transform 0.5s ease';
+}
+
 const styles = theme => ({
   appContent: {
     // width: `calc(100% + ${theme.workspaces.drawer.width}px)`,
     width: '100%',
-    transition: 'transform 0.5s ease',
+    transition,
     transform() {
-      return workspaceStore.isWorkspaceDrawerOpen ? 'translateX(0)' : `translateX(-${theme.workspaces.drawer.width}px)`;
+      return workspaceStore.isWorkspaceDrawerOpen
+        ? 'translateX(0)'
+        : `translateX(-${theme.workspaces.drawer.width}px)`;
     },
   },
 });
 
-@injectSheet(styles) @observer
+@injectSheet(styles)
+@observer
 class AppLayout extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
@@ -79,12 +86,11 @@ class AppLayout extends Component {
     areRequiredRequestsSuccessful: PropTypes.bool.isRequired,
     retryRequiredRequests: PropTypes.func.isRequired,
     areRequiredRequestsLoading: PropTypes.bool.isRequired,
-    hasActivatedTrial: PropTypes.bool.isRequired,
   };
 
   state = {
     shouldShowAppUpdateInfoBar: true,
-  }
+  };
 
   static defaultProps = {
     children: [],
@@ -115,7 +121,6 @@ class AppLayout extends Component {
       areRequiredRequestsSuccessful,
       retryRequiredRequests,
       areRequiredRequestsLoading,
-      hasActivatedTrial,
     } = this.props;
 
     const { intl } = this.context;
@@ -123,45 +128,48 @@ class AppLayout extends Component {
     return (
       <ErrorBoundary>
         <div className="app">
-          {isWindows && !isFullScreen && <TitleBar menu={window.ferdi.menu.template} icon="assets/images/logo.svg" />}
+          {isWindows && !isFullScreen && (
+            <TitleBar
+              menu={window.ferdi.menu.template}
+              icon="assets/images/logo.svg"
+            />
+          )}
           <div className={`app__content ${classes.appContent}`}>
             {workspacesDrawer}
             {sidebar}
             <div className="app__service">
               <WorkspaceSwitchingIndicator />
-              {news.length > 0 && news.map(item => (
+              {news.length > 0 &&
+                news.map(item => (
+                  <InfoBar
+                    key={item.id}
+                    position="top"
+                    type={item.type}
+                    sticky={item.sticky}
+                    onHide={() => removeNewsItem({ newsId: item.id })}
+                  >
+                    <span
+                      dangerouslySetInnerHTML={createMarkup(item.message)}
+                      onClick={event => {
+                        const { target } = event;
+                        if (target && target.hasAttribute('data-is-news-cta')) {
+                          removeNewsItem({ newsId: item.id });
+                        }
+                      }}
+                    />
+                  </InfoBar>
+                ))}
+              {!areRequiredRequestsSuccessful && showRequiredRequestsError && (
                 <InfoBar
-                  key={item.id}
-                  position="top"
-                  type={item.type}
-                  sticky={item.sticky}
-                  onHide={() => removeNewsItem({ newsId: item.id })}
+                  type="danger"
+                  ctaLabel="Try again"
+                  ctaLoading={areRequiredRequestsLoading}
+                  sticky
+                  onClick={retryRequiredRequests}
                 >
-                  <span
-                    dangerouslySetInnerHTML={createMarkup(item.message)}
-                    onClick={(event) => {
-                      const { target } = event;
-                      if (target && target.hasAttribute('data-is-news-cta')) {
-                        removeNewsItem({ newsId: item.id });
-                      }
-                    }}
-                  />
+                  <span className="mdi mdi-flash" />
+                  {intl.formatMessage(messages.requiredRequestsFailed)}
                 </InfoBar>
-              ))}
-              {hasActivatedTrial && (
-                <TrialActivationInfoBar />
-              )}
-              {!areRequiredRequestsSuccessful && showRequiredRequestsError && (
-              <InfoBar
-                type="danger"
-                ctaLabel="Try again"
-                ctaLoading={areRequiredRequestsLoading}
-                sticky
-                onClick={retryRequiredRequests}
-              >
-                <span className="mdi mdi-flash" />
-                {intl.formatMessage(messages.requiredRequestsFailed)}
-              </InfoBar>
               )}
               {authRequestFailed && (
                 <InfoBar
@@ -186,7 +194,7 @@ class AppLayout extends Component {
                   {intl.formatMessage(messages.servicesUpdated)}
                 </InfoBar>
               )}
-              { appUpdateIsDownloaded && this.state.shouldShowAppUpdateInfoBar && (
+              {appUpdateIsDownloaded && this.state.shouldShowAppUpdateInfoBar && (
                 <AppUpdateInfoBar
                   nextAppReleaseVersion={nextAppReleaseVersion}
                   onInstallUpdate={installAppUpdate}
@@ -202,11 +210,9 @@ class AppLayout extends Component {
               <PublishDebugInfo />
               {services}
               {children}
-              <TrialStatusBar />
             </div>
             <Todos />
           </div>
-          <PlanSelection />
         </div>
       </ErrorBoundary>
     );
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 802538eba..daa5642c3 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -6,16 +6,13 @@ import { inject, observer } from 'mobx-react';
 import { Link } from 'react-router';
 
 import Tabbar from '../services/tabs/Tabbar';
-import { ctrlKey, isMac } from '../../environment';
+import { settingsShortcutKey, lockFerdiShortcutKey, todosToggleShortcutKey, workspaceToggleShortcutKey, addNewServiceShortcutKey, muteFerdiShortcutKey } from '../../environment';
 import { workspaceStore } from '../../features/workspaces';
 import { todosStore } from '../../features/todos';
 import { todoActions } from '../../features/todos/actions';
 import AppStore from '../../stores/AppStore';
 import SettingsStore from '../../stores/SettingsStore';
 
-// Platform specific shortcut keys
-const settingsShortcutKey = isMac ? ',' : 'P';
-
 const messages = defineMessages({
   settings: {
     id: 'sidebar.settings',
@@ -58,6 +55,19 @@ const messages = defineMessages({
 export default @inject('stores', 'actions') @observer class Sidebar extends Component {
   static propTypes = {
     openSettings: PropTypes.func.isRequired,
+    closeSettings: PropTypes.func.isRequired,
+    setActive: PropTypes.func.isRequired,
+    reorder: PropTypes.func.isRequired,
+    reload: PropTypes.func.isRequired,
+    toggleNotifications: PropTypes.func.isRequired,
+    toggleAudio: PropTypes.func.isRequired,
+    toggleDarkMode: PropTypes.func.isRequired,
+    showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
+    showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
+    deleteService: PropTypes.func.isRequired,
+    updateService: PropTypes.func.isRequired,
+    hibernateService: PropTypes.func.isRequired,
+    wakeUpService: PropTypes.func.isRequired,
     toggleMuteApp: PropTypes.func.isRequired,
     isAppMuted: PropTypes.bool.isRequired,
     isWorkspaceDrawerOpen: PropTypes.bool.isRequired,
@@ -139,7 +149,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
                     },
                   });
                 }}
-                data-tip={`${intl.formatMessage(messages.lockFerdi)} (${ctrlKey}+Shift+L)`}
+                data-tip={`${intl.formatMessage(messages.lockFerdi)} (${lockFerdiShortcutKey(false)})`}
               >
                 <i className="mdi mdi-lock" />
               </button>
@@ -152,8 +162,8 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
                   this.updateToolTip();
                 }}
                 disabled={isTodosServiceActive}
-                className={`sidebar__button sidebar__button--todos  ${todosStore.isTodosPanelVisible ? 'is-active' : ''}`}
-                data-tip={`${intl.formatMessage(todosToggleMessage)} (${ctrlKey}+T)`}
+                className={`sidebar__button sidebar__button--todos ${todosStore.isTodosPanelVisible ? 'is-active' : ''}`}
+                data-tip={`${intl.formatMessage(todosToggleMessage)} (${todosToggleShortcutKey(false)})`}
               >
                 <i className="mdi mdi-check-all" />
               </button>
@@ -166,7 +176,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
                   this.updateToolTip();
                 }}
                 className={`sidebar__button sidebar__button--workspaces ${isWorkspaceDrawerOpen ? 'is-active' : ''}`}
-                data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${ctrlKey}+D)`}
+                data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${workspaceToggleShortcutKey(false)})`}
               >
                 <i className="mdi mdi-view-grid" />
               </button>
@@ -178,7 +188,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
                 this.updateToolTip();
               }}
               className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
-              data-tip={`${intl.formatMessage(isAppMuted ? messages.unmute : messages.mute)} (${ctrlKey}+Shift+M)`}
+              data-tip={`${intl.formatMessage(isAppMuted ? messages.unmute : messages.mute)} (${muteFerdiShortcutKey(false)})`}
             >
               <i className={`mdi mdi-bell${isAppMuted ? '-off' : ''}`} />
             </button>
@@ -186,7 +196,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
               type="button"
               onClick={() => openSettings({ path: 'recipes' })}
               className="sidebar__button sidebar__button--new-service"
-              data-tip={`${intl.formatMessage(messages.addNewService)} (${ctrlKey}+N)`}
+              data-tip={`${intl.formatMessage(messages.addNewService)} (${addNewServiceShortcutKey(false)})`}
             >
               <i className="mdi mdi-plus-box" />
             </button>
@@ -204,9 +214,10 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
           type="button"
           onClick={() => openSettings({ path: 'app' })}
           className="sidebar__button sidebar__button--settings"
-          data-tip={`${intl.formatMessage(messages.settings)} (${ctrlKey}+${settingsShortcutKey})`}
+          data-tip={`${intl.formatMessage(messages.settings)} (${settingsShortcutKey(false)})`}
         >
-          <i className="mdi mdi-settings" />
+          {/* TODO: Because of https://github.com/Templarian/MaterialDesign-Webfont/issues/81 bug in @mdi/font in 5.9.55, added `mdi-memory` as a fallback */}
+          <i className="mdi mdi-settings mdi-memory" />
           { (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE
             || this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.DOWNLOADED) && (
             <span className="update-available">
diff --git a/src/components/services/content/ConnectionLostBanner.js b/src/components/services/content/ConnectionLostBanner.js
index e54a88faa..ebe863333 100644
--- a/src/components/services/content/ConnectionLostBanner.js
+++ b/src/components/services/content/ConnectionLostBanner.js
@@ -5,9 +5,7 @@ import injectSheet from 'react-jss';
 import { Icon } from '@meetfranz/ui';
 import { intlShape, defineMessages } from 'react-intl';
 
-import {
-  mdiAlert,
-} from '@mdi/js';
+import { mdiAlert } from '@mdi/js';
 import { LIVE_API_FERDI_WEBSITE } from '../../../config';
 // import { Button } from '@meetfranz/forms';
 
@@ -26,6 +24,12 @@ const messages = defineMessages({
   },
 });
 
+let buttonTransition = 'none';
+
+if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) {
+  buttonTransition = 'opacity 0.25s';
+}
+
 const styles = theme => ({
   root: {
     background: theme.colorBackground,
@@ -47,7 +51,7 @@ const styles = theme => ({
     opacity: 0.7,
   },
   button: {
-    transition: 'opacity 0.25s',
+    transition: buttonTransition,
     color: theme.colorText,
     border: [1, 'solid', theme.colorText],
     borderRadius: theme.borderRadiusSmall,
@@ -65,13 +69,14 @@ const styles = theme => ({
   },
 });
 
-@injectSheet(styles) @observer
+@injectSheet(styles)
+@observer
 class ConnectionLostBanner extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
     name: PropTypes.string.isRequired,
     reload: PropTypes.func.isRequired,
-  }
+  };
 
   static contextTypes = {
     intl: intlShape,
@@ -80,20 +85,13 @@ class ConnectionLostBanner extends Component {
   inputRef = React.createRef();
 
   render() {
-    const {
-      classes,
-      name,
-      reload,
-    } = this.props;
+    const { classes, name, reload } = this.props;
 
     const { intl } = this.context;
 
     return (
       <div className={classes.root}>
-        <Icon
-          icon={mdiAlert}
-          className={classes.icon}
-        />
+        <Icon icon={mdiAlert} className={classes.icon} />
         <p>
           {intl.formatMessage(messages.text, { name })}
           <br />
@@ -104,11 +102,7 @@ class ConnectionLostBanner extends Component {
             {intl.formatMessage(messages.moreInformation)}
           </a>
         </p>
-        <button
-          type="button"
-          className={classes.button}
-          onClick={reload}
-        >
+        <button type="button" className={classes.button} onClick={reload}>
           {intl.formatMessage(messages.cta)}
         </button>
       </div>
diff --git a/src/components/services/content/ErrorHandlers/styles.js b/src/components/services/content/ErrorHandlers/styles.js
index 9e2509ee5..72d62f5e3 100644
--- a/src/components/services/content/ErrorHandlers/styles.js
+++ b/src/components/services/content/ErrorHandlers/styles.js
@@ -1,4 +1,4 @@
-export default theme => ({
+export default (theme) => ({
   component: {
     left: 0,
     position: 'absolute',
diff --git a/src/components/services/content/ServiceRestricted.js b/src/components/services/content/ServiceRestricted.js
deleted file mode 100644
index 4b8d926aa..000000000
--- a/src/components/services/content/ServiceRestricted.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
-
-import { serviceLimitStore } from '../../../features/serviceLimit';
-import Button from '../../ui/Button';
-import { RESTRICTION_TYPES } from '../../../models/Service';
-
-const messages = defineMessages({
-  headlineServiceLimit: {
-    id: 'service.restrictedHandler.serviceLimit.headline',
-    defaultMessage: '!!!You have reached your service limit.',
-  },
-  textServiceLimit: {
-    id: 'service.restrictedHandler.serviceLimit.text',
-    defaultMessage: '!!!Please upgrade your account to use more than {count} services.',
-  },
-  headlineCustomUrl: {
-    id: 'service.restrictedHandler.customUrl.headline',
-    defaultMessage: '!!!Franz Professional Plan required',
-  },
-  textCustomUrl: {
-    id: 'service.restrictedHandler.customUrl.text',
-    defaultMessage: '!!!Please upgrade to the Franz Professional plan to use custom urls & self hosted services.',
-  },
-  action: {
-    id: 'service.restrictedHandler.action',
-    defaultMessage: '!!!Upgrade Account',
-  },
-});
-
-export default @observer class ServiceRestricted extends Component {
-  static propTypes = {
-    name: PropTypes.string.isRequired,
-    upgrade: PropTypes.func.isRequired,
-    type: PropTypes.number.isRequired,
-  };
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  countdownInterval = null;
-
-  countdownIntervalTimeout = 1000;
-
-  render() {
-    const {
-      name,
-      upgrade,
-      type,
-    } = this.props;
-    const { intl } = this.context;
-
-    return (
-      <div className="services__info-layer">
-        {type === RESTRICTION_TYPES.SERVICE_LIMIT && (
-          <>
-            <h1>{intl.formatMessage(messages.headlineServiceLimit)}</h1>
-            <p>{intl.formatMessage(messages.textServiceLimit, { count: serviceLimitStore.serviceLimit })}</p>
-          </>
-        )}
-        {type === RESTRICTION_TYPES.CUSTOM_URL && (
-          <>
-            <h1>{intl.formatMessage(messages.headlineCustomUrl)}</h1>
-            <p>{intl.formatMessage(messages.textCustomUrl)}</p>
-          </>
-        )}
-        <Button
-          label={intl.formatMessage(messages.action, { name })}
-          buttonType="inverted"
-          onClick={() => upgrade()}
-        />
-      </div>
-    );
-  }
-}
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index 17d2db5a0..3fc084ff0 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -145,19 +145,17 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
           </>
         ) : (
           <>
-            {(!service.isHibernating || service.isHibernationEnabled) ? (
+            {!service.isHibernating ? (
               <>
                 {showNavBar && (
                   <WebControlsScreen service={service} />
                 )}
-                {!service.isHibernating && (
-                  <ServiceWebview
-                    service={service}
-                    setWebviewReference={setWebviewReference}
-                    detachService={detachService}
-                    isSpellcheckerEnabled={isSpellcheckerEnabled}
-                  />
-                )}
+                <ServiceWebview
+                  service={service}
+                  setWebviewReference={setWebviewReference}
+                  detachService={detachService}
+                  isSpellcheckerEnabled={isSpellcheckerEnabled}
+                />
               </>
             ) : (
               <div>
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 9e5fed996..3b499a5db 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { observable, reaction } from 'mobx';
 import ElectronWebView from 'react-electron-web-view';
-import path from 'path';
+import { join } from 'path';
 
 import ServiceModel from '../../../models/Service';
 
@@ -59,7 +59,7 @@ class ServiceWebview extends Component {
       isSpellcheckerEnabled,
     } = this.props;
 
-    const preloadScript = path.join(__dirname, '../../../', 'webview', 'recipe.js');
+    const preloadScript = join(__dirname, '..', '..', '..', 'webview', 'recipe.js');
 
     return (
       <ElectronWebView
@@ -83,7 +83,7 @@ class ServiceWebview extends Component {
         useragent={service.userAgent}
         disablewebsecurity={service.recipe.disablewebsecurity ? true : undefined}
         allowpopups
-        webpreferences={`spellcheck=${isSpellcheckerEnabled ? 1 : 0}, contextIsolation=false`}
+        webpreferences={`spellcheck=${isSpellcheckerEnabled ? 1 : 0}`}
       />
     );
   }
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index caa3cf9aa..bb93ff7d4 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -30,7 +30,7 @@ const messages = defineMessages({
   },
   serverInfo: {
     id: 'services.serverInfo',
-    defaultMessage: '!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.',
+    defaultMessage: '!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!',
   },
 });
 
@@ -54,7 +54,6 @@ export default @injectSheet(styles) @inject('actions') @observer class Services
     openSettings: PropTypes.func.isRequired,
     update: PropTypes.func.isRequired,
     userHasCompletedSignup: PropTypes.bool.isRequired,
-    hasActivatedTrial: PropTypes.bool.isRequired,
     classes: PropTypes.object.isRequired,
     actions: PropTypes.object.isRequired,
     isSpellcheckerEnabled: PropTypes.bool.isRequired,
@@ -109,7 +108,6 @@ export default @injectSheet(styles) @inject('actions') @observer class Services
       openSettings,
       update,
       userHasCompletedSignup,
-      hasActivatedTrial,
       classes,
       isSpellcheckerEnabled,
     } = this.props;
@@ -123,7 +121,7 @@ export default @injectSheet(styles) @inject('actions') @observer class Services
 
     return (
       <div className="services">
-        {(userHasCompletedSignup || hasActivatedTrial) && (
+        {userHasCompletedSignup && (
           <div className={classes.confettiContainer}>
             <Confetti
               width={window.width}
@@ -169,7 +167,7 @@ export default @injectSheet(styles) @inject('actions') @observer class Services
             </div>
           </Appear>
         )}
-        {services.filter(service => !service.isTodosService).map(service => (
+        {services.filter((service) => !service.isTodosService).map((service) => (
           <ServiceView
             key={service.id}
             service={service}
@@ -186,7 +184,6 @@ export default @injectSheet(styles) @inject('actions') @observer class Services
               },
               redirect: false,
             })}
-            upgrade={() => openSettings({ path: 'user' })}
             isSpellcheckerEnabled={isSpellcheckerEnabled}
           />
         ))}
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js
index b62940c06..10ff0bbbb 100644
--- a/src/components/services/content/WebviewCrashHandler.js
+++ b/src/components/services/content/WebviewCrashHandler.js
@@ -47,7 +47,7 @@ export default @observer class WebviewCrashHandler extends Component {
     const { reload } = this.props;
 
     this.countdownInterval = setInterval(() => {
-      this.setState(prevState => ({
+      this.setState((prevState) => ({
         countdown: prevState.countdown - this.countdownIntervalTimeout,
       }));
 
diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js
index 489027d57..1a389991d 100644
--- a/src/components/services/tabs/TabBarSortableList.js
+++ b/src/components/services/tabs/TabBarSortableList.js
@@ -14,9 +14,12 @@ class TabBarSortableList extends Component {
     reload: PropTypes.func.isRequired,
     toggleNotifications: PropTypes.func.isRequired,
     toggleAudio: PropTypes.func.isRequired,
+    toggleDarkMode: PropTypes.func.isRequired,
     deleteService: PropTypes.func.isRequired,
     disableService: PropTypes.func.isRequired,
     enableService: PropTypes.func.isRequired,
+    hibernateService: PropTypes.func.isRequired,
+    wakeUpService: PropTypes.func.isRequired,
     showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
     showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
   }
@@ -28,9 +31,12 @@ class TabBarSortableList extends Component {
       reload,
       toggleNotifications,
       toggleAudio,
+      toggleDarkMode,
       deleteService,
       disableService,
       enableService,
+      hibernateService,
+      wakeUpService,
       openSettings,
       showMessageBadgeWhenMutedSetting,
       showMessageBadgesEvenWhenMuted,
@@ -50,23 +56,17 @@ class TabBarSortableList extends Component {
             reload={() => reload({ serviceId: service.id })}
             toggleNotifications={() => toggleNotifications({ serviceId: service.id })}
             toggleAudio={() => toggleAudio({ serviceId: service.id })}
+            toggleDarkMode={() => toggleDarkMode({ serviceId: service.id })}
             deleteService={() => deleteService({ serviceId: service.id })}
             disableService={() => disableService({ serviceId: service.id })}
             enableService={() => enableService({ serviceId: service.id })}
+            hibernateService={() => hibernateService({ serviceId: service.id })}
+            wakeUpService={() => wakeUpService({ serviceId: service.id })}
             openSettings={openSettings}
             showMessageBadgeWhenMutedSetting={showMessageBadgeWhenMutedSetting}
             showMessageBadgesEvenWhenMuted={showMessageBadgesEvenWhenMuted}
           />
         ))}
-        {/* <li>
-          <button
-            className="sidebar__add-service"
-            onClick={() => openSettings({ path: 'recipes' })}
-            data-tip={`${intl.formatMessage(messages.addNewService)} (${ctrlKey}+N)`}
-          >
-            <span className="mdi mdi-plus" />
-          </button>
-        </li> */}
       </ul>
     );
   }
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index 5c3149a11..6a6d2c8c5 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -1,6 +1,4 @@
-import {
-  Menu, dialog, app, getCurrentWindow,
-} from '@electron/remote';
+import { Menu, dialog, app, getCurrentWindow } from '@electron/remote';
 import React, { Component } from 'react';
 import { defineMessages, intlShape } from 'react-intl';
 import PropTypes from 'prop-types';
@@ -12,9 +10,11 @@ import ms from 'ms';
 
 import { observable, autorun } from 'mobx';
 import ServiceModel from '../../../models/Service';
-import { ctrlKey, cmdKey } from '../../../environment';
+import { shortcutKey } from '../../../environment';
 
-const IS_SERVICE_DEBUGGING_ENABLED = (localStorage.getItem('debug') || '').includes('Ferdi:Service');
+const IS_SERVICE_DEBUGGING_ENABLED = (
+  localStorage.getItem('debug') || ''
+).includes('Ferdi:Service');
 
 const messages = defineMessages({
   reload: {
@@ -41,6 +41,14 @@ const messages = defineMessages({
     id: 'tabs.item.enableAudio',
     defaultMessage: '!!!Enable audio',
   },
+  enableDarkMode: {
+    id: 'tabs.item.enableDarkMode',
+    defaultMessage: '!!!Enable Dark mode',
+  },
+  disableDarkMode: {
+    id: 'tabs.item.disableDarkMode',
+    defaultMessage: '!!!Disable Dark mode',
+  },
   disableService: {
     id: 'tabs.item.disableService',
     defaultMessage: '!!!Disable Service',
@@ -49,16 +57,35 @@ const messages = defineMessages({
     id: 'tabs.item.enableService',
     defaultMessage: '!!!Enable Service',
   },
+  hibernateService: {
+    id: 'tabs.item.hibernateService',
+    defaultMessage: '!!!Hibernate Service',
+  },
+  wakeUpService: {
+    id: 'tabs.item.wakeUpService',
+    defaultMessage: '!!!Wake Up Service',
+  },
   deleteService: {
     id: 'tabs.item.deleteService',
     defaultMessage: '!!!Delete Service',
   },
   confirmDeleteService: {
     id: 'tabs.item.confirmDeleteService',
-    defaultMessage: '!!!Do you really want to delete the {serviceName} service?',
+    defaultMessage:
+      '!!!Do you really want to delete the {serviceName} service?',
   },
 });
 
+let pollIndicatorTransition = 'none';
+let polledTransition = 'none';
+let pollAnsweredTransition = 'none';
+
+if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) {
+  pollIndicatorTransition = 'background 0.5s';
+  polledTransition = 'background 0.1s';
+  pollAnsweredTransition = 'background 0.1s';
+}
+
 const styles = {
   pollIndicator: {
     position: 'absolute',
@@ -67,7 +94,7 @@ const styles = {
     height: 10,
     borderRadius: 5,
     background: 'gray',
-    transition: 'background 0.5s',
+    transition: pollIndicatorTransition,
   },
   pollIndicatorPoll: {
     left: 2,
@@ -77,18 +104,20 @@ const styles = {
   },
   polled: {
     background: 'yellow !important',
-    transition: 'background 0.1s',
+    transition: polledTransition,
   },
   pollAnswered: {
     background: 'green !important',
-    transition: 'background 0.1s',
+    transition: pollAnsweredTransition,
   },
   stale: {
     background: 'red !important',
   },
 };
 
-@injectSheet(styles) @observer class TabItem extends Component {
+@injectSheet(styles)
+@observer
+class TabItem extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
     service: PropTypes.instanceOf(ServiceModel).isRequired,
@@ -97,10 +126,13 @@ const styles = {
     reload: PropTypes.func.isRequired,
     toggleNotifications: PropTypes.func.isRequired,
     toggleAudio: PropTypes.func.isRequired,
+    toggleDarkMode: PropTypes.func.isRequired,
     openSettings: PropTypes.func.isRequired,
     deleteService: PropTypes.func.isRequired,
     disableService: PropTypes.func.isRequired,
     enableService: PropTypes.func.isRequired,
+    hibernateService: PropTypes.func.isRequired,
+    wakeUpService: PropTypes.func.isRequired,
     showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
     showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
   };
@@ -121,13 +153,17 @@ const styles = {
         if (Date.now() - service.lastPoll < ms('0.2s')) {
           this.isPolled = true;
 
-          setTimeout(() => { this.isPolled = false; }, ms('1s'));
+          setTimeout(() => {
+            this.isPolled = false;
+          }, ms('1s'));
         }
 
         if (Date.now() - service.lastPollAnswer < ms('0.2s')) {
           this.isPollAnswered = true;
 
-          setTimeout(() => { this.isPollAnswered = false; }, ms('1s'));
+          setTimeout(() => {
+            this.isPollAnswered = false;
+          }, ms('1s'));
         }
       });
     }
@@ -142,67 +178,103 @@ const styles = {
       reload,
       toggleNotifications,
       toggleAudio,
+      toggleDarkMode,
       deleteService,
       disableService,
       enableService,
+      hibernateService,
+      wakeUpService,
       openSettings,
       showMessageBadgeWhenMutedSetting,
       showMessageBadgesEvenWhenMuted,
     } = this.props;
     const { intl } = this.context;
 
-    const menuTemplate = [{
-      label: service.name || service.recipe.name,
-      enabled: false,
-    }, {
-      type: 'separator',
-    }, {
-      label: intl.formatMessage(messages.reload),
-      click: reload,
-      accelerator: `${cmdKey}+R`,
-    }, {
-      label: intl.formatMessage(messages.edit),
-      click: () => openSettings({
-        path: `services/edit/${service.id}`,
-      }),
-    }, {
-      type: 'separator',
-    }, {
-      label: service.isNotificationEnabled
-        ? intl.formatMessage(messages.disableNotifications)
-        : intl.formatMessage(messages.enableNotifications),
-      click: () => toggleNotifications(),
-    }, {
-      label: service.isMuted
-        ? intl.formatMessage(messages.enableAudio)
-        : intl.formatMessage(messages.disableAudio),
-      click: () => toggleAudio(),
-    }, {
-      label: intl.formatMessage(service.isEnabled ? messages.disableService : messages.enableService),
-      click: () => (service.isEnabled ? disableService() : enableService()),
-    }, {
-      type: 'separator',
-    }, {
-      label: intl.formatMessage(messages.deleteService),
-      click: () => {
-        const selection = dialog.showMessageBoxSync(app.mainWindow, {
-          type: 'question',
-          message: intl.formatMessage(messages.deleteService),
-          detail: intl.formatMessage(messages.confirmDeleteService, { serviceName: service.name || service.recipe.name }),
-          buttons: [
-            'Yes',
-            'No',
-          ],
-        });
-        if (selection === 0) {
-          deleteService();
-        }
+    const menuTemplate = [
+      {
+        label: service.name || service.recipe.name,
+        enabled: false,
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(messages.reload),
+        click: reload,
+        accelerator: `${shortcutKey()}+R`,
+      },
+      {
+        label: intl.formatMessage(messages.edit),
+        click: () =>
+          openSettings({
+            path: `services/edit/${service.id}`,
+          }),
       },
-    }];
+      {
+        type: 'separator',
+      },
+      {
+        label: service.isNotificationEnabled
+          ? intl.formatMessage(messages.disableNotifications)
+          : intl.formatMessage(messages.enableNotifications),
+        click: () => toggleNotifications(),
+      },
+      {
+        label: service.isMuted
+          ? intl.formatMessage(messages.enableAudio)
+          : intl.formatMessage(messages.disableAudio),
+        click: () => toggleAudio(),
+      },
+      {
+        label: service.isDarkModeEnabled
+          ? intl.formatMessage(messages.enableDarkMode)
+          : intl.formatMessage(messages.disableDarkMode),
+        click: () => toggleDarkMode(),
+      },
+      {
+        label: intl.formatMessage(
+          service.isEnabled ? messages.disableService : messages.enableService,
+        ),
+        click: () => (service.isEnabled ? disableService() : enableService()),
+      },
+      {
+        label: intl.formatMessage(
+          service.isHibernating
+            ? messages.wakeUpService
+            : messages.hibernateService,
+        ),
+        click: () =>
+          (service.isHibernating ? wakeUpService() : hibernateService()),
+        enabled: service.canHibernate,
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(messages.deleteService),
+        click: () => {
+          const selection = dialog.showMessageBoxSync(app.mainWindow, {
+            type: 'question',
+            message: intl.formatMessage(messages.deleteService),
+            detail: intl.formatMessage(messages.confirmDeleteService, {
+              serviceName: service.name || service.recipe.name,
+            }),
+            buttons: ['Yes', 'No'],
+          });
+          if (selection === 0) {
+            deleteService();
+          }
+        },
+      },
+    ];
     const menu = Menu.buildFromTemplate(menuTemplate);
 
     let notificationBadge = null;
-    if ((showMessageBadgeWhenMutedSetting || service.isNotificationEnabled) && showMessageBadgesEvenWhenMuted && service.isBadgeEnabled) {
+    if (
+      (showMessageBadgeWhenMutedSetting || service.isNotificationEnabled) &&
+      showMessageBadgesEvenWhenMuted &&
+      service.isBadgeEnabled
+    ) {
       notificationBadge = (
         <span>
           {service.unreadDirectMessageCount > 0 && (
@@ -210,17 +282,13 @@ const styles = {
               {service.unreadDirectMessageCount}
             </span>
           )}
-          {service.unreadIndirectMessageCount > 0
-            && service.unreadDirectMessageCount === 0
-            && service.isIndirectMessageBadgeEnabled && (
-            <span className="tab-item__message-count is-indirect">
-              •
-            </span>
+          {service.unreadIndirectMessageCount > 0 &&
+            service.unreadDirectMessageCount === 0 &&
+            service.isIndirectMessageBadgeEnabled && (
+              <span className="tab-item__message-count is-indirect">•</span>
           )}
-          {service.isHibernating && !service.isHibernationEnabled && (
-            <span className="tab-item__message-count hibernating">
-              •
-            </span>
+          {service.isHibernating && (
+            <span className="tab-item__message-count hibernating">•</span>
           )}
         </span>
       );
@@ -229,7 +297,8 @@ const styles = {
     return (
       <li
         className={classnames({
-          [classes.stale]: IS_SERVICE_DEBUGGING_ENABLED && service.lostRecipeConnection,
+          [classes.stale]:
+            IS_SERVICE_DEBUGGING_ENABLED && service.lostRecipeConnection,
           'tab-item': true,
           'is-active': service.isActive,
           'has-custom-icon': service.hasCustomIcon,
@@ -237,13 +306,11 @@ const styles = {
         })}
         onClick={clickHandler}
         onContextMenu={() => menu.popup(getCurrentWindow())}
-        data-tip={`${service.name} ${shortcutIndex <= 9 ? `(${ctrlKey}+${shortcutIndex})` : ''}`}
+        data-tip={`${service.name} ${
+          shortcutIndex <= 9 ? `(${shortcutKey(false)}+${shortcutIndex})` : ''
+        }`}
       >
-        <img
-          src={service.icon}
-          className="tab-item__icon"
-          alt=""
-        />
+        <img src={service.icon} className="tab-item__icon" alt="" />
         {notificationBadge}
         {IS_SERVICE_DEBUGGING_ENABLED && (
           <>
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js
index 5e8260ad0..ab1e46c9f 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.js
@@ -15,8 +15,11 @@ export default @observer class TabBar extends Component {
     reload: PropTypes.func.isRequired,
     toggleNotifications: PropTypes.func.isRequired,
     toggleAudio: PropTypes.func.isRequired,
+    toggleDarkMode: PropTypes.func.isRequired,
     deleteService: PropTypes.func.isRequired,
     updateService: PropTypes.func.isRequired,
+    hibernateService: PropTypes.func.isRequired,
+    wakeUpService: PropTypes.func.isRequired,
     showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
     showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
   };
@@ -31,7 +34,7 @@ export default @observer class TabBar extends Component {
     reorder({ oldIndex, newIndex });
   };
 
-  shouldPreventSorting = event => event.target.tagName !== 'LI';
+  shouldPreventSorting = (event) => event.target.tagName !== 'LI';
 
   toggleService = ({ serviceId, isEnabled }) => {
     const { updateService } = this.props;
@@ -55,6 +58,18 @@ export default @observer class TabBar extends Component {
     this.toggleService({ serviceId, isEnabled: true });
   }
 
+  hibernateService({ serviceId }) {
+    if (serviceId) {
+      this.props.hibernateService({ serviceId });
+    }
+  }
+
+  wakeUpService({ serviceId }) {
+    if (serviceId) {
+      this.props.wakeUpService({ serviceId });
+    }
+  }
+
   render() {
     const {
       services,
@@ -64,6 +79,7 @@ export default @observer class TabBar extends Component {
       reload,
       toggleNotifications,
       toggleAudio,
+      toggleDarkMode,
       deleteService,
       showMessageBadgeWhenMutedSetting,
       showMessageBadgesEvenWhenMuted,
@@ -80,9 +96,12 @@ export default @observer class TabBar extends Component {
           reload={reload}
           toggleNotifications={toggleNotifications}
           toggleAudio={toggleAudio}
+          toggleDarkMode={toggleDarkMode}
           deleteService={deleteService}
-          disableService={args => this.disableService(args)}
-          enableService={args => this.enableService(args)}
+          disableService={(args) => this.disableService(args)}
+          enableService={(args) => this.enableService(args)}
+          hibernateService={(args) => this.hibernateService(args)}
+          wakeUpService={(args) => this.wakeUpService(args)}
           openSettings={openSettings}
           distance={20}
           axis="y"
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 68d88e218..ef7748343 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -3,14 +3,11 @@ import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 import ReactTooltip from 'react-tooltip';
-import { ProBadge, H1, H2 } from '@meetfranz/ui';
-import moment from 'moment';
+import { H1, H2 } from '@meetfranz/ui';
 
 import Loader from '../../ui/Loader';
 import Button from '../../ui/Button';
 import Infobox from '../../ui/Infobox';
-import SubscriptionForm from '../../../containers/subscription/SubscriptionFormScreen';
-import { i18nPlanName } from '../../../helpers/plan-helpers';
 import { LOCAL_SERVER, LIVE_FRANZ_API } from '../../../config';
 
 const messages = defineMessages({
@@ -18,30 +15,10 @@ const messages = defineMessages({
     id: 'settings.account.headline',
     defaultMessage: '!!!Account',
   },
-  headlineSubscription: {
-    id: 'settings.account.headlineSubscription',
-    defaultMessage: '!!!Your Subscription',
-  },
   headlineDangerZone: {
     id: 'settings.account.headlineDangerZone',
     defaultMessage: '!!Danger Zone',
   },
-  manageSubscriptionButtonLabel: {
-    id: 'settings.account.manageSubscription.label',
-    defaultMessage: '!!!Manage your subscription',
-  },
-  upgradeAccountToPro: {
-    id: 'settings.account.upgradeToPro.label',
-    defaultMessage: '!!!Upgrade to Franz Professional',
-  },
-  accountTypeBasic: {
-    id: 'settings.account.accountType.basic',
-    defaultMessage: '!!!Basic Account',
-  },
-  accountTypePremium: {
-    id: 'settings.account.accountType.premium',
-    defaultMessage: '!!!Premium Supporter Account',
-  },
   accountEditButton: {
     id: 'settings.account.account.editButton',
     defaultMessage: '!!!Edit Account',
@@ -50,10 +27,6 @@ const messages = defineMessages({
     id: 'settings.account.headlineInvoices',
     defaultMessage: '!!Invoices',
   },
-  invoiceDownload: {
-    id: 'settings.account.invoiceDownload',
-    defaultMessage: '!!!Download',
-  },
   userInfoRequestFailed: {
     id: 'settings.account.userInfoRequestFailed',
     defaultMessage: '!!!Could not load user information',
@@ -76,23 +49,10 @@ const messages = defineMessages({
     defaultMessage:
       '!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!',
   },
-  trial: {
-    id: 'settings.account.trial',
-    defaultMessage: '!!!Free Trial',
-  },
   yourLicense: {
     id: 'settings.account.yourLicense',
     defaultMessage: '!!!Your Franz License:',
   },
-  trialEndsIn: {
-    id: 'settings.account.trialEndsIn',
-    defaultMessage: '!!!Your free trial ends in {duration}.',
-  },
-  trialUpdateBillingInformation: {
-    id: 'settings.account.trialUpdateBillingInfo',
-    defaultMessage:
-      '!!!Please update your billing info to continue using {license} after your trial period.',
-  },
   accountUnavailable: {
     id: 'settings.account.accountUnavailable',
     defaultMessage: 'Account is unavailable',
@@ -107,8 +67,6 @@ const messages = defineMessages({
 class AccountDashboard extends Component {
   static propTypes = {
     user: MobxPropTypes.observableObject.isRequired,
-    isPremiumOverrideUser: PropTypes.bool.isRequired,
-    isProUser: PropTypes.bool.isRequired,
     isLoading: PropTypes.bool.isRequired,
     userInfoRequestFailed: PropTypes.bool.isRequired,
     retryUserInfoRequest: PropTypes.func.isRequired,
@@ -116,10 +74,7 @@ class AccountDashboard extends Component {
     isLoadingDeleteAccount: PropTypes.bool.isRequired,
     isDeleteAccountSuccessful: PropTypes.bool.isRequired,
     openEditAccount: PropTypes.func.isRequired,
-    openBilling: PropTypes.func.isRequired,
-    upgradeToPro: PropTypes.func.isRequired,
     openInvoices: PropTypes.func.isRequired,
-    onCloseSubscriptionWindow: PropTypes.func.isRequired,
     server: PropTypes.string.isRequired,
   };
 
@@ -130,8 +85,6 @@ class AccountDashboard extends Component {
   render() {
     const {
       user,
-      isPremiumOverrideUser,
-      isProUser,
       isLoading,
       userInfoRequestFailed,
       retryUserInfoRequest,
@@ -139,20 +92,11 @@ class AccountDashboard extends Component {
       isLoadingDeleteAccount,
       isDeleteAccountSuccessful,
       openEditAccount,
-      openBilling,
-      upgradeToPro,
       openInvoices,
-      onCloseSubscriptionWindow,
       server,
     } = this.props;
     const { intl } = this.context;
 
-    let planName = '';
-
-    if (user.team && user.team.plan) {
-      planName = i18nPlanName(user.team.plan, intl);
-    }
-
     const isUsingWithoutAccount = server === LOCAL_SERVER;
     const isUsingFranzServer = server === LIVE_FRANZ_API;
 
@@ -210,98 +154,40 @@ class AccountDashboard extends Component {
                           <div className="account__info">
                             <H1>
                               <span className="username">{`${user.firstname} ${user.lastname}`}</span>
-                              {user.isPremium && (
-                                <>
-                                  {' '}
-                                  <ProBadge />
-                                </>
-                              )}
                             </H1>
                             <p>
                               {user.organization && `${user.organization}, `}
                               {user.email}
                             </p>
-                            {user.isPremium && (
-                              <div className="manage-user-links">
-                                <Button
-                                  label={intl.formatMessage(
-                                    messages.accountEditButton,
-                                  )}
-                                  className="franz-form__button--inverted"
-                                  onClick={openEditAccount}
-                                />
-                              </div>
-                            )}
+                            <div className="manage-user-links">
+                              <Button
+                                label={intl.formatMessage(
+                                  messages.accountEditButton,
+                                )}
+                                className="franz-form__button--inverted"
+                                onClick={openEditAccount}
+                              />
+                            </div>
                           </div>
-                          {!user.isPremium && (
-                            <Button
-                              label={intl.formatMessage(
-                                messages.accountEditButton,
-                              )}
-                              className="franz-form__button--inverted"
-                              onClick={openEditAccount}
-                            />
-                          )}
+                          <Button
+                            label={intl.formatMessage(
+                              messages.accountEditButton,
+                            )}
+                            className="franz-form__button--inverted"
+                            onClick={openEditAccount}
+                          />
                         </div>
                       </div>
-                      {user.isPremium && user.isSubscriptionOwner && isUsingFranzServer && (
+                      {user.isSubscriptionOwner && isUsingFranzServer && (
                         <div className="account">
                           <div className="account__box">
                             <H2>{intl.formatMessage(messages.yourLicense)}</H2>
                             <p>
                               Franz
-                              {' '}
-                              {isPremiumOverrideUser ? 'Premium' : planName}
-                              {user.team.isTrial && (
-                                <>
-                                  {' – '}
-                                  {intl.formatMessage(messages.trial)}
-                                </>
-                              )}
                             </p>
-                            {user.team.isTrial && (
-                              <>
-                                <br />
-                                <p>
-                                  {intl.formatMessage(messages.trialEndsIn, {
-                                    duration: moment
-                                      .duration(
-                                        moment().diff(user.team.trialEnd),
-                                      )
-                                      .humanize(),
-                                  })}
-                                </p>
-                                <p>
-                                  {intl.formatMessage(
-                                    messages.trialUpdateBillingInformation,
-                                    {
-                                      license: planName,
-                                    },
-                                  )}
-                                </p>
-                              </>
-                            )}
-                            {!isProUser && (
-                              <div className="manage-user-links">
-                                <Button
-                                  label={intl.formatMessage(
-                                    messages.upgradeAccountToPro,
-                                  )}
-                                  className="franz-form__button--primary"
-                                  onClick={upgradeToPro}
-                                />
-                              </div>
-                            )}
                             <div className="manage-user-links">
                               <Button
                                 label={intl.formatMessage(
-                                  messages.manageSubscriptionButtonLabel,
-                                )}
-                                className="franz-form__button--inverted"
-                                onClick={openBilling}
-                              />
-                              <Button
-                                label={intl.formatMessage(
                                   messages.invoicesButton,
                                 )}
                                 className="franz-form__button--inverted"
@@ -311,15 +197,6 @@ class AccountDashboard extends Component {
                           </div>
                         </div>
                       )}
-                      {!user.isPremium && (
-                        <div className="account franz-form">
-                          <div className="account__box">
-                            <SubscriptionForm
-                              onCloseWindow={onCloseSubscriptionWindow}
-                            />
-                          </div>
-                        </div>
-                      )}
                     </>
                   )}
 
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index cebab2f12..02cae6b69 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { defineMessages, intlShape } from 'react-intl';
 import { inject, observer } from 'mobx-react';
-import { ProBadge } from '@meetfranz/ui';
 import { RouterStore } from 'mobx-react-router';
 
 import { LOCAL_SERVER, LIVE_FERDI_API, LIVE_FRANZ_API } from '../../../config';
@@ -11,7 +10,6 @@ import { workspaceStore } from '../../../features/workspaces';
 import UIStore from '../../../stores/UIStore';
 import SettingsStore from '../../../stores/SettingsStore';
 import UserStore from '../../../stores/UserStore';
-import { serviceLimitStore } from '../../../features/serviceLimit';
 
 const messages = defineMessages({
   availableServices: {
@@ -98,8 +96,6 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
 
   render() {
     const { serviceCount, workspaceCount, stores } = this.props;
-    const { isDarkThemeActive } = stores.ui;
-    const { router, user } = stores;
     const { intl } = this.context;
     const isLoggedIn = Boolean(localStorage.getItem('authToken'));
     const isUsingWithoutAccount = stores.settings.app.server === LOCAL_SERVER;
@@ -124,9 +120,6 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
           {' '}
           <span className="badge">
             {serviceCount}
-            {serviceLimitStore.serviceLimit !== 0 && (
-              `/${serviceLimitStore.serviceLimit}`
-            )}
           </span>
         </Link>
         {workspaceStore.isFeatureEnabled ? (
@@ -138,11 +131,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
           >
             {intl.formatMessage(messages.yourWorkspaces)}
             {' '}
-            {workspaceStore.isPremiumUpgradeRequired ? (
-              <ProBadge inverted={!isDarkThemeActive && workspaceStore.isSettingsRouteActive} />
-            ) : (
-              <span className="badge">{workspaceCount}</span>
-            )}
+            <span className="badge">{workspaceCount}</span>
           </Link>
         ) : null}
         {!isUsingWithoutAccount && (
@@ -163,9 +152,6 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
             disabled={!isLoggedIn}
           >
             {intl.formatMessage(messages.team)}
-            {!user.data.isPremium && (
-              <ProBadge inverted={!isDarkThemeActive && router.location.pathname === '/settings/team'} />
-            )}
           </Link>
         )}
         <Link
diff --git a/src/components/settings/recipes/RecipeItem.js b/src/components/settings/recipes/RecipeItem.js
index 12e3775f6..55f415bd5 100644
--- a/src/components/settings/recipes/RecipeItem.js
+++ b/src/components/settings/recipes/RecipeItem.js
@@ -28,6 +28,11 @@ export default @observer class RecipeItem extends Component {
           alt=""
         />
         <span className="recipe-teaser__label">{recipe.name}</span>
+        {recipe.aliases && recipe.aliases.length > 0 && (
+          <span className="recipe-teaser__alias_label">
+            {`Aliases: ${recipe.aliases.join(', ')}`}
+          </span>
+        )}
       </button>
     );
   }
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js
index b4e2fc05c..44ff2d0d7 100644
--- a/src/components/settings/recipes/RecipesDashboard.js
+++ b/src/components/settings/recipes/RecipesDashboard.js
@@ -6,15 +6,13 @@ import { Link } from 'react-router';
 
 import { Button, Input } from '@meetfranz/forms';
 import injectSheet from 'react-jss';
-import { H3, H2, ProBadge } from '@meetfranz/ui';
+import { H3, H2 } from '@meetfranz/ui';
 import SearchInput from '../../ui/SearchInput';
 import Infobox from '../../ui/Infobox';
 import RecipeItem from './RecipeItem';
 import Loader from '../../ui/Loader';
 import Appear from '../../ui/effects/Appear';
 import { FRANZ_SERVICE_REQUEST } from '../../../config';
-import LimitReachedInfobox from '../../../features/serviceLimit/components/LimitReachedInfobox';
-import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
 import RecipePreview from '../../../models/RecipePreview';
 
 const messages = defineMessages({
@@ -26,10 +24,6 @@ const messages = defineMessages({
     id: 'settings.searchService',
     defaultMessage: '!!!Search service',
   },
-  mostPopularRecipes: {
-    id: 'settings.recipes.mostPopular',
-    defaultMessage: '!!!Most popular',
-  },
   allRecipes: {
     id: 'settings.recipes.all',
     defaultMessage: '!!!All services',
@@ -109,7 +103,6 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
     recipes: MobxPropTypes.arrayOrObservableArray.isRequired,
     customWebsiteRecipe: PropTypes.instanceOf(RecipePreview).isRequired,
     isLoading: PropTypes.bool.isRequired,
-    hasLoadedRecipes: PropTypes.bool.isRequired,
     showAddServiceInterface: PropTypes.func.isRequired,
     searchRecipes: PropTypes.func.isRequired,
     resetSearch: PropTypes.func.isRequired,
@@ -120,7 +113,6 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
     openRecipeDirectory: PropTypes.func.isRequired,
     openDevDocs: PropTypes.func.isRequired,
     classes: PropTypes.object.isRequired,
-    isCommunityRecipesIncludedInCurrentPlan: PropTypes.bool.isRequired,
   };
 
   static defaultProps = {
@@ -137,7 +129,6 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
       recipes,
       customWebsiteRecipe,
       isLoading,
-      hasLoadedRecipes,
       showAddServiceInterface,
       searchRecipes,
       resetSearch,
@@ -148,11 +139,9 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
       openRecipeDirectory,
       openDevDocs,
       classes,
-      isCommunityRecipesIncludedInCurrentPlan,
     } = this.props;
     const { intl } = this.context;
 
-
     const communityRecipes = recipes.filter(r => !r.isDevRecipe);
     const devRecipes = recipes.filter(r => r.isDevRecipe);
 
@@ -163,7 +152,6 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
         <div className="settings__header">
           <h1>{intl.formatMessage(messages.headline)}</h1>
         </div>
-        <LimitReachedInfobox />
         <div className="settings__body recipes">
           {serviceStatus.length > 0 && serviceStatus.includes('created') && (
             <Appear>
@@ -190,14 +178,6 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
               activeClassName={`${!searchNeedle ? 'badge--primary' : ''}`}
               onClick={() => resetSearch()}
             >
-              {intl.formatMessage(messages.mostPopularRecipes)}
-            </Link>
-            <Link
-              to="/settings/recipes/all"
-              className="badge"
-              activeClassName={`${!searchNeedle ? 'badge--primary' : ''}`}
-              onClick={() => resetSearch()}
-            >
               {intl.formatMessage(messages.allRecipes)}
             </Link>
             <Link
@@ -208,7 +188,7 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
             >
               {intl.formatMessage(messages.customRecipes)}
             </Link>
-            <a href={FRANZ_SERVICE_REQUEST} target="_blank" className="link recipes__service-request">
+            <a href={FRANZ_SERVICE_REQUEST} target="_blank" className="link recipes__service-request" rel="noreferrer">
               {intl.formatMessage(messages.missingService)}
               {' '}
               <i className="mdi mdi-open-in-new" />
@@ -223,9 +203,6 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
                 <>
                   <H2>
                     {intl.formatMessage(messages.headlineCustomRecipes)}
-                    {!isCommunityRecipesIncludedInCurrentPlan && (
-                      <ProBadge className={classes.proBadge} />
-                    )}
                   </H2>
                   <div className={classes.devRecipeIntroContainer}>
                     <p>
@@ -251,37 +228,33 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
                   </div>
                 </>
               )}
-              <PremiumFeatureContainer
-                condition={(recipeFilter === 'dev' && communityRecipes.length > 0) && !isCommunityRecipesIncludedInCurrentPlan}
-              >
-                {recipeFilter === 'dev' && communityRecipes.length > 0 && (
-                  <H3>{intl.formatMessage(messages.headlineCommunityRecipes)}</H3>
-                )}
-                <div className="recipes__list">
-                  {hasLoadedRecipes && recipes.length === 0 && recipeFilter !== 'dev' && (
-                    <div className="align-middle settings__empty-state">
-                      <span className="emoji">
-                        <img src="./assets/images/emoji/dontknow.png" alt="" />
-                      </span>
+              {recipeFilter === 'dev' && communityRecipes.length > 0 && (
+                <H3>{intl.formatMessage(messages.headlineCommunityRecipes)}</H3>
+              )}
+              <div className="recipes__list">
+                {recipes.length === 0 && recipeFilter !== 'dev' && (
+                  <div className="align-middle settings__empty-state">
+                    <span className="emoji">
+                      <img src="./assets/images/emoji/dontknow.png" alt="" />
+                    </span>
 
-                      <p className="settings__empty-state-text">{intl.formatMessage(messages.nothingFound)}</p>
+                    <p className="settings__empty-state-text">{intl.formatMessage(messages.nothingFound)}</p>
 
-                      <RecipeItem
-                        key={customWebsiteRecipe.id}
-                        recipe={customWebsiteRecipe}
-                        onClick={() => isLoggedIn && showAddServiceInterface({ recipeId: customWebsiteRecipe.id })}
-                      />
-                    </div>
-                  )}
-                  {communityRecipes.map(recipe => (
                     <RecipeItem
-                      key={recipe.id}
-                      recipe={recipe}
-                      onClick={() => isLoggedIn && showAddServiceInterface({ recipeId: recipe.id })}
+                      key={customWebsiteRecipe.id}
+                      recipe={customWebsiteRecipe}
+                      onClick={() => isLoggedIn && showAddServiceInterface({ recipeId: customWebsiteRecipe.id })}
                     />
-                  ))}
-                </div>
-              </PremiumFeatureContainer>
+                  </div>
+                )}
+                {communityRecipes.map(recipe => (
+                  <RecipeItem
+                    key={recipe.id}
+                    recipe={recipe}
+                    onClick={() => isLoggedIn && showAddServiceInterface({ recipeId: recipe.id })}
+                  />
+                ))}
+              </div>
               {recipeFilter === 'dev' && devRecipes.length > 0 && (
                 <div className={classes.devRecipeList}>
                   <H3>{intl.formatMessage(messages.headlineDevRecipes)}</H3>
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 513c75eed..c41cdd56a 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { Link } from 'react-router';
@@ -6,7 +6,6 @@ import { defineMessages, intlShape } from 'react-intl';
 import normalizeUrl from 'normalize-url';
 
 import Form from '../../../lib/Form';
-import User from '../../../models/User';
 import Recipe from '../../../models/Recipe';
 import Service from '../../../models/Service';
 import Tabs, { TabItem } from '../../ui/Tabs';
@@ -17,9 +16,6 @@ import Button from '../../ui/Button';
 import ImageUpload from '../../ui/ImageUpload';
 import Select from '../../ui/Select';
 
-import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
-import LimitReachedInfobox from '../../../features/serviceLimit/components/LimitReachedInfobox';
-import { serviceLimitStore } from '../../../features/serviceLimit';
 import { isMac } from '../../../environment';
 import globalMessages from '../../../i18n/globalMessages';
 
@@ -80,14 +76,6 @@ const messages = defineMessages({
     id: 'settings.service.form.customUrlValidationError',
     defaultMessage: '!!!Could not validate custom {name} server.',
   },
-  customUrlPremiumInfo: {
-    id: 'settings.service.form.customUrlPremiumInfo',
-    defaultMessage: '!!!To add self hosted services, you need a Ferdi Premium Supporter Account.',
-  },
-  customUrlUpgradeAccount: {
-    id: 'settings.service.form.customUrlUpgradeAccount',
-    defaultMessage: '!!!Upgrade your account',
-  },
   indirectMessageInfo: {
     id: 'settings.service.form.indirectMessageInfo',
     defaultMessage: '!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...',
@@ -149,7 +137,6 @@ export default @observer class EditServiceForm extends Component {
 
       return null;
     },
-    user: PropTypes.instanceOf(User).isRequired,
     action: PropTypes.string.isRequired,
     form: PropTypes.instanceOf(Form).isRequired,
     onSubmit: PropTypes.func.isRequired,
@@ -158,9 +145,6 @@ export default @observer class EditServiceForm extends Component {
     isSaving: PropTypes.bool.isRequired,
     isDeleting: PropTypes.bool.isRequired,
     isProxyFeatureEnabled: PropTypes.bool.isRequired,
-    isServiceProxyIncludedInCurrentPlan: PropTypes.bool.isRequired,
-    isSpellcheckerIncludedInCurrentPlan: PropTypes.bool.isRequired,
-    isHibernationFeatureActive: PropTypes.bool.isRequired,
   };
 
   static defaultProps = {
@@ -217,16 +201,12 @@ export default @observer class EditServiceForm extends Component {
       recipe,
       service,
       action,
-      user,
       form,
       isSaving,
       isDeleting,
       onDelete,
       openRecipeFile,
       isProxyFeatureEnabled,
-      isServiceProxyIncludedInCurrentPlan,
-      isSpellcheckerIncludedInCurrentPlan,
-      isHibernationFeatureActive,
     } = this.props;
     const { intl } = this.context;
 
@@ -285,9 +265,8 @@ export default @observer class EditServiceForm extends Component {
             )}
           </span>
         </div>
-        <LimitReachedInfobox />
         <div className="settings__body">
-          <form onSubmit={e => this.submit(e)} id="form">
+          <form onSubmit={(e) => this.submit(e)} id="form">
             <div className="service-name">
               <Input field={form.$('name')} focus />
             </div>
@@ -311,24 +290,11 @@ export default @observer class EditServiceForm extends Component {
                 )}
                 {recipe.hasCustomUrl && (
                   <TabItem title={intl.formatMessage(messages.tabOnPremise)}>
-                    {user.isPremium || recipe.author.find(a => a.email === user.email) ? (
-                      <>
-                        <Input field={form.$('customUrl')} />
-                        {form.error === 'url-validation-error' && (
-                          <p className="franz-form__error">
-                            {intl.formatMessage(messages.customUrlValidationError, { name: recipe.name })}
-                          </p>
-                        )}
-                      </>
-                    ) : (
-                      <div className="center premium-info">
-                        <p>{intl.formatMessage(messages.customUrlPremiumInfo)}</p>
-                        <p>
-                          <Link to="/settings/user" className="button">
-                            {intl.formatMessage(messages.customUrlUpgradeAccount)}
-                          </Link>
-                        </p>
-                      </div>
+                    <Input field={form.$('customUrl')} />
+                    {form.error === 'url-validation-error' && (
+                      <p className="franz-form__error">
+                        {intl.formatMessage(messages.customUrlValidationError, { name: recipe.name })}
+                      </p>
                     )}
                   </TabItem>
                 )}
@@ -373,14 +339,10 @@ export default @observer class EditServiceForm extends Component {
                 <div className="settings__settings-group">
                   <h3>{intl.formatMessage(messages.headlineGeneral)}</h3>
                   <Toggle field={form.$('isEnabled')} />
-                  {isHibernationFeatureActive && (
-                    <>
-                      <Toggle field={form.$('isHibernationEnabled')} />
-                      <p className="settings__help indented__help">
-                        {intl.formatMessage(messages.isHibernationEnabledInfo)}
-                      </p>
-                    </>
-                  )}
+                  <Toggle field={form.$('isHibernationEnabled')} />
+                  <p className="settings__help indented__help">
+                    {intl.formatMessage(messages.isHibernationEnabledInfo)}
+                  </p>
                   <Toggle field={form.$('isDarkModeEnabled')} />
                   {form.$('isDarkModeEnabled').value
                     && (
@@ -403,56 +365,46 @@ export default @observer class EditServiceForm extends Component {
             </div>
 
             {!isMac && (
-              <PremiumFeatureContainer
-                condition={!isSpellcheckerIncludedInCurrentPlan}
-                gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }}
-              >
-                <div className="settings__settings-group">
-                  <Select field={form.$('spellcheckerLanguage')} />
-                </div>
-              </PremiumFeatureContainer>
+              <div className="settings__settings-group">
+                <Select field={form.$('spellcheckerLanguage')} />
+              </div>
             )}
 
             {isProxyFeatureEnabled && (
-              <PremiumFeatureContainer
-                condition={!isServiceProxyIncludedInCurrentPlan}
-                gaEventInfo={{ category: 'User', event: 'upgrade', label: 'proxy' }}
-              >
-                <div className="settings__settings-group">
-                  <h3>
-                    {intl.formatMessage(messages.headlineProxy)}
-                    <span className="badge badge--success">beta</span>
-                  </h3>
-                  <Toggle field={form.$('proxy.isEnabled')} />
-                  {form.$('proxy.isEnabled').value && (
-                    <>
-                      <div className="grid">
-                        <div className="grid__row">
-                          <Input field={form.$('proxy.host')} className="proxyHost" />
-                          <Input field={form.$('proxy.port')} />
-                        </div>
+              <div className="settings__settings-group">
+                <h3>
+                  {intl.formatMessage(messages.headlineProxy)}
+                  <span className="badge badge--success">beta</span>
+                </h3>
+                <Toggle field={form.$('proxy.isEnabled')} />
+                {form.$('proxy.isEnabled').value && (
+                  <>
+                    <div className="grid">
+                      <div className="grid__row">
+                        <Input field={form.$('proxy.host')} className="proxyHost" />
+                        <Input field={form.$('proxy.port')} />
                       </div>
-                      <div className="grid">
-                        <div className="grid__row">
-                          <Input field={form.$('proxy.user')} />
-                          <Input
-                            field={form.$('proxy.password')}
-                            showPasswordToggle
-                          />
-                        </div>
+                    </div>
+                    <div className="grid">
+                      <div className="grid__row">
+                        <Input field={form.$('proxy.user')} />
+                        <Input
+                          field={form.$('proxy.password')}
+                          showPasswordToggle
+                        />
                       </div>
-                      <p>
-                        <span className="mdi mdi-information" />
-                        {intl.formatMessage(messages.proxyRestartInfo)}
-                      </p>
-                      <p>
-                        <span className="mdi mdi-information" />
-                        {intl.formatMessage(messages.proxyInfo)}
-                      </p>
-                    </>
-                  )}
-                </div>
-              </PremiumFeatureContainer>
+                    </div>
+                    <p>
+                      <span className="mdi mdi-information" />
+                      {intl.formatMessage(messages.proxyRestartInfo)}
+                    </p>
+                    <p>
+                      <span className="mdi mdi-information" />
+                      {intl.formatMessage(messages.proxyInfo)}
+                    </p>
+                  </>
+                )}
+              </div>
             )}
 
             <div className="user-agent">
@@ -512,7 +464,7 @@ export default @observer class EditServiceForm extends Component {
               type="submit"
               label={intl.formatMessage(messages.saveService)}
               htmlForm="form"
-              disabled={action !== 'edit' && ((form.isPristine && requiresUserInput) || serviceLimitStore.userHasReachedServiceLimit)}
+              disabled={action !== 'edit' && (form.isPristine && requiresUserInput)}
             />
           )}
         </div>
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js
index a0f05fd20..11d3eaa79 100644
--- a/src/components/settings/services/ServicesDashboard.js
+++ b/src/components/settings/services/ServicesDashboard.js
@@ -10,7 +10,6 @@ import Loader from '../../ui/Loader';
 import FAB from '../../ui/FAB';
 import ServiceItem from './ServiceItem';
 import Appear from '../../ui/effects/Appear';
-import LimitReachedInfobox from '../../../features/serviceLimit/components/LimitReachedInfobox';
 
 const messages = defineMessages({
   headline: {
@@ -93,12 +92,11 @@ export default @observer class ServicesDashboard extends Component {
         <div className="settings__header">
           <h1>{intl.formatMessage(messages.headline)}</h1>
         </div>
-        <LimitReachedInfobox />
         <div className="settings__body">
           {(services.length !== 0 || searchNeedle) && !isLoading && (
             <SearchInput
               placeholder={intl.formatMessage(messages.searchService)}
-              onChange={needle => filterServices({ needle })}
+              onChange={(needle) => filterServices({ needle })}
               onReset={() => resetFilter()}
               autoFocus
             />
@@ -165,7 +163,7 @@ export default @observer class ServicesDashboard extends Component {
           ) : (
             <table className="service-table">
               <tbody>
-                {services.map(service => (
+                {services.map((service) => (
                   <ServiceItem
                     key={service.id}
                     service={service}
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 52b26d65b..87a4ada27 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -1,5 +1,5 @@
 import { app, systemPreferences } from '@electron/remote';
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import prettyBytes from 'pretty-bytes';
@@ -10,14 +10,13 @@ import Button from '../../ui/Button';
 import Toggle from '../../ui/Toggle';
 import ToggleRaw from '../../ui/ToggleRaw';
 import Select from '../../ui/Select';
-import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
 import Input from '../../ui/Input';
 
 import {
   FRANZ_TRANSLATION,
   GITHUB_FRANZ_URL,
 } from '../../../config';
-import { DEFAULT_APP_SETTINGS, isMac, isWindows } from '../../../environment';
+import { DEFAULT_APP_SETTINGS, isMac, isWindows, lockFerdiShortcutKey } from '../../../environment';
 import globalMessages from '../../../i18n/globalMessages';
 
 const messages = defineMessages({
@@ -31,7 +30,7 @@ const messages = defineMessages({
   },
   sentryInfo: {
     id: 'settings.app.sentryInfo',
-    defaultMessage: '!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.',
+    defaultMessage: '!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!',
   },
   hibernateInfo: {
     id: 'settings.app.hibernateInfo',
@@ -55,7 +54,7 @@ const messages = defineMessages({
   },
   lockInfo: {
     id: 'settings.app.lockInfo',
-    defaultMessage: '!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.',
+    defaultMessage: '!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.',
   },
   scheduledDNDTimeInfo: {
     id: 'settings.app.scheduledDNDTimeInfo',
@@ -168,12 +167,10 @@ export default @observer class EditSettingsForm extends Component {
     isClearingAllCache: PropTypes.bool.isRequired,
     onClearAllCache: PropTypes.func.isRequired,
     getCacheSize: PropTypes.func.isRequired,
-    isSpellcheckerIncludedInCurrentPlan: PropTypes.bool.isRequired,
     isTodosEnabled: PropTypes.bool.isRequired,
     isTodosActivated: PropTypes.bool.isRequired,
     isWorkspaceEnabled: PropTypes.bool.isRequired,
     automaticUpdates: PropTypes.bool.isRequired,
-    hibernationEnabled: PropTypes.bool.isRequired,
     isDarkmodeEnabled: PropTypes.bool.isRequired,
     isAdaptableDarkModeEnabled: PropTypes.bool.isRequired,
     isNightlyEnabled: PropTypes.bool.isRequired,
@@ -224,11 +221,9 @@ export default @observer class EditSettingsForm extends Component {
       isClearingAllCache,
       onClearAllCache,
       getCacheSize,
-      isSpellcheckerIncludedInCurrentPlan,
       isTodosEnabled,
       isWorkspaceEnabled,
       automaticUpdates,
-      hibernationEnabled,
       isDarkmodeEnabled,
       isTodosActivated,
       isNightlyEnabled,
@@ -271,8 +266,8 @@ export default @observer class EditSettingsForm extends Component {
         </div>
         <div className="settings__body">
           <form
-            onSubmit={e => this.submit(e)}
-            onChange={e => this.submit(e)}
+            onSubmit={(e) => this.submit(e)}
+            onChange={(e) => this.submit(e)}
             id="form"
           >
             {/* Titles */}
@@ -339,13 +334,8 @@ export default @observer class EditSettingsForm extends Component {
 
                 <Hr />
 
-                <Toggle field={form.$('hibernate')} />
-                {hibernationEnabled && (
-                  <>
-                    <Select field={form.$('hibernationStrategy')} />
-                    <Toggle field={form.$('hibernateOnStartup')} />
-                  </>
-                )}
+                <Select field={form.$('hibernationStrategy')} />
+                <Toggle field={form.$('hibernateOnStartup')} />
                 <p
                   className="settings__message"
                   style={{
@@ -357,14 +347,17 @@ export default @observer class EditSettingsForm extends Component {
                   </span>
                 </p>
 
+                <Select field={form.$('wakeUpStrategy')} />
+
                 <Hr />
 
                 {isWorkspaceEnabled && (
-                  <Toggle field={form.$('keepAllWorkspacesLoaded')} />
+                  <>
+                    <Toggle field={form.$('keepAllWorkspacesLoaded')} />
+                    <Hr />
+                  </>
                 )}
 
-                <Hr />
-
                 {isTodosEnabled && !hasAddedTodosAsService && (
                   <>
                     <Toggle field={form.$('enableTodos')} />
@@ -375,7 +368,7 @@ export default @observer class EditSettingsForm extends Component {
                           <div>
                             <Input
                               placeholder="Todo Server"
-                              onChange={e => this.submit(e)}
+                              onChange={(e) => this.submit(e)}
                               field={form.$('customTodoServer')}
                             />
                             <p
@@ -409,7 +402,7 @@ export default @observer class EditSettingsForm extends Component {
                       >
                         <Input
                           placeholder="17:00"
-                          onChange={e => this.submit(e)}
+                          onChange={(e) => this.submit(e)}
                           field={form.$('scheduledDNDStart')}
                           type="time"
                         />
@@ -421,7 +414,7 @@ export default @observer class EditSettingsForm extends Component {
                       >
                         <Input
                           placeholder="09:00"
-                          onChange={e => this.submit(e)}
+                          onChange={(e) => this.submit(e)}
                           field={form.$('scheduledDNDEnd')}
                           type="time"
                         />
@@ -488,7 +481,7 @@ export default @observer class EditSettingsForm extends Component {
 
                 <Input
                   placeholder="Accent Color"
-                  onChange={e => this.submit(e)}
+                  onChange={(e) => this.submit(e)}
                   field={form.$('accentColor')}
                 />
                 <p>
@@ -509,8 +502,12 @@ export default @observer class EditSettingsForm extends Component {
                 <Hr />
 
                 <Select field={form.$('searchEngine')} />
+
+                <Hr />
+
                 <Toggle field={form.$('sentry')} />
-                <p>{intl.formatMessage(messages.sentryInfo)}</p>
+                <p className="settings__help">{intl.formatMessage(messages.sentryInfo)}</p>
+                <p className="settings__help">{intl.formatMessage(messages.appRestartRequired)}</p>
 
                 <Hr />
 
@@ -523,7 +520,7 @@ export default @observer class EditSettingsForm extends Component {
 
                     <Input
                       placeholder={intl.formatMessage(messages.lockedPassword)}
-                      onChange={e => this.submit(e)}
+                      onChange={(e) => this.submit(e)}
                       field={form.$('lockedPassword')}
                       type="password"
                       scorePassword
@@ -535,7 +532,7 @@ export default @observer class EditSettingsForm extends Component {
 
                     <Input
                       placeholder="Lock after inactivity"
-                      onChange={e => this.submit(e)}
+                      onChange={(e) => this.submit(e)}
                       field={form.$('inactivityLock')}
                       autoFocus
                     />
@@ -551,7 +548,7 @@ export default @observer class EditSettingsForm extends Component {
                   }}
                 >
                   <span>
-                    { intl.formatMessage(messages.lockInfo) }
+                    { intl.formatMessage(messages.lockInfo, { lockShortcut: `${lockFerdiShortcutKey(false)}` }) }
                   </span>
                 </p>
               </div>
@@ -564,26 +561,24 @@ export default @observer class EditSettingsForm extends Component {
 
                 <Hr />
 
-                <PremiumFeatureContainer
-                  condition={!isSpellcheckerIncludedInCurrentPlan}
-                  gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }}
-                >
-                  <>
-                    <Toggle
-                      field={form.$('enableSpellchecking')}
-                    />
-                    {!isMac && form.$('enableSpellchecking').value && (
-                      <Select field={form.$('spellcheckerLanguage')} />
-                    )}
-                    {isMac && form.$('enableSpellchecking').value && (
-                      <p>{intl.formatMessage(messages.spellCheckerLanguageInfo)}</p>
-                    )}
-                  </>
-                </PremiumFeatureContainer>
+                <Toggle
+                  field={form.$('enableSpellchecking')}
+                />
+                {!isMac && form.$('enableSpellchecking').value && (
+                  <Select field={form.$('spellcheckerLanguage')} />
+                )}
+                {isMac && form.$('enableSpellchecking').value && (
+                  <p className="settings__help">{intl.formatMessage(messages.spellCheckerLanguageInfo)}</p>
+                )}
+                <p className="settings__help">{intl.formatMessage(messages.appRestartRequired)}</p>
+
+                <Hr />
+
                 <a
                   href={FRANZ_TRANSLATION}
                   target="_blank"
                   className="link"
+                  rel="noreferrer"
                 >
                   {intl.formatMessage(messages.translationHelp)}
                   {' '}
@@ -602,7 +597,7 @@ export default @observer class EditSettingsForm extends Component {
 
                 <Input
                   placeholder="User Agent"
-                  onChange={e => this.submit(e)}
+                  onChange={(e) => this.submit(e)}
                   field={form.$('userAgentPref')}
                 />
                 <p className="settings__help">{intl.formatMessage(globalMessages.userAgentHelp)}</p>
@@ -688,12 +683,12 @@ export default @observer class EditSettingsForm extends Component {
 
                   Ferdi is based on
                   {' '}
-                  <a href={`${GITHUB_FRANZ_URL}/franz`} target="_blank">Franz</a>
+                  <a href={`${GITHUB_FRANZ_URL}/franz`} target="_blank" rel="noreferrer">Franz</a>
 
                   , a project published
                   under the
                   {' '}
-                  <a href={`${GITHUB_FRANZ_URL}/franz/blob/master/LICENSE`} target="_blank">Apache-2.0 License</a>
+                  <a href={`${GITHUB_FRANZ_URL}/franz/blob/master/LICENSE`} target="_blank" rel="noreferrer">Apache-2.0 License</a>
                 </span>
                 <br />
                 <span className="mdi mdi-information" />
diff --git a/src/components/settings/supportFerdi/SupportFerdiDashboard.js b/src/components/settings/supportFerdi/SupportFerdiDashboard.js
index 36c126565..b84e06739 100644
--- a/src/components/settings/supportFerdi/SupportFerdiDashboard.js
+++ b/src/components/settings/supportFerdi/SupportFerdiDashboard.js
@@ -94,10 +94,10 @@ class SupportFerdiDashboard extends Component {
           <h1>{intl.formatMessage(messages.title)}</h1>
           <div>
             <p className="settings__support-badges">
-              <a href="https://github.com/getferdi/ferdi" target="_blank"><img alt="GitHub Stars" src="https://img.shields.io/github/stars/getferdi/ferdi?style=social" /></a>
-              <a href="https://twitter.com/getferdi/" target="_blank"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/getferdi?label=Follow&style=social" /></a>
-              <a href="https://opencollective.com/getferdi#section-contributors" target="_blank"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective" /></a>
-              <a href="https://opencollective.com/getferdi#section-contributors" target="_blank"><img alt="Open Collective sponsors" src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective" /></a>
+              <a href="https://github.com/getferdi/ferdi" target="_blank" rel="noreferrer"><img alt="GitHub Stars" src="https://img.shields.io/github/stars/getferdi/ferdi?style=social" /></a>
+              <a href="https://twitter.com/getferdi/" target="_blank" rel="noreferrer"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/getferdi?label=Follow&style=social" /></a>
+              <a href="https://opencollective.com/getferdi#section-contributors" target="_blank" rel="noreferrer"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective" /></a>
+              <a href="https://opencollective.com/getferdi#section-contributors" target="_blank" rel="noreferrer"><img alt="Open Collective sponsors" src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective" /></a>
             </p>
             <FormattedHTMLMessage {...messages.aboutIntro} />
             <br />
@@ -109,7 +109,7 @@ class SupportFerdiDashboard extends Component {
             </p>
             <p>
               {intl.formatMessage(messages.textListContributors)}
-              <a href="https://github.com/getferdi/ferdi#contributors-" target="_blank" className="link">
+              <a href="https://github.com/getferdi/ferdi#contributors-" target="_blank" className="link" rel="noreferrer">
                 {' '}
                 {intl.formatMessage(messages.textListContributorsHere)}
                 <i className="mdi mdi-open-in-new" />
@@ -122,7 +122,7 @@ class SupportFerdiDashboard extends Component {
             </p>
             <p>
               {intl.formatMessage(messages.textSupportWelcome)}
-              <a href="https://help.getferdi.com/general/support" target="_blank" className="link">
+              <a href="https://help.getferdi.com/general/support" target="_blank" className="link" rel="noreferrer">
                 {' '}
                 {intl.formatMessage(messages.textSupportWelcomeHere)}
                 <i className="mdi mdi-open-in-new" />
@@ -130,7 +130,7 @@ class SupportFerdiDashboard extends Component {
             </p>
             <p>
               {intl.formatMessage(messages.textExpenses)}
-              <a href="https://opencollective.com/getferdi#section-budget" target="_blank" className="link">
+              <a href="https://opencollective.com/getferdi#section-budget" target="_blank" className="link" rel="noreferrer">
                 {' '}
                 {intl.formatMessage(messages.textOpenCollective)}
                 <i className="mdi mdi-open-in-new" />
@@ -138,14 +138,14 @@ class SupportFerdiDashboard extends Component {
             </p>
             <p>
               {intl.formatMessage(messages.textDonation)}
-              <a href="https://opencollective.com/getferdi#section-contribute" target="_blank" className="link">
+              <a href="https://opencollective.com/getferdi#section-contribute" target="_blank" className="link" rel="noreferrer">
                 {' '}
                 {intl.formatMessage(messages.textOpenCollective)}
                 <i className="mdi mdi-open-in-new" />
               </a>
               {' '}
               {intl.formatMessage(messages.textDonationAnd)}
-              <a href="https://github.com/sponsors/getferdi" target="_blank" className="link">
+              <a href="https://github.com/sponsors/getferdi" target="_blank" className="link" rel="noreferrer">
                 {' '}
                 {intl.formatMessage(messages.textGitHubSponsors)}
                 <i className="mdi mdi-open-in-new" />
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js
index 602d6e490..437225058 100644
--- a/src/components/settings/team/TeamDashboard.js
+++ b/src/components/settings/team/TeamDashboard.js
@@ -6,12 +6,9 @@ import ReactTooltip from 'react-tooltip';
 import injectSheet from 'react-jss';
 import classnames from 'classnames';
 
-import { Badge } from '@meetfranz/ui';
 import Loader from '../../ui/Loader';
 import Button from '../../ui/Button';
 import Infobox from '../../ui/Infobox';
-import globalMessages from '../../../i18n/globalMessages';
-import UpgradeButton from '../../ui/UpgradeButton';
 import { LIVE_FRANZ_API } from '../../../config';
 
 const messages = defineMessages({
@@ -35,10 +32,6 @@ const messages = defineMessages({
     id: 'settings.team.manageAction',
     defaultMessage: '!!!Manage your Team on meetfranz.com',
   },
-  upgradeButton: {
-    id: 'settings.team.upgradeAction',
-    defaultMessage: '!!!Upgrade your Account',
-  },
   teamsUnavailable: {
     id: 'settings.team.teamsUnavailable',
     defaultMessage: '!!!Teams are unavailable',
@@ -88,10 +81,6 @@ const styles = {
   headlineWithSpacing: {
     marginBottom: 'inherit',
   },
-  proRequired: {
-    margin: [10, 0, 40],
-    height: 'auto',
-  },
   buttonContainer: {
     display: 'flex',
     height: 'auto',
@@ -105,7 +94,6 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
     retryUserInfoRequest: PropTypes.func.isRequired,
     openTeamManagement: PropTypes.func.isRequired,
     classes: PropTypes.object.isRequired,
-    isProUser: PropTypes.bool.isRequired,
     server: PropTypes.string.isRequired,
   };
 
@@ -119,7 +107,6 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
       userInfoRequestFailed,
       retryUserInfoRequest,
       openTeamManagement,
-      isProUser,
       classes,
       server,
     } = this.props;
@@ -157,37 +144,25 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
                     <>
                       <h1 className={classnames({
                         [classes.headline]: true,
-                        [classes.headlineWithSpacing]: isProUser,
+                        [classes.headlineWithSpacing]: true,
                       })}
                       >
                         {intl.formatMessage(messages.contentHeadline)}
 
                       </h1>
-                      {!isProUser && (
-                        <Badge className={classes.proRequired}>{intl.formatMessage(globalMessages.proRequired)}</Badge>
-                      )}
                       <div className={classes.container}>
                         <div className={classes.content}>
                           <p>{intl.formatMessage(messages.intro)}</p>
                           <p>{intl.formatMessage(messages.copy)}</p>
                         </div>
-                        <img className={classes.image} src="https://cdn.franzinfra.com/announcements/assets/teams.png" alt="Franz for Teams" />
+                        <img className={classes.image} src="https://cdn.franzinfra.com/announcements/assets/teams.png" alt="Ferdi for Teams" />
                       </div>
                       <div className={classes.buttonContainer}>
-                        {!isProUser ? (
-                          <UpgradeButton
-                            className={classes.cta}
-                            gaEventInfo={{ category: 'Todos', event: 'upgrade' }}
-                            requiresPro
-                            short
-                          />
-                        ) : (
-                          <Button
-                            label={intl.formatMessage(messages.manageButton)}
-                            onClick={openTeamManagement}
-                            className={classes.cta}
-                          />
-                        )}
+                        <Button
+                          label={intl.formatMessage(messages.manageButton)}
+                          onClick={openTeamManagement}
+                          className={classes.cta}
+                        />
                       </div>
                     </>
                   </>
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js
index a1a353e57..db78acb69 100644
--- a/src/components/settings/user/EditUserForm.js
+++ b/src/components/settings/user/EditUserForm.js
@@ -84,7 +84,7 @@ export default @observer class EditUserForm extends Component {
           </span>
         </div>
         <div className="settings__body">
-          <form onSubmit={e => this.submit(e)} id="form">
+          <form onSubmit={(e) => this.submit(e)} id="form">
             {status.length > 0 && status.includes('data-updated') && (
               <Infobox
                 type="success"
diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js
deleted file mode 100644
index ec486e5d0..000000000
--- a/src/components/subscription/SubscriptionForm.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
-import injectSheet from 'react-jss';
-
-import { H3, H2 } from '@meetfranz/ui';
-
-import { Button } from '@meetfranz/forms';
-import { FeatureList } from '../ui/FeatureList';
-
-const messages = defineMessages({
-  submitButtonLabel: {
-    id: 'subscription.cta.choosePlan',
-    defaultMessage: '!!!Choose your plan',
-  },
-  teaserHeadline: {
-    id: 'settings.account.headlineUpgradeAccount',
-    defaultMessage: '!!!Upgrade your account and get the full Franz experience',
-  },
-  teaserText: {
-    id: 'subscription.teaser.intro',
-    defaultMessage: '!!!Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!',
-  },
-  includedFeatures: {
-    id: 'subscription.teaser.includedFeatures',
-    defaultMessage: '!!!Paid Franz Plans include:',
-  },
-});
-
-const styles = () => ({
-  activateTrialButton: {
-    margin: [40, 'auto', 50],
-    display: 'flex',
-  },
-});
-
-export default @injectSheet(styles) @observer class SubscriptionForm extends Component {
-  static propTypes = {
-    selectPlan: PropTypes.func.isRequired,
-    isActivatingTrial: PropTypes.bool.isRequired,
-    classes: PropTypes.object.isRequired,
-  };
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  render() {
-    const {
-      isActivatingTrial,
-      selectPlan,
-      classes,
-    } = this.props;
-    const { intl } = this.context;
-
-    return (
-      <>
-        <H2>{intl.formatMessage(messages.teaserHeadline)}</H2>
-        <p>{intl.formatMessage(messages.teaserText)}</p>
-        <Button
-          label={intl.formatMessage(messages.submitButtonLabel)}
-          className={classes.activateTrialButton}
-          busy={isActivatingTrial}
-          onClick={selectPlan}
-        />
-        <div className="subscription__premium-info">
-          <H3>
-            {intl.formatMessage(messages.includedFeatures)}
-          </H3>
-          <div className="subscription">
-            <FeatureList />
-          </div>
-        </div>
-      </>
-    );
-  }
-}
diff --git a/src/components/subscription/SubscriptionPopup.js b/src/components/subscription/SubscriptionPopup.js
deleted file mode 100644
index 0df43fd4b..000000000
--- a/src/components/subscription/SubscriptionPopup.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
-import Webview from 'react-electron-web-view';
-import ms from 'ms';
-
-import Button from '../ui/Button';
-
-const messages = defineMessages({
-  buttonCancel: {
-    id: 'subscriptionPopup.buttonCancel',
-    defaultMessage: '!!!Cancel',
-  },
-  buttonDone: {
-    id: 'subscriptionPopup.buttonDone',
-    defaultMessage: '!!!Done',
-  },
-});
-
-export default @observer class SubscriptionPopup extends Component {
-  static propTypes = {
-    url: PropTypes.string.isRequired,
-    closeWindow: PropTypes.func.isRequired,
-    completeCheck: PropTypes.func.isRequired,
-    isCompleted: PropTypes.bool.isRequired,
-  };
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  state = {
-    isFakeLoading: false,
-  };
-
-  // We delay the window closing a bit in order to give
-  // the Recurly webhook a few seconds to do it's magic
-  delayedCloseWindow() {
-    this.setState({
-      isFakeLoading: true,
-    });
-
-    setTimeout(() => {
-      this.props.closeWindow();
-    }, ms('1s'));
-  }
-
-  render() {
-    const {
-      url, closeWindow, completeCheck, isCompleted,
-    } = this.props;
-    const { intl } = this.context;
-
-    return (
-      <div className="subscription-popup">
-        <div className="subscription-popup__content">
-          <Webview
-            className="subscription-popup__webview"
-            autosize
-            allowpopups
-            src={encodeURI(url)}
-            onDidNavigate={completeCheck}
-            onDidNavigateInPage={completeCheck}
-          />
-        </div>
-        <div className="subscription-popup__toolbar franz-form">
-          <Button
-            label={intl.formatMessage(messages.buttonCancel)}
-            buttonType="secondary"
-            onClick={closeWindow}
-            disabled={isCompleted}
-          />
-          <Button
-            label={intl.formatMessage(messages.buttonDone)}
-            onClick={() => this.delayedCloseWindow()}
-            disabled={!isCompleted}
-            loaded={!this.state.isFakeLoading}
-          />
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/src/components/subscription/TrialForm.js b/src/components/subscription/TrialForm.js
deleted file mode 100644
index d61b779ed..000000000
--- a/src/components/subscription/TrialForm.js
+++ /dev/null
@@ -1,115 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
-import injectSheet from 'react-jss';
-
-import { H3, H2 } from '@meetfranz/ui';
-
-import { Button } from '@meetfranz/forms';
-import { FeatureList } from '../ui/FeatureList';
-import { FeatureItem } from '../ui/FeatureItem';
-
-const messages = defineMessages({
-  submitButtonLabel: {
-    id: 'subscription.cta.activateTrial',
-    defaultMessage: '!!!Yes, start the free Franz Professional trial',
-  },
-  allOptionsButton: {
-    id: 'subscription.cta.allOptions',
-    defaultMessage: '!!!See all options',
-  },
-  teaserHeadline: {
-    id: 'settings.account.headlineTrialUpgrade',
-    defaultMessage: '!!!Get the free 14 day Franz Professional Trial',
-  },
-  includedFeatures: {
-    id: 'subscription.includedProFeatures',
-    defaultMessage: '!!!The Franz Professional Plan includes:',
-  },
-  noStringsAttachedHeadline: {
-    id: 'pricing.trial.terms.headline',
-    defaultMessage: '!!!No strings attached',
-  },
-  noCreditCard: {
-    id: 'pricing.trial.terms.noCreditCard',
-    defaultMessage: '!!!No credit card required',
-  },
-  automaticTrialEnd: {
-    id: 'pricing.trial.terms.automaticTrialEnd',
-    defaultMessage: '!!!Your free trial ends automatically after 14 days',
-  },
-});
-
-const styles = theme => ({
-  activateTrialButton: {
-    margin: [40, 'auto', 10],
-    display: 'flex',
-  },
-  allOptionsButton: {
-    margin: [0, 0, 40],
-    background: 'none',
-    border: 'none',
-    color: theme.colorText,
-  },
-  keyTerms: {
-    marginTop: 20,
-  },
-});
-
-export default @injectSheet(styles) @observer class TrialForm extends Component {
-  static propTypes = {
-    activateTrial: PropTypes.func.isRequired,
-    isActivatingTrial: PropTypes.bool.isRequired,
-    showAllOptions: PropTypes.func.isRequired,
-    classes: PropTypes.object.isRequired,
-  };
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  render() {
-    const {
-      isActivatingTrial,
-      activateTrial,
-      showAllOptions,
-      classes,
-    } = this.props;
-    const { intl } = this.context;
-
-    return (
-      <>
-        <H2>{intl.formatMessage(messages.teaserHeadline)}</H2>
-        <H3 className={classes.keyTerms}>
-          {intl.formatMessage(messages.noStringsAttachedHeadline)}
-        </H3>
-        <ul>
-          <FeatureItem icon="👉" name={intl.formatMessage(messages.noCreditCard)} />
-          <FeatureItem icon="👉" name={intl.formatMessage(messages.automaticTrialEnd)} />
-        </ul>
-
-        <Button
-          label={intl.formatMessage(messages.submitButtonLabel)}
-          className={classes.activateTrialButton}
-          busy={isActivatingTrial}
-          onClick={activateTrial}
-        />
-        <Button
-          label={intl.formatMessage(messages.allOptionsButton)}
-          className={classes.allOptionsButton}
-          onClick={showAllOptions}
-          stretch
-        />
-        <div className="subscription__premium-info">
-          <H3>
-            {intl.formatMessage(messages.includedFeatures)}
-          </H3>
-          <div className="subscription">
-            <FeatureList />
-          </div>
-        </div>
-      </>
-    );
-  }
-}
diff --git a/src/components/ui/ActivateTrialButton/index.js b/src/components/ui/ActivateTrialButton/index.js
deleted file mode 100644
index 8f4d21f64..000000000
--- a/src/components/ui/ActivateTrialButton/index.js
+++ /dev/null
@@ -1,107 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { inject, observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
-import classnames from 'classnames';
-
-import { Button } from '@meetfranz/forms';
-
-import UserStore from '../../../stores/UserStore';
-import UIStore from '../../../stores/UIStore';
-
-const messages = defineMessages({
-  action: {
-    id: 'feature.delayApp.upgrade.action',
-    defaultMessage: '!!!Get a Franz Supporter License',
-  },
-  actionTrial: {
-    id: 'feature.delayApp.trial.action',
-    defaultMessage: '!!!Yes, I want the free 14 day trial of Franz Professional',
-  },
-  shortAction: {
-    id: 'feature.delayApp.upgrade.actionShort',
-    defaultMessage: '!!!Upgrade account',
-  },
-  shortActionTrial: {
-    id: 'feature.delayApp.trial.actionShort',
-    defaultMessage: '!!!Activate the free Franz Professional trial',
-  },
-  noStringsAttachedHeadline: {
-    id: 'pricing.trial.terms.headline',
-    defaultMessage: '!!!No strings attached',
-  },
-  noCreditCard: {
-    id: 'pricing.trial.terms.noCreditCard',
-    defaultMessage: '!!!No credit card required',
-  },
-  automaticTrialEnd: {
-    id: 'pricing.trial.terms.automaticTrialEnd',
-    defaultMessage: '!!!Your free trial ends automatically after 14 days',
-  },
-});
-
-@inject('stores', 'actions') @observer
-class ActivateTrialButton extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    short: PropTypes.bool,
-    gaEventInfo: PropTypes.shape({
-      category: PropTypes.string.isRequired,
-      event: PropTypes.string.isRequired,
-      label: PropTypes.string,
-    }),
-  };
-
-  static defaultProps = {
-    className: '',
-    short: false,
-    gaEventInfo: null,
-  }
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  handleCTAClick() {
-    const { actions } = this.props;
-
-    actions.ui.openSettings({ path: 'user' });
-  }
-
-  render() {
-    const { stores, className, short } = this.props;
-    const { intl } = this.context;
-
-    const { hadSubscription } = stores.user.data;
-
-    let label;
-    if (hadSubscription) {
-      label = short ? messages.shortAction : messages.action;
-    } else {
-      label = short ? messages.shortActionTrial : messages.actionTrial;
-    }
-
-    return (
-      <Button
-        label={intl.formatMessage(label)}
-        className={classnames({
-          [className]: className,
-        })}
-        buttonType="inverted"
-        onClick={this.handleCTAClick.bind(this)}
-        busy={stores.user.activateTrialRequest.isExecuting}
-      />
-    );
-  }
-}
-
-export default ActivateTrialButton;
-
-ActivateTrialButton.wrappedComponent.propTypes = {
-  stores: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-  }).isRequired,
-  actions: PropTypes.shape({
-    ui: PropTypes.instanceOf(UIStore).isRequired,
-  }).isRequired,
-};
diff --git a/src/components/ui/AppLoader/index.js b/src/components/ui/AppLoader/index.js
index a7f6f4545..31d7ca249 100644
--- a/src/components/ui/AppLoader/index.js
+++ b/src/components/ui/AppLoader/index.js
@@ -37,7 +37,7 @@ export default @injectSheet(styles) @withTheme class AppLoader extends Component
 
   componentDidMount() {
     this.interval = setInterval(() => {
-      this.setState(prevState => ({
+      this.setState((prevState) => ({
         step: prevState.step === textList.length - 1 ? 0 : prevState.step + 1,
       }));
     }, 2500);
diff --git a/src/components/ui/AppLoader/styles.js b/src/components/ui/AppLoader/styles.js
index 755a56b40..9891e0387 100644
--- a/src/components/ui/AppLoader/styles.js
+++ b/src/components/ui/AppLoader/styles.js
@@ -1,3 +1,9 @@
+let sloganTransition = 'none';
+
+if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) {
+  sloganTransition = 'opacity 1s ease';
+}
+
 export default {
   component: {
     color: '#FFF',
@@ -5,7 +11,7 @@ export default {
   slogan: {
     display: 'block',
     opacity: 0,
-    transition: 'opacity 1s ease',
+    transition: sloganTransition,
     position: 'absolute',
     textAlign: 'center',
     width: '100%',
diff --git a/src/components/ui/FeatureItem.js b/src/components/ui/FeatureItem.js
index 4926df470..646cf56ca 100644
--- a/src/components/ui/FeatureItem.js
+++ b/src/components/ui/FeatureItem.js
@@ -4,7 +4,7 @@ import { Icon } from '@meetfranz/ui';
 import classnames from 'classnames';
 import { mdiCheckCircle } from '@mdi/js';
 
-const styles = theme => ({
+const styles = (theme) => ({
   featureItem: {
     borderBottom: [1, 'solid', theme.defaultContentBorder],
     padding: [8, 0],
diff --git a/src/components/ui/FeatureList.js b/src/components/ui/FeatureList.js
index 72c799819..cf2664830 100644
--- a/src/components/ui/FeatureList.js
+++ b/src/components/ui/FeatureList.js
@@ -3,12 +3,11 @@ import PropTypes from 'prop-types';
 import { defineMessages, intlShape } from 'react-intl';
 
 import { FeatureItem } from './FeatureItem';
-import { PLANS } from '../../config';
 
 const messages = defineMessages({
   availableRecipes: {
     id: 'pricing.features.recipes',
-    defaultMessage: '!!!Choose from more than 70 Services',
+    defaultMessage: '!!!Choose from more than 70 Services', // TODO: Make this dynamic
   },
   accountSync: {
     id: 'pricing.features.accountSync',
@@ -22,14 +21,6 @@ const messages = defineMessages({
     id: 'pricing.features.unlimitedServices',
     defaultMessage: '!!!Add unlimited services',
   },
-  upToThreeServices: {
-    id: 'pricing.features.upToThreeServices',
-    defaultMessage: '!!!Add up to 3 services',
-  },
-  upToSixServices: {
-    id: 'pricing.features.upToSixServices',
-    defaultMessage: '!!!Add up to 6 services',
-  },
   spellchecker: {
     id: 'pricing.features.spellchecker',
     defaultMessage: '!!!Spellchecker support',
@@ -58,31 +49,17 @@ const messages = defineMessages({
     id: 'pricing.features.teamManagement',
     defaultMessage: '!!!Team Management',
   },
-  appDelays: {
-    id: 'pricing.features.appDelays',
-    defaultMessage: '!!!No Waiting Screens',
-  },
-  adFree: {
-    id: 'pricing.features.adFree',
-    defaultMessage: '!!!Forever ad-free',
-  },
-  appDelayEnabled: {
-    id: 'pricing.features.appDelaysEnabled',
-    defaultMessage: '!!!Occasional Waiting Screens',
-  },
 });
 
 export class FeatureList extends Component {
   static propTypes = {
     className: PropTypes.string,
     featureClassName: PropTypes.string,
-    plan: PropTypes.oneOf(Object.keys(PLANS)),
   };
 
   static defaultProps = {
     className: '',
     featureClassName: '',
-    plan: false,
   }
 
   static contextTypes = {
@@ -93,53 +70,29 @@ export class FeatureList extends Component {
     const {
       className,
       featureClassName,
-      plan,
     } = this.props;
     const { intl } = this.context;
 
-    const features = [];
-    if (plan === PLANS.FREE) {
-      features.push(
-        messages.appDelayEnabled,
-        messages.upToThreeServices,
-        messages.availableRecipes,
-        messages.accountSync,
-        messages.desktopNotifications,
-      );
-    } else if (plan === PLANS.PERSONAL) {
-      features.push(
-        messages.upToSixServices,
-        messages.spellchecker,
-        messages.appDelays,
-        messages.adFree,
-      );
-    } else if (plan === PLANS.PRO) {
-      features.push(
-        messages.unlimitedServices,
-        messages.workspaces,
-        messages.customWebsites,
-        // messages.onPremise,
-        messages.thirdPartyServices,
-        // messages.serviceProxies,
-      );
-    } else {
-      features.push(
-        messages.unlimitedServices,
-        messages.spellchecker,
-        messages.workspaces,
-        messages.customWebsites,
-        messages.onPremise,
-        messages.thirdPartyServices,
-        messages.serviceProxies,
-        messages.teamManagement,
-        messages.appDelays,
-        messages.adFree,
-      );
-    }
+    const features = [
+      messages.availableRecipes,
+      messages.accountSync,
+      messages.desktopNotifications,
+
+      messages.spellchecker,
+
+      messages.workspaces,
+      messages.customWebsites,
+      messages.thirdPartyServices,
+
+      messages.unlimitedServices,
+      messages.onPremise,
+      messages.serviceProxies,
+      messages.teamManagement,
+    ];
 
     return (
       <ul className={className}>
-        {features.map(feature => <FeatureItem name={intl.formatMessage(feature)} className={featureClassName} />)}
+        {features.map((feature) => <FeatureItem name={intl.formatMessage(feature)} className={featureClassName} />)}
       </ul>
     );
   }
diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js
index 059610aec..bb4ea0565 100644
--- a/src/components/ui/ImageUpload.js
+++ b/src/components/ui/ImageUpload.js
@@ -26,16 +26,13 @@ export default @observer class ImageUpload extends Component {
 
   dropzoneRef = null;
 
-  imgPath = null;
-
   onDrop(acceptedFiles) {
     const { field } = this.props;
 
     acceptedFiles.forEach((file) => {
-      this.imgPath = isWindows ? file.path.replace(/\\/g, '/') : file.path;
-
+      const imgPath = isWindows ? file.path.replace(/\\/g, '/') : file.path;
       this.setState({
-        path: this.imgPath,
+        path: imgPath,
       });
 
       this.props.field.onDrop(file);
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js
index 7930d98b4..fd14b7018 100644
--- a/src/components/ui/Link.js
+++ b/src/components/ui/Link.js
@@ -48,7 +48,7 @@ export default @inject('stores') @observer class Link extends Component {
         href={router.history.createHref(to)}
         className={linkClasses}
         style={style}
-        onClick={e => this.onClick(e)}
+        onClick={(e) => this.onClick(e)}
       >
         {children}
       </a>
diff --git a/src/components/ui/Modal/styles.js b/src/components/ui/Modal/styles.js
index c2bebf9bb..f32c075ce 100644
--- a/src/components/ui/Modal/styles.js
+++ b/src/components/ui/Modal/styles.js
@@ -1,4 +1,4 @@
-export default theme => ({
+export default (theme) => ({
   component: {
     zIndex: 500,
     position: 'absolute',
diff --git a/src/components/ui/PremiumFeatureContainer/index.js b/src/components/ui/PremiumFeatureContainer/index.js
deleted file mode 100644
index 1e100f9d8..000000000
--- a/src/components/ui/PremiumFeatureContainer/index.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import React, { Component } from 'react';
-import { inject, observer } from 'mobx-react';
-import PropTypes from 'prop-types';
-import { defineMessages, intlShape } from 'react-intl';
-import injectSheet from 'react-jss';
-
-import { oneOrManyChildElements } from '../../../prop-types';
-
-import UserStore from '../../../stores/UserStore';
-
-import styles from './styles';
-import FeaturesStore from '../../../stores/FeaturesStore';
-import UIStore from '../../../stores/UIStore';
-
-const messages = defineMessages({
-  action: {
-    id: 'premiumFeature.button.upgradeAccount',
-    defaultMessage: '!!!Upgrade account',
-  },
-});
-
-@inject('stores', 'actions') @injectSheet(styles) @observer
-class PremiumFeatureContainer extends Component {
-  static propTypes = {
-    classes: PropTypes.object.isRequired,
-    condition: PropTypes.oneOfType([
-      PropTypes.bool,
-      PropTypes.func,
-    ]),
-    gaEventInfo: PropTypes.shape({
-      category: PropTypes.string.isRequired,
-      event: PropTypes.string.isRequired,
-      label: PropTypes.string,
-    }),
-  };
-
-  static defaultProps = {
-    condition: null,
-    gaEventInfo: null,
-  };
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  render() {
-    const {
-      classes,
-      children,
-      actions,
-      condition,
-      stores,
-    } = this.props;
-
-    const { intl } = this.context;
-
-    let showWrapper = !!condition;
-
-    if (condition === null) {
-      showWrapper = !stores.user.data.isPremium;
-    } else if (typeof condition === 'function') {
-      showWrapper = condition({
-        isPremium: stores.user.data.isPremium,
-        features: stores.features.features,
-      });
-    }
-
-    return showWrapper ? (
-      <div className={classes.container}>
-        <div className={classes.titleContainer}>
-          <p className={classes.title}>Premium Feature</p>
-          <button
-            className={classes.actionButton}
-            type="button"
-            onClick={() => {
-              actions.ui.openSettings({ path: 'user' });
-            }}
-          >
-            {intl.formatMessage(messages.action)}
-          </button>
-        </div>
-        <div className={classes.content}>
-          {children}
-        </div>
-      </div>
-    ) : children;
-  }
-}
-
-PremiumFeatureContainer.wrappedComponent.propTypes = {
-  children: oneOrManyChildElements.isRequired,
-  stores: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-    features: PropTypes.instanceOf(FeaturesStore).isRequired,
-  }).isRequired,
-  actions: PropTypes.shape({
-    ui: PropTypes.instanceOf(UIStore).isRequired,
-  }).isRequired,
-};
-
-export default PremiumFeatureContainer;
diff --git a/src/components/ui/PremiumFeatureContainer/styles.js b/src/components/ui/PremiumFeatureContainer/styles.js
deleted file mode 100644
index 41881e044..000000000
--- a/src/components/ui/PremiumFeatureContainer/styles.js
+++ /dev/null
@@ -1,34 +0,0 @@
-export default theme => ({
-  container: {
-    background: theme.colorSubscriptionContainerBackground,
-    border: theme.colorSubscriptionContainerBorder,
-    margin: [0, 0, 20, -20],
-    padding: 20,
-    'border-radius': theme.borderRadius,
-    pointerEvents: 'none',
-    height: 'auto',
-  },
-  titleContainer: {
-    display: 'flex',
-  },
-  title: {
-    'font-weight': 'bold',
-    color: theme.colorSubscriptionContainerTitle,
-  },
-  actionButton: {
-    background: theme.colorSubscriptionContainerActionButtonBackground,
-    color: theme.colorSubscriptionContainerActionButtonColor,
-    'margin-left': 'auto',
-    'border-radius': theme.borderRadiusSmall,
-    padding: [4, 8],
-    'font-size': 12,
-    pointerEvents: 'initial',
-  },
-  content: {
-    opacity: 0.5,
-    'margin-top': 20,
-    '& > :last-child': {
-      'margin-bottom': 0,
-    },
-  },
-});
diff --git a/src/components/ui/Radio.js b/src/components/ui/Radio.js
index ba13aca63..e77714eb7 100644
--- a/src/components/ui/Radio.js
+++ b/src/components/ui/Radio.js
@@ -54,7 +54,7 @@ export default @observer class Radio extends Component {
           </label>
         )}
         <div className="franz-form__radio-wrapper">
-          {field.options.map(type => (
+          {field.options.map((type) => (
             <label
               key={type.value}
               htmlFor={`${field.id}-${type.value}`}
diff --git a/src/components/ui/SearchInput.js b/src/components/ui/SearchInput.js
index 78d6aae8b..0b25734dd 100644
--- a/src/components/ui/SearchInput.js
+++ b/src/components/ui/SearchInput.js
@@ -96,7 +96,7 @@ export default @observer class SearchInput extends Component {
             type="text"
             placeholder={placeholder}
             value={value}
-            onChange={e => this.onChange(e)}
+            onChange={(e) => this.onChange(e)}
             ref={(ref) => { this.input = ref; }}
           />
         </label>
diff --git a/src/components/ui/Select.js b/src/components/ui/Select.js
index b4511433c..e7a5eafa8 100644
--- a/src/components/ui/Select.js
+++ b/src/components/ui/Select.js
@@ -82,7 +82,7 @@ export default @observer class Select extends Component {
           </label>
         )}
         <select
-          onChange={multiple ? e => this.multipleChange(e) : field.onChange}
+          onChange={multiple ? (e) => this.multipleChange(e) : field.onChange}
           id={field.id}
           defaultValue={selected}
           className="franz-form__select"
@@ -90,7 +90,7 @@ export default @observer class Select extends Component {
           multiple={multiple}
           ref={this.element}
         >
-          {field.options.map(type => (
+          {field.options.map((type) => (
             <option
               key={type.value}
               value={type.value}
diff --git a/src/components/ui/ServiceIcon.js b/src/components/ui/ServiceIcon.js
index 0b9155a4e..b2dadeac3 100644
--- a/src/components/ui/ServiceIcon.js
+++ b/src/components/ui/ServiceIcon.js
@@ -6,7 +6,7 @@ import classnames from 'classnames';
 
 import ServiceModel from '../../models/Service';
 
-const styles = theme => ({
+const styles = (theme) => ({
   root: {
     height: 'auto',
   },
diff --git a/src/components/ui/Slider.js b/src/components/ui/Slider.js
index b00a6a3f8..f344449a0 100644
--- a/src/components/ui/Slider.js
+++ b/src/components/ui/Slider.js
@@ -53,7 +53,7 @@ export default @observer class Slider extends Component {
               value={field.value}
               min="1"
               max="100"
-              onChange={e => (!disabled ? this.onChange(e) : null)}
+              onChange={(e) => (!disabled ? this.onChange(e) : null)}
             />
           </div>
 
diff --git a/src/components/ui/Tabs/TabItem.js b/src/components/ui/Tabs/TabItem.js
index 546b05a4e..d0ef4e798 100644
--- a/src/components/ui/Tabs/TabItem.js
+++ b/src/components/ui/Tabs/TabItem.js
@@ -1,17 +1,15 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 
 import { oneOrManyChildElements } from '../../../prop-types';
 
 export default class TabItem extends Component {
   static propTypes = {
     children: oneOrManyChildElements.isRequired,
-  }
+  };
 
   render() {
     const { children } = this.props;
 
-    return (
-      <>{children}</>
-    );
+    return <>{children}</>;
   }
 }
diff --git a/src/components/ui/Tabs/Tabs.js b/src/components/ui/Tabs/Tabs.js
index e68dc3a1d..56c76f215 100644
--- a/src/components/ui/Tabs/Tabs.js
+++ b/src/components/ui/Tabs/Tabs.js
@@ -28,7 +28,7 @@ class Tab extends Component {
 
   render() {
     const { children: childElements } = this.props;
-    const children = childElements.filter(c => !!c);
+    const children = childElements.filter((c) => !!c);
 
     if (children.length === 1) {
       return <div>{children}</div>;
diff --git a/src/components/ui/Toggle.js b/src/components/ui/Toggle.js
index 78fb77cbe..14330e5c7 100644
--- a/src/components/ui/Toggle.js
+++ b/src/components/ui/Toggle.js
@@ -59,7 +59,7 @@ export default @observer class Toggle extends Component {
             name={field.name}
             value={field.name}
             checked={field.value}
-            onChange={e => (!disabled ? this.onChange(e) : null)}
+            onChange={(e) => (!disabled ? this.onChange(e) : null)}
           />
         </label>
         {field.error && <div className={field.error}>{field.error}</div>}
diff --git a/src/components/ui/ToggleRaw.js b/src/components/ui/ToggleRaw.js
index dcaf664e1..4700127d4 100644
--- a/src/components/ui/ToggleRaw.js
+++ b/src/components/ui/ToggleRaw.js
@@ -64,7 +64,7 @@ export default @observer class ToggleRaw extends Component {
             name={field.name}
             value={field.name}
             checked={field.value}
-            onChange={e => (!disabled ? this.onChange(e) : null)}
+            onChange={(e) => (!disabled ? this.onChange(e) : null)}
           />
         </label>
         {field.error && <div className={field.error}>{field.error}</div>}
diff --git a/src/components/ui/UpgradeButton/index.js b/src/components/ui/UpgradeButton/index.js
deleted file mode 100644
index eade46cfd..000000000
--- a/src/components/ui/UpgradeButton/index.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { inject, observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
-
-import { Button } from '@meetfranz/forms';
-
-import UserStore from '../../../stores/UserStore';
-import ActivateTrialButton from '../ActivateTrialButton';
-import UIStore from '../../../stores/UIStore';
-
-const messages = defineMessages({
-  upgradeToPro: {
-    id: 'global.upgradeButton.upgradeToPro',
-    defaultMessage: '!!!Upgrade to Franz Professional',
-  },
-});
-
-@inject('stores', 'actions') @observer
-class UpgradeButton extends Component {
-  static propTypes = {
-    // eslint-disable-next-line
-    classes: PropTypes.object.isRequired,
-    className: PropTypes.string,
-    gaEventInfo: PropTypes.shape({
-      category: PropTypes.string.isRequired,
-      event: PropTypes.string.isRequired,
-      label: PropTypes.string,
-    }),
-    requiresPro: PropTypes.bool,
-  };
-
-  static defaultProps = {
-    className: '',
-    gaEventInfo: null,
-    requiresPro: false,
-  }
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  handleCTAClick() {
-    const { actions } = this.props;
-
-    actions.ui.openSettings({ path: 'user' });
-  }
-
-  render() {
-    const { stores, requiresPro } = this.props;
-    const { intl } = this.context;
-
-    const { isPremium, isPersonal } = stores.user;
-
-    if (isPremium && isPersonal && requiresPro) {
-      return (
-        <Button
-          label={intl.formatMessage(messages.upgradeToPro)}
-          onClick={this.handleCTAClick.bind(this)}
-          className={this.props.className}
-          buttonType="inverted"
-        />
-      );
-    }
-
-    if (!isPremium) {
-      return <ActivateTrialButton {...this.props} />;
-    }
-
-    return null;
-  }
-}
-
-export default UpgradeButton;
-
-UpgradeButton.wrappedComponent.propTypes = {
-  stores: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-  }).isRequired,
-  actions: PropTypes.shape({
-    ui: PropTypes.instanceOf(UIStore).isRequired,
-  }).isRequired,
-};
diff --git a/src/components/ui/WebviewLoader/styles.js b/src/components/ui/WebviewLoader/styles.js
index dbd75db8a..5d58011fe 100644
--- a/src/components/ui/WebviewLoader/styles.js
+++ b/src/components/ui/WebviewLoader/styles.js
@@ -1,4 +1,4 @@
-export default theme => ({
+export default (theme) => ({
   component: {
     background: theme.colorWebviewLoaderBackground,
     padding: 20,
diff --git a/src/components/util/ErrorBoundary/styles.js b/src/components/util/ErrorBoundary/styles.js
index 0960546ff..51b36fdf3 100644
--- a/src/components/util/ErrorBoundary/styles.js
+++ b/src/components/util/ErrorBoundary/styles.js
@@ -1,4 +1,4 @@
-export default theme => ({
+export default (theme) => ({
   component: {
     display: 'flex',
     width: '100%',
diff --git a/src/config.js b/src/config.js
index 7762a8cae..aeaec1089 100644
--- a/src/config.js
+++ b/src/config.js
@@ -4,6 +4,8 @@ import ms from 'ms';
 
 export const CHECK_INTERVAL = ms('1h'); // How often should we perform checks
 
+export const LOCAL_HOSTNAME = 'localhost';
+export const LOCAL_PORT = 45569;
 export const LOCAL_API = 'http://localhost:3000';
 export const DEV_FRANZ_API = 'https://dev.franzinfra.com';
 
@@ -41,6 +43,17 @@ export const HIBERNATION_STRATEGIES = {
   3600: 'Extremely Slow Hibernation (1hour)',
 };
 
+export const WAKE_UP_STRATEGIES = {
+  0: 'Never wake up',
+  10: 'Wake up after 10sec',
+  30: 'Wake up after 30sec',
+  60: 'Wake up after 1min',
+  300: 'Wake up after 5min',
+  600: 'Wake up after 10min',
+  1800: 'Wake up after 30min',
+  3600: 'Wake up after 1hour',
+};
+
 export const NAVIGATION_BAR_BEHAVIOURS = {
   custom: 'Show navigation bar on custom websites only',
   always: 'Show navigation bar on all services',
@@ -120,18 +133,10 @@ export const ICON_SIZES = {
 export const iconSizeBias = 20;
 
 export const DEFAULT_FEATURES_CONFIG = {
-  isSpellcheckerIncludedInCurrentPlan: true,
-  needToWaitToProceed: false,
-  needToWaitToProceedConfig: {
-    delayOffset: ms('1h'),
-    wait: ms('10s'),
-  },
   isServiceProxyEnabled: false,
-  isServiceProxyIncludedInCurrentPlan: true,
   isAnnouncementsEnabled: true,
-  isWorkspaceIncludedInCurrentPlan: true,
   isWorkspaceEnabled: false,
-  isCommunityRecipesIncludedInCurrentPlan: true,
+  isTodosEnabled: true,
 };
 
 export const DEFAULT_WINDOW_OPTIONS = {
@@ -166,32 +171,8 @@ export const ALLOWED_PROTOCOLS = [
   'ferdi:',
 ];
 
-export const PLANS = {
-  PERSONAL: 'personal',
-  PRO: 'pro',
-  LEGACY: 'legacy',
-  FREE: 'free',
-};
-
-export const PLANS_MAPPING = {
-  'franz-personal-monthly': PLANS.PERSONAL,
-  'franz-personal-yearly': PLANS.PERSONAL,
-  'franz-pro-monthly': PLANS.PRO,
-  'franz-pro-yearly': PLANS.PRO,
-  'franz-supporter-license': PLANS.LEGACY,
-  'franz-supporter-license-x1': PLANS.LEGACY,
-  'franz-supporter-license-x2': PLANS.LEGACY,
-  'franz-supporter-license-year': PLANS.LEGACY,
-  'franz-supporter-license-year-x1': PLANS.LEGACY,
-  'franz-supporter-license-year-x2': PLANS.LEGACY,
-  'franz-supporter-license-year-2019': PLANS.LEGACY,
-  free: PLANS.FREE,
-};
-
 export const DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED = false;
 
-export const DEFAULT_SERVICE_LIMIT = 3;
-
 export const DEFAULT_TODOS_WIDTH = 300;
 export const TODOS_MIN_WIDTH = 200;
 export const DEFAULT_TODOS_VISIBLE = true;
diff --git a/src/containers/auth/PricingScreen.js b/src/containers/auth/PricingScreen.js
deleted file mode 100644
index 97bf1f6be..000000000
--- a/src/containers/auth/PricingScreen.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { inject, observer } from 'mobx-react';
-import { RouterStore } from 'mobx-react-router';
-
-import Pricing from '../../components/auth/Pricing';
-import UserStore from '../../stores/UserStore';
-
-import { globalError as globalErrorPropType } from '../../prop-types';
-import FeaturesStore from '../../stores/FeaturesStore';
-
-export default @inject('stores', 'actions') @observer class PricingScreen extends Component {
-  static propTypes = {
-    error: globalErrorPropType.isRequired,
-  };
-
-  async submit() {
-    const {
-      actions,
-      stores,
-    } = this.props;
-
-    const { activateTrialRequest } = stores.user;
-    const { defaultTrialPlan, canSkipTrial } = stores.features.anonymousFeatures;
-
-    if (!canSkipTrial) {
-      stores.router.push('/');
-      stores.user.hasCompletedSignup = true;
-    } else {
-      actions.user.activateTrial({ planId: defaultTrialPlan });
-      await activateTrialRequest._promise;
-
-      if (!activateTrialRequest.isError) {
-        stores.router.push('/');
-        stores.user.hasCompletedSignup = true;
-      }
-    }
-  }
-
-  render() {
-    const {
-      error,
-      stores,
-    } = this.props;
-
-    const { getUserInfoRequest, activateTrialRequest, data } = stores.user;
-    const { featuresRequest, features } = stores.features;
-
-    const { pricingConfig } = features;
-
-    let currency = '$';
-    let price = 5.99;
-    if (pricingConfig) {
-      ({ currency } = pricingConfig);
-      ({ price } = pricingConfig.plans.pro.yearly);
-    }
-
-    return (
-      <Pricing
-        onSubmit={this.submit.bind(this)}
-        isLoadingRequiredData={(getUserInfoRequest.isExecuting || !getUserInfoRequest.wasExecuted) || (featuresRequest.isExecuting || !featuresRequest.wasExecuted)}
-        isActivatingTrial={activateTrialRequest.isExecuting}
-        trialActivationError={activateTrialRequest.isError}
-        canSkipTrial={features.canSkipTrial}
-        error={error}
-        currency={currency}
-        price={price}
-        name={data.firstname}
-      />
-    );
-  }
-}
-
-PricingScreen.wrappedComponent.propTypes = {
-  actions: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-  }).isRequired,
-  stores: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-    router: PropTypes.instanceOf(RouterStore).isRequired,
-    features: PropTypes.instanceOf(FeaturesStore).isRequired,
-  }).isRequired,
-};
diff --git a/src/containers/auth/SetupAssistantScreen.js b/src/containers/auth/SetupAssistantScreen.js
index 2a8f2c010..d7036969a 100644
--- a/src/containers/auth/SetupAssistantScreen.js
+++ b/src/containers/auth/SetupAssistantScreen.js
@@ -4,14 +4,28 @@ import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 
 import { RouterStore } from 'mobx-react-router';
-import { DEFAULT_TODO_RECIPE_ID, DEFAULT_TODO_SERVICE_NAME } from '../../config';
+import {
+  DEFAULT_TODO_RECIPE_ID,
+  DEFAULT_TODO_SERVICE_NAME,
+} from '../../config';
 import { sleep } from '../../helpers/async-helpers';
 import SetupAssistant from '../../components/auth/SetupAssistant';
 import ServicesStore from '../../stores/ServicesStore';
 import RecipesStore from '../../stores/RecipesStore';
 import UserStore from '../../stores/UserStore';
 
-export default @inject('stores', 'actions') @observer class SetupAssistantScreen extends Component {
+export default
+@inject('stores', 'actions')
+@observer
+class SetupAssistantScreen extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      isSettingUpServices: false,
+    };
+  }
+
+  // TODO: Why are these hardcoded here? Do they need to conform to specific services in the packaged recipes? If so, its more important to fix this
   services = {
     whatsapp: {
       name: 'WhatsApp',
@@ -49,21 +63,18 @@ export default @inject('stores', 'actions') @observer class SetupAssistantScreen
       name: 'LinkedIn',
       hasTeamId: false,
     },
-  }
-
-  state = {
-    isSettingUpServices: false,
-  }
+  };
 
   async setupServices(serviceConfig) {
-    const { stores: { services, router, user } } = this.props;
-    console.log(serviceConfig);
+    const {
+      stores: { services },
+    } = this.props;
 
     this.setState({
       isSettingUpServices: true,
     });
 
-    // The store requests are not build for paralell requests so we need to finish one request after another
+    // The store requests are not build for parallel requests so we need to finish one request after another
     for (const config of serviceConfig) {
       const serviceData = {
         name: this.services[config.id].name,
@@ -96,10 +107,6 @@ export default @inject('stores', 'actions') @observer class SetupAssistantScreen
     this.setState({
       isSettingUpServices: false,
     });
-
-    await sleep(100);
-
-    router.push(user.pricingRoute);
   }
 
   render() {
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js
index 42ee09f33..38c5dfb43 100644
--- a/src/containers/auth/SignupScreen.js
+++ b/src/containers/auth/SignupScreen.js
@@ -14,16 +14,7 @@ export default @inject('stores', 'actions') @observer class SignupScreen extends
   };
 
   onSignup(values) {
-    const { actions, stores } = this.props;
-
-    const { canSkipTrial, defaultTrialPlan, pricingConfig } = stores.features.anonymousFeatures;
-
-    if (!canSkipTrial) {
-      Object.assign(values, {
-        plan: defaultTrialPlan,
-        currency: pricingConfig.currencyID,
-      });
-    }
+    const { actions } = this.props;
 
     actions.user.signup(values);
   }
@@ -33,7 +24,7 @@ export default @inject('stores', 'actions') @observer class SignupScreen extends
 
     return (
       <Signup
-        onSubmit={values => this.onSignup(values)}
+        onSubmit={(values) => this.onSignup(values)}
         isSubmitting={stores.user.signupRequest.isExecuting}
         loginRoute={stores.user.loginRoute}
         changeServerRoute={stores.user.changeServerRoute}
diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js
index 6f2d0eee6..bfcc880d0 100644
--- a/src/containers/auth/WelcomeScreen.js
+++ b/src/containers/auth/WelcomeScreen.js
@@ -15,7 +15,7 @@ export default @inject('stores', 'actions') @observer class LoginScreen extends
         loginRoute={user.loginRoute}
         signupRoute={user.signupRoute}
         changeServerRoute={user.changeServerRoute}
-        recipes={recipePreviews.featured}
+        recipes={recipePreviews.all}
       />
     );
   }
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 7a12aee83..32b1f1cf7 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -20,7 +20,6 @@ import Sidebar from '../../components/layout/Sidebar';
 import Services from '../../components/services/content/Services';
 import AppLoader from '../../components/ui/AppLoader';
 
-import { state as delayAppState } from '../../features/delayApp';
 import { workspaceActions } from '../../features/workspaces/actions';
 import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer';
 import { workspaceStore } from '../../features/workspaces';
@@ -55,8 +54,11 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
       reload,
       toggleNotifications,
       toggleAudio,
+      toggleDarkMode,
       deleteService,
       updateService,
+      hibernate,
+      awake,
     } = this.props.actions.service;
 
     const { hide } = this.props.actions.news;
@@ -91,10 +93,9 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
 
     const workspacesDrawer = (
       <WorkspaceDrawer
-        getServicesForWorkspace={workspace => (
-          workspace ? workspaceStore.getWorkspaceServices(workspace).map(s => s.name) : services.all.map(s => s.name)
+        getServicesForWorkspace={(workspace) => (
+          workspace ? workspaceStore.getWorkspaceServices(workspace).map((s) => s.name) : services.all.map((s) => s.name)
         )}
-        onUpgradeAccountClick={() => openSettings({ path: 'user' })}
       />
     );
 
@@ -109,8 +110,11 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
         reload={reload}
         toggleNotifications={toggleNotifications}
         toggleAudio={toggleAudio}
+        toggleDarkMode={toggleDarkMode}
         deleteService={deleteService}
         updateService={updateService}
+        hibernateService={hibernate}
+        wakeUpService={awake}
         toggleMuteApp={toggleMuteApp}
         toggleWorkspaceDrawer={workspaceActions.toggleWorkspaceDrawer}
         isWorkspaceDrawerOpen={workspaceStore.isWorkspaceDrawerOpen}
@@ -131,7 +135,6 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
         openSettings={openSettings}
         update={updateService}
         userHasCompletedSignup={user.hasCompletedSignup}
-        hasActivatedTrial={user.hasActivatedTrial}
         isSpellcheckerEnabled={settings.app.enableSpellchecking}
       />
     );
@@ -157,8 +160,6 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
           areRequiredRequestsSuccessful={requests.areRequiredRequestsSuccessful}
           retryRequiredRequests={retryRequiredRequests}
           areRequiredRequestsLoading={requests.areRequiredRequestsLoading}
-          isDelayAppScreenVisible={delayAppState.isDelayAppScreenVisible}
-          hasActivatedTrial={user.hasActivatedTrial}
         >
           {React.Children.count(children) > 0 ? children : null}
         </AppLayout>
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index db3b2a4a7..8d92b01be 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 
-import PaymentStore from '../../stores/PaymentStore';
 import UserStore from '../../stores/UserStore';
 import AppStore from '../../stores/AppStore';
 import FeaturesStore from '../../stores/FeaturesStore';
@@ -24,10 +23,9 @@ class AccountScreen extends Component {
   }
 
   reloadData() {
-    const { user, payment } = this.props.stores;
+    const { user } = this.props.stores;
 
     user.getUserInfoRequest.reload();
-    payment.plansRequest.reload();
   }
 
   handleWebsiteLink(route) {
@@ -48,28 +46,17 @@ class AccountScreen extends Component {
   }
 
   render() {
-    const {
-      user,
-      payment,
-      features,
-      settings,
-    } = this.props.stores;
-    const { user: userActions, payment: paymentActions } = this.props.actions;
+    const { user, settings } = this.props.stores;
+    const { user: userActions } = this.props.actions;
 
     const isLoadingUserInfo = user.getUserInfoRequest.isExecuting;
-    const isLoadingPlans = payment.plansRequest.isExecuting;
-
-    const { upgradeAccount } = paymentActions;
 
     return (
       <ErrorBoundary>
         <AccountDashboard
           server={settings.all.app.server}
           user={user.data}
-          isPremiumOverrideUser={user.isPremiumOverride}
-          isProUser={user.isPro}
           isLoading={isLoadingUserInfo}
-          isLoadingPlans={isLoadingPlans}
           userInfoRequestFailed={
             user.getUserInfoRequest.wasExecuted
             && user.getUserInfoRequest.isError
@@ -83,10 +70,6 @@ class AccountScreen extends Component {
             && !user.deleteAccountRequest.isError
           }
           openEditAccount={() => this.handleWebsiteLink('/user/profile')}
-          upgradeToPro={() => upgradeAccount({
-            planId: features.features.pricingConfig.plans.pro.yearly.id,
-          })}
-          openBilling={() => this.handleWebsiteLink('/user/billing')}
           openInvoices={() => this.handleWebsiteLink('/user/invoices')}
         />
       </ErrorBoundary>
@@ -98,12 +81,10 @@ AccountScreen.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
     features: PropTypes.instanceOf(FeaturesStore).isRequired,
-    payment: PropTypes.instanceOf(PaymentStore).isRequired,
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
     app: PropTypes.instanceOf(AppStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    payment: PropTypes.instanceOf(PaymentStore).isRequired,
     app: PropTypes.instanceOf(AppStore).isRequired,
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index ddf2d2d25..c880e97ae 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -19,7 +19,6 @@ import { required, url, oneRequired } from '../../helpers/validation-helpers';
 import { getSelectOptions } from '../../helpers/i18n-helpers';
 
 import { config as proxyFeature } from '../../features/serviceProxy';
-import { config as spellcheckerFeature } from '../../features/spellchecker';
 
 import { SPELLCHECKER_LOCALES } from '../../i18n/languages';
 
@@ -346,7 +345,7 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
 
   render() {
     const {
-      recipes, services, user, settings,
+      recipes, services, user,
     } = this.props.stores;
     const { action } = this.props.router.params;
 
@@ -395,13 +394,10 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
           status={services.actionStatus}
           isSaving={services.updateServiceRequest.isExecuting || services.createServiceRequest.isExecuting}
           isDeleting={services.deleteServiceRequest.isExecuting}
-          onSubmit={d => this.onSubmit(d)}
+          onSubmit={(d) => this.onSubmit(d)}
           onDelete={() => this.deleteService()}
-          openRecipeFile={file => this.openRecipeFile(file)}
+          openRecipeFile={(file) => this.openRecipeFile(file)}
           isProxyFeatureEnabled={proxyFeature.isEnabled}
-          isServiceProxyIncludedInCurrentPlan={proxyFeature.isIncludedInCurrentPlan}
-          isSpellcheckerIncludedInCurrentPlan={spellcheckerFeature.isIncludedInCurrentPlan}
-          isHibernationFeatureActive={settings.app.hibernate}
         />
       </ErrorBoundary>
     );
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index d601e03d4..0d718489a 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -11,10 +11,9 @@ import Form from '../../lib/Form';
 import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
 import {
   HIBERNATION_STRATEGIES, SIDEBAR_WIDTH, ICON_SIZES, NAVIGATION_BAR_BEHAVIOURS, SEARCH_ENGINE_NAMES, TODO_APPS,
-  DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED, DEFAULT_IS_FEATURE_ENABLED_BY_USER,
+  DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED, DEFAULT_IS_FEATURE_ENABLED_BY_USER, WAKE_UP_STRATEGIES,
 } from '../../config';
 import { DEFAULT_APP_SETTINGS, isMac } from '../../environment';
-import { config as spellcheckerConfig } from '../../features/spellchecker';
 
 import { getSelectOptions } from '../../helpers/i18n-helpers';
 import { hash } from '../../helpers/password-helpers';
@@ -27,6 +26,8 @@ import globalMessages from '../../i18n/globalMessages';
 import WorkspacesStore from '../../features/workspaces/store';
 import ServicesStore from '../../stores/ServicesStore';
 
+const debug = require('debug')('Ferdi:EditSettingsScreen');
+
 const messages = defineMessages({
   autoLaunchOnStart: {
     id: 'settings.app.form.autoLaunchOnStart',
@@ -88,10 +89,6 @@ const messages = defineMessages({
     id: 'settings.app.form.sentry',
     defaultMessage: '!!!Send telemetry data',
   },
-  hibernate: {
-    id: 'settings.app.form.hibernate',
-    defaultMessage: '!!!Enable service hibernation',
-  },
   hibernateOnStartup: {
     id: 'settings.app.form.hibernateOnStartup',
     defaultMessage: '!!!Keep services in hibernation on startup',
@@ -100,6 +97,10 @@ const messages = defineMessages({
     id: 'settings.app.form.hibernationStrategy',
     defaultMessage: '!!!Hibernation strategy',
   },
+  wakeUpStrategy: {
+    id: 'settings.app.form.wakeUpStrategy',
+    defaultMessage: '!!!Wake up strategy',
+  },
   predefinedTodoServer: {
     id: 'settings.app.form.predefinedTodoServer',
     defaultMessage: '!!!Todo Server',
@@ -242,6 +243,8 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
       openInBackground: settingsData.autoLaunchInBackground,
     });
 
+    debug(`Updating settings store with data: ${settingsData}`);
+
     settings.update({
       type: 'app',
       data: {
@@ -257,9 +260,9 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         navigationBarBehaviour: settingsData.navigationBarBehaviour,
         searchEngine: settingsData.searchEngine,
         sentry: settingsData.sentry,
-        hibernate: settingsData.hibernate,
         hibernateOnStartup: settingsData.hibernateOnStartup,
         hibernationStrategy: settingsData.hibernationStrategy,
+        wakeUpStrategy: settingsData.wakeUpStrategy,
         predefinedTodoServer: settingsData.predefinedTodoServer,
         customTodoServer: settingsData.customTodoServer,
         lockingFeatureEnabled: settingsData.lockingFeatureEnabled,
@@ -339,6 +342,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
       sort: false,
     });
 
+    const wakeUpStrategies = getSelectOptions({
+      locales: WAKE_UP_STRATEGIES,
+      sort: false,
+    });
+
     const todoApp = getSelectOptions({
       locales: TODO_APPS,
       sort: false,
@@ -433,11 +441,6 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.sentry,
           default: DEFAULT_APP_SETTINGS.sentry,
         },
-        hibernate: {
-          label: intl.formatMessage(messages.hibernate),
-          value: settings.all.app.hibernate,
-          default: DEFAULT_APP_SETTINGS.hibernate,
-        },
         hibernateOnStartup: {
           label: intl.formatMessage(messages.hibernateOnStartup),
           value: settings.all.app.hibernateOnStartup,
@@ -449,6 +452,12 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           options: hibernationStrategies,
           default: DEFAULT_APP_SETTINGS.hibernationStrategy,
         },
+        wakeUpStrategy: {
+          label: intl.formatMessage(messages.wakeUpStrategy),
+          value: settings.all.app.wakeUpStrategy,
+          options: wakeUpStrategies,
+          default: DEFAULT_APP_SETTINGS.wakeUpStrategy,
+        },
         predefinedTodoServer: {
           label: intl.formatMessage(messages.predefinedTodoServer),
           value: settings.all.app.predefinedTodoServer,
@@ -516,8 +525,8 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         },
         enableSpellchecking: {
           label: intl.formatMessage(messages.enableSpellchecking),
-          value: !this.props.stores.user.data.isPremium && !spellcheckerConfig.isIncludedInCurrentPlan ? false : settings.all.app.enableSpellchecking,
-          default: !this.props.stores.user.data.isPremium && !spellcheckerConfig.isIncludedInCurrentPlan ? false : DEFAULT_APP_SETTINGS.enableSpellchecking,
+          value: settings.all.app.enableSpellchecking,
+          default: DEFAULT_APP_SETTINGS.enableSpellchecking,
         },
         spellcheckerLanguage: {
           label: intl.formatMessage(globalMessages.spellcheckerLanguage),
@@ -646,16 +655,14 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           isUpdateAvailable={updateStatus === updateStatusTypes.AVAILABLE}
           noUpdateAvailable={updateStatus === updateStatusTypes.NOT_AVAILABLE}
           updateIsReadyToInstall={updateStatus === updateStatusTypes.DOWNLOADED}
-          onSubmit={d => this.onSubmit(d)}
+          onSubmit={(d) => this.onSubmit(d)}
           getCacheSize={() => app.cacheSize}
           isClearingAllCache={isClearingAllCache}
           onClearAllCache={clearAllCache}
-          isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan}
           isTodosEnabled={todos.isFeatureActive}
           isWorkspaceEnabled={workspaces.isFeatureActive}
           lockingFeatureEnabled={lockingFeatureEnabled}
           automaticUpdates={this.props.stores.settings.app.automaticUpdates}
-          hibernationEnabled={this.props.stores.settings.app.hibernate}
           isDarkmodeEnabled={this.props.stores.settings.app.darkMode}
           isAdaptableDarkModeEnabled={this.props.stores.settings.app.adaptableDarkMode}
           isTodosActivated={this.props.stores.todos.isFeatureEnabledByUser}
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index 8e93164de..820b5e4d3 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -141,7 +141,7 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
           status={user.actionStatus}
           form={form}
           isSaving={user.updateUserInfoRequest.isExecuting}
-          onSubmit={d => this.onSubmit(d)}
+          onSubmit={(d) => this.onSubmit(d)}
         />
       </ErrorBoundary>
     );
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index f12f67b1f..52bf31383 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -1,11 +1,9 @@
 import { shell } from 'electron';
-import { app } from '@electron/remote';
-import fs from 'fs-extra';
+import { ensureDirSync, readJsonSync } from 'fs-extra';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { autorun } from 'mobx';
 import { inject, observer } from 'mobx-react';
-import path from 'path';
 
 import RecipePreviewsStore from '../../stores/RecipePreviewsStore';
 import RecipeStore from '../../stores/RecipesStore';
@@ -15,7 +13,7 @@ import UserStore from '../../stores/UserStore';
 import RecipesDashboard from '../../components/settings/recipes/RecipesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { CUSTOM_WEBSITE_RECIPE_ID, FRANZ_DEV_DOCS } from '../../config';
-import { RECIPES_PATH } from '../../environment';
+import { asarRecipesPath, userDataRecipesPath } from '../../environment';
 import { communityRecipesStore } from '../../features/communityRecipes';
 import RecipePreview from '../../models/RecipePreview';
 import AppStore from '../../stores/AppStore';
@@ -45,18 +43,16 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
   constructor(props) {
     super(props);
 
-    this.customRecipes = fs.readJsonSync(path.join(RECIPES_PATH, 'all.json'));
+    this.customRecipes = readJsonSync(asarRecipesPath('all.json'));
   }
 
   componentDidMount() {
     this.autorunDisposer = autorun(() => {
-      const { filter } = this.props.params;
+      const { filter } = { filter: 'all', ...this.props.params };
       const { currentFilter } = this.state;
 
       if (filter === 'all' && currentFilter !== 'all') {
         this.setState({ currentFilter: 'all' });
-      } else if (filter === 'featured' && currentFilter !== 'featured') {
-        this.setState({ currentFilter: 'featured' });
       } else if (filter === 'dev' && currentFilter !== 'dev') {
         this.setState({ currentFilter: 'dev' });
       }
@@ -82,7 +78,7 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
     return recipes
     // Filter out duplicate recipes
       .filter((recipe, index, self) => {
-        const ids = self.map(rec => rec.id);
+        const ids = self.map((rec) => rec.id);
         return ids.indexOf(recipe.id) === index;
 
         // Sort alphabetically
@@ -95,7 +91,7 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
 
   // Create an array of RecipePreviews from an array of recipe objects
   createPreviews(recipes) {
-    return recipes.map(recipe => new RecipePreview(recipe));
+    return recipes.map((recipe) => new RecipePreview(recipe));
   }
 
   resetSearch() {
@@ -107,7 +103,6 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
       recipePreviews,
       recipes,
       services,
-      user,
     } = this.props.stores;
 
     const {
@@ -115,7 +110,7 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
       service: serviceActions,
     } = this.props.actions;
 
-    const { filter } = this.props.params;
+    const { filter } = { filter: 'all', ...this.props.params };
     let recipeFilter;
 
     if (filter === 'all') {
@@ -125,8 +120,6 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
       ]);
     } else if (filter === 'dev') {
       recipeFilter = communityRecipesStore.communityRecipes;
-    } else {
-      recipeFilter = recipePreviews.featured;
     }
 
     const allRecipes = this.state.needle ? this.prepareRecipes([
@@ -135,18 +128,17 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
       // All search recipes from local recipes
       ...this.createPreviews(
         this.customRecipes
-          .filter(service => service.name.toLowerCase().includes(this.state.needle.toLowerCase())),
+          .filter((service) => service.name.toLowerCase().includes(this.state.needle.toLowerCase()) || (service.aliases || []).some(alias => alias.toLowerCase().includes(this.state.needle.toLowerCase()))),
       ),
     ]) : recipeFilter;
 
-    const customWebsiteRecipe = recipePreviews.all.find(service => service.id === CUSTOM_WEBSITE_RECIPE_ID);
+    const customWebsiteRecipe = recipePreviews.all.find((service) => service.id === CUSTOM_WEBSITE_RECIPE_ID);
 
-    const isLoading = recipePreviews.featuredRecipePreviewsRequest.isExecuting
-      || recipePreviews.allRecipePreviewsRequest.isExecuting
+    const isLoading = recipePreviews.allRecipePreviewsRequest.isExecuting
       || recipes.installRecipeRequest.isExecuting
       || recipePreviews.searchRecipePreviewsRequest.isExecuting;
 
-    const recipeDirectory = path.join(app.getPath('userData'), 'recipes', 'dev');
+    const recipeDirectory = userDataRecipesPath('dev');
 
     return (
       <ErrorBoundary>
@@ -155,24 +147,20 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
           customWebsiteRecipe={customWebsiteRecipe}
           isLoading={isLoading}
           addedServiceCount={services.all.length}
-          isPremium={user.data.isPremium}
-          hasLoadedRecipes={recipePreviews.featuredRecipePreviewsRequest.wasExecuted}
           showAddServiceInterface={serviceActions.showAddServiceInterface}
-          searchRecipes={e => this.searchRecipes(e)}
+          searchRecipes={(e) => this.searchRecipes(e)}
           resetSearch={() => this.resetSearch()}
           searchNeedle={this.state.needle}
           serviceStatus={services.actionStatus}
           recipeFilter={filter}
           recipeDirectory={recipeDirectory}
           openRecipeDirectory={async () => {
-            await fs.ensureDir(recipeDirectory);
+            ensureDirSync(recipeDirectory);
             shell.openExternal(`file://${recipeDirectory}`);
           }}
           openDevDocs={() => {
             appActions.openExternalUrl({ url: FRANZ_DEV_DOCS });
           }}
-          isCommunityRecipesIncludedInCurrentPlan={communityRecipesStore.isCommunityRecipesIncludedInCurrentPlan}
-          isUserPremiumUser={user.isPremium}
         />
       </ErrorBoundary>
     );
diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js
index a627a047a..10c2e36ef 100644
--- a/src/containers/settings/TeamScreen.js
+++ b/src/containers/settings/TeamScreen.js
@@ -9,7 +9,6 @@ import SettingsStore from '../../stores/SettingsStore';
 import TeamDashboard from '../../components/settings/team/TeamDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { DEV_API_FRANZ_WEBSITE } from '../../config';
-import PaymentStore from '../../stores/PaymentStore';
 
 export default @inject('stores', 'actions') @observer class TeamScreen extends Component {
   handleWebsiteLink(route) {
@@ -33,7 +32,6 @@ export default @inject('stores', 'actions') @observer class TeamScreen extends C
           userInfoRequestFailed={user.getUserInfoRequest.wasExecuted && user.getUserInfoRequest.isError}
           retryUserInfoRequest={() => this.reloadData()}
           openTeamManagement={() => this.handleWebsiteLink('/user/team')}
-          isProUser={user.isPro}
           server={server}
         />
       </ErrorBoundary>
@@ -48,7 +46,6 @@ TeamScreen.wrappedComponent.propTypes = {
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    payment: PropTypes.instanceOf(PaymentStore).isRequired,
     app: PropTypes.instanceOf(AppStore).isRequired,
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
diff --git a/src/containers/subscription/SubscriptionFormScreen.js b/src/containers/subscription/SubscriptionFormScreen.js
deleted file mode 100644
index e5c8207be..000000000
--- a/src/containers/subscription/SubscriptionFormScreen.js
+++ /dev/null
@@ -1,99 +0,0 @@
-import React, { Component } from 'react';
-import { BrowserWindow, getCurrentWindow } from '@electron/remote';
-import PropTypes from 'prop-types';
-import { inject, observer } from 'mobx-react';
-
-import PaymentStore from '../../stores/PaymentStore';
-
-import SubscriptionForm from '../../components/subscription/SubscriptionForm';
-import TrialForm from '../../components/subscription/TrialForm';
-import UserStore from '../../stores/UserStore';
-import FeaturesStore from '../../stores/FeaturesStore';
-import AppStore from '../../stores/AppStore';
-
-export default @inject('stores', 'actions') @observer class SubscriptionFormScreen extends Component {
-  static propTypes = {
-    onCloseWindow: PropTypes.func,
-  }
-
-  static defaultProps = {
-    onCloseWindow: () => null,
-  }
-
-  async openBrowser() {
-    const {
-      stores,
-      onCloseWindow,
-    } = this.props;
-
-    const {
-      user,
-      features,
-    } = stores;
-
-    let hostedPageURL = features.features.planSelectionURL;
-    hostedPageURL = user.getAuthURL(hostedPageURL);
-
-    const paymentWindow = new BrowserWindow({
-      parent: getCurrentWindow(),
-      modal: true,
-      title: '🔒 Franz Supporter License',
-      width: 800,
-      height: window.innerHeight - 100,
-      maxWidth: 800,
-      minWidth: 600,
-      webPreferences: {
-        nodeIntegration: true,
-        webviewTag: true,
-        enableRemoteModule: true,
-        contextIsolation: false,
-      },
-    });
-    paymentWindow.loadURL(`file://${__dirname}/../../index.html#/payment/${encodeURIComponent(hostedPageURL)}`);
-
-    paymentWindow.on('closed', () => {
-      onCloseWindow();
-    });
-  }
-
-  render() {
-    const {
-      actions,
-      stores,
-    } = this.props;
-
-    const { data: user } = stores.user;
-
-    if (user.hadSubscription) {
-      return (
-        <SubscriptionForm
-          plan={stores.payment.plan}
-          selectPlan={() => this.openBrowser()}
-          isActivatingTrial={stores.user.activateTrialRequest.isExecuting || stores.user.getUserInfoRequest.isExecuting}
-        />
-      );
-    }
-
-    return (
-      <TrialForm
-        plan={stores.payment.plan}
-        activateTrial={() => actions.user.activateTrial({ planId: stores.features.features.defaultTrialPlan })}
-        showAllOptions={() => this.openBrowser()}
-        isActivatingTrial={stores.user.activateTrialRequest.isExecuting || stores.user.getUserInfoRequest.isExecuting}
-      />
-    );
-  }
-}
-
-SubscriptionFormScreen.wrappedComponent.propTypes = {
-  actions: PropTypes.shape({
-    app: PropTypes.instanceOf(AppStore).isRequired,
-    payment: PropTypes.instanceOf(PaymentStore).isRequired,
-    user: PropTypes.instanceOf(UserStore).isRequired,
-  }).isRequired,
-  stores: PropTypes.shape({
-    payment: PropTypes.instanceOf(PaymentStore).isRequired,
-    user: PropTypes.instanceOf(UserStore).isRequired,
-    features: PropTypes.instanceOf(FeaturesStore).isRequired,
-  }).isRequired,
-};
diff --git a/src/containers/subscription/SubscriptionPopupScreen.js b/src/containers/subscription/SubscriptionPopupScreen.js
deleted file mode 100644
index 43966b6a4..000000000
--- a/src/containers/subscription/SubscriptionPopupScreen.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { inject, observer } from 'mobx-react';
-
-import SubscriptionPopup from '../../components/subscription/SubscriptionPopup';
-import { isDevMode } from '../../environment';
-
-export default @inject('stores', 'actions') @observer class SubscriptionPopupScreen extends Component {
-  state = {
-    complete: false,
-  };
-
-  completeCheck(event) {
-    const { url } = event;
-
-    if ((url.includes('recurly') && url.includes('confirmation')) || ((url.includes('meetfranz') || isDevMode) && url.includes('success'))) {
-      this.setState({
-        complete: true,
-      });
-    }
-  }
-
-  render() {
-    return (
-      <SubscriptionPopup
-        url={this.props.router.params.url}
-        closeWindow={() => window.close()}
-        completeCheck={e => this.completeCheck(e)}
-        isCompleted={this.state.complete}
-      />
-    );
-  }
-}
-
-SubscriptionPopupScreen.wrappedComponent.propTypes = {
-  router: PropTypes.shape({
-    params: PropTypes.shape({
-      url: PropTypes.string.isRequired,
-    }).isRequired,
-  }).isRequired,
-};
diff --git a/src/electron/Settings.js b/src/electron/Settings.js
index 2f3f8261a..3e11bb175 100644
--- a/src/electron/Settings.js
+++ b/src/electron/Settings.js
@@ -1,8 +1,6 @@
 import { observable, toJS } from 'mobx';
 import { pathExistsSync, outputJsonSync, readJsonSync } from 'fs-extra';
-import path from 'path';
-
-import { SETTINGS_PATH } from '../environment';
+import { userDataPath } from '../environment';
 
 const debug = require('debug')('Ferdi:Settings');
 
@@ -47,17 +45,17 @@ export default class Settings {
 
   _hydrate() {
     this.store = this._merge(readJsonSync(this.settingsFile));
-    debug('Hydrate store', this.type, toJS(this.store));
+    debug('Hydrate store', this.type, this.allSerialized);
   }
 
   _writeFile() {
     outputJsonSync(this.settingsFile, this.store, {
       spaces: 2,
     });
-    debug('Write settings file', this.type, toJS(this.store));
+    debug('Write settings file', this.type, this.allSerialized);
   }
 
   get settingsFile() {
-    return path.join(SETTINGS_PATH, `${this.type === 'app' ? 'settings' : this.type}.json`);
+    return userDataPath('config', `${this.type === 'app' ? 'settings' : this.type}.json`);
   }
 }
diff --git a/src/electron/ipc-api/appIndicator.js b/src/electron/ipc-api/appIndicator.js
index 0691e5170..c6c261d0f 100644
--- a/src/electron/ipc-api/appIndicator.js
+++ b/src/electron/ipc-api/appIndicator.js
@@ -1,5 +1,5 @@
 import { app, ipcMain } from 'electron';
-import path from 'path';
+import { join } from 'path';
 import { autorun } from 'mobx';
 import { isMac, isWindows, isLinux } from '../../environment';
 
@@ -9,7 +9,7 @@ const FILE_EXTENSION = isWindows ? 'ico' : 'png';
 let isTrayIconEnabled;
 
 function getAsset(type, asset) {
-  return path.join(
+  return join(
     __dirname, '..', '..', 'assets', 'images', type, process.platform, `${asset}.${FILE_EXTENSION}`,
   );
 }
diff --git a/src/electron/ipc-api/download.js b/src/electron/ipc-api/download.js
index 7f8718924..ba261ba1e 100644
--- a/src/electron/ipc-api/download.js
+++ b/src/electron/ipc-api/download.js
@@ -1,7 +1,7 @@
 import { ipcMain, dialog, BrowserWindow } from 'electron';
 import { download } from 'electron-dl';
 import mime from 'mime-types';
-import fs from 'fs-extra';
+import { writeFileSync } from 'fs-extra';
 
 const debug = require('debug')('Ferdi:ipcApi:download');
 
@@ -37,7 +37,7 @@ export default (params) => {
           if (saveDialog.canceled) return;
 
           const binaryImage = decodeBase64Image(content);
-          fs.writeFileSync(saveDialog.filePath, binaryImage, 'binary');
+          writeFileSync(saveDialog.filePath, binaryImage, 'binary');
 
           debug('File blob saved to', saveDialog.filePath);
         } catch (err) {
diff --git a/src/electron/ipc-api/localServer.js b/src/electron/ipc-api/localServer.js
index 9b800fdf6..591e70504 100644
--- a/src/electron/ipc-api/localServer.js
+++ b/src/electron/ipc-api/localServer.js
@@ -1,9 +1,9 @@
-import { ipcMain, app } from 'electron';
+import { ipcMain } from 'electron';
 import net from 'net';
+import { LOCAL_HOSTNAME, LOCAL_PORT } from '../../config';
+import { userDataPath } from '../../environment';
 import startServer from '../../internal-server/start';
 
-const DEFAULT_PORT = 45569;
-
 const portInUse = function (port) {
   return new Promise((resolve) => {
     const server = net.createServer((socket) => {
@@ -11,7 +11,7 @@ const portInUse = function (port) {
       socket.pipe(socket);
     });
 
-    server.listen(port, '127.0.0.1');
+    server.listen(port, LOCAL_HOSTNAME);
     server.on('error', () => {
       resolve(true);
     });
@@ -28,15 +28,15 @@ export default (params) => {
   ipcMain.on('startLocalServer', () => {
     if (!localServerStarted) {
       // Find next unused port for server
-      let port = DEFAULT_PORT;
+      let port = LOCAL_PORT;
       (async () => {
         // eslint-disable-next-line no-await-in-loop
-        while ((await portInUse(port)) && port < DEFAULT_PORT + 10) {
+        while ((await portInUse(port)) && port < LOCAL_PORT + 10) {
           port += 1;
         }
         console.log('Starting local server on port', port);
 
-        startServer(app.getPath('userData'), port);
+        startServer(userDataPath(), port);
 
         params.mainWindow.webContents.send('localServerPort', {
           port,
diff --git a/src/electron/macOSPermissions.js b/src/electron/macOSPermissions.js
index 940b16c6e..887af2903 100644
--- a/src/electron/macOSPermissions.js
+++ b/src/electron/macOSPermissions.js
@@ -1,83 +1,80 @@
-import { app, systemPreferences, dialog } from 'electron';
-import fs from 'fs';
+import { systemPreferences, dialog } from 'electron';
+import { pathExistsSync, mkdirSync, writeFileSync } from 'fs-extra';
 import macosVersion from 'macos-version';
-import path from 'path';
-import { isMac } from '../environment';
-
-let askForScreenCaptureAccess;
-if (isMac) {
-  // eslint-disable-next-line global-require
-  askForScreenCaptureAccess = require('node-mac-permissions').askForScreenCaptureAccess;
-}
+import { dirname } from 'path';
+import { askForScreenCaptureAccess } from 'node-mac-permissions';
+import { userDataPath } from '../environment';
 
 const debug = require('debug')('Ferdi:macOSPermissions');
 
-const permissionExists = macosVersion.isGreaterThanOrEqualTo('10.15');
-const filePath = path.join(app.getPath('userData'), '.has-app-requested-screen-capture-permissions');
+const isExplicitScreenCapturePermissionReqd = macosVersion.isGreaterThanOrEqualTo('10.15');
+debug(`Should check explicitly for screen-capture permissions: ${isExplicitScreenCapturePermissionReqd}`);
 
-function hasPromptedForPermission() {
-  if (!permissionExists) {
-    return false;
-  }
+const filePath = userDataPath('.has-app-requested-screen-capture-permissions');
 
-  if (filePath && fs.existsSync(filePath)) {
-    return true;
+function hasPromptedForScreenCapturePermission() {
+  if (!isExplicitScreenCapturePermissionReqd) {
+    return false;
   }
 
-  return false;
+  debug('Checking if status file exists');
+  return filePath && pathExistsSync(filePath);
 }
 
-function hasScreenCapturePermission() {
-  if (!permissionExists) {
+function hasScreenCapturePermissionAlreadyBeenGranted() {
+  if (!isExplicitScreenCapturePermissionReqd) {
     return true;
   }
 
   const screenCaptureStatus = systemPreferences.getMediaAccessStatus('screen');
+  debug(`screen-capture permissions status: ${screenCaptureStatus}`);
   return screenCaptureStatus === 'granted';
 }
 
 function createStatusFile() {
   try {
-    fs.writeFileSync(filePath, '');
+    writeFileSync(filePath, '');
   } catch (error) {
     if (error.code === 'ENOENT') {
-      fs.mkdirSync(path.dirname(filePath));
-      fs.writeFileSync(filePath, '');
+      mkdirSync(dirname(filePath));
+      writeFileSync(filePath, '');
     }
 
     throw error;
   }
 }
 
-export default async function (mainWindow) {
+export const askFormacOSPermissions = async mainWindow => {
   debug('Checking camera & microphone permissions');
   systemPreferences.askForMediaAccess('camera');
   systemPreferences.askForMediaAccess('microphone');
 
-  if (!hasPromptedForPermission() && !hasScreenCapturePermission()) {
+  if (hasScreenCapturePermissionAlreadyBeenGranted()) {
+    debug('Already obtained screen-capture permissions - writing status file');
+    createStatusFile();
+    return;
+  }
+
+  if (!hasPromptedForScreenCapturePermission()) {
     debug('Checking screen capture permissions');
 
     const { response } = await dialog.showMessageBox(mainWindow, {
       type: 'info',
       message: 'Enable Screen Sharing',
-      detail: 'To enable screen sharing for some services, Ferdi needs the permission to record your screen.',
-      buttons: [
-        'Allow screen sharing',
-        'No',
-        'Ask me later',
-      ],
+      detail:
+        'To enable screen sharing for some services, Ferdi needs the permission to record your screen.',
+      buttons: ['Allow screen sharing', 'No', 'Ask me later'],
       defaultId: 0,
       cancelId: 2,
     });
 
-    console.log('result', response);
     if (response === 0) {
       debug('Asking for access');
       askForScreenCaptureAccess();
       createStatusFile();
     } else if (response === 1) {
-      debug('Don\'t ask again');
+      debug("Don't ask again");
       createStatusFile();
     }
   }
-}
+};
diff --git a/src/electron/webview-ime-focus.js b/src/electron/webview-ime-focus.js
index b9421eb06..e187ee0b4 100644
--- a/src/electron/webview-ime-focus.js
+++ b/src/electron/webview-ime-focus.js
@@ -1,5 +1,5 @@
-const { webContents } = require('@electron/remote');
-const { releaseDocumentFocus } = require('./webview-ime-focus-helpers');
+import { webContents } from '@electron/remote';
+import { releaseDocumentFocus } from './webview-ime-focus-helpers';
 
 function giveWebviewDocumentFocus(element) {
   releaseDocumentFocus();
diff --git a/src/environment.js b/src/environment.js
index 758a33380..42c6b2927 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -1,10 +1,11 @@
 import os from 'os';
-import path from 'path';
+import { join } from 'path';
 
 import { is, api as electronApi } from 'electron-util';
 
 import { DEFAULT_ACCENT_COLOR } from '@meetfranz/theme';
 
+import osName from 'os-name';
 import {
   LIVE_FERDI_API,
   DEV_FRANZ_API,
@@ -17,7 +18,6 @@ import {
   DEV_WS_API,
   LOCAL_TODOS_FRONTEND_URL,
   PRODUCTION_TODOS_FRONTEND_URL,
-  LIVE_FRANZ_API,
   DEFAULT_TODO_SERVICE,
   SEARCH_ENGINE_DDG,
   iconSizeBias,
@@ -26,8 +26,6 @@ import {
 import { asarPath } from './helpers/asar-helpers';
 import * as buildInfo from './buildInfo.json'; // eslint-disable-line import/no-unresolved
 
-const osName = require('os-name');
-
 export const { app } = electronApi;
 export const ferdiVersion = app.getVersion();
 export const electronVersion = process.versions.electron;
@@ -37,26 +35,35 @@ export const nodeVersion = process.versions.node;
 // Set app directory before loading user modules
 if (process.env.FERDI_APPDATA_DIR != null) {
   app.setPath('appData', process.env.FERDI_APPDATA_DIR);
-  app.setPath('userData', path.join(app.getPath('appData')));
+  app.setPath('userData', join(app.getPath('appData')));
 } else if (process.env.PORTABLE_EXECUTABLE_DIR != null) {
   app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.name}AppData`);
-  app.setPath('userData', path.join(app.getPath('appData'), `${app.name}AppData`));
+  app.setPath('userData', join(app.getPath('appData'), `${app.name}AppData`));
 } else if (is.windows) {
   app.setPath('appData', process.env.APPDATA);
-  app.setPath('userData', path.join(app.getPath('appData'), app.name));
+  app.setPath('userData', join(app.getPath('appData'), app.name));
 }
 
 export const isDevMode = is.development;
 if (isDevMode) {
-  app.setPath('userData', path.join(app.getPath('appData'), `${app.name}Dev`));
+  app.setPath('userData', join(app.getPath('appData'), `${app.name}Dev`));
 }
 
-export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config');
+export function userDataPath(...segments) {
+  return join(app.getPath('userData'), ...([segments].flat()));
+}
+
+export function userDataRecipesPath(...segments) {
+  return userDataPath('recipes', ...([segments].flat()));
+}
 
 // Replacing app.asar is not beautiful but unfortunately necessary
-export const RECIPES_PATH = asarPath(path.join(__dirname, 'recipes'));
+export function asarRecipesPath(...segments) {
+  return join(asarPath(join(__dirname, 'recipes')), ...([segments].flat()));
+}
 
-export const useLiveAPI = process.env.LIVE_API;
+export const useLiveAPI = process.env.USE_LIVE_API;
+const useLocalAPI = process.env.USE_LOCAL_API;
 
 export const isMac = is.macos;
 export const isWindows = is.windows;
@@ -66,8 +73,22 @@ export const osArch = os.arch();
 export const osRelease = os.release();
 export const is64Bit = osArch.match(/64/);
 
-export const ctrlKey = isMac ? '⌘' : 'Ctrl';
-export const cmdKey = isMac ? 'Cmd' : 'Ctrl';
+// for accelerator, show the shortform that electron/OS understands
+// for tooltip, show symbol
+const ctrlKey = isMac ? '⌘' : 'Ctrl';
+const cmdKey = isMac ? 'Cmd' : 'Ctrl';
+
+export const altKey = isMac ? '⌥' : 'Alt';
+export const shiftKey = isMac ? '⇧' : 'Shift';
+
+// Platform specific shortcut keys
+export const shortcutKey = (isAccelerator = true) => (isAccelerator ? cmdKey : ctrlKey);
+export const lockFerdiShortcutKey = (isAccelerator = true) => `${shortcutKey(isAccelerator)}+${shiftKey}+L`;
+export const todosToggleShortcutKey = (isAccelerator = true) => `${shortcutKey(isAccelerator)}+T`;
+export const workspaceToggleShortcutKey = (isAccelerator = true) => `${shortcutKey(isAccelerator)}+D`;
+export const muteFerdiShortcutKey = (isAccelerator = true) => `${shortcutKey(isAccelerator)}+${shiftKey}+M`;
+export const addNewServiceShortcutKey = (isAccelerator = true) => `${shortcutKey(isAccelerator)}+N`;
+export const settingsShortcutKey = (isAccelerator = true) => `${shortcutKey(isAccelerator)}+${isMac ? ',' : 'P'}`;
 
 let api;
 let wsApi;
@@ -75,12 +96,10 @@ let web;
 let todos;
 if (!isDevMode || (isDevMode && useLiveAPI)) {
   api = LIVE_FERDI_API;
-  // api = DEV_FRANZ_API;
   wsApi = LIVE_WS_API;
   web = LIVE_API_FERDI_WEBSITE;
-  // web = DEV_API_FRANZ_WEBSITE;
   todos = PRODUCTION_TODOS_FRONTEND_URL;
-} else if (isDevMode && process.env.LOCAL_API) {
+} else if (isDevMode && useLocalAPI) {
   api = LOCAL_API;
   wsApi = LOCAL_WS_API;
   web = LOCAL_API_WEBSITE;
@@ -120,7 +139,6 @@ export const DEFAULT_APP_SETTINGS = {
   beta: false,
   isAppMuted: false,
   enableGPUAcceleration: true,
-  serviceLimit: 5,
 
   // Ferdi specific options
   server: LIVE_FERDI_API,
@@ -133,9 +151,9 @@ export const DEFAULT_APP_SETTINGS = {
   scheduledDNDEnabled: false,
   scheduledDNDStart: '17:00',
   scheduledDNDEnd: '09:00',
-  hibernate: false,
   hibernateOnStartup: true,
-  hibernationStrategy: 300,
+  hibernationStrategy: '300', // seconds
+  wakeUpStrategy: '300', // seconds
   inactivityLock: 0,
   automaticUpdates: true,
   showServiceNavigationBar: false,
@@ -153,10 +171,6 @@ export const DEFAULT_APP_SETTINGS = {
   alwaysShowWorkspaces: false,
 };
 
-export function termsBase() {
-  return window.ferdi.stores.settings.all.app.server !== LIVE_FRANZ_API ? window.ferdi.stores.settings.all.app.server : DEV_API_FRANZ_WEBSITE;
-}
-
 export function aboutAppDetails() {
   return [
     `Version: ${ferdiVersion}`,
diff --git a/src/features/announcements/api.js b/src/features/announcements/api.js
index 53df69eed..a7fe24bb1 100644
--- a/src/features/announcements/api.js
+++ b/src/features/announcements/api.js
@@ -1,7 +1,7 @@
 import { app } from '@electron/remote';
 import Request from '../../stores/lib/Request';
 import apiBase from '../../api/apiBase';
-import { GITHUB_FERDI_REPO_NAME, GITHUB_ORG_NAME } from '../../config';
+import { GITHUB_FERDI_REPO_NAME, GITHUB_NIGHTLIES_REPO_NAME, GITHUB_ORG_NAME } from '../../config';
 
 const debug = require('debug')('Ferdi:feature:announcements:api');
 
@@ -12,8 +12,8 @@ export const announcementsApi = {
   },
 
   async getChangelog(version) {
-    // TODO: This doesn't seem to handle the different 'nightlies' repo that we currently use. Needs to be fixed.
-    const url = `https://api.github.com/repos/${GITHUB_ORG_NAME}/${GITHUB_FERDI_REPO_NAME}/releases/tags/v${version}`;
+    const ferdiRepoName = version.includes('nightly') ? GITHUB_NIGHTLIES_REPO_NAME : GITHUB_FERDI_REPO_NAME;
+    const url = `https://api.github.com/repos/${GITHUB_ORG_NAME}/${ferdiRepoName}/releases/tags/v${version}`;
     debug(`fetching release changelog from Github url: ${url}`);
     const request = await window.fetch(url, { method: 'GET' });
     if (!request.ok) return null;
@@ -22,7 +22,7 @@ export const announcementsApi = {
   },
 
   async getAnnouncement(version) {
-    const url = `${apiBase(true)}/announcements/${version}`;
+    const url = `${apiBase()}/announcements/${version}`;
     debug(`fetching release announcement from api url: ${url}`);
     const response = await window.fetch(url, { method: 'GET' });
     if (!response.ok) return null;
diff --git a/src/features/announcements/components/AnnouncementScreen.js b/src/features/announcements/components/AnnouncementScreen.js
index 21964b108..315843db3 100644
--- a/src/features/announcements/components/AnnouncementScreen.js
+++ b/src/features/announcements/components/AnnouncementScreen.js
@@ -25,7 +25,7 @@ const messages = defineMessages({
 
 const smallScreen = '1000px';
 
-const styles = theme => ({
+const styles = (theme) => ({
   container: {
     background: theme.colorBackground,
     position: 'relative',
diff --git a/src/features/communityRecipes/index.js b/src/features/communityRecipes/index.js
index 39f7e9cd6..828c6d867 100644
--- a/src/features/communityRecipes/index.js
+++ b/src/features/communityRecipes/index.js
@@ -1,26 +1,7 @@
-import { reaction } from 'mobx';
 import { CommunityRecipesStore } from './store';
 
-const debug = require('debug')('Ferdi:feature:communityRecipes');
-
 export const communityRecipesStore = new CommunityRecipesStore();
 
 export default function initCommunityRecipes(stores, actions) {
-  const { features } = stores;
-
   communityRecipesStore.start(stores, actions);
-
-  // Toggle communityRecipe premium status
-  reaction(
-    () => (
-      features.features.isCommunityRecipesIncludedInCurrentPlan
-    ),
-    (isPremiumFeature) => {
-      debug('Community recipes is premium feature: ', isPremiumFeature);
-      communityRecipesStore.isCommunityRecipesIncludedInCurrentPlan = true;
-    },
-    {
-      fireImmediately: true,
-    },
-  );
 }
diff --git a/src/features/communityRecipes/store.js b/src/features/communityRecipes/store.js
index 3a60e5449..a3614dd11 100644
--- a/src/features/communityRecipes/store.js
+++ b/src/features/communityRecipes/store.js
@@ -1,11 +1,9 @@
-import { computed, observable } from 'mobx';
+import { computed } from 'mobx';
 import { FeatureStore } from '../utils/FeatureStore';
 
 const debug = require('debug')('Ferdi:feature:communityRecipes:store');
 
 export class CommunityRecipesStore extends FeatureStore {
-  @observable isCommunityRecipesIncludedInCurrentPlan = true;
-
   start(stores, actions) {
     debug('start');
     this.stores = stores;
@@ -21,7 +19,8 @@ export class CommunityRecipesStore extends FeatureStore {
     if (!this.stores) return [];
 
     return this.stores.recipePreviews.dev.map((r) => {
-      r.isDevRecipe = !!r.author.find(a => a.email === this.stores.user.data.email);
+      // TODO: Need to figure out if this is even necessary/used
+      r.isDevRecipe = !!r.author.find((a) => a.email === this.stores.user.data.email);
 
       return r;
     });
diff --git a/src/features/delayApp/Component.js b/src/features/delayApp/Component.js
deleted file mode 100644
index 6471240ab..000000000
--- a/src/features/delayApp/Component.js
+++ /dev/null
@@ -1,120 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { inject, observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
-import injectSheet from 'react-jss';
-
-import { Button } from '@meetfranz/forms';
-
-import { config } from './constants';
-import styles from './styles';
-import UserStore from '../../stores/UserStore';
-import UIStore from '../../stores/UIStore';
-import { FeatureStore } from '../utils/FeatureStore';
-
-const messages = defineMessages({
-  headline: {
-    id: 'feature.delayApp.headline',
-    defaultMessage: '!!!Please purchase license to skip waiting',
-  },
-  headlineTrial: {
-    id: 'feature.delayApp.trial.headline',
-    defaultMessage: '!!!Get the free Franz Professional 14 day trial and skip the line',
-  },
-  action: {
-    id: 'feature.delayApp.upgrade.action',
-    defaultMessage: '!!!Upgrade Franz',
-  },
-  actionTrial: {
-    id: 'feature.delayApp.trial.action',
-    defaultMessage: '!!!Yes, I want the free 14 day trial of Franz Professional',
-  },
-  text: {
-    id: 'feature.delayApp.text',
-    defaultMessage: '!!!Ferdi will continue in {seconds} seconds.',
-  },
-});
-
-export default @inject('stores', 'actions') @injectSheet(styles) @observer class DelayApp extends Component {
-  static propTypes = {
-    // eslint-disable-next-line
-    classes: PropTypes.object.isRequired,
-  };
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  state = {
-    countdown: config.delayDuration,
-  };
-
-  countdownInterval = null;
-
-  countdownIntervalTimeout = 1000;
-
-  componentDidMount() {
-    this.countdownInterval = setInterval(() => {
-      this.setState(prevState => ({
-        countdown: prevState.countdown - this.countdownIntervalTimeout,
-      }));
-
-      if (this.state.countdown <= 0) {
-        // reload();
-        clearInterval(this.countdownInterval);
-      }
-    }, this.countdownIntervalTimeout);
-  }
-
-  componentWillUnmount() {
-    clearInterval(this.countdownInterval);
-  }
-
-  handleCTAClick() {
-    const { actions, stores } = this.props;
-    const { hadSubscription } = stores.user.data;
-    const { defaultTrialPlan } = stores.features.features;
-
-    if (!hadSubscription) {
-      actions.user.activateTrial({ planId: defaultTrialPlan });
-    } else {
-      actions.ui.openSettings({ path: 'user' });
-    }
-  }
-
-  render() {
-    const { classes, stores } = this.props;
-    const { intl } = this.context;
-
-    const { hadSubscription } = stores.user.data;
-
-    return (
-      <div className={`${classes.container}`}>
-        <h1 className={classes.headline}>{intl.formatMessage(hadSubscription ? messages.headline : messages.headlineTrial)}</h1>
-        <Button
-          label={intl.formatMessage(hadSubscription ? messages.action : messages.actionTrial)}
-          className={classes.button}
-          buttonType="inverted"
-          onClick={this.handleCTAClick.bind(this)}
-          busy={stores.user.activateTrialRequest.isExecuting}
-        />
-        <p className="footnote">
-          {intl.formatMessage(messages.text, {
-            seconds: this.state.countdown / 1000,
-          })}
-        </p>
-      </div>
-    );
-  }
-}
-
-DelayApp.wrappedComponent.propTypes = {
-  stores: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-    features: PropTypes.instanceOf(FeatureStore).isRequired,
-  }).isRequired,
-  actions: PropTypes.shape({
-    ui: PropTypes.instanceOf(UIStore).isRequired,
-    user: PropTypes.instanceOf(UserStore).isRequired,
-  }).isRequired,
-};
diff --git a/src/features/delayApp/constants.js b/src/features/delayApp/constants.js
deleted file mode 100644
index 72cc4246e..000000000
--- a/src/features/delayApp/constants.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { DEFAULT_FEATURES_CONFIG } from '../../config';
-
-export const config = {
-  delayOffset: DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.delayOffset,
-  delayDuration: DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.wait,
-};
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
deleted file mode 100644
index f0c2bdc82..000000000
--- a/src/features/delayApp/index.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import { autorun, observable, reaction } from 'mobx';
-import moment from 'moment';
-import DelayAppComponent from './Component';
-import { config } from './constants';
-import { DEFAULT_FEATURES_CONFIG } from '../../config';
-import { getUserWorkspacesRequest } from '../workspaces/api';
-
-const debug = require('debug')('Ferdi:feature:delayApp');
-
-export const state = observable({
-  isDelayAppScreenVisible: DEFAULT_FEATURES_CONFIG.needToWaitToProceed,
-});
-
-function setVisibility(value) {
-  Object.assign(state, {
-    isDelayAppScreenVisible: value,
-  });
-}
-
-export default function init(stores) {
-  debug('Initializing `delayApp` feature');
-
-  let shownAfterLaunch = false;
-  let timeLastDelay = moment();
-
-  window.ferdi.features.delayApp = {
-    state,
-  };
-
-  reaction(
-    () => (
-      stores.user.isLoggedIn
-      && stores.services.allServicesRequest.wasExecuted
-      && getUserWorkspacesRequest.wasExecuted
-      && stores.features.features.needToWaitToProceed
-      && !stores.user.data.isPremium
-    ),
-    (isEnabled) => {
-      if (isEnabled) {
-        debug('Enabling `delayApp` feature');
-
-        const { needToWaitToProceedConfig: globalConfig } = stores.features.features;
-
-        config.delayOffset = globalConfig.delayOffset !== undefined ? globalConfig.delayOffset : DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.delayOffset;
-        config.delayDuration = globalConfig.wait !== undefined ? globalConfig.wait : DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.wait;
-
-        autorun(() => {
-          const { isAnnouncementShown } = stores.announcements;
-          if (stores.services.allDisplayed.length === 0 || isAnnouncementShown) {
-            shownAfterLaunch = true;
-            setVisibility(false);
-            return;
-          }
-
-          const diff = moment().diff(timeLastDelay);
-          const itsTimeToWait = diff >= config.delayOffset;
-          if (!isAnnouncementShown && ((stores.app.isFocused && itsTimeToWait) || !shownAfterLaunch)) {
-            debug(`App will be delayed for ${config.delayDuration / 1000}s`);
-
-            setVisibility(true);
-
-            setTimeout(() => {
-              debug('Resetting app delay');
-
-              shownAfterLaunch = true;
-              timeLastDelay = moment();
-              setVisibility(false);
-            }, config.delayDuration + 1000); // timer needs to be able to hit 0
-          } else {
-            setVisibility(false);
-          }
-        });
-      } else {
-        setVisibility(false);
-      }
-    },
-  );
-}
-
-export const Component = DelayAppComponent;
diff --git a/src/features/delayApp/styles.js b/src/features/delayApp/styles.js
deleted file mode 100644
index 69c3c7a27..000000000
--- a/src/features/delayApp/styles.js
+++ /dev/null
@@ -1,22 +0,0 @@
-export default theme => ({
-  container: {
-    background: theme.colorBackground,
-    top: 0,
-    width: '100%',
-    display: 'flex',
-    'flex-direction': 'column',
-    'align-items': 'center',
-    'justify-content': 'center',
-    'z-index': 150,
-  },
-  headline: {
-    color: theme.colorHeadline,
-    margin: [25, 0, 40],
-    'max-width': 500,
-    'text-align': 'center',
-    'line-height': '1.3em',
-  },
-  button: {
-    margin: [40, 0, 20],
-  },
-});
diff --git a/src/features/planSelection/actions.js b/src/features/planSelection/actions.js
deleted file mode 100644
index 83f58bfd7..000000000
--- a/src/features/planSelection/actions.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import PropTypes from 'prop-types';
-import { createActionsFromDefinitions } from '../../actions/lib/actions';
-
-export const planSelectionActions = createActionsFromDefinitions({
-  downgradeAccount: {},
-  hideOverlay: {},
-}, PropTypes.checkPropTypes);
-
-export default planSelectionActions;
diff --git a/src/features/planSelection/api.js b/src/features/planSelection/api.js
deleted file mode 100644
index 16bf9ff2d..000000000
--- a/src/features/planSelection/api.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { sendAuthRequest } from '../../api/utils/auth';
-import Request from '../../stores/lib/Request';
-import apiBase from '../../api/apiBase';
-
-const debug = require('debug')('Ferdi:feature:planSelection:api');
-
-export const planSelectionApi = {
-  downgrade: async () => {
-    const url = `${apiBase()}/payment/downgrade`;
-    const options = {
-      method: 'PUT',
-    };
-    debug('downgrade UPDATE', url, options);
-    const result = await sendAuthRequest(url, options);
-    debug('downgrade RESULT', result);
-    if (!result.ok) throw result;
-
-    return result.ok;
-  },
-};
-
-export const downgradeUserRequest = new Request(planSelectionApi, 'downgrade');
-
-export const resetApiRequests = () => {
-  downgradeUserRequest.reset();
-};
diff --git a/src/features/planSelection/components/PlanItem.js b/src/features/planSelection/components/PlanItem.js
deleted file mode 100644
index e90532dec..000000000
--- a/src/features/planSelection/components/PlanItem.js
+++ /dev/null
@@ -1,215 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
-import injectSheet from 'react-jss';
-import classnames from 'classnames';
-import color from 'color';
-
-import { H2 } from '@meetfranz/ui';
-
-import { Button } from '@meetfranz/forms';
-import { mdiArrowRight } from '@mdi/js';
-
-const messages = defineMessages({
-  perMonth: {
-    id: 'subscription.interval.perMonth',
-    defaultMessage: '!!!per month',
-  },
-  perMonthPerUser: {
-    id: 'subscription.interval.perMonthPerUser',
-    defaultMessage: '!!!per month & user',
-  },
-  bestValue: {
-    id: 'subscription.bestValue',
-    defaultMessage: '!!!Best value',
-  },
-});
-
-const styles = theme => ({
-  root: {
-    display: 'flex',
-    flexDirection: 'column',
-    borderRadius: theme.borderRadius,
-    flex: 1,
-    color: theme.styleTypes.primary.accent,
-    overflow: 'hidden',
-    textAlign: 'center',
-
-    '& h2': {
-      textAlign: 'center',
-      marginBottom: 10,
-      fontSize: 30,
-      color: theme.styleTypes.primary.contrast,
-    },
-  },
-  currency: {
-    fontSize: 35,
-  },
-  priceWrapper: {
-    height: 50,
-    marginBottom: 0,
-    marginTop: ({ text }) => (!text ? 15 : 0),
-  },
-  price: {
-    fontSize: 50,
-
-    '& sup': {
-      fontSize: 20,
-      verticalAlign: 20,
-    },
-  },
-  text: {
-    marginBottom: 'auto',
-  },
-  cta: {
-    background: theme.styleTypes.primary.accent,
-    color: theme.styleTypes.primary.contrast,
-    margin: [30, 'auto', 0, 'auto'],
-  },
-  divider: {
-    width: 40,
-    border: 0,
-    borderTop: [1, 'solid', theme.styleTypes.primary.contrast],
-    margin: [15, 'auto', 20],
-  },
-  header: {
-    padding: 20,
-    background: color(theme.styleTypes.primary.accent).darken(0.25).hex(),
-    color: theme.styleTypes.primary.contrast,
-    position: 'relative',
-    height: 'auto',
-  },
-  content: {
-    padding: [10, 20, 20],
-    background: '#EFEFEF',
-    display: 'flex',
-    flexDirection: 'column',
-    justifyContent: 'space-between',
-  },
-  simpleCTA: {
-    background: 'none',
-    color: theme.styleTypes.primary.accent,
-
-    '& svg': {
-      fill: theme.styleTypes.primary.accent,
-    },
-  },
-  bestValue: {
-    background: theme.styleTypes.success.accent,
-    color: theme.styleTypes.success.contrast,
-    right: -66,
-    top: -40,
-    height: 'auto',
-    position: 'absolute',
-    transform: 'rotateZ(45deg)',
-    textAlign: 'center',
-    padding: [5, 50],
-    transformOrigin: 'left bottom',
-    fontSize: 12,
-    boxShadow: '0 2px 6px rgba(0,0,0,0.15)',
-  },
-});
-
-export default @observer @injectSheet(styles) class PlanItem extends Component {
-  static propTypes = {
-    name: PropTypes.string.isRequired,
-    text: PropTypes.string.isRequired,
-    price: PropTypes.number.isRequired,
-    currency: PropTypes.string.isRequired,
-    upgrade: PropTypes.func.isRequired,
-    ctaLabel: PropTypes.string.isRequired,
-    simpleCTA: PropTypes.bool,
-    perUser: PropTypes.bool,
-    classes: PropTypes.object.isRequired,
-    bestValue: PropTypes.bool,
-    className: PropTypes.string,
-    children: PropTypes.element,
-  };
-
-  static defaultProps = {
-    simpleCTA: false,
-    perUser: false,
-    children: null,
-    bestValue: false,
-    className: '',
-  }
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  render() {
-    const {
-      name,
-      text,
-      price,
-      currency,
-      classes,
-      upgrade,
-      ctaLabel,
-      simpleCTA,
-      perUser,
-      bestValue,
-      className,
-      children,
-    } = this.props;
-    const { intl } = this.context;
-
-    const priceParts = `${price}`.split('.');
-
-    return (
-      <div className={classnames({
-        [classes.root]: true,
-        [className]: className,
-      })}
-      >
-        <div className={classes.header}>
-          {bestValue && (
-            <div className={classes.bestValue}>
-              {intl.formatMessage(messages.bestValue)}
-            </div>
-          )}
-          <H2 className={classes.planName}>{name}</H2>
-          {text && (
-            <>
-              <p className={classes.text}>
-                {text}
-              </p>
-              <hr className={classes.divider} />
-            </>
-          )}
-          <p className={classes.priceWrapper}>
-            <span className={classes.currency}>{currency}</span>
-            <span className={classes.price}>
-              {priceParts[0]}
-              <sup>{priceParts[1]}</sup>
-            </span>
-          </p>
-          <p className={classes.interval}>
-            {intl.formatMessage(perUser ? messages.perMonthPerUser : messages.perMonth)}
-          </p>
-        </div>
-
-        <div className={classes.content}>
-          {children}
-
-          <Button
-            className={classnames({
-              [classes.cta]: true,
-              [classes.simpleCTA]: simpleCTA,
-            })}
-            icon={simpleCTA ? mdiArrowRight : null}
-            label={(
-              <>
-                {ctaLabel}
-              </>
-            )}
-            onClick={upgrade}
-          />
-        </div>
-
-      </div>
-    );
-  }
-}
diff --git a/src/features/planSelection/components/PlanSelection.js b/src/features/planSelection/components/PlanSelection.js
deleted file mode 100644
index 819a9df5b..000000000
--- a/src/features/planSelection/components/PlanSelection.js
+++ /dev/null
@@ -1,269 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { observer } from 'mobx-react';
-import injectSheet from 'react-jss';
-import { defineMessages, intlShape } from 'react-intl';
-import { H1, H2, Icon } from '@meetfranz/ui';
-import color from 'color';
-
-import { mdiArrowRight } from '@mdi/js';
-import PlanItem from './PlanItem';
-import { i18nPlanName } from '../../../helpers/plan-helpers';
-import { DEV_API_FRANZ_WEBSITE, PLANS } from '../../../config';
-import { FeatureList } from '../../../components/ui/FeatureList';
-import Appear from '../../../components/ui/effects/Appear';
-
-const messages = defineMessages({
-  welcome: {
-    id: 'feature.planSelection.fullscreen.welcome',
-    defaultMessage: '!!!Are you ready to choose, {name}',
-  },
-  subheadline: {
-    id: 'feature.planSelection.fullscreen.subheadline',
-    defaultMessage: '!!!It\'s time to make a choice. Franz works best on our Personal and Professional plans. Please have a look and choose the best one for you.',
-  },
-  textFree: {
-    id: 'feature.planSelection.free.text',
-    defaultMessage: '!!!Basic functionality',
-  },
-  textPersonal: {
-    id: 'feature.planSelection.personal.text',
-    defaultMessage: '!!!More services, no waiting - ideal for personal use.',
-  },
-  textProfessional: {
-    id: 'feature.planSelection.pro.text',
-    defaultMessage: '!!!Unlimited services and professional features for you - and your team.',
-  },
-  ctaStayOnFree: {
-    id: 'feature.planSelection.cta.stayOnFree',
-    defaultMessage: '!!!Stay on Free',
-  },
-  ctaDowngradeFree: {
-    id: 'feature.planSelection.cta.ctaDowngradeFree',
-    defaultMessage: '!!!Downgrade to Free',
-  },
-  actionTrial: {
-    id: 'feature.planSelection.cta.trial',
-    defaultMessage: '!!!Start my free 14-days Trial',
-  },
-  shortActionPersonal: {
-    id: 'feature.planSelection.cta.upgradePersonal',
-    defaultMessage: '!!!Choose Personal',
-  },
-  shortActionPro: {
-    id: 'feature.planSelection.cta.upgradePro',
-    defaultMessage: '!!!Choose Professional',
-  },
-  fullFeatureList: {
-    id: 'feature.planSelection.fullFeatureList',
-    defaultMessage: '!!!Complete comparison of all plans',
-  },
-  pricesBasedOnAnnualPayment: {
-    id: 'feature.planSelection.pricesBasedOnAnnualPayment',
-    defaultMessage: '!!!All prices based on yearly payment',
-  },
-});
-
-const styles = theme => ({
-  root: {
-    background: theme.colorModalOverlayBackground,
-    width: '100%',
-    height: '100%',
-    position: 'absolute',
-    top: 0,
-    left: 0,
-    display: 'flex',
-    justifyContent: 'center',
-    alignItems: 'center',
-    zIndex: 999999,
-    overflowY: 'scroll',
-  },
-  container: {
-    // width: '80%',
-    height: 'auto',
-    // background: theme.styleTypes.primary.accent,
-    // padding: 40,
-    borderRadius: theme.borderRadius,
-    maxWidth: 1000,
-
-    '& h1, & h2': {
-      textAlign: 'center',
-      color: theme.styleTypes.primary.contrast,
-    },
-  },
-  plans: {
-    display: 'flex',
-    margin: [40, 0, 0],
-    height: 'auto',
-
-    '& > div': {
-      margin: [0, 15],
-      flex: 1,
-      height: 'auto',
-      background: theme.styleTypes.primary.contrast,
-      boxShadow: [0, 2, 30, color('#000').alpha(0.1).rgb().string()],
-    },
-  },
-  headline: {
-    fontSize: 40,
-  },
-  subheadline: {
-    maxWidth: 660,
-    fontSize: 22,
-    lineHeight: 1.1,
-    margin: [0, 'auto'],
-  },
-  featureList: {
-    '& li': {
-      borderBottom: [1, 'solid', '#CECECE'],
-    },
-  },
-  footer: {
-    display: 'flex',
-    color: theme.styleTypes.primary.contrast,
-    marginTop: 20,
-    padding: [0, 15],
-  },
-  fullFeatureList: {
-    marginRight: 'auto',
-    textAlign: 'center',
-    display: 'flex',
-    justifyContent: 'center',
-    alignItems: 'center',
-    color: `${theme.styleTypes.primary.contrast} !important`,
-
-    '& svg': {
-      marginRight: 5,
-    },
-  },
-  scrollContainer: {
-    border: '1px solid red',
-    overflow: 'scroll-x',
-  },
-  featuredPlan: {
-    transform: ({ isPersonalPlanAvailable }) => (isPersonalPlanAvailable ? 'scale(1.05)' : null),
-  },
-  disclaimer: {
-    textAlign: 'right',
-    margin: [10, 15, 0, 0],
-  },
-});
-
-@injectSheet(styles) @observer
-class PlanSelection extends Component {
-  static propTypes = {
-    classes: PropTypes.object.isRequired,
-    firstname: PropTypes.string.isRequired,
-    plans: PropTypes.object.isRequired,
-    currency: PropTypes.string.isRequired,
-    subscriptionExpired: PropTypes.bool.isRequired,
-    upgradeAccount: PropTypes.func.isRequired,
-    stayOnFree: PropTypes.func.isRequired,
-    hadSubscription: PropTypes.bool.isRequired,
-    isPersonalPlanAvailable: PropTypes.bool,
-  };
-
-  static defaultProps = {
-    isPersonalPlanAvailable: true,
-  }
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  componentDidMount() {
-  }
-
-  render() {
-    const {
-      classes,
-      firstname,
-      plans,
-      currency,
-      subscriptionExpired,
-      upgradeAccount,
-      stayOnFree,
-      hadSubscription,
-      isPersonalPlanAvailable,
-    } = this.props;
-
-    const { intl } = this.context;
-
-    return (
-      <Appear>
-        <div
-          className={classes.root}
-        >
-          <div className={classes.container}>
-            <H1 className={classes.headline}>{intl.formatMessage(messages.welcome, { name: firstname })}</H1>
-            {isPersonalPlanAvailable && (
-              <H2 className={classes.subheadline}>{intl.formatMessage(messages.subheadline)}</H2>
-            )}
-            <div className={classes.plans}>
-              <PlanItem
-                name={i18nPlanName(PLANS.FREE, intl)}
-                text={isPersonalPlanAvailable ? intl.formatMessage(messages.textFree) : null}
-                price={0}
-                currency={currency}
-                ctaLabel={intl.formatMessage(subscriptionExpired ? messages.ctaDowngradeFree : messages.ctaStayOnFree)}
-                upgrade={() => stayOnFree()}
-                simpleCTA
-              >
-                <FeatureList
-                  plan={PLANS.FREE}
-                  className={classes.featureList}
-                />
-              </PlanItem>
-              <PlanItem
-                name={i18nPlanName(plans.pro.yearly.id, intl)}
-                text={isPersonalPlanAvailable ? intl.formatMessage(messages.textProfessional) : null}
-                price={plans.pro.yearly.price}
-                currency={currency}
-                ctaLabel={intl.formatMessage(hadSubscription ? messages.shortActionPro : messages.actionTrial)}
-                upgrade={() => upgradeAccount(plans.pro.yearly.id)}
-                className={classes.featuredPlan}
-                perUser
-                bestValue={isPersonalPlanAvailable}
-              >
-                <FeatureList
-                  plan={isPersonalPlanAvailable ? PLANS.PRO : null}
-                  className={classes.featureList}
-                />
-              </PlanItem>
-              {isPersonalPlanAvailable && (
-                <PlanItem
-                  name={i18nPlanName(plans.personal.yearly.id, intl)}
-                  text={intl.formatMessage(messages.textPersonal)}
-                  price={plans.personal.yearly.price}
-                  currency={currency}
-                  ctaLabel={intl.formatMessage(hadSubscription ? messages.shortActionPersonal : messages.actionTrial)}
-                  upgrade={() => upgradeAccount(plans.personal.yearly.id)}
-                >
-                  <FeatureList
-                    plan={PLANS.PERSONAL}
-                    className={classes.featureList}
-                  />
-                </PlanItem>
-              )}
-            </div>
-            <div className={classes.footer}>
-              <a
-                href={`${DEV_API_FRANZ_WEBSITE}/pricing`}
-                target="_blank"
-                className={classes.fullFeatureList}
-              >
-                <Icon icon={mdiArrowRight} />
-                {intl.formatMessage(messages.fullFeatureList)}
-              </a>
-              {/* <p className={classes.disclaimer}> */}
-              {intl.formatMessage(messages.pricesBasedOnAnnualPayment)}
-              {/* </p> */}
-            </div>
-          </div>
-        </div>
-      </Appear>
-    );
-  }
-}
-
-export default PlanSelection;
diff --git a/src/features/planSelection/containers/PlanSelectionScreen.js b/src/features/planSelection/containers/PlanSelectionScreen.js
deleted file mode 100644
index 594829c01..000000000
--- a/src/features/planSelection/containers/PlanSelectionScreen.js
+++ /dev/null
@@ -1,120 +0,0 @@
-import React, { Component } from 'react';
-import { observer, inject } from 'mobx-react';
-import PropTypes from 'prop-types';
-import { dialog, app } from '@electron/remote';
-import { defineMessages, intlShape } from 'react-intl';
-
-import FeaturesStore from '../../../stores/FeaturesStore';
-import UserStore from '../../../stores/UserStore';
-import PlanSelection from '../components/PlanSelection';
-import ErrorBoundary from '../../../components/util/ErrorBoundary';
-import { planSelectionStore } from '..';
-import PaymentStore from '../../../stores/PaymentStore';
-
-const messages = defineMessages({
-  dialogTitle: {
-    id: 'feature.planSelection.fullscreen.dialog.title',
-    defaultMessage: '!!!Downgrade your Franz Plan',
-  },
-  dialogMessage: {
-    id: 'feature.planSelection.fullscreen.dialog.message',
-    defaultMessage: '!!!You\'re about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.',
-  },
-  dialogCTADowngrade: {
-    id: 'feature.planSelection.fullscreen.dialog.cta.downgrade',
-    defaultMessage: '!!!Downgrade to Free',
-  },
-  dialogCTAUpgrade: {
-    id: 'feature.planSelection.fullscreen.dialog.cta.upgrade',
-    defaultMessage: '!!!Choose Personal',
-  },
-});
-
-@inject('stores', 'actions') @observer
-class PlanSelectionScreen extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  upgradeAccount(planId) {
-    const { upgradeAccount } = this.props.actions.payment;
-
-    upgradeAccount({
-      planId,
-    });
-  }
-
-  render() {
-    if (!planSelectionStore || !planSelectionStore.isFeatureActive || !planSelectionStore.showPlanSelectionOverlay) {
-      return null;
-    }
-
-    const { intl } = this.context;
-
-    const { user, features } = this.props.stores;
-    const { isPersonalPlanAvailable, pricingConfig } = features.features;
-    const { plans, currency } = pricingConfig;
-    const { activateTrial } = this.props.actions.user;
-    const { downgradeAccount, hideOverlay } = this.props.actions.planSelection;
-
-    return (
-      <ErrorBoundary>
-        <PlanSelection
-          firstname={user.data.firstname}
-          plans={plans}
-          currency={currency}
-          upgradeAccount={(planId) => {
-            if (user.data.hadSubscription) {
-              this.upgradeAccount(planId);
-            } else {
-              activateTrial({
-                planId,
-              });
-            }
-          }}
-          stayOnFree={() => {
-            const selection = dialog.showMessageBoxSync(app.mainWindow, {
-              type: 'question',
-              message: intl.formatMessage(messages.dialogTitle),
-              detail: intl.formatMessage(messages.dialogMessage, {
-                currency,
-                price: plans.personal.yearly.price,
-              }),
-              buttons: [
-                intl.formatMessage(messages.dialogCTADowngrade),
-                intl.formatMessage(messages.dialogCTAUpgrade),
-              ],
-            });
-
-            if (selection === 0) {
-              downgradeAccount();
-              hideOverlay();
-            } else {
-              this.upgradeAccount(plans.personal.yearly.id);
-            }
-          }}
-          subscriptionExpired={user.team && user.team.state === 'expired' && !user.team.userHasDowngraded}
-          hadSubscription={user.data.hadSubscription}
-          isPersonalPlanAvailable={isPersonalPlanAvailable}
-        />
-      </ErrorBoundary>
-    );
-  }
-}
-
-export default PlanSelectionScreen;
-
-PlanSelectionScreen.wrappedComponent.propTypes = {
-  stores: PropTypes.shape({
-    features: PropTypes.instanceOf(FeaturesStore).isRequired,
-    user: PropTypes.instanceOf(UserStore).isRequired,
-  }).isRequired,
-  actions: PropTypes.shape({
-    payment: PropTypes.instanceOf(PaymentStore),
-    planSelection: PropTypes.shape({
-      downgradeAccount: PropTypes.func.isRequired,
-      hideOverlay: PropTypes.func.isRequired,
-    }),
-    user: PropTypes.instanceOf(UserStore).isRequired,
-  }).isRequired,
-};
diff --git a/src/features/planSelection/index.js b/src/features/planSelection/index.js
deleted file mode 100644
index b96ad6d8f..000000000
--- a/src/features/planSelection/index.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { reaction } from 'mobx';
-import PlanSelectionStore from './store';
-
-const debug = require('debug')('Ferdi:feature:planSelection');
-
-export const planSelectionStore = new PlanSelectionStore();
-
-export default function initPlanSelection(stores, actions) {
-  stores.planSelection = planSelectionStore;
-  const { features } = stores;
-
-  // Toggle planSelection feature
-  reaction(
-    () => features.features.isPlanSelectionEnabled,
-    (isEnabled) => {
-      if (isEnabled) {
-        debug('Initializing `planSelection` feature');
-        planSelectionStore.start(stores, actions);
-      } else if (planSelectionStore.isFeatureActive) {
-        debug('Disabling `planSelection` feature');
-        planSelectionStore.stop();
-      }
-    },
-    {
-      fireImmediately: true,
-    },
-  );
-}
diff --git a/src/features/planSelection/store.js b/src/features/planSelection/store.js
deleted file mode 100644
index de8fc7584..000000000
--- a/src/features/planSelection/store.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import {
-  action,
-  observable,
-  computed,
-} from 'mobx';
-
-import { planSelectionActions } from './actions';
-import { FeatureStore } from '../utils/FeatureStore';
-import { createActionBindings } from '../utils/ActionBinding';
-import { downgradeUserRequest } from './api';
-
-const debug = require('debug')('Ferdi:feature:planSelection:store');
-
-export default class PlanSelectionStore extends FeatureStore {
-  @observable isFeatureEnabled = false;
-
-  @observable isFeatureActive = false;
-
-  @observable hideOverlay = false;
-
-  @computed get showPlanSelectionOverlay() {
-    const { team, isPremium } = this.stores.user;
-    if (team && !this.hideOverlay && !isPremium) {
-      return team.state === 'expired' && !team.userHasDowngraded;
-    }
-
-    return false;
-  }
-
-  // ========== PUBLIC API ========= //
-
-  @action start(stores, actions, api) {
-    debug('PlanSelectionStore::start');
-    this.stores = stores;
-    this.actions = actions;
-    this.api = api;
-
-    // ACTIONS
-
-    this._registerActions(createActionBindings([
-      [planSelectionActions.downgradeAccount, this._downgradeAccount],
-      [planSelectionActions.hideOverlay, this._hideOverlay],
-    ]));
-
-    this.isFeatureActive = true;
-  }
-
-  @action stop() {
-    super.stop();
-    debug('PlanSelectionStore::stop');
-    this.isFeatureActive = false;
-  }
-
-  // ========== PRIVATE METHODS ========= //
-
-  // Actions
-  @action _downgradeAccount = () => {
-    downgradeUserRequest.execute();
-  }
-
-  @action _hideOverlay = () => {
-    this.hideOverlay = true;
-  }
-
-  @action _showOverlay = () => {
-    this.hideOverlay = false;
-  }
-}
diff --git a/src/features/publishDebugInfo/Component.js b/src/features/publishDebugInfo/Component.js
index f97a7c750..5387bd358 100644
--- a/src/features/publishDebugInfo/Component.js
+++ b/src/features/publishDebugInfo/Component.js
@@ -46,7 +46,7 @@ const messages = defineMessages({
   },
 });
 
-const styles = theme => ({
+const styles = (theme) => ({
   container: {
     minWidth: '70vw',
   },
@@ -186,10 +186,10 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
             <>
               <p className={classes.info}>{intl.formatMessage(messages.info)}</p>
 
-              <a href={`${DEBUG_API}/privacy.html`} target="_blank" className={classes.link}>
+              <a href={`${DEBUG_API}/privacy.html`} target="_blank" className={classes.link} rel="noreferrer">
                 {intl.formatMessage(messages.privacy)}
               </a>
-              <a href={`${DEBUG_API}/terms.html`} target="_blank" className={classes.link}>
+              <a href={`${DEBUG_API}/terms.html`} target="_blank" className={classes.link} rel="noreferrer">
                 {intl.formatMessage(messages.terms)}
               </a>
 
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js
index 04822db71..812f2c04b 100644
--- a/src/features/quickSwitch/Component.js
+++ b/src/features/quickSwitch/Component.js
@@ -28,7 +28,7 @@ const messages = defineMessages({
   },
 });
 
-const styles = theme => ({
+const styles = (theme) => ({
   modal: {
     width: '80%',
     maxWidth: 600,
@@ -139,7 +139,7 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
     if (this.state.search && compact(invoke(this.state.search, 'match', /^[a-z0-9]/i)).length > 0) {
       // Apply simple search algorythm to list of all services
       services = this.props.stores.services.allDisplayed;
-      services = services.filter(service => service.name.toLowerCase().search(this.state.search.toLowerCase()) !== -1);
+      services = services.filter((service) => service.name.toLowerCase().search(this.state.search.toLowerCase()) !== -1);
     } else {
       // Add the currently active service first
       const currentService = this.props.stores.services.active;
diff --git a/src/features/serviceLimit/components/LimitReachedInfobox.js b/src/features/serviceLimit/components/LimitReachedInfobox.js
deleted file mode 100644
index 424c92990..000000000
--- a/src/features/serviceLimit/components/LimitReachedInfobox.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { inject, observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
-import injectSheet from 'react-jss';
-import { Infobox } from '@meetfranz/ui';
-
-const messages = defineMessages({
-  limitReached: {
-    id: 'feature.serviceLimit.limitReached',
-    defaultMessage: '!!!You have added {amount} of {limit} services. Please upgrade your account to add more services.',
-  },
-  action: {
-    id: 'premiumFeature.button.upgradeAccount',
-    defaultMessage: '!!!Upgrade account',
-  },
-});
-
-const styles = theme => ({
-  container: {
-    height: 'auto',
-    background: theme.styleTypes.warning.accent,
-    color: theme.styleTypes.warning.contrast,
-    borderRadius: 0,
-    marginBottom: 0,
-
-    '& > div': {
-      marginBottom: 0,
-    },
-
-    '& button': {
-      color: theme.styleTypes.primary.contrast,
-    },
-  },
-});
-
-@inject('stores', 'actions') @injectSheet(styles) @observer
-class LimitReachedInfobox extends Component {
-  static propTypes = {
-    classes: PropTypes.object.isRequired,
-    stores: PropTypes.object.isRequired,
-    actions: PropTypes.object.isRequired,
-  };
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  render() {
-    const { classes, stores, actions } = this.props;
-    const { intl } = this.context;
-
-    const {
-      serviceLimit,
-    } = stores;
-
-    if (!serviceLimit.userHasReachedServiceLimit) return null;
-
-    return (
-      <Infobox
-        icon="mdiInformation"
-        type="warning"
-        className={classes.container}
-        ctaLabel={intl.formatMessage(messages.action)}
-        ctaOnClick={() => {
-          actions.ui.openSettings({ path: 'user' });
-        }}
-      >
-        {intl.formatMessage(messages.limitReached, { amount: serviceLimit.serviceCount, limit: serviceLimit.serviceLimit })}
-      </Infobox>
-    );
-  }
-}
-
-export default LimitReachedInfobox;
diff --git a/src/features/serviceLimit/index.js b/src/features/serviceLimit/index.js
deleted file mode 100644
index f867e3d87..000000000
--- a/src/features/serviceLimit/index.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { reaction } from 'mobx';
-import { ServiceLimitStore } from './store';
-
-const debug = require('debug')('Ferdi:feature:serviceLimit');
-
-let store = null;
-
-export const serviceLimitStore = new ServiceLimitStore();
-
-export default function initServiceLimit(stores, actions) {
-  const { features } = stores;
-
-  // Toggle serviceLimit feature
-  reaction(
-    () => (
-      features.features.isServiceLimitEnabled
-    ),
-    (isEnabled) => {
-      if (isEnabled) {
-        debug('Initializing `serviceLimit` feature');
-        store = serviceLimitStore.start(stores, actions);
-      } else if (store) {
-        debug('Disabling `serviceLimit` feature');
-        serviceLimitStore.stop();
-      }
-    },
-    {
-      fireImmediately: true,
-    },
-  );
-}
diff --git a/src/features/serviceLimit/store.js b/src/features/serviceLimit/store.js
deleted file mode 100644
index b1e55a1fc..000000000
--- a/src/features/serviceLimit/store.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { computed, observable } from 'mobx';
-import { FeatureStore } from '../utils/FeatureStore';
-import { DEFAULT_SERVICE_LIMIT } from '../../config';
-
-const debug = require('debug')('Ferdi:feature:serviceLimit:store');
-
-export class ServiceLimitStore extends FeatureStore {
-  @observable isServiceLimitEnabled = false;
-
-  start(stores, actions) {
-    debug('start');
-    this.stores = stores;
-    this.actions = actions;
-
-    this.isServiceLimitEnabled = false;
-  }
-
-  stop() {
-    super.stop();
-
-    this.isServiceLimitEnabled = false;
-  }
-
-  @computed get userHasReachedServiceLimit() {
-    return false;
-    // if (!this.isServiceLimitEnabled) return false;
-
-    // return this.serviceLimit !== 0 && this.serviceCount >= this.serviceLimit;
-  }
-
-  @computed get serviceLimit() {
-    if (!this.isServiceLimitEnabled || this.stores.features.features.serviceLimitCount === 0) return 0;
-
-    return this.stores.features.features.serviceLimitCount || DEFAULT_SERVICE_LIMIT;
-  }
-
-  @computed get serviceCount() {
-    return this.stores.services.all.length;
-  }
-}
-
-export default ServiceLimitStore;
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
index f74f5f0b2..eb7116651 100644
--- a/src/features/serviceProxy/index.js
+++ b/src/features/serviceProxy/index.js
@@ -5,7 +5,6 @@ const debug = require('debug')('Ferdi:feature:serviceProxy');
 
 export const config = observable({
   isEnabled: true,
-  isPremium: true,
 });
 
 export default function init(stores) {
@@ -13,7 +12,6 @@ export default function init(stores) {
 
   autorun(() => {
     config.isEnabled = true;
-    config.isIncludedInCurrentPlan = true;
 
     const services = stores.services.enabled;
     const proxySettings = stores.settings.proxy;
diff --git a/src/features/shareFranz/Component.js b/src/features/shareFranz/Component.js
index f7f8dc41c..cc2e81b70 100644
--- a/src/features/shareFranz/Component.js
+++ b/src/features/shareFranz/Component.js
@@ -36,15 +36,15 @@ const messages = defineMessages({
   },
   shareTextEmail: {
     id: 'feature.shareFranz.shareText.email',
-    defaultMessage: '!!! I\'ve added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com',
+    defaultMessage: '!!! I\'ve added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com',
   },
   shareTextTwitter: {
     id: 'feature.shareFranz.shareText.twitter',
-    defaultMessage: '!!! I\'ve added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger',
+    defaultMessage: '!!! I\'ve added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger',
   },
 });
 
-const styles = theme => ({
+const styles = (theme) => ({
   modal: {
     width: '80%',
     maxWidth: 600,
diff --git a/src/features/shareFranz/index.js b/src/features/shareFranz/index.js
index 34475f674..9add0f65e 100644
--- a/src/features/shareFranz/index.js
+++ b/src/features/shareFranz/index.js
@@ -1,8 +1,6 @@
 import { reaction } from 'mobx';
 import ms from 'ms';
 import { state as ModalState } from './store';
-import { state as delayAppState } from '../delayApp';
-import { planSelectionStore } from '../planSelection';
 
 export { default as Component } from './Component';
 
@@ -19,21 +17,14 @@ export default function initialize(stores) {
 
   function showModal() {
     debug('Would have showed share window');
-
-    // state.isModalVisible = true;
   }
 
   reaction(
     () => stores.user.isLoggedIn,
     () => {
       setTimeout(() => {
-        if (stores.settings.stats.appStarts % 50 === 0 && !planSelectionStore.showPlanSelectionOverlay) {
-          if (delayAppState.isDelayAppScreenVisible) {
-            debug('Delaying share modal by 5 minutes');
-            setTimeout(() => showModal(), ms('5m'));
-          } else {
-            showModal();
-          }
+        if (stores.settings.stats.appStarts % 50 === 0) {
+          showModal();
         }
       }, ms('2s'));
     },
diff --git a/src/features/spellchecker/index.js b/src/features/spellchecker/index.js
deleted file mode 100644
index 6a393e250..000000000
--- a/src/features/spellchecker/index.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { autorun, observable } from 'mobx';
-
-import { DEFAULT_FEATURES_CONFIG } from '../../config';
-
-const debug = require('debug')('Ferdi:feature:spellchecker');
-
-export const config = observable({
-  isIncludedInCurrentPlan: DEFAULT_FEATURES_CONFIG.isSpellcheckerIncludedInCurrentPlan,
-});
-
-export default function init() {
-  debug('Initializing `spellchecker` feature');
-
-  autorun(() => {
-    // const { isSpellcheckerIncludedInCurrentPlan } = stores.features.features;
-
-    // config.isIncludedInCurrentPlan = isSpellcheckerIncludedInCurrentPlan !== undefined ? isSpellcheckerIncludedInCurrentPlan : DEFAULT_FEATURES_CONFIG.isSpellcheckerIncludedInCurrentPlan;
-
-    // if (!stores.user.data.isPremium && config.isIncludedInCurrentPlan && stores.settings.app.enableSpellchecking) {
-    //   debug('Override settings.spellcheckerEnabled flag to false');
-
-    //   Object.assign(stores.settings.app, {
-    //     enableSpellchecking: false,
-    //   });
-    // }
-  });
-}
diff --git a/src/features/todos/components/TodosWebview.js b/src/features/todos/components/TodosWebview.js
index ca8460f94..2dc30cdf2 100644
--- a/src/features/todos/components/TodosWebview.js
+++ b/src/features/todos/components/TodosWebview.js
@@ -35,26 +35,6 @@ const styles = (theme) => ({
     zIndex: 400,
     background: theme.todos.dragIndicator.background,
   },
-  premiumContainer: {
-    display: 'flex',
-    flexDirection: 'column',
-    justifyContent: 'center',
-    alignItems: 'center',
-    width: '80%',
-    maxWidth: 300,
-    margin: [0, 'auto'],
-    textAlign: 'center',
-  },
-  premiumIcon: {
-    marginBottom: 40,
-    background: theme.styleTypes.primary.accent,
-    fill: theme.styleTypes.primary.contrast,
-    padding: 10,
-    borderRadius: 10,
-  },
-  premiumCTA: {
-    marginTop: 40,
-  },
   isTodosServiceActive: {
     width: 'calc(100% - 368px)',
     position: 'absolute',
diff --git a/src/features/todos/containers/TodosScreen.js b/src/features/todos/containers/TodosScreen.js
index 6425746e6..d05e24e56 100644
--- a/src/features/todos/containers/TodosScreen.js
+++ b/src/features/todos/containers/TodosScreen.js
@@ -24,10 +24,10 @@ class TodosScreen extends Component {
           isVisible={todosStore.isTodosPanelVisible}
           togglePanel={todoActions.toggleTodosPanel}
           handleClientMessage={todoActions.handleClientMessage}
-          setTodosWebview={webview => todoActions.setTodosWebview({ webview })}
+          setTodosWebview={(webview) => todoActions.setTodosWebview({ webview })}
           width={todosStore.width}
           minWidth={TODOS_MIN_WIDTH}
-          resize={width => todoActions.resize({ width })}
+          resize={(width) => todoActions.resize({ width })}
           userAgent={todosStore.userAgent}
           todoUrl={todosStore.todoUrl}
           isTodoUrlValid={todosStore.isTodoUrlValid}
diff --git a/src/features/todos/store.js b/src/features/todos/store.js
index 429507927..f283c1e59 100644
--- a/src/features/todos/store.js
+++ b/src/features/todos/store.js
@@ -20,7 +20,6 @@ import { FeatureStore } from '../utils/FeatureStore';
 import { createReactions } from '../../stores/lib/Reaction';
 import { createActionBindings } from '../utils/ActionBinding';
 import { IPC, TODOS_ROUTES } from './constants';
-import { state as delayAppState } from '../delayApp';
 import UserAgent from '../../models/UserAgent';
 
 const debug = require('debug')('Ferdi:feature:todos:store');
@@ -46,7 +45,7 @@ export default class TodoStore extends FeatureStore {
 
   @computed get isTodosPanelForceHidden() {
     const { isAnnouncementShown } = this.stores.announcements;
-    return delayAppState.isDelayAppScreenVisible || !this.isFeatureEnabledByUser || isAnnouncementShown;
+    return !this.isFeatureEnabledByUser || isAnnouncementShown;
   }
 
   @computed get isTodosPanelVisible() {
@@ -123,12 +122,6 @@ export default class TodoStore extends FeatureStore {
     this._registerReactions(this._allReactions);
 
     this.isFeatureActive = true;
-
-    if (this.settings.isFeatureEnabledByUser === undefined) {
-      this._updateSettings({
-        isFeatureEnabledByUser: DEFAULT_IS_FEATURE_ENABLED_BY_USER,
-      });
-    }
   }
 
   @action stop() {
@@ -266,6 +259,12 @@ export default class TodoStore extends FeatureStore {
   _firstLaunchReaction = () => {
     const { stats } = this.stores.settings.all;
 
+    if (this.settings.isFeatureEnabledByUser === undefined) {
+      this._updateSettings({
+        isFeatureEnabledByUser: DEFAULT_IS_FEATURE_ENABLED_BY_USER,
+      });
+    }
+
     // Hide todos layer on first app start but show on second
     if (stats.appStarts <= 1) {
       this._updateSettings({
diff --git a/src/features/trialStatusBar/actions.js b/src/features/trialStatusBar/actions.js
deleted file mode 100644
index 38df76458..000000000
--- a/src/features/trialStatusBar/actions.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import PropTypes from 'prop-types';
-import { createActionsFromDefinitions } from '../../actions/lib/actions';
-
-export const trialStatusBarActions = createActionsFromDefinitions({
-  upgradeAccount: {
-    planId: PropTypes.string.isRequired,
-    onCloseWindow: PropTypes.func.isRequired,
-  },
-  downgradeAccount: {},
-  hideOverlay: {},
-}, PropTypes.checkPropTypes);
-
-export default trialStatusBarActions;
diff --git a/src/features/trialStatusBar/components/ProgressBar.js b/src/features/trialStatusBar/components/ProgressBar.js
deleted file mode 100644
index 41b74d396..000000000
--- a/src/features/trialStatusBar/components/ProgressBar.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { observer } from 'mobx-react';
-import injectSheet from 'react-jss';
-
-const styles = theme => ({
-  root: {
-    background: theme.trialStatusBar.progressBar.background,
-    width: '25%',
-    maxWidth: 200,
-    height: 8,
-    display: 'flex',
-    alignItems: 'center',
-    borderRadius: theme.borderRadius,
-    overflow: 'hidden',
-  },
-  progress: {
-    background: theme.trialStatusBar.progressBar.progressIndicator,
-    width: ({ percent }) => `${percent}%`,
-    height: '100%',
-  },
-});
-
-@injectSheet(styles) @observer
-class ProgressBar extends Component {
-  static propTypes = {
-    classes: PropTypes.object.isRequired,
-  };
-
-  render() {
-    const {
-      classes,
-    } = this.props;
-
-    return (
-      <div
-        className={classes.root}
-      >
-        <div className={classes.progress} />
-      </div>
-    );
-  }
-}
-
-export default ProgressBar;
diff --git a/src/features/trialStatusBar/components/TrialStatusBar.js b/src/features/trialStatusBar/components/TrialStatusBar.js
deleted file mode 100644
index b8fe4acc9..000000000
--- a/src/features/trialStatusBar/components/TrialStatusBar.js
+++ /dev/null
@@ -1,135 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { observer } from 'mobx-react';
-import injectSheet from 'react-jss';
-import { defineMessages, intlShape } from 'react-intl';
-import { Icon } from '@meetfranz/ui';
-import { mdiArrowRight, mdiWindowClose } from '@mdi/js';
-import classnames from 'classnames';
-
-import ProgressBar from './ProgressBar';
-
-const messages = defineMessages({
-  restTime: {
-    id: 'feature.trialStatusBar.restTime',
-    defaultMessage: '!!!Your Free Franz {plan} Trial ends in {time}.',
-  },
-  expired: {
-    id: 'feature.trialStatusBar.expired',
-    defaultMessage: '!!!Your free Franz {plan} Trial has expired, please upgrade your account.',
-  },
-  cta: {
-    id: 'feature.trialStatusBar.cta',
-    defaultMessage: '!!!Upgrade now',
-  },
-});
-
-const styles = theme => ({
-  root: {
-    background: theme.trialStatusBar.bar.background,
-    width: '100%',
-    height: 25,
-    order: 10,
-    display: 'flex',
-    alignItems: 'center',
-    fontSize: 12,
-    padding: [0, 10],
-    justifyContent: 'flex-end',
-  },
-  ended: {
-    background: theme.styleTypes.warning.accent,
-    color: theme.styleTypes.warning.contrast,
-  },
-  message: {
-    marginLeft: 20,
-  },
-  action: {
-    marginLeft: 20,
-    fontSize: 12,
-    color: theme.colorText,
-    textDecoration: 'underline',
-    display: 'flex',
-
-    '& svg': {
-      margin: [1, 2, 0, 0],
-    },
-  },
-});
-
-@injectSheet(styles) @observer
-class TrialStatusBar extends Component {
-  static propTypes = {
-    planName: PropTypes.string.isRequired,
-    percent: PropTypes.number.isRequired,
-    upgradeAccount: PropTypes.func.isRequired,
-    hideOverlay: PropTypes.func.isRequired,
-    trialEnd: PropTypes.string.isRequired,
-    hasEnded: PropTypes.bool.isRequired,
-    classes: PropTypes.object.isRequired,
-  };
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  render() {
-    const {
-      planName,
-      percent,
-      upgradeAccount,
-      hideOverlay,
-      trialEnd,
-      hasEnded,
-      classes,
-    } = this.props;
-
-    const { intl } = this.context;
-
-    return (
-      <div
-        className={classnames({
-          [classes.root]: true,
-          [classes.ended]: hasEnded,
-        })}
-      >
-        <ProgressBar
-          percent={percent}
-        />
-        {' '}
-        <span className={classes.message}>
-          {!hasEnded ? (
-            intl.formatMessage(messages.restTime, {
-              plan: planName,
-              time: trialEnd,
-            })
-          ) : (
-            intl.formatMessage(messages.expired, {
-              plan: planName,
-            })
-          )}
-        </span>
-        <button
-          className={classes.action}
-          type="button"
-          onClick={() => {
-            upgradeAccount();
-          }}
-        >
-          <Icon icon={mdiArrowRight} />
-          {intl.formatMessage(messages.cta)}
-        </button>
-        <button
-          className={classes.action}
-          type="button"
-          onClick={() => {
-            hideOverlay();
-          }}
-        >
-          <Icon icon={mdiWindowClose} />
-        </button>
-      </div>
-    );
-  }
-}
-
-export default TrialStatusBar;
diff --git a/src/features/trialStatusBar/containers/TrialStatusBarScreen.js b/src/features/trialStatusBar/containers/TrialStatusBarScreen.js
deleted file mode 100644
index e0f5ab5f2..000000000
--- a/src/features/trialStatusBar/containers/TrialStatusBarScreen.js
+++ /dev/null
@@ -1,112 +0,0 @@
-import React, { Component } from 'react';
-import { observer, inject } from 'mobx-react';
-import PropTypes from 'prop-types';
-import ms from 'ms';
-import { intlShape } from 'react-intl';
-
-import FeaturesStore from '../../../stores/FeaturesStore';
-import UserStore from '../../../stores/UserStore';
-import TrialStatusBar from '../components/TrialStatusBar';
-import ErrorBoundary from '../../../components/util/ErrorBoundary';
-import { trialStatusBarStore } from '..';
-import { i18nPlanName } from '../../../helpers/plan-helpers';
-import PaymentStore from '../../../stores/PaymentStore';
-
-@inject('stores', 'actions')
-@observer
-class TrialStatusBarScreen extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  state = {
-    showOverlay: true,
-    percent: 0,
-    restTime: '',
-    hasEnded: false,
-  };
-
-  percentInterval = null;
-
-  componentDidMount() {
-    this.percentInterval = setInterval(() => {
-      this.calculateRestTime();
-    }, ms('1m'));
-
-    this.calculateRestTime();
-  }
-
-  componentWillUnmount() {
-    clearInterval(this.percentInterval);
-  }
-
-  calculateRestTime() {
-    const { trialEndTime } = trialStatusBarStore;
-    const percent = (
-      Math.abs(100 - Math.abs(trialEndTime.asMilliseconds()) * 100) / ms('14d')
-    ).toFixed(2);
-    const restTime = trialEndTime.humanize();
-    const hasEnded = trialEndTime.asMilliseconds() > 0;
-
-    this.setState({
-      percent,
-      restTime,
-      hasEnded,
-    });
-  }
-
-  hideOverlay() {
-    this.setState({
-      showOverlay: false,
-    });
-  }
-
-  render() {
-    const { intl } = this.context;
-
-    const {
-      showOverlay, percent, restTime, hasEnded,
-    } = this.state;
-
-    if (
-      !trialStatusBarStore
-      || !trialStatusBarStore.isFeatureActive
-      || !showOverlay
-      || !trialStatusBarStore.showTrialStatusBarOverlay
-    ) {
-      return null;
-    }
-
-    const { user } = this.props.stores;
-    const { upgradeAccount } = this.props.actions.payment;
-
-    const planName = i18nPlanName(user.team.plan, intl);
-
-    return (
-      <ErrorBoundary>
-        <TrialStatusBar
-          planName={planName}
-          percent={parseFloat(percent < 5 ? 5 : percent)}
-          trialEnd={restTime}
-          upgradeAccount={() => upgradeAccount({
-            planId: user.team.plan,
-          })}
-          hideOverlay={() => this.hideOverlay()}
-          hasEnded={hasEnded}
-        />
-      </ErrorBoundary>
-    );
-  }
-}
-
-export default TrialStatusBarScreen;
-
-TrialStatusBarScreen.wrappedComponent.propTypes = {
-  stores: PropTypes.shape({
-    features: PropTypes.instanceOf(FeaturesStore).isRequired,
-    user: PropTypes.instanceOf(UserStore).isRequired,
-  }).isRequired,
-  actions: PropTypes.shape({
-    payment: PropTypes.instanceOf(PaymentStore),
-  }).isRequired,
-};
diff --git a/src/features/trialStatusBar/index.js b/src/features/trialStatusBar/index.js
deleted file mode 100644
index 987b5c04e..000000000
--- a/src/features/trialStatusBar/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import { reaction } from 'mobx';
-import TrialStatusBarStore from './store';
-
-const debug = require('debug')('Ferdi:feature:trialStatusBar');
-
-export const GA_CATEGORY_TRIAL_STATUS_BAR = 'trialStatusBar';
-
-export const trialStatusBarStore = new TrialStatusBarStore();
-
-export default function initTrialStatusBar(stores, actions) {
-  stores.trialStatusBar = trialStatusBarStore;
-  const { features } = stores;
-
-  // Toggle trialStatusBar feature
-  reaction(
-    () => features.features.isTrialStatusBarEnabled,
-    (isEnabled) => {
-      if (isEnabled) {
-        debug('Initializing `trialStatusBar` feature');
-        trialStatusBarStore.start(stores, actions);
-      } else if (trialStatusBarStore.isFeatureActive) {
-        debug('Disabling `trialStatusBar` feature');
-        trialStatusBarStore.stop();
-      }
-    },
-    {
-      fireImmediately: true,
-    },
-  );
-}
diff --git a/src/features/trialStatusBar/store.js b/src/features/trialStatusBar/store.js
deleted file mode 100644
index 858a08238..000000000
--- a/src/features/trialStatusBar/store.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import {
-  action,
-  observable,
-  computed,
-} from 'mobx';
-import moment from 'moment';
-
-import { trialStatusBarActions } from './actions';
-import { FeatureStore } from '../utils/FeatureStore';
-import { createActionBindings } from '../utils/ActionBinding';
-
-const debug = require('debug')('Ferdi:feature:trialStatusBar:store');
-
-export default class TrialStatusBarStore extends FeatureStore {
-  @observable isFeatureActive = false;
-
-  @observable isFeatureEnabled = false;
-
-  @computed get showTrialStatusBarOverlay() {
-    if (this.isFeatureActive) {
-      const { team } = this.stores.user;
-      if (team && !this.hideOverlay) {
-        return team.state !== 'expired' && team.isTrial;
-      }
-    }
-
-    return false;
-  }
-
-  @computed get trialEndTime() {
-    if (this.isFeatureActive) {
-      const { team } = this.stores.user;
-
-      if (team && !this.hideOverlay) {
-        return moment.duration(moment().diff(team.trialEnd));
-      }
-    }
-
-    return moment.duration();
-  }
-
-  // ========== PUBLIC API ========= //
-
-  @action start(stores, actions, api) {
-    debug('TrialStatusBarStore::start');
-    this.stores = stores;
-    this.actions = actions;
-    this.api = api;
-
-    // ACTIONS
-
-    this._registerActions(createActionBindings([
-      [trialStatusBarActions.hideOverlay, this._hideOverlay],
-    ]));
-
-    this.isFeatureActive = true;
-  }
-
-  @action stop() {
-    super.stop();
-    debug('TrialStatusBarStore::stop');
-    this.isFeatureActive = false;
-  }
-
-  // ========== PRIVATE METHODS ========= //
-
-  // Actions
-
-  @action _hideOverlay = () => {
-    this.hideOverlay = true;
-  }
-}
diff --git a/src/features/utils/ActionBinding.js b/src/features/utils/ActionBinding.js
index 497aa071b..787166d44 100644
--- a/src/features/utils/ActionBinding.js
+++ b/src/features/utils/ActionBinding.js
@@ -24,6 +24,6 @@ export default class ActionBinding {
   }
 }
 
-export const createActionBindings = actions => (
-  actions.map(a => new ActionBinding(a))
+export const createActionBindings = (actions) => (
+  actions.map((a) => new ActionBinding(a))
 );
diff --git a/src/features/utils/FeatureStore.js b/src/features/utils/FeatureStore.js
index 0bc10e176..4d4e217a9 100644
--- a/src/features/utils/FeatureStore.js
+++ b/src/features/utils/FeatureStore.js
@@ -16,11 +16,11 @@ export class FeatureStore {
   }
 
   _startActions(actions = this._actions) {
-    actions.forEach(a => a.start());
+    actions.forEach((a) => a.start());
   }
 
   _stopActions(actions = this._actions) {
-    actions.forEach(a => a.stop());
+    actions.forEach((a) => a.stop());
   }
 
   // REACTIONS
@@ -31,10 +31,10 @@ export class FeatureStore {
   }
 
   _startReactions(reactions = this._reactions) {
-    reactions.forEach(r => r.start());
+    reactions.forEach((r) => r.start());
   }
 
   _stopReactions(reactions = this._reactions) {
-    reactions.forEach(r => r.stop());
+    reactions.forEach((r) => r.stop());
   }
 }
diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js
index b9403bd0d..9a95eb2d2 100644
--- a/src/features/webControls/components/WebControls.js
+++ b/src/features/webControls/components/WebControls.js
@@ -6,7 +6,11 @@ import { Icon } from '@meetfranz/ui';
 import { defineMessages, intlShape } from 'react-intl';
 
 import {
-  mdiReload, mdiArrowRight, mdiArrowLeft, mdiHomeOutline, mdiEarth,
+  mdiReload,
+  mdiArrowRight,
+  mdiArrowLeft,
+  mdiHomeOutline,
+  mdiEarth,
 } from '@mdi/js';
 
 const messages = defineMessages({
@@ -32,6 +36,12 @@ const messages = defineMessages({
   },
 });
 
+let buttonTransition = 'none';
+
+if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) {
+  buttonTransition = 'opacity 0.25s';
+}
+
 const styles = theme => ({
   root: {
     background: theme.colorBackground,
@@ -51,7 +61,7 @@ const styles = theme => ({
   button: {
     width: 30,
     height: 50,
-    transition: 'opacity 0.25s',
+    transition: buttonTransition,
 
     '&:hover': {
       opacity: 0.8,
@@ -83,7 +93,8 @@ const styles = theme => ({
   },
 });
 
-@injectSheet(styles) @observer
+@injectSheet(styles)
+@observer
 class WebControls extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
@@ -96,7 +107,7 @@ class WebControls extends Component {
     openInBrowser: PropTypes.func.isRequired,
     url: PropTypes.string.isRequired,
     navigate: PropTypes.func.isRequired,
-  }
+  };
 
   static contextTypes = {
     intl: intlShape,
@@ -119,7 +130,7 @@ class WebControls extends Component {
   state = {
     inputUrl: '',
     editUrl: false,
-  }
+  };
 
   render() {
     const {
@@ -135,10 +146,7 @@ class WebControls extends Component {
       navigate,
     } = this.props;
 
-    const {
-      inputUrl,
-      editUrl,
-    } = this.state;
+    const { inputUrl, editUrl } = this.state;
 
     const { intl } = this.context;
 
@@ -151,10 +159,7 @@ class WebControls extends Component {
           data-tip={intl.formatMessage(messages.goHome)}
           data-place="bottom"
         >
-          <Icon
-            icon={mdiHomeOutline}
-            className={classes.icon}
-          />
+          <Icon icon={mdiHomeOutline} className={classes.icon} />
         </button>
         <button
           onClick={goBack}
@@ -164,10 +169,7 @@ class WebControls extends Component {
           data-tip={intl.formatMessage(messages.back)}
           data-place="bottom"
         >
-          <Icon
-            icon={mdiArrowLeft}
-            className={classes.icon}
-          />
+          <Icon icon={mdiArrowLeft} className={classes.icon} />
         </button>
         <button
           onClick={goForward}
@@ -177,10 +179,7 @@ class WebControls extends Component {
           data-tip={intl.formatMessage(messages.forward)}
           data-place="bottom"
         >
-          <Icon
-            icon={mdiArrowRight}
-            className={classes.icon}
-          />
+          <Icon icon={mdiArrowRight} className={classes.icon} />
         </button>
         <button
           onClick={reload}
@@ -189,25 +188,24 @@ class WebControls extends Component {
           data-tip={intl.formatMessage(messages.reload)}
           data-place="bottom"
         >
-          <Icon
-            icon={mdiReload}
-            className={classes.icon}
-          />
+          <Icon icon={mdiReload} className={classes.icon} />
         </button>
         <input
           value={editUrl ? inputUrl : url}
           className={classes.input}
-          onChange={event => this.setState({
-            inputUrl: event.target.value,
-          })}
-          onFocus={(event) => {
+          onChange={event =>
+            this.setState({
+              inputUrl: event.target.value,
+            })
+          }
+          onFocus={event => {
             console.log('on focus event');
             event.target.select();
             this.setState({
               editUrl: true,
             });
           }}
-          onKeyDown={(event) => {
+          onKeyDown={event => {
             if (event.key === 'Enter') {
               this.setState({
                 editUrl: false,
@@ -231,10 +229,7 @@ class WebControls extends Component {
           data-tip={intl.formatMessage(messages.openInBrowser)}
           data-place="bottom"
         >
-          <Icon
-            icon={mdiEarth}
-            className={classes.icon}
-          />
+          <Icon icon={mdiEarth} className={classes.icon} />
         </button>
       </div>
     );
diff --git a/src/features/webControls/containers/WebControlsScreen.js b/src/features/webControls/containers/WebControlsScreen.js
index d638b831c..e1e1b9991 100644
--- a/src/features/webControls/containers/WebControlsScreen.js
+++ b/src/features/webControls/containers/WebControlsScreen.js
@@ -114,7 +114,7 @@ class WebControlsScreen extends Component {
         goBack={() => this.goBack()}
         canGoForward={this.canGoForward}
         goForward={() => this.goForward()}
-        navigate={url => this.navigate(url)}
+        navigate={(url) => this.navigate(url)}
         url={this.url}
       />
     );
diff --git a/src/features/workspaces/api.js b/src/features/workspaces/api.js
index 30fbd84be..322695ed2 100644
--- a/src/features/workspaces/api.js
+++ b/src/features/workspaces/api.js
@@ -14,7 +14,7 @@ export const workspaceApi = {
     debug('getUserWorkspaces RESULT', result);
     if (!result.ok) throw result;
     const workspaces = await result.json();
-    return workspaces.map(data => new Workspace(data));
+    return workspaces.map((data) => new Workspace(data));
   },
 
   createWorkspace: async (name) => {
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js
index bf7016e2f..1138f23d7 100644
--- a/src/features/workspaces/components/WorkspaceDrawer.js
+++ b/src/features/workspaces/components/WorkspaceDrawer.js
@@ -2,12 +2,11 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
-import { defineMessages, FormattedHTMLMessage, intlShape } from 'react-intl';
-import { H1, Icon, ProBadge } from '@meetfranz/ui';
-import { Button } from '@meetfranz/forms/lib';
+import { defineMessages, intlShape } from 'react-intl';
+import { H1, Icon } from '@meetfranz/ui';
 import ReactTooltip from 'react-tooltip';
 
-import { mdiPlusBox, mdiSettings, mdiStar } from '@mdi/js';
+import { mdiPlusBox, mdiSettings } from '@mdi/js';
 import WorkspaceDrawerItem from './WorkspaceDrawerItem';
 import { workspaceActions } from '../actions';
 import { workspaceStore } from '../index';
@@ -29,25 +28,13 @@ const messages = defineMessages({
     id: 'workspaceDrawer.workspaceFeatureInfo',
     defaultMessage: '!!!Info about workspace feature',
   },
-  premiumCtaButtonLabel: {
-    id: 'workspaceDrawer.premiumCtaButtonLabel',
-    defaultMessage: '!!!Create your first workspace',
-  },
-  reactivatePremiumAccount: {
-    id: 'workspaceDrawer.reactivatePremiumAccountLabel',
-    defaultMessage: '!!!Reactivate premium account',
-  },
   addNewWorkspaceLabel: {
     id: 'workspaceDrawer.addNewWorkspaceLabel',
     defaultMessage: '!!!add new workspace',
   },
-  premiumFeatureBadge: {
-    id: 'workspaceDrawer.proFeatureBadge',
-    defaultMessage: '!!!Premium feature',
-  },
 });
 
-const styles = theme => ({
+const styles = (theme) => ({
   drawer: {
     background: theme.workspaces.drawer.background,
     width: `${theme.workspaces.drawer.width}px`,
@@ -60,9 +47,6 @@ const styles = theme => ({
     marginBottom: '25px',
     marginLeft: theme.workspaces.drawer.padding,
   },
-  headlineProBadge: {
-    marginRight: 15,
-  },
   workspacesSettingsButton: {
     float: 'right',
     marginRight: theme.workspaces.drawer.padding,
@@ -78,16 +62,6 @@ const styles = theme => ({
     height: 'auto',
     overflowY: 'auto',
   },
-  premiumAnnouncement: {
-    padding: '20px',
-    paddingTop: '0',
-    height: 'auto',
-  },
-  premiumCtaButton: {
-    marginTop: '20px',
-    width: '100%',
-    color: 'white !important',
-  },
   addNewWorkspaceLabel: {
     height: 'auto',
     color: theme.workspaces.drawer.buttons.color,
@@ -116,7 +90,6 @@ class WorkspaceDrawer extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
     getServicesForWorkspace: PropTypes.func.isRequired,
-    onUpgradeAccountClick: PropTypes.func.isRequired,
   };
 
   static contextTypes = {
@@ -131,7 +104,6 @@ class WorkspaceDrawer extends Component {
     const {
       classes,
       getServicesForWorkspace,
-      onUpgradeAccountClick,
     } = this.props;
     const { intl } = this.context;
     const {
@@ -144,14 +116,6 @@ class WorkspaceDrawer extends Component {
     return (
       <div className={`${classes.drawer} workspaces-drawer`}>
         <H1 className={classes.headline}>
-          {workspaceStore.isPremiumUpgradeRequired && (
-            <span
-              className={classes.headlineProBadge}
-              data-tip={`${intl.formatMessage(messages.premiumFeatureBadge)}`}
-            >
-              <ProBadge />
-            </span>
-          )}
           {intl.formatMessage(messages.headline)}
           <span
             className={classes.workspacesSettingsButton}
@@ -167,75 +131,48 @@ class WorkspaceDrawer extends Component {
             />
           </span>
         </H1>
-        {workspaceStore.isPremiumUpgradeRequired ? (
-          <div className={classes.premiumAnnouncement}>
-            <FormattedHTMLMessage {...messages.workspaceFeatureInfo} />
-            {workspaceStore.userHasWorkspaces ? (
-              <Button
-                className={classes.premiumCtaButton}
-                buttonType="primary"
-                label={intl.formatMessage(messages.reactivatePremiumAccount)}
-                icon={mdiStar}
-                onClick={() => {
-                  onUpgradeAccountClick();
-                }}
-              />
-            ) : (
-              <Button
-                className={classes.premiumCtaButton}
-                buttonType="primary"
-                label={intl.formatMessage(messages.premiumCtaButtonLabel)}
-                icon={mdiPlusBox}
-                onClick={() => {
-                  workspaceActions.openWorkspaceSettings();
-                }}
-              />
-            )}
-          </div>
-        ) : (
-          <div className={classes.workspaces}>
+        <div className={classes.workspaces}>
+          <WorkspaceDrawerItem
+            name={intl.formatMessage(messages.allServices)}
+            onClick={() => {
+              workspaceActions.deactivate();
+              workspaceActions.toggleWorkspaceDrawer();
+            }}
+            services={getServicesForWorkspace(null)}
+            isActive={actualWorkspace == null}
+            shortcutIndex={0}
+          />
+          {workspaces.map((workspace, index) => (
             <WorkspaceDrawerItem
-              name={intl.formatMessage(messages.allServices)}
+              key={workspace.id}
+              name={workspace.name}
+              isActive={actualWorkspace === workspace}
               onClick={() => {
-                workspaceActions.deactivate();
+                if (actualWorkspace === workspace) return;
+                workspaceActions.activate({ workspace });
                 workspaceActions.toggleWorkspaceDrawer();
               }}
-              services={getServicesForWorkspace(null)}
-              isActive={actualWorkspace == null}
-              shortcutIndex={0}
+              onContextMenuEditClick={() => workspaceActions.edit({ workspace })}
+              services={getServicesForWorkspace(workspace)}
+              shortcutIndex={index + 1}
             />
-            {workspaces.map((workspace, index) => (
-              <WorkspaceDrawerItem
-                key={workspace.id}
-                name={workspace.name}
-                isActive={actualWorkspace === workspace}
-                onClick={() => {
-                  if (actualWorkspace === workspace) return;
-                  workspaceActions.activate({ workspace });
-                  workspaceActions.toggleWorkspaceDrawer();
-                }}
-                onContextMenuEditClick={() => workspaceActions.edit({ workspace })}
-                services={getServicesForWorkspace(workspace)}
-                shortcutIndex={index + 1}
-              />
-            ))}
-            <div
-              className={classes.addNewWorkspaceLabel}
-              onClick={() => {
-                workspaceActions.openWorkspaceSettings();
-              }}
-            >
-              <Icon
-                icon={mdiPlusBox}
-                size={1}
-                className={classes.workspacesSettingsButtonIcon}
-              />
-              <span>
-                {intl.formatMessage(messages.addNewWorkspaceLabel)}
-              </span>
-            </div>
+          ))}
+          <div
+            className={classes.addNewWorkspaceLabel}
+            onClick={() => {
+              workspaceActions.openWorkspaceSettings();
+            }}
+          >
+            <Icon
+              icon={mdiPlusBox}
+              size={1}
+              className={classes.workspacesSettingsButtonIcon}
+            />
+            <span>
+              {intl.formatMessage(messages.addNewWorkspaceLabel)}
+            </span>
           </div>
-        )}
+        </div>
         <ReactTooltip place="right" type="dark" effect="solid" />
       </div>
     );
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.js b/src/features/workspaces/components/WorkspaceDrawerItem.js
index 2e58b70d6..fff607330 100644
--- a/src/features/workspaces/components/WorkspaceDrawerItem.js
+++ b/src/features/workspaces/components/WorkspaceDrawerItem.js
@@ -5,7 +5,7 @@ import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
 import classnames from 'classnames';
 import { defineMessages, intlShape } from 'react-intl';
-import { ctrlKey } from '../../../environment';
+import { altKey, shortcutKey } from '../../../environment';
 
 const messages = defineMessages({
   noServicesAddedYet: {
@@ -18,12 +18,18 @@ const messages = defineMessages({
   },
 });
 
+let itemTransition = 'none';
+
+if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) {
+  itemTransition = 'background-color 300ms ease-out';
+}
+
 const styles = theme => ({
   item: {
     height: '67px',
     padding: `15px ${theme.workspaces.drawer.padding}px`,
     borderBottom: `1px solid ${theme.workspaces.drawer.listItem.border}`,
-    transition: 'background-color 300ms ease-out',
+    transition: itemTransition,
     '&:first-child': {
       borderTop: `1px solid ${theme.workspaces.drawer.listItem.border}`,
     },
@@ -59,7 +65,8 @@ const styles = theme => ({
   },
 });
 
-@injectSheet(styles) @observer
+@injectSheet(styles)
+@observer
 class WorkspaceDrawerItem extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
@@ -91,15 +98,19 @@ class WorkspaceDrawerItem extends Component {
     } = this.props;
     const { intl } = this.context;
 
-    const contextMenuTemplate = [{
-      label: name,
-      enabled: false,
-    }, {
-      type: 'separator',
-    }, {
-      label: intl.formatMessage(messages.contextMenuEdit),
-      click: onContextMenuEditClick,
-    }];
+    const contextMenuTemplate = [
+      {
+        label: name,
+        enabled: false,
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(messages.contextMenuEdit),
+        click: onContextMenuEditClick,
+      },
+    ];
 
     const contextMenu = Menu.buildFromTemplate(contextMenuTemplate);
 
@@ -110,10 +121,12 @@ class WorkspaceDrawerItem extends Component {
           isActive ? classes.isActiveItem : null,
         ])}
         onClick={onClick}
-        onContextMenu={() => (
+        onContextMenu={() =>
           onContextMenuEditClick && contextMenu.popup(getCurrentWindow())
-        )}
-        data-tip={`${shortcutIndex <= 9 ? `(${ctrlKey}+Alt+${shortcutIndex})` : ''}`}
+        }
+        data-tip={`${
+          shortcutIndex <= 9 ? `(${shortcutKey(false)}+${altKey}+${shortcutIndex})` : ''
+        }`}
       >
         <span
           className={classnames([
@@ -129,7 +142,9 @@ class WorkspaceDrawerItem extends Component {
             isActive ? classes.activeServices : null,
           ])}
         >
-          {services.length ? services.join(', ') : intl.formatMessage(messages.noServicesAddedYet)}
+          {services.length
+            ? services.join(', ')
+            : intl.formatMessage(messages.noServicesAddedYet)}
         </span>
       </div>
     );
diff --git a/src/features/workspaces/components/WorkspaceItem.js b/src/features/workspaces/components/WorkspaceItem.js
index cc4b1a3ba..85fc02d51 100644
--- a/src/features/workspaces/components/WorkspaceItem.js
+++ b/src/features/workspaces/components/WorkspaceItem.js
@@ -6,7 +6,7 @@ import injectSheet from 'react-jss';
 
 import Workspace from '../models/Workspace';
 
-const styles = theme => ({
+const styles = (theme) => ({
   row: {
     height: theme.workspaces.settings.listItems.height,
     borderBottom: `1px solid ${theme.workspaces.settings.listItems.borderColor}`,
diff --git a/src/features/workspaces/components/WorkspaceServiceListItem.js b/src/features/workspaces/components/WorkspaceServiceListItem.js
index e05b21440..f6e2a2786 100644
--- a/src/features/workspaces/components/WorkspaceServiceListItem.js
+++ b/src/features/workspaces/components/WorkspaceServiceListItem.js
@@ -8,7 +8,7 @@ import { Toggle } from '@meetfranz/forms';
 import Service from '../../../models/Service';
 import ServiceIcon from '../../../components/ui/ServiceIcon';
 
-const styles = theme => ({
+const styles = (theme) => ({
   listItem: {
     height: theme.workspaces.settings.listItems.height,
     borderBottom: `1px solid ${theme.workspaces.settings.listItems.borderColor}`,
diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
index a70d1d66f..c8ec0bc4c 100644
--- a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
+++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
@@ -15,12 +15,18 @@ const messages = defineMessages({
   },
 });
 
+let wrapperTransition = 'none';
+
+if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) {
+  wrapperTransition = 'width 0.5s ease';
+}
+
 const styles = theme => ({
   wrapper: {
     display: 'flex',
     alignItems: 'flex-start',
     position: 'absolute',
-    transition: 'width 0.5s ease',
+    transition: wrapperTransition,
     width: `calc(100% - ${theme.workspaces.drawer.width}px)`,
     marginTop: '20px',
   },
@@ -47,7 +53,8 @@ const styles = theme => ({
   },
 });
 
-@injectSheet(styles) @observer
+@injectSheet(styles)
+@observer
 class WorkspaceSwitchingIndicator extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
@@ -63,13 +70,11 @@ class WorkspaceSwitchingIndicator extends Component {
     const { intl } = this.context;
     const { isSwitchingWorkspace, nextWorkspace } = workspaceStore;
     if (!isSwitchingWorkspace) return null;
-    const nextWorkspaceName = nextWorkspace ? nextWorkspace.name : 'All services';
+    const nextWorkspaceName = nextWorkspace
+      ? nextWorkspace.name
+      : 'All services';
     return (
-      <div
-        className={classnames([
-          classes.wrapper,
-        ])}
-      >
+      <div className={classnames([classes.wrapper])}>
         <div className={classes.component}>
           <Loader
             className={classes.spinner}
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
index cfaacd56e..8319d3bc6 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.js
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -1,9 +1,9 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 import injectSheet from 'react-jss';
-import { Infobox, Badge } from '@meetfranz/ui';
+import { Infobox } from '@meetfranz/ui';
 
 import { mdiCheckboxMarkedCircleOutline } from '@mdi/js';
 import Loader from '../../../components/ui/Loader';
@@ -11,10 +11,7 @@ import WorkspaceItem from './WorkspaceItem';
 import CreateWorkspaceForm from './CreateWorkspaceForm';
 import Request from '../../../stores/lib/Request';
 import Appear from '../../../components/ui/effects/Appear';
-import { workspaceStore } from '../index';
 import UIStore from '../../../stores/UIStore';
-import globalMessages from '../../../i18n/globalMessages';
-import UpgradeButton from '../../../components/ui/UpgradeButton';
 
 const messages = defineMessages({
   headline: {
@@ -64,12 +61,6 @@ const styles = () => ({
   appear: {
     height: 'auto',
   },
-  premiumAnnouncement: {
-    height: 'auto',
-  },
-  premiumAnnouncementContainer: {
-    display: 'flex',
-  },
   announcementHeadline: {
     marginBottom: 0,
   },
@@ -78,12 +69,6 @@ const styles = () => ({
     margin: [-8, 0, 0, 20],
     alignSelf: 'center',
   },
-  upgradeCTA: {
-    margin: [40, 'auto'],
-  },
-  proRequired: {
-    margin: [10, 0, 40],
-  },
 });
 
 @inject('stores') @injectSheet(styles) @observer
@@ -152,77 +137,53 @@ class WorkspacesDashboard extends Component {
             </Appear>
           )}
 
-          {workspaceStore.isPremiumUpgradeRequired && (
-            <div className={classes.premiumAnnouncement}>
-
-              <h1 className={classes.announcementHeadline}>{intl.formatMessage(messages.workspaceFeatureHeadline)}</h1>
-              <Badge className={classes.proRequired}>{intl.formatMessage(globalMessages.proRequired)}</Badge>
-              <div className={classes.premiumAnnouncementContainer}>
-                <div className={classes.premiumAnnouncementContent}>
-                  <p>{intl.formatMessage(messages.workspaceFeatureInfo)}</p>
-                  <UpgradeButton
-                    className={classes.upgradeCTA}
-                    gaEventInfo={{ category: 'Workspaces', event: 'upgrade' }}
-                    short
-                    requiresPro
-                  />
-                </div>
-                <img src={`https://cdn.franzinfra.com/announcements/assets/workspaces_${this.props.stores.ui.isDarkThemeActive ? 'dark' : 'light'}.png`} className={classes.teaserImage} alt="" />
-              </div>
-            </div>
-          )}
-
-          {!workspaceStore.isPremiumUpgradeRequired && (
+          {/* ===== Create workspace form ===== */}
+          <div className={classes.createForm}>
+            <CreateWorkspaceForm
+              isSubmitting={createWorkspaceRequest.isExecuting}
+              onSubmit={onCreateWorkspaceSubmit}
+            />
+          </div>
+          {getUserWorkspacesRequest.isExecuting ? (
+            <Loader />
+          ) : (
             <>
-              {/* ===== Create workspace form ===== */}
-              <div className={classes.createForm}>
-                <CreateWorkspaceForm
-                  isSubmitting={createWorkspaceRequest.isExecuting}
-                  onSubmit={onCreateWorkspaceSubmit}
-                />
-              </div>
-              {getUserWorkspacesRequest.isExecuting ? (
-                <Loader />
+              {/* ===== Workspace could not be loaded error ===== */}
+              {getUserWorkspacesRequest.error ? (
+                <Infobox
+                  icon="alert"
+                  type="danger"
+                  ctaLabel={intl.formatMessage(messages.tryReloadWorkspaces)}
+                  ctaLoading={getUserWorkspacesRequest.isExecuting}
+                  ctaOnClick={getUserWorkspacesRequest.retry}
+                >
+                  {intl.formatMessage(messages.workspacesRequestFailed)}
+                </Infobox>
               ) : (
                 <>
-                  {/* ===== Workspace could not be loaded error ===== */}
-                  {getUserWorkspacesRequest.error ? (
-                    <Infobox
-                      icon="alert"
-                      type="danger"
-                      ctaLabel={intl.formatMessage(messages.tryReloadWorkspaces)}
-                      ctaLoading={getUserWorkspacesRequest.isExecuting}
-                      ctaOnClick={getUserWorkspacesRequest.retry}
-                    >
-                      {intl.formatMessage(messages.workspacesRequestFailed)}
-                    </Infobox>
+                  {workspaces.length === 0 ? (
+                    <div className="align-middle settings__empty-state">
+                      {/* ===== Workspaces empty state ===== */}
+                      <p className="settings__empty-text">
+                        <span className="emoji">
+                          <img src="./assets/images/emoji/sad.png" alt="" />
+                        </span>
+                        {intl.formatMessage(messages.noServicesAdded)}
+                      </p>
+                    </div>
                   ) : (
-                    <>
-                      {workspaces.length === 0 ? (
-                        <div className="align-middle settings__empty-state">
-                          {/* ===== Workspaces empty state ===== */}
-                          <p className="settings__empty-text">
-                            <span className="emoji">
-                              <img src="./assets/images/emoji/sad.png" alt="" />
-                            </span>
-                            {intl.formatMessage(messages.noServicesAdded)}
-                          </p>
-                        </div>
-                      ) : (
-                        <table className={classes.table}>
-                          {/* ===== Workspaces list ===== */}
-                          <tbody>
-                            {workspaces.map(workspace => (
-                              <WorkspaceItem
-                                key={workspace.id}
-                                workspace={workspace}
-                                onItemClick={w => onWorkspaceClick(w)}
-                              />
-                            ))}
-                          </tbody>
-                        </table>
-                      )}
-                    </>
+                    <table className={classes.table}>
+                      {/* ===== Workspaces list ===== */}
+                      <tbody>
+                        {workspaces.map((workspace) => (
+                          <WorkspaceItem
+                            key={workspace.id}
+                            workspace={workspace}
+                            onItemClick={(w) => onWorkspaceClick(w)}
+                          />
+                        ))}
+                      </tbody>
+                    </table>
                   )}
                 </>
               )}
diff --git a/src/features/workspaces/containers/WorkspacesScreen.js b/src/features/workspaces/containers/WorkspacesScreen.js
index c241cd622..4828658f9 100644
--- a/src/features/workspaces/containers/WorkspacesScreen.js
+++ b/src/features/workspaces/containers/WorkspacesScreen.js
@@ -30,8 +30,8 @@ class WorkspacesScreen extends Component {
           createWorkspaceRequest={createWorkspaceRequest}
           deleteWorkspaceRequest={deleteWorkspaceRequest}
           updateWorkspaceRequest={updateWorkspaceRequest}
-          onCreateWorkspaceSubmit={data => actions.workspaces.create(data)}
-          onWorkspaceClick={w => actions.workspaces.edit({ workspace: w })}
+          onCreateWorkspaceSubmit={(data) => actions.workspaces.create(data)}
+          onWorkspaceClick={(w) => actions.workspaces.edit({ workspace: w })}
         />
       </ErrorBoundary>
     );
diff --git a/src/features/workspaces/models/Workspace.js b/src/features/workspaces/models/Workspace.js
index 77c4e05f4..11ee377cd 100644
--- a/src/features/workspaces/models/Workspace.js
+++ b/src/features/workspaces/models/Workspace.js
@@ -22,13 +22,13 @@ export default class Workspace {
     this.name = data.name;
     this.order = data.order;
 
-    let services = data.services;
+    let { services } = data;
     if (data.saving && data.keepLoaded) {
       // Keep workspaces loaded
       services.push(KEEP_WS_LOADED_USID);
     } else if (data.saving && data.services.includes(KEEP_WS_LOADED_USID)) {
       // Don't keep loaded
-      services = services.filter(e => e !== KEEP_WS_LOADED_USID);
+      services = services.filter((e) => e !== KEEP_WS_LOADED_USID);
     }
     this.services.replace(services);
 
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index 632f3c299..8c73516bc 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -22,10 +22,6 @@ export default class WorkspacesStore extends FeatureStore {
 
   @observable isFeatureActive = false;
 
-  @observable isPremiumFeature = false;
-
-  @observable isPremiumUpgradeRequired = false;
-
   @observable activeWorkspace = null;
 
   @observable nextWorkspace = null;
@@ -58,7 +54,6 @@ export default class WorkspacesStore extends FeatureStore {
 
   @computed get isUserAllowedToUseFeature() {
     return true;
-    // return !this.isPremiumUpgradeRequired;
   }
 
   @computed get isAnyWorkspaceActive() {
@@ -69,16 +64,8 @@ export default class WorkspacesStore extends FeatureStore {
 
   _wasDrawerOpenBeforeSettingsRoute = null;
 
-  _freeUserActions = [];
-
-  _premiumUserActions = [];
-
   _allActions = [];
 
-  _freeUserReactions = [];
-
-  _premiumUserReactions = [];
-
   _allReactions = [];
 
   // ========== PUBLIC API ========= //
@@ -90,11 +77,9 @@ export default class WorkspacesStore extends FeatureStore {
 
     // ACTIONS
 
-    this._freeUserActions = createActionBindings([
+    this._allActions = createActionBindings([
       [workspaceActions.toggleWorkspaceDrawer, this._toggleWorkspaceDrawer],
       [workspaceActions.openWorkspaceSettings, this._openWorkspaceSettings],
-    ]);
-    this._premiumUserActions = createActionBindings([
       [workspaceActions.edit, this._edit],
       [workspaceActions.create, this._create],
       [workspaceActions.delete, this._delete],
@@ -106,27 +91,18 @@ export default class WorkspacesStore extends FeatureStore {
         this._toggleKeepAllWorkspacesLoadedSetting,
       ],
     ]);
-    this._allActions = this._freeUserActions.concat(this._premiumUserActions);
     this._registerActions(this._allActions);
 
     // REACTIONS
 
-    this._freeUserReactions = createReactions([
-      this._disablePremiumFeatures,
+    this._allReactions = createReactions([
       this._openDrawerWithSettingsReaction,
       this._setFeatureEnabledReaction,
-      this._setIsPremiumFeatureReaction,
       this._cleanupInvalidServiceReferences,
-    ]);
-    this._premiumUserReactions = createReactions([
       this._setActiveServiceOnWorkspaceSwitchReaction,
       this._activateLastUsedWorkspaceReaction,
       this._setWorkspaceBeingEditedReaction,
     ]);
-    this._allReactions = this._freeUserReactions.concat(
-      this._premiumUserReactions,
-    );
-
     this._registerReactions(this._allReactions);
 
     getUserWorkspacesRequest.execute();
@@ -273,13 +249,6 @@ export default class WorkspacesStore extends FeatureStore {
     this.isFeatureEnabled = isWorkspaceEnabled;
   };
 
-  _setIsPremiumFeatureReaction = () => {
-    // const { features } = this.stores;
-    // const { isWorkspaceIncludedInCurrentPlan } = features.features;
-    // this.isPremiumFeature = !isWorkspaceIncludedInCurrentPlan;
-    // this.isPremiumUpgradeRequired = !isWorkspaceIncludedInCurrentPlan;
-  };
-
   _setWorkspaceBeingEditedReaction = () => {
     const { pathname } = this.stores.router.location;
     const match = matchRoute('/settings/workspaces/edit/:id', pathname);
@@ -357,16 +326,4 @@ export default class WorkspacesStore extends FeatureStore {
       });
     });
   };
-
-  _disablePremiumFeatures = () => {
-    if (!this.isUserAllowedToUseFeature) {
-      debug('_disablePremiumFeatures');
-      this._stopActions(this._premiumUserActions);
-      this._stopReactions(this._premiumUserReactions);
-      this.reset();
-    } else {
-      this._startActions(this._premiumUserActions);
-      this._startReactions(this._premiumUserReactions);
-    }
-  };
 }
diff --git a/src/helpers/array-helpers.js b/src/helpers/array-helpers.js
index ffb3b63dc..5e592b7f7 100644
--- a/src/helpers/array-helpers.js
+++ b/src/helpers/array-helpers.js
@@ -1,4 +1,4 @@
-export const shuffleArray = arr => arr
-  .map(a => [Math.random(), a])
+export const shuffleArray = (arr) => arr
+  .map((a) => [Math.random(), a])
   .sort((a, b) => a[0] - b[0])
-  .map(a => a[1]);
+  .map((a) => a[1]);
diff --git a/src/helpers/async-helpers.js b/src/helpers/async-helpers.js
index 2ef01ee09..c6c57e28e 100644
--- a/src/helpers/async-helpers.js
+++ b/src/helpers/async-helpers.js
@@ -1,5 +1,5 @@
 /* eslint-disable import/prefer-default-export */
 
 export function sleep(ms = 0) {
-  return new Promise(r => setTimeout(r, ms));
+  return new Promise((r) => setTimeout(r, ms));
 }
diff --git a/src/helpers/plan-helpers.js b/src/helpers/plan-helpers.js
deleted file mode 100644
index b474f8bbd..000000000
--- a/src/helpers/plan-helpers.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import { defineMessages } from 'react-intl';
-import { PLANS_MAPPING, PLANS } from '../config';
-
-const messages = defineMessages({
-  [PLANS.PRO]: {
-    id: 'pricing.plan.pro',
-    defaultMessage: '!!!Professional',
-  },
-  [PLANS.PERSONAL]: {
-    id: 'pricing.plan.personal',
-    defaultMessage: '!!!Personal',
-  },
-  [PLANS.FREE]: {
-    id: 'pricing.plan.free',
-    defaultMessage: '!!!Free',
-  },
-  [PLANS.LEGACY]: {
-    id: 'pricing.plan.legacy',
-    defaultMessage: '!!!Premium',
-  },
-});
-
-export function cleanupPlanId(id) {
-  return id.replace(/(.*)-x[0-9]/, '$1');
-}
-
-export function i18nPlanName(planId, intl) {
-  if (!planId) {
-    throw new Error('planId is required');
-  }
-
-  if (!intl) {
-    throw new Error('intl context is required');
-  }
-
-  const id = cleanupPlanId(planId);
-
-  const plan = PLANS_MAPPING[id];
-
-  return intl.formatMessage(messages[plan]);
-}
-
-export function getPlan(planId) {
-  if (!planId) {
-    throw new Error('planId is required');
-  }
-
-  const id = cleanupPlanId(planId);
-
-  const plan = PLANS_MAPPING[id];
-
-  return plan;
-}
diff --git a/src/helpers/recipe-helpers.js b/src/helpers/recipe-helpers.js
index 7daa0aaab..7e4bfa85a 100644
--- a/src/helpers/recipe-helpers.js
+++ b/src/helpers/recipe-helpers.js
@@ -1,12 +1,12 @@
-import path from 'path';
-import { app } from '@electron/remote';
+import { parse } from 'path';
+import { userDataRecipesPath } from '../environment';
 
 export function getRecipeDirectory(id = '') {
-  return path.join(app.getPath('userData'), 'recipes', id);
+  return userDataRecipesPath(id);
 }
 
 export function getDevRecipeDirectory(id = '') {
-  return path.join(app.getPath('userData'), 'recipes', 'dev', id);
+  return userDataRecipesPath('dev', id);
 }
 
 export function loadRecipeConfig(recipeId) {
@@ -19,8 +19,7 @@ export function loadRecipeConfig(recipeId) {
     let config = require(configPath);
 
     const moduleConfigPath = require.resolve(configPath);
-    const paths = path.parse(moduleConfigPath);
-    config.path = paths.dir;
+    config.path = parse(moduleConfigPath).dir;
 
     return config;
   } catch (e) {
diff --git a/src/helpers/service-helpers.js b/src/helpers/service-helpers.js
index f6363aca8..745f40dd9 100644
--- a/src/helpers/service-helpers.js
+++ b/src/helpers/service-helpers.js
@@ -1,18 +1,16 @@
-import path from 'path';
-import { app } from '@electron/remote';
-import fs from 'fs-extra';
+import { readdirSync, removeSync } from 'fs-extra';
+import { userDataPath } from '../environment';
 
-export function getServicePartitionsDirectory() {
-  return path.join(app.getPath('userData'), 'Partitions');
+export function getServicePartitionsDirectory(...segments) {
+  return userDataPath('Partitions', ...([segments].flat()));
 }
 
 export function removeServicePartitionDirectory(id = '', addServicePrefix = false) {
-  const servicePartition = path.join(getServicePartitionsDirectory(), `${addServicePrefix ? 'service-' : ''}${id}`);
-
-  return fs.remove(servicePartition);
+  const servicePartition = getServicePartitionsDirectory(`${addServicePrefix ? 'service-' : ''}${id}`);
+  return removeSync(servicePartition);
 }
 
 export async function getServiceIdsFromPartitions() {
-  const files = await fs.readdir(getServicePartitionsDirectory());
-  return files.filter(n => n !== '__chrome_extension');
+  const files = readdirSync(getServicePartitionsDirectory());
+  return files.filter((n) => n !== '__chrome_extension');
 }
diff --git a/src/helpers/userAgent-helpers.js b/src/helpers/userAgent-helpers.js
index 9c9c8f132..ede5e6dc4 100644
--- a/src/helpers/userAgent-helpers.js
+++ b/src/helpers/userAgent-helpers.js
@@ -1,11 +1,10 @@
 import os from 'os';
 import macosVersion from 'macos-version';
+import { chrome } from 'useragent-generator';
 import {
   chromeVersion, isMac, isWindows, is64Bit, osArch, osRelease,
 } from '../environment';
 
-const uaGenerator = require('useragent-generator');
-
 function macOS() {
   const version = macosVersion();
   let cpuName = os.cpus()[0].model.split(' ')[0];
@@ -38,5 +37,5 @@ export default function userAgent() {
     platformString = linux();
   }
 
-  return uaGenerator.chrome({ os: platformString, version: chromeVersion });
+  return chrome({ os: platformString, version: chromeVersion });
 }
diff --git a/src/helpers/validation-helpers.js b/src/helpers/validation-helpers.js
index f489ec65e..116f19905 100644
--- a/src/helpers/validation-helpers.js
+++ b/src/helpers/validation-helpers.js
@@ -61,7 +61,7 @@ export function minLength(length) {
 
 export function oneRequired(targets) {
   return ({ field, form }) => {
-    const invalidFields = targets.filter(target => form.$(target).value === '');
+    const invalidFields = targets.filter((target) => form.$(target).value === '');
     return [targets.length !== invalidFields.length, window.ferdi.intl.formatMessage(messages.required, { field: field.label })];
   };
 }
diff --git a/src/i18n/globalMessages.js b/src/i18n/globalMessages.js
index 190417536..cc219957a 100644
--- a/src/i18n/globalMessages.js
+++ b/src/i18n/globalMessages.js
@@ -33,8 +33,4 @@ export default defineMessages({
     id: 'global.userAgentHelp',
     defaultMessage: "!!!Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   },
-  proRequired: {
-    id: 'global.franzProRequired',
-    defaultMessage: '!!!Franz Professional Required',
-  },
 });
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index 3447ea7ac..3e185e73b 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "Cancel",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Send as email",
   "feature.shareFranz.action.facebook": "Share on Facebook",
   "feature.shareFranz.action.twitter": "Share on Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Import your Ferdi 4 services",
@@ -88,7 +52,6 @@
   "infobar.hide": "Hide",
   "infobar.requiredRequestsFailed": "Could not load services and user information",
   "infobar.servicesUpdated": "Your services have been updated.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "A new update for Ferdi is available.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Email address",
@@ -149,6 +112,7 @@
   "menu.help.debugInfo": "Copy Debug Information",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Learn More",
   "menu.help.privacy": "Privacy Statement",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,12 +127,10 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "View",
   "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Enter Full Screen",
-  "menu.view.exitFullScreen": "Exit Full Screen",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.reloadTodos": "Reload ToDos",
   "menu.view.resetZoom": "Actual Size",
@@ -194,11 +156,7 @@
   "password.noUser": "No user with that email address was found",
   "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Welcome to Ferdi",
   "settings.account.account.editButton": "Edit account",
-  "settings.account.accountType.basic": "Basic Account",
-  "settings.account.accountType.premium": "Premium Supporter Account",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Invoices",
   "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Update profile",
-  "settings.account.headlineSubscription": "Your subscription",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.manageSubscription.label": "Manage your subscription",
   "settings.account.successInfo": "Your changes have been saved",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Try again",
   "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Could not load user information",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Available services",
   "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
   "settings.searchService": "Search service",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Add {name}",
   "settings.service.form.availableServices": "Available services",
   "settings.service.form.customUrl": "Custom server",
-  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
   "settings.user.form.accountType.label": "Account type",
@@ -516,29 +431,20 @@
   "signup.link.login": "Already have an account, sign in?",
   "signup.password.label": "Password",
   "signup.submit.label": "Create account",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Cancel",
-  "subscriptionPopup.buttonDone": "Done",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Disable audio",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
   "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Reload",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} is not valid",
   "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index e2af263a5..1081ace02 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "أوه لا! فقد فردي الاتصال بـ.",
   "feature.announcements.changelog.headline": "تغيرات في فريدي {version}",
   "feature.debugger.title": "نشر معلومات تصحيح الأخطاء",
-  "feature.delayApp.headline": "رجاء قيم بشراء رخصة الدعم لبرنامج فريدي للتخلص من وقت الانتظار",
-  "feature.delayApp.text": "فريدي سوف يستكمل خلال {seconds} ثانية.",
-  "feature.delayApp.trial.action": "أجل, أريد الحصول على 14 يوم تجريبي مجاني من برنامج فريدي بروفشنال",
-  "feature.delayApp.trial.actionShort": "تفعيل الفتره التجريبية لرنامج فريدي بروفشنال",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "الحصول على ترخيص الدعم لفردي",
-  "feature.delayApp.upgrade.actionShort": "ترقية الحساب",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "إلغاء",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "حدث خطأ أثناء محاولة نشر معلومات التصحيح. الرجاء المحاولة مرة أخرى لاحقاً أو عرض وحدة التحكم لمزيد من المعلومات.",
   "feature.publishDebugInfo.info": "نشر معلومات التصحيح الخاصة بك يساعدنا على العثور على المشاكل والأخطاء في فردي. بنشر معلومات التصحيح الخاصة بك فإنك تقبل سياسة الخصوصية وشروط خدمة مصحح فيردي",
   "feature.publishDebugInfo.privacy": "سياسة الخصوصية",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "حدد خدمة من خلال زر تاب، ↑ و ↓. افتح الخدمة بالظغط على زر الدخول.",
   "feature.quickSwitch.search": "بحث...",
   "feature.quickSwitch.title": "تبديل سريع",
-  "feature.serviceLimit.limitReached": "لقد قمت بإضافة {amount} من {limit} خدمات مدرجة في خطتك. الرجاء ترقية حسابك لإضافة المزيد من الخدمات.",
   "feature.shareFranz.action.email": "إرسال كبريد إلكتروني",
   "feature.shareFranz.action.facebook": "شارك على فيسبوك",
   "feature.shareFranz.action.twitter": "شارِك على تويتر",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "لقد أضفت {count} خدمات إلى فردي! احصل على التطبيق المجاني لـ WhatsApp، و Messenger، و Slack، و Skype و co على www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "لقد أضفت {count} خدمات إلى فردي! احصل على التطبيق المجاني لـ WhatsApp، Messenger, Slack, Skype and co على www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "أخبر أصدقائك وزملاءك كيف أن فردي رائع وساعدنا على نشر الكلمة.",
-  "feature.todos.premium.info": "فردي للمهام متاح للمستخدمين المتميزين الآن!",
-  "feature.todos.premium.rollout": "سيتعين على كل شخص آخر الانتظار لفترة أطول قليلا.",
-  "feature.todos.premium.upgrade": "ترقية الحساب",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "لا يمكن الإتصال بخدمات فردي عبر الإنترنت",
-  "global.franzProRequired": "الخطة الإحترافية لفردي مطلوبة",
   "global.notConnectedToTheInternet": "أنت غير متصل بالإنترنت.",
   "global.spellchecker.useDefault": "إستخدم الإعدادت الافتراضية ({default})",
   "global.spellchecking.autodetect": "الكشف عن اللغة تلقائياً",
   "global.spellchecking.autodetect.short": "تلقائي",
   "global.spellchecking.language": "لغة التدقيق الإملائي",
-  "global.upgradeButton.upgradeToPro": "الترقية إلى الخطة الإحترافية لفردي",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "استيراد خدمات فردي الأربع",
@@ -88,7 +52,6 @@
   "infobar.hide": "إخفاء",
   "infobar.requiredRequestsFailed": "تعذر تحميل الخدمات ومعلومات المستخدم",
   "infobar.servicesUpdated": "تم تحديث خدماتك.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "يتوفر تحديث جديد لفردي.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "البريد الإلكتروني",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "إخفاء شريط القوائم تلقائيا",
   "menu.app.checkForUpdates": "التحقق من وجود تحديثات",
   "menu.app.hide": "إخفاء",
-  "menu.app.hideOthers": "إخفاء الآخرين",
-  "menu.app.quit": "إغلاق",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "الإعدادات",
-  "menu.app.unhide": "إظهار",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "تعديل",
-  "menu.edit.copy": "نسخ",
-  "menu.edit.cut": "قص",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "حذف",
   "menu.edit.emojiSymbols": "الابتسامات والرموز التعبيرية",
   "menu.edit.findInPage": "البحث في الصفحة",
-  "menu.edit.paste": "لصق",
-  "menu.edit.pasteAndMatchStyle": "لصق ومطابقة النمط",
-  "menu.edit.redo": "إعادة",
-  "menu.edit.selectAll": "تحديد الكل",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "الحديث",
   "menu.edit.startDictation": "بدء الإملاء",
   "menu.edit.startSpeaking": "بدء الحديث",
   "menu.edit.stopSpeaking": "إيقاف الحديث",
-  "menu.edit.undo": "تراجع",
+  "menu.edit.undo": "Undo",
   "menu.file": "الملف",
-  "menu.help": "مساعدة",
+  "menu.help": "Help",
   "menu.help.changelog": "سِجل التغيرات",
   "menu.help.debugInfo": "نسخ معلومات تصحيح الأخطاء",
   "menu.help.debugInfoCopiedBody": "تم نسخ معلومات تصحيح الأخطاء الخاصة بك إلى الحافظة.",
   "menu.help.debugInfoCopiedHeadline": "معلومات تصحيح الأخطاء لفردي",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "معرفة المزيد",
   "menu.help.privacy": "بيان الخصوصية",
   "menu.help.publishDebugInfo": "نشر معلومات تصحيح الأخطاء",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "تفعيل المهام",
   "menu.view": "عرض",
   "menu.view.back": "الرجوع",
-  "menu.view.enterFullScreen": "الدخول إلى وضع ملء الشاشة",
-  "menu.view.exitFullScreen": "الخروج من وضع ملئ للشاشة",
   "menu.view.forward": "تقدم",
   "menu.view.lockFerdi": "قفل فردي",
   "menu.view.openQuickSwitch": "فتح التبديل السريع",
-  "menu.view.reloadFranz": "إعادة تحميل فردي",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "إعادة تحميل الخدمة",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "الحجم الأصلي",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "تفعيل الوضع المظلم",
   "menu.view.toggleDevTools": "فتح أدوات المطور",
-  "menu.view.toggleFullScreen": "تفعيل وضع ملء الشاشة",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "فتح أدوات المطور للخدمة",
   "menu.view.toggleTodosDevTools": "ادخل إلى أدوات مطوري تودوس",
-  "menu.view.zoomIn": "تكبير",
-  "menu.view.zoomOut": "تصغير",
-  "menu.window": "النافذة",
-  "menu.window.close": "إغلاق",
-  "menu.window.minimize": "تصغير النافذة",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "مساحاتُ العمل",
   "menu.workspaces.addNewWorkspace": "إضافة مساحة عمل جديدة...",
   "menu.workspaces.closeWorkspaceDrawer": "غلقُ دُرجِ مساحة العمل",
@@ -194,11 +156,7 @@
   "password.noUser": "لم يُعثر على مُستخدمٍ بعنوانِ البريدِ هذا",
   "password.submit.label": "إرسال",
   "password.successInfo": "رجاءً تحقق من عنوان بريدك الإلكتروني",
-  "premiumFeature.button.upgradeAccount": "ترقية الحساب",
   "pricing.features.accountSync": "مزامنةُ الحساب",
-  "pricing.features.adFree": "خالٍ من الإعلانات للأبد",
-  "pricing.features.appDelays": "لا شاشاتِ انتظار",
-  "pricing.features.appDelaysEnabled": "شاشاتُ انتظار هنا وهنا",
   "pricing.features.customWebsites": "إضافة مواقع مخصصة",
   "pricing.features.desktopNotifications": "إشعارات سطح المكتب",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "فريق الإدارة",
   "pricing.features.thirdPartyServices": "تنصيب خدمات الطرف الثالث",
   "pricing.features.unlimitedServices": "إمكانية إضافة خدمات غير محدودة",
-  "pricing.features.upToSixServices": "إضافة ما يصل إلى 6 خدمات",
-  "pricing.features.upToThreeServices": "إضافة ما يصل إلى 3 خدمات",
   "pricing.features.workspaces": "مساحاتُ العمل",
-  "pricing.plan.free": "فيردي المجاني",
-  "pricing.plan.legacy": "فيردي الإصدار الممتاز",
-  "pricing.plan.personal": "فيردي الإصدار الشخصي",
-  "pricing.plan.personal-monthly": "فيردي الإصدار الشخصي الشهري",
-  "pricing.plan.personal-yearly": "فيردي الإصدار الشخصي السنوي",
-  "pricing.plan.pro": "فيردي الإصدار الاحترافي",
-  "pricing.plan.pro-monthly": "فيردي الإصدار الاحترافي الشهري",
-  "pricing.plan.pro-yearly": "فيردي الإصدار الاحترافي السنوي",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "أعادة تحميل {name}",
   "service.crashHandler.autoReload": "محاولة الاستعادة التلقائية {name} في غضون {seconds} ثانية",
   "service.crashHandler.headline": "أوه لا!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "أوه لا!",
   "service.errorHandler.message": "خطأ",
   "service.errorHandler.text": "فشل {name} في التحميل.",
-  "service.restrictedHandler.action": "ترقية الحساب",
-  "service.restrictedHandler.customUrl.headline": "مطلوب الخطة الاحترافية لفيردي",
-  "service.restrictedHandler.customUrl.text": "يرجى الترقية إلى خطة فيردي الاحترافية لاستخدام العناوين الإلكترونية المخصصة وخدمات الاستضافة الذاتية.",
-  "service.restrictedHandler.serviceLimit.headline": "لقد وصلت إلى حد الخدمة الخاص بك.",
-  "service.restrictedHandler.serviceLimit.text": "الرجاء ترقية حسابك لاستخدام أكثر من {count} خدمة.",
   "service.webviewLoader.loading": "جاري تحميل {service}",
   "services.getStarted": "بدأ الإستخدام",
   "services.login": "الرجاء تسجيل الدخول لاستخدام فردي.",
-  "services.serverInfo": "يمكنك تغيير خادم فردي الخاص بك بالنقر على الكود في أسفل الزاوية اليسار بشكل اختياري.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "استخدام فردي بدون حساب",
   "services.welcome": "مرحبا بكم في فردي",
   "settings.account.account.editButton": "تعديل الحساب",
-  "settings.account.accountType.basic": "الحساب الأساسي",
-  "settings.account.accountType.premium": "حساب الدعم المدفوع",
   "settings.account.accountUnavailable": "الحساب غير متوفر",
   "settings.account.accountUnavailableInfo": "أنت تستخدم فردي بدون حساب. إذا كنت ترغب في استخدام فردي مع حساب والحفاظ على مزامنة خدماتك عبر مختلف الحواسيب، الرجاء تحديد خادم في علامة تبويب الإعدادات ثم سجل الدخول.",
   "settings.account.buttonSave": "تحديث الملف الشخصي",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "الفواتير",
   "settings.account.headlinePassword": "تغيير كلمة المرور",
   "settings.account.headlineProfile": "تحديث الملف الشخصي",
-  "settings.account.headlineSubscription": "الاشتراك الخاص بك",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "قم بترقية حسابك واحصل على تجربة فردي الكاملة",
-  "settings.account.invoiceDownload": "تنزيل",
-  "settings.account.manageSubscription.label": "إدارة اشتراكك",
   "settings.account.successInfo": "تم حفظ التغييرات الخاصة بك",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "حاول مجددًا",
   "settings.account.tryReloadUserInfoRequest": "حاول مجددًا",
-  "settings.account.upgradeToPro.label": "الترقية إلى الخطة الإحترافية لفردي",
   "settings.account.userInfoRequestFailed": "تعذر تحميل معلومات المستخدم",
   "settings.account.yourLicense": "رخصة فردي الخاصة بك",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "تفعيل التصحيح الإملائي",
   "settings.app.form.enableSystemTray": "إظهار فردي في شريط النظام",
   "settings.app.form.enableTodos": "تفعيل فردي للمهام",
-  "settings.app.form.hibernate": "تفعيل وضع النوم للخدمة",
   "settings.app.form.hibernateOnStartup": "الإبقاء على الخدمات في وضع النوم عند بدء التشغيل",
   "settings.app.form.hibernationStrategy": "استراتيجية وضع النوم",
   "settings.app.form.iconSize": "حجم أيقونة الخدمة",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "تمكين الوضع المظلم الكامل",
   "settings.app.form.useTouchIdToUnlock": "السماح باستخدام TouchID لفتح فردي",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "الإعدادات",
   "settings.app.headlineAdvanced": "متقدم",
   "settings.app.headlineAppearance": "المظهر",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "الترجمات الرسمية هي الإنكليزية والألمانية. وجميع اللغات الأخرى مبنية على ترجمات مساهمين.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "كلمة المرور",
   "settings.app.lockedPasswordInfo": "الرجاء التأكد من تعيين كلمة مرور سوف تتذكرها.\nإذما فقدت كلمة المرور هذه، سوف تضطر إلى إعادة تثبيت فيردي.",
   "settings.app.restartRequired": "التغيرات تتطلب إعادة تشغيل",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "الذاكرة المؤقتة",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "فتح المجلد",
   "settings.recipes.headline": "الخدمات المتاحة",
   "settings.recipes.missingService": "خدمة مفقودة؟",
-  "settings.recipes.mostPopular": "الأكثر شعبية",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "تمت إضافة الخدمة بنجاح",
   "settings.searchService": "البحث عن خدمة",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "إضافة {name}",
   "settings.service.form.availableServices": "الخدمات المتاحة",
   "settings.service.form.customUrl": "خادم مخصص",
-  "settings.service.form.customUrlPremiumInfo": "لإضافة الخدمات المستضافة بنفسك، تحتاج إلى حساب الدعم المدفوع لفردي.",
-  "settings.service.form.customUrlUpgradeAccount": "ترقية حسابك",
   "settings.service.form.customUrlValidationError": "تعذر التحقق من خادم {name} المخصص.",
   "settings.service.form.darkReaderBrightness": "سطوع الشاشة في وضع القراءة المظلم",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "فريق أدارة فرانز",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "فريق",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "ادر فريقك على meetfranz.com",
   "settings.team.teamsUnavailable": "الفرق غير متوفرة",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "ترقية حسابك",
   "settings.user.form.accountType.company": "اسم الشركة",
   "settings.user.form.accountType.individual": "شخصي",
   "settings.user.form.accountType.label": "نوع الحساب",
@@ -516,29 +431,20 @@
   "signup.link.login": "ألديك حساب, سجل الدخول؟",
   "signup.password.label": "كلمة المرور",
   "signup.submit.label": "أنشئ حساب",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "مشاهدة جميع الخيارات",
-  "subscription.cta.choosePlan": "اختر خطة اشتراكك",
-  "subscription.includedProFeatures": "وتشمل خطة اشتراك فيردي الاحترافية ما يلي:",
-  "subscription.interval.per": "لكل {interval}",
-  "subscription.interval.perMonth": "في الشهر",
-  "subscription.interval.perMonthPerUser": "في الشهر وعدد المستخدمين",
-  "subscription.planItem.upgradeAccount": "ترقية الحساب",
-  "subscription.teaser.includedFeatures": "تشمل خطة الاشتراك المدفوعة لفريدي:",
-  "subscription.teaser.intro": "يأتي فردي 5 مع مجموعة واسعة من الميزات الجديدة لتعزيز تواصلك اليومي - ويشمل ذلك البطاريات. تحقق من خطط اشتراكاتنا الجديدة واكتشف أي واحد تناسبك أكثر!",
-  "subscriptionPopup.buttonCancel": "إلغاء",
-  "subscriptionPopup.buttonDone": "تم",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "حذف الخدمة",
   "tabs.item.disableAudio": "تعطيل الصوت",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "تعطيل الإشعارات",
   "tabs.item.disableService": "تعطيل الخدمة",
   "tabs.item.edit": "تعديل",
   "tabs.item.enableAudio": "تمكين الصوت",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "تفعيل الإشعارات",
   "tabs.item.enableService": "تفعيل الخدمة",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "إعادة التحميل",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} غير صالح",
   "validation.minLength": "{field} يجب أن يكون على الأقل {length} حرفاً",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "مساحاتُ العمل",
   "workspaceDrawer.item.contextMenuEdit": "تعديل",
   "workspaceDrawer.item.noServicesAddedYet": "لم تضف أي خدمات بعد",
-  "workspaceDrawer.premiumCtaButtonLabel": "أنشئ مساحة عملك الأولى",
-  "workspaceDrawer.proFeatureBadge": "المزايا المدفوعة",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "إعادة تنشيط الحساب المدفوع",
   "workspaceDrawer.workspaceFeatureInfo": "<p>يُمكنك فيردي من التركيز على ما هو مهم لديك الآن. أنشاء مجموعات مختلفة من الخدمات وإداراتها والتنقل بينها بسهولة في أي وقت.<p><p/>أنتَ  من يقرر أيّ الخدمات تحتاج ساعة تحتاج وأين تحتاج, لذا نستطيع مساعدتك لتبقى محافظ مع مستجدات ما تقوم به أو تستريح إن شئت.<p/>",
   "workspaceDrawer.workspacesSettingsTooltip": "تعديل إعدادات مساحات العمل",
   "workspaces.switchingIndicator.switchingTo": "التبديل إلى"
diff --git a/src/i18n/locales/be.json b/src/i18n/locales/be.json
index 848450add..8f1141c31 100644
--- a/src/i18n/locales/be.json
+++ b/src/i18n/locales/be.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "Cancel",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Send as email",
   "feature.shareFranz.action.facebook": "Share on Facebook",
   "feature.shareFranz.action.twitter": "Share on Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Import your Ferdi 4 services",
@@ -88,7 +52,6 @@
   "infobar.hide": "Hide",
   "infobar.requiredRequestsFailed": "Could not load services and user information",
   "infobar.servicesUpdated": "Your services have been updated.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "A new update for Ferdi is available.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Email address",
@@ -149,6 +112,7 @@
   "menu.help.debugInfo": "Copy Debug Information",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Learn More",
   "menu.help.privacy": "Privacy Statement",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,12 +127,10 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "View",
   "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Enter Full Screen",
-  "menu.view.exitFullScreen": "Exit Full Screen",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.reloadTodos": "Reload ToDos",
   "menu.view.resetZoom": "Actual Size",
@@ -194,11 +156,7 @@
   "password.noUser": "No user with that email address was found",
   "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Welcome to Ferdi",
   "settings.account.account.editButton": "Edit account",
-  "settings.account.accountType.basic": "Basic Account",
-  "settings.account.accountType.premium": "Premium Supporter Account",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Invoices",
   "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Update profile",
-  "settings.account.headlineSubscription": "Your subscription",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.manageSubscription.label": "Manage your subscription",
   "settings.account.successInfo": "Your changes have been saved",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Try again",
   "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Could not load user information",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Available services",
   "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
   "settings.searchService": "Search service",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Add {name}",
   "settings.service.form.availableServices": "Available services",
   "settings.service.form.customUrl": "Custom server",
-  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
   "settings.user.form.accountType.label": "Account type",
@@ -516,29 +431,20 @@
   "signup.link.login": "Already have an account, sign in?",
   "signup.password.label": "Password",
   "signup.submit.label": "Create account",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Cancel",
-  "subscriptionPopup.buttonDone": "Done",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Disable audio",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
   "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Абнавіць",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} is not valid",
   "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/bg.json b/src/i18n/locales/bg.json
index a2a28c856..87d1083a8 100644
--- a/src/i18n/locales/bg.json
+++ b/src/i18n/locales/bg.json
@@ -5,30 +5,6 @@
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
-  "feature.delayApp.headline": "Upgrade your Ferdi plan to skip the wait",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14-days trial and skip the wait",
-  "feature.delayApp.upgrade.action": "Upgrade Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}?",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Send as email",
   "feature.shareFranz.action.facebook": "Share on Facebook",
   "feature.shareFranz.action.twitter": "Share on Twitter",
@@ -36,16 +12,6 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Няма връзка с онлайн услугите на Франц",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "Не сте свързани към интернет",
@@ -53,7 +19,6 @@
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "import.headline": "Вмъкнете вашите услуги на Франц 4",
   "import.notSupportedHeadline": "Тези услуги не се подържат все още във Франц 5. ",
   "import.skip.label": "Искам да прибавя ръчно услуги",
@@ -63,7 +28,6 @@
   "infobar.buttonReloadServices": "Презареждане на услугите",
   "infobar.requiredRequestsFailed": "Неуспешно зареждане на услугите и информацията на потребителя. ",
   "infobar.servicesUpdated": "Вашите услуги са обновени.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "Има нова версия на Франц",
   "invite.email.label": "Адрес на е-поща:",
   "invite.headline.friends": "Поканете 3 ваши приятели или колеги",
@@ -122,9 +86,7 @@
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Изглед",
-  "menu.view.enterFullScreen": "Отвории на цял екран",
-  "menu.view.exitFullScreen": "Излез от цял екран",
-  "menu.view.reloadFranz": "Презареди Ferdi",
+  "menu.view.reloadFerdi": "Презареди Ferdi",
   "menu.view.reloadService": "Презареди услугата",
   "menu.view.reloadTodos": "Reload ToDos",
   "menu.view.resetZoom": "Оригинален размер",
@@ -149,7 +111,6 @@
   "password.noUser": "Абонат с такава е-поща не бе намерен",
   "password.submit.label": "Изпращане",
   "password.successInfo": "Моля отбележете вашата е-поща",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
@@ -166,27 +127,6 @@
   "pricing.features.upToSixServices": "Add up to 6 services",
   "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Free",
-  "pricing.plan.legacy": "Premium",
-  "pricing.plan.personal": "Personal",
-  "pricing.plan.personal-monthly": "Personal Monthly",
-  "pricing.plan.personal-yearly": "Personal Yearly",
-  "pricing.plan.pro": "Professional",
-  "pricing.plan.pro-monthly": "Professional Monthly",
-  "pricing.plan.pro-yearly": "Professional Yearly",
-  "pricing.trial.cta.accept": "Start my 14-day Ferdi Professional Trial ",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Презареждане {име}",
   "service.crashHandler.autoReload": "Опитва се да възтанови автоматично {name} след {seconds} секунди",
   "service.crashHandler.headline": "О не!",
@@ -198,11 +138,6 @@
   "service.errorHandler.headline": "О не!",
   "service.errorHandler.message": "Грешка",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading",
   "services.getStarted": "Започване",
   "services.welcome": "Добре дошли във Франц",
@@ -219,18 +154,9 @@
   "settings.account.headlineInvoices": "Фактури",
   "settings.account.headlinePassword": "Смяна на парола",
   "settings.account.headlineProfile": "Обновление на профила",
-  "settings.account.headlineSubscription": "Вашият абонамент",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Изтегляне",
-  "settings.account.manageSubscription.label": "Управление на абонамена",
   "settings.account.successInfo": "Промените бяха запазени",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Опитайте отново",
   "settings.account.tryReloadUserInfoRequest": "Опитайте отново",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Не може да зареди информацията на абоната",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.buttonClearAllCache": "Изчистване на буфера",
@@ -284,7 +210,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Налични услуги",
   "settings.recipes.missingService": "Липсващи услуги?",
-  "settings.recipes.mostPopular": "Най-разпространените",
   "settings.recipes.nothingFound": "За съжаление няма услуги съвпадащи с вашето търсене.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Услугата беше прибавена успешно",
   "settings.searchService": "Търсене на услуга",
@@ -295,7 +220,6 @@
   "settings.service.form.availableServices": "Налични услуги",
   "settings.service.form.customUrl": "Клиентски сървър",
   "settings.service.form.customUrlPremiumInfo": "За да добавите услуги, разположени на ваш сървър, трябва да имате Ferdi Premium Supporter профил",
-  "settings.service.form.customUrlUpgradeAccount": "Надградете вашия профил",
   "settings.service.form.customUrlValidationError": "Не може да се валидира стандартния {name} сървър",
   "settings.service.form.deleteButton": "Изтрий услугата",
   "settings.service.form.editServiceHeadline": "Редактира {име}",
@@ -391,19 +315,6 @@
   "signup.link.login": "Вече сте регистриран, впишете се?",
   "signup.password.label": "Парола",
   "signup.submit.label": "Създаване на акаунт",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Отказ",
-  "subscriptionPopup.buttonDone": "Готово",
   "tabs.item.deleteService": "Изтрий услугата",
   "tabs.item.disableAudio": "Изключване на звука",
   "tabs.item.disableNotifications": "Изключване на известията",
@@ -431,7 +342,6 @@
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
   "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
   "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index 3447ea7ac..3e185e73b 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "Cancel",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Send as email",
   "feature.shareFranz.action.facebook": "Share on Facebook",
   "feature.shareFranz.action.twitter": "Share on Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Import your Ferdi 4 services",
@@ -88,7 +52,6 @@
   "infobar.hide": "Hide",
   "infobar.requiredRequestsFailed": "Could not load services and user information",
   "infobar.servicesUpdated": "Your services have been updated.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "A new update for Ferdi is available.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Email address",
@@ -149,6 +112,7 @@
   "menu.help.debugInfo": "Copy Debug Information",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Learn More",
   "menu.help.privacy": "Privacy Statement",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,12 +127,10 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "View",
   "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Enter Full Screen",
-  "menu.view.exitFullScreen": "Exit Full Screen",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.reloadTodos": "Reload ToDos",
   "menu.view.resetZoom": "Actual Size",
@@ -194,11 +156,7 @@
   "password.noUser": "No user with that email address was found",
   "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Welcome to Ferdi",
   "settings.account.account.editButton": "Edit account",
-  "settings.account.accountType.basic": "Basic Account",
-  "settings.account.accountType.premium": "Premium Supporter Account",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Invoices",
   "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Update profile",
-  "settings.account.headlineSubscription": "Your subscription",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.manageSubscription.label": "Manage your subscription",
   "settings.account.successInfo": "Your changes have been saved",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Try again",
   "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Could not load user information",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Available services",
   "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
   "settings.searchService": "Search service",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Add {name}",
   "settings.service.form.availableServices": "Available services",
   "settings.service.form.customUrl": "Custom server",
-  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
   "settings.user.form.accountType.label": "Account type",
@@ -516,29 +431,20 @@
   "signup.link.login": "Already have an account, sign in?",
   "signup.password.label": "Password",
   "signup.submit.label": "Create account",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Cancel",
-  "subscriptionPopup.buttonDone": "Done",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Disable audio",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
   "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Reload",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} is not valid",
   "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 561fe3c4c..beb7f7f92 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh no! Ferdi ha perdut la connexió a {name}.",
   "feature.announcements.changelog.headline": "Canvis en Ferdi {version}",
   "feature.debugger.title": "Registra la informació de depuració",
-  "feature.delayApp.headline": "Si us plau, compra una llicència de suport per a Ferdi per saltar l'espera",
-  "feature.delayApp.text": "Ferdi continuarà en {seconds} segons",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Aconsegueix una llicència de suport per a Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Millorar el teu compte",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "Cancel·la",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "S'ha produït un error en intentar publicar la informació de depuració. Torneu-ho a provar més tard o visualitzeu la consola per obtenir més informació.",
   "feature.publishDebugInfo.info": "La publicació de la informació de depuració ens ajuda a trobar problemes i errors a Ferdi. En publicar la informació de depuració, accepteu la política de privadesa i els termes del servei de Ferdi Debugger",
   "feature.publishDebugInfo.privacy": "Política de privacitat",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Seleccioneu un servei amb TAB, ↑ i ↓. Obriu un servei amb ENTER.",
   "feature.quickSwitch.search": "Cerca...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "Heu afegit {amount} de {limit} serveis inclosos al vostre pla. Actualitzeu el vostre compte per afegir més serveis.",
   "feature.shareFranz.action.email": "Envia com a correu",
   "feature.shareFranz.action.facebook": "Compartir en Facebook",
   "feature.shareFranz.action.twitter": "Compartir a Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "He afegit {count} serveis a Ferdi! Obtén l'aplicació gratuïta per a Whatsapp, Messenger, Slack, Skype a www,getferdi.com",
   "feature.shareFranz.shareText.twitter": "He afegit {count} serveis a Ferdi! Obtén l'aplicació gratuïta  de Whatsapp, Messenger, Slack, Skype i altres a www.getferdi.com/cc @FerdiMessenger",
   "feature.shareFranz.text": "Digues als teus amics i col·legues l'increïble que és Ferdi i ajuda'ns a còrrer la veu ",
-  "feature.todos.premium.info": "Les Tasques de Ferdi ja estan disponibles per a usuaris premium!",
-  "feature.todos.premium.rollout": "Tothom haurà d'esperar una mica més.",
-  "feature.todos.premium.upgrade": "Actualitzar el compte",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "No es pot connectar amb els serveis en línia de Ferdi",
-  "global.franzProRequired": "Professional de Ferdi obligatori",
   "global.notConnectedToTheInternet": "No esteu connectat a Internet.",
   "global.spellchecker.useDefault": "Utilitzar el predeterminat del sistema ({default})",
   "global.spellchecking.autodetect": "Detectar l'idioma automàticament",
   "global.spellchecking.autodetect.short": "Automàtic",
   "global.spellchecking.language": "Corrector ortogràfic",
-  "global.upgradeButton.upgradeToPro": "Actualitza a Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importa els teus serveis Ferdi 4",
@@ -88,7 +52,6 @@
   "infobar.hide": "Amaga",
   "infobar.requiredRequestsFailed": "No s'han pogut carregar els serveis i la informació de l'usuari",
   "infobar.servicesUpdated": "Els teus serveis s'han actualitzat.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "Hi ha disponible una nova actualització per a Ferdi.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Correu electrònic",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Amaga automàticament la barra de menú",
   "menu.app.checkForUpdates": "Comprova si hi ha actualitzacions",
   "menu.app.hide": "Amaga",
-  "menu.app.hideOthers": "Amaga altres",
-  "menu.app.quit": "Surt",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Configuració",
-  "menu.app.unhide": "Mostra",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Edita",
-  "menu.edit.copy": "Copia",
-  "menu.edit.cut": "Retalla",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Suprimeix",
   "menu.edit.emojiSymbols": "Emoji i Símbols",
   "menu.edit.findInPage": "Troba a la pàgina",
-  "menu.edit.paste": "Enganxa",
-  "menu.edit.pasteAndMatchStyle": "Enganxa amb els estils",
-  "menu.edit.redo": "Refés",
-  "menu.edit.selectAll": "Selecciona-ho tot",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Pronuncia",
   "menu.edit.startDictation": "Inicia el dictat",
   "menu.edit.startSpeaking": "Inicia la parla",
   "menu.edit.stopSpeaking": "Atura la parla",
-  "menu.edit.undo": "Desfés",
+  "menu.edit.undo": "Undo",
   "menu.file": "Fitxer",
-  "menu.help": "Ajuda",
+  "menu.help": "Help",
   "menu.help.changelog": "Registre de canvis",
   "menu.help.debugInfo": "Copia la informació de depuració",
   "menu.help.debugInfoCopiedBody": "La informació de depuració s'ha copiat al porta-retalls.",
   "menu.help.debugInfoCopiedHeadline": "Informació de depuració de Ferdi",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Conegueu-ne més detalls",
   "menu.help.privacy": "Declaració de privacitat",
   "menu.help.publishDebugInfo": "Publicar informació de depuració",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Activar Tasques",
   "menu.view": "Visualitza",
   "menu.view.back": "Enrere",
-  "menu.view.enterFullScreen": "Inicia la pantalla completa",
-  "menu.view.exitFullScreen": "Surt de pantalla completa",
   "menu.view.forward": "Endavant",
   "menu.view.lockFerdi": "Bloqueja Ferdi",
   "menu.view.openQuickSwitch": "Obre Quick Switch",
-  "menu.view.reloadFranz": "Torna a carregar Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Torna a carregar el servei",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Mida real",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Canvia a Mode Fosc",
   "menu.view.toggleDevTools": "Activa serveis per a desenvolupadors",
-  "menu.view.toggleFullScreen": "Activa la pantalla completa",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Habilita les eines de desenvolupador de serveis",
   "menu.view.toggleTodosDevTools": "Activa serveis per a desenvolupadors a Tasques",
-  "menu.view.zoomIn": "Amplia",
-  "menu.view.zoomOut": "Redueix",
-  "menu.window": "Finestra",
-  "menu.window.close": "Tanca",
-  "menu.window.minimize": "Minimitza",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Espais de treball",
   "menu.workspaces.addNewWorkspace": "Afegir un Espai de Treball...",
   "menu.workspaces.closeWorkspaceDrawer": "Tancar el calaix d'espais de treball",
@@ -194,11 +156,7 @@
   "password.noUser": "No s'ha trobat cap usuari amb aquesta adreça de correu electrònic",
   "password.submit.label": "Enviar",
   "password.successInfo": "Comproveu el vostre correu electrònic",
-  "premiumFeature.button.upgradeAccount": "Millorar el teu compte",
   "pricing.features.accountSync": "Sincronització de Conte",
-  "pricing.features.adFree": "Sense publicitat per sempre",
-  "pricing.features.appDelays": "Cap pantalla d’espera",
-  "pricing.features.appDelaysEnabled": "Pantalles d’espera ocasionals",
   "pricing.features.customWebsites": "Afegir llocs web personalitzats",
   "pricing.features.desktopNotifications": "Notificacions a l'escriptori",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Espais de treball",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Recarrega {name}",
   "service.crashHandler.autoReload": "Intentant restablir automàticament {name} en {seconds} segons",
   "service.crashHandler.headline": "Oh no!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} ha fallat al carregar",
-  "service.restrictedHandler.action": "Actualitzar el compte",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Introducció",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Benvingut a Ferdi",
   "settings.account.account.editButton": "Editar Compte",
-  "settings.account.accountType.basic": "Compte bàsic",
-  "settings.account.accountType.premium": "Compte de Suport Premium",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Actualitzar el perfil",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Factures",
   "settings.account.headlinePassword": "Canvia la contrasenya",
   "settings.account.headlineProfile": "Actualitzar el perfil",
-  "settings.account.headlineSubscription": "La vostra subscripció",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Descarregar",
-  "settings.account.manageSubscription.label": "Gestioneu la vostra subscripció",
   "settings.account.successInfo": "S'han desat els canvis",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Torna a provar-ho",
   "settings.account.tryReloadUserInfoRequest": "Torna a provar-ho",
-  "settings.account.upgradeToPro.label": "Actualitza a Ferdi Professional",
   "settings.account.userInfoRequestFailed": "No s'ha pogut carregar la informació de l'usuari",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Habilita la comprobació ortogràfica",
   "settings.app.form.enableSystemTray": "Mostra Ferdi a la safata del sistema",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Configuració",
   "settings.app.headlineAdvanced": "Avançat",
   "settings.app.headlineAppearance": "Aparença",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Contrasenya",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Els canvis requereixen reiniciar",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Memòria cau",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Serveis disponibles",
   "settings.recipes.missingService": "Trobes a faltar algun servei?",
-  "settings.recipes.mostPopular": "Els més populars",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "El servei s'ha afegit correctament",
   "settings.searchService": "Cercar servei",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Afegir {name}",
   "settings.service.form.availableServices": "Serveis disponibles",
   "settings.service.form.customUrl": "Servidor personalitzat",
-  "settings.service.form.customUrlPremiumInfo": "Per afegir serveis allotjats per vosaltres mateixos, necessiteu un Compte Ferdi Premium Supporter.",
-  "settings.service.form.customUrlUpgradeAccount": "Actualitzeu el vostre compte",
   "settings.service.form.customUrlValidationError": "No s'ha pogut validar el servidor {name} personalitzat.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Equip",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Empresa",
   "settings.user.form.accountType.individual": "Individual",
   "settings.user.form.accountType.label": "Tipus de compte",
@@ -516,29 +431,20 @@
   "signup.link.login": "Ja teniu un compte, iniciar la sessió?",
   "signup.password.label": "Contrasenya",
   "signup.submit.label": "Crea un compte",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Actualitzar el compte",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Cancel·la",
-  "subscriptionPopup.buttonDone": "Fet",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Suprimeix el servei",
   "tabs.item.disableAudio": "Desactiva l'àudio",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Desactiva les notificacions",
   "tabs.item.disableService": "Desactiva el servei",
   "tabs.item.edit": "Edita",
   "tabs.item.enableAudio": "Activa l'àudio",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Activa les notificacions",
   "tabs.item.enableService": "Activa el servei",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Recarrega",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} no es vàlid",
   "validation.minLength": "{field} ha de ser al menys {length} caràcters de llargada",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Espais de treball",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index edc73c64c..16c5322aa 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Změny ve Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Kup si Ferdi Supporter licenci a nebudeš už muset čekat",
-  "feature.delayApp.text": "Ferdi bude pokračovat v {seconds} sekundách.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Podpoř Ferdi a získej Supporter licenci",
-  "feature.delayApp.upgrade.actionShort": "Vylepši si svůj účet",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "Zrušit",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Poslat jako e-mail",
   "feature.shareFranz.action.facebook": "Sdílet na Facebooku",
   "feature.shareFranz.action.twitter": "Sdílet na Twitteru",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "Přidali jsme {count} služeb do Ferdie. Získejte zdarma aplikace pro WhatsApp, Messenger, SLack, Skype a další na www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Nemůžeme připojit Ferdi k online službám",
-  "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "Připojení k internetu není k dispozici.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Automaticky rozpoznat jazyk",
   "global.spellchecking.autodetect.short": "Automaticky",
   "global.spellchecking.language": "Oprava překlepů jazyka",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importovat služby z Ferdi 4",
@@ -88,7 +52,6 @@
   "infobar.hide": "Skrýt",
   "infobar.requiredRequestsFailed": "Není možné nahrát služby a informace o uživateli",
   "infobar.servicesUpdated": "Vaše služby byly aktualizovány",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "Nová aktualizace Ferdi je k dispozici",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "E-mailová adresa",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Zkontrolovat aktualizace",
   "menu.app.hide": "Skrýt",
-  "menu.app.hideOthers": "Skryt ostatní",
-  "menu.app.quit": "Ukončit",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Nastavení",
-  "menu.app.unhide": "Odkrýt",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Upravit",
-  "menu.edit.copy": "Kopírovat",
-  "menu.edit.cut": "Vyjmout",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Smazat",
   "menu.edit.emojiSymbols": "Emoji a znaky",
   "menu.edit.findInPage": "Find in Page",
-  "menu.edit.paste": "Vložit",
-  "menu.edit.pasteAndMatchStyle": "Vložit včetně formátování",
-  "menu.edit.redo": "Vpřed",
-  "menu.edit.selectAll": "Vybrat vše",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Mluvené slovo",
   "menu.edit.startDictation": "Začít diktovat",
   "menu.edit.startSpeaking": "Začít mluvit",
   "menu.edit.stopSpeaking": "Přestat mluvit",
-  "menu.edit.undo": "Vrátit zpět",
+  "menu.edit.undo": "Undo",
   "menu.file": "Soubor",
-  "menu.help": "Nápověda",
+  "menu.help": "Help",
   "menu.help.changelog": "Seznam změn",
   "menu.help.debugInfo": "Copy Debug Information",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Dozvědět se více",
   "menu.help.privacy": "Prohlášení o ochraně soukromí",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Zobrazení",
   "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Spustit režim celé obrazovky",
-  "menu.view.exitFullScreen": "Ukončit celoobrazovkový režim",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Obnovit Ferdie",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Obnovit službu",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Skutečná velikost",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Zobrazit Vývojářské nástroje",
-  "menu.view.toggleFullScreen": "Přepnout na celou obrazovku",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Zobrazit Vývojářské nástroje pro službu",
   "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
-  "menu.view.zoomIn": "Přiblížit",
-  "menu.view.zoomOut": "Oddálit",
-  "menu.window": "Okno",
-  "menu.window.close": "Zavřít",
-  "menu.window.minimize": "Minimalizovat",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Workspaces",
   "menu.workspaces.addNewWorkspace": "Add New Workspace...",
   "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
@@ -194,11 +156,7 @@
   "password.noUser": "Pro emailovou adresu nebyl nalezený žádný uživatel",
   "password.submit.label": "Odeslat",
   "password.successInfo": "Prosím, zkontrolujte svůj e-mail",
-  "premiumFeature.button.upgradeAccount": "Vylepši si svůj účet",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Načíst znovu {name}",
   "service.crashHandler.autoReload": "Pokus o automatické obnovení {name} za {seconds} sekund",
   "service.crashHandler.headline": "Ale ne!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Ale ne!",
   "service.errorHandler.message": "Chyba",
   "service.errorHandler.text": "{name} se nepodařilo načíst.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Začněme",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Vítejte v programu Ferdi",
   "settings.account.account.editButton": "Upravit účet",
-  "settings.account.accountType.basic": "Základní účet",
-  "settings.account.accountType.premium": "Prémiový účet podporovatele",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Aktualizovat profil",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Faktury",
   "settings.account.headlinePassword": "Změnit heslo",
   "settings.account.headlineProfile": "Aktualizovat profil",
-  "settings.account.headlineSubscription": "Vaše předplatné",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Stáhnout",
-  "settings.account.manageSubscription.label": "Spravovat vaše předplatné",
   "settings.account.successInfo": "Vaše změny byly uloženy",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Zkusit opět",
   "settings.account.tryReloadUserInfoRequest": "Zkusit opět",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Nelze načíst informace o uživateli.",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Zapnout kontrolu pravopisu",
   "settings.app.form.enableSystemTray": "Zobrazit Ferdi v systémové liště",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Nastavení",
   "settings.app.headlineAdvanced": "Pokročilé",
   "settings.app.headlineAppearance": "Vzhled",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Změny vyžadují restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Mezipaměť",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Dostupné služby",
   "settings.recipes.missingService": "Chybějící služba?",
-  "settings.recipes.mostPopular": "Nejpopulárnější",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Služba byla úspěšně přidána",
   "settings.searchService": "Vyhledat službu",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Přidat {name}",
   "settings.service.form.availableServices": "Dostupné služby",
   "settings.service.form.customUrl": "Vlastní server",
-  "settings.service.form.customUrlPremiumInfo": "Chcete-li přidat vlastní hostované služby, potřebujete účet Ferdi Premium Supporter.",
-  "settings.service.form.customUrlUpgradeAccount": "Aktualizujte svůj účet",
   "settings.service.form.customUrlValidationError": "Nepodařilo se ověřit vlastní server {name}.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Tým",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Společnost",
   "settings.user.form.accountType.individual": "Jednotlivec",
   "settings.user.form.accountType.label": "Druh účtu",
@@ -516,29 +431,20 @@
   "signup.link.login": "Již máte účet, přihlásit se?",
   "signup.password.label": "Password",
   "signup.submit.label": "Vytvořit účet",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Zrušit",
-  "subscriptionPopup.buttonDone": "Dokončit",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Odstranit službu",
   "tabs.item.disableAudio": "Vypnout zvuk",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Zakázat upozornění",
   "tabs.item.disableService": "Zakázat službu",
   "tabs.item.edit": "Upravit",
   "tabs.item.enableAudio": "Zapnout zvuk",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Povolit upozornění",
   "tabs.item.enableService": "Povolit službu",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Obnovit",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} není validní",
   "validation.minLength": "{field} musí být alespoň {length} znaků dlouhé",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index 8fb2f2f9e..7ea135cb2 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Åh nej! Ferdi mistede forbindelsen til {name}.",
   "feature.announcements.changelog.headline": "Ændringer i Ferdi {version}",
   "feature.debugger.title": "Udgiv fejlfindingsoplysninger",
-  "feature.delayApp.headline": "Køb en Ferdi Supporter licens for at slippe for at vente",
-  "feature.delayApp.text": "Ferdi vil fortsætte om {seconds} sekunder.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Få en Ferdi Supporter licens",
-  "feature.delayApp.upgrade.actionShort": "Opgradér konto",
   "feature.nightlyBuilds.activate": "Aktiver",
   "feature.nightlyBuilds.cancel": "Annuller",
   "feature.nightlyBuilds.info": "Natlige byg af Ferdi er meget eksperimentelle versioner, der kan indeholde ikke polerede eller ufærdige funktioner. Disse natlige byg bruges hovedsageligt af udviklere til at teste deres nyudviklede funktioner, og hvordan de vil opføre sig i den endelige version. Hvis du er usikker, foreslår vi ikke at aktivere natlige byg.",
   "feature.nightlyBuilds.title": "Natlige byg",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "Der opstod en fejl under forsøg på at udgive fejlfindingsoplysningerne. Prøv igen senere, eller se konsollen for mere information.",
   "feature.publishDebugInfo.info": "At udgive dine fejlfindingsoplysninger hjælper os med at finde problemer og fejl i Ferdi. Ved at udgive dine fejlfindingsoplysninger accepterer du Ferdi Debugger's privatlivspolitik og servicevilkår",
   "feature.publishDebugInfo.privacy": "Privatlivspolitik",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Vælg en tjeneste med TAB, ↑ og ↓. Åbn en tjeneste med ENTER.",
   "feature.quickSwitch.search": "Søg...",
   "feature.quickSwitch.title": "Hurtigskift",
-  "feature.serviceLimit.limitReached": "Du har tilføjet {amount} ud af de {limit} tjenester, der er inkluderet i dit abonnement. Opgrader venligst din konto for at tilføje flere tjenester.",
   "feature.shareFranz.action.email": "Send som mail",
   "feature.shareFranz.action.facebook": "Del på Facebook",
   "feature.shareFranz.action.twitter": "Del på Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "Jeg har tilføjet {count} tjenester til Ferdi! Få den gratis app til WhatsApp, Messenger, Slack, Skype osv. på www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "Jeg har tilføjet {count} tjenester til Ferdi! Få den gratis app til WhatsApp, Messenger, Slack, Skype osv. på www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Fortæl dine venner og kolleger, hvor fedt et program Ferdi er, og hjælp os med at sprede ordet.",
-  "feature.todos.premium.info": "Ferdi Todos er tilgængelig for betalende brugere nu!",
-  "feature.todos.premium.rollout": "Alle andre må vente lidt længere.",
-  "feature.todos.premium.upgrade": "Opgrader konto",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Kan ikke oprette forbindelse til Ferdi onlinetjenester",
-  "global.franzProRequired": "Ferdi Professionel påkrævet",
   "global.notConnectedToTheInternet": "Du har ikke forbindelse til internettet.",
   "global.spellchecker.useDefault": "Benyt systemstandard ({default})",
   "global.spellchecking.autodetect": "Vælg sprog automatisk",
   "global.spellchecking.autodetect.short": "Automatisk",
   "global.spellchecking.language": "Stavekontrolsprog",
-  "global.upgradeButton.upgradeToPro": "Opgrader til Ferdi Professionel",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importer dine Ferdi 4-tjenester",
@@ -88,7 +52,6 @@
   "infobar.hide": "Skjul",
   "infobar.requiredRequestsFailed": "Kunne ikke indlæse tjenester og brugerinformation",
   "infobar.servicesUpdated": "Dine tjenester er blevet opdateret.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "En ny opdatering til Ferdi er tilgængelig.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Mailadresse",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Auto-skjul menulinje",
   "menu.app.checkForUpdates": "Søg efter opdateringer",
   "menu.app.hide": "Skjul",
-  "menu.app.hideOthers": "Skjul andre",
-  "menu.app.quit": "Afslut",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Indstillinger",
-  "menu.app.unhide": "Vis",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Rediger",
-  "menu.edit.copy": "Kopier",
-  "menu.edit.cut": "Klip",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Slet",
   "menu.edit.emojiSymbols": "Emojis og symboler",
   "menu.edit.findInPage": "Find på side",
-  "menu.edit.paste": "Indsæt",
-  "menu.edit.pasteAndMatchStyle": "Indsæt uden formatering",
-  "menu.edit.redo": "Gendan",
-  "menu.edit.selectAll": "Vælg alle",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Tale",
   "menu.edit.startDictation": "Start diktering",
   "menu.edit.startSpeaking": "Start oplæsning",
   "menu.edit.stopSpeaking": "Stop oplæsning",
-  "menu.edit.undo": "Fortryd",
+  "menu.edit.undo": "Undo",
   "menu.file": "Fil",
-  "menu.help": "Hjælp",
+  "menu.help": "Help",
   "menu.help.changelog": "Ændringslog",
   "menu.help.debugInfo": "Kopier fejlfindingsoplysninger",
   "menu.help.debugInfoCopiedBody": "Dine fejlfindingsoplysninger er blevet kopieret til udklipsholderen.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi fejlfindingsoplysninger",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Få mere at vide",
   "menu.help.privacy": "Privatlivspolitik",
   "menu.help.publishDebugInfo": "Udgiv fejlfindingsoplysninger",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Aktiver Todos",
   "menu.view": "Vis",
   "menu.view.back": "Tilbage",
-  "menu.view.enterFullScreen": "Start fuld skærm",
-  "menu.view.exitFullScreen": "Afslut fuld skærm",
   "menu.view.forward": "Fremad",
   "menu.view.lockFerdi": "Lås Ferdi",
   "menu.view.openQuickSwitch": "Åben hurtig skift",
-  "menu.view.reloadFranz": "Genindlæs Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Genindlæs tjeneste",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Faktisk størrelse",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Slå mørk tilstand til/fra",
   "menu.view.toggleDevTools": "Åbn/luk udviklerværktøjer",
-  "menu.view.toggleFullScreen": "Aktiver/deaktiver fuld skærm",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Åbn/luk udviklerværktøjer for tjeneste",
   "menu.view.toggleTodosDevTools": "Åbn/luk udviklerværktøjer for Todos",
-  "menu.view.zoomIn": "Zoom ind",
-  "menu.view.zoomOut": "Zoom ud",
-  "menu.window": "Vindue",
-  "menu.window.close": "Luk",
-  "menu.window.minimize": "Minimer",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Arbejdsrum",
   "menu.workspaces.addNewWorkspace": "Tilføj nyt arbejdsrum...",
   "menu.workspaces.closeWorkspaceDrawer": "Luk arbejdsrumspanel",
@@ -194,11 +156,7 @@
   "password.noUser": "Der blev ikke fundet nogen bruger med den mailadresse",
   "password.submit.label": "Send",
   "password.successInfo": "Tjek venligst din mail",
-  "premiumFeature.button.upgradeAccount": "Opgradér konto",
   "pricing.features.accountSync": "Kontosynkronisering",
-  "pricing.features.adFree": "Reklamefri, altid",
-  "pricing.features.appDelays": "Ingen venteskærme",
-  "pricing.features.appDelaysEnabled": "Lejlighedsvise venteskærme",
   "pricing.features.customWebsites": "Tilføj brugerdefinerede hjemmesider",
   "pricing.features.desktopNotifications": "Skrivebordsnotifikationer",
   "pricing.features.onPremise": "Lokale- & andre hostede tjenester",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Teamhåndtering",
   "pricing.features.thirdPartyServices": "Installer tredjeparts tjenester",
   "pricing.features.unlimitedServices": "Tilføj ubegrænsede tjenester",
-  "pricing.features.upToSixServices": "Tilføj op til 6 tjenester",
-  "pricing.features.upToThreeServices": "Tilføj op til 3 tjenester",
   "pricing.features.workspaces": "Arbejdsrum",
-  "pricing.plan.free": "Gratis Ferdi",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personlig",
-  "pricing.plan.personal-monthly": "Ferdi Personlig Månedlig",
-  "pricing.plan.personal-yearly": "Ferdi Personlig Årlig",
-  "pricing.plan.pro": "Ferdi Professionel",
-  "pricing.plan.pro-monthly": "Ferdi Professionel månedligt",
-  "pricing.plan.pro-yearly": "Ferdi Professionel arligt",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Genindlæs {name}",
   "service.crashHandler.autoReload": "Forsøger automatisk at gendanne {name} om {seconds} sekunder",
   "service.crashHandler.headline": "Åh nej!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Åh nej!",
   "service.errorHandler.message": "Fejl",
   "service.errorHandler.text": "{name} blev ikke indlæst.",
-  "service.restrictedHandler.action": "Opgrader konto",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professionel planen påkrævet",
-  "service.restrictedHandler.customUrl.text": "Opgrader venligst til Ferdi Professionel planen for at bruge egne hjemmesideadresser og selvhostede tjenester.",
-  "service.restrictedHandler.serviceLimit.headline": "Du har nået din tjenestegrænse.",
-  "service.restrictedHandler.serviceLimit.text": "Opgrader din konto for at bruge mere end {count} tjenester.",
   "service.webviewLoader.loading": "Indlæser {service}",
   "services.getStarted": "Kom godt i gang",
   "services.login": "Log ind for at bruge Ferdi.",
-  "services.serverInfo": "Alternativt kan du ændre din Ferdi server ved at klikke på tandhjulet i nederste venstre hjørne.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Brug Ferdi uden en konto",
   "services.welcome": "Velkommen til Ferdi",
   "settings.account.account.editButton": "Rediger konto",
-  "settings.account.accountType.basic": "Normal konto",
-  "settings.account.accountType.premium": "Premium Supporter konto",
   "settings.account.accountUnavailable": "Konto utilgængelig",
   "settings.account.accountUnavailableInfo": "Du bruger Ferdi uden en konto. Hvis du ønsker at bruge Ferdi med en konto og holde dine tjenester synkroniseret på tværs af enheder, vælg en server under fanen Indstillinger, og log derefter ind.",
   "settings.account.buttonSave": "Opdater profil",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Fakturaer",
   "settings.account.headlinePassword": "Skift adgangskode",
   "settings.account.headlineProfile": "Opdater profil",
-  "settings.account.headlineSubscription": "Dit abonnement",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Opgrader din konto og få den fulde oplevelse",
-  "settings.account.invoiceDownload": "Hent",
-  "settings.account.manageSubscription.label": "Administrer dit abonnement",
   "settings.account.successInfo": "Dine ændringer er blevet gemt",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Prøv igen",
   "settings.account.tryReloadUserInfoRequest": "Prøv igen",
-  "settings.account.upgradeToPro.label": "Opgrader til Ferdi Professionel",
   "settings.account.userInfoRequestFailed": "Kunne ikke indlæse brugerinformation",
   "settings.account.yourLicense": "Din Ferdi-licens",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Aktiver stavekontrol",
   "settings.app.form.enableSystemTray": "Vis Ferdi i systembakken",
   "settings.app.form.enableTodos": "Aktiver Ferdi Todos",
-  "settings.app.form.hibernate": "Tillad tjenester at gå i dvale",
   "settings.app.form.hibernateOnStartup": "Sæt tjenester i dvale ved opstart",
   "settings.app.form.hibernationStrategy": "Dvale strategi",
   "settings.app.form.iconSize": "Ikonstørrelse for tjenester",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Aktiver universel mørk tilstand",
   "settings.app.form.useTouchIdToUnlock": "Tillad brug af TouchID for at låse Ferdi op",
   "settings.app.form.useVerticalStyle": "Brug lodret stil",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Indstillinger",
   "settings.app.headlineAdvanced": "Avanceret",
   "settings.app.headlineAppearance": "Udseende",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "Som standard vil Ferdi holde alle dine tjenester åbne og indlæste i baggrunden, så de er klar, når du vil bruge dem. Du kan vælge at sætte dine tjenester i dvale efter en angivet mængde tid. Dette er nyttigt til at spare hukommelse eller forhindre tjenester i at bremse din computer.",
   "settings.app.inactivityLockInfo": "Minutter af inaktivitet, hvorefter Ferdi automatisk skal låse. Brug 0 for at deaktivere",
   "settings.app.languageDisclaimer": "Officielle oversættelser er engelske og tyske. Alle andre sprog er fællesskabsstyrede oversættelser.",
-  "settings.app.lockInfo": "Adgangskode-lås giver dig mulighed for at holde dine beskeder beskyttet.\nVed brug af adgangskode-lås vil du blive bedt om at indtaste din adgangskode, hver gang du starter Ferdi eller låser Ferdi selv ved hjælp af låsesymbolet i nederste venstre hjørne eller genvejen CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Adgangskode",
   "settings.app.lockedPasswordInfo": "Sørg for at angive en adgangskode, du husker.\nHvis du mister denne adgangskode, vil du blive nødt til at geninstallere Ferdi.",
   "settings.app.restartRequired": "Ændringer kræver genstart",
   "settings.app.scheduledDNDInfo": "Planlagt Forstyr ikke giver dig mulighed for at definere et tidsrum, hvor du ikke ønsker at få meddelelser fra Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Tider er i 24-timer format. Sluttidspunktet kan være før starttidspunktet (f.eks. fra 17:00 til 09:00) for at aktivere Forstyr ikke natten over.",
-  "settings.app.sentryInfo": "At sende telemetri data hjælper os med at finde fejl i Ferdi - vi vil ikke sende nogen personlige oplysninger så som dine besked data! Ændring af denne indstilling kræver, at du genstarter Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi bruger din Macs indbyggede stavekontrol. Hvis du ønsker at ændre de sprog, stavekontrollen kontrollerer for, kan du gøre det i din Macs systemindstillinger.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "Denne server vil blive brugt til funktionen \"Ferdi Todo\".",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Åbn mappe",
   "settings.recipes.headline": "Tilgængelige tjenester",
   "settings.recipes.missingService": "Mangler du en service?",
-  "settings.recipes.mostPopular": "Mest populære",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Tjenesten blev tilføjet",
   "settings.searchService": "Søg tjeneste",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Tilføj {name}",
   "settings.service.form.availableServices": "Tilgængelige tjenester",
   "settings.service.form.customUrl": "Brugerdefineret server",
-  "settings.service.form.customUrlPremiumInfo": "For at tilføje selvhostede tjenester, skal du bruge en Ferdi Premium Supporter konto.",
-  "settings.service.form.customUrlUpgradeAccount": "Opgrader din konto",
   "settings.service.form.customUrlValidationError": "Kunne ikke validere brugerdefineret {name} server.",
   "settings.service.form.darkReaderBrightness": "Mørk læser lysstyrke",
   "settings.service.form.darkReaderContrast": "Mørk læser kontrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Teamstyring",
   "settings.team.copy": "Franz's teamstyring giver dig mulighed for at administrere Franz abonnementer for flere brugere. Husk på, at hvis du har et Franz Premium-abonnement, får du ingen fordele ved at bruge Ferdi: Den eneste grund til, at du stadig har adgang til teamstyring er, at du kan administrere dine gamle Franz Teams, og så du ikke mister nogen funktionalitet i forvaltningen af din konto.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "Du bruger i øjeblikket Franz Servere, og derfor har du adgang til Teamstyring.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Administrer dit Team på meetfranz.com",
   "settings.team.teamsUnavailable": "Teams er ikke tilgængelige",
   "settings.team.teamsUnavailableInfo": "Teams er i øjeblikket kun tilgængelige, når du bruger Franz Servere og efter at have betalt for Franz Professionel. Skift venligst din server til https://api.franzinfra.com for at bruge teams.",
-  "settings.team.upgradeAction": "Opgrader din konto",
   "settings.user.form.accountType.company": "Virksomhed",
   "settings.user.form.accountType.individual": "Individuel",
   "settings.user.form.accountType.label": "Kontotype",
@@ -516,29 +431,20 @@
   "signup.link.login": "Har du allerede en konto? Log ind.",
   "signup.password.label": "Adgangskode",
   "signup.submit.label": "Opret konto",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "Se alle valgmuligheder",
-  "subscription.cta.choosePlan": "Vælg dit abonnement",
-  "subscription.includedProFeatures": "Ferdi Professionel planen omfatter:",
-  "subscription.interval.per": "pr. {interval}",
-  "subscription.interval.perMonth": "pr. måned",
-  "subscription.interval.perMonthPerUser": "pr. måned og bruger",
-  "subscription.planItem.upgradeAccount": "Opgrader konto",
-  "subscription.teaser.includedFeatures": "Betalte Ferdi planer omfatter:",
-  "subscription.teaser.intro": "Ferdi 5 kommer med et stort udvalg af nye funktioner til give din daglige kommunikation et løft. Tjek vores nye planer og find ud af, hvilken der passer dig mest!",
-  "subscriptionPopup.buttonCancel": "Annuller",
-  "subscriptionPopup.buttonDone": "Udført",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Slet tjeneste",
   "tabs.item.disableAudio": "Deaktiver lyd",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Deaktiver notifikationer",
   "tabs.item.disableService": "Deaktiver tjeneste",
   "tabs.item.edit": "Rediger",
   "tabs.item.enableAudio": "Aktiver lyd",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktiver notifikationer",
   "tabs.item.enableService": "Aktiverede tjenester",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Genindlæs",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} er ugyldigt",
   "validation.minLength": "{field} skal være på mindst {length} tegn",
   "validation.oneRequired": "Mindst én er påkrævet",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Arbejdsrum",
   "workspaceDrawer.item.contextMenuEdit": "rediger",
   "workspaceDrawer.item.noServicesAddedYet": "Ingen tjenester tilføjet endnu",
-  "workspaceDrawer.premiumCtaButtonLabel": "Opret dit første arbejdsrum",
-  "workspaceDrawer.proFeatureBadge": "Premium-funktion",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Genaktiver premium konto",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Arbejdsrum lader dig fokusere på, hvad der er vigtigt lige nu. Konfigurer forskellige sæt af tjenester og skift nemt mellem dem til enhver tid.</p>\n<p>Du bestemmer hvilke tjenester du har brug for hvor og hvornår, så vi kan hjælpe dig med at holde dig på toppen - eller nemt lukke ned for arbejdet, når du vil.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Rediger indstillinger for arbejdsrum",
   "workspaces.switchingIndicator.switchingTo": "Skifter til"
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 6f76f74ea..eef9aa21a 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh nein! Ferdi hat die Verbindung zu {name} verloren.",
   "feature.announcements.changelog.headline": "Was ist neu in Ferdi {version}",
   "feature.debugger.title": "Debug-Informationen veröffentlichen",
-  "feature.delayApp.headline": "Bitte kaufe eine Ferdi Supporter Lizenz, um das Warten zu überspringen",
-  "feature.delayApp.text": "In {seconds} Sekunden geht's weiter!",
-  "feature.delayApp.trial.action": "Ja, ich möchte Ferdi Professional 14 Tage gratis testen",
-  "feature.delayApp.trial.actionShort": "Aktiviere die kostenlose Ferdi Professional Testlizenz",
-  "feature.delayApp.trial.headline": "Hol dir die kostenlose Ferdi Professional Testlizenz und es geht ohne Warten weiter",
-  "feature.delayApp.upgrade.action": "Hol dir Ferdi Premium",
-  "feature.delayApp.upgrade.actionShort": "Account erweitern",
   "feature.nightlyBuilds.activate": "Aktivieren",
   "feature.nightlyBuilds.cancel": "Abbrechen",
   "feature.nightlyBuilds.info": "Nightly builds sind experimentelle Versionen von Ferdi die unfertige Funktionen enthalten kann. Nightly builds werden hauptsächlich von Entwicklern genutzt um neu entwickelte Features zu testen und zu sehen wie sie sich in der finalen Version verhalten. Wenn du nicht genau weisst was du tust, empfehlen wir dir Nightly Builds nicht zu aktivieren.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Auf kostenlosen Plan herunterstufen",
-  "feature.planSelection.cta.stayOnFree": "Auf kostenlosem Plan bleiben",
-  "feature.planSelection.cta.trial": "Starte meine 14-Tage Testversion",
-  "feature.planSelection.cta.upgradePersonal": "Personal Plan wählen",
-  "feature.planSelection.cta.upgradePro": "Professional Plan wählen",
-  "feature.planSelection.free.text": "Einfache Funktionalität",
-  "feature.planSelection.fullFeatureList": "Kompletter Vergleich aller Pläne",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Auf kostenlosen Plan herunterstufen",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Personal Plan wählen",
-  "feature.planSelection.fullscreen.dialog.message": "Du bist dabei, auf ein kostenloses Konto herunterzustufen. Bist du sicher? Klicke stattdessen hier, um mehr Dienste und Funktionen für nur {currency}{price} pro Monat zu erhalten.",
-  "feature.planSelection.fullscreen.dialog.title": "Deinen Ferdi Plan herunterstufen",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Bist du bereit zu wählen, {name}",
-  "feature.planSelection.personal.text": "Weitere Dienste, keine Wartezeiten - ideal für den persönlichen Gebrauch.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "Beim Veröffentlichen der Debug-Informationen ist ein Fehler aufgetreten. Bitte versuche es später noch einmal oder sehe dir die Konsole für weitere Informationen an.",
   "feature.publishDebugInfo.info": "Die Veröffentlichung deiner Debug-Informationen hilft uns, Probleme und Fehler in Ferdi zu finden. Indem du deine Debug-Informationen veröffentlichst, akzeptierst du die Datenschutzbestimmungen und Nutzungsbedingungen vom Ferdi Debugger",
   "feature.publishDebugInfo.privacy": "Datenschutzrichtlinien",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Wähle einen Service mit TAB, ↑ und ↓. Um einen Service zu öffnen, drücke ENTER.",
   "feature.quickSwitch.search": "Suchen...",
   "feature.quickSwitch.title": "Schnellauswahl",
-  "feature.serviceLimit.limitReached": "Du hast {amount} von {limit} in deiner Lizenz inkludierten Services hinzugefügt. Bitte führe ein Upgrade deines Accounts durch, um mehr Services hinzuzufügen.",
   "feature.shareFranz.action.email": "Als E-Mail senden",
   "feature.shareFranz.action.facebook": "Auf Facebook teilen",
   "feature.shareFranz.action.twitter": "Auf Twitter teilen",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "Ich habe {count} Services zu Ferdi hinzugefügt! Hol dir jetzt die kostenlose App für WhatsApp, Messenger, Slack, Skype und viele mehr auf www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "Ich habe {count} Services zu Ferdi hinzugefügt! Hol dir die kostenlose App für WhatsApp, Messenger, Slack, Skype und viele mehr auf www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Bitte erzähle deinen Freunden und Kolleginnen, warum du Ferdi toll findest.",
-  "feature.todos.premium.info": "Ferdi Todos sind jetzt für Premium User verfügbar!",
-  "feature.todos.premium.rollout": "Alle anderen müssen sich noch ein wenig gedulden.",
-  "feature.todos.premium.upgrade": "Account Upgrade",
-  "feature.trialStatusBar.cta": "Jetzt upgraden",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Auf kostenlosen Plan herunterstufen",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Personal Plan wählen",
-  "feature.trialStatusBar.fullscreen.dialog.message": "Du bist dabei, auf ein kostenloses Konto herunterzustufen. Bist du sicher? Klicke stattdessen hier, um mehr Dienste und Funktionen für nur {currency}{price} pro Monat zu erhalten.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Deinen Ferdi Plan herunterstufen",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Verbindung zu den Ferdi Online Services fehlgeschlagen",
-  "global.franzProRequired": "Ferdi Professional benötigt",
   "global.notConnectedToTheInternet": "Du bist nicht mit dem Internet verbunden.",
   "global.spellchecker.useDefault": "Standard benutzen ({default})",
   "global.spellchecking.autodetect": "Sprache automatisch erkennen",
   "global.spellchecking.autodetect.short": "Automatisch",
   "global.spellchecking.language": "Sprache für Rechtschreibprüfung",
-  "global.upgradeButton.upgradeToPro": "Upgrade zu Ferdi Professional",
   "global.userAgentHelp": "Benutze 'https://whatmyuseragent.com/' (für das Entdecken) oder 'https://developers.whatismybrowser.com/useragents/explore/' (für die Wahl) deines gewünschten User Agenten und kopiere ihn hier hinein.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Deine Ferdi-4-Dienste importieren",
@@ -88,7 +52,6 @@
   "infobar.hide": "Ausblenden",
   "infobar.requiredRequestsFailed": "Dienste und Benutzerinformationen konnten nicht geladen werden",
   "infobar.servicesUpdated": "Deine Dienste wurden aktualisiert.",
-  "infobar.trialActivated": "Deine kostenlose Testlizenz wurde erfolgreich aktiviert. Viel Spaß!",
   "infobar.updateAvailable": "Eine neue Version von Ferdi ist verfügbar.",
   "infobox.dismiss": "Verwerfen",
   "invite.email.label": "E-Mail-Adresse",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Menü automatisch verstecken",
   "menu.app.checkForUpdates": "Nach Updates suchen",
   "menu.app.hide": "Ausblenden",
-  "menu.app.hideOthers": "Andere ausblenden",
-  "menu.app.quit": "Beenden",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Einstellungen",
-  "menu.app.unhide": "Einblenden",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Bearbeiten",
-  "menu.edit.copy": "Kopieren",
-  "menu.edit.cut": "Ausschneiden",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Löschen",
   "menu.edit.emojiSymbols": "Emoji & Symbole",
   "menu.edit.findInPage": "In Seite suchen",
-  "menu.edit.paste": "Einfügen",
-  "menu.edit.pasteAndMatchStyle": "Einfügen und Stil anpassen",
-  "menu.edit.redo": "Wiederholen",
-  "menu.edit.selectAll": "Alle auswählen",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Sprachausgabe",
   "menu.edit.startDictation": "Diktat starten",
   "menu.edit.startSpeaking": "Sprachausgabe starten",
   "menu.edit.stopSpeaking": "Sprachausgabe stoppen",
-  "menu.edit.undo": "Rückgängig",
+  "menu.edit.undo": "Undo",
   "menu.file": "Datei",
-  "menu.help": "Hilfe",
+  "menu.help": "Help",
   "menu.help.changelog": "Änderungsprotokoll",
   "menu.help.debugInfo": "Debugging-Information anzeigen",
   "menu.help.debugInfoCopiedBody": "Deine Debugging-Information wurde in die Zwischenablage kopiert.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debugging-Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Mehr erfahren",
   "menu.help.privacy": "Datenschutzerklärung",
   "menu.help.publishDebugInfo": "Debug-Informationen veröffentlichen",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Todos aktivieren",
   "menu.view": "Darstellung",
   "menu.view.back": "Zurück",
-  "menu.view.enterFullScreen": "Vollbildmodus",
-  "menu.view.exitFullScreen": "Vollbildmodus aus",
   "menu.view.forward": "Vorwärts",
   "menu.view.lockFerdi": "Ferdi sperren",
   "menu.view.openQuickSwitch": "Quick Switch öffnen",
-  "menu.view.reloadFranz": "Ferdi neu laden",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Dienst neu laden",
   "menu.view.reloadTodos": "ToDos neuladen",
-  "menu.view.resetZoom": "Originalgröße",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Dunkles Design umschalten",
   "menu.view.toggleDevTools": "Entwicklertools anzeigen",
-  "menu.view.toggleFullScreen": "Vollbildmodus umschalten",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Entwicklertools für Dienst anzeigen",
   "menu.view.toggleTodosDevTools": "Todos Developer Tools umschalten",
-  "menu.view.zoomIn": "Vergrößern",
-  "menu.view.zoomOut": "Verkleinern",
-  "menu.window": "Fenster",
-  "menu.window.close": "Schließen",
-  "menu.window.minimize": "Minimieren",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Arbeitsbereiche",
   "menu.workspaces.addNewWorkspace": "Neuen Workspace hinzufügen...",
   "menu.workspaces.closeWorkspaceDrawer": "Workspaces öffnen",
@@ -194,11 +156,7 @@
   "password.noUser": "Es wurde kein Benutzer mit dieser E-Mail-Adresse gefunden",
   "password.submit.label": "Absenden",
   "password.successInfo": "Wir haben Dir eine E-Mail mit weiteren Anweisungen geschickt",
-  "premiumFeature.button.upgradeAccount": "Account erweitern",
   "pricing.features.accountSync": "Konto-Synchronisierung",
-  "pricing.features.adFree": "Keine Werbung",
-  "pricing.features.appDelays": "Keine unnötigen Unterbrechungen",
-  "pricing.features.appDelaysEnabled": "Gelegentliche Wartebildschirme",
   "pricing.features.customWebsites": "Hinzufügen von eigenen Websites",
   "pricing.features.desktopNotifications": "Desktop Benachrichtigungen",
   "pricing.features.onPremise": "On-premise & andere Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team-Management",
   "pricing.features.thirdPartyServices": "Integration von Services über Drittanbieter",
   "pricing.features.unlimitedServices": "Unbegrenztes hinzufügen von Services",
-  "pricing.features.upToSixServices": "Bis zu 6 Dienste hinzufügen",
-  "pricing.features.upToThreeServices": "Bis zu 3 Dienste hinzufügen",
   "pricing.features.workspaces": "Arbeitsbereiche",
-  "pricing.plan.free": "Ferdi kostenlos",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal monatlich",
-  "pricing.plan.personal-yearly": "Ferdi Personal jährlich",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional monatlich",
-  "pricing.plan.pro-yearly": "Ferdi Professional jährlich",
-  "pricing.trial.cta.accept": "Ja, Upgrade zu Ferdi Professional durchführen",
-  "pricing.trial.cta.skip": "Weiter zu Ferdi",
-  "pricing.trial.cta.start": "Ferdi verwenden",
-  "pricing.trial.error": "Tut uns leid, wir konnten deine kostenlose Testlizenz nicht aktivieren!",
-  "pricing.trial.features.headline": "Ferdi Professional beinhaltet:",
-  "pricing.trial.headline.pro": "Hi {name}, willkommen bei Ferdi",
-  "pricing.trial.intro.happyMessaging": "Viel Spaß beim Nachrichten schreiben",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Deine kostenlose Testlizenz endet automatisch nach 14 Tagen",
-  "pricing.trial.terms.headline": "Ohne Bindung, ohne Haken",
-  "pricing.trial.terms.noCreditCard": "Keine Kreditkarte notwendig",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "{name} neu laden",
   "service.crashHandler.autoReload": "{name} wird in {seconds} Sekunden automatisch wiederhergestellt",
   "service.crashHandler.headline": "Oh nein!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Oh nein!",
   "service.errorHandler.message": "Fehler",
   "service.errorHandler.text": "{name} konnte nicht geladen werden.",
-  "service.restrictedHandler.action": "Account Upgrade",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional benötigt",
-  "service.restrictedHandler.customUrl.text": "Bitte ein Upgrade zu Ferdi Professional durchführen um benutzerdefinierte URLs und Self Hosted Services verwenden zu können.",
-  "service.restrictedHandler.serviceLimit.headline": "Du hast deine maximale Anzahl an Services erreicht.",
-  "service.restrictedHandler.serviceLimit.text": "Bitte führe eine Upgrade deines Accounts durch um mehr als {count} Services verwenden zu können.",
   "service.webviewLoader.loading": "Lade {service}",
   "services.getStarted": "Los geht's!",
   "services.login": "Bitte melde dich an, um Ferdi zu benutzen.",
-  "services.serverInfo": "Optional können Sie Ihren Ferdi-Server durch Klicken auf das Zahnrad unten-links ändern.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Ferdi ohne ein Konto verwenden",
   "services.welcome": "Willkommen bei Ferdi!",
   "settings.account.account.editButton": "Konto bearbeiten",
-  "settings.account.accountType.basic": "Basis-Konto",
-  "settings.account.accountType.premium": "Premium Lizenz",
   "settings.account.accountUnavailable": "Konto nicht verfügbar",
   "settings.account.accountUnavailableInfo": "Du verwendest Ferdi ohne ein Konto. Wenn du Ferdi mit einem Konto verwenden möchtest und deine Dienste über alle verschiedene Computer hinweg synchronisieren möchtest, wählen bitte einen Server in den Einstellungen und melde dich danach an.",
   "settings.account.buttonSave": "Profil aktualisieren",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Rechnungen",
   "settings.account.headlinePassword": "Passwort ändern",
   "settings.account.headlineProfile": "Profil aktualisieren",
-  "settings.account.headlineSubscription": "Dein Abonnement",
-  "settings.account.headlineTrialUpgrade": "Hol dir die kostenlose 14-tägige Ferdi Professional Testlizenz!",
-  "settings.account.headlineUpgradeAccount": "Hol dir ein Upgrade deines Kontos und bekomme alle Features von Ferdi",
-  "settings.account.invoiceDownload": "Herunterladen",
-  "settings.account.manageSubscription.label": "Dein Abonnement verwalten",
   "settings.account.successInfo": "Deine Änderungen wurden gespeichert",
-  "settings.account.trial": "Kostenlose Testlizenz",
-  "settings.account.trialEndsIn": "Deine kostenlose Testlizenz endet in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Bitte aktualisiere deine Zahlungsinformation damit du {license} nach der kostenlosen Testphase weiter nutzen kannst.",
   "settings.account.tryReloadServices": "Erneut versuchen",
   "settings.account.tryReloadUserInfoRequest": "Erneut versuchen",
-  "settings.account.upgradeToPro.label": "Upgrade zu Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Benutzerinformationen konnten nicht geladen werden",
   "settings.account.yourLicense": "Deine Ferdi Lizenz",
   "settings.app.accentColorInfo": "Schreibe deine Akzentfarbe in einem CSS-kompatiblen Format. (Standard: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Rechtschreibprüfung aktivieren",
   "settings.app.form.enableSystemTray": "Ferdi im Infobereich anzeigen",
   "settings.app.form.enableTodos": "Ferdi Todos aktivieren",
-  "settings.app.form.hibernate": "\"Service Hibernation\" aktivieren",
   "settings.app.form.hibernateOnStartup": "Behalte Dienste im Ruhezustand beim Start",
   "settings.app.form.hibernationStrategy": "\"Service Hibernation\"-Strategie",
   "settings.app.form.iconSize": "Service Symbolgröße",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Universellen Dark Mode aktivieren",
   "settings.app.form.useTouchIdToUnlock": "Verwenden von Touch ID zum Entsperren von Ferdi erlauben",
   "settings.app.form.useVerticalStyle": "Vertikalen Stil verwenden",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Einstellungen",
   "settings.app.headlineAdvanced": "Erweitert",
   "settings.app.headlineAppearance": "Darstellung",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "Standardmäßig öffnet Ferdi alle deine Dienste im Hintergrund, sodass diese bereit sind, wenn du sie verwenden möchtest. \"Service Hibernation\" wird deine Dienste nach einer bestimmten Zeitspanne schließen. Dies ist nützlich, um RAM zu sparen oder Dienste davon abzuhalten, deinen Computer zu verlangsamen.",
   "settings.app.inactivityLockInfo": "Minuten der Inaktivität, nach denen Ferdi automatisch sperren soll. Verwenden Sie 0, um dies zu deaktivieren",
   "settings.app.languageDisclaimer": "Offizielle Übersetzungen: Englisch & Deutsch. Alle anderen Sprachen sind Übersetzungen der Ferdi Community.",
-  "settings.app.lockInfo": "Die Passwort-Sperre erlaubt es dir, deine Nachrichten zu schützen.\nMit der Passwort-Sperre wirst du beim Starten von Ferdi und wenn du das Programm manuell sperrst, darum gebeten, dein Passwort einzugeben.\nDu kannst Ferdi über das Sperrsymbol in der unteren linken Ecke oder dem Shortcut CMD/CTRL+Shift+L sperren.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Passwort",
   "settings.app.lockedPasswordInfo": "Bitte stelle sicher, dass du ein Passwort setzt, an welches du dich erinnern kannst.\nSolltest du dieses Passwort vergessen, musst du Ferdi neu installieren.",
   "settings.app.restartRequired": "Änderungen werden erst nach einem Neustart wirksam.",
   "settings.app.scheduledDNDInfo": "Die geplante \"Nicht-stören\"-Funktion erlaubt es dir eine Zeitspanne festzulegen, in der du keine Benachrichtigungen von Ferdi erhalten möchtest.",
   "settings.app.scheduledDNDTimeInfo": "Zeiten im 24-Stunden-Format (z.B. 18:00). Endzeit kann vor Beginn der Startzeit sein (z.B. 17:00 Uhr, Ende 09:00), um die Funktion über Nacht zu aktivieren.",
-  "settings.app.sentryInfo": "Das Senden von Telemetrie-Daten ermöglicht es uns, Fehler in Ferdi zu finden - wir werden keine persönlichen Informationen wie deine Nachrichten versenden! Ändern dieser Option erfordert einen Neustart von Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi verwendet den eingebauten Rechtschreibprüfer deines Macs, um nach Tippfehlern zu suchen. Wenn du die zu überprüfenden Sprachen ändern möchtest, kannst du das in deinen Systemeinstellungen tun.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "Dieser Server wird für die \"Ferdi Todo\"-Funktion verwendet.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Ordner öffnen",
   "settings.recipes.headline": "Verfügbare Dienste",
   "settings.recipes.missingService": "Fehlt ein Dienst?",
-  "settings.recipes.mostPopular": "Am beliebtesten",
   "settings.recipes.nothingFound": "Leider hat kein Dienst zu deinem Suchbegriff gepasst - aber du kannst ihn wahrscheinlich trotzdem über die Option \"Eigene Website\" hinzufügen. Bitte beachte, dass die Website möglicherweise weitere Dienste anzeigt, die seit deiner aktuellen Version zu Ferdi hinzugefügt wurden. Um diese neuen Dienste zu erhalten, erwäge bitte ein Upgrade auf eine neuere Version von Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Dienst erfolgreich hinzugefügt",
   "settings.searchService": "Dienst suchen",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "{name} hinzufügen",
   "settings.service.form.availableServices": "Verfügbare Dienste",
   "settings.service.form.customUrl": "Eigener Server",
-  "settings.service.form.customUrlPremiumInfo": "Um einen selbst gehosteten Dienst hinzuzufügen, brauchst Du ein Ferdi Premium Konto.",
-  "settings.service.form.customUrlUpgradeAccount": "Dein Konto upgraden",
   "settings.service.form.customUrlValidationError": "Dein {name}-Server konnte nicht verifiziert werden.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Helligkeit",
   "settings.service.form.darkReaderContrast": "Dark Reader Kontrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team-Management",
   "settings.team.copy": "Mit Franz's Team Management kannst du Franz Abonnements für mehrere Benutzer verwalten. Bitte beachte, dass dir ein Franz Premium-Abonnement keine Vorteile bei der Nutzung von Ferdi bringt: Der einzige Grund, warum du noch Zugriff auf das Team Management hast, ist, damit du weiterhin Franz Teams verwalten kannst und damit du keine Funktionalität bei der Verwaltung deines Kontos verlierst.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "Du nutzt derzeit Franz Server und hast deshalb Zugriff auf das Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Verwalte dein Team auf meetfranz.com",
   "settings.team.teamsUnavailable": "Teams sind nicht verfügbar",
   "settings.team.teamsUnavailableInfo": "Teams sind derzeit nur bei der Verwendung des Franz Servers und nach der Zahlung für Franz Professional verfügbar.\nBitte ändern Sie Ihren Server auf https://api.franzinfra.com, um Teams zu verwenden.",
-  "settings.team.upgradeAction": "Account Upgrade durchführen",
   "settings.user.form.accountType.company": "Firma",
   "settings.user.form.accountType.individual": "Einzelperson",
   "settings.user.form.accountType.label": "Konto-Typ",
@@ -516,29 +431,20 @@
   "signup.link.login": "Du hast bereits ein Konto? Melde Dich an.",
   "signup.password.label": "Passwort",
   "signup.submit.label": "Konto erstellen",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Ja, kostenlose Ferdi Professional Testlizenz starten",
-  "subscription.cta.allOptions": "Alle Optionen anzeigen",
-  "subscription.cta.choosePlan": "Wähle deine Lizenz",
-  "subscription.includedProFeatures": "Die Ferdi Professional Lizenz beinhaltet:",
-  "subscription.interval.per": "pro {interval}",
-  "subscription.interval.perMonth": "pro Monat",
-  "subscription.interval.perMonthPerUser": "pro Monat und Benutzer",
-  "subscription.planItem.upgradeAccount": "Account Upgrade",
-  "subscription.teaser.includedFeatures": "Bezahlte Ferdi Lizenzen beinhalten:",
-  "subscription.teaser.intro": "Ferdi 5 ist voll gepackt mit vielen neuen Features, damit du für jegliche kommunikative Eventualität gerüstet bist. Nimm dir was du brauchst und leg los!",
-  "subscriptionPopup.buttonCancel": "Abbrechen",
-  "subscriptionPopup.buttonDone": "Fertig",
   "tabs.item.confirmDeleteService": "Willst du den {serviceName} Dienst wirklich löschen?",
   "tabs.item.deleteService": "Dienst löschen",
   "tabs.item.disableAudio": "Audio deaktivieren",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Benachrichtigungen deaktivieren",
   "tabs.item.disableService": "Dienst deaktivieren",
   "tabs.item.edit": "Bearbeiten",
   "tabs.item.enableAudio": "Audio aktivieren",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Benachrichtigungen aktivieren",
   "tabs.item.enableService": "Dienst aktivieren",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Neu laden",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} ist ungültig",
   "validation.minLength": "{field} muss mindestens {length} Zeichen enthalten",
   "validation.oneRequired": "Mindestens ein Wert wird benötigt",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Arbeitsbereiche",
   "workspaceDrawer.item.contextMenuEdit": "Bearbeiten",
   "workspaceDrawer.item.noServicesAddedYet": "Noch keine Services hinzugefügt",
-  "workspaceDrawer.premiumCtaButtonLabel": "Erstelle deinen ersten Workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium Feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Premium Account aktivieren",
   "workspaceDrawer.workspaceFeatureInfo": "Mit Ferdi Workspaces hast du alles im Blick, was gerade wichtig ist - und nur das. Erstelle unterschiedliche Sets von Services, und wechsle jederzeit zwischen ihnen hin und her. Du entscheidest welche Services du wann und wo brauchst, um ungestört arbeiten zu können - oder zu Hause besser abzuschalten.",
   "workspaceDrawer.workspacesSettingsTooltip": "Workspaces bearbeiten",
   "workspaces.switchingIndicator.switchingTo": "Wechsle zu"
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 370a6fb92..683ec4628 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -661,180 +661,6 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Hi {name}, welcome to Franz",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.headline.pro",
-        "start": {
-          "column": 12,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!!We have a special treat for you.",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.intro.specialTreat",
-        "start": {
-          "column": 16,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Enjoy the full Franz Professional experience completely free for 14 days.",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.intro.tryPro",
-        "start": {
-          "column": 10,
-          "line": 22
-        }
-      },
-      {
-        "defaultMessage": "!!!Happy messaging,",
-        "end": {
-          "column": 3,
-          "line": 29
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.intro.happyMessaging",
-        "start": {
-          "column": 18,
-          "line": 26
-        }
-      },
-      {
-        "defaultMessage": "!!!No strings attached",
-        "end": {
-          "column": 3,
-          "line": 33
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.terms.headline",
-        "start": {
-          "column": 29,
-          "line": 30
-        }
-      },
-      {
-        "defaultMessage": "!!!No credit card required",
-        "end": {
-          "column": 3,
-          "line": 37
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.terms.noCreditCard",
-        "start": {
-          "column": 16,
-          "line": 34
-        }
-      },
-      {
-        "defaultMessage": "!!!Your free trial ends automatically after 14 days",
-        "end": {
-          "column": 3,
-          "line": 41
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.terms.automaticTrialEnd",
-        "start": {
-          "column": 21,
-          "line": 38
-        }
-      },
-      {
-        "defaultMessage": "!!!Free trial (normally {currency}{price} per month)",
-        "end": {
-          "column": 3,
-          "line": 45
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.terms.trialWorth",
-        "start": {
-          "column": 14,
-          "line": 42
-        }
-      },
-      {
-        "defaultMessage": "!!!Sorry, we could not activate your trial!",
-        "end": {
-          "column": 3,
-          "line": 49
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.error",
-        "start": {
-          "column": 19,
-          "line": 46
-        }
-      },
-      {
-        "defaultMessage": "!!!Start my 14-day Franz Professional Trial",
-        "end": {
-          "column": 3,
-          "line": 53
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.cta.accept",
-        "start": {
-          "column": 13,
-          "line": 50
-        }
-      },
-      {
-        "defaultMessage": "!!!Start using Franz",
-        "end": {
-          "column": 3,
-          "line": 57
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.cta.start",
-        "start": {
-          "column": 12,
-          "line": 54
-        }
-      },
-      {
-        "defaultMessage": "!!!Continue to Ferdi",
-        "end": {
-          "column": 3,
-          "line": 61
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.cta.skip",
-        "start": {
-          "column": 11,
-          "line": 58
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz Professional includes:",
-        "end": {
-          "column": 3,
-          "line": 65
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.features.headline",
-        "start": {
-          "column": 20,
-          "line": 62
-        }
-      }
-    ],
-    "path": "src/components/auth/Pricing.json"
-  },
-  {
-    "descriptors": [
-      {
         "defaultMessage": "!!!Invite Friends",
         "end": {
           "column": 3,
@@ -947,7 +773,7 @@
         "defaultMessage": "!!!Choose from our most used services and get back on top of your messaging now.",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 27
         },
         "file": "src/components/auth/SetupAssistant.js",
         "id": "setupAssistant.subheadline",
@@ -960,26 +786,26 @@
         "defaultMessage": "!!!Let's go",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 31
         },
         "file": "src/components/auth/SetupAssistant.js",
         "id": "setupAssistant.submit.label",
         "start": {
           "column": 21,
-          "line": 27
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Invitations sent successfully",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 35
         },
         "file": "src/components/auth/SetupAssistant.js",
         "id": "invite.successInfo",
         "start": {
           "column": 21,
-          "line": 31
+          "line": 32
         }
       }
     ],
@@ -991,169 +817,169 @@
         "defaultMessage": "!!!Sign up",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 23
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.headline",
         "start": {
           "column": 12,
-          "line": 19
+          "line": 20
         }
       },
       {
         "defaultMessage": "!!!Firstname",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 27
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.firstname.label",
         "start": {
           "column": 18,
-          "line": 23
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Lastname",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 31
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.lastname.label",
         "start": {
           "column": 17,
-          "line": 27
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Email address",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 35
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.email.label",
         "start": {
           "column": 14,
-          "line": 31
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 43
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.password.label",
         "start": {
           "column": 17,
-          "line": 39
+          "line": 40
         }
       },
       {
         "defaultMessage": "!!!By creating a Ferdi account you accept the",
         "end": {
           "column": 3,
-          "line": 46
+          "line": 47
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.legal.info",
         "start": {
           "column": 13,
-          "line": 43
+          "line": 44
         }
       },
       {
         "defaultMessage": "!!!Terms of service",
         "end": {
           "column": 3,
-          "line": 50
+          "line": 51
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.legal.terms",
         "start": {
           "column": 9,
-          "line": 47
+          "line": 48
         }
       },
       {
         "defaultMessage": "!!!Privacy Statement",
         "end": {
           "column": 3,
-          "line": 54
+          "line": 55
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.legal.privacy",
         "start": {
           "column": 11,
-          "line": 51
+          "line": 52
         }
       },
       {
         "defaultMessage": "!!!Create account",
         "end": {
           "column": 3,
-          "line": 58
+          "line": 59
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.submit.label",
         "start": {
           "column": 21,
-          "line": 55
+          "line": 56
         }
       },
       {
         "defaultMessage": "!!!Already have an account, sign in?",
         "end": {
           "column": 3,
-          "line": 62
+          "line": 63
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.link.login",
         "start": {
           "column": 13,
-          "line": 59
+          "line": 60
         }
       },
       {
         "defaultMessage": "!!!Change server",
         "end": {
           "column": 3,
-          "line": 66
+          "line": 67
         },
         "file": "src/components/auth/Signup.js",
         "id": "login.changeServer",
         "start": {
           "column": 16,
-          "line": 63
+          "line": 64
         }
       },
       {
         "defaultMessage": "!!!Use Ferdi without an Account",
         "end": {
           "column": 3,
-          "line": 70
+          "line": 71
         },
         "file": "src/components/auth/Signup.js",
         "id": "services.serverless",
         "start": {
           "column": 14,
-          "line": 67
+          "line": 68
         }
       },
       {
         "defaultMessage": "!!!A user with that email address already exists",
         "end": {
           "column": 3,
-          "line": 74
+          "line": 75
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.emailDuplicate",
         "start": {
           "column": 18,
-          "line": 71
+          "line": 72
         }
       }
     ],
@@ -1209,52 +1035,52 @@
         "defaultMessage": "!!!Your services have been updated.",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 32
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.servicesUpdated",
         "start": {
           "column": 19,
-          "line": 32
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Reload services",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 36
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.buttonReloadServices",
         "start": {
           "column": 24,
-          "line": 36
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Could not load services and user information",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 40
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.requiredRequestsFailed",
         "start": {
           "column": 26,
-          "line": 40
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 45
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.authRequestFailed",
         "start": {
           "column": 21,
-          "line": 44
+          "line": 41
         }
       }
     ],
@@ -1266,117 +1092,117 @@
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 23
+          "line": 20
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.settings",
         "start": {
           "column": 12,
-          "line": 20
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!Add new service",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 24
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.addNewService",
         "start": {
           "column": 17,
-          "line": 24
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 28
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 8,
-          "line": 28
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 32
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 10,
-          "line": 32
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Open workspace drawer",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 36
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.openWorkspaceDrawer",
         "start": {
           "column": 23,
-          "line": 36
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Close workspace drawer",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 40
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.closeWorkspaceDrawer",
         "start": {
           "column": 24,
-          "line": 40
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!Open Franz Todos",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 44
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.openTodosDrawer",
         "start": {
           "column": 19,
-          "line": 44
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!Close Franz Todos",
         "end": {
           "column": 3,
-          "line": 51
+          "line": 48
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.closeTodosDrawer",
         "start": {
           "column": 20,
-          "line": 48
+          "line": 45
         }
       },
       {
         "defaultMessage": "!!!Lock Ferdi",
         "end": {
           "column": 3,
-          "line": 55
+          "line": 52
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.lockFerdi",
         "start": {
           "column": 13,
-          "line": 52
+          "line": 49
         }
       }
     ],
@@ -1528,39 +1354,39 @@
         "defaultMessage": "!!!Oh no! Ferdi lost the connection to {name}.",
         "end": {
           "column": 3,
-          "line": 18
+          "line": 16
         },
         "file": "src/components/services/content/ConnectionLostBanner.js",
         "id": "connectionLostBanner.message",
         "start": {
           "column": 8,
-          "line": 15
+          "line": 13
         }
       },
       {
         "defaultMessage": "!!!What happened?",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 20
         },
         "file": "src/components/services/content/ConnectionLostBanner.js",
         "id": "connectionLostBanner.informationLink",
         "start": {
           "column": 19,
-          "line": 19
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!Reload Service",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 24
         },
         "file": "src/components/services/content/ConnectionLostBanner.js",
         "id": "connectionLostBanner.cta",
         "start": {
           "column": 7,
-          "line": 23
+          "line": 21
         }
       }
     ],
@@ -1670,76 +1496,6 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!You have reached your service limit.",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/services/content/ServiceRestricted.js",
-        "id": "service.restrictedHandler.serviceLimit.headline",
-        "start": {
-          "column": 24,
-          "line": 11
-        }
-      },
-      {
-        "defaultMessage": "!!!Please upgrade your account to use more than {count} services.",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/services/content/ServiceRestricted.js",
-        "id": "service.restrictedHandler.serviceLimit.text",
-        "start": {
-          "column": 20,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz Professional Plan required",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/services/content/ServiceRestricted.js",
-        "id": "service.restrictedHandler.customUrl.headline",
-        "start": {
-          "column": 21,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/services/content/ServiceRestricted.js",
-        "id": "service.restrictedHandler.customUrl.text",
-        "start": {
-          "column": 17,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade Account",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/services/content/ServiceRestricted.js",
-        "id": "service.restrictedHandler.action",
-        "start": {
-          "column": 10,
-          "line": 27
-        }
-      }
-    ],
-    "path": "src/components/services/content/ServiceRestricted.json"
-  },
-  {
-    "descriptors": [
-      {
         "defaultMessage": "!!!Welcome to Ferdi",
         "end": {
           "column": 3,
@@ -1792,7 +1548,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+        "defaultMessage": "!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
         "end": {
           "column": 3,
           "line": 34
@@ -2015,333 +1771,268 @@
         }
       },
       {
-        "defaultMessage": "!!!Disable Service",
+        "defaultMessage": "!!!Enable Dark mode",
         "end": {
           "column": 3,
           "line": 47
         },
         "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.disableService",
+        "id": "tabs.item.enableDarkMode",
         "start": {
           "column": 18,
           "line": 44
         }
       },
       {
-        "defaultMessage": "!!!Enable Service",
+        "defaultMessage": "!!!Disable Dark mode",
         "end": {
           "column": 3,
           "line": 51
         },
         "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.enableService",
+        "id": "tabs.item.disableDarkMode",
         "start": {
-          "column": 17,
+          "column": 19,
           "line": 48
         }
       },
       {
-        "defaultMessage": "!!!Delete Service",
+        "defaultMessage": "!!!Disable Service",
         "end": {
           "column": 3,
           "line": 55
         },
         "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.deleteService",
+        "id": "tabs.item.disableService",
         "start": {
-          "column": 17,
+          "column": 18,
           "line": 52
         }
       },
       {
-        "defaultMessage": "!!!Do you really want to delete the {serviceName} service?",
+        "defaultMessage": "!!!Enable Service",
         "end": {
           "column": 3,
           "line": 59
         },
         "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.confirmDeleteService",
+        "id": "tabs.item.enableService",
         "start": {
-          "column": 24,
+          "column": 17,
           "line": 56
         }
-      }
-    ],
-    "path": "src/components/services/tabs/TabItem.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Account",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.headline",
-        "start": {
-          "column": 12,
-          "line": 17
-        }
       },
       {
-        "defaultMessage": "!!!Your Subscription",
+        "defaultMessage": "!!!Hibernate Service",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 63
         },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.headlineSubscription",
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.hibernateService",
         "start": {
-          "column": 24,
-          "line": 21
+          "column": 20,
+          "line": 60
         }
       },
       {
-        "defaultMessage": "!!Danger Zone",
+        "defaultMessage": "!!!Wake Up Service",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 67
         },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.headlineDangerZone",
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.wakeUpService",
         "start": {
-          "column": 22,
-          "line": 25
+          "column": 17,
+          "line": 64
         }
       },
       {
-        "defaultMessage": "!!!Manage your subscription",
+        "defaultMessage": "!!!Delete Service",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 71
         },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.manageSubscription.label",
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.deleteService",
         "start": {
-          "column": 33,
-          "line": 29
+          "column": 17,
+          "line": 68
         }
       },
       {
-        "defaultMessage": "!!!Upgrade to Franz Professional",
+        "defaultMessage": "!!!Do you really want to delete the {serviceName} service?",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 76
         },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.upgradeToPro.label",
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.confirmDeleteService",
         "start": {
-          "column": 23,
-          "line": 33
+          "column": 24,
+          "line": 72
         }
-      },
+      }
+    ],
+    "path": "src/components/services/tabs/TabItem.json"
+  },
+  {
+    "descriptors": [
       {
-        "defaultMessage": "!!!Basic Account",
+        "defaultMessage": "!!!Account",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 17
         },
         "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.accountType.basic",
+        "id": "settings.account.headline",
         "start": {
-          "column": 20,
-          "line": 37
+          "column": 12,
+          "line": 14
         }
       },
       {
-        "defaultMessage": "!!!Premium Supporter Account",
+        "defaultMessage": "!!Danger Zone",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 21
         },
         "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.accountType.premium",
+        "id": "settings.account.headlineDangerZone",
         "start": {
           "column": 22,
-          "line": 41
+          "line": 18
         }
       },
       {
         "defaultMessage": "!!!Edit Account",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 25
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.account.editButton",
         "start": {
           "column": 21,
-          "line": 45
+          "line": 22
         }
       },
       {
         "defaultMessage": "!!Invoices",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 29
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.headlineInvoices",
         "start": {
           "column": 18,
-          "line": 49
-        }
-      },
-      {
-        "defaultMessage": "!!!Download",
-        "end": {
-          "column": 3,
-          "line": 56
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.invoiceDownload",
-        "start": {
-          "column": 19,
-          "line": 53
+          "line": 26
         }
       },
       {
         "defaultMessage": "!!!Could not load user information",
         "end": {
           "column": 3,
-          "line": 60
+          "line": 33
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.userInfoRequestFailed",
         "start": {
           "column": 25,
-          "line": 57
+          "line": 30
         }
       },
       {
         "defaultMessage": "!!!Try again",
         "end": {
           "column": 3,
-          "line": 64
+          "line": 37
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.tryReloadUserInfoRequest",
         "start": {
           "column": 28,
-          "line": 61
+          "line": 34
         }
       },
       {
         "defaultMessage": "!!!Delete account",
         "end": {
           "column": 3,
-          "line": 68
+          "line": 41
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.deleteAccount",
         "start": {
           "column": 17,
-          "line": 65
+          "line": 38
         }
       },
       {
         "defaultMessage": "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
         "end": {
           "column": 3,
-          "line": 73
+          "line": 46
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.deleteInfo",
         "start": {
           "column": 14,
-          "line": 69
+          "line": 42
         }
       },
       {
         "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
         "end": {
           "column": 3,
-          "line": 78
+          "line": 51
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.deleteEmailSent",
         "start": {
           "column": 19,
-          "line": 74
-        }
-      },
-      {
-        "defaultMessage": "!!!Free Trial",
-        "end": {
-          "column": 3,
-          "line": 82
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.trial",
-        "start": {
-          "column": 9,
-          "line": 79
+          "line": 47
         }
       },
       {
         "defaultMessage": "!!!Your Franz License:",
         "end": {
           "column": 3,
-          "line": 86
+          "line": 55
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.yourLicense",
         "start": {
           "column": 15,
-          "line": 83
-        }
-      },
-      {
-        "defaultMessage": "!!!Your free trial ends in {duration}.",
-        "end": {
-          "column": 3,
-          "line": 90
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.trialEndsIn",
-        "start": {
-          "column": 15,
-          "line": 87
-        }
-      },
-      {
-        "defaultMessage": "!!!Please update your billing info to continue using {license} after your trial period.",
-        "end": {
-          "column": 3,
-          "line": 95
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.trialUpdateBillingInfo",
-        "start": {
-          "column": 33,
-          "line": 91
+          "line": 52
         }
       },
       {
         "defaultMessage": "Account is unavailable",
         "end": {
           "column": 3,
-          "line": 99
+          "line": 59
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.accountUnavailable",
         "start": {
           "column": 22,
-          "line": 96
+          "line": 56
         }
       },
       {
         "defaultMessage": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
         "end": {
           "column": 3,
-          "line": 103
+          "line": 63
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.accountUnavailableInfo",
         "start": {
           "column": 26,
-          "line": 100
+          "line": 60
         }
       }
     ],
@@ -2353,104 +2044,104 @@
         "defaultMessage": "!!!Available services",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 18
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.availableServices",
         "start": {
           "column": 21,
-          "line": 17
+          "line": 15
         }
       },
       {
         "defaultMessage": "!!!Your services",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 22
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.yourServices",
         "start": {
           "column": 16,
-          "line": 21
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Your workspaces",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 26
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.yourWorkspaces",
         "start": {
           "column": 18,
-          "line": 25
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Account",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 30
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.account",
         "start": {
           "column": 11,
-          "line": 29
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Manage Team",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 34
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.team",
         "start": {
           "column": 8,
-          "line": 33
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 38
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.settings",
         "start": {
           "column": 12,
-          "line": 37
+          "line": 35
         }
       },
       {
         "defaultMessage": "!!!About Ferdi",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 42
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.supportFerdi",
         "start": {
           "column": 16,
-          "line": 41
+          "line": 39
         }
       },
       {
         "defaultMessage": "!!!Logout",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 46
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.logout",
         "start": {
           "column": 10,
-          "line": 45
+          "line": 43
         }
       }
     ],
@@ -2462,182 +2153,169 @@
         "defaultMessage": "!!!Available Services",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 22
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.headline",
         "start": {
           "column": 12,
-          "line": 21
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Search service",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 26
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.searchService",
         "start": {
           "column": 17,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Most popular",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.mostPopular",
-        "start": {
-          "column": 22,
-          "line": 29
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!All services",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 30
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.all",
         "start": {
           "column": 14,
-          "line": 33
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Custom Services",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 34
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.custom",
         "start": {
           "column": 17,
-          "line": 37
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 38
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.nothingFound",
         "start": {
           "column": 16,
-          "line": 41
+          "line": 35
         }
       },
       {
         "defaultMessage": "!!!Service successfully added",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 42
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.servicesSuccessfulAddedInfo",
         "start": {
           "column": 31,
-          "line": 45
+          "line": 39
         }
       },
       {
         "defaultMessage": "!!!Missing a service?",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 46
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.missingService",
         "start": {
           "column": 18,
-          "line": 49
+          "line": 43
         }
       },
       {
         "defaultMessage": "!!!To add a custom service, copy the recipe folder into:",
         "end": {
           "column": 3,
-          "line": 56
+          "line": 50
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.customService.intro",
         "start": {
           "column": 21,
-          "line": 53
+          "line": 47
         }
       },
       {
         "defaultMessage": "!!!Open directory",
         "end": {
           "column": 3,
-          "line": 60
+          "line": 54
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.customService.openFolder",
         "start": {
           "column": 14,
-          "line": 57
+          "line": 51
         }
       },
       {
         "defaultMessage": "!!!Developer Documentation",
         "end": {
           "column": 3,
-          "line": 64
+          "line": 58
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.customService.openDevDocs",
         "start": {
           "column": 15,
-          "line": 61
+          "line": 55
         }
       },
       {
         "defaultMessage": "!!!Custom 3rd Party Recipes",
         "end": {
           "column": 3,
-          "line": 68
+          "line": 62
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.customService.headline.customRecipes",
         "start": {
           "column": 25,
-          "line": 65
+          "line": 59
         }
       },
       {
         "defaultMessage": "!!!Community 3rd Party Recipes",
         "end": {
           "column": 3,
-          "line": 72
+          "line": 66
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.customService.headline.communityRecipes",
         "start": {
           "column": 28,
-          "line": 69
+          "line": 63
         }
       },
       {
         "defaultMessage": "!!!Your Development Service Recipes",
         "end": {
           "column": 3,
-          "line": 76
+          "line": 70
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.customService.headline.devRecipes",
         "start": {
           "column": 22,
-          "line": 73
+          "line": 67
         }
       }
     ],
@@ -2649,364 +2327,338 @@
         "defaultMessage": "!!!Save service",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 26
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.saveButton",
         "start": {
           "column": 15,
-          "line": 27
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Delete Service",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 30
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.deleteButton",
         "start": {
           "column": 17,
-          "line": 31
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Open darkmode.css",
         "end": {
           "column": 3,
-          "line": 38
+          "line": 34
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.openDarkmodeCss",
         "start": {
           "column": 19,
-          "line": 35
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Open user.css",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 38
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.openUserCss",
         "start": {
           "column": 15,
-          "line": 39
+          "line": 35
         }
       },
       {
         "defaultMessage": "!!!Open user.js",
         "end": {
           "column": 3,
-          "line": 46
+          "line": 42
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.openUserJs",
         "start": {
           "column": 14,
-          "line": 43
+          "line": 39
         }
       },
       {
         "defaultMessage": "!!!Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
         "end": {
           "column": 3,
-          "line": 50
+          "line": 46
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.recipeFileInfo",
         "start": {
           "column": 18,
-          "line": 47
+          "line": 43
         }
       },
       {
         "defaultMessage": "!!!Available services",
         "end": {
           "column": 3,
-          "line": 54
+          "line": 50
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.availableServices",
         "start": {
           "column": 21,
-          "line": 51
+          "line": 47
         }
       },
       {
         "defaultMessage": "!!!Your services",
         "end": {
           "column": 3,
-          "line": 58
+          "line": 54
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.yourServices",
         "start": {
           "column": 16,
-          "line": 55
+          "line": 51
         }
       },
       {
         "defaultMessage": "!!!Add {name}",
         "end": {
           "column": 3,
-          "line": 62
+          "line": 58
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.addServiceHeadline",
         "start": {
           "column": 22,
-          "line": 59
+          "line": 55
         }
       },
       {
         "defaultMessage": "!!!Edit {name}",
         "end": {
           "column": 3,
-          "line": 66
+          "line": 62
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.editServiceHeadline",
         "start": {
           "column": 23,
-          "line": 63
+          "line": 59
         }
       },
       {
         "defaultMessage": "!!!Hosted",
         "end": {
           "column": 3,
-          "line": 70
+          "line": 66
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.tabHosted",
         "start": {
           "column": 13,
-          "line": 67
+          "line": 63
         }
       },
       {
         "defaultMessage": "!!!Self hosted ⭐️",
         "end": {
           "column": 3,
-          "line": 74
+          "line": 70
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.tabOnPremise",
         "start": {
           "column": 16,
-          "line": 71
+          "line": 67
         }
       },
       {
         "defaultMessage": "!!!Use the hosted {name} service.",
         "end": {
           "column": 3,
-          "line": 78
+          "line": 74
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.useHostedService",
         "start": {
           "column": 20,
-          "line": 75
+          "line": 71
         }
       },
       {
         "defaultMessage": "!!!Could not validate custom {name} server.",
         "end": {
           "column": 3,
-          "line": 82
+          "line": 78
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.customUrlValidationError",
         "start": {
           "column": 28,
-          "line": 79
-        }
-      },
-      {
-        "defaultMessage": "!!!To add self hosted services, you need a Ferdi Premium Supporter Account.",
-        "end": {
-          "column": 3,
-          "line": 86
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.customUrlPremiumInfo",
-        "start": {
-          "column": 24,
-          "line": 83
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade your account",
-        "end": {
-          "column": 3,
-          "line": 90
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.customUrlUpgradeAccount",
-        "start": {
-          "column": 27,
-          "line": 87
+          "line": 75
         }
       },
       {
         "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
         "end": {
           "column": 3,
-          "line": 94
+          "line": 82
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.indirectMessageInfo",
         "start": {
           "column": 23,
-          "line": 91
+          "line": 79
         }
       },
       {
         "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
         "end": {
           "column": 3,
-          "line": 98
+          "line": 86
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.isMutedInfo",
         "start": {
           "column": 15,
-          "line": 95
+          "line": 83
         }
       },
       {
         "defaultMessage": "!!!When enabled, a service will be shut down after a period of time to save system resources.",
         "end": {
           "column": 3,
-          "line": 102
+          "line": 90
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.isHibernatedEnabledInfo",
         "start": {
           "column": 28,
-          "line": 99
+          "line": 87
         }
       },
       {
         "defaultMessage": "!!!Notifications",
         "end": {
           "column": 3,
-          "line": 106
+          "line": 94
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.headlineNotifications",
         "start": {
           "column": 25,
-          "line": 103
+          "line": 91
         }
       },
       {
         "defaultMessage": "!!!Unread message badges",
         "end": {
           "column": 3,
-          "line": 110
+          "line": 98
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.headlineBadges",
         "start": {
           "column": 18,
-          "line": 107
+          "line": 95
         }
       },
       {
         "defaultMessage": "!!!General",
         "end": {
           "column": 3,
-          "line": 114
+          "line": 102
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.headlineGeneral",
         "start": {
           "column": 19,
-          "line": 111
+          "line": 99
         }
       },
       {
         "defaultMessage": "!!!Dark Reader Settings",
         "end": {
           "column": 3,
-          "line": 118
+          "line": 106
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.headlineDarkReaderSettings",
         "start": {
           "column": 30,
-          "line": 115
+          "line": 103
         }
       },
       {
         "defaultMessage": "!!!Delete",
         "end": {
           "column": 3,
-          "line": 122
+          "line": 110
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.iconDelete",
         "start": {
           "column": 14,
-          "line": 119
+          "line": 107
         }
       },
       {
         "defaultMessage": "!!!Drop your image, or click here",
         "end": {
           "column": 3,
-          "line": 126
+          "line": 114
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.iconUpload",
         "start": {
           "column": 14,
-          "line": 123
+          "line": 111
         }
       },
       {
         "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
         "end": {
           "column": 3,
-          "line": 130
+          "line": 118
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.proxy.headline",
         "start": {
           "column": 17,
-          "line": 127
+          "line": 115
         }
       },
       {
         "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
         "end": {
           "column": 3,
-          "line": 134
+          "line": 122
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.proxy.restartInfo",
         "start": {
           "column": 20,
-          "line": 131
+          "line": 119
         }
       },
       {
         "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
         "end": {
           "column": 3,
-          "line": 138
+          "line": 126
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.proxy.info",
         "start": {
           "column": 13,
-          "line": 135
+          "line": 123
         }
       }
     ],
@@ -3119,117 +2771,117 @@
         "defaultMessage": "!!!Your services",
         "end": {
           "column": 3,
-          "line": 19
+          "line": 18
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.services.headline",
         "start": {
           "column": 12,
-          "line": 16
+          "line": 15
         }
       },
       {
         "defaultMessage": "!!!Search service",
         "end": {
           "column": 3,
-          "line": 23
+          "line": 22
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.searchService",
         "start": {
           "column": 17,
-          "line": 20
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Start by adding a service.",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 26
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.services.noServicesAdded",
         "start": {
           "column": 19,
-          "line": 24
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 30
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.recipes.nothingFound",
         "start": {
           "column": 18,
-          "line": 28
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Discover services",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 34
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.services.discoverServices",
         "start": {
           "column": 20,
-          "line": 32
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Could not load your services",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 38
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.services.servicesRequestFailed",
         "start": {
           "column": 25,
-          "line": 36
+          "line": 35
         }
       },
       {
         "defaultMessage": "!!!Try again",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 42
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.account.tryReloadServices",
         "start": {
           "column": 21,
-          "line": 40
+          "line": 39
         }
       },
       {
         "defaultMessage": "!!!Your changes have been saved",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 46
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.services.updatedInfo",
         "start": {
           "column": 15,
-          "line": 44
+          "line": 43
         }
       },
       {
         "defaultMessage": "!!!Service has been deleted",
         "end": {
           "column": 3,
-          "line": 51
+          "line": 50
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.services.deletedInfo",
         "start": {
           "column": 15,
-          "line": 48
+          "line": 47
         }
       }
     ],
@@ -3241,416 +2893,416 @@
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 26
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headline",
         "start": {
           "column": 12,
-          "line": 24
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!General",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 30
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineGeneral",
         "start": {
           "column": 19,
-          "line": 28
+          "line": 27
         }
       },
       {
-        "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+        "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 34
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.sentryInfo",
         "start": {
           "column": 14,
-          "line": 32
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 38
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.hibernateInfo",
         "start": {
           "column": 17,
-          "line": 36
+          "line": 35
         }
       },
       {
         "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 42
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.inactivityLockInfo",
         "start": {
           "column": 22,
-          "line": 40
+          "line": 39
         }
       },
       {
         "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 46
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.todoServerInfo",
         "start": {
           "column": 18,
-          "line": 44
+          "line": 43
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 51
+          "line": 50
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.lockedPassword",
         "start": {
           "column": 18,
-          "line": 48
+          "line": 47
         }
       },
       {
         "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
         "end": {
           "column": 3,
-          "line": 55
+          "line": 54
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.lockedPasswordInfo",
         "start": {
           "column": 22,
-          "line": 52
+          "line": 51
         }
       },
       {
-        "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+        "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
         "end": {
           "column": 3,
-          "line": 59
+          "line": 58
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.lockInfo",
         "start": {
           "column": 12,
-          "line": 56
+          "line": 55
         }
       },
       {
         "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
         "end": {
           "column": 3,
-          "line": 63
+          "line": 62
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.scheduledDNDTimeInfo",
         "start": {
           "column": 24,
-          "line": 60
+          "line": 59
         }
       },
       {
         "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
         "end": {
           "column": 3,
-          "line": 67
+          "line": 66
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.scheduledDNDInfo",
         "start": {
           "column": 20,
-          "line": 64
+          "line": 63
         }
       },
       {
         "defaultMessage": "!!!Language",
         "end": {
           "column": 3,
-          "line": 71
+          "line": 70
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineLanguage",
         "start": {
           "column": 20,
-          "line": 68
+          "line": 67
         }
       },
       {
         "defaultMessage": "!!!Updates",
         "end": {
           "column": 3,
-          "line": 75
+          "line": 74
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineUpdates",
         "start": {
           "column": 19,
-          "line": 72
+          "line": 71
         }
       },
       {
         "defaultMessage": "!!!Appearance",
         "end": {
           "column": 3,
-          "line": 79
+          "line": 78
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineAppearance",
         "start": {
           "column": 22,
-          "line": 76
+          "line": 75
         }
       },
       {
         "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
         "end": {
           "column": 3,
-          "line": 83
+          "line": 82
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.universalDarkModeInfo",
         "start": {
           "column": 25,
-          "line": 80
+          "line": 79
         }
       },
       {
         "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
         "end": {
           "column": 3,
-          "line": 87
+          "line": 86
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.accentColorInfo",
         "start": {
           "column": 19,
-          "line": 84
+          "line": 83
         }
       },
       {
         "defaultMessage": "!!!Privacy",
         "end": {
           "column": 3,
-          "line": 91
+          "line": 90
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlinePrivacy",
         "start": {
           "column": 19,
-          "line": 88
+          "line": 87
         }
       },
       {
         "defaultMessage": "!!!Advanced",
         "end": {
           "column": 3,
-          "line": 95
+          "line": 94
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineAdvanced",
         "start": {
           "column": 20,
-          "line": 92
+          "line": 91
         }
       },
       {
         "defaultMessage": "!!!Help us to translate Ferdi into your language.",
         "end": {
           "column": 3,
-          "line": 99
+          "line": 98
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.translationHelp",
         "start": {
           "column": 19,
-          "line": 96
+          "line": 95
         }
       },
       {
         "defaultMessage": "!!!Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
         "end": {
           "column": 3,
-          "line": 103
+          "line": 102
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.spellCheckerLanguageInfo",
         "start": {
           "column": 28,
-          "line": 100
+          "line": 99
         }
       },
       {
         "defaultMessage": "!!!Cache",
         "end": {
           "column": 3,
-          "line": 107
+          "line": 106
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.subheadlineCache",
         "start": {
           "column": 20,
-          "line": 104
+          "line": 103
         }
       },
       {
         "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
         "end": {
           "column": 3,
-          "line": 111
+          "line": 110
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.cacheInfo",
         "start": {
           "column": 13,
-          "line": 108
+          "line": 107
         }
       },
       {
         "defaultMessage": "!!!Couldn't clear all cache",
         "end": {
           "column": 3,
-          "line": 115
+          "line": 114
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.cacheNotCleared",
         "start": {
           "column": 19,
-          "line": 112
+          "line": 111
         }
       },
       {
         "defaultMessage": "!!!Clear cache",
         "end": {
           "column": 3,
-          "line": 119
+          "line": 118
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonClearAllCache",
         "start": {
           "column": 23,
-          "line": 116
+          "line": 115
         }
       },
       {
         "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
-          "line": 123
+          "line": 122
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonSearchForUpdate",
         "start": {
           "column": 25,
-          "line": 120
+          "line": 119
         }
       },
       {
         "defaultMessage": "!!!Restart & install update",
         "end": {
           "column": 3,
-          "line": 127
+          "line": 126
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonInstallUpdate",
         "start": {
           "column": 23,
-          "line": 124
+          "line": 123
         }
       },
       {
         "defaultMessage": "!!!Is searching for update",
         "end": {
           "column": 3,
-          "line": 131
+          "line": 130
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusSearching",
         "start": {
           "column": 25,
-          "line": 128
+          "line": 127
         }
       },
       {
         "defaultMessage": "!!!Update available, downloading...",
         "end": {
           "column": 3,
-          "line": 135
+          "line": 134
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusAvailable",
         "start": {
           "column": 25,
-          "line": 132
+          "line": 131
         }
       },
       {
         "defaultMessage": "!!!You are using the latest version of Ferdi",
         "end": {
           "column": 3,
-          "line": 139
+          "line": 138
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusUpToDate",
         "start": {
           "column": 24,
-          "line": 136
+          "line": 135
         }
       },
       {
         "defaultMessage": "!!!Current version:",
         "end": {
           "column": 3,
-          "line": 143
+          "line": 142
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.currentVersion",
         "start": {
           "column": 18,
-          "line": 140
+          "line": 139
         }
       },
       {
         "defaultMessage": "!!!Changes require restart",
         "end": {
           "column": 3,
-          "line": 147
+          "line": 146
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.restartRequired",
         "start": {
           "column": 22,
-          "line": 144
+          "line": 143
         }
       },
       {
         "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
         "end": {
           "column": 3,
-          "line": 151
+          "line": 150
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.languageDisclaimer",
         "start": {
           "column": 22,
-          "line": 148
+          "line": 147
         }
       }
     ],
@@ -3880,104 +3532,91 @@
         "defaultMessage": "!!!Team",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 18
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.headline",
         "start": {
           "column": 12,
-          "line": 18
+          "line": 15
         }
       },
       {
         "defaultMessage": "!!!Franz Team Management",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 22
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.contentHeadline",
         "start": {
           "column": 19,
-          "line": 22
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Your are currently using Franz Servers, which is why you have access to Team Management.",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 26
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.intro",
         "start": {
           "column": 9,
-          "line": 26
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 30
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.copy",
         "start": {
           "column": 8,
-          "line": 30
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Manage your Team on meetfranz.com",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 34
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.manageAction",
         "start": {
           "column": 16,
-          "line": 34
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade your Account",
-        "end": {
-          "column": 3,
-          "line": 41
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.upgradeAction",
-        "start": {
-          "column": 17,
-          "line": 38
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Teams are unavailable",
         "end": {
           "column": 3,
-          "line": 45
+          "line": 38
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.teamsUnavailable",
         "start": {
           "column": 20,
-          "line": 42
+          "line": 35
         }
       },
       {
         "defaultMessage": "!!!Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
         "end": {
           "column": 3,
-          "line": 49
+          "line": 42
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.teamsUnavailableInfo",
         "start": {
           "column": 24,
-          "line": 46
+          "line": 39
         }
       }
     ],
@@ -4069,509 +3708,146 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Choose your plan",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.cta.choosePlan",
-        "start": {
-          "column": 21,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade your account and get the full Franz experience",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "settings.account.headlineUpgradeAccount",
-        "start": {
-          "column": 18,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.teaser.intro",
-        "start": {
-          "column": 14,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Paid Franz Plans include:",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.teaser.includedFeatures",
-        "start": {
-          "column": 20,
-          "line": 25
-        }
-      }
-    ],
-    "path": "src/components/subscription/SubscriptionForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Cancel",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/subscription/SubscriptionPopup.js",
-        "id": "subscriptionPopup.buttonCancel",
-        "start": {
-          "column": 16,
-          "line": 11
-        }
-      },
-      {
-        "defaultMessage": "!!!Done",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/subscription/SubscriptionPopup.js",
-        "id": "subscriptionPopup.buttonDone",
-        "start": {
-          "column": 14,
-          "line": 15
-        }
-      }
-    ],
-    "path": "src/components/subscription/SubscriptionPopup.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Yes, start the free Franz Professional trial",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/components/subscription/TrialForm.js",
-        "id": "subscription.cta.activateTrial",
-        "start": {
-          "column": 21,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!!See all options",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/subscription/TrialForm.js",
-        "id": "subscription.cta.allOptions",
-        "start": {
-          "column": 20,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Get the free 14 day Franz Professional Trial",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/subscription/TrialForm.js",
-        "id": "settings.account.headlineTrialUpgrade",
-        "start": {
-          "column": 18,
-          "line": 22
-        }
-      },
-      {
-        "defaultMessage": "!!!The Franz Professional Plan includes:",
-        "end": {
-          "column": 3,
-          "line": 29
-        },
-        "file": "src/components/subscription/TrialForm.js",
-        "id": "subscription.includedProFeatures",
-        "start": {
-          "column": 20,
-          "line": 26
-        }
-      },
-      {
-        "defaultMessage": "!!!No strings attached",
-        "end": {
-          "column": 3,
-          "line": 33
-        },
-        "file": "src/components/subscription/TrialForm.js",
-        "id": "pricing.trial.terms.headline",
-        "start": {
-          "column": 29,
-          "line": 30
-        }
-      },
-      {
-        "defaultMessage": "!!!No credit card required",
-        "end": {
-          "column": 3,
-          "line": 37
-        },
-        "file": "src/components/subscription/TrialForm.js",
-        "id": "pricing.trial.terms.noCreditCard",
-        "start": {
-          "column": 16,
-          "line": 34
-        }
-      },
-      {
-        "defaultMessage": "!!!Your free trial ends automatically after 14 days",
-        "end": {
-          "column": 3,
-          "line": 41
-        },
-        "file": "src/components/subscription/TrialForm.js",
-        "id": "pricing.trial.terms.automaticTrialEnd",
-        "start": {
-          "column": 21,
-          "line": 38
-        }
-      }
-    ],
-    "path": "src/components/subscription/TrialForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Your trial was successfully activated. Happy messaging!",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/TrialActivationInfoBar.js",
-        "id": "infobar.trialActivated",
-        "start": {
-          "column": 11,
-          "line": 11
-        }
-      }
-    ],
-    "path": "src/components/TrialActivationInfoBar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Get a Franz Supporter License",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/ui/ActivateTrialButton/index.js",
-        "id": "feature.delayApp.upgrade.action",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/ui/ActivateTrialButton/index.js",
-        "id": "feature.delayApp.trial.action",
-        "start": {
-          "column": 15,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade account",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/ui/ActivateTrialButton/index.js",
-        "id": "feature.delayApp.upgrade.actionShort",
-        "start": {
-          "column": 15,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Activate the free Franz Professional trial",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/ui/ActivateTrialButton/index.js",
-        "id": "feature.delayApp.trial.actionShort",
-        "start": {
-          "column": 20,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!No strings attached",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/ui/ActivateTrialButton/index.js",
-        "id": "pricing.trial.terms.headline",
-        "start": {
-          "column": 29,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!No credit card required",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/components/ui/ActivateTrialButton/index.js",
-        "id": "pricing.trial.terms.noCreditCard",
-        "start": {
-          "column": 16,
-          "line": 33
-        }
-      },
-      {
-        "defaultMessage": "!!!Your free trial ends automatically after 14 days",
-        "end": {
-          "column": 3,
-          "line": 40
-        },
-        "file": "src/components/ui/ActivateTrialButton/index.js",
-        "id": "pricing.trial.terms.automaticTrialEnd",
-        "start": {
-          "column": 21,
-          "line": 37
-        }
-      }
-    ],
-    "path": "src/components/ui/ActivateTrialButton/index.json"
-  },
-  {
-    "descriptors": [
-      {
         "defaultMessage": "!!!Choose from more than 70 Services",
         "end": {
           "column": 3,
-          "line": 12
+          "line": 11
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.recipes",
         "start": {
           "column": 20,
-          "line": 9
+          "line": 8
         }
       },
       {
         "defaultMessage": "!!!Account Synchronisation",
         "end": {
           "column": 3,
-          "line": 16
+          "line": 15
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.accountSync",
         "start": {
           "column": 15,
-          "line": 13
+          "line": 12
         }
       },
       {
         "defaultMessage": "!!!Desktop Notifications",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 19
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.desktopNotifications",
         "start": {
           "column": 24,
-          "line": 17
+          "line": 16
         }
       },
       {
         "defaultMessage": "!!!Add unlimited services",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 23
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.unlimitedServices",
         "start": {
           "column": 21,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Add up to 3 services",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.upToThreeServices",
-        "start": {
-          "column": 21,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Add up to 6 services",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.upToSixServices",
-        "start": {
-          "column": 19,
-          "line": 29
+          "line": 20
         }
       },
       {
         "defaultMessage": "!!!Spellchecker support",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 27
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.spellchecker",
         "start": {
           "column": 16,
-          "line": 33
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 31
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.workspaces",
         "start": {
           "column": 14,
-          "line": 37
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Add Custom Websites",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 35
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.customWebsites",
         "start": {
           "column": 18,
-          "line": 41
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!On-premise & other Hosted Services",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 39
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.onPremise",
         "start": {
           "column": 13,
-          "line": 45
+          "line": 36
         }
       },
       {
         "defaultMessage": "!!!Install 3rd party services",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 43
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.thirdPartyServices",
         "start": {
           "column": 22,
-          "line": 49
+          "line": 40
         }
       },
       {
         "defaultMessage": "!!!Service Proxies",
         "end": {
           "column": 3,
-          "line": 56
+          "line": 47
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.serviceProxies",
         "start": {
           "column": 18,
-          "line": 53
+          "line": 44
         }
       },
       {
         "defaultMessage": "!!!Team Management",
         "end": {
           "column": 3,
-          "line": 60
+          "line": 51
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.teamManagement",
         "start": {
           "column": 18,
-          "line": 57
-        }
-      },
-      {
-        "defaultMessage": "!!!No Waiting Screens",
-        "end": {
-          "column": 3,
-          "line": 64
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.appDelays",
-        "start": {
-          "column": 13,
-          "line": 61
-        }
-      },
-      {
-        "defaultMessage": "!!!Forever ad-free",
-        "end": {
-          "column": 3,
-          "line": 68
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.adFree",
-        "start": {
-          "column": 10,
-          "line": 65
-        }
-      },
-      {
-        "defaultMessage": "!!!Occasional Waiting Screens",
-        "end": {
-          "column": 3,
-          "line": 72
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.appDelaysEnabled",
-        "start": {
-          "column": 19,
-          "line": 69
+          "line": 48
         }
       }
     ],
@@ -4634,42 +3910,6 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Upgrade account",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/ui/PremiumFeatureContainer/index.js",
-        "id": "premiumFeature.button.upgradeAccount",
-        "start": {
-          "column": 10,
-          "line": 16
-        }
-      }
-    ],
-    "path": "src/components/ui/PremiumFeatureContainer/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Upgrade to Franz Professional",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/ui/UpgradeButton/index.js",
-        "id": "global.upgradeButton.upgradeToPro",
-        "start": {
-          "column": 16,
-          "line": 13
-        }
-      }
-    ],
-    "path": "src/components/ui/UpgradeButton/index.json"
-  },
-  {
-    "descriptors": [
-      {
         "defaultMessage": "!!!Loading {service}",
         "end": {
           "column": 3,
@@ -4722,247 +3962,247 @@
         "defaultMessage": "!!!Name",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 31
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.name",
         "start": {
           "column": 8,
-          "line": 29
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Enable service",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 35
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableService",
         "start": {
           "column": 17,
-          "line": 33
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!Enable hibernation",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 39
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableHibernation",
         "start": {
           "column": 21,
-          "line": 37
+          "line": 36
         }
       },
       {
         "defaultMessage": "!!!Enable Notifications",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 43
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableNotification",
         "start": {
           "column": 22,
-          "line": 41
+          "line": 40
         }
       },
       {
         "defaultMessage": "!!!Show unread message badges",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 47
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableBadge",
         "start": {
           "column": 15,
-          "line": 45
+          "line": 44
         }
       },
       {
         "defaultMessage": "!!!Enable audio",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 51
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableAudio",
         "start": {
           "column": 15,
-          "line": 49
+          "line": 48
         }
       },
       {
         "defaultMessage": "!!!Team",
         "end": {
           "column": 3,
-          "line": 56
+          "line": 55
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.team",
         "start": {
           "column": 8,
-          "line": 53
+          "line": 52
         }
       },
       {
         "defaultMessage": "!!!Service URL",
         "end": {
           "column": 3,
-          "line": 60
+          "line": 59
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.customUrl",
         "start": {
           "column": 13,
-          "line": 57
+          "line": 56
         }
       },
       {
         "defaultMessage": "!!!Show message badge for all new messages",
         "end": {
           "column": 3,
-          "line": 64
+          "line": 63
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.indirectMessages",
         "start": {
           "column": 20,
-          "line": 61
+          "line": 60
         }
       },
       {
         "defaultMessage": "!!!Custom icon",
         "end": {
           "column": 3,
-          "line": 68
+          "line": 67
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.icon",
         "start": {
           "column": 8,
-          "line": 65
+          "line": 64
         }
       },
       {
         "defaultMessage": "!!!Enable Dark Mode",
         "end": {
           "column": 3,
-          "line": 72
+          "line": 71
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableDarkMode",
         "start": {
           "column": 18,
-          "line": 69
+          "line": 68
         }
       },
       {
         "defaultMessage": "!!!Dark Reader Brightness",
         "end": {
           "column": 3,
-          "line": 76
+          "line": 75
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.darkReaderBrightness",
         "start": {
           "column": 24,
-          "line": 73
+          "line": 72
         }
       },
       {
         "defaultMessage": "!!!Dark Reader Contrast",
         "end": {
           "column": 3,
-          "line": 80
+          "line": 79
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.darkReaderContrast",
         "start": {
           "column": 22,
-          "line": 77
+          "line": 76
         }
       },
       {
         "defaultMessage": "!!!Dark Reader Sepia",
         "end": {
           "column": 3,
-          "line": 84
+          "line": 83
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.darkReaderSepia",
         "start": {
           "column": 19,
-          "line": 81
+          "line": 80
         }
       },
       {
         "defaultMessage": "!!!Use Proxy",
         "end": {
           "column": 3,
-          "line": 88
+          "line": 87
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.isEnabled",
         "start": {
           "column": 15,
-          "line": 85
+          "line": 84
         }
       },
       {
         "defaultMessage": "!!!Proxy Host/IP",
         "end": {
           "column": 3,
-          "line": 92
+          "line": 91
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.host",
         "start": {
           "column": 13,
-          "line": 89
+          "line": 88
         }
       },
       {
         "defaultMessage": "!!!Port",
         "end": {
           "column": 3,
-          "line": 96
+          "line": 95
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.port",
         "start": {
           "column": 13,
-          "line": 93
+          "line": 92
         }
       },
       {
         "defaultMessage": "!!!User",
         "end": {
           "column": 3,
-          "line": 100
+          "line": 99
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.user",
         "start": {
           "column": 13,
-          "line": 97
+          "line": 96
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 104
+          "line": 103
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.password",
         "start": {
           "column": 17,
-          "line": 101
+          "line": 100
         }
       }
     ],
@@ -4974,585 +4214,585 @@
         "defaultMessage": "!!!Launch Ferdi on start",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 35
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.autoLaunchOnStart",
         "start": {
           "column": 21,
-          "line": 31
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!Open in background",
         "end": {
           "column": 3,
-          "line": 38
+          "line": 39
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.autoLaunchInBackground",
         "start": {
           "column": 26,
-          "line": 35
+          "line": 36
         }
       },
       {
         "defaultMessage": "!!!Keep Ferdi in background when closing the window",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 43
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.runInBackground",
         "start": {
           "column": 19,
-          "line": 39
+          "line": 40
         }
       },
       {
         "defaultMessage": "!!!Start minimized",
         "end": {
           "column": 3,
-          "line": 46
+          "line": 47
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.startMinimized",
         "start": {
           "column": 18,
-          "line": 43
+          "line": 44
         }
       },
       {
         "defaultMessage": "!!!Always show Ferdi in System Tray",
         "end": {
           "column": 3,
-          "line": 50
+          "line": 51
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableSystemTray",
         "start": {
           "column": 20,
-          "line": 47
+          "line": 48
         }
       },
       {
         "defaultMessage": "!!!Always show Ferdi in Menu Bar",
         "end": {
           "column": 3,
-          "line": 54
+          "line": 55
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableMenuBar",
         "start": {
           "column": 17,
-          "line": 51
+          "line": 52
         }
       },
       {
         "defaultMessage": "!!!Reload Ferdi after system resume",
         "end": {
           "column": 3,
-          "line": 58
+          "line": 59
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.reloadAfterResume",
         "start": {
           "column": 21,
-          "line": 55
+          "line": 56
         }
       },
       {
         "defaultMessage": "!!!Minimize Ferdi to system tray",
         "end": {
           "column": 3,
-          "line": 62
+          "line": 63
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.minimizeToSystemTray",
         "start": {
           "column": 24,
-          "line": 59
+          "line": 60
         }
       },
       {
         "defaultMessage": "!!!Close Ferdi to system tray",
         "end": {
           "column": 3,
-          "line": 66
+          "line": 67
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.closeToSystemTray",
         "start": {
           "column": 21,
-          "line": 63
+          "line": 64
         }
       },
       {
         "defaultMessage": "!!!Don't show message content in notifications",
         "end": {
           "column": 3,
-          "line": 70
+          "line": 71
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.privateNotifications",
         "start": {
           "column": 24,
-          "line": 67
+          "line": 68
         }
       },
       {
         "defaultMessage": "!!!Don't show notifications for clipboard events",
         "end": {
           "column": 3,
-          "line": 74
+          "line": 75
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.clipboardNotifications",
         "start": {
           "column": 26,
-          "line": 71
+          "line": 72
         }
       },
       {
         "defaultMessage": "!!!Notify TaskBar/Dock on new message",
         "end": {
           "column": 3,
-          "line": 78
+          "line": 79
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.notifyTaskBarOnMessage",
         "start": {
           "column": 26,
-          "line": 75
+          "line": 76
         }
       },
       {
         "defaultMessage": "!!!Navigation bar behaviour",
         "end": {
           "column": 3,
-          "line": 82
+          "line": 83
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.navigationBarBehaviour",
         "start": {
           "column": 26,
-          "line": 79
+          "line": 80
         }
       },
       {
         "defaultMessage": "!!!Search engine",
         "end": {
           "column": 3,
-          "line": 86
+          "line": 87
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.searchEngine",
         "start": {
           "column": 16,
-          "line": 83
+          "line": 84
         }
       },
       {
         "defaultMessage": "!!!Send telemetry data",
         "end": {
           "column": 3,
-          "line": 90
+          "line": 91
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.sentry",
         "start": {
           "column": 10,
-          "line": 87
+          "line": 88
         }
       },
       {
-        "defaultMessage": "!!!Enable service hibernation",
+        "defaultMessage": "!!!Keep services in hibernation on startup",
         "end": {
           "column": 3,
-          "line": 94
+          "line": 95
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.hibernate",
+        "id": "settings.app.form.hibernateOnStartup",
         "start": {
-          "column": 13,
-          "line": 91
+          "column": 22,
+          "line": 92
         }
       },
       {
-        "defaultMessage": "!!!Keep services in hibernation on startup",
+        "defaultMessage": "!!!Hibernation strategy",
         "end": {
           "column": 3,
-          "line": 98
+          "line": 99
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.hibernateOnStartup",
+        "id": "settings.app.form.hibernationStrategy",
         "start": {
-          "column": 22,
-          "line": 95
+          "column": 23,
+          "line": 96
         }
       },
       {
-        "defaultMessage": "!!!Hibernation strategy",
+        "defaultMessage": "!!!Wake up strategy",
         "end": {
           "column": 3,
-          "line": 102
+          "line": 103
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.hibernationStrategy",
+        "id": "settings.app.form.wakeUpStrategy",
         "start": {
-          "column": 23,
-          "line": 99
+          "column": 18,
+          "line": 100
         }
       },
       {
         "defaultMessage": "!!!Todo Server",
         "end": {
           "column": 3,
-          "line": 106
+          "line": 107
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.predefinedTodoServer",
         "start": {
           "column": 24,
-          "line": 103
+          "line": 104
         }
       },
       {
         "defaultMessage": "!!!Custom TodoServer",
         "end": {
           "column": 3,
-          "line": 110
+          "line": 111
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.customTodoServer",
         "start": {
           "column": 20,
-          "line": 107
+          "line": 108
         }
       },
       {
         "defaultMessage": "!!!Enable Password Lock",
         "end": {
           "column": 3,
-          "line": 114
+          "line": 115
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableLock",
         "start": {
           "column": 14,
-          "line": 111
+          "line": 112
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 118
+          "line": 119
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.lockPassword",
         "start": {
           "column": 16,
-          "line": 115
+          "line": 116
         }
       },
       {
         "defaultMessage": "!!!Allow using Touch ID to unlock",
         "end": {
           "column": 3,
-          "line": 122
+          "line": 123
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.useTouchIdToUnlock",
         "start": {
           "column": 22,
-          "line": 119
+          "line": 120
         }
       },
       {
         "defaultMessage": "!!!Lock after inactivity",
         "end": {
           "column": 3,
-          "line": 126
+          "line": 127
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.inactivityLock",
         "start": {
           "column": 18,
-          "line": 123
+          "line": 124
         }
       },
       {
         "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
         "end": {
           "column": 3,
-          "line": 130
+          "line": 131
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDEnabled",
         "start": {
           "column": 23,
-          "line": 127
+          "line": 128
         }
       },
       {
         "defaultMessage": "!!!From",
         "end": {
           "column": 3,
-          "line": 134
+          "line": 135
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDStart",
         "start": {
           "column": 21,
-          "line": 131
+          "line": 132
         }
       },
       {
         "defaultMessage": "!!!To",
         "end": {
           "column": 3,
-          "line": 138
+          "line": 139
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDEnd",
         "start": {
           "column": 19,
-          "line": 135
+          "line": 136
         }
       },
       {
         "defaultMessage": "!!!Language",
         "end": {
           "column": 3,
-          "line": 142
+          "line": 143
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.language",
         "start": {
           "column": 12,
-          "line": 139
+          "line": 140
         }
       },
       {
         "defaultMessage": "!!!Dark Mode",
         "end": {
           "column": 3,
-          "line": 146
+          "line": 147
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.darkMode",
         "start": {
           "column": 12,
-          "line": 143
+          "line": 144
         }
       },
       {
         "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
         "end": {
           "column": 3,
-          "line": 150
+          "line": 151
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.adaptableDarkMode",
         "start": {
           "column": 21,
-          "line": 147
+          "line": 148
         }
       },
       {
         "defaultMessage": "!!!Enable universal Dark Mode",
         "end": {
           "column": 3,
-          "line": 154
+          "line": 155
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.universalDarkMode",
         "start": {
           "column": 21,
-          "line": 151
+          "line": 152
         }
       },
       {
         "defaultMessage": "!!!Sidebar width",
         "end": {
           "column": 3,
-          "line": 158
+          "line": 159
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.serviceRibbonWidth",
         "start": {
           "column": 22,
-          "line": 155
+          "line": 156
         }
       },
       {
         "defaultMessage": "!!!Service icon size",
         "end": {
           "column": 3,
-          "line": 162
+          "line": 163
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.iconSize",
         "start": {
           "column": 12,
-          "line": 159
+          "line": 160
         }
       },
       {
         "defaultMessage": "!!!Use vertical style",
         "end": {
           "column": 3,
-          "line": 166
+          "line": 167
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.useVerticalStyle",
         "start": {
           "column": 20,
-          "line": 163
+          "line": 164
         }
       },
       {
         "defaultMessage": "!!!Always show workspace drawer",
         "end": {
           "column": 3,
-          "line": 170
+          "line": 171
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.alwaysShowWorkspaces",
         "start": {
           "column": 24,
-          "line": 167
+          "line": 168
         }
       },
       {
         "defaultMessage": "!!!Accent color",
         "end": {
           "column": 3,
-          "line": 174
+          "line": 175
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.accentColor",
         "start": {
           "column": 15,
-          "line": 171
+          "line": 172
         }
       },
       {
         "defaultMessage": "!!!Display disabled services tabs",
         "end": {
           "column": 3,
-          "line": 178
+          "line": 179
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDisabledServices",
         "start": {
           "column": 24,
-          "line": 175
+          "line": 176
         }
       },
       {
         "defaultMessage": "!!!Show unread message badge when notifications are disabled",
         "end": {
           "column": 3,
-          "line": 182
+          "line": 183
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showMessagesBadgesWhenMuted",
         "start": {
           "column": 29,
-          "line": 179
+          "line": 180
         }
       },
       {
         "defaultMessage": "!!!Show draggable area on window",
         "end": {
           "column": 3,
-          "line": 186
+          "line": 187
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDragArea",
         "start": {
           "column": 16,
-          "line": 183
+          "line": 184
         }
       },
       {
         "defaultMessage": "!!!Enable spell checking",
         "end": {
           "column": 3,
-          "line": 190
+          "line": 191
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableSpellchecking",
         "start": {
           "column": 23,
-          "line": 187
+          "line": 188
         }
       },
       {
         "defaultMessage": "!!!Enable GPU Acceleration",
         "end": {
           "column": 3,
-          "line": 194
+          "line": 195
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableGPUAcceleration",
         "start": {
           "column": 25,
-          "line": 191
+          "line": 192
         }
       },
       {
         "defaultMessage": "!!!Include beta versions",
         "end": {
           "column": 3,
-          "line": 198
+          "line": 199
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.beta",
         "start": {
           "column": 8,
-          "line": 195
+          "line": 196
         }
       },
       {
         "defaultMessage": "!!!Enable updates",
         "end": {
           "column": 3,
-          "line": 202
+          "line": 203
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.automaticUpdates",
         "start": {
           "column": 20,
-          "line": 199
+          "line": 200
         }
       },
       {
         "defaultMessage": "!!!Enable Franz Todos",
         "end": {
           "column": 3,
-          "line": 206
+          "line": 207
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableTodos",
         "start": {
           "column": 15,
-          "line": 203
+          "line": 204
         }
       },
       {
         "defaultMessage": "!!!Keep all workspaces loaded",
         "end": {
           "column": 3,
-          "line": 210
+          "line": 211
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.keepAllWorkspacesLoaded",
         "start": {
           "column": 27,
-          "line": 207
+          "line": 208
         }
       }
     ],
@@ -5719,76 +4959,6 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Please purchase license to skip waiting",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/features/delayApp/Component.js",
-        "id": "feature.delayApp.headline",
-        "start": {
-          "column": 12,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Get the free Franz Professional 14 day trial and skip the line",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/features/delayApp/Component.js",
-        "id": "feature.delayApp.trial.headline",
-        "start": {
-          "column": 17,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade Franz",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/features/delayApp/Component.js",
-        "id": "feature.delayApp.upgrade.action",
-        "start": {
-          "column": 10,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/features/delayApp/Component.js",
-        "id": "feature.delayApp.trial.action",
-        "start": {
-          "column": 15,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Ferdi will continue in {seconds} seconds.",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/features/delayApp/Component.js",
-        "id": "feature.delayApp.text",
-        "start": {
-          "column": 8,
-          "line": 32
-        }
-      }
-    ],
-    "path": "src/features/delayApp/Component.json"
-  },
-  {
-    "descriptors": [
-      {
         "defaultMessage": "!!!Nightly Builds",
         "end": {
           "column": 3,
@@ -5846,299 +5016,6 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!per month",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/features/planSelection/components/PlanItem.js",
-        "id": "subscription.interval.perMonth",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!per month & user",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/features/planSelection/components/PlanItem.js",
-        "id": "subscription.interval.perMonthPerUser",
-        "start": {
-          "column": 19,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Best value",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/features/planSelection/components/PlanItem.js",
-        "id": "subscription.bestValue",
-        "start": {
-          "column": 13,
-          "line": 23
-        }
-      }
-    ],
-    "path": "src/features/planSelection/components/PlanItem.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Are you ready to choose, {name}",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.fullscreen.welcome",
-        "start": {
-          "column": 11,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!It's time to make a choice. Franz works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.fullscreen.subheadline",
-        "start": {
-          "column": 15,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Basic functionality",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.free.text",
-        "start": {
-          "column": 12,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!More services, no waiting - ideal for personal use.",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.personal.text",
-        "start": {
-          "column": 16,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Unlimited services and professional features for you - and your team.",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.pro.text",
-        "start": {
-          "column": 20,
-          "line": 33
-        }
-      },
-      {
-        "defaultMessage": "!!!Stay on Free",
-        "end": {
-          "column": 3,
-          "line": 40
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.cta.stayOnFree",
-        "start": {
-          "column": 17,
-          "line": 37
-        }
-      },
-      {
-        "defaultMessage": "!!!Downgrade to Free",
-        "end": {
-          "column": 3,
-          "line": 44
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.cta.ctaDowngradeFree",
-        "start": {
-          "column": 20,
-          "line": 41
-        }
-      },
-      {
-        "defaultMessage": "!!!Start my free 14-days Trial",
-        "end": {
-          "column": 3,
-          "line": 48
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.cta.trial",
-        "start": {
-          "column": 15,
-          "line": 45
-        }
-      },
-      {
-        "defaultMessage": "!!!Choose Personal",
-        "end": {
-          "column": 3,
-          "line": 52
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.cta.upgradePersonal",
-        "start": {
-          "column": 23,
-          "line": 49
-        }
-      },
-      {
-        "defaultMessage": "!!!Choose Professional",
-        "end": {
-          "column": 3,
-          "line": 56
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.cta.upgradePro",
-        "start": {
-          "column": 18,
-          "line": 53
-        }
-      },
-      {
-        "defaultMessage": "!!!Complete comparison of all plans",
-        "end": {
-          "column": 3,
-          "line": 60
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.fullFeatureList",
-        "start": {
-          "column": 19,
-          "line": 57
-        }
-      },
-      {
-        "defaultMessage": "!!!All prices based on yearly payment",
-        "end": {
-          "column": 3,
-          "line": 64
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.pricesBasedOnAnnualPayment",
-        "start": {
-          "column": 30,
-          "line": 61
-        }
-      }
-    ],
-    "path": "src/features/planSelection/components/PlanSelection.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!per {interval}",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/features/planSelection/components/PlanTeaser.js",
-        "id": "subscription.interval.per",
-        "start": {
-          "column": 7,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade Account",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/features/planSelection/components/PlanTeaser.js",
-        "id": "subscription.planItem.upgradeAccount",
-        "start": {
-          "column": 7,
-          "line": 20
-        }
-      }
-    ],
-    "path": "src/features/planSelection/components/PlanTeaser.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Downgrade your Franz Plan",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
-        "id": "feature.planSelection.fullscreen.dialog.title",
-        "start": {
-          "column": 15,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
-        "id": "feature.planSelection.fullscreen.dialog.message",
-        "start": {
-          "column": 17,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Downgrade to Free",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
-        "id": "feature.planSelection.fullscreen.dialog.cta.downgrade",
-        "start": {
-          "column": 22,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Choose Personal",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
-        "id": "feature.planSelection.fullscreen.dialog.cta.upgrade",
-        "start": {
-          "column": 20,
-          "line": 27
-        }
-      }
-    ],
-    "path": "src/features/planSelection/containers/PlanSelectionScreen.json"
-  },
-  {
-    "descriptors": [
-      {
         "defaultMessage": "!!!Publish debug information",
         "end": {
           "column": 3,
@@ -6349,55 +5226,6 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Changes in Franz {version}",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/features/serviceLimit/components/AnnouncementScreen.js",
-        "id": "feature.announcements.changelog.headline",
-        "start": {
-          "column": 12,
-          "line": 20
-        }
-      }
-    ],
-    "path": "src/features/serviceLimit/components/AnnouncementScreen.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!You have added {amount} of {limit} services. Please upgrade your account to add more services.",
-        "end": {
-          "column": 3,
-          "line": 12
-        },
-        "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
-        "id": "feature.serviceLimit.limitReached",
-        "start": {
-          "column": 16,
-          "line": 9
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade account",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
-        "id": "premiumFeature.button.upgradeAccount",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      }
-    ],
-    "path": "src/features/serviceLimit/components/LimitReachedInfobox.json"
-  },
-  {
-    "descriptors": [
-      {
         "defaultMessage": "!!!Ferdi is better together!",
         "end": {
           "column": 3,
@@ -6463,7 +5291,7 @@
         }
       },
       {
-        "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+        "defaultMessage": "!!! I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
         "end": {
           "column": 3,
           "line": 40
@@ -6476,7 +5304,7 @@
         }
       },
       {
-        "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger",
+        "defaultMessage": "!!! I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger",
         "end": {
           "column": 3,
           "line": 44
@@ -6494,213 +5322,68 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Franz Todos are available to premium users now!",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/features/todos/components/TodosWebview.js",
-        "id": "feature.todos.premium.info",
-        "start": {
-          "column": 15,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade Account",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/features/todos/components/TodosWebview.js",
-        "id": "feature.todos.premium.upgrade",
-        "start": {
-          "column": 14,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!Everyone else will have to wait a little longer.",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/features/todos/components/TodosWebview.js",
-        "id": "feature.todos.premium.rollout",
-        "start": {
-          "column": 15,
-          "line": 39
-        }
-      }
-    ],
-    "path": "src/features/todos/components/TodosWebview.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Your Free Franz {plan} Trial ends in {time}.",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/features/trialStatusBar/components/TrialStatusBar.js",
-        "id": "feature.trialStatusBar.restTime",
-        "start": {
-          "column": 12,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Your free Franz {plan} Trial has expired, please upgrade your account.",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/trialStatusBar/components/TrialStatusBar.js",
-        "id": "feature.trialStatusBar.expired",
-        "start": {
-          "column": 11,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade now",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/trialStatusBar/components/TrialStatusBar.js",
-        "id": "feature.trialStatusBar.cta",
-        "start": {
-          "column": 7,
-          "line": 21
-        }
-      }
-    ],
-    "path": "src/features/trialStatusBar/components/TrialStatusBar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Downgrade your Franz Plan",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/features/trialStatusBar/containers/TrialStatusBarScreen.js",
-        "id": "feature.trialStatusBar.fullscreen.dialog.title",
-        "start": {
-          "column": 15,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/features/trialStatusBar/containers/TrialStatusBarScreen.js",
-        "id": "feature.trialStatusBar.fullscreen.dialog.message",
-        "start": {
-          "column": 17,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Downgrade to Free",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/features/trialStatusBar/containers/TrialStatusBarScreen.js",
-        "id": "feature.trialStatusBar.fullscreen.dialog.cta.downgrade",
-        "start": {
-          "column": 22,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Choose Personal",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/features/trialStatusBar/containers/TrialStatusBarScreen.js",
-        "id": "feature.trialStatusBar.fullscreen.dialog.cta.upgrade",
-        "start": {
-          "column": 20,
-          "line": 28
-        }
-      }
-    ],
-    "path": "src/features/trialStatusBar/containers/TrialStatusBarScreen.json"
-  },
-  {
-    "descriptors": [
-      {
         "defaultMessage": "!!!Home",
         "end": {
           "column": 3,
-          "line": 16
+          "line": 20
         },
         "file": "src/features/webControls/components/WebControls.js",
         "id": "webControls.goHome",
         "start": {
           "column": 10,
-          "line": 13
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!Open in Browser",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 24
         },
         "file": "src/features/webControls/components/WebControls.js",
         "id": "webControls.openInBrowser",
         "start": {
           "column": 17,
-          "line": 17
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Back",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 28
         },
         "file": "src/features/webControls/components/WebControls.js",
         "id": "webControls.back",
         "start": {
           "column": 8,
-          "line": 21
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!Forward",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 32
         },
         "file": "src/features/webControls/components/WebControls.js",
         "id": "webControls.forward",
         "start": {
           "column": 11,
-          "line": 25
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Reload",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 36
         },
         "file": "src/features/webControls/components/WebControls.js",
         "id": "webControls.reload",
         "start": {
           "column": 10,
-          "line": 29
+          "line": 33
         }
       }
     ],
@@ -6865,104 +5548,65 @@
         "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 19
+          "line": 18
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.headline",
         "start": {
           "column": 12,
-          "line": 16
+          "line": 15
         }
       },
       {
         "defaultMessage": "!!!All services",
         "end": {
           "column": 3,
-          "line": 23
+          "line": 22
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.allServices",
         "start": {
           "column": 15,
-          "line": 20
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Workspaces settings",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 26
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.workspacesSettingsTooltip",
         "start": {
           "column": 29,
-          "line": 24
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Info about workspace feature",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 30
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.workspaceFeatureInfo",
         "start": {
           "column": 24,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Create your first workspace",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.premiumCtaButtonLabel",
-        "start": {
-          "column": 25,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Reactivate premium account",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.reactivatePremiumAccountLabel",
-        "start": {
-          "column": 28,
-          "line": 36
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!add new workspace",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 34
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.addNewWorkspaceLabel",
         "start": {
           "column": 24,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Premium feature",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.proFeatureBadge",
-        "start": {
-          "column": 23,
-          "line": 44
+          "line": 31
         }
       }
     ],
@@ -7005,104 +5649,104 @@
         "defaultMessage": "!!!Your workspaces",
         "end": {
           "column": 3,
-          "line": 23
+          "line": 20
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.headline",
         "start": {
           "column": 12,
-          "line": 20
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!You haven't created any workspaces yet.",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 24
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.noWorkspacesAdded",
         "start": {
           "column": 19,
-          "line": 24
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Could not load your workspaces",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 28
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.workspacesRequestFailed",
         "start": {
           "column": 27,
-          "line": 28
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!Try again",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 32
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.tryReloadWorkspaces",
         "start": {
           "column": 23,
-          "line": 32
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Your changes have been saved",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 36
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.updatedInfo",
         "start": {
           "column": 15,
-          "line": 36
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Workspace has been deleted",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 40
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.deletedInfo",
         "start": {
           "column": 15,
-          "line": 40
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!Info about workspace feature",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 44
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.workspaceFeatureInfo",
         "start": {
           "column": 24,
-          "line": 44
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!Less is More: Introducing Ferdi Workspaces",
         "end": {
           "column": 3,
-          "line": 51
+          "line": 48
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.workspaceFeatureHeadline",
         "start": {
           "column": 28,
-          "line": 48
+          "line": 45
         }
       }
     ],
@@ -7129,146 +5773,6 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Professional",
-        "end": {
-          "column": 3,
-          "line": 8
-        },
-        "file": "src/helpers/plan-helpers.js",
-        "id": "pricing.plan.pro",
-        "start": {
-          "column": 15,
-          "line": 5
-        }
-      },
-      {
-        "defaultMessage": "!!!Personal",
-        "end": {
-          "column": 3,
-          "line": 12
-        },
-        "file": "src/helpers/plan-helpers.js",
-        "id": "pricing.plan.personal",
-        "start": {
-          "column": 20,
-          "line": 9
-        }
-      },
-      {
-        "defaultMessage": "!!!Free",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/helpers/plan-helpers.js",
-        "id": "pricing.plan.free",
-        "start": {
-          "column": 16,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Premium",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/helpers/plan-helpers.js",
-        "id": "pricing.plan.legacy",
-        "start": {
-          "column": 18,
-          "line": 17
-        }
-      }
-    ],
-    "path": "src/helpers/plan-helpers.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Franz Professional Yearly",
-        "end": {
-          "column": 3,
-          "line": 8
-        },
-        "file": "src/helpers/pricing-helpers.js",
-        "id": "pricing.plan.pro-yearly",
-        "start": {
-          "column": 22,
-          "line": 5
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz Professional Monthly",
-        "end": {
-          "column": 3,
-          "line": 12
-        },
-        "file": "src/helpers/pricing-helpers.js",
-        "id": "pricing.plan.pro-monthly",
-        "start": {
-          "column": 23,
-          "line": 9
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz Personal Yearly",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/helpers/pricing-helpers.js",
-        "id": "pricing.plan.personal-yearly",
-        "start": {
-          "column": 27,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz Personal Monthly",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/helpers/pricing-helpers.js",
-        "id": "pricing.plan.personal-monthly",
-        "start": {
-          "column": 28,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz Free",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/helpers/pricing-helpers.js",
-        "id": "pricing.plan.free",
-        "start": {
-          "column": 16,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz Premium",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/helpers/pricing-helpers.js",
-        "id": "pricing.plan.legacy",
-        "start": {
-          "column": 18,
-          "line": 25
-        }
-      }
-    ],
-    "path": "src/helpers/pricing-helpers.json"
-  },
-  {
-    "descriptors": [
-      {
         "defaultMessage": "!!!Field is required",
         "end": {
           "column": 3,
@@ -7441,19 +5945,6 @@
           "column": 17,
           "line": 32
         }
-      },
-      {
-        "defaultMessage": "!!!Franz Professional Required",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.franzProRequired",
-        "start": {
-          "column": 15,
-          "line": 36
-        }
       }
     ],
     "path": "src/i18n/globalMessages.json"
@@ -7464,962 +5955,949 @@
         "defaultMessage": "!!!Edit",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 23
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit",
         "start": {
           "column": 8,
-          "line": 19
+          "line": 20
         }
       },
       {
         "defaultMessage": "!!!Undo",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 27
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.undo",
         "start": {
           "column": 8,
-          "line": 23
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Redo",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 31
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.redo",
         "start": {
           "column": 8,
-          "line": 27
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Cut",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 35
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.cut",
         "start": {
           "column": 7,
-          "line": 31
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!Copy",
         "end": {
           "column": 3,
-          "line": 38
+          "line": 39
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.copy",
         "start": {
           "column": 8,
-          "line": 35
+          "line": 36
         }
       },
       {
         "defaultMessage": "!!!Paste",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 43
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.paste",
         "start": {
           "column": 9,
-          "line": 39
+          "line": 40
         }
       },
       {
         "defaultMessage": "!!!Paste And Match Style",
         "end": {
           "column": 3,
-          "line": 46
+          "line": 47
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.pasteAndMatchStyle",
         "start": {
           "column": 22,
-          "line": 43
+          "line": 44
         }
       },
       {
         "defaultMessage": "!!!Delete",
         "end": {
           "column": 3,
-          "line": 50
+          "line": 51
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.delete",
         "start": {
           "column": 10,
-          "line": 47
+          "line": 48
         }
       },
       {
         "defaultMessage": "!!!Select All",
         "end": {
           "column": 3,
-          "line": 54
+          "line": 55
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.selectAll",
         "start": {
           "column": 13,
-          "line": 51
+          "line": 52
         }
       },
       {
         "defaultMessage": "!!!Find in Page",
         "end": {
           "column": 3,
-          "line": 58
+          "line": 59
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.findInPage",
         "start": {
           "column": 14,
-          "line": 55
+          "line": 56
         }
       },
       {
         "defaultMessage": "!!!Speech",
         "end": {
           "column": 3,
-          "line": 62
+          "line": 63
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.speech",
         "start": {
           "column": 10,
-          "line": 59
+          "line": 60
         }
       },
       {
         "defaultMessage": "!!!Start Speaking",
         "end": {
           "column": 3,
-          "line": 66
+          "line": 67
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startSpeaking",
         "start": {
           "column": 17,
-          "line": 63
+          "line": 64
         }
       },
       {
         "defaultMessage": "!!!Stop Speaking",
         "end": {
           "column": 3,
-          "line": 70
+          "line": 71
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.stopSpeaking",
         "start": {
           "column": 16,
-          "line": 67
+          "line": 68
         }
       },
       {
         "defaultMessage": "!!!Start Dictation",
         "end": {
           "column": 3,
-          "line": 74
+          "line": 75
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startDictation",
         "start": {
           "column": 18,
-          "line": 71
+          "line": 72
         }
       },
       {
         "defaultMessage": "!!!Emoji & Symbols",
         "end": {
           "column": 3,
-          "line": 78
+          "line": 79
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.emojiSymbols",
         "start": {
           "column": 16,
-          "line": 75
+          "line": 76
         }
       },
       {
         "defaultMessage": "!!!Open Quick Switch",
         "end": {
           "column": 3,
-          "line": 82
+          "line": 83
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.openQuickSwitch",
         "start": {
           "column": 19,
-          "line": 79
+          "line": 80
         }
       },
       {
         "defaultMessage": "!!!Back",
         "end": {
           "column": 3,
-          "line": 86
+          "line": 87
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.back",
         "start": {
           "column": 8,
-          "line": 83
+          "line": 84
         }
       },
       {
         "defaultMessage": "!!!Forward",
         "end": {
           "column": 3,
-          "line": 90
+          "line": 91
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.forward",
         "start": {
           "column": 11,
-          "line": 87
+          "line": 88
         }
       },
       {
         "defaultMessage": "!!!Actual Size",
         "end": {
           "column": 3,
-          "line": 94
+          "line": 95
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.resetZoom",
         "start": {
           "column": 13,
-          "line": 91
+          "line": 92
         }
       },
       {
         "defaultMessage": "!!!Zoom In",
         "end": {
           "column": 3,
-          "line": 98
+          "line": 99
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.zoomIn",
         "start": {
           "column": 10,
-          "line": 95
+          "line": 96
         }
       },
       {
         "defaultMessage": "!!!Zoom Out",
         "end": {
           "column": 3,
-          "line": 102
+          "line": 103
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.zoomOut",
         "start": {
           "column": 11,
-          "line": 99
-        }
-      },
-      {
-        "defaultMessage": "!!!Enter Full Screen",
-        "end": {
-          "column": 3,
-          "line": 106
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.enterFullScreen",
-        "start": {
-          "column": 19,
-          "line": 103
-        }
-      },
-      {
-        "defaultMessage": "!!!Exit Full Screen",
-        "end": {
-          "column": 3,
-          "line": 110
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.exitFullScreen",
-        "start": {
-          "column": 18,
-          "line": 107
+          "line": 100
         }
       },
       {
         "defaultMessage": "!!!Toggle Full Screen",
         "end": {
           "column": 3,
-          "line": 114
+          "line": 107
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleFullScreen",
         "start": {
           "column": 20,
-          "line": 111
+          "line": 104
         }
       },
       {
         "defaultMessage": "!!!Toggle Dark Mode",
         "end": {
           "column": 3,
-          "line": 118
+          "line": 111
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleDarkMode",
         "start": {
           "column": 18,
-          "line": 115
+          "line": 108
         }
       },
       {
         "defaultMessage": "!!!Toggle Developer Tools",
         "end": {
           "column": 3,
-          "line": 122
+          "line": 115
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleDevTools",
         "start": {
           "column": 18,
-          "line": 119
+          "line": 112
         }
       },
       {
         "defaultMessage": "!!!Toggle Todos Developer Tools",
         "end": {
           "column": 3,
-          "line": 126
+          "line": 119
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleTodosDevTools",
         "start": {
           "column": 23,
-          "line": 123
+          "line": 116
         }
       },
       {
         "defaultMessage": "!!!Toggle Service Developer Tools",
         "end": {
           "column": 3,
-          "line": 130
+          "line": 123
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleServiceDevTools",
         "start": {
           "column": 25,
-          "line": 127
+          "line": 120
         }
       },
       {
         "defaultMessage": "!!!Reload Service",
         "end": {
           "column": 3,
-          "line": 134
+          "line": 127
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadService",
         "start": {
           "column": 17,
-          "line": 131
+          "line": 124
         }
       },
       {
         "defaultMessage": "!!!Reload Ferdi",
         "end": {
           "column": 3,
-          "line": 138
+          "line": 131
         },
         "file": "src/lib/Menu.js",
-        "id": "menu.view.reloadFranz",
+        "id": "menu.view.reloadFerdi",
         "start": {
           "column": 15,
-          "line": 135
+          "line": 128
         }
       },
       {
         "defaultMessage": "!!!Lock Ferdi",
         "end": {
           "column": 3,
-          "line": 142
+          "line": 135
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.lockFerdi",
         "start": {
           "column": 13,
-          "line": 139
+          "line": 132
         }
       },
       {
         "defaultMessage": "!!!Reload ToDos",
         "end": {
           "column": 3,
-          "line": 146
+          "line": 139
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadTodos",
         "start": {
           "column": 15,
-          "line": 143
+          "line": 136
         }
       },
       {
         "defaultMessage": "!!!Minimize",
         "end": {
           "column": 3,
-          "line": 150
+          "line": 143
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.minimize",
         "start": {
           "column": 12,
-          "line": 147
+          "line": 140
         }
       },
       {
         "defaultMessage": "!!!Close",
         "end": {
           "column": 3,
-          "line": 154
+          "line": 147
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.close",
         "start": {
           "column": 9,
-          "line": 151
+          "line": 144
         }
       },
       {
         "defaultMessage": "!!!Learn More",
         "end": {
           "column": 3,
-          "line": 158
+          "line": 151
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.learnMore",
         "start": {
           "column": 13,
-          "line": 155
+          "line": 148
         }
       },
       {
         "defaultMessage": "!!!Changelog",
         "end": {
           "column": 3,
-          "line": 162
+          "line": 155
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.changelog",
         "start": {
           "column": 13,
+          "line": 152
+        }
+      },
+      {
+        "defaultMessage": "!!!Import/Export Configuration Data",
+        "end": {
+          "column": 3,
           "line": 159
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.help.importExportData",
+        "start": {
+          "column": 20,
+          "line": 156
         }
       },
       {
         "defaultMessage": "!!!Support",
         "end": {
           "column": 3,
-          "line": 166
+          "line": 163
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.support",
         "start": {
           "column": 11,
-          "line": 163
+          "line": 160
         }
       },
       {
         "defaultMessage": "!!!Copy Debug Information",
         "end": {
           "column": 3,
-          "line": 170
+          "line": 167
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfo",
         "start": {
           "column": 13,
-          "line": 167
+          "line": 164
         }
       },
       {
         "defaultMessage": "!!!Publish Debug Information",
         "end": {
           "column": 3,
-          "line": 174
+          "line": 171
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.publishDebugInfo",
         "start": {
           "column": 20,
-          "line": 171
+          "line": 168
         }
       },
       {
         "defaultMessage": "!!!Ferdi Debug Information",
         "end": {
           "column": 3,
-          "line": 178
+          "line": 175
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfoCopiedHeadline",
         "start": {
           "column": 27,
-          "line": 175
+          "line": 172
         }
       },
       {
         "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
         "end": {
           "column": 3,
-          "line": 182
+          "line": 179
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfoCopiedBody",
         "start": {
           "column": 23,
-          "line": 179
+          "line": 176
         }
       },
       {
         "defaultMessage": "!!!Unlock with Touch ID",
         "end": {
           "column": 3,
-          "line": 186
+          "line": 183
         },
         "file": "src/lib/Menu.js",
         "id": "locked.touchId",
         "start": {
           "column": 11,
-          "line": 183
+          "line": 180
         }
       },
       {
         "defaultMessage": "!!!unlock via Touch ID",
         "end": {
           "column": 3,
-          "line": 190
+          "line": 187
         },
         "file": "src/lib/Menu.js",
         "id": "locked.touchIdPrompt",
         "start": {
           "column": 17,
-          "line": 187
+          "line": 184
         }
       },
       {
         "defaultMessage": "!!!Terms of Service",
         "end": {
           "column": 3,
-          "line": 194
+          "line": 191
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.tos",
         "start": {
           "column": 7,
-          "line": 191
+          "line": 188
         }
       },
       {
         "defaultMessage": "!!!Privacy Statement",
         "end": {
           "column": 3,
-          "line": 198
+          "line": 195
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.privacy",
         "start": {
           "column": 11,
-          "line": 195
+          "line": 192
         }
       },
       {
         "defaultMessage": "!!!File",
         "end": {
           "column": 3,
-          "line": 202
+          "line": 199
         },
         "file": "src/lib/Menu.js",
         "id": "menu.file",
         "start": {
           "column": 8,
-          "line": 199
+          "line": 196
         }
       },
       {
         "defaultMessage": "!!!View",
         "end": {
           "column": 3,
-          "line": 206
+          "line": 203
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view",
         "start": {
           "column": 8,
-          "line": 203
+          "line": 200
         }
       },
       {
         "defaultMessage": "!!!Services",
         "end": {
           "column": 3,
-          "line": 210
+          "line": 207
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services",
         "start": {
           "column": 12,
-          "line": 207
+          "line": 204
         }
       },
       {
         "defaultMessage": "!!!Window",
         "end": {
           "column": 3,
-          "line": 214
+          "line": 211
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window",
         "start": {
           "column": 10,
-          "line": 211
+          "line": 208
         }
       },
       {
         "defaultMessage": "!!!Help",
         "end": {
           "column": 3,
-          "line": 218
+          "line": 215
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help",
         "start": {
           "column": 8,
-          "line": 215
+          "line": 212
         }
       },
       {
         "defaultMessage": "!!!About Ferdi",
         "end": {
           "column": 3,
-          "line": 222
+          "line": 219
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.about",
         "start": {
           "column": 9,
-          "line": 219
+          "line": 216
         }
       },
       {
         "defaultMessage": "!!!What's new?",
         "end": {
           "column": 3,
-          "line": 226
+          "line": 223
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.announcement",
         "start": {
           "column": 16,
-          "line": 223
+          "line": 220
         }
       },
       {
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 230
+          "line": 227
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.settings",
         "start": {
           "column": 12,
-          "line": 227
+          "line": 224
         }
       },
       {
         "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
-          "line": 234
+          "line": 231
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.checkForUpdates",
         "start": {
           "column": 19,
-          "line": 231
+          "line": 228
         }
       },
       {
         "defaultMessage": "!!!Hide",
         "end": {
           "column": 3,
-          "line": 238
+          "line": 235
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hide",
         "start": {
           "column": 8,
-          "line": 235
+          "line": 232
         }
       },
       {
         "defaultMessage": "!!!Hide Others",
         "end": {
           "column": 3,
-          "line": 242
+          "line": 239
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hideOthers",
         "start": {
           "column": 14,
-          "line": 239
+          "line": 236
         }
       },
       {
         "defaultMessage": "!!!Unhide",
         "end": {
           "column": 3,
-          "line": 246
+          "line": 243
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.unhide",
         "start": {
           "column": 10,
-          "line": 243
+          "line": 240
         }
       },
       {
         "defaultMessage": "!!!Auto-hide menu bar",
         "end": {
           "column": 3,
-          "line": 250
+          "line": 247
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.autohideMenuBar",
         "start": {
           "column": 19,
-          "line": 247
+          "line": 244
         }
       },
       {
         "defaultMessage": "!!!Quit",
         "end": {
           "column": 3,
-          "line": 254
+          "line": 251
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.quit",
         "start": {
           "column": 8,
-          "line": 251
+          "line": 248
         }
       },
       {
         "defaultMessage": "!!!Add New Service...",
         "end": {
           "column": 3,
-          "line": 258
+          "line": 255
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.addNewService",
         "start": {
           "column": 17,
-          "line": 255
+          "line": 252
         }
       },
       {
         "defaultMessage": "!!!Add New Workspace...",
         "end": {
           "column": 3,
-          "line": 262
+          "line": 259
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.addNewWorkspace",
         "start": {
           "column": 19,
-          "line": 259
+          "line": 256
         }
       },
       {
         "defaultMessage": "!!!Open workspace drawer",
         "end": {
           "column": 3,
-          "line": 266
+          "line": 263
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.openWorkspaceDrawer",
         "start": {
           "column": 23,
-          "line": 263
+          "line": 260
         }
       },
       {
         "defaultMessage": "!!!Close workspace drawer",
         "end": {
           "column": 3,
-          "line": 270
+          "line": 267
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.closeWorkspaceDrawer",
         "start": {
           "column": 24,
-          "line": 267
+          "line": 264
         }
       },
       {
         "defaultMessage": "!!!Activate next service...",
         "end": {
           "column": 3,
-          "line": 274
+          "line": 271
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.setNextServiceActive",
         "start": {
           "column": 23,
-          "line": 271
+          "line": 268
         }
       },
       {
         "defaultMessage": "!!!Activate previous service...",
         "end": {
           "column": 3,
-          "line": 278
+          "line": 275
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.activatePreviousService",
         "start": {
           "column": 27,
-          "line": 275
+          "line": 272
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 282
+          "line": 279
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 11,
-          "line": 279
+          "line": 276
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 286
+          "line": 283
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 13,
-          "line": 283
+          "line": 280
         }
       },
       {
         "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 290
+          "line": 287
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces",
         "start": {
           "column": 14,
-          "line": 287
+          "line": 284
         }
       },
       {
         "defaultMessage": "!!!Default",
         "end": {
           "column": 3,
-          "line": 294
+          "line": 291
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.defaultWorkspace",
         "start": {
           "column": 20,
-          "line": 291
+          "line": 288
         }
       },
       {
         "defaultMessage": "!!!Todos",
         "end": {
           "column": 3,
-          "line": 298
+          "line": 295
         },
         "file": "src/lib/Menu.js",
         "id": "menu.todos",
         "start": {
           "column": 9,
-          "line": 295
+          "line": 292
         }
       },
       {
         "defaultMessage": "!!!Open Todos drawer",
         "end": {
           "column": 3,
-          "line": 302
+          "line": 299
         },
         "file": "src/lib/Menu.js",
         "id": "menu.Todoss.openTodosDrawer",
         "start": {
           "column": 19,
-          "line": 299
+          "line": 296
         }
       },
       {
         "defaultMessage": "!!!Close Todos drawer",
         "end": {
           "column": 3,
-          "line": 306
+          "line": 303
         },
         "file": "src/lib/Menu.js",
         "id": "menu.Todoss.closeTodosDrawer",
         "start": {
           "column": 20,
-          "line": 303
+          "line": 300
         }
       },
       {
         "defaultMessage": "!!!Enable Todos",
         "end": {
           "column": 3,
-          "line": 310
+          "line": 307
         },
         "file": "src/lib/Menu.js",
         "id": "menu.todos.enableTodos",
         "start": {
           "column": 15,
-          "line": 307
+          "line": 304
         }
       },
       {
         "defaultMessage": "!!!Home",
         "end": {
           "column": 3,
-          "line": 314
+          "line": 311
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.goHome",
         "start": {
           "column": 17,
-          "line": 311
+          "line": 308
         }
       }
     ],
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index b2a6f5d2d..a0f0e5fa6 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Ωχ όχι! Ο Ferdi έχασε την επικοινωνία με το",
   "feature.announcements.changelog.headline": "Αλλαγές σχετικά με το Ferdi",
   "feature.debugger.title": "Εγγραφή πληροφοριών εντοπισμού σφαλμάτων",
-  "feature.delayApp.headline": "Παρακαλούμε αγοράστε μία άδεια Ferdi για να παραλείψετε την αναμονή",
-  "feature.delayApp.text": "Ferdi θα συνεχίσει σε {seconds} δευτερόλεπτα.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Αγοράστε μία άδεια Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Αναβαθμίστε τον λογαριασμό σας ",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "Ακύρωση",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Send as email",
   "feature.shareFranz.action.facebook": "Share on Facebook",
   "feature.shareFranz.action.twitter": "Share on Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Δεν είναι δυνατή η σύνδεση με τις ζωντανές υπηρεσίες του Ferdi",
-  "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "Έχετε αποσυνδεθεί από το Διαδίκτυο",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Εισαγάγετε τις υπηρεσίες σας Ferdi 4",
@@ -88,7 +52,6 @@
   "infobar.hide": "Απόκρυψη",
   "infobar.requiredRequestsFailed": "Δεν ήταν δυνατή η φόρτωση υπηρεσιών και πληροφοριών χρηστών",
   "infobar.servicesUpdated": "Οι υπηρεσίες σας έχουν ενημερωθεί.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "Υπάρχει διαθέσιμη μια νέα ενημέρωση για τον Ferdi.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Έλεγχος για ενημερώσεις",
   "menu.app.hide": "Απόκρυψη",
-  "menu.app.hideOthers": "Απόκρυψη των άλλων",
-  "menu.app.quit": "Έξοδος",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Ρυθμίσεις",
-  "menu.app.unhide": "Εμφάνιση",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Επεξεργασία",
-  "menu.edit.copy": "Αντιγραφή",
-  "menu.edit.cut": "Αποκοπή",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Διαγραφή",
   "menu.edit.emojiSymbols": "Emoji & Σύμβολα",
   "menu.edit.findInPage": "Find in Page",
-  "menu.edit.paste": "Επικόλληση",
-  "menu.edit.pasteAndMatchStyle": "Επικόλληση και διατήρηση μορφοποίησης",
-  "menu.edit.redo": "Ακύρωση αναίρεσης",
-  "menu.edit.selectAll": "Επιλογή Όλων",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Ομιλία",
   "menu.edit.startDictation": "Έναρξη φωνητικής πληκτρολόγησης",
   "menu.edit.startSpeaking": "Έναρξη εκφώνησης",
   "menu.edit.stopSpeaking": "Σταμάτημα εκφώνησης",
-  "menu.edit.undo": "Αναίρεση",
+  "menu.edit.undo": "Undo",
   "menu.file": "Αρχείο",
-  "menu.help": "Βοήθεια",
+  "menu.help": "Help",
   "menu.help.changelog": "Πρόσφατες αλλαγές",
   "menu.help.debugInfo": "Copy Debug Information",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Μάθετε περισσότερα",
   "menu.help.privacy": "Δήλωση απορρήτου",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Προβολή",
   "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Πλήρης Οθόνη",
-  "menu.view.exitFullScreen": "Έξοδος από πλήρη οθόνη",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Ανανέωση Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Ανανέωση Υπηρεσίας",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Πραγματικό μέγεθος",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Άνοιγμα Εργαλειοθήκη Προγραμματιστών",
-  "menu.view.toggleFullScreen": "Λειτουργία πλήρους οθόνης",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Λειτουργεία Υπηρεσίασ Εργαλειοθήκης Προγραμματιστών",
   "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
-  "menu.view.zoomIn": "Μεγέθυνση",
-  "menu.view.zoomOut": "Σμίκρυνση",
-  "menu.window": "Παράθυρο",
-  "menu.window.close": "Κλείσιμο",
-  "menu.window.minimize": "Ελαχιστοποίηση",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Workspaces",
   "menu.workspaces.addNewWorkspace": "Add New Workspace...",
   "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
@@ -194,11 +156,7 @@
   "password.noUser": "Δεν βρέθηκε χρήστης με τη συγκεκριμένη διεύθυνση ηλεκτρονικού ταχυδρομείου",
   "password.submit.label": "Υποβολή",
   "password.successInfo": "Ελέγξτε το email σας",
-  "premiumFeature.button.upgradeAccount": "Αναβαθμίστε τον λογαριασμό σας ",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Επαναφόρτωση {name}",
   "service.crashHandler.autoReload": "Γίνεται προσπάθεια αυτόματης ανάκτησης του {name} σε {seconds} δευτερόλεπτα",
   "service.crashHandler.headline": "Ω, όχι!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Ω, όχι!",
   "service.errorHandler.message": "Σφάλμα",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Ξεκινήστε",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Καλώς ορίσατε στον Ferdi",
   "settings.account.account.editButton": "Επεξεργασία λογαριασμού",
-  "settings.account.accountType.basic": "Βασικός λογαριασμός",
-  "settings.account.accountType.premium": "Λογαριασμός Premium Υποστηρικτή",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Ενημέρωση προφίλ",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Τιμολόγια",
   "settings.account.headlinePassword": "Αλλαγή κωδικού πρόσβασης",
   "settings.account.headlineProfile": "Ενημέρωση προφίλ",
-  "settings.account.headlineSubscription": "Η συνδρομή σας",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Λήψη",
-  "settings.account.manageSubscription.label": "Διαχείριση της συνδρομής σας",
   "settings.account.successInfo": "Οι αλλαγές σας έχουν αποθηκευτεί",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Δοκιμάστε ξανά",
   "settings.account.tryReloadUserInfoRequest": "Δοκιμάστε ξανά",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Δεν ήταν δυνατή η φόρτωση πληροφοριών χρήστη",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Ενεργοποίηση ορθογραφικού ελέγχου",
   "settings.app.form.enableSystemTray": "Εμφάνιση του Ferdi στη γραμμή ειδοποιήσεων",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Ρυθμίσεις",
   "settings.app.headlineAdvanced": "Για προχωρημένους",
   "settings.app.headlineAppearance": "Εμφάνιση",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Οι αλλαγές απαιτούν επανεκκίνηση",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Λανθάνουσα μνήμη",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Διαθέσιμες υπηρεσίες",
   "settings.recipes.missingService": "Λείπει κάποια υπηρεσία;",
-  "settings.recipes.mostPopular": "Τα πιο δημοφιλή",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Η υπηρεσία προστέθηκε με επιτυχία",
   "settings.searchService": "Αναζήτηση υπηρεσίας",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Προσθήκη {name}",
   "settings.service.form.availableServices": "Διαθέσιμες υπηρεσίες",
   "settings.service.form.customUrl": "Προσαρμοσμένος διακομιστής",
-  "settings.service.form.customUrlPremiumInfo": "Για να προσθέσετε υπηρεσίες που φιλοξενούνται μόνος σας, χρειάζεστε έναν λογαριασμό υποστήριξης Premium Ferdi.",
-  "settings.service.form.customUrlUpgradeAccount": "Αναβάθμιση του λογαριασμού σας",
   "settings.service.form.customUrlValidationError": "Δεν ήταν δυνατή η επικύρωση του προσαρμοσμένου διακομιστή {name}.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Ομάδα",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Εταιρεία",
   "settings.user.form.accountType.individual": "Ατομικός",
   "settings.user.form.accountType.label": "Τύπος λογαριασμού",
@@ -516,29 +431,20 @@
   "signup.link.login": "Έχετε ήδη λογαριασμό? Συνδεθείτε.",
   "signup.password.label": "Password",
   "signup.submit.label": "Δημιουργία λογαριασμού",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Ακύρωση",
-  "subscriptionPopup.buttonDone": "Έγινε",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Διαγραφή υπηρεσίας",
   "tabs.item.disableAudio": "Απενεργοποίηση ήχου",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Απενεργοποίηση ειδοποιήσεων",
   "tabs.item.disableService": "Απενεργοποίηση υπηρεσίας",
   "tabs.item.edit": "Επεξεργασία",
   "tabs.item.enableAudio": "Ενεργοποίηση ήχου",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Ενεργοποίηση ειδοποιήσεων",
   "tabs.item.enableService": "Ενεργοποίηση υπηρεσίας",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Επαναφόρτωση",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} δεν είναι έγκυρο",
   "validation.minLength": "{field} πρέπει να είναι τουλάχιστον {length} χαρακτήρες",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index ab2be014b..002ea5655 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "Cancel",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Send as email",
   "feature.shareFranz.action.facebook": "Share on Facebook",
   "feature.shareFranz.action.twitter": "Share on Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Import your Ferdi 4 services",
@@ -88,7 +52,6 @@
   "infobar.hide": "Hide",
   "infobar.requiredRequestsFailed": "Could not load services and user information",
   "infobar.servicesUpdated": "Your services have been updated.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "A new update for Ferdi is available.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Email address",
@@ -149,6 +112,7 @@
   "menu.help.debugInfo": "Copy Debug Information",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Learn More",
   "menu.help.privacy": "Privacy Statement",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,12 +127,10 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "View",
   "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Enter Full Screen",
-  "menu.view.exitFullScreen": "Exit Full Screen",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.reloadTodos": "Reload ToDos",
   "menu.view.resetZoom": "Actual Size",
@@ -194,11 +156,7 @@
   "password.noUser": "No user with that email address was found",
   "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Welcome to Ferdi",
   "settings.account.account.editButton": "Edit account",
-  "settings.account.accountType.basic": "Basic Account",
-  "settings.account.accountType.premium": "Premium Supporter Account",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Invoices",
   "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Update profile",
-  "settings.account.headlineSubscription": "Your subscription",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.manageSubscription.label": "Manage your subscription",
   "settings.account.successInfo": "Your changes have been saved",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Try again",
   "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Could not load user information",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Available services",
   "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
   "settings.searchService": "Search service",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Add {name}",
   "settings.service.form.availableServices": "Available services",
   "settings.service.form.customUrl": "Custom server",
-  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
   "settings.user.form.accountType.label": "Account type",
@@ -516,29 +431,20 @@
   "signup.link.login": "Already have an account, sign in?",
   "signup.password.label": "Password",
   "signup.submit.label": "Create account",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Cancel",
-  "subscriptionPopup.buttonDone": "Done",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Disable audio",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
   "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Reload",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} is not valid",
   "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 6959a3a78..3c617ab5e 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "¡Oh no! Ferdi perdió la conexión con {name}.",
   "feature.announcements.changelog.headline": "Cambios en Ferdi {version}",
   "feature.debugger.title": "Publica la información de depuración",
-  "feature.delayApp.headline": "Por favor compra una Licencia de Soporte de Ferdi para evitar la espera",
-  "feature.delayApp.text": "Ferdi continuará en {seconds} segundos.",
-  "feature.delayApp.trial.action": "Si! Quiero probar Ferdi Profesional por 14 días, gratis!",
-  "feature.delayApp.trial.actionShort": "Activar el período de prueba de Ferdi Profesional",
-  "feature.delayApp.trial.headline": "Empieza el periodo de prueba de Ferdi Profesional por 14 días y cruza la linea.",
-  "feature.delayApp.upgrade.action": "Consigue una Licencia de Soporte de Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Consigue una mejora para tu cuenta",
   "feature.nightlyBuilds.activate": "Activar",
   "feature.nightlyBuilds.cancel": "Cancelar",
   "feature.nightlyBuilds.info": "Las \"Nightly builds\" son versiones altamente experimentales de Ferdi que pueden contener características sin pulir o sin completar. Estas versiones son utilizadas principalmente por los desarrolladores para probar sus nuevas características desarrolladas y cómo se comportarán en la versión final. Si no sabe lo que está haciendo, le sugerimos que no active las estas versiones.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "Hubo un error al intentar publicar la información de depuración. Por favor, inténtalo de nuevo más tarde o revisa la consola para más información.",
   "feature.publishDebugInfo.info": "Publicar tu información de depuración nos ayuda a encontrar problemas y errores en Ferdi. Al publicar tu información de depuración aceptas la política de privacidad y las condiciones de servicio de Ferdi Debuggger",
   "feature.publishDebugInfo.privacy": "Política de Privacidad",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Puede seleccionar un servicio usando TAB, ↑ y ↓. Puede abrir servicio usando ENTER.",
   "feature.quickSwitch.search": "Buscar...",
   "feature.quickSwitch.title": "Cambiar rápidamente",
-  "feature.serviceLimit.limitReached": "Has agregado {amount} servicio mas que los {limit} servicios permitidos en tu plan. Por favor mejora tu cuenta para agregar mas servicios.",
   "feature.shareFranz.action.email": "Enviar como correo",
   "feature.shareFranz.action.facebook": "Compartir en Facebook",
   "feature.shareFranz.action.twitter": "Compartir en Twitter",
@@ -57,26 +33,14 @@
   "feature.shareFranz.shareText.email": "¡He añadido {count} servicios a Ferdi! Obtén la aplicación gratuita para WhatsApp, Messenger, Slack, Skype en www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "He agregado {count} servicios a Ferdi! Obtené la aplicación gratuita de WhatsApp, Messenger, Slack, Skype y co en www.getferdi.com/cc @FerdiMessenger",
   "feature.shareFranz.text": "Dile a tus amigos y colegas lo asombroso que es Ferdi y ayúdanos a correr la voz.",
-  "feature.todos.premium.info": "Todos de Ferdi está disponible para usuarios premium ahora!",
-  "feature.todos.premium.rollout": "El resto de los usuarios deberán esperar un poco más de tiempo.",
-  "feature.todos.premium.upgrade": "Actualizar cuenta",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "No es posible conectarse a los servicios en línea de Ferdi.",
-  "global.franzProRequired": "Se requiere una cuenta Ferdi Profesional",
   "global.notConnectedToTheInternet": "No estás conectado a Internet",
   "global.spellchecker.useDefault": "Utilizar estándar del sistema ({default})",
   "global.spellchecking.autodetect": "Detectar el idioma automáticamente",
   "global.spellchecking.autodetect.short": "Automático",
   "global.spellchecking.language": "Corrector de ortografía",
-  "global.upgradeButton.upgradeToPro": "Actualiza a Ferdi Profesional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
-  "global.userAgentPref": "User Agent",
+  "global.userAgentPref": "Navegador",
   "import.headline": "Importa tus servicios de Ferdi 4",
   "import.notSupportedHeadline": "Servicios aún no admitidos en Ferdi 5",
   "import.skip.label": "Quiero agregar servicios manualmente",
@@ -88,9 +52,8 @@
   "infobar.hide": "Ocultar",
   "infobar.requiredRequestsFailed": "No se han podido cargar los servicios ni la información de usuario",
   "infobar.servicesUpdated": "Tus servicios han sido actualizados.",
-  "infobar.trialActivated": "Tu periodo de prueba ha sido activado exitosamente. Que disfrutes tus mensajes!",
   "infobar.updateAvailable": "Una nueva actualización de Ferdi está disponible",
-  "infobox.dismiss": "Dismiss",
+  "infobox.dismiss": "Descargar",
   "invite.email.label": "Dirección de correo electrónico",
   "invite.headline.friends": "Invita a 3 de tus amigos o compañeros",
   "invite.name.label": "Nombre",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Auto-ocultar barra de menú",
   "menu.app.checkForUpdates": "Comprobar actualizaciones",
   "menu.app.hide": "Ocultar",
-  "menu.app.hideOthers": "Ocultar otros",
-  "menu.app.quit": "Salir",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Configuración",
-  "menu.app.unhide": "Mostrar",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Editar",
-  "menu.edit.copy": "Copiar",
-  "menu.edit.cut": "Cortar",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Borrar",
   "menu.edit.emojiSymbols": "Emoji y Símbolos",
   "menu.edit.findInPage": "Buscar en la página",
-  "menu.edit.paste": "Pegar",
-  "menu.edit.pasteAndMatchStyle": "Pegar con el mismo estilo",
-  "menu.edit.redo": "Rehacer",
-  "menu.edit.selectAll": "Seleccionar todo",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Leer",
   "menu.edit.startDictation": "Empezar dictado",
   "menu.edit.startSpeaking": "Empezar lectura",
   "menu.edit.stopSpeaking": "Detener lectura",
-  "menu.edit.undo": "Deshacer",
+  "menu.edit.undo": "Undo",
   "menu.file": "Archivo",
-  "menu.help": "Ayuda",
+  "menu.help": "Help",
   "menu.help.changelog": "Registro de cambios",
   "menu.help.debugInfo": "Copiar información de depuración",
   "menu.help.debugInfoCopiedBody": "Tu información de depuración ha sido copiada a tu portapapeles",
   "menu.help.debugInfoCopiedHeadline": "Información de depurador de Ferdi",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Conocer más",
   "menu.help.privacy": "Declaración de privacidad",
   "menu.help.publishDebugInfo": "Escribir información de depuración",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Habilitar Tareas pendientes",
   "menu.view": "Mostrar",
   "menu.view.back": "Volver",
-  "menu.view.enterFullScreen": "Pasar a pantalla completa",
-  "menu.view.exitFullScreen": "Salir de Pantalla Completa",
   "menu.view.forward": "Siguiente",
   "menu.view.lockFerdi": "Bloquear Ferdi",
   "menu.view.openQuickSwitch": "Abrir Cambio Rápido",
-  "menu.view.reloadFranz": "Recargar Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Recargar Servicio",
   "menu.view.reloadTodos": "Recargar Pendientes",
-  "menu.view.resetZoom": "Tamaño Actual",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Cambiar a modo oscuro",
   "menu.view.toggleDevTools": "Activar las Herramientas para Desarrolladores",
-  "menu.view.toggleFullScreen": "Cambiar a Pantalla Completa",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Mostrar Herramientas de Servicios para Desarrolladores",
   "menu.view.toggleTodosDevTools": "Tareas pendientes: Herramientas para desarrolladores",
-  "menu.view.zoomIn": "Ampliar",
-  "menu.view.zoomOut": "Reducir",
-  "menu.window": "Ventana",
-  "menu.window.close": "Cerrar",
-  "menu.window.minimize": "Minimizar",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Espacios de trabajo",
   "menu.workspaces.addNewWorkspace": "Añadir nuevo espacio de trabajo...",
   "menu.workspaces.closeWorkspaceDrawer": "Cerrar cajón de espacio de trabajo",
@@ -194,11 +156,7 @@
   "password.noUser": "No se encontró un usuario con esa dirección de correo electrónico",
   "password.submit.label": "Enviar",
   "password.successInfo": "Por favor revisa tu correo electrónico",
-  "premiumFeature.button.upgradeAccount": "Consigue una mejora para tu cuenta",
   "pricing.features.accountSync": "Sincronización de cuenta",
-  "pricing.features.adFree": "Sin anuncios para siempre!",
-  "pricing.features.appDelays": "Sin pantallas de espera",
-  "pricing.features.appDelaysEnabled": "Pantallas Ocasionales de Espera",
   "pricing.features.customWebsites": "Agregue sitios personalizados",
   "pricing.features.desktopNotifications": "Notificaciones de escritorio",
   "pricing.features.onPremise": "En sitio y otros servicios alojados",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Administración de Equipo",
   "pricing.features.thirdPartyServices": "Instalar servicios de terceros",
   "pricing.features.unlimitedServices": "Agregar servicios ilimitados",
-  "pricing.features.upToSixServices": "Añadir hasta 6 servicios",
-  "pricing.features.upToThreeServices": "Añadir hasta 3 servicios",
   "pricing.features.workspaces": "Espacios de trabajo",
-  "pricing.plan.free": "Ferdi gratis",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Profesional",
-  "pricing.plan.personal-monthly": "Ferdi Personal Mensual",
-  "pricing.plan.personal-yearly": "Ferdi Personal Anual",
-  "pricing.plan.pro": "Ferdi Profesional",
-  "pricing.plan.pro-monthly": "Ferdi Profesional Mensual",
-  "pricing.plan.pro-yearly": "Ferdi Profesional Anual",
-  "pricing.trial.cta.accept": "Si, actualizar mi cuenta a Ferdi Profesional",
-  "pricing.trial.cta.skip": "Continuar a Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Disculpe, no pudimos activar su prueba!",
-  "pricing.trial.features.headline": "Ferdi Profesional incluye:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Su prueba gratis finaliza automáticamente después de 14 días",
-  "pricing.trial.terms.headline": "Sin condiciones",
-  "pricing.trial.terms.noCreditCard": "No necesita tarjeta de crédito",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Recargar {name}",
   "service.crashHandler.autoReload": "Intentando recuperar automáticamente {name} en {seconds} segundos",
   "service.crashHandler.headline": "¡Oh, no!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "¡Oh, no!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} ha fallado la carga",
-  "service.restrictedHandler.action": "Actualizar cuenta",
-  "service.restrictedHandler.customUrl.headline": "Necesita el Plan Ferdi Profesional",
-  "service.restrictedHandler.customUrl.text": "Por favor suscribase al Plan Ferdi Profesional para utilizar urls personalizadas y servicios auto alojados.",
-  "service.restrictedHandler.serviceLimit.headline": "Ha llegado al límite del servicio.",
-  "service.restrictedHandler.serviceLimit.text": "Por favor mejore su cuenta para poder utilizar más de {count} servicios.",
   "service.webviewLoader.loading": "Cargando {service}",
   "services.getStarted": "Primeros pasos",
   "services.login": "Iniciar sesión para usar Ferdi.",
-  "services.serverInfo": "Opcionalmente, puede cambiar su servidor Ferdi pulsando en el icono de la esquina inferior izquierda.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Usar Ferdi sin una cuenta",
   "services.welcome": "Bienvenido a Ferdi",
   "settings.account.account.editButton": "Editar cuenta",
-  "settings.account.accountType.basic": "Cuenta Básica",
-  "settings.account.accountType.premium": "Cuenta Colaborador Premium",
   "settings.account.accountUnavailable": "La cuenta no está disponible",
   "settings.account.accountUnavailableInfo": "Estás usando Ferdi sin una cuenta. Si desea utilizar Ferdi con una cuenta y así mantener sus servicios sincronizados entre instalaciones, debe seleccionar un servidor en la Configuración e iniciar sesión.",
   "settings.account.buttonSave": "Actualizar perfil",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Facturas",
   "settings.account.headlinePassword": "Cambiar contraseña",
   "settings.account.headlineProfile": "Actualizar perfil",
-  "settings.account.headlineSubscription": "Tu suscripción",
-  "settings.account.headlineTrialUpgrade": "Consiga 14 días de prueba gratis de Ferdi Profesional ",
-  "settings.account.headlineUpgradeAccount": "Mejore su cuenta y reciba la experiencia completa de Ferdi",
-  "settings.account.invoiceDownload": "Descargar",
-  "settings.account.manageSubscription.label": "Administra tu suscripción",
   "settings.account.successInfo": "Tus cambios han sido guardados",
-  "settings.account.trial": "Prueba Gratis",
-  "settings.account.trialEndsIn": "Su prueba gratis finaliza en {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Por favor actualice su información de facturación para continuar utilizando {license} luego del periodo de prueba.",
   "settings.account.tryReloadServices": "Intentar de nuevo",
   "settings.account.tryReloadUserInfoRequest": "Intentar de nuevo",
-  "settings.account.upgradeToPro.label": "Actualiza a Ferdi Profesional",
   "settings.account.userInfoRequestFailed": "No se pudo cargar la información de usuario",
   "settings.account.yourLicense": "Su Licencia Ferdi",
   "settings.app.accentColorInfo": "Escribe tu color de acento en un formato compatible con CSS. (Predeterminado: {defaultAccentColor})",
@@ -298,17 +217,16 @@
   "settings.app.form.autoLaunchOnStart": "Iniciar Ferdi al iniciar",
   "settings.app.form.automaticUpdates": "Activar actualizaciones",
   "settings.app.form.beta": "Incluir versiones beta",
-  "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
+  "settings.app.form.clipboardNotifications": "Dejar de mostrar notificaciones acerca del portapapeles",
   "settings.app.form.closeToSystemTray": "Cerrar Ferdi a la barra de tareas",
   "settings.app.form.customTodoServer": "Servidor de Todo personalizado",
   "settings.app.form.darkMode": "Activar tema oscuro",
   "settings.app.form.enableGPUAcceleration": "Habilitar aceleración de GPU",
   "settings.app.form.enableLock": "Activar bloqueo por contraseña",
-  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
+  "settings.app.form.enableMenuBar": "Mostrar a Ferdi en la barra de menús",
   "settings.app.form.enableSpellchecking": "Activar corrección ortográfica",
   "settings.app.form.enableSystemTray": "Mostrar Ferdi en la bandeja del sistema",
   "settings.app.form.enableTodos": "Activar Ferdi Todos",
-  "settings.app.form.hibernate": "Habilitar hibernación del servicio",
   "settings.app.form.hibernateOnStartup": "Mantener los servicios en hibernación al iniciar",
   "settings.app.form.hibernationStrategy": "Estrategia de hibernación",
   "settings.app.form.iconSize": "Tamaño del icono del servicio",
@@ -327,7 +245,7 @@
   "settings.app.form.scheduledDNDEnabled": "Activar programación \"No molestar\"",
   "settings.app.form.scheduledDNDEnd": "A",
   "settings.app.form.scheduledDNDStart": "De",
-  "settings.app.form.searchEngine": "Search engine",
+  "settings.app.form.searchEngine": "Motor de búsqueda",
   "settings.app.form.sentry": "Enviar datos de telemetría",
   "settings.app.form.serviceRibbonWidth": "Ancho de Barra Lateral",
   "settings.app.form.showDisabledServices": "Mostrar pestañas de servicios desactivados",
@@ -337,23 +255,24 @@
   "settings.app.form.universalDarkMode": "Activar modo oscuro universal",
   "settings.app.form.useTouchIdToUnlock": "Permitir usar TouchID para desbloquear Ferdi",
   "settings.app.form.useVerticalStyle": "Usar estilo vertical",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Configuración",
   "settings.app.headlineAdvanced": "Avanzado",
   "settings.app.headlineAppearance": "Apariencia",
   "settings.app.headlineGeneral": "General",
   "settings.app.headlineLanguage": "Idioma",
-  "settings.app.headlinePrivacy": "Privacy",
+  "settings.app.headlinePrivacy": "Privacidad",
   "settings.app.headlineUpdates": "Actualizaciones",
   "settings.app.hibernateInfo": "Por defecto, Ferdi mantendrá todos sus servicios abiertos y cargados en segundo plano para que estén listos cuando los necesite. La hibernación del servicio desactivará los mismos tras el tiempo especificado. Esto es útil para ahorrar RAM y evitar que los servicios ralentizen su sistema.",
   "settings.app.inactivityLockInfo": "Minutos de inactividad, tras los cuales Ferdi debe bloquear automáticamente. Utilice 0 para desactivar",
   "settings.app.languageDisclaimer": "Las traducciones oficiales son en inglés y alemán. Todos los demás idiomas son traducciones basadas en la comunidad.",
-  "settings.app.lockInfo": "El bloqueo de contraseña le permite mantener los mensajes protegidos.\nSi activa el bloqueo de contraseña, se le pedirá introducirla cada vez que inicie o bloquee Ferdi usando el símbolo de la esquina inferior izquierda o bien el acceso directo CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Contraseña",
   "settings.app.lockedPasswordInfo": "Por favor, asegúrese de recordar la contraseña que establezca.\nSi la perdiera u olvidara, tendría que reinstalar Ferdi.",
   "settings.app.restartRequired": "Los cambios requieren reiniciar",
   "settings.app.scheduledDNDInfo": "El \"No molestar\" programado permite definir un período de tiempo en el que no recibir notificaciones de Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Horas en formato 24 horas. La hora de finalización puede ser anterior a la hora de inicio (por ejemplo, inicio 17:00, final 09:00) para habilitar No molestar la noche.",
-  "settings.app.sentryInfo": "El envío de datos de telemetría nos permite encontrar errores en Ferdi - no enviaremos ninguna información personal como sus datos de mensaje! Cambiar esta opción requiere reiniciar Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi utiliza el corrector ortográfico incluido en su Mac. Si desea cambiar los lenguajes que el corrector ortográfico revisa, lo puede hacer en las Preferencias del Sistema de su Mac.",
   "settings.app.subheadlineCache": "Caché",
   "settings.app.todoServerInfo": "Este servidor se utilizará para la función \"Ferdi Todo\".",
@@ -381,8 +300,7 @@
   "settings.recipes.customService.openFolder": "Abrir carpeta",
   "settings.recipes.headline": "Servicios disponibles",
   "settings.recipes.missingService": "¿Echas de menos algún servicio?",
-  "settings.recipes.mostPopular": "Más populares",
-  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
+  "settings.recipes.nothingFound": "Lo sentimos, pero no pudimos encontrar ningún servicio similar a tu búsqueda, sin embargo: puedes agregarlo utilizando la opción de \"Sitio web personalizado\". \nRecuerda que pueden aparecer más servicios de los que has agregado a Ferdi desde la versión que estás utilizando. Para poder utilizar los nuevos servicios disponibles, considera actualizar a la versión más reciente.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Servicio añadido con éxito",
   "settings.searchService": "Buscar servicio",
   "settings.service.error.goBack": "Volver a los servicios",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Añadir {name}",
   "settings.service.form.availableServices": "Servicios disponibles",
   "settings.service.form.customUrl": "Servidor personalizado",
-  "settings.service.form.customUrlPremiumInfo": "Para añadir tus propios servicios, necesitas una Cuenta Colaborador Premium de Ferdi.",
-  "settings.service.form.customUrlUpgradeAccount": "Mejora tu cuenta",
   "settings.service.form.customUrlValidationError": "No se pudo validar el servidor personalizado {name}.",
   "settings.service.form.darkReaderBrightness": "Brillo del Lector Oscuro",
   "settings.service.form.darkReaderContrast": "Contraste del Lector Oscuro",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Administración de Equipo",
   "settings.team.copy": "La gestión de equipos de Franz's te permite administrar suscripciones de Franz para múltiples usuarios. Por favor, ten en cuenta que tener una suscripción a Franz Premium no te dará ninguna ventaja en el uso de Ferdi: la única razón por la que todavía tienes acceso a la Gestión de Equipos es para que puedas gestionar tus equipos de Franz y para que no pierdas ninguna funcionalidad en la gestión de tu cuenta.",
   "settings.team.headline": "Equipo",
-  "settings.team.intro": "Actualmente estás usando Franz Servers, por lo que tienes acceso a la Gestión de Equipos.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Administra tu equipo en meetfranz.com",
   "settings.team.teamsUnavailable": "Los equipos no están disponibles",
   "settings.team.teamsUnavailableInfo": "Los equipos están disponibles actualmente sólo cuando se utiliza el servidor Franz y después de pagar por Franz Professional. Por favor, cambie su servidor a https://api.franz)[video] .com para usar equipos.",
-  "settings.team.upgradeAction": "Actualiza tu cuenta",
   "settings.user.form.accountType.company": "Empresa",
   "settings.user.form.accountType.individual": "Individual",
   "settings.user.form.accountType.label": "Tipo de cuenta",
@@ -516,29 +431,20 @@
   "signup.link.login": "Ya tienes una cuenta, ¿Iniciar sesión?",
   "signup.password.label": "Contraseña",
   "signup.submit.label": "Crear cuenta",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "Ver todas las opciones",
-  "subscription.cta.choosePlan": "Elije tu plan",
-  "subscription.includedProFeatures": "El Plan Profesional de Ferdi incluye:",
-  "subscription.interval.per": "por {interval}",
-  "subscription.interval.perMonth": "al mes",
-  "subscription.interval.perMonthPerUser": "por mes y usuario",
-  "subscription.planItem.upgradeAccount": "Actualizar cuenta",
-  "subscription.teaser.includedFeatures": "Los planes de pago de Ferdi incluyen:",
-  "subscription.teaser.intro": "Ferdi 5 viene con una amplia gama de nuevas características para mejorar tu comunicación diaria - baterías incluidas. ¡Echa un vistazo a nuestros nuevos planes y descubra cuál le conviene más!",
-  "subscriptionPopup.buttonCancel": "Cancelar",
-  "subscriptionPopup.buttonDone": "Listo",
-  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
+  "tabs.item.confirmDeleteService": "¿Estás seguro que quieres elimiar el servicio de {serviceName}?",
   "tabs.item.deleteService": "Eliminar servicio",
   "tabs.item.disableAudio": "Desactivar sonido",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Desactivar notificaciones",
   "tabs.item.disableService": "Desactivar servicio",
   "tabs.item.edit": "Editar",
   "tabs.item.enableAudio": "Habilitar audio",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Activar notificaciones",
   "tabs.item.enableService": "Activar servicio",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Volver a cargar",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} no es válido",
   "validation.minLength": "{field} debería tener al menos {length} caracteres",
   "validation.oneRequired": "Al menos uno es requerido",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Espacios de trabajo",
   "workspaceDrawer.item.contextMenuEdit": "editar",
   "workspaceDrawer.item.noServicesAddedYet": "Ningún servicio ha sido añadido",
-  "workspaceDrawer.premiumCtaButtonLabel": "Crea tu primer área de trabajo",
-  "workspaceDrawer.proFeatureBadge": "Función Premium",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivar cuenta premium",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Los espacios de trabajo Ferdi permiten centrarse en lo que es importante. Configure diferentes conjuntos de servicios y cambie fácilmente entre ellos en cualquier momento. </p><p>Usted decide qué servicios necesita, cuándo y dónde, para que podamos ayudarte a mantenerte al tanto - o apartarte fácilmente del trabajo cuando asi lo desees.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Editar ajustes de áreas de trabajo",
   "workspaces.switchingIndicator.switchingTo": "Cambiando a"
diff --git a/src/i18n/locales/et.json b/src/i18n/locales/et.json
index 6709db455..62efbc5aa 100644
--- a/src/i18n/locales/et.json
+++ b/src/i18n/locales/et.json
@@ -5,30 +5,6 @@
   "connectionLostBanner.informationLink": "Mis juhtus?",
   "connectionLostBanner.message": "Oh ei! Ferdi kaotas ühenduse {name} teenusega.",
   "feature.announcements.changelog.headline": "Ferdi {versiooni} uuendused",
-  "feature.delayApp.headline": "Uuendage oma Ferdi'i tellimust, et ootamine vahele jätta",
-  "feature.delayApp.text": "Ferdi jätkab {seconds} sekundi pärast.",
-  "feature.delayApp.trial.action": "Jah, ma tahan Ferdi Professionali tasuta 14-päevast proovitellimust",
-  "feature.delayApp.trial.actionShort": "Aktiveerige tasuta Ferdi Professionali proovitellimus",
-  "feature.delayApp.trial.headline": "Hankige tasuta Ferdi Professionali 14-päevane proovitellimus ja saate ootamise vahele jätta",
-  "feature.delayApp.upgrade.action": "Uuendage Ferdi'it",
-  "feature.delayApp.upgrade.actionShort": "Uuendage oma kontot",
-  "feature.planSelection.cta.ctaDowngradeFree": "Minge tagasi tasuta tellimusele",
-  "feature.planSelection.cta.stayOnFree": "Jää tasuta tellimuse juurde",
-  "feature.planSelection.cta.trial": "Alustage minu tasuta 14-päevast proovitellimust",
-  "feature.planSelection.cta.upgradePersonal": "Valige Personal tellimus",
-  "feature.planSelection.cta.upgradePro": "Valige Professional tellimus",
-  "feature.planSelection.free.text": "Põhifunktsionaalsus",
-  "feature.planSelection.fullFeatureList": "Kõigi tellimuste täielik võrdlus",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Minge tagasi tasuta tellimusele",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Valige Personal tellimus",
-  "feature.planSelection.fullscreen.dialog.message": "Olete hakanud meie tasuta tellimusele tagasi minema. Olete ikka kindel? Selle asemel klõpsake siin, et saada rohkem teenuseid ja funktsioone vaid {currency} {price} eest kuus.",
-  "feature.planSelection.fullscreen.dialog.title": "Minge tagasi oma Ferdi'i tellimusele",
-  "feature.planSelection.fullscreen.subheadline": "On aeg teha valik. Ferdi töötab kõige paremini meie Personal ja Professional tellimustega. Vaadake palun ja valige endale sobiv.",
-  "feature.planSelection.fullscreen.welcome": "{name}, kas olete valmis valima?",
-  "feature.planSelection.personal.text": "Rohkem teenuseid, ilma ootamiseta - ideaalne isiklikuks kasutamiseks.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "Kõik hinnad põhinevad aastamaksel",
-  "feature.planSelection.pro.text": "Piiramatu teenus ja täiustatud funktsioonid teile ja teie meeskonnale.",
-  "feature.serviceLimit.limitReached": "Olete lisanud {amount} teenust, saadaolevast {limit} teenusest, mis on lubatud tellimuses. Teenuste lisamiseks täiendage oma kontot.",
   "feature.shareFranz.action.email": "Saadke e-kirjana",
   "feature.shareFranz.action.facebook": "Jagage Facebookis",
   "feature.shareFranz.action.twitter": "Jagage Twitteris",
@@ -36,16 +12,6 @@
   "feature.shareFranz.shareText.email": "Olen lisanud Ferdi'i {count} teenust! Hankige tasuta rakendus WhatsApp'ile, Messenger'ile, Slack'ile, Skype'ile ja muule veebiaadressilt www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "Olen lisanud Ferdi'i {count} teenust! Hankige tasuta rakendus WhatsApp'ile, Messenger'ile, Slack'ile, Skype'ile ja muule veebiaadressilt www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Rääkige oma sõpradele ja kolleegidele, kui vinge Ferdi on, ja aidake meil seda sõna levitada.",
-  "feature.todos.premium.info": "Ferdi'i ülesanded on nüüd saadaval tasulise tellimusega kasutajatele!",
-  "feature.todos.premium.rollout": "Kõigil teistel tuleb veidi kauem oodata.",
-  "feature.todos.premium.upgrade": "Uuendage oma kontot",
-  "feature.trialStatusBar.cta": "Uuendage nüüd",
-  "feature.trialStatusBar.expired": "Teie tasuta Ferdii {plan} proovitellimus on lõppenud, uuendage oma kontot.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Minge tagasi tasuta tellimusele",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Valige Personal tellimus",
-  "feature.trialStatusBar.fullscreen.dialog.message": "Olete hakanud meie tasuta tellimusele tagasi minema. Olete ikka kindel? Selle asemel klõpsake siin, et saada rohkem teenuseid ja funktsioone vaid {currency} {price} eest kuus.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Minge tagasi oma Ferdi'i tellimusele",
-  "feature.trialStatusBar.restTime": "Teie tasuta Ferdi'i {plan} proovtellimus lõpeb {time} pärast.",
   "global.api.unhealthy": "Ups! Ferdi'i võrguteenustega ei saa ühendust luua",
   "global.franzProRequired": "Vajalik Ferdi Professional tellimus",
   "global.notConnectedToTheInternet": "Teil pole Interneti-ühendust.",
@@ -53,7 +19,6 @@
   "global.spellchecking.autodetect": "Tuvastage keel automaatselt",
   "global.spellchecking.autodetect.short": "Automaatne",
   "global.spellchecking.language": "Õigekirja kontrollimise keel",
-  "global.upgradeButton.upgradeToPro": "Täiendage Ferdi Professional tellimusele",
   "import.headline": "Importige oma Ferdi 4 teenused",
   "import.notSupportedHeadline": "Teenused, mida Ferdi 5 veel ei toeta",
   "import.skip.label": "Soovin teenuseid käsitsi lisada",
@@ -63,7 +28,6 @@
   "infobar.buttonReloadServices": "Laadi teenused uuesti",
   "infobar.requiredRequestsFailed": "Teenuseid ja kasutajainfot ei õnnestunud laadida",
   "infobar.servicesUpdated": "Teie teenuseid on uuendatud.",
-  "infobar.trialActivated": "Teie proovitellimus oli edukalt aktiveeritud. Head sõnumineerimist!",
   "infobar.updateAvailable": "Ferdi'i jaoks on saadaval uus värskendus.",
   "invite.email.label": "E-posti aadress",
   "invite.headline.friends": "Kutsu oma 3 sõpra või kolleegi liituma",
@@ -122,9 +86,7 @@
   "menu.todos": "Ülesanded",
   "menu.todos.enableTodos": "Luba ülesanded",
   "menu.view": "Vaade",
-  "menu.view.enterFullScreen": "Kuva täisekraanil",
-  "menu.view.exitFullScreen": "Välju täisekraanilt",
-  "menu.view.reloadFranz": "Laadi Ferdi uuesti",
+  "menu.view.reloadFerdi": "Laadi Ferdi uuesti",
   "menu.view.reloadService": "Laadi teenus uuesti",
   "menu.view.reloadTodos": "Laadi ülesanded uuesti",
   "menu.view.resetZoom": "Tegelik suurus",
@@ -149,7 +111,6 @@
   "password.noUser": "Ühtegi selle e-posti aadressiga kasutajat ei leitud",
   "password.submit.label": "Saada",
   "password.successInfo": "Palun kontrollige oma e-posti aadressi",
-  "premiumFeature.button.upgradeAccount": "Konto täiendamine",
   "pricing.features.accountSync": "Konto sünkroonimine",
   "pricing.features.adFree": "Igavesti reklaamivaba",
   "pricing.features.appDelays": "Ootavaid ekraane pole",
@@ -166,27 +127,6 @@
   "pricing.features.upToSixServices": "Lisa kuni 6 teenust",
   "pricing.features.upToThreeServices": "Lisa kuni 3 teenust",
   "pricing.features.workspaces": "Tööruumid",
-  "pricing.plan.free": "Tasuta",
-  "pricing.plan.legacy": "Täiendatud",
-  "pricing.plan.personal": "Personal",
-  "pricing.plan.personal-monthly": "Personal kuumakse põhine",
-  "pricing.plan.personal-yearly": "Personal aastamakse põhine",
-  "pricing.plan.pro": "Professional",
-  "pricing.plan.pro-monthly": "Professional kuumakse põhine",
-  "pricing.plan.pro-yearly": "Professional aastamakse põhine",
-  "pricing.trial.cta.accept": "Alusta minu 14-päevast Ferdi'i proovitellimust",
-  "pricing.trial.cta.skip": "Edasi Ferdi'ini",
-  "pricing.trial.cta.start": "Alusta Ferdi'i kasutamist",
-  "pricing.trial.error": "Vabandust, me ei saanud teie proovitellimust aktiveerida!",
-  "pricing.trial.features.headline": "Ferdi Professional sisaldab:",
-  "pricing.trial.headline.pro": "Hei {name}, tere tulemast Ferdi'i",
-  "pricing.trial.intro.happyMessaging": "Head sõnumineerimist.",
-  "pricing.trial.intro.specialTreat": "Meil on teile spetsiaalne maiuspala.",
-  "pricing.trial.intro.tryPro": "Nautige täielikku Ferdi Professional'i kogemust 14 päeva jooksul täiesti tasuta.",
-  "pricing.trial.terms.automaticTrialEnd": "Teie tasuta proovitellimus lõpeb automaatselt 14 päeva pärast",
-  "pricing.trial.terms.headline": "Stringe pole lisatud",
-  "pricing.trial.terms.noCreditCard": "Krediitkaarti pole vaja",
-  "pricing.trial.terms.trialWorth": "Tasuta proovitellimus (tavaliselt {currency}{price} kuus)",
   "service.crashHandler.action": "Laadi {name} uuesti",
   "service.crashHandler.autoReload": "Püütakse {name} automaatselt taastada {seconds} sekundi jooksul",
   "service.crashHandler.headline": "Oh ei!",
@@ -198,11 +138,6 @@
   "service.errorHandler.headline": "Oh ei!",
   "service.errorHandler.message": "Tõrge",
   "service.errorHandler.text": "{name} laadimine nurjus.",
-  "service.restrictedHandler.action": "Uuendage oma kontot",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional tellimus on nõutav",
-  "service.restrictedHandler.customUrl.text": "Kohandatud URL-ide ja ise hostitud teenuste kasutamiseks minge üle Ferdi Professional'i tellimusele.",
-  "service.restrictedHandler.serviceLimit.headline": "Olete jõudnud oma maksimaalselt lubatud teenusete arvuni.",
-  "service.restrictedHandler.serviceLimit.text": "Palun täiendage oma kontot, et kasutada rohkem, kui {count} teenust.",
   "service.webviewLoader.loading": "Laadimine",
   "services.getStarted": "Alusta",
   "services.welcome": "Tere tulemast Ferdi'i",
@@ -219,18 +154,9 @@
   "settings.account.headlineInvoices": "Arved",
   "settings.account.headlinePassword": "Muuda salasõna",
   "settings.account.headlineProfile": "Profiili uuendamine",
-  "settings.account.headlineSubscription": "Teie tellimus",
-  "settings.account.headlineTrialUpgrade": "Hankige tasuta 14-päevane Ferdi'i proovitellimus",
-  "settings.account.headlineUpgradeAccount": "Täiendage oma kontot ja saate täieliku Ferdi'i kasutuskogemuse",
-  "settings.account.invoiceDownload": "Laadi alla",
-  "settings.account.manageSubscription.label": "Halda oma tellimust",
   "settings.account.successInfo": "Teie muudatused on salvestatud",
-  "settings.account.trial": "Tasuta proovitellimus",
-  "settings.account.trialEndsIn": "Teie tasuta prooviperiood lõpeb {duration} pärast.",
-  "settings.account.trialUpdateBillingInfo": "Palun uuendage oma arveldusteavet, et jätkata teenuse {license} kasutamist ka pärast prooviperioodi.",
   "settings.account.tryReloadServices": "Proovi uuesti",
   "settings.account.tryReloadUserInfoRequest": "Proovi uuesti",
-  "settings.account.upgradeToPro.label": "Täiendage Ferdi Professional tellimusele",
   "settings.account.userInfoRequestFailed": "Kasutaja teabe laadimine nurjus",
   "settings.account.yourLicense": "Teie Ferdi'i litsents",
   "settings.app.buttonClearAllCache": "Tühjenda vahemälu",
@@ -284,7 +210,6 @@
   "settings.recipes.customService.openFolder": "Ava kaust",
   "settings.recipes.headline": "Saadaolevad teenused",
   "settings.recipes.missingService": "Teenus puudub?",
-  "settings.recipes.mostPopular": "Populaarseimad teenused",
   "settings.recipes.nothingFound": "Vabandust, kuid ükski teenus ei vastanud teie otsinguterminile.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Teenus lisati edukalt",
   "settings.searchService": "Otsi teenust",
@@ -295,7 +220,6 @@
   "settings.service.form.availableServices": "Saadaolevad teenused",
   "settings.service.form.customUrl": "Kohandatud server",
   "settings.service.form.customUrlPremiumInfo": "Isemajutatavate teenuste lisamiseks vajate Ferdi Premium'i tellimust.",
-  "settings.service.form.customUrlUpgradeAccount": "Uuendage oma kontot",
   "settings.service.form.customUrlValidationError": "Kohandatud {name} serverit ei saanud kinnitada.",
   "settings.service.form.deleteButton": "Kustuta teenus",
   "settings.service.form.editServiceHeadline": "Muuda {name}",
@@ -391,19 +315,6 @@
   "signup.link.login": "Kas teil on juba konto, logi sisse?",
   "signup.password.label": "Salasõna",
   "signup.submit.label": "Loo konto",
-  "subscription.bestValue": "Parim hind",
-  "subscription.cta.activateTrial": "Jah, alusta tasuta Ferdi Professional'i proovitellimust",
-  "subscription.cta.allOptions": "Vaata kõiki võimalusi",
-  "subscription.cta.choosePlan": "Valige oma tellimus",
-  "subscription.includedProFeatures": "Ferdi'i Professional tellimus sisaldab:",
-  "subscription.interval.per": "{interval} kohta",
-  "subscription.interval.perMonth": "kuus",
-  "subscription.interval.perMonthPerUser": "kuus kasutaja kohta",
-  "subscription.planItem.upgradeAccount": "Uuendage oma kontot",
-  "subscription.teaser.includedFeatures": "Tasuliste Ferdi'i tellimuste hulka kuuluvad:",
-  "subscription.teaser.intro": "Ferdi 5 sisaldab laia valikut uusi funktsioone, et teie igapäevast suhtlemist veelgi paremaks muuta - patareid kaasaarvatud. Tutvuge meie uute tellimusvariantidega ja saate teada, milline neist sobib teile kõige paremini!",
-  "subscriptionPopup.buttonCancel": "Loobu",
-  "subscriptionPopup.buttonDone": "Valmis",
   "tabs.item.deleteService": "Kustuta teenus",
   "tabs.item.disableAudio": "Keela heli",
   "tabs.item.disableNotifications": "Keela teated",
@@ -431,7 +342,6 @@
   "workspaceDrawer.item.contextMenuEdit": "muutmine",
   "workspaceDrawer.item.noServicesAddedYet": "Ühtegi teenust pole veel lisatud",
   "workspaceDrawer.premiumCtaButtonLabel": "Loo oma esimene tööruum",
-  "workspaceDrawer.proFeatureBadge": "Täiustatud funktsioon",
   "workspaceDrawer.reactivatePremiumAccountLabel": "Aktiveerige täiustatud konto uuesti",
   "workspaceDrawer.workspaceFeatureInfo": "<p> Ferdi'i tööruumid võimaldavad teil keskenduda sellele, mis on hetkel oluline. Seadistage erinevaid teenusekomplekte ja saate neid igal ajal hõlpsasti vahetada. </p> <p> Teie otsustate milliseid teenuseid millal ja kus vajate, et saaksime aidata teil oma mängu tipus püsida - või hõlpsalt töölt välja lülitada. millal soovite. </p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Muuda tööruumide sätteid",
diff --git a/src/i18n/locales/fa.json b/src/i18n/locales/fa.json
index a57caeb47..bfc275e58 100644
--- a/src/i18n/locales/fa.json
+++ b/src/i18n/locales/fa.json
@@ -5,30 +5,6 @@
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "تغییرات فرَنز {version}",
-  "feature.delayApp.headline": "Upgrade your Ferdi plan to skip the wait",
-  "feature.delayApp.text": "فرَنز بعد از {seconds} ثانیه ادامه میده.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14-days trial and skip the wait",
-  "feature.delayApp.upgrade.action": "Upgrade Ferdi",
-  "feature.delayApp.upgrade.actionShort": "ارتقای حساب",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}?",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "ارسال به صورت ایمیل",
   "feature.shareFranz.action.facebook": "اشتراک‌گذاری در فیس بوک",
   "feature.shareFranz.action.twitter": "اشتراک‌گذاری در توییتر",
@@ -36,16 +12,6 @@
   "feature.shareFranz.shareText.email": "من {count} تا سرویس تو فرَنز اضافه کردم! برنامه رایگان برای واتسآپ، اسکایپ، مسنجر، اسلک رو از سایت www.getferdi.com دانلود کن.",
   "feature.shareFranz.shareText.twitter": "من {count} تا سرویس تو فرَنز اضافه کردم! برنامه رایگان برای واتسآپ، اسکایپ، مسنجر، اسلک رو از سایت www.getferdi.com دانلود کن /cc @FerdiMessenger",
   "feature.shareFranz.text": "به دوستات بگو فرَنز چقدر باحاله و بهمون کمک کن گسترش پیدا کنیم.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "به سرویس های آنلاین فرَنز متصل نشدی",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "اینترنت وصل نیست",
@@ -53,7 +19,6 @@
   "global.spellchecking.autodetect": "تشخیص خودکار زبان",
   "global.spellchecking.autodetect.short": "خودکار",
   "global.spellchecking.language": "زبان غلط یاب املایی",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "import.headline": "جانشانی سرویس های فرانز 4",
   "import.notSupportedHeadline": "این سرویس ها در Ferdi ۵ پشتیبانی نمیشوند.",
   "import.skip.label": "میخواهم سرویس ها را به صورت دستی اضافه کنم.",
@@ -63,7 +28,6 @@
   "infobar.buttonReloadServices": "بارگذاری مجدد سرویس ها",
   "infobar.requiredRequestsFailed": "بارگذاری سرویس ها و اطلاعات کاربر ممکن نیست",
   "infobar.servicesUpdated": "سرویس های شما به روز رسانی شدند.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "یک به روز رسانی جدید برای Ferdi آماده است.",
   "invite.email.label": "نشانی ایمیل",
   "invite.headline.friends": "دعوت ۳ نفر از دوستان یا همکارانتان.",
@@ -122,9 +86,7 @@
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "نمایش",
-  "menu.view.enterFullScreen": "نمای تمام صفحه",
-  "menu.view.exitFullScreen": "خروج از تمام‌صفحه ",
-  "menu.view.reloadFranz": "بارگذاری مجدد فرَنز",
+  "menu.view.reloadFerdi": "بارگذاری مجدد فرَنز",
   "menu.view.reloadService": "بارگذاری مجدد سرور",
   "menu.view.reloadTodos": "Reload ToDos",
   "menu.view.resetZoom": "اندازه واقعی‌ ",
@@ -149,7 +111,6 @@
   "password.noUser": "هیچ کاربری با این نشانی ایمیل یافت نشد ",
   "password.submit.label": "ارسال ",
   "password.successInfo": "لطفا ایمیل خود را چک کنید",
-  "premiumFeature.button.upgradeAccount": "ارتقای حساب",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
@@ -166,27 +127,6 @@
   "pricing.features.upToSixServices": "Add up to 6 services",
   "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Free",
-  "pricing.plan.legacy": "Premium",
-  "pricing.plan.personal": "Personal",
-  "pricing.plan.personal-monthly": "Personal Monthly",
-  "pricing.plan.personal-yearly": "Personal Yearly",
-  "pricing.plan.pro": "Professional",
-  "pricing.plan.pro-monthly": "Professional Monthly",
-  "pricing.plan.pro-yearly": "Professional Yearly",
-  "pricing.trial.cta.accept": "Start my 14-day Ferdi Professional Trial ",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "بارگذاری مجدد {name}",
   "service.crashHandler.autoReload": "در حال بازیابی{نام} در{ثانیه} ثانیه به طور خودکار",
   "service.crashHandler.headline": "وای نه! ",
@@ -198,11 +138,6 @@
   "service.errorHandler.headline": "وای نه! ",
   "service.errorHandler.message": "خطا ",
   "service.errorHandler.text": "{name} بارگذاری نشد.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "در حال بارگذاری",
   "services.getStarted": "شروع ",
   "services.welcome": "به فرانز خوش آمدید",
@@ -219,18 +154,9 @@
   "settings.account.headlineInvoices": "فاکتورها",
   "settings.account.headlinePassword": "تغییر کلمه عبور",
   "settings.account.headlineProfile": "بروزرسانی پروفایل",
-  "settings.account.headlineSubscription": "اشتراک شما",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "دانلود",
-  "settings.account.manageSubscription.label": "اشتراک خود را مدیریت کنید",
   "settings.account.successInfo": "تغییرات شما ذخیره شد!",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "تلاش مجدد ",
   "settings.account.tryReloadUserInfoRequest": "تلاش مجدد ",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "نمی‌توان اطلاعات کاربر را بارگذاری کرد.",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.buttonClearAllCache": "پاک کردن حافظه پنهان",
@@ -284,7 +210,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "سرویس های موجود",
   "settings.recipes.missingService": "سرویسی را نیاز دارید ؟",
-  "settings.recipes.mostPopular": "مشهورترین ها",
   "settings.recipes.nothingFound": "متاسفیم ، اما هیچ سرویسی با آنچه که جستجو کردید مطابقت نداشت .",
   "settings.recipes.servicesSuccessfulAddedInfo": "سرویس با موفقیت اضافه شد",
   "settings.searchService": "جستجوی سرویس ها",
@@ -295,7 +220,6 @@
   "settings.service.form.availableServices": "سرویس های موجود",
   "settings.service.form.customUrl": "سرور سفارشی",
   "settings.service.form.customUrlPremiumInfo": "برای اضافه کردن سرویس هایی که خود دارید ، نیاز به پشتیبانی پیشرفته فرانز را دارید",
-  "settings.service.form.customUrlUpgradeAccount": "اکانت خود را ارتقا دهید",
   "settings.service.form.customUrlValidationError": "نتوانستیم سرور {نام} را تایید اعتبار کنیم",
   "settings.service.form.deleteButton": "حذف سرویس",
   "settings.service.form.editServiceHeadline": "ویرایش {name}",
@@ -391,19 +315,6 @@
   "signup.link.login": "صاحب اکانت هستید ؟ وارد شوید",
   "signup.password.label": "رمز عبور",
   "signup.submit.label": "ایجاد حساب جدید",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "انصراف",
-  "subscriptionPopup.buttonDone": "انجام شد",
   "tabs.item.deleteService": "حذف سرویس",
   "tabs.item.disableAudio": "غیرفعال کردن صدا",
   "tabs.item.disableNotifications": "غیر فعال کردن اعلان ها",
@@ -431,7 +342,6 @@
   "workspaceDrawer.item.contextMenuEdit": "ویرایش",
   "workspaceDrawer.item.noServicesAddedYet": "هنوز هیچ سرویسی اضافه نشده",
   "workspaceDrawer.premiumCtaButtonLabel": "اولین فضای کاریتو درست کن",
-  "workspaceDrawer.proFeatureBadge": "امکانات ویژه",
   "workspaceDrawer.reactivatePremiumAccountLabel": "فعالسازی مجدد حساب ویژه",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "ویرایش تنظیمات فضاهای کاری",
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index 5b74d709b..cce6b3e9c 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Voi ei! Ferdi menetti yhteyden {name}.",
   "feature.announcements.changelog.headline": "Muutoksia Ferdissä {version}",
   "feature.debugger.title": "Julkaise virheraportti",
-  "feature.delayApp.headline": "Ole hyvä ja osta Ferdin Tukijalisenssi, jotta vältyt odottamiselta",
-  "feature.delayApp.text": "Ferdi jatkaa {seconds} sekunnin kuluttua.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Hanki Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Päivitä tili",
   "feature.nightlyBuilds.activate": "Aktivoi",
   "feature.nightlyBuilds.cancel": "Peruuta",
   "feature.nightlyBuilds.info": "Uusimmat versiot ovat Ferdin kokeellisia versioita, jotka voivat sisältää viimeistelemättömiä tai keskeneräisiä ominaisuuksia. Näitä uusimpia versioita käyttävät pääasiassa kehittäjät testaamaan uusia ominaisuuksia ja miten ne toimivat lopullisessa versiossa. Jos et tiedä mitä olet tekemässä, suosittelemme ettet aktivoi uusimpia versioita.",
   "feature.nightlyBuilds.title": "Uusimmat versiot",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "Virheraportin julkaisussa tapahtui virhe. Yritä myöhemmin uudelleen tai katso konsolista saadaksesi lisätietoja.",
   "feature.publishDebugInfo.info": "Julkaisemalla virheraportin auttat meitä löytämään Ferdissä ongelmia ja virheitä. Julkaisemalla virheraportin hyväksyt Ferdi Debugger´s tietosuojakäytännöt ja -ehdot",
   "feature.publishDebugInfo.privacy": "Tietosuojakäytäntö",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Valitse palvelu painamalla TAB, ↑ ja ↓. Avaa palvelu painamalla ENTER.",
   "feature.quickSwitch.search": "Etsi...",
   "feature.quickSwitch.title": "Pikavalitsin",
-  "feature.serviceLimit.limitReached": "Olet lisännyt {amount} {limit} palvelusta, jotka sisältyvät suunnitelmaasi. Ole hyvä ja päivitä tilisi lisätäksesi muita palveluita.",
   "feature.shareFranz.action.email": "Lähetä sähköpostina",
   "feature.shareFranz.action.facebook": "Jaa Facebookissa",
   "feature.shareFranz.action.twitter": "Jaa Twitterissä",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "Lisäsin Ferdiin {count} palvelun! Hanki ilmainen sovellus WhatsAppille, Messengerille, Slackille, Skypelle ja muille palveluille osoitteessa www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "Olen lisännyt {count} palvelua Ferdiin! Hanki ilmainen sovellus WhatsAppille, Messengerille, Slackille, Skypelle ja muille palveluille osoitteessa www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Kerro ystävillesi ja kollegoille, kuinka Ferdi on mahtava ja auta meitä levittämään sanaa eteenpäin.",
-  "feature.todos.premium.info": "Ferdi Todos on saatavilla nyt premium-käyttäjille!",
-  "feature.todos.premium.rollout": "Kaikkien muiden on odotettava hieman kauemmin.",
-  "feature.todos.premium.upgrade": "Päivitä tili",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Ferdin verkkopalveluihin ei saada yhteyttä",
-  "global.franzProRequired": "Vaatii Ferdi Professionalin",
   "global.notConnectedToTheInternet": "Et ole yhteydessä internetiin.",
   "global.spellchecker.useDefault": "Käytä järjestelmän oletusasetusta ({default})",
   "global.spellchecking.autodetect": "Tunnista kieli automaattisesti",
   "global.spellchecking.autodetect.short": "Automaattinen",
   "global.spellchecking.language": "Oikeinkirjoituksen tarkistuskieli",
-  "global.upgradeButton.upgradeToPro": "Päivitä Ferdi Professionaliin",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Tuo Ferdin 4 palveluasi",
@@ -88,7 +52,6 @@
   "infobar.hide": "Piilota",
   "infobar.requiredRequestsFailed": "Palveluja ja käyttäjätietoja ei voitu ladata",
   "infobar.servicesUpdated": "Palvelusi on päivitetty.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "Ferdille on saatavana uusi päivitys.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Sähköpostiosoite",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Piilota valikko automaattisesti",
   "menu.app.checkForUpdates": "Tarkista päivitykset",
   "menu.app.hide": "Piilota",
-  "menu.app.hideOthers": "Piilota muut",
-  "menu.app.quit": "Lopeta",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Asetukset",
-  "menu.app.unhide": "Näytä",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Muokkaa",
-  "menu.edit.copy": "Kopioi",
-  "menu.edit.cut": "Leikkaa",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Poista",
   "menu.edit.emojiSymbols": "Emoji & Symbolit",
   "menu.edit.findInPage": "Etsi sivulta",
-  "menu.edit.paste": "Liitä",
-  "menu.edit.pasteAndMatchStyle": "Liitä ja yhdistä tyyli",
-  "menu.edit.redo": "Tee uudelleen",
-  "menu.edit.selectAll": "Valitse kaikki",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Puhe",
   "menu.edit.startDictation": "Aloita sanelu",
   "menu.edit.startSpeaking": "Aloita puhuminen",
   "menu.edit.stopSpeaking": "Lopeta puhuminen",
-  "menu.edit.undo": "Kumoa",
+  "menu.edit.undo": "Undo",
   "menu.file": "Tiedosto",
-  "menu.help": "Ohje",
+  "menu.help": "Help",
   "menu.help.changelog": "Muutosloki",
   "menu.help.debugInfo": "Kopioi virheraportin tiedot",
   "menu.help.debugInfoCopiedBody": "Virheraportin tiedot on kopioitu leikepöydälle.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi virheraportin tiedot",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Lue lisää",
   "menu.help.privacy": "Tietosuojalauseke",
   "menu.help.publishDebugInfo": "Julkaise virheraportin tiedot",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Ota Todos käyttöön",
   "menu.view": "Katso",
   "menu.view.back": "Takaisin",
-  "menu.view.enterFullScreen": "Siirry koko näyttöön",
-  "menu.view.exitFullScreen": "Poistu koko näytön tilasta",
   "menu.view.forward": "Eteenpäin",
   "menu.view.lockFerdi": "Lukitse Ferdi",
   "menu.view.openQuickSwitch": "Avaa Pikavalinta",
-  "menu.view.reloadFranz": "Lataa Ferdi uudestaan",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Lataa Palvelu uudelleen",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Nykyinen koko",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Vaihda Tummaan tilaan",
   "menu.view.toggleDevTools": "Vaihda Kehittäjän työkaluun",
-  "menu.view.toggleFullScreen": "Vaihda koko ruututilaan",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Vaihda Palvelun kehittäjän työkaluun",
   "menu.view.toggleTodosDevTools": "Vaihda Todon Kehittäjän työkalut",
-  "menu.view.zoomIn": "Lähennä",
-  "menu.view.zoomOut": "Loitonna",
-  "menu.window": "Ikkuna",
-  "menu.window.close": "Sulje",
-  "menu.window.minimize": "Pienennä",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Työtilat",
   "menu.workspaces.addNewWorkspace": "Lisää Uusi Työtila...",
   "menu.workspaces.closeWorkspaceDrawer": "Sulje työtilan valikko",
@@ -194,11 +156,7 @@
   "password.noUser": "Tälle sähköpostiosoiteelle ei löytynyt käyttäjää",
   "password.submit.label": "Jatka",
   "password.successInfo": "Ole hyvä ja tarkista sähköpostisi",
-  "premiumFeature.button.upgradeAccount": "Päivitä tili",
   "pricing.features.accountSync": "Tilin Synkronointi",
-  "pricing.features.adFree": "Ikuisesti mainosvapaa",
-  "pricing.features.appDelays": "Ei Odotus-näyttöjä",
-  "pricing.features.appDelaysEnabled": "Satunnaisesti Odotus-näyttöjä",
   "pricing.features.customWebsites": "Lisää mukautettuja sivustoja",
   "pricing.features.desktopNotifications": "Työpöytäilmoitukset",
   "pricing.features.onPremise": "Toimitila ja muut Hosting-palvelut",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Tiimin Hallinta",
   "pricing.features.thirdPartyServices": "Asenna kolmannen osapuolen palveluita",
   "pricing.features.unlimitedServices": "Lisää rajattomat palvelut",
-  "pricing.features.upToSixServices": "Lisää enintään 6 palvelua",
-  "pricing.features.upToThreeServices": "Lisää enintään 3 palvelua",
   "pricing.features.workspaces": "Työtilat",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal kuukausittain",
-  "pricing.plan.personal-yearly": "Ferdi Personal vuosittain",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional kuukausittain",
-  "pricing.plan.pro-yearly": "Ferdi Professional vuosittain",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Lataa uudestaan {name}",
   "service.crashHandler.autoReload": "Yritetään palauttaa {name} automaattisesti {seconds} sekunnin kuluttua",
   "service.crashHandler.headline": "Voi ei!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Voi ei!",
   "service.errorHandler.message": "Virhe",
   "service.errorHandler.text": "{name} lataus epäonnistui.",
-  "service.restrictedHandler.action": "Päivitä tili",
-  "service.restrictedHandler.customUrl.headline": "Vaaditaan Ferdi Professional Plan",
-  "service.restrictedHandler.customUrl.text": "Ole hyvä ja päivitä Ferdi Professional Plan käyttääksesi omia Url-osoitteita ja itse isännöityjä palveluita.",
-  "service.restrictedHandler.serviceLimit.headline": "Olet saavuttanut palvelusi enimmäismäärän.",
-  "service.restrictedHandler.serviceLimit.text": "Ole hyvä ja päivitä tilisi käyttääksesi enemmän kuin {count} palvelua.",
   "service.webviewLoader.loading": "Ladataan {service}",
   "services.getStarted": "Aloita",
   "services.login": "Kirjaudu sisään käyttääksesi Ferdiä.",
-  "services.serverInfo": "Vaihtoehtoisesti voit vaihtaa Ferdi palvelimen klikkaamalla ratasta vasemmassa alakulmassa.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Käytä Ferdia ilman tiliä",
   "services.welcome": "Tervetuloa Ferdiin",
   "settings.account.account.editButton": "Muokkaa tiliä",
-  "settings.account.accountType.basic": "Perustili",
-  "settings.account.accountType.premium": "Premium Supporter-tili",
   "settings.account.accountUnavailable": "Tili ei ole käytettävissä",
   "settings.account.accountUnavailableInfo": "Käytät Ferdia ilman tiliä. Jos haluat käyttää Ferdia tilin kanssa ja pitää palvelusi synkronoituna kaikissa asennuksissa, valitse Asetukset-välilehdessä palvelin ja kirjaudu sisään.",
   "settings.account.buttonSave": "Päivitä profiili",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Laskut",
   "settings.account.headlinePassword": "Vaihda salasana",
   "settings.account.headlineProfile": "Päivitä profiili",
-  "settings.account.headlineSubscription": "Tilauksesi",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Päivitä tilisi niin saat täydellisen Ferdi-kokemuksen",
-  "settings.account.invoiceDownload": "Lataa",
-  "settings.account.manageSubscription.label": "Hallinnoi tilaustasi",
   "settings.account.successInfo": "Tekemäsi muutokset on tallennettu",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Yritä uudelleen",
   "settings.account.tryReloadUserInfoRequest": "Yritä uudelleen",
-  "settings.account.upgradeToPro.label": "Päivitä Ferdi Professionaliin",
   "settings.account.userInfoRequestFailed": "Käyttäjätietoja ei voitu ladata",
   "settings.account.yourLicense": "Sinun Ferdi-lisenssi",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Ota oikoluku käyttöön",
   "settings.app.form.enableSystemTray": "Näytä Ferdi ilmoitusalueella",
   "settings.app.form.enableTodos": "Ota Ferdi Todos käyttöön",
-  "settings.app.form.hibernate": "Ota horrostila käyttöön",
   "settings.app.form.hibernateOnStartup": "Pidä palvelut horrostilassa käynnistettäessä",
   "settings.app.form.hibernationStrategy": "Horrostila-suunnitelma",
   "settings.app.form.iconSize": "Palvelun kuvakkeen koko",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Ota käyttöön yleinen tumma tila",
   "settings.app.form.useTouchIdToUnlock": "Salli TouchID:n käyttö Ferdin avaamiseksi",
   "settings.app.form.useVerticalStyle": "Käytä pystysuoraa tyyliä",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Asetukset",
   "settings.app.headlineAdvanced": "Lisäasetukset",
   "settings.app.headlineAppearance": "Ulkoasu",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "Oletuksena Ferdi pitää kaikki palvelut auki ja ladattuna taustalla, joten ne ovat valmiina, kun haluat käyttää niitä. Horrostila sammuttaa palveluita tietyn jakson jälkeen. Tämä kätevä toimino säästää RAM-muistia tai estää palveluita hidastamasta tietokonetta.",
   "settings.app.inactivityLockInfo": "Minuutin käyttämättömyyden jälkeen Ferdi lukkiutuu automaattisesti. Käytä arvoa 0 poistaaksesi toiminnon käytöstä",
   "settings.app.languageDisclaimer": "Viralliset käännökset ovat englanti ja saksa. Kaikki muut kielet ovat yhteisön kääntämiä.",
-  "settings.app.lockInfo": "Salasanalukitus pitää viestisi suojattuna.\nKäyttämällä salasanalukitusta, sinua pyydetään syöttämään salasanasi joka kerta kun käynnistät Ferdin tai lukitset Ferdin lukitussymbolin avulla vasemmassa alakulmassa tai näppäinyhdistelmällä CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Salasana",
   "settings.app.lockedPasswordInfo": "Varmista, että luot salasanan, jonka muistat.\nJos hukkaat tämän salasanan, sinun täytyy asentaa Ferdi uudelleen.",
   "settings.app.restartRequired": "Muutokset vaativat uudelleenkäynnistyksen",
   "settings.app.scheduledDNDInfo": "Ajastetun Älä häiritse-tilan avulla voit määritellä ajanjakson, jonka aikana et halua saada ilmoituksia Ferdistä.",
   "settings.app.scheduledDNDTimeInfo": "Ajastin 24 tunnin järjestelmässä. Kun Älä häiritse-tila otetaan yöksi käyttöön, päättymisaika voi olla ennen alkamisaikaa (esim. alku 17:00, loppu 09:00).",
-  "settings.app.sentryInfo": "Telemetriatiedon lähettäminen antaa meille mahdollisuudet löytää virheitä Ferdistä - emme lähetä mitään henkilökohtaisia tietoja, kuten viestitietoja! Tämän vaihtoehdon muuttaminen edellyttää, että käynnistät Ferdin uudelleen.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi käyttää Macin sisäänrakennettua oikolukua tarkastaessaan kirjoitusvirheitä. Jos haluat muuttaa tarkastettavaa kieltä, voit tehdä sen Macin järjestelmän asetuksissa.",
   "settings.app.subheadlineCache": "Välimuisti",
   "settings.app.todoServerInfo": "Tätä palvelinta käytetään \"Ferdi Todo\" -toiminnossa.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Avaa kansio",
   "settings.recipes.headline": "Käytettävissä olevat palvelut",
   "settings.recipes.missingService": "Palvelu puuttuu?",
-  "settings.recipes.mostPopular": "Suosituin",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Palvelu lisätty onnistuneesti",
   "settings.searchService": "Hae palvelua",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Lisää {name}",
   "settings.service.form.availableServices": "Käytettävissä olevat palvelut",
   "settings.service.form.customUrl": "Mukautettu palvelin",
-  "settings.service.form.customUrlPremiumInfo": "Liittääksesi ylläpitopalveluja, tarvitset Ferdi Premium Supporter -tilin.",
-  "settings.service.form.customUrlUpgradeAccount": "Päivitä tilisi",
   "settings.service.form.customUrlValidationError": "Mukautettua {name} palvelinta ei voitu vahvistaa.",
   "settings.service.form.darkReaderBrightness": "Tumman tilan kirkkaus",
   "settings.service.form.darkReaderContrast": "Tumman tilan kontrasti",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz-tiimin hallinta",
   "settings.team.copy": "Franzin Tiimihallinnan avulla voit hallita usean käyttäjän Franz-tilauksia. Huomioithan, että Franz Premium -tilaus ei anna sinulle etuja Ferdin käytössä: Ainoa syy siihen, että sinulla on vielä pääsy Tiimihallintaan, on se, että voit hallita perinteisiä Franz-tiimejä ja että et menetä mitään toimintoja tilisi hallinnassa.",
   "settings.team.headline": "Tiimi",
-  "settings.team.intro": "Käytössäsi on tällä hetkellä Franz Servers, minkä vuoksi sinulla on pääsy Tiimi-hallintaan.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Hallitse tiimiäsi meetfranz.comissa",
   "settings.team.teamsUnavailable": "Tiimit eivät ole käytettävissä",
   "settings.team.teamsUnavailableInfo": "Tiimit ovat tällä hetkellä käytettävissä vain Franz-palvelimella ja Franz Professionalin lunastamisen jälkeen. Käyttääksesi tiimejä, vaihda palvelimesi osoitteeseen https://api.franzinfra.com.",
-  "settings.team.upgradeAction": "Päivitä tilisi",
   "settings.user.form.accountType.company": "Yritys",
   "settings.user.form.accountType.individual": "Yksityishenkilö",
   "settings.user.form.accountType.label": "Tilin tyyppi",
@@ -516,29 +431,20 @@
   "signup.link.login": "Sinulla on jo tili? Kirjaudu sisään",
   "signup.password.label": "Salasana",
   "signup.submit.label": "Luo tili",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "Näytä kaikki vaihtoehdot",
-  "subscription.cta.choosePlan": "Valitse tilauksesi",
-  "subscription.includedProFeatures": "Ferdi Professional Plan sisältää:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "kuukaudessa",
-  "subscription.interval.perMonthPerUser": "per kuukausi & käyttäjä",
-  "subscription.planItem.upgradeAccount": "Päivitä tili",
-  "subscription.teaser.includedFeatures": "Maksulliset Ferdin suunnitelmat ovat:",
-  "subscription.teaser.intro": "Ferdi 5:n mukana tulee laaja valikoima uusia ominaisuuksia, jotka parantavat jokapäiväistä viestintää - ryhmät mukaanlukien. Tutustu uusiin suunnitelmiin ja selvitä, mikä sopii sinulle parhaiten!",
-  "subscriptionPopup.buttonCancel": "Peruuta",
-  "subscriptionPopup.buttonDone": "Valmis",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Poista palvelu",
   "tabs.item.disableAudio": "Poista ääni käytöstä",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Poista ilmoitukset käytöstä",
   "tabs.item.disableService": "Poista palvelu",
   "tabs.item.edit": "Muokkaa",
   "tabs.item.enableAudio": "Ota ääni käyttöön",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Ota ilmoitukset käyttöön",
   "tabs.item.enableService": "Ota palvelu käyttöön",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Lataa uudelleen",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} ei ole kelvollinen",
   "validation.minLength": "{field} pitää olla vähintään {length} kirjainta",
   "validation.oneRequired": "Vähintään yksi kohde valittava",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Työtilat",
   "workspaceDrawer.item.contextMenuEdit": "muokkaa",
   "workspaceDrawer.item.noServicesAddedYet": "Palveluja ei ole vielä lisätty",
-  "workspaceDrawer.premiumCtaButtonLabel": "Luo ensimmäinen työtila",
-  "workspaceDrawer.proFeatureBadge": "Premium-ominaisuus",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Ota Premium-tili uudelleen käyttöön",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces auttaa sinun keskittymään mikä on tärkeää juuri nyt. Määritä erilaisia palvelukokonaisuuksia ja vaihda helposti niiden välillä milloin tahansa.</p><p>Sinä päätät mitä palveluita tarvitset milloin ja missä, jotta voimme auttaa sinua pysymään työsi äärellä - tai helpottamaan poistumista aina kun haluat.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Muokkaa työtilojen asetuksia",
   "workspaces.switchingIndicator.switchingTo": "Vaihdetaan"
diff --git a/src/i18n/locales/fil.json b/src/i18n/locales/fil.json
index 5588d982d..0bcaad1ee 100644
--- a/src/i18n/locales/fil.json
+++ b/src/i18n/locales/fil.json
@@ -5,30 +5,6 @@
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
-  "feature.delayApp.headline": "Upgrade your Ferdi plan to skip the wait",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14-days trial and skip the wait",
-  "feature.delayApp.upgrade.action": "Upgrade Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}?",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Send as email",
   "feature.shareFranz.action.facebook": "Share on Facebook",
   "feature.shareFranz.action.twitter": "Share on Twitter",
@@ -36,16 +12,6 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Hindi maka connect sa 'Ferdi online services'",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "Hindi ka naka connect sa internet.",
@@ -53,7 +19,6 @@
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "import.headline": "Ilagay ang iyonhg Ferdi 4 services",
   "import.notSupportedHeadline": "Ang mga services ay hindi pa supported ni Ferdi 5",
   "import.skip.label": "Gusto kong magdagdag",
@@ -63,7 +28,6 @@
   "infobar.buttonReloadServices": "I-load muli ang mga serbisyo",
   "infobar.requiredRequestsFailed": "Hindi mai-load ang mga serbisyo at ang impormasyon tungkol sa user.",
   "infobar.servicesUpdated": "Na-update na ang iyong mga serbisyo.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "May bagong update.",
   "invite.email.label": "Email Address",
   "invite.headline.friends": "Invite 3 of your friends or colleagues",
@@ -122,9 +86,7 @@
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "View",
-  "menu.view.enterFullScreen": "Enter Full Screen",
-  "menu.view.exitFullScreen": "Exit Full Screen",
-  "menu.view.reloadFranz": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.reloadTodos": "Reload ToDos",
   "menu.view.resetZoom": "Actual Size",
@@ -149,7 +111,6 @@
   "password.noUser": "No user with that email address was found",
   "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
@@ -166,27 +127,6 @@
   "pricing.features.upToSixServices": "Add up to 6 services",
   "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Free",
-  "pricing.plan.legacy": "Premium",
-  "pricing.plan.personal": "Personal",
-  "pricing.plan.personal-monthly": "Personal Monthly",
-  "pricing.plan.personal-yearly": "Personal Yearly",
-  "pricing.plan.pro": "Professional",
-  "pricing.plan.pro-monthly": "Professional Monthly",
-  "pricing.plan.pro-yearly": "Professional Yearly",
-  "pricing.trial.cta.accept": "Start my 14-day Ferdi Professional Trial ",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -198,11 +138,6 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading",
   "services.getStarted": "Get started",
   "services.welcome": "Welcome to Ferdi",
@@ -219,18 +154,9 @@
   "settings.account.headlineInvoices": "Invoices",
   "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Update profile",
-  "settings.account.headlineSubscription": "Your subscription",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.manageSubscription.label": "Manage your subscription",
   "settings.account.successInfo": "Your changes have been saved",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Try again",
   "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Could not load user information",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.buttonClearAllCache": "Clear cache",
@@ -284,7 +210,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Available services",
   "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
   "settings.searchService": "Search service",
@@ -295,7 +220,6 @@
   "settings.service.form.availableServices": "Available services",
   "settings.service.form.customUrl": "Custom server",
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Edit {name}",
@@ -391,19 +315,6 @@
   "signup.link.login": "Already have an account, sign in?",
   "signup.password.label": "Password",
   "signup.submit.label": "Create account",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Cancel",
-  "subscriptionPopup.buttonDone": "Done",
   "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
@@ -431,7 +342,6 @@
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
   "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
   "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index e3d3051ec..464c70138 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh non ! Ferdi a perdu la connexion avec {name}.",
   "feature.announcements.changelog.headline": "Les nouveaux changements dans Ferdi {version}",
   "feature.debugger.title": "Publier les informations de débogage",
-  "feature.delayApp.headline": "Achetez la licence Ferdi pour ne plus avoir de temps d'attente",
-  "feature.delayApp.text": "Ferdi s'ouvrira dans {seconds} secondes.",
-  "feature.delayApp.trial.action": "Oui, je veux les 14 jours d'essai gratuits de Ferdi Professionnel",
-  "feature.delayApp.trial.actionShort": "Activer l'essai gratuit de Ferdi Professionnel",
-  "feature.delayApp.trial.headline": "Prendre l'essai gratuit de 14 jours de Ferdi Professionnel et esquiver la ligne",
-  "feature.delayApp.upgrade.action": "Acheter une license Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Mettre à niveau le compte",
   "feature.nightlyBuilds.activate": "Activer",
   "feature.nightlyBuilds.cancel": "Annuler",
   "feature.nightlyBuilds.info": "Les versions de développement sont des versions expérimentales de Ferdi qui peuvent contenir des fonctionnalités non optimisées ou incomplètes. Ces versions de développement sont principalement utilisés par les développeurs pour tester leurs nouvelles fonctionnalités et leurs performances. Si vous ne savez pas ce que vous faites, nous vous suggérons de ne pas activer les versions de développement.",
   "feature.nightlyBuilds.title": "Versions de développement",
-  "feature.planSelection.cta.ctaDowngradeFree": "Rétrograder à la version gratuite",
-  "feature.planSelection.cta.stayOnFree": "Rester en version gratuite",
-  "feature.planSelection.cta.trial": "Commencez mon essai gratuit de 14 jours",
-  "feature.planSelection.cta.upgradePersonal": "Choisir Personnel",
-  "feature.planSelection.cta.upgradePro": "Choisir Professionnel",
-  "feature.planSelection.free.text": "Fonctionnalité basique",
-  "feature.planSelection.fullFeatureList": "Comparaison complète de tous les plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Rétrograder à la version gratuite",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choisir Personnel",
-  "feature.planSelection.fullscreen.dialog.message": "Vous êtes sur le point de rétrograder vers notre compte gratuit. Êtes-vous sûr ? Cliquez ici pour obtenir plus de services et de fonctionnalités pour seulement {currency}{price} par mois.",
-  "feature.planSelection.fullscreen.dialog.title": "Rétrograder votre plan Ferdi",
-  "feature.planSelection.fullscreen.subheadline": "Il est temps de faire un choix. Ferdi fonctionne mieux sur nos plans Personnels et Professionnels. Veuillez consulter et choisir le meilleur pour vous.",
-  "feature.planSelection.fullscreen.welcome": "Êtes-vous prêt à choisir, {name}",
-  "feature.planSelection.personal.text": "Plus de services, pas d'attente - idéal pour un usage personnel.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "Tous les prix basés sur un paiement annuel",
-  "feature.planSelection.pro.text": "Des services illimités et des fonctionnalités professionnelles pour vous - et votre équipe.",
   "feature.publishDebugInfo.error": "Il y a eu une erreur en essayant de publier les informations de débogage. Veuillez réessayer plus tard ou consulter la console pour plus d'informations.",
   "feature.publishDebugInfo.info": "La publication de vos informations de débogage nous aide à trouver des problèmes et des erreurs dans Ferdi. En publiant vos informations de débogage, vous acceptez la politique de confidentialité et les conditions d'utilisation de Ferdi Debugger",
   "feature.publishDebugInfo.privacy": "Politique de confidentialité",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Sélectionner un service avec TAB, ↑ et ↓. Ouvrir un service avec ENTER.",
   "feature.quickSwitch.search": "Rechercher...",
   "feature.quickSwitch.title": "Changement rapide",
-  "feature.serviceLimit.limitReached": "Vous avez ajouté {amount} sur {limit} services qui sont inclus dans votre plan. S'il vous plaît améliorer votre compte pour ajouter plus de services.",
   "feature.shareFranz.action.email": "Envoyer par mail",
   "feature.shareFranz.action.facebook": "Partager sur Facebook",
   "feature.shareFranz.action.twitter": "Partager sur Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "J'ai ajouté {count} services sur Ferdi ! Télécharger l'application gratuite pour WhatsApp, Messenger, Skype et autres sur www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "J'ai ajouté {count} services à Ferdi! Télécharge l'application gratuite pour WhatsApp, Messenger, Slack, Skype et autres sur www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Dites à vos amis et collègues a quel point Ferdi est super et aidez nous à faire passer le mot.",
-  "feature.todos.premium.info": "Ferdi Todos est disponible aux utilisateurs premium maintenant!",
-  "feature.todos.premium.rollout": "Tout le monde devra attendre un peux plus longtemps.",
-  "feature.todos.premium.upgrade": "Améliorez votre compte",
-  "feature.trialStatusBar.cta": "Améliorer maintenant",
-  "feature.trialStatusBar.expired": "Votre essai gratuit Ferdi {plan} a expiré, veuillez mettre à jour votre compte.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Rétrograder à la version gratuite",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choisir Personnel",
-  "feature.trialStatusBar.fullscreen.dialog.message": "Vous êtes sur le point de rétrograder vers notre compte gratuit. Êtes-vous sûr ? Cliquez ici pour obtenir plus de services et de fonctionnalités pour seulement {currency}{price} par mois.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Rétrograder votre plan Ferdi",
-  "feature.trialStatusBar.restTime": "Votre essai gratuit de Ferdi {plan} se termine dans {time}.",
   "global.api.unhealthy": "Impossible de se connecter aux services en ligne de Ferdi",
-  "global.franzProRequired": "Ferdi Professionnel Requis",
   "global.notConnectedToTheInternet": "Vous n'êtes pas connecté à Internet.",
   "global.spellchecker.useDefault": "Par défaut ({default})",
   "global.spellchecking.autodetect": "Détecter automatiquement la langue",
   "global.spellchecking.autodetect.short": "Automatiquement",
   "global.spellchecking.language": "Langue de la vérification orthographique",
-  "global.upgradeButton.upgradeToPro": "Passez à Ferdi Professionnel",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importez vos services depuis la version 4 de Ferdi",
@@ -88,7 +52,6 @@
   "infobar.hide": "Masquer",
   "infobar.requiredRequestsFailed": "Impossible d'accéder aux services et informations de l'utilisateur",
   "infobar.servicesUpdated": "Vos services ont été mis à jour.",
-  "infobar.trialActivated": "Votre essai à été correctement activé. Bonne messagerie!",
   "infobar.updateAvailable": "Une nouvelle mise à jour de Ferdi est disponible.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Adresse Email",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Cacher automatiquement la barre de menu",
   "menu.app.checkForUpdates": "Vérifier les mises à jour",
   "menu.app.hide": "Masquer",
-  "menu.app.hideOthers": "Masquer les autres",
-  "menu.app.quit": "Quitter",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Paramètres",
-  "menu.app.unhide": "Afficher",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Éditer",
-  "menu.edit.copy": "Copier",
-  "menu.edit.cut": "Couper",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Supprimer",
   "menu.edit.emojiSymbols": "Emoji & Symboles",
   "menu.edit.findInPage": "Rechercher dans la page",
-  "menu.edit.paste": "Coller",
-  "menu.edit.pasteAndMatchStyle": "Coller et fusionner le style",
-  "menu.edit.redo": "Rétablir",
-  "menu.edit.selectAll": "Tout sélectionner",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Synthèse vocale",
   "menu.edit.startDictation": "Démarrer la dictée",
   "menu.edit.startSpeaking": "Démarrer la synthèse vocale",
   "menu.edit.stopSpeaking": "Arrêter la synthèse vocale",
-  "menu.edit.undo": "Annuler",
+  "menu.edit.undo": "Undo",
   "menu.file": "Fichier",
-  "menu.help": "Aide",
+  "menu.help": "Help",
   "menu.help.changelog": "Liste des modifications",
   "menu.help.debugInfo": "Copier les informations de Debug",
   "menu.help.debugInfoCopiedBody": "Les informations de Debug ont été copié dans votre presse-papier.",
   "menu.help.debugInfoCopiedHeadline": "Information de Debug de Ferdi",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "En savoir plus",
   "menu.help.privacy": "Déclaration de confidentialité",
   "menu.help.publishDebugInfo": "Publier les informations de débogage",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Activer Todos",
   "menu.view": "Aperçu",
   "menu.view.back": "Revenir",
-  "menu.view.enterFullScreen": "Entrer en mode plein écran",
-  "menu.view.exitFullScreen": "Sortir du mode plein écran",
   "menu.view.forward": "Avancer",
   "menu.view.lockFerdi": "Verrouiller Ferdi",
   "menu.view.openQuickSwitch": "Ouvrir le changement rapide",
-  "menu.view.reloadFranz": "Recharger Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Redémarrer le service",
   "menu.view.reloadTodos": "Recharger les Todos",
-  "menu.view.resetZoom": "Taille actuelle",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Activer le mode sombre",
   "menu.view.toggleDevTools": "Activer les outils de développeur",
-  "menu.view.toggleFullScreen": "Activer le mode plein écran",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Activer les outils de développeur du service",
   "menu.view.toggleTodosDevTools": "Activer les outils de développeur Todos",
-  "menu.view.zoomIn": "Zoom Avant",
-  "menu.view.zoomOut": "Zoom Arrière",
-  "menu.window": "Fenêtre",
-  "menu.window.close": "Fermer",
-  "menu.window.minimize": "Réduire",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Espace de travail",
   "menu.workspaces.addNewWorkspace": "Ajouter un nouvel espace de travail...",
   "menu.workspaces.closeWorkspaceDrawer": "Fermer l'espace de travail",
@@ -194,11 +156,7 @@
   "password.noUser": "Aucun utilisateur n'a été trouvé avec cette adresse email",
   "password.submit.label": "Soumettre",
   "password.successInfo": "Merci de consulter vos emails",
-  "premiumFeature.button.upgradeAccount": "Mettre à niveau le compte",
   "pricing.features.accountSync": "Synchronisation de compte",
-  "pricing.features.adFree": "Sans pub, pour toujours",
-  "pricing.features.appDelays": "Plus d'écrans d'attente",
-  "pricing.features.appDelaysEnabled": "Écrans d'attente occasionnels",
   "pricing.features.customWebsites": "Ajouter des sites web modifiés",
   "pricing.features.desktopNotifications": "Notifications de bureau",
   "pricing.features.onPremise": "Services hébergés sur place et autres",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Gestion d'équipe",
   "pricing.features.thirdPartyServices": "Installer des services tiers",
   "pricing.features.unlimitedServices": "Ajouter des services illimités",
-  "pricing.features.upToSixServices": "Ajouter jusqu'à 6 services",
-  "pricing.features.upToThreeServices": "Ajouter jusqu'à 3 services",
   "pricing.features.workspaces": "Espace de travail",
-  "pricing.plan.free": "Ferdi Gratuit",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personnel",
-  "pricing.plan.personal-monthly": "Ferdi Personnel au mois",
-  "pricing.plan.personal-yearly": "Ferdi Personnel à l'année",
-  "pricing.plan.pro": "Ferdi Professionnel",
-  "pricing.plan.pro-monthly": "Ferdi Professionnel au mois",
-  "pricing.plan.pro-yearly": "Ferdi Professionnel à l'année",
-  "pricing.trial.cta.accept": "Oui, améliorer mon compte à Ferdi Professionnel",
-  "pricing.trial.cta.skip": "Continuer à Ferdi",
-  "pricing.trial.cta.start": "Commencez à utiliser Ferdi",
-  "pricing.trial.error": "Désoler, nous ne pouvons pas activé votre essai!",
-  "pricing.trial.features.headline": "Ferdi Professionnel inclus:",
-  "pricing.trial.headline.pro": "Bonjour {name}, bienvenue dans Ferdi",
-  "pricing.trial.intro.happyMessaging": "Bonne messagerie,",
-  "pricing.trial.intro.specialTreat": "Nous avons une offre spéciale pour vous.",
-  "pricing.trial.intro.tryPro": "Profitez de l'expérience complète de Ferdi Professional pendant 14 jours.",
-  "pricing.trial.terms.automaticTrialEnd": "Votre essai gratuit se finis automatiquement après 14 jours",
-  "pricing.trial.terms.headline": "Sans condition",
-  "pricing.trial.terms.noCreditCard": "Pas de carte de crédit requis",
-  "pricing.trial.terms.trialWorth": "Essai gratuit (normalement {currency}{price} par mois)",
   "service.crashHandler.action": "Recharger {name}",
   "service.crashHandler.autoReload": "Tentative de restauration automatique de {name} dans {seconds} secondes",
   "service.crashHandler.headline": "Oh non!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Oh non!",
   "service.errorHandler.message": "Erreur",
   "service.errorHandler.text": "Le chargement de {name} a échoué.",
-  "service.restrictedHandler.action": "Améliorez votre compte",
-  "service.restrictedHandler.customUrl.headline": "Le Plan Ferdi Professionnel requis",
-  "service.restrictedHandler.customUrl.text": "Veuillez passer à Ferdi Professionnel pour pouvoir utiliser vos propres urls et services auto-hébergés.",
-  "service.restrictedHandler.serviceLimit.headline": "Vous avez atteint votre limite de service.",
-  "service.restrictedHandler.serviceLimit.text": "S'il vous plaît améliorer votre compte pour utilisé plus que {count} services.",
   "service.webviewLoader.loading": "Chargement de {service}",
   "services.getStarted": "Commencer",
   "services.login": "Veuillez vous connecter pour utiliser Ferdi.",
-  "services.serverInfo": "Optionnellement, vous pouvez changer votre serveur Ferdi en cliquant sur la roue dentée en bas au coin gauche.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Utiliser Ferdi sans compte",
   "services.welcome": "Bienvenue dans Ferdi",
   "settings.account.account.editButton": "Modifier le compte",
-  "settings.account.accountType.basic": "Compte de base",
-  "settings.account.accountType.premium": "Compte supporteur premium",
   "settings.account.accountUnavailable": "Compte indisponible",
   "settings.account.accountUnavailableInfo": "Vous utilisez Ferdi sans compte. Si vous souhaitez utiliser Ferdi avec un compte et garder vos services synchronisés entre les installations, sélectionnez un serveur dans l'onglet Paramètres, puis connectez-vous.",
   "settings.account.buttonSave": "Mettre à jour le profil",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Factures",
   "settings.account.headlinePassword": "Changer le mot de passe",
   "settings.account.headlineProfile": "Mettre à jour le profil",
-  "settings.account.headlineSubscription": "Votre abonnement",
-  "settings.account.headlineTrialUpgrade": "Prenez l'essai de 14 jours gratuit de Ferdi Professionnel",
-  "settings.account.headlineUpgradeAccount": "Améliorer votre compte et recevez l'expérience de Ferdi au complet",
-  "settings.account.invoiceDownload": "Télécharger",
-  "settings.account.manageSubscription.label": "Gérer votre abonnement",
   "settings.account.successInfo": "Vos modifications ont été enregistrées",
-  "settings.account.trial": "Essai Gratuit",
-  "settings.account.trialEndsIn": "Votre essai gratuit fini dans {duration}.",
-  "settings.account.trialUpdateBillingInfo": "S'il vous plaît mettre à jour votre facturation pour utilisé {license} après votre période d’essais.",
   "settings.account.tryReloadServices": "Réessayer",
   "settings.account.tryReloadUserInfoRequest": "Réessayer",
-  "settings.account.upgradeToPro.label": "Passez à Ferdi Professionnel",
   "settings.account.userInfoRequestFailed": "Impossible de charger les informations de l'utilisateur",
   "settings.account.yourLicense": "Votre licence Ferdi",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Activer la vérification orthographique",
   "settings.app.form.enableSystemTray": "Afficher Ferdi dans la barre d'état système",
   "settings.app.form.enableTodos": "Activer Ferdi Todos",
-  "settings.app.form.hibernate": "Activer le service d'hibernation",
   "settings.app.form.hibernateOnStartup": "Garder les services en veille prolongée au démarrage",
   "settings.app.form.hibernationStrategy": "Stratégie d'hibernation",
   "settings.app.form.iconSize": "Taille de l'icône du service",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Activer le mode sombre universel",
   "settings.app.form.useTouchIdToUnlock": "Autoriser l'utilisation de TouchID pour déverrouiller Ferdi",
   "settings.app.form.useVerticalStyle": "Utiliser le style vertical",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Paramètres",
   "settings.app.headlineAdvanced": "Paramètres avancés",
   "settings.app.headlineAppearance": "Apparence",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "Par défaut, Ferdi gardera tous vos services ouverts et chargés en arrière-plan afin qu'ils soient prêts lorsque vous voulez les utiliser. Le service d'hibernation déchargera vos services après un montant spécifié. Ceci est utile pour sauver de la RAM ou garder les services de ralentir votre ordinateur.",
   "settings.app.inactivityLockInfo": "Minutes d'inactivité, après lesquelles Ferdi devrait se verrouiller automatiquement. Utilisez 0 pour désactiver",
   "settings.app.languageDisclaimer": "Les traductions officielles sont l'anglais et l'allemand. Toutes les autres langues sont des traductions faites par la communauté.",
-  "settings.app.lockInfo": "Le mot de passe de verrouillage de Ferdi vous permet de garder vos messages protégés.\nEn utilisant le mot de passe de verrouillage de Ferdi, vous allez être demandé de rentrer un mot de passe à chaque fois que vous démarré Ferdi ou verrouillé Ferdi vous même avec le symbole de cadenas en bas à gauche dans le coins ou avec le raccourcie CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Mot de passe",
   "settings.app.lockedPasswordInfo": "S'il vous plaît soyez sûre de mettre un mot de passe que vous allez vous rappelez.\nSi vous perdez ce mot de passe vous allez devoir réinstaller Ferdi.",
   "settings.app.restartRequired": "Les modifications nécessitent un redémarrage",
   "settings.app.scheduledDNDInfo": "Planifier le Ne-pas-Déranger vous permet de définir une période de temps dans lequel vous ne voulez pas de notifications de Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Le temps est en format 24 heures. La fin du temps peut être avant le début du temps (ex: début 17:00, fin 09:00) pour activer le Ne-pas-Déranger durant la nuit.",
-  "settings.app.sentryInfo": "L'envoi de données de télémétrie nous permet de trouver des erreurs dans Ferdi - nous n'enverrons aucune information personnelle comme vos données de message! La modification de cette option nécessite le redémarrage de Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi utilise le correcteur orthographique intégré de votre Mac pour vérifier les fautes de frappe. Si vous voulez changer les langues pour lesquelles le correcteur vérifie l'orthographe, vous pouvez le faire dans les préférences système de votre Mac.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "Ce serveur sera utilisé pour la fonctionnalité \"Ferdi Todo\".",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Ouvrir le dossier",
   "settings.recipes.headline": "Services disponibles",
   "settings.recipes.missingService": "Un service est manquant?",
-  "settings.recipes.mostPopular": "Les plus populaires",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Le service a été ajouté avec succès",
   "settings.searchService": "Chercher un service",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Ajouter {name}",
   "settings.service.form.availableServices": "Services disponibles",
   "settings.service.form.customUrl": "Serveur personnalisé",
-  "settings.service.form.customUrlPremiumInfo": "Pour ajouter des services auto-hébergés, vous avez besoin d'un compte Ferdi Premium Supporter.",
-  "settings.service.form.customUrlUpgradeAccount": "Améliorez votre compte",
   "settings.service.form.customUrlValidationError": "Impossible de valider le serveur modifié {name}.",
   "settings.service.form.darkReaderBrightness": "Luminosité de Dark Reader",
   "settings.service.form.darkReaderContrast": "Contraste de Dark Reader",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Gestion d'équipe Franz",
   "settings.team.copy": "La gestion d'équipe de Franz vous permet de gérer les abonnements Franz pour plusieurs utilisateurs. N’oubliez pas que le fait d’avoir un abonnement Franz Premium ne vous donnera aucun avantage dans l'utilisation de Ferdi : la seule raison pour laquelle vous avez encore accès à la gestion d’équipe est que vous pouvez gérer vos équipes Franz héritées et que vous ne perdez donc aucune fonctionnalité dans la gestion de votre compte.",
   "settings.team.headline": "Équipe",
-  "settings.team.intro": "Vous utilisez actuellement les serveurs Franz, c'est pourquoi vous avez accès à la gestion d'équipe.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Gérez votre équipe sur meetfranz.com",
   "settings.team.teamsUnavailable": "Les équipes sont indisponibles",
   "settings.team.teamsUnavailableInfo": "Les équipes sont actuellement disponibles uniquement lorsque vous utilisez le serveur de Franz et après avoir payé pour Franz Professionnel. Veuillez changer votre serveur à https://api.franzinfra.com pour utiliser des équipes.",
-  "settings.team.upgradeAction": "Améliorez votre compte",
   "settings.user.form.accountType.company": "Entreprise",
   "settings.user.form.accountType.individual": "Individuel",
   "settings.user.form.accountType.label": "Type de compte",
@@ -516,29 +431,20 @@
   "signup.link.login": "Vous avez déjà un compte? Connectez-vous",
   "signup.password.label": "Mot de passe",
   "signup.submit.label": "Créer un compte",
-  "subscription.bestValue": "Le meilleur prix",
-  "subscription.cta.activateTrial": "Oui, commencer l'essai gratuit de Ferdi Professionnel",
-  "subscription.cta.allOptions": "Voir toutes les options",
-  "subscription.cta.choosePlan": "Choisissez votre plan",
-  "subscription.includedProFeatures": "Le plan Ferdi Professionnel inclus:",
-  "subscription.interval.per": "par {interval}",
-  "subscription.interval.perMonth": "par mois",
-  "subscription.interval.perMonthPerUser": "par mois et utilisateur",
-  "subscription.planItem.upgradeAccount": "Améliorez votre compte",
-  "subscription.teaser.includedFeatures": "Les plans de Ferdi payés inclus:",
-  "subscription.teaser.intro": "Ferdi 5 viens avec une large plage de nouvelles fonctionnalités pour renforcer votre communication quotidienne - batteries inclus. Aller voir nos nouveaux plans et trouver celui qui vous satisfait le mieux!",
-  "subscriptionPopup.buttonCancel": "Annuler",
-  "subscriptionPopup.buttonDone": "Terminé",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Supprimer le service",
   "tabs.item.disableAudio": "Désactiver l'audio",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Désactiver les notifications",
   "tabs.item.disableService": "Désactiver le service",
   "tabs.item.edit": "Éditer",
   "tabs.item.enableAudio": "Activer l'audio",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Activer les notifications",
   "tabs.item.enableService": "Activer le service",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Actualiser",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} n'est pas valide",
   "validation.minLength": "{field} doit contenir au moins {length} caractère(s)",
   "validation.oneRequired": "Au moins un de ces champs est requis",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Espace de travail",
   "workspaceDrawer.item.contextMenuEdit": "Modifier",
   "workspaceDrawer.item.noServicesAddedYet": "Aucun services ajoutés pour l'instant",
-  "workspaceDrawer.premiumCtaButtonLabel": "Créez votre premier espace de travail",
-  "workspaceDrawer.proFeatureBadge": "Fonctionnalité premium",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Réactivez votre compte premium",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Les Espaces de travail de Ferdi vous permettant de rester concentré sur ce qui est important. Créez différents groupes de services et naviguez facilement entre eux à n'importe quel moment.</p><p>Vous décidez de quels services vous avez besoin, où et quand, ainsi nous pouvons vous aider à rester concentré sur votre travail - ou à le quitter dès que vous le souhaitez.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Éditer les paramètres de l'espace de travail",
   "workspaces.switchingIndicator.switchingTo": "Changement vers"
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 7c93c8a63..cc7715e03 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "Cealaigh",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Send as email",
   "feature.shareFranz.action.facebook": "Share on Facebook",
   "feature.shareFranz.action.twitter": "Share on Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Ní féidir nascadh le seirbhísí Ferdi ar líne",
-  "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "Níl tú nasctha leis an Idirlíon.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Iompórtáil do sheirbhísí Ferdi 4",
@@ -88,7 +52,6 @@
   "infobar.hide": "Cuir Ferdi i bhfolach",
   "infobar.requiredRequestsFailed": "Ní féidir seirbhísí agus eolas úsáideora a lódáil",
   "infobar.servicesUpdated": "Nuashonraíodh do sheirbhísí.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "Tá nuashonrú nua do Ferdi ar fáil.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Seoladh ríomhphoist",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Cuardaigh le nuashonruithe",
   "menu.app.hide": "Cuir Ferdi i bhfolach",
-  "menu.app.hideOthers": "Folaigh feidhmchláir eile",
-  "menu.app.quit": "Scoir",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Socruithe",
-  "menu.app.unhide": "Taispeáin",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Cuir in eagar",
-  "menu.edit.copy": "Cóipeáil",
-  "menu.edit.cut": "Gearr",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Scrios",
   "menu.edit.emojiSymbols": "Straoiseoga ⁊ siombailí",
   "menu.edit.findInPage": "Find in Page",
-  "menu.edit.paste": "Greamaigh",
-  "menu.edit.pasteAndMatchStyle": "Greamaigh agus cuir stíl in oiriúint",
-  "menu.edit.redo": "Athdhéan",
-  "menu.edit.selectAll": "Roghnaigh gach rud",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Caint",
   "menu.edit.startDictation": "Tosaigh deachtú",
   "menu.edit.startSpeaking": "Tosaigh ag caint",
   "menu.edit.stopSpeaking": "Stad ag caint",
-  "menu.edit.undo": "Cealaigh",
+  "menu.edit.undo": "Undo",
   "menu.file": "Comhad",
-  "menu.help": "Cabhair",
+  "menu.help": "Help",
   "menu.help.changelog": "Athruithe",
   "menu.help.debugInfo": "Copy Debug Information",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Tuilleadh eolais",
   "menu.help.privacy": "Ráiteas phríobháideachais",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Amharc",
   "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Cuir isteach mód lánscáileáin",
-  "menu.view.exitFullScreen": "Scoir mód lánscáileáin",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Athlódáil Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Athlódáil seirbhís",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Fíormhéid",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Scoránaigh uirlis forbróra",
-  "menu.view.toggleFullScreen": "Scoránaigh mód lánscáileáin",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Scoránaigh uirlis forbróra seirbhíse",
   "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
-  "menu.view.zoomIn": "Zúmáil isteach",
-  "menu.view.zoomOut": "Zúmáil amach",
-  "menu.window": "Fuinneog",
-  "menu.window.close": "Dún",
-  "menu.window.minimize": "Íoslaghdaigh",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Workspaces",
   "menu.workspaces.addNewWorkspace": "Add New Workspace...",
   "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
@@ -194,11 +156,7 @@
   "password.noUser": "Níor aimsíodh úsáideoir leis an seoladh ríomhphoist seo",
   "password.submit.label": "Cuir isteach",
   "password.successInfo": "Seiceáil do chuid ríomhphoist le do thoil",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Athlódáil {name}",
   "service.crashHandler.autoReload": "Ag iarraidh {name} a thabhairt ar ais go huathoibríoch i gceann {seconds} shoicind",
   "service.crashHandler.headline": "Oró, ní hea!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Oró, ní hea!",
   "service.errorHandler.message": "Earráid",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Cuir tús",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Fáilte go Ferdi",
   "settings.account.account.editButton": "Cuir cuntas in eagar",
-  "settings.account.accountType.basic": "Bunchuntas",
-  "settings.account.accountType.premium": "Cuntas Phŕeimhthacadóra Ferdi",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Nuashonraigh próifíl",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Sonraisc",
   "settings.account.headlinePassword": "Athraigh pasfhocal",
   "settings.account.headlineProfile": "Nuashonraigh próifíl",
-  "settings.account.headlineSubscription": "Do shíntiús",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Íoslódáil",
-  "settings.account.manageSubscription.label": "Bainistigh do shíntiús",
   "settings.account.successInfo": "Sábháladh do chuid athruithe",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Atriail",
   "settings.account.tryReloadUserInfoRequest": "Atriail",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Ní féidir eolas úsáideora a lódáil",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Cumasaigh seiceáil litrithe",
   "settings.app.form.enableSystemTray": "Taispeáin Ferdi i dtráidire an chórais",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Socruithe",
   "settings.app.headlineAdvanced": "Casta",
   "settings.app.headlineAppearance": "Dealramh",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Ní gá atosú chun athruithe a chur i bhfeidhm.",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Taisce",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Seirbhísí le fáil",
   "settings.recipes.missingService": "Seirbhís ar iarraidh?",
-  "settings.recipes.mostPopular": "Is coitianta",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Seirbhís curtha go rathúil",
   "settings.searchService": "Cuardaigh seirbhís",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Cuir {name} leis",
   "settings.service.form.availableServices": "Seirbhísí le fáil",
   "settings.service.form.customUrl": "Freastalaí saincheaptha",
-  "settings.service.form.customUrlPremiumInfo": "Chun seirbhísí féinóstáilte a chur le Ferdi, ní gá Cuntas Phŕeimhthacadóra Ferdi a bheith agat.",
-  "settings.service.form.customUrlUpgradeAccount": "Uasghrádaigh do chuntas",
   "settings.service.form.customUrlValidationError": "Ní féidir seirbhís {name} saincheaptha a dheimhniú",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Foireann",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Comhlacht",
   "settings.user.form.accountType.individual": "Ar leith",
   "settings.user.form.accountType.label": "Cineál chuntais",
@@ -516,29 +431,20 @@
   "signup.link.login": "Cuntas agat cheana féin, logáil isteach?",
   "signup.password.label": "Password",
   "signup.submit.label": "Cruthaigh cuntas",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Cealaigh",
-  "subscriptionPopup.buttonDone": "Déanta",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Scrios seirbhís",
   "tabs.item.disableAudio": "Díchumasaigh fuaim",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Díchumasaigh fógraí",
   "tabs.item.disableService": "Díchumasaigh seirbhís",
   "tabs.item.edit": "Cuir in eagar",
   "tabs.item.enableAudio": "Cumasaigh fuaim",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Cumasaigh fógraí",
   "tabs.item.enableService": "Cumasaigh seirbhís",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Athlódáil",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "Níl {field} neamhbhailí",
   "validation.minLength": "Ba cheart go mbeadh {field} ar a laghad {length} charactar fada",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 3b25c293e..fcba1f459 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "הו לא! פרדי איבד את החיבור ל {name}.",
   "feature.announcements.changelog.headline": "שינויים בגרסת פרדי מספר {version}",
   "feature.debugger.title": "פרסם את פרטי ניפוי השגיאות",
-  "feature.delayApp.headline": "אנא קנה את גרסת התומכים כדי לדלג על ההמתנה",
-  "feature.delayApp.text": "פרדי ימשיך בעוד {seconds} שניות.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "קבל רישיון תומכים של פרדי",
-  "feature.delayApp.upgrade.actionShort": "שדרג חשבון",
   "feature.nightlyBuilds.activate": "הפעל",
   "feature.nightlyBuilds.cancel": "בטל",
   "feature.nightlyBuilds.info": "גרסאות נייטלי הם גרסאות נסיוניות ביותר של פרדי, העשויות להכיל פיצ'רים בלתי גמורים. גרסאות אלה מיועדות בעיקר לשימוש מפתחים על מנת לנסות את הפיצ'רים החדשים הנמצאים בפיתוח - לפני הכנסתם לגרסה הסופית. אם אתה לא יודע מה אתה עושה, אנו ממליצים שלא תפעיל את האופציה הזאת.",
   "feature.nightlyBuilds.title": "גרסאות נייטלי",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "קיימת שגיאה בפרסום מידע ניפוי השגיאות, אנא נסה שנית מאוחר יותר או הסתכל בקובץ הלוג למידע נוסף.",
   "feature.publishDebugInfo.info": "פרסום מידע ניפוי השגיאות עוזר לנו למצוא ולטפל בבאגים בפרדי. בפרסום מידע ניפוי השגיאות הנך מסכים למדיניות הפרטיות ותנאי השימוש של מפתחי פרדי",
   "feature.publishDebugInfo.privacy": "מדיניות הפרטיות",
@@ -49,48 +26,34 @@
   "feature.quickSwitch.info": "בחר שירות עם מקש ה TAB, ↑ ו ↓. פתח שירות באמצעות מקש ה ENTER.",
   "feature.quickSwitch.search": "חיפוש...",
   "feature.quickSwitch.title": "החלפה מהירה",
-  "feature.serviceLimit.limitReached": "הוספת {amount} מתוך {limit} שירותים האפשריים בגרסה שלך. אנא שדרג את החשבון שלך על מנת להוסיף שירותים נוספים.",
   "feature.shareFranz.action.email": "שלח בתור אימייל",
   "feature.shareFranz.action.facebook": "שיתוף ב-Facebook",
   "feature.shareFranz.action.twitter": "שתף בטוויטר",
   "feature.shareFranz.headline": "פרדי מוצלחת יותר ביחד!",
   "feature.shareFranz.shareText.email": "הוספתי {count} שירותים לפרדי! קבל את האפליקציה בחינם עבור ווטסאפ, מסנג'ר, סלאק, סקייפ ועוד ב www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "הוספתי {count} שירותים לפרדי! קבל את האפליקציה בחינם עבור ווטסאפ, מסנג'ר, סלאק, סקייפ ועוד ב www.getferdi.com /cc @FerdiMessenger",
-  "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "שדרוג חשבון",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
-  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.franzProRequired": "נדרשת גרסת פרדי מקצועית",
+  "feature.shareFranz.text": "ספר לחבריך ולעמיתיך כמה Ferdi הוא מדהים ועזור לנו להפיץ את הבשורה.",
+  "global.api.unhealthy": "לא ניתן להתחבר לשרותי האינטרנת של Ferdi",
   "global.notConnectedToTheInternet": "נראה שאתה לא מחובר לאינטרנט.",
   "global.spellchecker.useDefault": "השתמש בברירת המחדל של המערכת ({default})",
   "global.spellchecking.autodetect": "זהה שפה באופן אוטומטי",
   "global.spellchecking.autodetect.short": "אוטומטי",
   "global.spellchecking.language": "שפה לבדיקת איות",
-  "global.upgradeButton.upgradeToPro": "שדרג לגרסת פרדי מקצועית",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
-  "global.userAgentPref": "User Agent",
+  "global.userAgentPref": "סוכן משתמש",
   "import.headline": "ייבא את השירותים שלך מפרדי גרסה 4",
   "import.notSupportedHeadline": "השירות עדיין אינו נתמך בפרדי גרסה 5",
   "import.skip.label": "אני רוצה להוסיף שירותים באופן ידני",
   "import.submit.label": "ייבא שירותים",
-  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
+  "infobar.authRequestFailed": "אירעה שגיאה בניסיון ההתחברות. נסה להתנתק ולהתחבר מחדש.",
   "infobar.buttonChangelog": "מה חדש?",
   "infobar.buttonInstallUpdate": "הפעל מחדש והתקן עדכונים",
   "infobar.buttonReloadServices": "טען מחדש את השירותים",
   "infobar.hide": "הסתר",
   "infobar.requiredRequestsFailed": "לא ניתן לטעון את השירותים ואת מידע המשתמש",
   "infobar.servicesUpdated": "השירותים שלך עודכנו.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "עדכון חדש לפרדי זמין.",
-  "infobox.dismiss": "Dismiss",
+  "infobox.dismiss": "בטל",
   "invite.email.label": "כתובת דוא\"ל",
   "invite.headline.friends": "הזמן 3 מחבריך",
   "invite.name.label": "שם",
@@ -98,7 +61,7 @@
   "invite.submit.label": "שלח הזמנות",
   "invite.successInfo": "ההזמנות נשלחו בהצלחה",
   "locked.headline": "נעול",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
+  "locked.info": "Ferdi נעול כרגע. אנא בטל את נעילת Ferdi באמצעות הסיסמה כדי לראות את ההודעות שלך.",
   "locked.invalidCredentials": "הסיסמא אינה תקינה",
   "locked.password.label": "סיסמא",
   "locked.submit.label": "בטל נעילה",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "הסתרת שורת התפריטים באופן אוטומטי",
   "menu.app.checkForUpdates": "חפש עדכונים",
   "menu.app.hide": "הסתר",
-  "menu.app.hideOthers": "הסתר את האחרים",
-  "menu.app.quit": "יציאה",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "הגדרות",
-  "menu.app.unhide": "בטל הסתרה",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "ערוך",
-  "menu.edit.copy": "העתק",
-  "menu.edit.cut": "גזור",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "מחק",
   "menu.edit.emojiSymbols": "אימוג'ים וסמלים",
   "menu.edit.findInPage": "חפש בדף",
-  "menu.edit.paste": "הדבק",
-  "menu.edit.pasteAndMatchStyle": "הדבק והתאם לסגנון",
-  "menu.edit.redo": "בצע שוב",
-  "menu.edit.selectAll": "בחר הכל",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "דיבור",
   "menu.edit.startDictation": "התחל הכתבה",
   "menu.edit.startSpeaking": "הקרא",
   "menu.edit.stopSpeaking": "הפסק הקראה",
-  "menu.edit.undo": "בטל",
+  "menu.edit.undo": "Undo",
   "menu.file": "קובץ",
-  "menu.help": "עזרה",
+  "menu.help": "Help",
   "menu.help.changelog": "רשימת שינויים",
   "menu.help.debugInfo": "העתק פרטי ניפוי שגיאות",
   "menu.help.debugInfoCopiedBody": "פרטי ניקוי השגיאות הועתקו בהצלחה ללוח.",
   "menu.help.debugInfoCopiedHeadline": "פרטי ניקוי השגיאות של פרדי",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "למידע נוסף",
   "menu.help.privacy": "הצהרת פרטיות",
   "menu.help.publishDebugInfo": "פרסם את פרטי ניפוי השגיאות",
@@ -156,32 +120,30 @@
   "menu.help.tos": "תנאי שימוש",
   "menu.services": "שירותים",
   "menu.services.activatePreviousService": "הפעל את השירות הקודם",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "הוסף שירות חדש",
   "menu.services.goHome": "בית",
   "menu.services.setNextServiceActive": "הפעל את השירות הבא",
   "menu.todos": "משימות",
   "menu.todos.enableTodos": "אפשר משימות",
   "menu.view": "הצג",
   "menu.view.back": "חזור",
-  "menu.view.enterFullScreen": "עבור למסך מלא",
-  "menu.view.exitFullScreen": "צא ממסך מלא",
   "menu.view.forward": "קדימה",
   "menu.view.lockFerdi": "נעל את פרדי",
   "menu.view.openQuickSwitch": "פתח החלפה מהירה",
-  "menu.view.reloadFranz": "טען מחדש את פרדי",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "טען מחדש את השירות",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "גודל אמיתי",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "הפעל\\בטל מצב לילה",
   "menu.view.toggleDevTools": "הצג/הסתר כלי פיתוח של משימות",
-  "menu.view.toggleFullScreen": "הפעל/הפסק מצב מסך מלא",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "הצג/הסתר כלי פיתוח",
   "menu.view.toggleTodosDevTools": "הצג/הסתר כלי פיתוח",
-  "menu.view.zoomIn": "התמקד",
-  "menu.view.zoomOut": "התרחק",
-  "menu.window": "חלון",
-  "menu.window.close": "סגור",
-  "menu.window.minimize": "מזער",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "סביבות עבודה",
   "menu.workspaces.addNewWorkspace": "הוסף שירות חדש...",
   "menu.workspaces.closeWorkspaceDrawer": "סגור את סרגל סביבות העבודה",
@@ -194,11 +156,7 @@
   "password.noUser": "לא נמצא משתמש עם כתובת הדוא\"ל הזאת",
   "password.submit.label": "שלח",
   "password.successInfo": "אנא בדוק את הדוא\"ל שלך",
-  "premiumFeature.button.upgradeAccount": "שדרג חשבון",
   "pricing.features.accountSync": "סנכון החשבון",
-  "pricing.features.adFree": "לעולם נטול פרסומות",
-  "pricing.features.appDelays": "ללא מסכי המתנה",
-  "pricing.features.appDelaysEnabled": "מסכי המתנה מדי פעם",
   "pricing.features.customWebsites": "הוסף אתרים מותאמים אישית",
   "pricing.features.desktopNotifications": "התראות שולחן העבודה",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "ניהול צוות",
   "pricing.features.thirdPartyServices": "התקן שירותי צד שלישי",
   "pricing.features.unlimitedServices": "הוסף שירותים בלי הגבלה",
-  "pricing.features.upToSixServices": "הוסף עד ל 6 שירותים",
-  "pricing.features.upToThreeServices": "הוסף עד ל 3 שירותים",
   "pricing.features.workspaces": "סביבות עבודה",
-  "pricing.plan.free": "פרדי חינמי",
-  "pricing.plan.legacy": "פרדי פרימיום",
-  "pricing.plan.personal": "פרדי אישי",
-  "pricing.plan.personal-monthly": "פרדי אישי לחודש",
-  "pricing.plan.personal-yearly": "פרדי אישי לשנה",
-  "pricing.plan.pro": "פרדי מקצועי",
-  "pricing.plan.pro-monthly": "פרדי מקצועי לחודש",
-  "pricing.plan.pro-yearly": "פרדי מקצועי לשנה",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "טען מחדש {name}",
   "service.crashHandler.autoReload": "מנסה לשחזר את {name} באופן אוטומטי בעוד {seconds} שניות",
   "service.crashHandler.headline": "הו, לא!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "הו, לא!",
   "service.errorHandler.message": "שגיאה",
   "service.errorHandler.text": "{name} לא הצליח להיטען.",
-  "service.restrictedHandler.action": "שדרוג חשבון",
-  "service.restrictedHandler.customUrl.headline": "נדרשת גרסת פרדי מקצועית",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "הגעת למגבלת השירותים המירבית שלך.",
-  "service.restrictedHandler.serviceLimit.text": "אנא עדכן את החשבון שלך כדי להשתמש ביותר מ {count} שירותים.",
   "service.webviewLoader.loading": "טוען את {service}",
   "services.getStarted": "התחל",
   "services.login": "אנא התחבר כדי להשתמש בפרדי.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "השתמש בפרדי ללא חשבון",
   "services.welcome": "ברוך הבא לפרדי",
   "settings.account.account.editButton": "ערוך את החשבון",
-  "settings.account.accountType.basic": "חשבון בסיסי",
-  "settings.account.accountType.premium": "חשבון פרימיום לתומכים",
   "settings.account.accountUnavailable": "החשבון אינו זמין",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "עדכן פרופיל",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "חשבוניות",
   "settings.account.headlinePassword": "שנה סיסמה",
   "settings.account.headlineProfile": "עדכן פרופיל",
-  "settings.account.headlineSubscription": "המנוי שלך",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "הורד",
-  "settings.account.manageSubscription.label": "נהל את המנוי שלך",
   "settings.account.successInfo": "השינויים שלך נשמרו",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "נסה שוב",
   "settings.account.tryReloadUserInfoRequest": "נסה שוב",
-  "settings.account.upgradeToPro.label": "שדרג לגרסת פרדי מקצועית",
   "settings.account.userInfoRequestFailed": "אי אפשר לטעון את פרטי המשתמש",
   "settings.account.yourLicense": "רישיון הפרדי שלך",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "הפעל בדיקת איות",
   "settings.app.form.enableSystemTray": "הצג את פרדי בסרגל הכלים",
   "settings.app.form.enableTodos": "אפשר את רשימת המשימות של Ferdi",
-  "settings.app.form.hibernate": "אפשר מצב שינה",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "גודל סמל השירות",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "הגדרות",
   "settings.app.headlineAdvanced": "מתקדם",
   "settings.app.headlineAppearance": "תצוגה",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "סיסמא",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "שינויים מצריכים הפעלה מחדש",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "זיכרון מטמון",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "פתח תיקיה",
   "settings.recipes.headline": "שירותים זמינים",
   "settings.recipes.missingService": "לא מוצא את השירות שלך?",
-  "settings.recipes.mostPopular": "הפופולריים ביותר",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "השירות נוסף בהצלחה",
   "settings.searchService": "חפש שירות",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "הוסף {name}",
   "settings.service.form.availableServices": "שירותים זמינים",
   "settings.service.form.customUrl": "שרת מותאם אישית",
-  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "שדרג את החשבון שלך",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "צוות",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "נהל את הצוות שלך ב meetfranz.com",
   "settings.team.teamsUnavailable": "יכולת זו אינה זמינה",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "שדרג את החשבון שלך",
   "settings.user.form.accountType.company": "חברה",
   "settings.user.form.accountType.individual": "יחיד",
   "settings.user.form.accountType.label": "סוג חשבון",
@@ -516,29 +431,20 @@
   "signup.link.login": "משתמש קיים? התחבר עכשיו",
   "signup.password.label": "סיסמא",
   "signup.submit.label": "צור חשבון",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "הצג את כל האפשרויות",
-  "subscription.cta.choosePlan": "בחר את התוכנית שלך",
-  "subscription.includedProFeatures": "גרסת פרדי המקצועית כוללת:",
-  "subscription.interval.per": "לכל {interval}",
-  "subscription.interval.perMonth": "לחודש",
-  "subscription.interval.perMonthPerUser": "לחודש \\ משתמש",
-  "subscription.planItem.upgradeAccount": "שדרוג חשבון",
-  "subscription.teaser.includedFeatures": "גרסאות פרדי בתשלום כוללות:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "בטל",
-  "subscriptionPopup.buttonDone": "הסתיים",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "מחק שירות",
   "tabs.item.disableAudio": "כבה אודיו",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "כבה התראות",
   "tabs.item.disableService": "כבה שירות",
   "tabs.item.edit": "ערוך",
   "tabs.item.enableAudio": "אפשר אודיו",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "אפשר התראות",
   "tabs.item.enableService": "אפשר שירות",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "רענן",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} is not valid",
   "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "סביבות עבודה",
   "workspaceDrawer.item.contextMenuEdit": "ערוך",
   "workspaceDrawer.item.noServicesAddedYet": "לא נוספו שירותים…",
-  "workspaceDrawer.premiumCtaButtonLabel": "צור את סביבת העבודה הראשונה שלך",
-  "workspaceDrawer.proFeatureBadge": "תכונת פרימיום",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "הפעל מחדש את חשבון הפרמיום שלי",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "הגדרות סביבת עבודה",
   "workspaces.switchingIndicator.switchingTo": "מעבר ל"
diff --git a/src/i18n/locales/hi.json b/src/i18n/locales/hi.json
index 2372494e5..a4e4e4e85 100644
--- a/src/i18n/locales/hi.json
+++ b/src/i18n/locales/hi.json
@@ -5,30 +5,6 @@
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "फ्रांज़ के संस्करण {version} में बदलाव:",
-  "feature.delayApp.headline": "Upgrade your Ferdi plan to skip the wait",
-  "feature.delayApp.text": "फ्रांज़ {seconds} सेकंड में जारी रहेगा।",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14-days trial and skip the wait",
-  "feature.delayApp.upgrade.action": "Upgrade Ferdi",
-  "feature.delayApp.upgrade.actionShort": "खाते का उन्नयन करें",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}?",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "ईमेल के रूप में भेजें",
   "feature.shareFranz.action.facebook": "फेसबुक पर सांझा करें",
   "feature.shareFranz.action.twitter": "ट्विटर पर सांझा करें",
@@ -36,16 +12,6 @@
   "feature.shareFranz.shareText.email": "मैंने फ्रांज में {count} सेवाएं जोड़ी हैं! व्हाट्सएप, मैसेंजर, स्लैक, स्काइप के लिए मुफ्त ऐप www.getferdi.com पर प्राप्त करें",
   "feature.shareFranz.shareText.twitter": "मैंने फ्रांज में {count} सेवाएं जोड़ी हैं! व्हाट्सएप, मैसेंजर, स्लैक, स्काइप के लिए मुफ्त ऐप www.getferdi.com पर प्राप्त करें / cc @FerdiMessenger",
   "feature.shareFranz.text": "अपने दोस्तों और सहकर्मियों को बताएं की फ्रांज़ कितना बढ़िया है और हमें इस बात को फैलाने में मदद करें।",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "फ्रांज़ ऑनलाइन सेवाओं से कनेक्ट नहीं किया जा सका",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "आप इंटरनेट से नहीं जुड़े हैं।",
@@ -53,7 +19,6 @@
   "global.spellchecking.autodetect": "स्वचालित रूप से भाषा का पता लगाएं",
   "global.spellchecking.autodetect.short": "स्वचालित",
   "global.spellchecking.language": "वर्तनी जाँच भाषा",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "import.headline": "अपनी फ्रांज़ 4 की सेवाओं का आयात करें",
   "import.notSupportedHeadline": "सेवाएं अभी तक फ्रांज़ 5 में समर्थित नहीं हैं",
   "import.skip.label": "मैं स्वयं सेवाएं जोड़ना चाहता हूं",
@@ -63,7 +28,6 @@
   "infobar.buttonReloadServices": "सेवाओं को फिर से लोड करें",
   "infobar.requiredRequestsFailed": "सेवाएं और उपयोगकर्ताओं की जानकारी लोड नहीं हो सकी",
   "infobar.servicesUpdated": "आपकी सेवाएं अपडेट कर दी गई हैं।",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "फ्रांज़ के लिए एक नया अपडेट उपलब्ध है।",
   "invite.email.label": "ईमेल पता",
   "invite.headline.friends": "अपने दोस्तों या सहयोगियों में से 3 को आमंत्रित करें",
@@ -122,9 +86,7 @@
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "दृश्य",
-  "menu.view.enterFullScreen": "पूर्ण स्क्रीन में प्रवेश",
-  "menu.view.exitFullScreen": "पूर्ण स्क्रीन से निकलें",
-  "menu.view.reloadFranz": "फ्रांज़ को पुनः लोड",
+  "menu.view.reloadFerdi": "फ्रांज़ को पुनः लोड",
   "menu.view.reloadService": "सेवा पुनः लोड करें",
   "menu.view.reloadTodos": "Reload ToDos",
   "menu.view.resetZoom": "वास्तविक आकार",
@@ -149,7 +111,6 @@
   "password.noUser": "उस ईमेल पते वाला कोई उपयोगकर्ता नहीं मिला",
   "password.submit.label": "जमा करें",
   "password.successInfo": "कृपया अपनी ईमेल देखें",
-  "premiumFeature.button.upgradeAccount": "खाते का उन्नयन करें",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
@@ -166,27 +127,6 @@
   "pricing.features.upToSixServices": "Add up to 6 services",
   "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "कार्यस्थान",
-  "pricing.plan.free": "Free",
-  "pricing.plan.legacy": "Premium",
-  "pricing.plan.personal": "Personal",
-  "pricing.plan.personal-monthly": "Personal Monthly",
-  "pricing.plan.personal-yearly": "Personal Yearly",
-  "pricing.plan.pro": "Professional",
-  "pricing.plan.pro-monthly": "Professional Monthly",
-  "pricing.plan.pro-yearly": "Professional Yearly",
-  "pricing.trial.cta.accept": "Start my 14-day Ferdi Professional Trial ",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "{name} को पुनः लोड करें ",
   "service.crashHandler.autoReload": "{name} को {seconds} सेकंड में स्वचालित रूप से पुनर्स्थापित करने की कोशिश जारी है",
   "service.crashHandler.headline": "अरे नहीं!",
@@ -198,11 +138,6 @@
   "service.errorHandler.headline": "अरे नहीं!",
   "service.errorHandler.message": "त्रुटि",
   "service.errorHandler.text": "{name} लोड करने में विफलता हुई ",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "लोड हो रहा है",
   "services.getStarted": "आरंभ करें",
   "services.welcome": "फ्रांज़ में आपका स्वागत है",
@@ -219,18 +154,9 @@
   "settings.account.headlineInvoices": "चालान",
   "settings.account.headlinePassword": "पासवर्ड बदलें",
   "settings.account.headlineProfile": "प्रोफ़ाइल अपडेट करें",
-  "settings.account.headlineSubscription": "आपकी सदस्यता",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "डाउनलोड",
-  "settings.account.manageSubscription.label": "अपनी सदस्यता प्रबंधित करें",
   "settings.account.successInfo": "आपके परिवर्तनों को सहेजा गया है",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "फिर कोशिश करें",
   "settings.account.tryReloadUserInfoRequest": "फिर कोशिश करें",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "उपयोगकर्ता की जानकारी लोड नहीं हो सकी",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.buttonClearAllCache": "कैश को साफ़ करें",
@@ -284,7 +210,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "उपलब्ध सेवाएं",
   "settings.recipes.missingService": "क्या कोई सेवा गुम है?",
-  "settings.recipes.mostPopular": "सबसे लोकप्रिय",
   "settings.recipes.nothingFound": "क्षमा करें, लेकिन आपके खोज शब्द से किसी भी सेवा का मिलान नहीं हुआ।",
   "settings.recipes.servicesSuccessfulAddedInfo": "सेवा सफलतापूर्वक जोड़ी गई",
   "settings.searchService": "खोज सेवा",
@@ -295,7 +220,6 @@
   "settings.service.form.availableServices": "उपलब्ध सेवाएं",
   "settings.service.form.customUrl": "कस्टम सर्वर",
   "settings.service.form.customUrlPremiumInfo": "स्वयं की होस्ट की गई सेवाओं को जोड़ने के लिए, आपको फ्रांज प्रीमियम सपोर्टर अकाउंट की आवश्यकता है।",
-  "settings.service.form.customUrlUpgradeAccount": "अपने खाते को अपग्रेड करें",
   "settings.service.form.customUrlValidationError": "कस्टम {name} सर्वर का मान्यकरण नहीं किया जा सका।",
   "settings.service.form.deleteButton": "सेवा हटाएँ",
   "settings.service.form.editServiceHeadline": "{name} संपादित करें",
@@ -391,19 +315,6 @@
   "signup.link.login": "पहले से ही एक खाता है? लॉग इन करें।",
   "signup.password.label": "पासवर्ड",
   "signup.submit.label": "खता खोलें",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "रद्द करें",
-  "subscriptionPopup.buttonDone": "संपन्न",
   "tabs.item.deleteService": "सेवा हटाएँ",
   "tabs.item.disableAudio": "ऑडियो अक्षम करें",
   "tabs.item.disableNotifications": "ऑडियो अक्षम करें",
@@ -431,7 +342,6 @@
   "workspaceDrawer.item.contextMenuEdit": "संपादन करें",
   "workspaceDrawer.item.noServicesAddedYet": "अभी तक कोई सेवा नहीं जोड़ी गई है",
   "workspaceDrawer.premiumCtaButtonLabel": "अपना पहला कार्यक्षेत्र बनाएँ",
-  "workspaceDrawer.proFeatureBadge": "प्रीमियम सुविधा",
   "workspaceDrawer.reactivatePremiumAccountLabel": "प्रीमियम खाता पुनः सक्रिय करें",
   "workspaceDrawer.workspaceFeatureInfo": "<p>फ्रांज वर्कस्पेस आपको इस बात पर ध्यान केंद्रित करने देता है कि अभी क्या महत्वपूर्ण है। सेवाओं के विभिन्न समूहों को तैयार करें और किसी भी समय उनके बीच आसानी से स्विच करें।</p><p>आप यह तय करते हैं कि आपको कब और कहाँ किन सेवाओं की ज़रूरत है, इसलिए हम आपको अपने खेल में शीर्ष पर बने रहने में मदद कर सकते हैं - या जब भी आप चाहें, आसानी से काम बंद कर सकते हैं।</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "कार्यस्थान सेटिंग्स संपादित करें",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 9f940c368..a1716483e 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "Odustani",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Send as email",
   "feature.shareFranz.action.facebook": "Share on Facebook",
   "feature.shareFranz.action.twitter": "Share on Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Nije se moguće povezati na Francove on-line servise. ",
-  "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "Sada ste povezani s internetom. ",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Uvezite svoje Franc 4 servise. ",
@@ -88,7 +52,6 @@
   "infobar.hide": "Hide",
   "infobar.requiredRequestsFailed": "Nemoguće učitati servise i korisničke informacije",
   "infobar.servicesUpdated": "Vaši servisi su ažurirani. ",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "Novo ažuriranje Ferdi-a je dostupno. ",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Vaša e-adresa:",
@@ -149,6 +112,7 @@
   "menu.help.debugInfo": "Copy Debug Information",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Learn More",
   "menu.help.privacy": "Izjava o privatnosti ",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,12 +127,10 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "View",
   "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Enter Full Screen",
-  "menu.view.exitFullScreen": "Exit Full Screen",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.reloadTodos": "Reload ToDos",
   "menu.view.resetZoom": "Actual Size",
@@ -194,11 +156,7 @@
   "password.noUser": "Ne postoji ni jedan korisnik s tom e-mail adresom",
   "password.submit.label": "Pošalji",
   "password.successInfo": "Molimo Vas da provjerite svoju e-mail adresu",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Osvježi okvir",
   "service.crashHandler.autoReload": "Pokušati ću automatski povratiti {name} u {seconds} sekundi",
   "service.crashHandler.headline": "O, ne! ",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "O, ne! ",
   "service.errorHandler.message": "Greška",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Započnimo!",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Dobrodošli u Ferdi",
   "settings.account.account.editButton": "Uredi račun",
-  "settings.account.accountType.basic": "Osnovni račun",
-  "settings.account.accountType.premium": "Premium račun",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Ažuriraj profil",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Fakture",
   "settings.account.headlinePassword": "Promijenite lozinku",
   "settings.account.headlineProfile": "Ažuriraj profil",
-  "settings.account.headlineSubscription": "Vaša pretplata",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Preuzmite",
-  "settings.account.manageSubscription.label": "Upravljajte pretplatama",
   "settings.account.successInfo": "Vaše promjene su spremljene",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Pokušajte ponovno",
   "settings.account.tryReloadUserInfoRequest": "Pokušajte ponovno",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Nije moguće učitati informacije o korisniku",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Omogući provjeru pravopisa",
   "settings.app.form.enableSystemTray": "Prikaži aplikaciju u sustavskoj traci",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Postavke",
   "settings.app.headlineAdvanced": "Napredne alatke",
   "settings.app.headlineAppearance": "Izgled",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Promjene postavki zahtijevaju ponovni zagon",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Predmemorija",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Dostupne usluge",
   "settings.recipes.missingService": "Da li neki servis nedostaje?",
-  "settings.recipes.mostPopular": "Najpopularniji",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Usluga uspješno dodana. ",
   "settings.searchService": "Potraži servis",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Dodaj {name}",
   "settings.service.form.availableServices": "Dostupne usluge",
   "settings.service.form.customUrl": "Prilagođen server",
-  "settings.service.form.customUrlPremiumInfo": "Da bi ste dodali samo-hostovane usluge, potreban vam je Premium račun.",
-  "settings.service.form.customUrlUpgradeAccount": "Nadogradite Vaš račun",
   "settings.service.form.customUrlValidationError": "Nije moguće odobriti prilagođeno {name} servera.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Tim",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Tvrtka",
   "settings.user.form.accountType.individual": "Pojedinac",
   "settings.user.form.accountType.label": "Tip računa",
@@ -516,29 +431,20 @@
   "signup.link.login": "Imate račun? Prijavite se.",
   "signup.password.label": "Password",
   "signup.submit.label": "Napravite novi račun",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Odustani",
-  "subscriptionPopup.buttonDone": "Završeno",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Izbriši uslugu",
   "tabs.item.disableAudio": "Onemogući zvuk",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Onemogući obavijesti",
   "tabs.item.disableService": "Onemogući servis",
   "tabs.item.edit": "Uredi",
   "tabs.item.enableAudio": "Omogućite zvuk",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Omogućite obavijesti",
   "tabs.item.enableService": "Omogućite usluge",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Ponovno učitavanje",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} is not valid",
   "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index afe2341ed..fe52240f4 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Ja ne! Ferdi nem tud kapcsolodni {name}-hez.",
   "feature.announcements.changelog.headline": "Ferdi {version} változásai",
   "feature.debugger.title": "Hibakeresési napló publikálása",
-  "feature.delayApp.headline": "Kérjük vásárolj egy Franc Támogatói Liszencet a várakozás átugrásához",
-  "feature.delayApp.text": "A Ferdi továbblép {seconds} másodperc múlva.",
-  "feature.delayApp.trial.action": "Igen, szeretném kipróbálni 14 napig a Ferdi Professional-t ingyen",
-  "feature.delayApp.trial.actionShort": "Aktiválom az ingyenes Ferdi Professional próbaidőszakot",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Szerezz egy Ferdi Támogatói Liszencet",
-  "feature.delayApp.upgrade.actionShort": "Fiók frissítése",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "Mégsem",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "Hiba történt a hibakeresési napló publikálása közben. Kérem próbálja meg később.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Adatvédelmi szabályzat",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Keresés...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Küldés email-ben",
   "feature.shareFranz.action.facebook": "Megosztás Facebook-on",
   "feature.shareFranz.action.twitter": "Megosztás Twitter-en",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "A Ferdi Tennivalók már elérhető a prémium felhasználók részére!",
-  "feature.todos.premium.rollout": "Mindenki másnak még egy kicsit tovább kell várni.",
-  "feature.todos.premium.upgrade": "Fiók frissítése",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Nem lehet csatlakozni a Ferdi online szolgáltatáshoz",
-  "global.franzProRequired": "Ferdi Professional szükséges",
   "global.notConnectedToTheInternet": "Nincs hálózati kapcsolat.",
   "global.spellchecker.useDefault": "Rendszer alapbeállítás használata ({default})",
   "global.spellchecking.autodetect": "Automatikus nyelvdetektálás",
   "global.spellchecking.autodetect.short": "Automatikus",
   "global.spellchecking.language": "Helyesírás-ellenőrző nyelve",
-  "global.upgradeButton.upgradeToPro": "Frissítés Ferdi Professional-ra",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importáld szolgáltatásaidat a Ferdi 4-ből",
@@ -88,7 +52,6 @@
   "infobar.hide": "Elrejt",
   "infobar.requiredRequestsFailed": "Szolgáltatások és felhasználói információk nem tölthetők be",
   "infobar.servicesUpdated": "A szolgáltatások frissítésre kerültek.",
-  "infobar.trialActivated": "A próbaidőszak aktiválva. Jó mulatást!",
   "infobar.updateAvailable": "Új frissítés érhető el a Ferdi-hoz.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Email cím",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Frissítések keresése",
   "menu.app.hide": "Elrejt",
-  "menu.app.hideOthers": "Többi elrejtése",
-  "menu.app.quit": "Kilépés",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Beállítások",
-  "menu.app.unhide": "Megjelenít",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Szerkesztés",
-  "menu.edit.copy": "Másolás",
-  "menu.edit.cut": "Kivágás",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Törlés",
   "menu.edit.emojiSymbols": "Emoji és Szimbólumok",
   "menu.edit.findInPage": "Find in Page",
-  "menu.edit.paste": "Beillesztés",
-  "menu.edit.pasteAndMatchStyle": "Beillesztés ugyanazzal a megjelenéssel",
-  "menu.edit.redo": "Újra",
-  "menu.edit.selectAll": "Összes kijelölése",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Beszéd",
   "menu.edit.startDictation": "Diktálás elkezdése",
   "menu.edit.startSpeaking": "Beszélgetés kezdeményezése",
   "menu.edit.stopSpeaking": "Beszéd vége",
-  "menu.edit.undo": "Visszavonás",
+  "menu.edit.undo": "Undo",
   "menu.file": "Fájl",
-  "menu.help": "Súgó",
+  "menu.help": "Help",
   "menu.help.changelog": "Változások listája",
   "menu.help.debugInfo": "Hibajelentés másolása",
   "menu.help.debugInfoCopiedBody": "A Hibajelentést a vágólapra másoltuk.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Hibajelentés",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Tudjon meg többet",
   "menu.help.privacy": "Adatvédelmi Nyilatkozatot",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Nézet",
   "menu.view.back": "Vissza",
-  "menu.view.enterFullScreen": "Kilépés a teljes képernyős módból",
-  "menu.view.exitFullScreen": "Kilépés a teljes képernyős módból",
   "menu.view.forward": "Előre",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Ferdi újrainditása",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Szolgáltatás újraindítása",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Tényleges méret",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Fejlesztői eszközök ki/bekapcsolása",
-  "menu.view.toggleFullScreen": "Teljes képernyős mód ki/bekapcsolása",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Szolgáltatás Fejlesztői Eszközök ki/bekapcsolása",
   "menu.view.toggleTodosDevTools": "Tennivalók Fejlesztői Eszközök kapcsolása",
-  "menu.view.zoomIn": "Nagyítás",
-  "menu.view.zoomOut": "Kicsinyítés",
-  "menu.window": "Ablak",
-  "menu.window.close": "Bezárás",
-  "menu.window.minimize": "Tálcára",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Munkaterületek",
   "menu.workspaces.addNewWorkspace": "Új munkaterület...",
   "menu.workspaces.closeWorkspaceDrawer": "Munkaterület panel bezárása",
@@ -194,11 +156,7 @@
   "password.noUser": "Nem található felhasználó a megadott email címmel",
   "password.submit.label": "Küldés",
   "password.successInfo": "Ellenőrizd az email fiókodat",
-  "premiumFeature.button.upgradeAccount": "Fiók frissítése",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Hirdetésmentesség, örökre!",
-  "pricing.features.appDelays": "Nincsenek töltőképernyők",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Egyéni weboldalak megadása",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "Helyi és egyéb távoli szolgáltatások",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Csapatkezelés",
   "pricing.features.thirdPartyServices": "Harmadik féltől származó szolgáltatások használata",
   "pricing.features.unlimitedServices": "Korlátlan szolgáltatások felvitele",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Munkaterületek",
-  "pricing.plan.free": "Ingyenes Ferdi",
-  "pricing.plan.legacy": "Ferdi Prémium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "{name} újratöltése",
   "service.crashHandler.autoReload": "{name} automatikusan helyreállítása {seconds} másodpercen belül",
   "service.crashHandler.headline": "Jajj ne!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Jajj ne!",
   "service.errorHandler.message": "Hiba",
   "service.errorHandler.text": "{name} nem tudott betöltődni.",
-  "service.restrictedHandler.action": "Fiók frissítése",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Kezdj hozzá",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Üdvözöl a Ferdi",
   "settings.account.account.editButton": "Fiók szerkesztése",
-  "settings.account.accountType.basic": "Alap Fiók",
-  "settings.account.accountType.premium": "Prémium Támogató Fiók",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Profil frissítése",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Számlák",
   "settings.account.headlinePassword": "Jelszócsere",
   "settings.account.headlineProfile": "Profil frissítése",
-  "settings.account.headlineSubscription": "Előfizetésed",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Letöltés",
-  "settings.account.manageSubscription.label": "Előfizetés kezelése",
   "settings.account.successInfo": "A módosításokat elmentettük",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Próbáld újra",
   "settings.account.tryReloadUserInfoRequest": "Próbáld újra",
-  "settings.account.upgradeToPro.label": "Frissítés Ferdi Professional-ra",
   "settings.account.userInfoRequestFailed": "A felhasználói adatok betöltése sikertelen",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Helyesírás-ellenőrzés engedélyezése",
   "settings.app.form.enableSystemTray": "Ferdi mutatása a tálcán",
   "settings.app.form.enableTodos": "Ferdi Tennivalók bekapcsolása",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Beállítások",
   "settings.app.headlineAdvanced": "Haladó",
   "settings.app.headlineAppearance": "Megjelenés",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "A hivatalos fordítások angol és német nyelven elérhetőek. Minden más nyelv közösségi fordításon alapul.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Újraindítást igénylő módosítás",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Gyorsítótár",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Könyvtár megnyitása",
   "settings.recipes.headline": "Elérhető szolgáltatások",
   "settings.recipes.missingService": "Hiányzik egy szolgáltatás?",
-  "settings.recipes.mostPopular": "Legnépszerűbb",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Szolgáltatás sikeresen hozzáadva",
   "settings.searchService": "Szolgáltatások keresése",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "{name} hozzáadása",
   "settings.service.form.availableServices": "Elérhető szolgáltatások",
   "settings.service.form.customUrl": "Egyéni szerver",
-  "settings.service.form.customUrlPremiumInfo": "Egyénileg üzemeltetett szolgáltatások hozzáadásához Ferdi Prémium Támogató Fiók szükséges.",
-  "settings.service.form.customUrlUpgradeAccount": "Frissítsd fiókodat",
   "settings.service.form.customUrlValidationError": "Nem sikerült érvényesíteni az egyéni {name} kiszolgálót.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Csapat",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Előfizetés",
   "settings.user.form.accountType.company": "Cég",
   "settings.user.form.accountType.individual": "Egyén",
   "settings.user.form.accountType.label": "Fiók típusa",
@@ -516,29 +431,20 @@
   "signup.link.login": "Már van fiókod? Lépj be!",
   "signup.password.label": "Password",
   "signup.submit.label": "Fiók létrehozása",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Fiók frissítése",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Mégsem",
-  "subscriptionPopup.buttonDone": "Kész",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Szolgáltatás törlése",
   "tabs.item.disableAudio": "Hang letiltása",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Értesítések letiltása",
   "tabs.item.disableService": "Szolgáltatás letiltása",
   "tabs.item.edit": "Szerkesztés",
   "tabs.item.enableAudio": "Hang engedélyezése",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Értesítések engedélyezése",
   "tabs.item.enableService": "Szolgáltatás engedélyezése",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Újratöltés",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} nem érvényes",
   "validation.minLength": "{field} mezőnek legalább {length} karakter hosszúnak kell lennie",
   "validation.oneRequired": "Legalább egy kitöltése szükséges",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Munkaterületek",
   "workspaceDrawer.item.contextMenuEdit": "szerkeszt",
   "workspaceDrawer.item.noServicesAddedYet": "Még nincsenek hozzáadott szolgáltatások",
-  "workspaceDrawer.premiumCtaButtonLabel": "Készítsd el az első munkaterületedet",
-  "workspaceDrawer.proFeatureBadge": "Prémium funkció",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Prémium fiók reaktiválása",
   "workspaceDrawer.workspaceFeatureInfo": "<p>A Ferdi Munkaterületek lehetővé teszik, hogy összpontosíts a jelenleg fontos dolgokra. Állítsd be a különböző szolgáltatáskészleteket és könnyedén válthatsz közöttük bármikor.</p><p>Te döntöd el, hogy mely szolgáltatásokra van szükséged, mikor és hol, így segíthetünk abban, hogy a teljesítményed csúcsán maradhass, vagy ha csak akarod, egyszerűen kikapcsold a munkával kapcsolatos dolgokat.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Munkaterület beállítások szerkesztése",
   "workspaces.switchingIndicator.switchingTo": "Váltás"
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 59a128cc4..caa33a068 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Yah! Ferdi terputus dari {name}.",
   "feature.announcements.changelog.headline": "Perubahan dalam Ferdi {version}",
   "feature.debugger.title": "Terbitkan informasi debug",
-  "feature.delayApp.headline": "Beli Lisensi Pendukung Ferdi agar tidak perlu menunggu",
-  "feature.delayApp.text": "Ferdi akan melanjutkan dalam {seconds} detik.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Dapatkan Lisensi Pendukung Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Tingkatkan akun",
   "feature.nightlyBuilds.activate": "Mengaktifkan",
   "feature.nightlyBuilds.cancel": "Batalkan",
   "feature.nightlyBuilds.info": "Nightly builds adalah versi eksperimen dari Ferdi yang mungkin berisi fitur-fitur yang masih kasar dan tidak lengkap. Nightly builds ini biasa digunakan untuk para developer untuk mengetes fitur-fitur terbaru mereka dan bagaimana fitur-fitur itu berjalan di versi terakhir. Jika anda tidak tahu apa yang anda lakukan, kami sarankan untuk tidak mengaktivasi nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Kirim sebagai email",
   "feature.shareFranz.action.facebook": "Bagikan di Facebook",
   "feature.shareFranz.action.twitter": "Bagikan di Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "Saya telah menambahkan layanan {count} ke Ferdi! Dapatkan aplikasi gratis untuk WhatsApp, Messenger, Slack, Skype dan co di www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "Saya telah menambahkan {count} layanan di Ferdi! Dapatkan aplikasi gratis untuk WhatsApp, Messenger, Slack, Skype dan lainnya di www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Beri tahu teman dan kolega Anda betapa hebatnya Ferdi dan bantu kami menyebarkan berita.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade akun",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Tidak dapat tersambung ke layanan Ferdi",
-  "global.franzProRequired": "Ferdi versi Profesional dibutuhkan",
   "global.notConnectedToTheInternet": "Anda tidak tersambung ke internet.",
   "global.spellchecker.useDefault": "Gunakan Bawaan Sistem ({default})",
   "global.spellchecking.autodetect": "Deteksi bahasa secara otomatis",
   "global.spellchecking.autodetect.short": "Otomatis",
   "global.spellchecking.language": "Periksa ejaan",
-  "global.upgradeButton.upgradeToPro": "Upgrade ke Ferdi Profesional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Impor layanan Ferdi 4 Anda",
@@ -88,7 +52,6 @@
   "infobar.hide": "Sembunyikan",
   "infobar.requiredRequestsFailed": "Gagal memuat layanan dan informasi pengguna",
   "infobar.servicesUpdated": "Layanan Anda telah diperbarui",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "Versi baru Ferdi tersedia.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Alamat email",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Periksa versi baru",
   "menu.app.hide": "Sembunyikan",
-  "menu.app.hideOthers": "Sembunyikan Lainnya",
-  "menu.app.quit": "Keluar",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Pengaturan",
-  "menu.app.unhide": "Perlihatkan",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
-  "menu.edit.copy": "Salin",
-  "menu.edit.cut": "Potong",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Hapus",
   "menu.edit.emojiSymbols": "Emoji & Simbol",
   "menu.edit.findInPage": "Find in Page",
-  "menu.edit.paste": "Tempel",
-  "menu.edit.pasteAndMatchStyle": "Tempel dan Cocokkan Gaya",
-  "menu.edit.redo": "Ulangi lagi",
-  "menu.edit.selectAll": "Pilih Semua",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Bicara",
   "menu.edit.startDictation": "Mulai Dikte",
   "menu.edit.startSpeaking": "Mulai Berbicara",
   "menu.edit.stopSpeaking": "Berhenti Berbicara",
-  "menu.edit.undo": "Batalkan",
+  "menu.edit.undo": "Undo",
   "menu.file": "Berkas",
-  "menu.help": "Bantuan",
+  "menu.help": "Help",
   "menu.help.changelog": "Log Perubahan",
   "menu.help.debugInfo": "Copy Debug Information",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Pelajari Lebih Lanjut",
   "menu.help.privacy": "Pernyataan Privasi",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Tampilan",
   "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Masuk ke Mode Layar Penuh",
-  "menu.view.exitFullScreen": "Keluar dari Layar Penuh",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Muat Ulang Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Muat ulang Layanan",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Ukuran Sebenarnya",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Aktif/Nonaktifkan alat pengembang",
-  "menu.view.toggleFullScreen": "Aktif/Nonaktifkan Layar Penuh",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Aktif/Nonaktifkan layanan alat pengembang",
   "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
-  "menu.view.zoomIn": "Perbesar",
-  "menu.view.zoomOut": "Perkecil",
-  "menu.window": "Jendela",
-  "menu.window.close": "Tutup",
-  "menu.window.minimize": "Minimalkan",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Ruang kerja",
   "menu.workspaces.addNewWorkspace": "Tambah Ruang Kerja Baru...",
   "menu.workspaces.closeWorkspaceDrawer": "Tutup laci ruang kerja",
@@ -194,11 +156,7 @@
   "password.noUser": "Tidak ditemukan pengguna dengan email tersebut",
   "password.submit.label": "Kirim",
   "password.successInfo": "Periksa email Anda",
-  "premiumFeature.button.upgradeAccount": "Tingkatkan akun",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Ruang kerja",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Muat Ulang {name}",
   "service.crashHandler.autoReload": "Mencoba memulihkan {name} secara otomatis dalam {seconds} detik",
   "service.crashHandler.headline": "Ya Ampun!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Ya Ampun!",
   "service.errorHandler.message": "Kesalahan",
   "service.errorHandler.text": "{name} gagal dimuat",
-  "service.restrictedHandler.action": "Upgrade akun",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Memulai",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Selamat datang di Ferdi",
   "settings.account.account.editButton": "Edit akun",
-  "settings.account.accountType.basic": "Akun Dasar",
-  "settings.account.accountType.premium": "Akun Pendukung Premium",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Perbarui profil",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Tagihan",
   "settings.account.headlinePassword": "Ubah sandi",
   "settings.account.headlineProfile": "Perbarui profil",
-  "settings.account.headlineSubscription": "Langganan Anda",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Unduh",
-  "settings.account.manageSubscription.label": "Kelola langganan Anda",
   "settings.account.successInfo": "Perubahan Anda telah disimpan",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Coba lagi",
   "settings.account.tryReloadUserInfoRequest": "Coba lagi",
-  "settings.account.upgradeToPro.label": "Upgrade ke Ferdi Profesional",
   "settings.account.userInfoRequestFailed": "Gagal memuat informasi pengguna",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Aktifkan pemeriksaan ejaan",
   "settings.app.form.enableSystemTray": "Tampilkan Ferdi di baki sistem",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Pengaturan",
   "settings.app.headlineAdvanced": "Tingkat Lanjut",
   "settings.app.headlineAppearance": "Tampilan",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Penerjemahan resmi dilakukan untuk Bahasa Inggris dan Jerman. Bahasa lainnya merupakan penerjemahan oleh komunitas.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Perubahan membutuhkan mulai ulang",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Singgahan",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Layanan tersedia",
   "settings.recipes.missingService": "Layanan tidak tersedia?",
-  "settings.recipes.mostPopular": "Terpopuler",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Layanan berhasil ditambahkan",
   "settings.searchService": "Cari layanan",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Tambahkan {name}",
   "settings.service.form.availableServices": "Layanan tersedia",
   "settings.service.form.customUrl": "Server khusus",
-  "settings.service.form.customUrlPremiumInfo": "Untuk menambahkan layanan hosted yang dijalankan mandiri, Anda membutuhkan Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "Tingkatkan akun Anda",
   "settings.service.form.customUrlValidationError": "Gagal memvalidasi server {name} khusus.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Tim",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Tingkatkan Akun Anda",
   "settings.user.form.accountType.company": "Perusahaan",
   "settings.user.form.accountType.individual": "Pribadi",
   "settings.user.form.accountType.label": "Jenis akun",
@@ -516,29 +431,20 @@
   "signup.link.login": "Sudah punya akun, masuk?",
   "signup.password.label": "Password",
   "signup.submit.label": "Buat akun",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade akun",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Batalkan",
-  "subscriptionPopup.buttonDone": "Selesai",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Hapus layanan",
   "tabs.item.disableAudio": "Nonaktifkan audio",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Nonaktifkan pemberitahuan",
   "tabs.item.disableService": "Nonaktifkan layanan",
   "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Aktifkan audio",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktifkan pemberitahuan",
   "tabs.item.enableService": "Aktifkan layanan",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Muat Ulang",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} tidak benar",
   "validation.minLength": "{field} setidaknya harus {length} karakter",
   "validation.oneRequired": "Setidaknya diperlukan satu",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Ruang kerja",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "Belum ada layanan yang ditambahkan",
-  "workspaceDrawer.premiumCtaButtonLabel": "Buat ruang kerja pertama Anda",
-  "workspaceDrawer.proFeatureBadge": "Fitur premium",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Aktifkan ulang akun premium",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ruang Kerja Ferdi dapat digunakan untuk tetap fokus pada hal penting saat ini. Siapkan sekelompok layanan yang berbeda dan dengan mudah beralih ke yang lain.</p><p>Anda yang memutuskan layanan mana yang Anda perlukan dan kapan, agar kami bisa membantu Anda tetap berada di garis depan - atau dengan mudah mengakhiri hari kerja kapan saja Anda inginkan.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit setelan ruang kerja",
   "workspaces.switchingIndicator.switchingTo": "Beralih ke"
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 76269d4ab..e349677a0 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh no! Ferdi ha perso la connessione con {name}.",
   "feature.announcements.changelog.headline": "Modifiche in Ferdi {version}",
   "feature.debugger.title": "Pubblica informazioni di debug",
-  "feature.delayApp.headline": "Per favore, compra una Licenza Supporter di Ferdi per saltare l'attesa",
-  "feature.delayApp.text": "Ferdi continuerà tra {seconds} secondi.",
-  "feature.delayApp.trial.action": "Sì, voglio la prova gratuita di 14 giorni di Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Attiva la prova gratuita di Ferdi Professional",
-  "feature.delayApp.trial.headline": "Ottieni la prova gratuita per 14 giorni di Ferdi Professional e salta la coda",
-  "feature.delayApp.upgrade.action": "Ricevi una Licenza Supporter di Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Effettua l'upgrade del tuo account",
   "feature.nightlyBuilds.activate": "Attivato",
   "feature.nightlyBuilds.cancel": "Annulla",
   "feature.nightlyBuilds.info": "Le 'Nightly Builds' sono versioni sperimentali di Ferdi che possono contenere funzionalità incomplete o non perfettamente funzionanti. Queste versioni sono principalmente usate dagli sviluppatori per effettuare dei test sulle nuove caratteristiche e verificare come si integrano nella versione finale di Ferdi. Se non sei sicuro di quello che stai facendo, ti consigliamo di non attivare le 'Nightly Builds'.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "Si è verificato un errore durante il tentativo di pubblicare le informazioni di debug. Riprova più tardi o vedi la console per maggiori informazioni.",
   "feature.publishDebugInfo.info": "Pubblicare le informazioni di debug ci aiuta a trovare problemi ed errori in Ferdi. Pubblicando le informazioni di debug accetti l'informativa sulla privacy e i termini di servizio di Ferdi Debugger",
   "feature.publishDebugInfo.privacy": "Informativa sulla privacy",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Seleziona un servizio con TAB, ↑ e ↓. Apri un servizio con INVIO.",
   "feature.quickSwitch.search": "Cerca...",
   "feature.quickSwitch.title": "Cambio Veloce",
-  "feature.serviceLimit.limitReached": "Hai aggiunto {amount} su {limit} servizi che sono inclusi nel tuo piano. Per favore potenzia il tuo account per aggiungere più servizi.",
   "feature.shareFranz.action.email": "Manda come email",
   "feature.shareFranz.action.facebook": "Condividi su Facebook",
   "feature.shareFranz.action.twitter": "Condividi su Twitter",
@@ -57,25 +33,13 @@
   "feature.shareFranz.shareText.email": "Ho aggiunto {count} nuovi servizi a Ferdi! Scarica ora l'app gratuita per WhatsApp, Messenger, Slack, Skype e altri all'indirizzo www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "Ho aggiunto {count} nuovi servizi a Ferdi! Scarica ora l’app gratuita per WhatsApp, Messenger, Slack, Skype e altri all’indirizzo www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Di’ ai tuoi amici e colleghi quanto Ferdi è fantastico e aiutaci a diffondere la parola.",
-  "feature.todos.premium.info": "Le attività Ferdi sono ora disponibili agli utenti premium!",
-  "feature.todos.premium.rollout": "Chiunque altro dovrà aspettare un po' di più.",
-  "feature.todos.premium.upgrade": "Potenzia l'Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Impossibile connettersi ai servizi online di Ferdi",
-  "global.franzProRequired": "Richiesto Ferdi Professional",
   "global.notConnectedToTheInternet": "Non sei connesso a Internet.",
   "global.spellchecker.useDefault": "Usa le impostazioni predefinite di sistema ({default})",
   "global.spellchecking.autodetect": "Rileva automaticamente la lingua",
   "global.spellchecking.autodetect.short": "Automatico",
   "global.spellchecking.language": "Lingua per controllo ortografico",
-  "global.upgradeButton.upgradeToPro": "Aggiorna a Ferdi Professional",
-  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
+  "global.userAgentHelp": "Usa 'https://whatmyuseragent.com/' (per scoprire) o 'https://developers.whatismybrowser.com/useragents/explore/' (per scegliere) il tuo user agent desiderato e copialo qui.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importa i servizi di Ferdi 4",
   "import.notSupportedHeadline": "Servizi non ancora supportati in Ferdi 5",
@@ -88,9 +52,8 @@
   "infobar.hide": "Nascondi",
   "infobar.requiredRequestsFailed": "Impossibile caricare i servizi e le informazioni dell'utente",
   "infobar.servicesUpdated": "I tuoi servizi sono stati aggiornati.",
-  "infobar.trialActivated": "La tua prova è stata attivata con successo. Buona chat!",
   "infobar.updateAvailable": "È disponibile un nuovo aggiornamento di Ferdi.",
-  "infobox.dismiss": "Dismiss",
+  "infobox.dismiss": "Annulla",
   "invite.email.label": "Indirizzo email",
   "invite.headline.friends": "Invita 3 dei tuoi amici o colleghi",
   "invite.name.label": "Nome",
@@ -106,8 +69,8 @@
   "locked.touchIdPrompt": "sblocca con Touch ID",
   "locked.unlockWithPassword": "Sblocca con Password",
   "login.changeServer": "Cambia Server",
-  "login.customServerQuestion": "Using a custom Ferdi server?",
-  "login.customServerSuggestion": "Try importing your Franz account",
+  "login.customServerQuestion": "Utilizzare un account Franz per effettuare il login?",
+  "login.customServerSuggestion": "Prova ad importare il tuo account Franz in Ferdi",
   "login.email.label": "Indirizzo email",
   "login.headline": "Accedi",
   "login.invalidCredentials": "Email o password non valide",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Nascondi automaticamente la barra del menù",
   "menu.app.checkForUpdates": "Controlla aggiornamenti",
   "menu.app.hide": "Nascondi",
-  "menu.app.hideOthers": "Nascondi altri",
-  "menu.app.quit": "Esci",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Impostazioni",
-  "menu.app.unhide": "Mostra",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Modifica",
-  "menu.edit.copy": "Copia",
-  "menu.edit.cut": "Taglia",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Elimina",
   "menu.edit.emojiSymbols": "Emoji e simboli",
   "menu.edit.findInPage": "Trova nella pagina",
-  "menu.edit.paste": "Incolla",
-  "menu.edit.pasteAndMatchStyle": "Incolla e Mantieni Stile",
-  "menu.edit.redo": "Ripeti",
-  "menu.edit.selectAll": "Seleziona Tutto",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Sintesi Vocale",
   "menu.edit.startDictation": "Avvia Dettatura",
   "menu.edit.startSpeaking": "Avvia Pronuncia",
   "menu.edit.stopSpeaking": "Interrompi Pronuncia",
-  "menu.edit.undo": "Annulla",
+  "menu.edit.undo": "Undo",
   "menu.file": "File",
-  "menu.help": "Aiuto",
+  "menu.help": "Help",
   "menu.help.changelog": "Changelog",
   "menu.help.debugInfo": "Copia informazioni di debug",
   "menu.help.debugInfoCopiedBody": "Le tue informazioni di debug sono state copiate nella tua clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Informazioni di debug di Ferdi",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Maggiori Informazioni",
   "menu.help.privacy": "Dichiarazione della Privacy",
   "menu.help.publishDebugInfo": "Pubblica le informazioni di debug",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Abilita Todos",
   "menu.view": "Visualizza",
   "menu.view.back": "Indietro",
-  "menu.view.enterFullScreen": "Visualizza a Schermo Intero",
-  "menu.view.exitFullScreen": "Esci da Schermo Intero",
   "menu.view.forward": "Avanti",
   "menu.view.lockFerdi": "Blocca Ferdi",
   "menu.view.openQuickSwitch": "Apri Cambio Rapido",
-  "menu.view.reloadFranz": "Ricarica Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Ricarica Servizio",
   "menu.view.reloadTodos": "Ricarica ToDos",
-  "menu.view.resetZoom": "Dimensione Attuale",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Attiva la modalità scura",
   "menu.view.toggleDevTools": "Attiva/Disattiva Strumenti Sviluppo",
-  "menu.view.toggleFullScreen": "Attiva/Disattiva Schermo Intero",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Attiva/Disattiva Strumenti per Sviluppatori di Servizi",
   "menu.view.toggleTodosDevTools": "Attiva/Disattiva gli strumenti di sviluppo delle Attività",
-  "menu.view.zoomIn": "Aumenta Zoom",
-  "menu.view.zoomOut": "Diminuisci Zoom",
-  "menu.window": "Finestra",
-  "menu.window.close": "Chiudi",
-  "menu.window.minimize": "Minimizza",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Aree di lavoro",
   "menu.workspaces.addNewWorkspace": "Aggiungi un'area di lavoro...",
   "menu.workspaces.closeWorkspaceDrawer": "Chiudi il menu dei workspace",
@@ -194,11 +156,7 @@
   "password.noUser": "Non è stato trovato nessun utente con questo indirizzo email",
   "password.submit.label": "Invia",
   "password.successInfo": "Per favore controlla la tua email",
-  "premiumFeature.button.upgradeAccount": "Effettua l'upgrade del tuo account",
   "pricing.features.accountSync": "Sincronizzazione account",
-  "pricing.features.adFree": "Senza pubblicità per sempre",
-  "pricing.features.appDelays": "Nessuna schermata di attesa",
-  "pricing.features.appDelaysEnabled": "Schermate d'attesa Occasionali",
   "pricing.features.customWebsites": "Aggiungi siti web personalizzati",
   "pricing.features.desktopNotifications": "Notifiche desktop",
   "pricing.features.onPremise": "Servizi ospitati & on-premise",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Gestione del team",
   "pricing.features.thirdPartyServices": "Installa servizi di terze parti",
   "pricing.features.unlimitedServices": "Aggiungi servizi illimitati",
-  "pricing.features.upToSixServices": "Aggiungi fino a 6 servizi",
-  "pricing.features.upToThreeServices": "Aggiungi fino a 3 servizi",
   "pricing.features.workspaces": "Aree di lavoro",
-  "pricing.plan.free": "Ferdi Gratuito",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Mensile",
-  "pricing.plan.personal-yearly": "Ferdi Personal Annuale",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Mensile",
-  "pricing.plan.pro-yearly": "Ferdi Professional Annuale",
-  "pricing.trial.cta.accept": "Sì, potenzia il mio account a Ferdi Professional",
-  "pricing.trial.cta.skip": "Continua su Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Ci dispiace, non abbiamo potuto attivare la tua prova!",
-  "pricing.trial.features.headline": "Ferdi Professional include:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "La tua prova gratuita finirà automaticamente dopo 14 giorni",
-  "pricing.trial.terms.headline": "Senza impegno",
-  "pricing.trial.terms.noCreditCard": "Nessuna carta di credito richiesta",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Ricarica {name}",
   "service.crashHandler.autoReload": "Tentativo di ripristino automatico di {name} in {seconds} secondi",
   "service.crashHandler.headline": "Oh no!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Errore",
   "service.errorHandler.text": "{name} non si è caricato correttamente.",
-  "service.restrictedHandler.action": "Potenzia l'Account",
-  "service.restrictedHandler.customUrl.headline": "Richiesto il piano Ferdi Professional",
-  "service.restrictedHandler.customUrl.text": "Per favore aggiorna al piano Ferdi Professional per usare url personalizzati e servizi da te ospitati.",
-  "service.restrictedHandler.serviceLimit.headline": "Hai raggiunto il tuo limite di servizio.",
-  "service.restrictedHandler.serviceLimit.text": "Per favore potenzia il tuo account per usare più di {count} servizi.",
   "service.webviewLoader.loading": "Caricamento {service}",
   "services.getStarted": "Iniziamo",
   "services.login": "Effettua il login per utlizzare Ferdi.",
-  "services.serverInfo": "Eventualmente, è possibile modificare server Ferdi facendo click sull'ingranaggio in basso a sinistra.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Usa Ferdi senza account",
   "services.welcome": "Benvenuto su Ferdi",
   "settings.account.account.editButton": "Modifica account",
-  "settings.account.accountType.basic": "Account Base",
-  "settings.account.accountType.premium": "Account Supporter Premium ",
   "settings.account.accountUnavailable": "Account non disponibile",
   "settings.account.accountUnavailableInfo": "Stai usando Ferdi senza un account. Se si desidera aggiungere un account, e tenere sincronizzati i servizi tra le installazioni, selezionare un server nel tab delle Impostazioni e quindi login.",
   "settings.account.buttonSave": "Aggiorna profilo",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Fatture",
   "settings.account.headlinePassword": "Cambia password",
   "settings.account.headlineProfile": "Aggiorna profilo",
-  "settings.account.headlineSubscription": "Il tuo abbonamento",
-  "settings.account.headlineTrialUpgrade": "Ottieni la tua prova gratuita di 14 giorni di Ferdi Professional",
-  "settings.account.headlineUpgradeAccount": "Potenzia il tuo account ed ottieni l'esperienza Ferdi completa",
-  "settings.account.invoiceDownload": "Scarica",
-  "settings.account.manageSubscription.label": "Gestisci il tuo abbonamento",
   "settings.account.successInfo": "Le tue modifiche sono state salvate",
-  "settings.account.trial": "Prova Gratuita",
-  "settings.account.trialEndsIn": "La tua prova gratuita scade tra {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Per favore aggiorna le tue informazioni di pagamento per continuare ad usare {license} dopo il tuo periodo di prova.",
   "settings.account.tryReloadServices": "Riprova",
   "settings.account.tryReloadUserInfoRequest": "Riprova",
-  "settings.account.upgradeToPro.label": "Aggiorna a Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Impossibile caricare le informazioni dell'utente.",
   "settings.account.yourLicense": "La tua licenza Ferdi",
   "settings.app.accentColorInfo": "Inserisci il tuo colore in risalto in un formato compatibile con CSS. (Default: {defaultAccentColor})",
@@ -289,7 +208,7 @@
   "settings.app.buttonSearchForUpdate": "Controlla aggiornamenti",
   "settings.app.cacheInfo": "Ferdi sta utilizzando {size} di spazio su disco.",
   "settings.app.cacheNotCleared": "Impossibile eliminare tutta la cache",
-  "settings.app.closeSettings": "Close settings",
+  "settings.app.closeSettings": "Chiudi le impostazioni",
   "settings.app.currentVersion": "Versione attuale:",
   "settings.app.form.accentColor": "Tema colore",
   "settings.app.form.adaptableDarkMode": "Sincronizza la modalità scusa con quella del mio sistema operativo",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Attiva controllo ortografico",
   "settings.app.form.enableSystemTray": "Mostra Ferdi nell'area di notifica",
   "settings.app.form.enableTodos": "Abilità le Attività Ferdi",
-  "settings.app.form.hibernate": "Abilita l'ibernazione dei servizi",
   "settings.app.form.hibernateOnStartup": "Mantieni i servizi in ibernazione all'avvio",
   "settings.app.form.hibernationStrategy": "Strategia di ibernazione",
   "settings.app.form.iconSize": "Dimensione icone servizi",
@@ -319,7 +237,7 @@
   "settings.app.form.minimizeToSystemTray": "Minimizza Ferdi nell'area di notifica",
   "settings.app.form.navigationBarBehaviour": "Comportamento della barra di navigazione",
   "settings.app.form.notifyTaskBarOnMessage": "Visualizza le notifiche relative a nuovi messaggi sul Dock o sulla Taskbar",
-  "settings.app.form.passwordToggle": "Password toggle",
+  "settings.app.form.passwordToggle": "Attiva/Disattiva password",
   "settings.app.form.predefinedTodoServer": "Server Todo",
   "settings.app.form.privateNotifications": "Non mostrare il contenuto dei messaggi nelle notifiche",
   "settings.app.form.reloadAfterResume": "Ricarica Ferdi dopo il ripristino del sistema",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Abilita la modalità scura universale",
   "settings.app.form.useTouchIdToUnlock": "Consenti l'utilizzo di TouchID per sbloccare Ferdi",
   "settings.app.form.useVerticalStyle": "Usa stile verticale",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Impostazioni",
   "settings.app.headlineAdvanced": "Avanzate",
   "settings.app.headlineAppearance": "Aspetto",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "Per impostazione predefinita, Ferdi manterrà tutti i servizi aperti e caricati in background in modo che siano pronti quando si desidera utilizzarli. Il servizio Hibernation sospenderà i servizi dopo un tempo specificato. Questo è utile per risparmiare RAM o per evitare che i servizi rallentino il computer.",
   "settings.app.inactivityLockInfo": "Minuti di inattività oltre i quali Ferdi si bloccherà automaticamente, 0 per disabilitare",
   "settings.app.languageDisclaimer": "Le traduzioni ufficiali sono in Inglese e Tedesco. Tutte le altre lingue sono tradotte dalla community.",
-  "settings.app.lockInfo": "Password Lock consente di mantenere i messaggi protetti.\nUsando Password Lock, ti verrà richiesto di inserire la tua password ogni volta che avvii Ferdi o di bloccare Ferdi utilizzando il simbolo del lucchetto nell'angolo in basso a sinistra o la scorciatoia CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Assicurati di impostare una password che ricordi.\nSe perdi questa password, dovrai reinstallare Ferdi.",
   "settings.app.restartRequired": "Le modifiche richiedono un riavvio",
   "settings.app.scheduledDNDInfo": "I Do-not-Disturb pianificati consentono di definire un periodo di tempo nel quale le notifiche da Ferdi saranno disabilitate.",
   "settings.app.scheduledDNDTimeInfo": "Ora in formato 24 ore. L'ora di fine può essere prima dell'ora di inizio (ad esempio inizio 17:00, fine 09:00) per abilitare Do-not-Disturb durante la notte.",
-  "settings.app.sentryInfo": "L'invio dei dati di telemetria ci permette di trovare errori in Ferdi - non invieremo alcuna informazione personale come i tuoi dati dei messaggi! La modifica di questa opzione richiede il riavvio di Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi utilizza il controllo ortografico del tuo Mac per verificare la presenza di errori. Se si desidera modificare le lingue del controllo ortografico, è possibile farlo nelle preferenze di sistema del vostro Mac.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "Questo server verrà usato per le funzionalità 'Ferdi Todo'.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Apri cartella",
   "settings.recipes.headline": "Servizi disponibili",
   "settings.recipes.missingService": "Manca un servizio?",
-  "settings.recipes.mostPopular": "Più popolari",
   "settings.recipes.nothingFound": "Ci scusiamo, ma nessun servizio corrisponde ai tuoi termini di ricerca - tuttavia è probabile che tu possa aggiungerlo in ogni caso utilizzando l'opzione \"Sito Web Personalizzato\". Ti informiamo che il sito web ufficiale potrebbe mostrare un numero maggiore di servizi rispetto alla versione attualmente in uso. Per ottenere tali servizi, è consigliato l'aggiornamento a una versione più recente di Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Servizio aggiunto con successo",
   "settings.searchService": "Cerca servizio",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Aggiungi {name}",
   "settings.service.form.availableServices": "Servizi disponibili",
   "settings.service.form.customUrl": "Server personalizzato",
-  "settings.service.form.customUrlPremiumInfo": "Per aggiungere servizi personalizzati, devi avere un account Ferdi Premium Supporter.",
-  "settings.service.form.customUrlUpgradeAccount": "Aggiorna il tuo account",
   "settings.service.form.customUrlValidationError": "Impossibile validare il server personalizzato {name}.",
   "settings.service.form.darkReaderBrightness": "Luminosità della Modalità Scura",
   "settings.service.form.darkReaderContrast": "Contrasto della Modalità Scura",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Il gestore di Team di Franz (Franz's Team Management) ti consente di gestire gli abbonamenti Franz (Franz Subscriptions) per più utenti. È importante ricordare che possedere un abbonamento Premium Franz non dà alcun beneficio nell'usare Ferdi. L'unico motivo per cui hai accesso al gestore di Team è perchè tu posa gestire i tuoi Team di Franz creati in precedenza così da non perdere alcuna funzionalità nella gestione del tuo account.",
   "settings.team.headline": "Gruppo",
-  "settings.team.intro": "Al momento stai usando i Server di Franz. Questo è il motivo per cui puoi accedere alla gestione dei Team (Team Management).",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Gestisci i tuoi Team su meetfranz.com",
   "settings.team.teamsUnavailable": "I Teams non sono disponibili",
   "settings.team.teamsUnavailableInfo": "I Team sono disponibili esclusivamente usando Franz Server e dopo aver attivato Franz Professional (a pagamento). Per poter utilizzare i Team è necessario modificare il server in https://api.franzinfra.com.",
-  "settings.team.upgradeAction": "Aggiorna il tuo Account",
   "settings.user.form.accountType.company": "Società",
   "settings.user.form.accountType.individual": "Individuale",
   "settings.user.form.accountType.label": "Tipo di account",
@@ -516,29 +431,20 @@
   "signup.link.login": "Hai già un account, vuoi accedere?",
   "signup.password.label": "Password",
   "signup.submit.label": "Crea un account",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Sì, inizia la prova gratuita di Ferdi Professional",
-  "subscription.cta.allOptions": "Vedi tutte le opzioni",
-  "subscription.cta.choosePlan": "Scegli il tuo piano",
-  "subscription.includedProFeatures": "Il piano Ferdi Professional include:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per mese",
-  "subscription.interval.perMonthPerUser": "per mese e utente",
-  "subscription.planItem.upgradeAccount": "Potenzia l'Account",
-  "subscription.teaser.includedFeatures": "I piani Ferdi a pagamento includono:",
-  "subscription.teaser.intro": "Ferdi 5 contiene un ampia gamma di nuove caratteristiche per potenziare le tue comunicazioni di tutti i giorni - incluse le batterie. Dai un'occhiata ai nostri nuovi piani per scoprire quale si adatta di più a te!",
-  "subscriptionPopup.buttonCancel": "Annulla",
-  "subscriptionPopup.buttonDone": "Fatto",
   "tabs.item.confirmDeleteService": "Vuoi davvero eliminare il servizio {serviceName}?",
   "tabs.item.deleteService": "Elimina servizio",
   "tabs.item.disableAudio": "Disattiva audio",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disattiva notifiche",
   "tabs.item.disableService": "Disattiva servizio",
   "tabs.item.edit": "Modifica",
   "tabs.item.enableAudio": "Attiva audio",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Attiva le notifiche",
   "tabs.item.enableService": "Attiva il servizio",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Ricarica",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} non valido",
   "validation.minLength": "{field} dovrebbe contenere almeno {length} caratteri",
   "validation.oneRequired": "Almeno un campo è richiesto",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Aree di lavoro",
   "workspaceDrawer.item.contextMenuEdit": "Modifica",
   "workspaceDrawer.item.noServicesAddedYet": "Nessun servizio aggiunto",
-  "workspaceDrawer.premiumCtaButtonLabel": "Crea il tuo primo workspace",
-  "workspaceDrawer.proFeatureBadge": "Funzionalità premium",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Riattiva l’account premium",
   "workspaceDrawer.workspaceFeatureInfo": "<p>I workspace di Ferdi ti permettono di concentrarti su ciò che è importante. Configura diversi insiemi di servizi e passa facilmente da uno all’altro quando vuoi.</p><p>Decidi di quali servizi hai bisogno quando e dove, così che ti possiamo aiutare a dare sempre il massimo - o semplicemente staccare dal lavoro quando ne hai bisogno.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Modifica le impostazioni dei workspace",
   "workspaces.switchingIndicator.switchingTo": "Passa a "
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 0aeac2891..707f08071 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "{name}への接続が切断されました。",
   "feature.announcements.changelog.headline": "Ferdi {version}の変更点",
   "feature.debugger.title": "デバッグ情報の記録",
-  "feature.delayApp.headline": "Ferdiをすぐに起動するには、Ferdi サポーターライセンスを購入してください。",
-  "feature.delayApp.text": "Ferdiは{seconds}秒後に起動します。",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Ferdiサポーターライセンスを購入する",
-  "feature.delayApp.upgrade.actionShort": "アカウントをアップグレード",
   "feature.nightlyBuilds.activate": "有効化",
   "feature.nightlyBuilds.cancel": "キャンセル",
   "feature.nightlyBuilds.info": "Nightlyビルドは未検証や未完成の機能が含まれる非常に実験的なバージョンです。このバージョンは、主に新機能のテストや最新ビルドでの検証を行う開発者が使用するものです。これを理解していない方は、Nightlyビルドを有効化しないことをおすすめします。",
   "feature.nightlyBuilds.title": "Nightlyビルド",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "デバッグ情報の公開中にエラーが発生しました。後でもう一度試すか、コンソールを表示して詳細な情報を確認します。",
   "feature.publishDebugInfo.info": "デバッグ情報を公開することで、Ferdiの開発者が問題やエラーを発見する手助けとなります。 デバッグ情報を公開することで、Ferdi Debuggerのプライバシーポリシーと利用規約に同意したことになります。",
   "feature.publishDebugInfo.privacy": "プライバシーポリシー",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Tab, ↑, ↓でサービスを選択します。Enterでサービスを開きます",
   "feature.quickSwitch.search": "検索...",
   "feature.quickSwitch.title": "クイックスイッチ",
-  "feature.serviceLimit.limitReached": "このプランで利用できるサービス{limit}個のうち、{amount}個が追加済みです。さらにサービスを追加したい場合はアカウントをアップグレードしてください。",
   "feature.shareFranz.action.email": "メールで送信",
   "feature.shareFranz.action.facebook": "Facebookでシェア",
   "feature.shareFranz.action.twitter": "Twitterでシェア",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "Ferdiで{count}個のサービスを使っています！あなたもGmail, Messenger, Slack, SkypeなどのサービスをFerdiで一元管理しましょう！ www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "{count}個のサービスをFerdiに追加しました！WhatsApp, Messenger, Slack, Skypeなどを一元管理する無料のアプリをダウンロードしましょう www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "あなたのお友達にFerdiを教えてあげましょう。",
-  "feature.todos.premium.info": "Ferdi ToDoはプレミアムユーザーがご利用できます！",
-  "feature.todos.premium.rollout": "もうしばらくお待ちください。",
-  "feature.todos.premium.upgrade": "アカウントをアップグレード",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Ferdiのオンラインサービスに接続できません。",
-  "global.franzProRequired": "Ferdi Professionalが必要です",
   "global.notConnectedToTheInternet": "インターネットに接続されていません。",
   "global.spellchecker.useDefault": " {default}を初期設定で使用してください",
   "global.spellchecking.autodetect": "言語を自動的に検出する",
   "global.spellchecking.autodetect.short": "自動",
   "global.spellchecking.language": "スペルチェックする言語",
-  "global.upgradeButton.upgradeToPro": "Ferdi Professionalにアップグレード",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "ユーザーエージェント",
   "import.headline": "Ferdi 4のサービスをインポートして下さい",
@@ -88,7 +52,6 @@
   "infobar.hide": "隠す",
   "infobar.requiredRequestsFailed": "サービスとユーザー情報を読み込めませんでした",
   "infobar.servicesUpdated": "サービスが更新されました。",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "Ferdiの更新があります。",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "メールアドレス",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "メニューバーを自動的に隠す",
   "menu.app.checkForUpdates": "更新の確認",
   "menu.app.hide": "隠す",
-  "menu.app.hideOthers": "他を隠す",
-  "menu.app.quit": "終了",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "設定",
-  "menu.app.unhide": "表示する",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "編集",
-  "menu.edit.copy": "コピー",
-  "menu.edit.cut": "切り取り",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "削除",
   "menu.edit.emojiSymbols": "絵文字とシンボル",
   "menu.edit.findInPage": "ページ内を検索",
-  "menu.edit.paste": "貼り付け",
-  "menu.edit.pasteAndMatchStyle": "書式を統一して貼り付け",
-  "menu.edit.redo": "やり直し",
-  "menu.edit.selectAll": "全て選択",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "読み上げ",
   "menu.edit.startDictation": "音声入力を開始",
   "menu.edit.startSpeaking": "読み上げを開始",
   "menu.edit.stopSpeaking": "読み上げを停止",
-  "menu.edit.undo": "元に戻す",
+  "menu.edit.undo": "Undo",
   "menu.file": "ファイル",
-  "menu.help": "ヘルプ",
+  "menu.help": "Help",
   "menu.help.changelog": "更新履歴",
   "menu.help.debugInfo": "デバッグ情報をコピー",
   "menu.help.debugInfoCopiedBody": "デバッグ情報をクリップボードにコピーしました。",
   "menu.help.debugInfoCopiedHeadline": "Ferdiデバッグ情報",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Ferdiについて",
   "menu.help.privacy": "プライバシーについて",
   "menu.help.publishDebugInfo": "デバッグ情報の公開",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "ToDoを有効にする",
   "menu.view": "表示",
   "menu.view.back": "戻る",
-  "menu.view.enterFullScreen": "全画面表示",
-  "menu.view.exitFullScreen": "全画面表示を終了する",
   "menu.view.forward": "次へ",
   "menu.view.lockFerdi": "Ferdiをロック",
   "menu.view.openQuickSwitch": "クイックスイッチを開く",
-  "menu.view.reloadFranz": "再起動",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "サービスをリロードする",
   "menu.view.reloadTodos": "ToDoをリロード",
-  "menu.view.resetZoom": "元のサイズ",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "ダークモードを切り替える",
   "menu.view.toggleDevTools": "開発者ツールを切り替え",
-  "menu.view.toggleFullScreen": "全画面表示の切り替え",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "サービス開発者ツールを切り替え",
   "menu.view.toggleTodosDevTools": "ToDoの開発者モードを切り替える",
-  "menu.view.zoomIn": "表示を拡大する",
-  "menu.view.zoomOut": "表示を縮小する",
-  "menu.window": "ウィンドウ",
-  "menu.window.close": "閉じる",
-  "menu.window.minimize": "最小化",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "ワークスペース",
   "menu.workspaces.addNewWorkspace": "ワークスペースを追加",
   "menu.workspaces.closeWorkspaceDrawer": "ワークスペースドロワーを閉じる",
@@ -194,11 +156,7 @@
   "password.noUser": "このメールアドレスはまだ登録されていません",
   "password.submit.label": "送信",
   "password.successInfo": "メールを確認して下さい",
-  "premiumFeature.button.upgradeAccount": "アカウントをアップグレード",
   "pricing.features.accountSync": "アカウントの同期",
-  "pricing.features.adFree": "永年広告なし",
-  "pricing.features.appDelays": "待ち無し",
-  "pricing.features.appDelaysEnabled": "時々表示される待ち",
   "pricing.features.customWebsites": "カスタムサイトを追加",
   "pricing.features.desktopNotifications": "デスクトップ通知",
   "pricing.features.onPremise": "オンプレミスおよびその他のホスティングサービス",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "チーム管理",
   "pricing.features.thirdPartyServices": "サードパーティ製サービスをインストール",
   "pricing.features.unlimitedServices": "無制限にサービスを追加",
-  "pricing.features.upToSixServices": "最大6個のサービスを追加",
-  "pricing.features.upToThreeServices": "最大3個のサービスを追加",
   "pricing.features.workspaces": "ワークスペース",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal (月額課金)",
-  "pricing.plan.personal-yearly": "Ferdi Personal (年額課金)",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional (月額課金)",
-  "pricing.plan.pro-yearly": "Ferdi Professional (年額課金)",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "{name}を再読み込み",
   "service.crashHandler.autoReload": "{seconds}秒後、自動的に{name}の復旧を試みます",
   "service.crashHandler.headline": "しまった！",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "しまった！",
   "service.errorHandler.message": "エラー",
   "service.errorHandler.text": "{name} はロードに失敗しました",
-  "service.restrictedHandler.action": "アカウントをアップグレード",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professionalプランが必要です",
-  "service.restrictedHandler.customUrl.text": "カスタムURLとセルフホスティングサービスを使用するには、Ferdi Professionalプランにアップグレードしてください。",
-  "service.restrictedHandler.serviceLimit.headline": "サービス数の上限に達しました。",
-  "service.restrictedHandler.serviceLimit.text": "{count}個以上のサービスを利用するにはアカウントをアップグレードしてください。",
   "service.webviewLoader.loading": "{service}を読み込み中",
   "services.getStarted": "はじめる",
   "services.login": "Ferdiを使用するにはログインしてください。",
-  "services.serverInfo": "必要に応じて、左下の歯車をクリックしてFerdiサーバーを変更できます。",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "アカウントなしでFerdiを使用する",
   "services.welcome": "Ferdiにようこそ",
   "settings.account.account.editButton": "アカウントの編集",
-  "settings.account.accountType.basic": "Basicアカウント",
-  "settings.account.accountType.premium": "Premium Supporterアカウント",
   "settings.account.accountUnavailable": "アカウントが利用できません",
   "settings.account.accountUnavailableInfo": "アカウントなしでFerdiを使用しています。 Ferdiのアカウントを使用してコンピューター間でサービスを同期させる場合、 設定タブでサーバーを選択してログインしてください。",
   "settings.account.buttonSave": "プロフィールの更新",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "請求書",
   "settings.account.headlinePassword": "パスワードの変更",
   "settings.account.headlineProfile": "プロフィールの更新",
-  "settings.account.headlineSubscription": "あなたの登録内容",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "アカウントをアップグレードしてFerdiの全機能を手に入れましょう",
-  "settings.account.invoiceDownload": "ダウンロード",
-  "settings.account.manageSubscription.label": "サブスクリプションの管理",
   "settings.account.successInfo": "変更内容が保存されました",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "もう一度試す",
   "settings.account.tryReloadUserInfoRequest": "もう一度試す",
-  "settings.account.upgradeToPro.label": "Ferdi Professionalにアップグレード",
   "settings.account.userInfoRequestFailed": "ユーザ情報を読み込めませんでした",
   "settings.account.yourLicense": "ご利用中のFerdiライセンス",
   "settings.app.accentColorInfo": "CSSフォーマットでアクセントカラーを記述してください。(デフォルト: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "スペルチェックを有効にする",
   "settings.app.form.enableSystemTray": "Ferdiをシステムトレイに表示する",
   "settings.app.form.enableTodos": "Ferdi ToDoを有効にする",
-  "settings.app.form.hibernate": "サービスの休止を有効化する",
   "settings.app.form.hibernateOnStartup": "起動時にサービスを休止状態にする",
   "settings.app.form.hibernationStrategy": "休止状態の方法",
   "settings.app.form.iconSize": "サービスのアイコンサイズ",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "ユニバーサルダークモードを有効にする",
   "settings.app.form.useTouchIdToUnlock": "Touch IDを使用してFerdiのロックを解除する",
   "settings.app.form.useVerticalStyle": "垂直レイアウトを使用する",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "設定",
   "settings.app.headlineAdvanced": "詳細",
   "settings.app.headlineAppearance": "表示スタイル",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "デフォルトでは、Ferdiはすべてのサービスをバックグラウンドで開いて読み込んでおくので、使いたいときにすぐに使えます。 サービス休止機能は設定した時間が経過したら読み込んだサービスを解放します。これはRAMを節約したり、サービスでコンピューターの動作が重くなるのを防ぐのに役立ちます。",
   "settings.app.inactivityLockInfo": "休止状態までの時間(分)、この時間が経過後Ferdiは自動でロックします。0で無効化",
   "settings.app.languageDisclaimer": "公式の言語は英語とドイツ語です。他の言語はコミュニティによる翻訳です。",
-  "settings.app.lockInfo": "パスワードロックはメッセージを保護できます。\nパスワードロックを使用すると、Ferdiの起動時、または自分で左下のロックボタンを押すかショートカット(CommandまたはCtrl + Shift + L)でFerdiをロックしたときに、その都度パスワードの入力が求められます。",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "パスワード",
   "settings.app.lockedPasswordInfo": "覚えられるパスワードを設定するようにしてください。\nパスワードを紛失すると、Ferdiの再インストールが必要になります。",
   "settings.app.restartRequired": "変更には再起動が必要です",
   "settings.app.scheduledDNDInfo": "集中モードのスケジュールを有効にすると、Ferdiからの通知を受け取らない時間帯を設定することができます。",
   "settings.app.scheduledDNDTimeInfo": "24時間形式で入力してください。終了時刻を開始時刻よりも早く設定すると(例: 17:00開始、9:00終了)、集中モードを一晩中有効にできます。",
-  "settings.app.sentryInfo": "統計情報を送信すると開発者がFerdiのエラーを発見するのに役立ちます。メッセージのデータのような個人情報は一切送信しません。この設定の反映にはFerdiの再起動が必要です。",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "FerdiはスペルチェックにmacOSシステムのスペルチェッカーを使用しています。スペルチェッカーでチェックする言語を変更するには、macOSのシステム環境設定から行ってください。",
   "settings.app.subheadlineCache": "キャッシュ",
   "settings.app.todoServerInfo": "このサーバーは「Ferdi ToDo」の機能に使用されます。",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "フォルダーを開く",
   "settings.recipes.headline": "利用可能なサービス",
   "settings.recipes.missingService": "使いたいサービスが一覧にありませんか?",
-  "settings.recipes.mostPopular": "最も人気",
   "settings.recipes.nothingFound": "残念ながら、検索語に一致するサービスはありませんでした。しかし、「カスタムウェブサイト」のオプションを使用して追加することができます。新しいバージョンのFerdiではウェブサイトで紹介されているような、より多くのサービスが追加されていることがあります。それらの新しいサービスを追加するには、Ferdiのアップデートをご検討ください。",
   "settings.recipes.servicesSuccessfulAddedInfo": "サービスが追加されました",
   "settings.searchService": "サービスを検索",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "{name}を追加",
   "settings.service.form.availableServices": "利用可能なサービス",
   "settings.service.form.customUrl": "独自サーバー",
-  "settings.service.form.customUrlPremiumInfo": "独自サービスを追加するためには、Ferdi Premium Supporterアカウントが必要です。",
-  "settings.service.form.customUrlUpgradeAccount": "アカウントをアップグレードする",
   "settings.service.form.customUrlValidationError": "独自サーバー{name}を検証できませんでした。",
   "settings.service.form.darkReaderBrightness": "ダークリーダーの明るさ",
   "settings.service.form.darkReaderContrast": "ダークリーダーのコントラスト",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franzのチーム管理",
   "settings.team.copy": "Franzチーム管理では、複数のユーザーのFranzサブスクリプションを管理できます。Franzプレミアムのサブスクリプションは、Ferdiを使用する上で何の利点もないことに留意してください。レガシーなFranzのチームを管理し、アカウント管理機能を維持するためだけに、チーム管理にアクセスできるようになっています。",
   "settings.team.headline": "チーム",
-  "settings.team.intro": "現在Franzサーバーを使用しているため、チーム管理にアクセスできます。",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "meetfranz.com でチームを管理",
   "settings.team.teamsUnavailable": "チームは利用できません",
   "settings.team.teamsUnavailableInfo": "チームは現在、Franzサーバーを使用していて、Franzプロフェッショナルを契約した方のみが利用できます。チームを使用するには、サーバーを https://api.franzinfra.com に変更してください。",
-  "settings.team.upgradeAction": "アカウントをアップグレードする",
   "settings.user.form.accountType.company": "法人",
   "settings.user.form.accountType.individual": "個人",
   "settings.user.form.accountType.label": "アカウントの種類",
@@ -516,29 +431,20 @@
   "signup.link.login": "アカウントを既に持っていますか? こちらからサインイン",
   "signup.password.label": "パスワード",
   "signup.submit.label": "アカウントの作成",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "全てのオプションを表示",
-  "subscription.cta.choosePlan": "プランを選択",
-  "subscription.includedProFeatures": "FerdiのProfessionalプランには次のものが含まれます:",
-  "subscription.interval.per": "{interval}あたり",
-  "subscription.interval.perMonth": "1か月あたり",
-  "subscription.interval.perMonthPerUser": "1か月、1ユーザーあたり",
-  "subscription.planItem.upgradeAccount": "アカウントをアップグレード",
-  "subscription.teaser.includedFeatures": "Ferdiの有料プランは次のものが含まれます:",
-  "subscription.teaser.intro": "Ferdi 5は毎日のコミュニケーションを強化する様々な新機能を搭載しています(バッテリー持ちの強化を含む)。新しいプランを確認し、ご自身にぴったりのプランを見つけましょう！",
-  "subscriptionPopup.buttonCancel": "キャンセル",
-  "subscriptionPopup.buttonDone": "完了",
   "tabs.item.confirmDeleteService": "本当に{serviceName}サービスを削除しますか？",
   "tabs.item.deleteService": "サービスの削除",
   "tabs.item.disableAudio": "オーディオの無効化",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "通知を無効にする",
   "tabs.item.disableService": "サービスを無効にする",
   "tabs.item.edit": "編集",
   "tabs.item.enableAudio": "オーディオを有効にする",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "通知を有効にする",
   "tabs.item.enableService": "サービスを有効にする",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "再読み込み",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field}は正しくありません",
   "validation.minLength": "{field}は少なくとも{length}文字以上でなければなりません",
   "validation.oneRequired": "少なくとも1つは必要です",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "ワークスペース",
   "workspaceDrawer.item.contextMenuEdit": "編集",
   "workspaceDrawer.item.noServicesAddedYet": "まだサービスが追加されていません",
-  "workspaceDrawer.premiumCtaButtonLabel": "最初のワークスペースを作成する",
-  "workspaceDrawer.proFeatureBadge": "Premiumの機能",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Premiumアカウントを再度有効化する",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdiワークスペースを使用すると、すぐに重要なことに集中できます。異なるサービス群を設定し、いつでも簡単に切り替えることができます。</p><p> 必要なサービスを、必要な時に、必要な場所でご利用いただけますので、仕事に集中することも、好きな時に仕事から離れることも可能です。</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "ワークスペースの設定を編集する",
   "workspaces.switchingIndicator.switchingTo": "切り替え先:"
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 70305c358..96480c005 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "გაუქმება",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Send as email",
   "feature.shareFranz.action.facebook": "Share on Facebook",
   "feature.shareFranz.action.twitter": "Share on Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Ferdi-ის ონლაინ სერვისთან დაკავშირება ვერ მოხერხდა",
-  "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "თქვენ არ ხართ ინტერნეტთან დაკავშირებული.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "შემოიტანე Ferdi 4-ის სერვისები",
@@ -88,7 +52,6 @@
   "infobar.hide": "Hide",
   "infobar.requiredRequestsFailed": "სერვისებისა და მომხმარებლის ინფორმაციის ჩატვირთვა ვერ მოხერხდა",
   "infobar.servicesUpdated": "თქვენი სერვისები განახლებულია.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "განახლება Ferdi-ისთვის ხელმისაწვდომია.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "მეილი",
@@ -124,20 +87,20 @@
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "განახლებების შემოწმება",
   "menu.app.hide": "Hide",
-  "menu.app.hideOthers": "სხვების დამალვა",
-  "menu.app.quit": "გამოსვლა",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "პარამეტრები",
   "menu.app.unhide": "Unhide",
   "menu.edit": "რედაქტირება",
-  "menu.edit.copy": "კოპირება",
-  "menu.edit.cut": "ამოჭრა",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "წაშლა",
   "menu.edit.emojiSymbols": "გრაფიკული გამოსახულებები & სიმბოლოები",
   "menu.edit.findInPage": "Find in Page",
-  "menu.edit.paste": "ჩასმა",
+  "menu.edit.paste": "Paste",
   "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
-  "menu.edit.redo": "აღდგენა",
-  "menu.edit.selectAll": "ყველას მონიშვნა",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "საუბრები",
   "menu.edit.startDictation": "პროგრამის დაწყება",
   "menu.edit.startSpeaking": "Start Speaking",
@@ -149,6 +112,7 @@
   "menu.help.debugInfo": "Copy Debug Information",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Learn More",
   "menu.help.privacy": "კონფიდენციალურობის შესახებ",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,12 +127,10 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "View",
   "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Enter Full Screen",
-  "menu.view.exitFullScreen": "Exit Full Screen",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.reloadTodos": "Reload ToDos",
   "menu.view.resetZoom": "Actual Size",
@@ -194,11 +156,7 @@
   "password.noUser": "მომხმარებელი მითითებული მეილით ვერ მოიძებნა",
   "password.submit.label": "დადასტურება",
   "password.successInfo": "გთხოვთ შეამოწმეთ მეილი",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "შეცდომა",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "დაწყება",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "მოგესალმებით Ferdi-ზე",
   "settings.account.account.editButton": "ანგარიშის მართვა",
-  "settings.account.accountType.basic": "ძირითადი ანგარიში",
-  "settings.account.accountType.premium": "პრემიუმ მხარდამჭერის ანგარიში",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "პროფილის განახლება",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "ინვოისები",
   "settings.account.headlinePassword": "პაროლის შეცვლა",
   "settings.account.headlineProfile": "პროფილის განახლება",
-  "settings.account.headlineSubscription": "თქვენი გამოწერა",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "გადმოწერა",
-  "settings.account.manageSubscription.label": "თქვენი გამოწერის მართვა",
   "settings.account.successInfo": "თქვენი ცვლილებები შენახულია",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "სცადეთ ხელახლა",
   "settings.account.tryReloadUserInfoRequest": "სცადეთ ხელახლა",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "მომხმარებლის ინფორმაციის ჩატვირთვა ვერ მოხერხდა",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "აჩვენეთ Ferdi სისტემის უჯრაში",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "პარამეტრები",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "ხელმისაწვდომი სერვისები",
   "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.mostPopular": "ყველაზე პოპულარული",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "სერვისი წარმატებით დაემატა",
   "settings.searchService": "Search service",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "დაამატე {name}",
   "settings.service.form.availableServices": "ხელმისაწვდომი სერვისები",
   "settings.service.form.customUrl": "კერძო სერვერი",
-  "settings.service.form.customUrlPremiumInfo": "თვით დაჰოსტილი სერვისების დასამატებლად საჭიროა Ferdi-ის პრემიუმ მხარდამჭერის ანგარიში.",
-  "settings.service.form.customUrlUpgradeAccount": "განაახლეთ თქვენი ანგარიში",
   "settings.service.form.customUrlValidationError": "ვერ დადასტურდა {name} კერძო სერვერი.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "გუნდი",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "კომპანია",
   "settings.user.form.accountType.individual": "ინდივიდუალური",
   "settings.user.form.accountType.label": "ანგარიშის ტიპი",
@@ -516,29 +431,20 @@
   "signup.link.login": "უკვე გაქვთ ანგარიში?",
   "signup.password.label": "Password",
   "signup.submit.label": "ანგარიშის შექმნა",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "გაუქმება",
-  "subscriptionPopup.buttonDone": "შესრულებულია",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "სერვისის წაშლა",
   "tabs.item.disableAudio": "Disable audio",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "შეტყობინებების გამორთვა",
   "tabs.item.disableService": "სერვისის გაუქმება",
   "tabs.item.edit": "რედაქტირება",
   "tabs.item.enableAudio": "Enable audio",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "შეტყობინებების ჩართვა",
   "tabs.item.enableService": "სერვისის ჩართვა",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "ჩატვირთვა",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} is not valid",
   "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/kk.json b/src/i18n/locales/kk.json
index 09bb10fb2..462ca8543 100644
--- a/src/i18n/locales/kk.json
+++ b/src/i18n/locales/kk.json
@@ -5,30 +5,6 @@
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
-  "feature.delayApp.headline": "Upgrade your Ferdi plan to skip the wait",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14-days trial and skip the wait",
-  "feature.delayApp.upgrade.action": "Upgrade Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}?",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Send as email",
   "feature.shareFranz.action.facebook": "Share on Facebook",
   "feature.shareFranz.action.twitter": "Share on Twitter",
@@ -36,16 +12,6 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
@@ -53,7 +19,6 @@
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "import.headline": "Import your Ferdi 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
   "import.skip.label": "I want to add services manually",
@@ -63,7 +28,6 @@
   "infobar.buttonReloadServices": "Reload services",
   "infobar.requiredRequestsFailed": "Could not load services and user information",
   "infobar.servicesUpdated": "Your services have been updated.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "A new update for Ferdi is available.",
   "invite.email.label": "Email address",
   "invite.headline.friends": "Invite 3 of your friends or colleagues",
@@ -122,9 +86,7 @@
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "View",
-  "menu.view.enterFullScreen": "Enter Full Screen",
-  "menu.view.exitFullScreen": "Exit Full Screen",
-  "menu.view.reloadFranz": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.reloadTodos": "Reload ToDos",
   "menu.view.resetZoom": "Actual Size",
@@ -149,7 +111,6 @@
   "password.noUser": "No user with that email address was found",
   "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
@@ -166,27 +127,6 @@
   "pricing.features.upToSixServices": "Add up to 6 services",
   "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Free",
-  "pricing.plan.legacy": "Premium",
-  "pricing.plan.personal": "Personal",
-  "pricing.plan.personal-monthly": "Personal Monthly",
-  "pricing.plan.personal-yearly": "Personal Yearly",
-  "pricing.plan.pro": "Professional",
-  "pricing.plan.pro-monthly": "Professional Monthly",
-  "pricing.plan.pro-yearly": "Professional Yearly",
-  "pricing.trial.cta.accept": "Start my 14-day Ferdi Professional Trial ",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -198,11 +138,6 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading",
   "services.getStarted": "Get started",
   "services.welcome": "Welcome to Ferdi",
@@ -219,18 +154,9 @@
   "settings.account.headlineInvoices": "Invoices",
   "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Update profile",
-  "settings.account.headlineSubscription": "Your subscription",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.manageSubscription.label": "Manage your subscription",
   "settings.account.successInfo": "Your changes have been saved",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Try again",
   "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Could not load user information",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.buttonClearAllCache": "Clear cache",
@@ -284,7 +210,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Available services",
   "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
   "settings.searchService": "Search service",
@@ -295,7 +220,6 @@
   "settings.service.form.availableServices": "Available services",
   "settings.service.form.customUrl": "Custom server",
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Edit {name}",
@@ -391,19 +315,6 @@
   "signup.link.login": "Already have an account, sign in?",
   "signup.password.label": "Password",
   "signup.submit.label": "Create account",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Cancel",
-  "subscriptionPopup.buttonDone": "Done",
   "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
@@ -431,7 +342,6 @@
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
   "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
   "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index af6171e3d..4286aa7d9 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "오 저런! Ferdi가 {name} 과 연결이 끊겼습니다.",
   "feature.announcements.changelog.headline": "Ferdi {version} 변경점",
   "feature.debugger.title": "디버깅 정보 공개",
-  "feature.delayApp.headline": "Ferdi Supporter License를 구매하여 대기시간을 스킵하세요.",
-  "feature.delayApp.text": "Ferdi가 {seconds} 초 안에 재개합니다.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Ferdi Supporter License 얻기",
-  "feature.delayApp.upgrade.actionShort": "계정 업그레이드",
   "feature.nightlyBuilds.activate": "활성화",
   "feature.nightlyBuilds.cancel": "취소",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "나이틀리 빌드",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "디버그 정보를 공개하는데 오류가 발생했습니다. 조금 뒤에 다시 시도하거나 콘솔을 통해 정보를 확인하십시오.",
   "feature.publishDebugInfo.info": "디버그 정보를 공개하는 것은 Ferdi의 오류를 찾는데 도움이 됩니다. 디버그 정보를 공개함으로 Ferdi Debugger의 개인정보보호정책과 이용 약관을 동의하는 것으로 간주합니다.",
   "feature.publishDebugInfo.privacy": "개인정보보호정책",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "서비스를 TAB, ↑, ↓을 이용해 선택할 수 있습니다. ENTER를 이용하여 서비스를 열 수 있습니다.",
   "feature.quickSwitch.search": "검색...",
   "feature.quickSwitch.title": "빠른 검색",
-  "feature.serviceLimit.limitReached": "사용하는 플랜의 {limit} 개 중 {amount} 를 추가했습니다. 더 많은 서비스를 추가하시려면 계정을 업그레이드 해주세요.",
   "feature.shareFranz.action.email": "이메일로 보내기",
   "feature.shareFranz.action.facebook": "페이스북에 공유하기",
   "feature.shareFranz.action.twitter": "트위터에 공유하기",
@@ -57,28 +33,16 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "친구들과 동료들에게 Ferdi 가 얼마나 멋지고 좋은지에 대해 널리 알려 저희를 도와주세요.",
-  "feature.todos.premium.info": "Ferdi Todos는 프리미엄 유저라면 이제 사용 가능합니다!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "계정 업그레이드",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Ferdi 온라인 서비스에 연결할 수 없습니다.",
-  "global.franzProRequired": "Ferdi 프로페셔널이 필요합니다.",
   "global.notConnectedToTheInternet": "인터넷에 연결할 수 없습니다.",
   "global.spellchecker.useDefault": "시스템 기본 사용 ({default})",
   "global.spellchecking.autodetect": "언어 자동 탐색",
   "global.spellchecking.autodetect.short": "자동",
   "global.spellchecking.language": "철자 검사",
-  "global.upgradeButton.upgradeToPro": "Ferdi 프로페셔널로 업그레이드 합니다.",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Import your Ferdi 4 services",
-  "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
+  "import.notSupportedHeadline": "Ferdi 5에서 아직 지원되지 않는 서비스입니다.",
   "import.skip.label": "수동으로 서비스 추가",
   "import.submit.label": "서비스 가져오기",
   "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
@@ -88,9 +52,8 @@
   "infobar.hide": "숨기기",
   "infobar.requiredRequestsFailed": "사용자 정보와 서비스를 불러올 수 없습니다.",
   "infobar.servicesUpdated": "서비스가 업데이트 되었습니다.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "새로운 업데이트를 사용할 수 있습니다.",
-  "infobox.dismiss": "Dismiss",
+  "infobox.dismiss": "닫기",
   "invite.email.label": "이메일 주소",
   "invite.headline.friends": "친구나 동료를 3명 초대하기",
   "invite.name.label": "이름",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "메뉴바 자동 감춤",
   "menu.app.checkForUpdates": "업데이트 확인",
   "menu.app.hide": "숨기기",
-  "menu.app.hideOthers": "나머지 숨기기",
-  "menu.app.quit": "종료",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "설정",
-  "menu.app.unhide": "보이기",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "편집",
-  "menu.edit.copy": "복사",
-  "menu.edit.cut": "잘라내기",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "삭제",
-  "menu.edit.emojiSymbols": "Emoji & Symbols",
+  "menu.edit.emojiSymbols": "이모지 및 기호",
   "menu.edit.findInPage": "현재 페이지에서 찾기",
-  "menu.edit.paste": "붙여넣기",
+  "menu.edit.paste": "Paste",
   "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
-  "menu.edit.redo": "재시도",
-  "menu.edit.selectAll": "전체 선택",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "말하기",
   "menu.edit.startDictation": "받아쓰기 시작",
   "menu.edit.startSpeaking": "말하기 시작",
   "menu.edit.stopSpeaking": "말하기 중지",
-  "menu.edit.undo": "되돌리기",
+  "menu.edit.undo": "Undo",
   "menu.file": "파일",
-  "menu.help": "도움말",
+  "menu.help": "Help",
   "menu.help.changelog": "변경 내역",
   "menu.help.debugInfo": "디버그 정보 복사",
   "menu.help.debugInfoCopiedBody": "디버그 정보가 클립보드에 복사되었습니다.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi 디버그 정보",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "자세히 보기",
   "menu.help.privacy": "개인정보보호정책",
   "menu.help.publishDebugInfo": "디버깅 정보 공개",
@@ -156,32 +120,30 @@
   "menu.help.tos": "이용 약관",
   "menu.services": "서비스",
   "menu.services.activatePreviousService": "이전 서비스 활성화",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "새로운 서비스 추가",
   "menu.services.goHome": "홈",
   "menu.services.setNextServiceActive": "다음 서비스 활성화",
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Todos 허용",
   "menu.view": "View",
   "menu.view.back": "뒤로가기",
-  "menu.view.enterFullScreen": "전체 화면으로",
-  "menu.view.exitFullScreen": "전체 화면 종료",
   "menu.view.forward": "앞으로 가기",
   "menu.view.lockFerdi": "Ferdi 잠금",
   "menu.view.openQuickSwitch": "Quick Switch 열기",
-  "menu.view.reloadFranz": "Ferdi 재시작",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "서비스 재시작",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "실제 크기",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "다크 모드 켜기/끄기",
   "menu.view.toggleDevTools": "개발자 모드 켜기/끄기",
-  "menu.view.toggleFullScreen": "전체 화면 전환/복귀",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
   "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
-  "menu.view.zoomIn": "확대",
-  "menu.view.zoomOut": "축소",
-  "menu.window": "윈도우",
-  "menu.window.close": "닫기",
-  "menu.window.minimize": "최소화",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "작업 공간",
   "menu.workspaces.addNewWorkspace": "새 작업영역을 추가",
   "menu.workspaces.closeWorkspaceDrawer": "작업영역 서랍 닫기",
@@ -194,48 +156,21 @@
   "password.noUser": "해당 이메일을 사용하는 유저를 찾을 수 없습니다.",
   "password.submit.label": "제출",
   "password.successInfo": "이메일을 확인해 주세요.",
-  "premiumFeature.button.upgradeAccount": "계정 업그레이드",
   "pricing.features.accountSync": "계정 동기화",
-  "pricing.features.adFree": "평생 광고 무료",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "사용자 지정 웹사이트 추가",
   "pricing.features.desktopNotifications": "데스크탑 알림",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
   "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
+  "pricing.features.serviceProxies": "서비스 프록시",
   "pricing.features.spellchecker": "철자 검사 지원",
   "pricing.features.teamManagement": "팀 관리",
   "pricing.features.thirdPartyServices": "써드파티 서비스 설치",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
+  "pricing.features.unlimitedServices": "무제한 서비스 추가",
   "pricing.features.workspaces": "작업 공간",
-  "pricing.plan.free": "Ferdi 무료",
-  "pricing.plan.legacy": "Ferdi 프리미엄",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi 프로페셔널",
-  "pricing.plan.pro-monthly": "월간 Ferdi 프로페셔널",
-  "pricing.plan.pro-yearly": "연간 Ferdi 프로페셔널",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "재시작 {name}",
   "service.crashHandler.autoReload": "{seconds} 초내에 자동으로 {name} 을 복원합니다.",
   "service.crashHandler.headline": "이런!",
-  "service.crashHandler.text": "{name} has caused an error.",
+  "service.crashHandler.text": "{name} 에서 에러가 발생했습니다.",
   "service.disabledHandler.action": "활성 {name}",
   "service.disabledHandler.headline": "{name} 사용 불가",
   "service.errorHandler.action": "재시작 {name}",
@@ -243,56 +178,40 @@
   "service.errorHandler.headline": "이런!",
   "service.errorHandler.message": "에러",
   "service.errorHandler.text": "{name} 불러오는데 실패하였습니다.",
-  "service.restrictedHandler.action": "계정 업그레이드",
-  "service.restrictedHandler.customUrl.headline": "Ferdi 프로페셔널이 필요합니다.",
-  "service.restrictedHandler.customUrl.text": "자체 호스트 서비스와 커스텀 url을 사용하기 위해 Ferdi 프로페셔널로 업그레이드 하세요.",
-  "service.restrictedHandler.serviceLimit.headline": "서비스 한도에 도달하였습니다.",
-  "service.restrictedHandler.serviceLimit.text": "{count} 보다 더 많은 서비스를 사용하려면 계정을 업그레이드 해주세요.",
   "service.webviewLoader.loading": "{service} 로딩 중",
   "services.getStarted": "시작하기",
   "services.login": "Ferdi를 사용해 로그인하세요.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "계정없이 Ferdi 사용하기",
   "services.welcome": "Ferdi에 오신 것을 환영합니다.",
   "settings.account.account.editButton": "계정 편집",
-  "settings.account.accountType.basic": "기본 계정",
-  "settings.account.accountType.premium": "Premium Supporter Account",
   "settings.account.accountUnavailable": "계정을 사용할 수 없습니다.",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "프로필 수정",
   "settings.account.deleteAccount": "계정 삭제",
-  "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-  "settings.account.deleteInfo": "If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
+  "settings.account.deleteEmailSent": "받은 이메일에 있는 링크를 통해 계정 삭제를 확인했다면 계정과 데이터는 복구되지 않습니다.",
+  "settings.account.deleteInfo": "더 이상 Ferdi 계정이 필요하지 않다면 여기서 모든 관련한 데이터와 계정을 삭제할 수 있습니다.",
   "settings.account.headline": "계정",
   "settings.account.headlineAccount": "계정 정보",
   "settings.account.headlineDangerZone": "위험 설정",
   "settings.account.headlineInvoices": "청구서",
   "settings.account.headlinePassword": "비밀번호 변경",
   "settings.account.headlineProfile": "프로필 수정",
-  "settings.account.headlineSubscription": "구독",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "다운로드",
-  "settings.account.manageSubscription.label": "구독 관리",
   "settings.account.successInfo": "변경사항이 저장되었습니다.",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "다시 시도하세요.",
   "settings.account.tryReloadUserInfoRequest": "다시 시도하세요.",
-  "settings.account.upgradeToPro.label": "Ferdi 프로페셔널로 업그레이드 합니다.",
   "settings.account.userInfoRequestFailed": "사용자 정보를 불러올 수 없습니다.",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Ferdi 라이센스",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "캐시 지우기",
   "settings.app.buttonInstallUpdate": "재시작 후 업데이트 설치",
   "settings.app.buttonSearchForUpdate": "업데이트 확인",
-  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
+  "settings.app.cacheInfo": "현재 Ferdi 캐시가 디스크 공간의 {size} 만큼 사용하고 있습니다.",
   "settings.app.cacheNotCleared": "모든 캐시를 지우지 못했습니다.",
-  "settings.app.closeSettings": "Close settings",
+  "settings.app.closeSettings": "설정 닫기",
   "settings.app.currentVersion": "현재 버전:",
   "settings.app.form.accentColor": "강조 색상",
-  "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
+  "settings.app.form.adaptableDarkMode": "사용하고 있는 OS의 다크 모드 설정과 동기화합니다.",
   "settings.app.form.alwaysShowWorkspaces": "Always show workspace drawer",
   "settings.app.form.autoLaunchInBackground": "백그라운드로 열기",
   "settings.app.form.autoLaunchOnStart": "부팅 시 Ferdi 실행",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "맞춤법 검사 활성화",
   "settings.app.form.enableSystemTray": "Ferdi 시스템 트레이에 표시",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Service Hibernation 허용",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "하이버네이션 전략",
   "settings.app.form.iconSize": "Service icon size",
@@ -327,33 +245,34 @@
   "settings.app.form.scheduledDNDEnabled": "방해 금지 모드 시간 설정",
   "settings.app.form.scheduledDNDEnd": "To",
   "settings.app.form.scheduledDNDStart": "From",
-  "settings.app.form.searchEngine": "Search engine",
+  "settings.app.form.searchEngine": "검색 엔진",
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "사이드바 너비",
   "settings.app.form.showDisabledServices": "사용하지 않는 서비스 출력",
   "settings.app.form.showDragArea": "드래그 가능 영역 보기",
   "settings.app.form.showMessagesBadgesWhenMuted": "알림이 비활성화잉ㄹ 때 읽지 않은 메세지 배지 표시",
   "settings.app.form.startMinimized": "최소화 된 상태로 시작",
-  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.universalDarkMode": "전체 다크 모드 활성화",
   "settings.app.form.useTouchIdToUnlock": "TouchID로 Ferdi 여는 것을 허용",
-  "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.useVerticalStyle": "수직 스타일 사용",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "설정",
   "settings.app.headlineAdvanced": "고급",
   "settings.app.headlineAppearance": "모양",
   "settings.app.headlineGeneral": "일반",
   "settings.app.headlineLanguage": "언어",
-  "settings.app.headlinePrivacy": "Privacy",
+  "settings.app.headlinePrivacy": "개인 정보",
   "settings.app.headlineUpdates": "업데이트",
   "settings.app.hibernateInfo": "기본적으로 Ferdi 는 모든 서비스를 열고 백그라운드에서 불러옵니다. 그래서 사용할 때 이미 준비되어 있습니다. Service Hibernation은 일정 개수 이후에 서비스를 불러오지 않습니다. 이로인해 RAM을 절약하고 컴퓨터에서 서비스가 느려지는 것을 방지해주기에 유용합니다.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "공식 지우너 언어는 영어와 독일어이며 이외 언어들은 커뮤니티에 의해 번역되고 있습니다.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "비밀번호",
   "settings.app.lockedPasswordInfo": "기억할 수 있는 비밀번호로 설정해주세요.\n만약 비밀번호를 잃어버리면 Ferdi 재설치를 해야합니다.",
   "settings.app.restartRequired": "변경사항을 적용하기 위해 재시작",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "캐시",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "폴더 열기",
   "settings.recipes.headline": "사용가능 한 서비스",
   "settings.recipes.missingService": "서비스가 보이지 않습니까?",
-  "settings.recipes.mostPopular": "가장 인기 있는",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "서비스가 성공적으로 추가되었습니다.",
   "settings.searchService": "서비스 찾기",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "{name} 추가",
   "settings.service.form.availableServices": "사용가능 한 서비스",
   "settings.service.form.customUrl": "사용자 정의 서버",
-  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "내 계정 업그레이드",
   "settings.service.form.customUrlValidationError": "사용자 정의 {name} 서버를 확인할 수 없습니다.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -402,10 +318,10 @@
   "settings.service.form.enableAudio": "오디오 활성화",
   "settings.service.form.enableBadge": "읽지 않은 메세지 배지 표시",
   "settings.service.form.enableDarkMode": "다크 모드 활성화",
-  "settings.service.form.enableHibernation": "Enable hibernation",
+  "settings.service.form.enableHibernation": "절전모드 활성화",
   "settings.service.form.enableNotification": "알림 허용",
   "settings.service.form.enableService": "서비스 활성화",
-  "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineBadges": "읽지 않은 메세지 배지 표시",
   "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "일반",
   "settings.service.form.headlineNotifications": "알림",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "팀",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "meetfranz.com에서 팀 관리하기",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "내 계정 업그레이드",
   "settings.user.form.accountType.company": "회사",
   "settings.user.form.accountType.individual": "개인",
   "settings.user.form.accountType.label": "계좌 유형",
@@ -483,7 +398,7 @@
   "settings.workspace.form.keepLoaded": "Keep this workspace loaded*",
   "settings.workspace.form.keepLoadedInfo": "*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
   "settings.workspace.form.name": "이름",
-  "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace",
+  "settings.workspace.form.servicesInWorkspaceHeadline": "작업공간에 있는 서비스",
   "settings.workspace.form.yourWorkspaces": "작업공간",
   "settings.workspaces.deletedInfo": "작업영역이 삭제되었습니다.",
   "settings.workspaces.headline": "작업공간",
@@ -493,7 +408,7 @@
   "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces",
   "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed": "작업공간을 불러오지 못했습니다.",
-  "setupAssistant.headline": "Let's get started",
+  "setupAssistant.headline": "시작하기",
   "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
   "setupAssistant.submit.label": "Let's go",
   "sidebar.addNewService": "새로운 서비스 추가",
@@ -516,31 +431,22 @@
   "signup.link.login": "이미 계정을 가지고 있으시면, 로그인하세요",
   "signup.password.label": "비밀번호",
   "signup.submit.label": "계정 만들기",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "모든 옵션 보기",
-  "subscription.cta.choosePlan": "플랜을 선택하세요",
-  "subscription.includedProFeatures": "Ferdi 프로페셔널 플랜에 포함된 것",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "계정 업그레이드",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "취소",
-  "subscriptionPopup.buttonDone": "완료",
-  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
+  "tabs.item.confirmDeleteService": "{serviceName} 서비스를 정말로 삭제하시겠습니까?",
   "tabs.item.deleteService": "서비스 삭제",
   "tabs.item.disableAudio": "오디오 비활성화",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "알림 비활성화",
   "tabs.item.disableService": "서비스 비활성화",
   "tabs.item.edit": "편집",
   "tabs.item.enableAudio": "오디오 활성화",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "알림 허용",
   "tabs.item.enableService": "서비스 활성화",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "새로고침",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} 는 유효하지 않습니다.",
-  "validation.minLength": "{field} should be at least {length} characters long",
+  "validation.minLength": "{field} 는 최소한 {length} 보다 길어야 합니다.",
   "validation.oneRequired": "적어도 하나는 필요 합니다.",
   "validation.required": "{field} 는 필수입니다.",
   "validation.url": "{field} 는 유효하지 않은 URL입니다.",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "작업 공간",
   "workspaceDrawer.item.contextMenuEdit": "편집",
   "workspaceDrawer.item.noServicesAddedYet": "추가된 서비스가 없습니다.",
-  "workspaceDrawer.premiumCtaButtonLabel": "첫 작업 공간 생성",
-  "workspaceDrawer.proFeatureBadge": "프리미엄 기능",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "프리미엄 계정 다시 활성화하기",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "작업공간 설정 편집",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/ms.json b/src/i18n/locales/ms.json
index bb6115b36..6f92bf4de 100644
--- a/src/i18n/locales/ms.json
+++ b/src/i18n/locales/ms.json
@@ -5,30 +5,6 @@
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
-  "feature.delayApp.headline": "Upgrade your Ferdi plan to skip the wait",
-  "feature.delayApp.text": "Ferdi akan beroperasi semula dalam {seconds} saat",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14-days trial and skip the wait",
-  "feature.delayApp.upgrade.action": "Upgrade Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Naik taraf akaun",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}?",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Hantar sebagai emel",
   "feature.shareFranz.action.facebook": "Kongsi ke Facebook",
   "feature.shareFranz.action.twitter": "Kongsi ke Twitter",
@@ -36,16 +12,6 @@
   "feature.shareFranz.shareText.email": "Saya telah menambah {count] servis ke Ferdi! Dapatkan aplikasi percuma WhatsApp, Messenger, Slack, Skype dan lain-lain dari www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Beritahu rakan anda betapa hebatnya Ferdi dan bantu kami menyebarkan maklumat ini",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Tidak dapat bersambung ke perkhidmatan dalam talian Ferdi",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "Anda tidak disambungkan ke internet.",
@@ -53,7 +19,6 @@
   "global.spellchecking.autodetect": "Kesan bahasa secara automatik",
   "global.spellchecking.autodetect.short": "Automatik",
   "global.spellchecking.language": "Bahasa untuk semakan ejaan",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "import.headline": "Import perkhidmatan Ferdi 4 anda",
   "import.notSupportedHeadline": "Perkhidmatan belum disokong dalam Ferdi 5",
   "import.skip.label": "Saya mahu menambah perkhidmatan secara manual",
@@ -63,7 +28,6 @@
   "infobar.buttonReloadServices": "Mula semula perkhidmatan",
   "infobar.requiredRequestsFailed": "Tidak dapat memuatkan perkhidmatan dan maklumat pengguna",
   "infobar.servicesUpdated": "Perkhidmatan anda telah dikemas kini.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "Kemas kini baru untuk Ferdi boleh didapati.",
   "invite.email.label": "Alamat emel",
   "invite.headline.friends": "Jemput 3 rakan atau rakan sekerja anda",
@@ -122,9 +86,7 @@
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Paparan",
-  "menu.view.enterFullScreen": "Masuk Skrin Penuh",
-  "menu.view.exitFullScreen": "Keluar Skrin Penuh",
-  "menu.view.reloadFranz": "Ulangmuat Ferdi",
+  "menu.view.reloadFerdi": "Ulangmuat Ferdi",
   "menu.view.reloadService": "Ulangmuat Perkhidmatan",
   "menu.view.reloadTodos": "Reload ToDos",
   "menu.view.resetZoom": "Saiz Sebenar",
@@ -149,7 +111,6 @@
   "password.noUser": "Tiada pengguna dengan alamat e-mel tersebut dijumpai",
   "password.submit.label": "Hantar",
   "password.successInfo": "Sila semak e-mel anda",
-  "premiumFeature.button.upgradeAccount": "Naik taraf akaun",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
@@ -166,27 +127,6 @@
   "pricing.features.upToSixServices": "Add up to 6 services",
   "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Free",
-  "pricing.plan.legacy": "Premium",
-  "pricing.plan.personal": "Personal",
-  "pricing.plan.personal-monthly": "Personal Monthly",
-  "pricing.plan.personal-yearly": "Personal Yearly",
-  "pricing.plan.pro": "Professional",
-  "pricing.plan.pro-monthly": "Professional Monthly",
-  "pricing.plan.pro-yearly": "Professional Yearly",
-  "pricing.trial.cta.accept": "Start my 14-day Ferdi Professional Trial ",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Ulangmuat {nama}",
   "service.crashHandler.autoReload": "Sedang cuba pulihkan secara automatik {nama} dalam {saat} saat",
   "service.crashHandler.headline": "Alamak!",
@@ -198,11 +138,6 @@
   "service.errorHandler.headline": "Alamak!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading",
   "services.getStarted": "Bermula",
   "services.welcome": "Selamat Datang ke Ferdi",
@@ -219,18 +154,9 @@
   "settings.account.headlineInvoices": "Invois",
   "settings.account.headlinePassword": "Tukar katalaluan",
   "settings.account.headlineProfile": "Kemaskini maklumat peribadi",
-  "settings.account.headlineSubscription": "Langganan anda",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Muat Turun",
-  "settings.account.manageSubscription.label": "Urus langganan anda",
   "settings.account.successInfo": "Kemaskini telah disimpan",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Cuba lagi",
   "settings.account.tryReloadUserInfoRequest": "Cuba lagi",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Maklumat pengguna tidak dapat dipapar",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.buttonClearAllCache": "Padamkan Cache",
@@ -284,7 +210,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Available services",
   "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
   "settings.searchService": "Search service",
@@ -295,7 +220,6 @@
   "settings.service.form.availableServices": "Available services",
   "settings.service.form.customUrl": "Custom server",
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Edit {name}",
@@ -391,19 +315,6 @@
   "signup.link.login": "Already have an account, sign in?",
   "signup.password.label": "Kata laluan",
   "signup.submit.label": "Create account",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Cancel",
-  "subscriptionPopup.buttonDone": "Done",
   "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
@@ -431,7 +342,6 @@
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
   "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
   "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
diff --git a/src/i18n/locales/nb.json b/src/i18n/locales/nb.json
index dde8fcb83..c2f9f0e53 100644
--- a/src/i18n/locales/nb.json
+++ b/src/i18n/locales/nb.json
@@ -45,15 +45,6 @@
   "invite.name.label": "Navn",
   "invite.email.label": "Email adresse",
   "invite.skip.label": "Jeg vil gjøre dette senere",
-  "subscription.submit.label": "Jeg vil ikke støtte utviklingen av Ferdi",
-  "subscription.paymentSessionError": "Kunne ikke laste betalingsskjemaet",
-  "subscription.includedFeatures": "Betalte Ferdi Premium konto inkluderer",
-  "subscription.features.onpremise": "Legg til on-premise/hosted tjenester som HipChat",
-  "subscription.features.customServices": "Private tjenester for deg og ditt lag",
-  "subscription.features.encryptedSync": "Kryptert øktsynkronisering",
-  "subscription.features.vpn": "Proxy & VPN støtte",
-  "subscription.features.ads": "Ingen annonser, noensinne!",
-  "subscription.features.comingSoon": "Kommer snart",
   "infobar.servicesUpdated": "Dine tjenester er oppdatert.",
   "infobar.updateAvailable": "En ny oppdatering for Ferdi er tilgjengelig.",
   "infobar.buttonReloadServices": "Oppdater tjenester",
@@ -64,14 +55,10 @@
   "services.welcome": "Velkommen til Ferdi",
   "services.getStarted": "Kom i gang",
   "settings.account.headline": "Konto",
-  "settings.account.headlineSubscription": "Ditt abonnement",
   "settings.account.headlineUpgrade": "Oppgrader din konto og støtt Ferdi",
-  "settings.account.headlineInvoices": "Fakturaer",
-  "settings.account.manageSubscription.label": "Administrer dine abonnement",
   "settings.account.accountType.basic": "Enkel Konto",
   "settings.account.accountType.premium": "Premium Konto",
   "settings.account.account.editButton": "Rediger konto",
-  "settings.account.invoiceDownload": "Last ned",
   "settings.account.userInfoRequestFailed": "Kunne ikke laste brukerinformasjon",
   "settings.account.tryReloadUserInfoRequest": "Prøv igjen",
   "settings.account.headlineProfile": "Oppdater profil",
@@ -89,7 +76,6 @@
   "settings.navigation.settings": "Innstillinger",
   "settings.navigation.logout": "Logg ut",
   "settings.recipes.headline": "Tilgjengelige tjenester",
-  "settings.recipes.mostPopular": "Mest populære",
   "settings.recipes.all": "Alle tjenester",
   "settings.recipes.dev": "Utvikling",
   "settings.recipes.nothingFound": "Beklager, men ingen tjeneste samsvarer med søkeordet ditt.",
@@ -149,18 +135,6 @@
   "settings.user.form.accountType.individual": "Individuell",
   "settings.user.form.accountType.non-profit": "Non-Profit",
   "settings.user.form.accountType.company": "Firma",
-  "subscription.type.free": "gratis",
-  "subscription.type.month": "måned",
-  "subscription.type.year": "år",
-  "subscription.type.mining": "Støtt Ferdi med prosessorkraft",
-  "subscription.mining.headline": "Hvordan fungerer dette?",
-  "subscription.mining.experimental": "eksperimental",
-  "subscription.mining.line1": "Ved å aktivere \"Støtt Ferdi med prosessorkraft\" vil Ferdi bruke cirka 20-50% av prosessore din til å mine kryptovalutaen Monero, som vil tilsvare omtrent $5/år",
-  "subscription.mining.line2": "Vi vil tilpasse prosessor bruken basert på arbeidsadferd for å ikke tømme batteriet og senke hastigheten på maskinen din.",
-  "subscription.mining.line3": "Så lenge du miner, har du ubegrenset tilgang til alle Ferdi Premium funksjoner.",
-  "subscription.mining.moreInformation": "Få mer informasjon om denne planen.",
-  "subscriptionPopup.buttonCancel": "Kanseller",
-  "subscriptionPopup.buttonDone": "Ferdi g",
   "tabs.item.reload": "Reload",
   "tabs.item.edit": "Rediger",
   "tabs.item.disableNotifications": "Deaktiver varsler",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index a4f8aca49..3d6991d5e 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Wijzigingen in Ferdi {versie}",
   "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Neem een Ferdi Supporter Licentie om niet meer te hoeven wachten",
-  "feature.delayApp.text": "Ferdi gaat over {seconds} seconden verder.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Neem een Ferdi Supporter Licentie ",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "Annuleren",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Verstuur als e-mail",
   "feature.shareFranz.action.facebook": "Deel op Facebook",
   "feature.shareFranz.action.twitter": "Deel op Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "Ik heb {telling} diensten toegevoegd aan Ferdi! Download de gratis app voor WhatsApp, Messenger, Slack, Skype, en anderen op www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "Ik heb {tel} diensten toegevoegd aan Ferdi! Download de gratis app voor WhatsApp, Messenger, Slack, Skype, en anderen op www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Vertel je vrienden en collega's hoe geweldig Ferdi is en help ons het woord te verspreiden.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Kan geen verbinding maken met de Ferdi services",
-  "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "Je hebt geen internet verbinding.",
   "global.spellchecker.useDefault": "Gebruik Systeemstandaard ({default})",
   "global.spellchecking.autodetect": "Taal automatisch herkennen",
   "global.spellchecking.autodetect.short": "Automatisch",
   "global.spellchecking.language": "Taal spellingscontrole",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importeer je Ferdi 4 services",
@@ -88,7 +52,6 @@
   "infobar.hide": "Verbergen",
   "infobar.requiredRequestsFailed": "Kan de services en gebruikersinformatie niet laden",
   "infobar.servicesUpdated": "Je services zijn bijgewerkt.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "Er is een nieuwe update voor Ferdi beschikbaar.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "E-mailadres",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Controleer op updates",
   "menu.app.hide": "Verbergen",
-  "menu.app.hideOthers": "Andere Verbergen",
-  "menu.app.quit": "Afsluiten",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Instellingen",
-  "menu.app.unhide": "Tonen",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Bewerken",
-  "menu.edit.copy": "Kopiëren",
-  "menu.edit.cut": "Knippen",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Verwijderen",
   "menu.edit.emojiSymbols": "Emoji & Symbolen",
   "menu.edit.findInPage": "Find in Page",
-  "menu.edit.paste": "Plakken",
-  "menu.edit.pasteAndMatchStyle": "Plakken en stijl overeen laten komen",
-  "menu.edit.redo": "Opnieuw doen",
-  "menu.edit.selectAll": "Selecteer Alles",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Spraakuitvoer",
   "menu.edit.startDictation": "Beginnen met dicteren",
   "menu.edit.startSpeaking": "Begin met Spreken",
   "menu.edit.stopSpeaking": "Stoppen met Spreken",
-  "menu.edit.undo": "Ongedaan maken",
+  "menu.edit.undo": "Undo",
   "menu.file": "Bestand",
   "menu.help": "Help",
   "menu.help.changelog": "Logboek",
   "menu.help.debugInfo": "Copy Debug Information",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Meer Weten",
   "menu.help.privacy": "Privacyverklaring",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Weergave",
   "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Volledig scherm openen",
-  "menu.view.exitFullScreen": "Volledig scherm verlaten",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Ferdi Herladen",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Service Herladen",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Werkelijke Grootte",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Ontwikkelaarstools Aan/Uit",
-  "menu.view.toggleFullScreen": "Volledig Scherm Aan/Uit",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Service Ontwikkelaarstools Aan/Uit",
   "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
-  "menu.view.zoomIn": "Inzoomen",
-  "menu.view.zoomOut": "Uitzoomen",
-  "menu.window": "Venster",
-  "menu.window.close": "Sluiten",
-  "menu.window.minimize": "Minimaliseren",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Werkruimten",
   "menu.workspaces.addNewWorkspace": "Voeg nieuwe werkruimte toe...",
   "menu.workspaces.closeWorkspaceDrawer": "Werkruimtepagina sluiten",
@@ -194,11 +156,7 @@
   "password.noUser": "Geen gebruiker gevonden met dat e-mailadres",
   "password.submit.label": "Verzenden",
   "password.successInfo": "Controleer alsjeblieft je e-mail",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Werkruimten",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "{naam} herladen",
   "service.crashHandler.autoReload": "Ga proberen om {name} te herstellen over {seconds} seconden",
   "service.crashHandler.headline": "Oh nee!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Oh nee!",
   "service.errorHandler.message": "Fout",
   "service.errorHandler.text": "{name} kon niet geladen worden.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Beginnen",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Welkom bij Ferdi",
   "settings.account.account.editButton": "Account bewerken",
-  "settings.account.accountType.basic": "Basis Account",
-  "settings.account.accountType.premium": "Premium Supporter Account",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Profiel bijwerken",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Facturen",
   "settings.account.headlinePassword": "Wijzig wachtwoord",
   "settings.account.headlineProfile": "Profiel bijwerken",
-  "settings.account.headlineSubscription": "Je abonnement",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.manageSubscription.label": "Beheer je abonnement",
   "settings.account.successInfo": "Je wijzigingen zijn opgeslagen",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Probeer opnieuw",
   "settings.account.tryReloadUserInfoRequest": "Probeer opnieuw",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Kon gebruikersinformatie niet laden",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Spellingcontrole inschakelen",
   "settings.app.form.enableSystemTray": "Toon Ferdi in de systeembalk",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Instellingen",
   "settings.app.headlineAdvanced": "Geavanceerd",
   "settings.app.headlineAppearance": "Weergave",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Officiële vertalingen zijn in het Engels en Duits. Alle andere tallen zijn op de gemeenschap gebaseerde vertalingen.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Deze wijziging heeft een herstart nodig",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Beschikbare services",
   "settings.recipes.missingService": "Mist er een service?",
-  "settings.recipes.mostPopular": "Meest populair",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service succesvol toegevoegd",
   "settings.searchService": "Service zoeken",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "{name} toevoegen",
   "settings.service.form.availableServices": "Beschikbare services",
   "settings.service.form.customUrl": "Aangepaste server",
-  "settings.service.form.customUrlPremiumInfo": "Om intern gehoste services toe te voegen heb je een Ferdi Premium Supporter Account nodig.",
-  "settings.service.form.customUrlUpgradeAccount": "Je account upgraden",
   "settings.service.form.customUrlValidationError": "Kon de custom {name} server niet valideren.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade je Account",
   "settings.user.form.accountType.company": "Bedrijf",
   "settings.user.form.accountType.individual": "Particulier",
   "settings.user.form.accountType.label": "Account type",
@@ -516,29 +431,20 @@
   "signup.link.login": "Al een account, inloggen?",
   "signup.password.label": "Password",
   "signup.submit.label": "Account aanmaken",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Annuleren",
-  "subscriptionPopup.buttonDone": "Klaar",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Service verwijderen",
   "tabs.item.disableAudio": "Audio uitschakelen",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Notificaties uitschakelen",
   "tabs.item.disableService": "Service uitschakelen",
   "tabs.item.edit": "Bewerken",
   "tabs.item.enableAudio": "Audio inschakelen",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Notificaties aanzetten",
   "tabs.item.enableService": "Service aanzetten",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Herladen",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} is niet geldig",
   "validation.minLength": "{field} moet minimaal {length} karakters lang zijn",
   "validation.oneRequired": "Ten minste één is vereist",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Werkruimten",
   "workspaceDrawer.item.contextMenuEdit": "bewerken",
   "workspaceDrawer.item.noServicesAddedYet": "Nog geen diensten toegevoegd",
-  "workspaceDrawer.premiumCtaButtonLabel": "Maak je eerste werkruimte aan",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Heractiveer premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Pas werkruimte instellingen aan",
   "workspaces.switchingIndicator.switchingTo": "Overschakelen naar"
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 45f0b4301..1d639197c 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh nee! Ferdi heeft de verbinding met {name} verloren.",
   "feature.announcements.changelog.headline": "Wijzigingen in Ferdi {version}",
   "feature.debugger.title": "Foutopsporingsinformatie publiceren",
-  "feature.delayApp.headline": "Sponsor Ferdi om wachten over te slaan",
-  "feature.delayApp.text": "Ferdi gaat over {seconds} seconden verder.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Sponsor Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Upgrade Account",
   "feature.nightlyBuilds.activate": "Activeren",
   "feature.nightlyBuilds.cancel": "Annuleer",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nachtelijke builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "Er is een fout opgetreden tijdens het publiceren van de debug informatie. Probeer het later opnieuw of bekijk de console voor meer informatie.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacybeleid",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Selecteer een service met TAB, ↑ en ↓. Open een service met ENTER.",
   "feature.quickSwitch.search": "Zoeken...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "U heeft {amount} van de {limit} diensten die deel uitmaken van uw abonnement toegevoegd. Upgrade uw account om meer diensten toe te voegen.",
   "feature.shareFranz.action.email": "Verstuur als e-mail",
   "feature.shareFranz.action.facebook": "Deel op Facebook",
   "feature.shareFranz.action.twitter": "Deel op Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "Ik heb {count} services toegevoegd aan Ferdi! Download de gratis app voor Whatsapp, Messenger, Slack, Skype en co op www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "Ik heb {count} services toegevoegd aan Ferdi! Download de gratis app voor Whatsapp, Messenger, Slack, Skype en co op www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Vertel je vrienden en collega's hoe geweldig Ferdi is en help ons om bekender te worden.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Alle anderen zullen nog wat langer moeten wachten.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Kan geen verbinding maken met de Ferdi-services.",
-  "global.franzProRequired": "Ferdi Professional Vereist",
   "global.notConnectedToTheInternet": "U bent niet verbonden met het internet.",
   "global.spellchecker.useDefault": "Gebruik systeemstandaard ({default})",
   "global.spellchecking.autodetect": "Taal automatisch herkennen",
   "global.spellchecking.autodetect.short": "Automatisch",
   "global.spellchecking.language": "Taal voor spellingcontrole",
-  "global.upgradeButton.upgradeToPro": "Upgrade naar Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importeer uw Ferdi 4-services",
@@ -88,7 +52,6 @@
   "infobar.hide": "Verbergen",
   "infobar.requiredRequestsFailed": "Kan de services en gebruikersinformatie niet laden",
   "infobar.servicesUpdated": "Je services zijn bijgewerkt.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "Een nieuwe update voor Ferdi is beschikbaar.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "E-mailadres",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Menubalk automatisch verbergen",
   "menu.app.checkForUpdates": "Controleer op updates",
   "menu.app.hide": "Verbergen",
-  "menu.app.hideOthers": "Andere verbergen",
-  "menu.app.quit": "Afsluiten",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Instellingen",
-  "menu.app.unhide": "Tonen",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Bewerk",
-  "menu.edit.copy": "Kopiëren",
-  "menu.edit.cut": "Knippen",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Verwijderen",
   "menu.edit.emojiSymbols": "Emoji's en symbolen",
   "menu.edit.findInPage": "Zoeken op pagina",
-  "menu.edit.paste": "Plakken",
-  "menu.edit.pasteAndMatchStyle": "Plakken en stijl overeen laten komen",
-  "menu.edit.redo": "Opnieuw doen",
-  "menu.edit.selectAll": "Selecteer alles",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Spraak",
   "menu.edit.startDictation": "Beginnen met dicteren",
   "menu.edit.startSpeaking": "Begin met spreken",
   "menu.edit.stopSpeaking": "Stop met spreken",
-  "menu.edit.undo": "Ongedaan maken",
+  "menu.edit.undo": "Undo",
   "menu.file": "Bestand",
-  "menu.help": "Hulp",
+  "menu.help": "Help",
   "menu.help.changelog": "Wijzigingenlogboek",
   "menu.help.debugInfo": "Copy Debug Information",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Meer informatie",
   "menu.help.privacy": "Privacyvoorwaarden",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Weergave",
   "menu.view.back": "Terug",
-  "menu.view.enterFullScreen": "Gebruik volledig scherm",
-  "menu.view.exitFullScreen": "Volledig scherm verlaten",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Ferdi vergrendelen",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Herlaad Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Een service opnieuw laden",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Werkelijke grootte",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Donkere modus aan/uit",
   "menu.view.toggleDevTools": "Ontwikkelaarstools aan/uit",
-  "menu.view.toggleFullScreen": "Volledig scherm aan/uit",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Service ontwikkelaarstools aan/uit",
   "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
-  "menu.view.zoomIn": "Inzoomen",
-  "menu.view.zoomOut": "Uitzoomen",
-  "menu.window": "Venster",
-  "menu.window.close": "Sluiten",
-  "menu.window.minimize": "Minimaliseren",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Werkruimtes",
   "menu.workspaces.addNewWorkspace": "Voeg nieuwe werkruimte toe...",
   "menu.workspaces.closeWorkspaceDrawer": "Werkruimtepagina sluiten",
@@ -194,11 +156,7 @@
   "password.noUser": "Geen gebruiker bekend met dat e-mailadres",
   "password.submit.label": "Verzenden",
   "password.successInfo": "Controleer je e-mail",
-  "premiumFeature.button.upgradeAccount": "Upgrade Account",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Voor altijd reclamevrij",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Installeer diensten van derden",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Werkruimtes",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Laad {name} opnieuw",
   "service.crashHandler.autoReload": "Bezig om {name} te herstellen over {seconds} seconden",
   "service.crashHandler.headline": "Oh nee!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Oh nee!",
   "service.errorHandler.message": "Fout",
   "service.errorHandler.text": "{name} kon niet geladen worden.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "{service} wordt geladen",
   "services.getStarted": "Begin",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Welkom bij Ferdi",
   "settings.account.account.editButton": "Bewerk account",
-  "settings.account.accountType.basic": "Basisaccount",
-  "settings.account.accountType.premium": "Premium Supporter Account",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profiel",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Facturen",
   "settings.account.headlinePassword": "Wijzig wachtwoord",
   "settings.account.headlineProfile": "Update profiel",
-  "settings.account.headlineSubscription": "Je abonnement",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.manageSubscription.label": "Beheer je abonnement",
   "settings.account.successInfo": "Je wijzigingen zijn opgeslagen",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Probeer opnieuw",
   "settings.account.tryReloadUserInfoRequest": "Probeer opnieuw",
-  "settings.account.upgradeToPro.label": "Upgrade naar Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Kon gebruikersinformatie niet laden",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Zet spellingcontrole aan",
   "settings.app.form.enableSystemTray": "Pictogram voor Ferdi in systeemvak tonen",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Instellingen",
   "settings.app.headlineAdvanced": "Geavanceerd",
   "settings.app.headlineAppearance": "Weergave",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Ferdi spreekt officieel Engels en Duits. Alle andere talen worden beheerd door de community.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Wachtwoord",
   "settings.app.lockedPasswordInfo": "Zorg ervoor dat je een wachtwoord instelt dat je niet vergeet.\nAls je dit wachtwoord verliest, moet je Ferdi opnieuw installeren.",
   "settings.app.restartRequired": "Deze wijziging heeft een herstart nodig",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Beschikbare services",
   "settings.recipes.missingService": "Mis je een service?",
-  "settings.recipes.mostPopular": "Meest populair",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service succesvol toegevoegd",
   "settings.searchService": "Zoek service",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Toevoegen {name}",
   "settings.service.form.availableServices": "Beschikbare services",
   "settings.service.form.customUrl": "Aangepaste server",
-  "settings.service.form.customUrlPremiumInfo": "Om zelf-gehoste services toe te kunnen voegen, heb je een Ferdi Premium Supporter Account nodig.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade je account",
   "settings.service.form.customUrlValidationError": "Kon aangepaste server {name} niet valideren.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Jouw Account opwaarderen",
   "settings.user.form.accountType.company": "Bedrijf",
   "settings.user.form.accountType.individual": "Individueel",
   "settings.user.form.accountType.label": "Accounttype",
@@ -516,29 +431,20 @@
   "signup.link.login": "Heb je al een account? Log in!",
   "signup.password.label": "Wachtwoord",
   "signup.submit.label": "Account aanmaken",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Annuleer",
-  "subscriptionPopup.buttonDone": "Klaar",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Verwijder service",
   "tabs.item.disableAudio": "Audio uitschakelen",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Meldingen uitschakelen",
   "tabs.item.disableService": "Service uitschakelen",
   "tabs.item.edit": "Bewerk",
   "tabs.item.enableAudio": "Audio inschakelen",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Meldingen inschakelen",
   "tabs.item.enableService": "Service inschakelen",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Herladen",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} is niet geldig",
   "validation.minLength": "{field} dient minimaal {length} karakters lang te zijn",
   "validation.oneRequired": "Minstens één vereist",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Werkruimtes",
   "workspaceDrawer.item.contextMenuEdit": "bewerken",
   "workspaceDrawer.item.noServicesAddedYet": "Nog geen services toegevoegd",
-  "workspaceDrawer.premiumCtaButtonLabel": "Maak je eerste werkruimte",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Premium account heractiveren",
   "workspaceDrawer.workspaceFeatureInfo": "Ferdi werkruimtes laat je aandacht geven aan wat nu belangrijk is. Maak verschillende sets van services aan en schakel wanneer je wilt tussen de verschillende sets. Jij beslist welke services je wanneer en waar nodig hebt. Zo helpen wij jou je focus te behouden - of net zo gemakkelijk te switchen van werk naar ontspanning.",
   "workspaceDrawer.workspacesSettingsTooltip": "Werkruimte instellingen aanpassen",
   "workspaces.switchingIndicator.switchingTo": "Overschakelen naar"
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index b5cdb33c8..57a4715c3 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Å nei! Ferdi mistet forbindelsen til {name}.",
   "feature.announcements.changelog.headline": "Endringer i Ferdi {version}",
   "feature.debugger.title": "Publiser feilsøkingsinformasjon",
-  "feature.delayApp.headline": "Vennligst kjøp en Ferdi Supporter-lisens for å hoppe over ventingen",
-  "feature.delayApp.text": "Ferdi vil fortsette om {seconds} sekunder.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Få en Ferdi Supporter-lisens",
-  "feature.delayApp.upgrade.actionShort": "Oppgrader kontoen",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "Avbryt",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "Det oppstod en feil under forsøket på å publisere feilsøkingsinformasjonen. Prøv igjen senere eller se i konsollet for ytterligere informasjon.",
   "feature.publishDebugInfo.info": "Publisering av din feilsøkingsinformasjon hjelper oss med å finne problemer og feil i Ferdi. Ved å publisere feilsøkingsinformasjonen, godtar du Ferdi feilsøkings-retningslinjer for personvern og tjenestevilkår",
   "feature.publishDebugInfo.privacy": "Retningslinjer for personvern",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Velg en tjeneste med TAB, ↑ og ↓. Åpne en tjeneste med ENTER.",
   "feature.quickSwitch.search": "Søk...",
   "feature.quickSwitch.title": "Hurtigbytte",
-  "feature.serviceLimit.limitReached": "Du har lagt til {amount} av {limit} tjenester som er inkludert i planen din. Vennligst oppgrader kontoen din for å legge til flere tjenester.",
   "feature.shareFranz.action.email": "Send som e-post",
   "feature.shareFranz.action.facebook": "Del på Facebook",
   "feature.shareFranz.action.twitter": "Del på Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "Jeg har lagt til {count} tjenester i Ferdi! Få den gratis programvaren for WhatsApp, Messenger, Slack, Skype og andre på www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "Jeg har lagt til {count} tjenester i Ferdi! Få den gratis programvaren for WhatsApp, Messenger, Slack, Skype og andre på www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Fortell vennene og kollegene dine om hvor fantastisk Ferdi er og hjelp oss med å spre ordet.",
-  "feature.todos.premium.info": "Ferdi gjøremål er tilgjengelig for premium brukere nå!",
-  "feature.todos.premium.rollout": "Alle andre må vente litt lenger.",
-  "feature.todos.premium.upgrade": "Oppgrader din konto",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Kan ikke koble til Ferdi online-tjenester",
-  "global.franzProRequired": "Ferdi Professional kreves",
   "global.notConnectedToTheInternet": "Du er ikke koblet til Internett.",
   "global.spellchecker.useDefault": "Bruk systemstandarden ({default})",
   "global.spellchecking.autodetect": "Oppdag språk automatisk",
   "global.spellchecking.autodetect.short": "Automatisk",
   "global.spellchecking.language": "Språk for stavekontroll",
-  "global.upgradeButton.upgradeToPro": "Oppgrader til Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importer Ferdi 4-tjenestene dine",
@@ -88,7 +52,6 @@
   "infobar.hide": "Skjul",
   "infobar.requiredRequestsFailed": "Kunne ikke laste tjenestene og brukerinformasjonen",
   "infobar.servicesUpdated": "Dine tjenester har blitt oppdatert.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "En ny oppdatering til Ferdi er tilgjengelig.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "E-postadresse",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Skjul menylinjen automatisk",
   "menu.app.checkForUpdates": "Se etter oppdateringer",
   "menu.app.hide": "Skjul",
-  "menu.app.hideOthers": "Skjul andre",
-  "menu.app.quit": "Avslutt",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Innstillinger",
-  "menu.app.unhide": "Vis",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Rediger",
-  "menu.edit.copy": "Kopier",
-  "menu.edit.cut": "Klipp ut",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Slett",
   "menu.edit.emojiSymbols": "Emoji og symboler",
   "menu.edit.findInPage": "Finn på siden",
-  "menu.edit.paste": "Lim inn",
-  "menu.edit.pasteAndMatchStyle": "Lim inn og tilpass stil",
-  "menu.edit.redo": "Gjenta",
-  "menu.edit.selectAll": "Merk alt",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Tale",
   "menu.edit.startDictation": "Start diktering",
   "menu.edit.startSpeaking": "Start diktering",
   "menu.edit.stopSpeaking": "Stopp diktering",
-  "menu.edit.undo": "Angre",
+  "menu.edit.undo": "Undo",
   "menu.file": "Fil",
-  "menu.help": "Hjelp",
+  "menu.help": "Help",
   "menu.help.changelog": "Endringslogg",
   "menu.help.debugInfo": "Kopier feilsøkingsinformasjon",
   "menu.help.debugInfoCopiedBody": "Din feilsøkingsinformasjon har blitt kopiert til utklippstavlen.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi feilsøkingsinformasjon",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Finn ut mer",
   "menu.help.privacy": "Personvernerklæring",
   "menu.help.publishDebugInfo": "Publiser feilsøkingsinformasjon",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Aktiver gjøremål",
   "menu.view": "Vis",
   "menu.view.back": "Tilbake",
-  "menu.view.enterFullScreen": "Gå til fullskjerm",
-  "menu.view.exitFullScreen": "Avslutt fullskjerm",
   "menu.view.forward": "Videresend",
   "menu.view.lockFerdi": "Lås Ferdi",
   "menu.view.openQuickSwitch": "Åpne hurtigbytte",
-  "menu.view.reloadFranz": "Last inn Ferdi på nytt",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Last inn tjenesten på nytt",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Faktisk størrelse",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Skru av/på mørkt tema",
   "menu.view.toggleDevTools": "Aktiverer/deaktiverer utviklerverktøy",
-  "menu.view.toggleFullScreen": "Gå inn/ut av fullskjerm",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Skru av/på tjenestutviklerverktøy",
   "menu.view.toggleTodosDevTools": "Aktiverer/deaktiverer gjøremål-utviklerverktøy",
-  "menu.view.zoomIn": "Zoom inn",
-  "menu.view.zoomOut": "Zoom ut",
-  "menu.window": "Vindu",
-  "menu.window.close": "Lukk",
-  "menu.window.minimize": "Minimer",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Arbeidsområder",
   "menu.workspaces.addNewWorkspace": "Legg til nytt arbeidsområde...",
   "menu.workspaces.closeWorkspaceDrawer": "Lukk skuff for arbeidsområder",
@@ -194,11 +156,7 @@
   "password.noUser": "Ingen bruker med den e-postadressen ble funnet",
   "password.submit.label": "Send",
   "password.successInfo": "Vennligst sjekk e-posten din",
-  "premiumFeature.button.upgradeAccount": "Oppgrader kontoen",
   "pricing.features.accountSync": "Konto synkronisering",
-  "pricing.features.adFree": "Alltid uten reklame",
-  "pricing.features.appDelays": "Ingen vente-skjermer",
-  "pricing.features.appDelaysEnabled": "Tilfeldig vente-skjermer",
   "pricing.features.customWebsites": "Legg til egendefinerte nettsteder",
   "pricing.features.desktopNotifications": "Skrivebord varsler",
   "pricing.features.onPremise": "On-premise og andre selvbetjente tjenester",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team-administrasjon",
   "pricing.features.thirdPartyServices": "Installer tredjepartstjenester",
   "pricing.features.unlimitedServices": "Legg til ubegrenset antall tjenester",
-  "pricing.features.upToSixServices": "Legg til opptil 6 tjenester",
-  "pricing.features.upToThreeServices": "Legg til opptil 3 tjenester",
   "pricing.features.workspaces": "Arbeidsområder",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal månedlig",
-  "pricing.plan.personal-yearly": "Ferdi Personal årlig",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional månedlig",
-  "pricing.plan.pro-yearly": "Ferdi Professional årlig",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Last {name} inn på nytt",
   "service.crashHandler.autoReload": "Prøver å automatisk gjenopprette {name} om {seconds} sekunder",
   "service.crashHandler.headline": "Å nei!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Å nei!",
   "service.errorHandler.message": "Feil",
   "service.errorHandler.text": "{name} kan ikke lastes.",
-  "service.restrictedHandler.action": "Oppgrader din konto",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional-funksjonsplan kreves",
-  "service.restrictedHandler.customUrl.text": "Vennligst oppgrader til Ferdi Professional funksjonsplan for å bruke egendefinerte nettadresser og selvbetjente tjenester.",
-  "service.restrictedHandler.serviceLimit.headline": "Du har nådd din tjeneste-grense.",
-  "service.restrictedHandler.serviceLimit.text": "Vennligst oppgrader kontoen din for å brukere mer enn {count} tjenester.",
   "service.webviewLoader.loading": "Laster inn {service}",
   "services.getStarted": "Kom i gang",
   "services.login": "Vennligst logg inn for å bruke Ferdi.",
-  "services.serverInfo": "Eventuelt kan du endre Ferdi-tjeneren ved å klikke på tannhjulet i det nederste venstre hjørne.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Bruk Ferdi uten en konto",
   "services.welcome": "Velkommen til Ferdi",
   "settings.account.account.editButton": "Rediger konto",
-  "settings.account.accountType.basic": "Basis-konto",
-  "settings.account.accountType.premium": "Premium Supporter-konto",
   "settings.account.accountUnavailable": "Kontoen er ikke tilgjengelig",
   "settings.account.accountUnavailableInfo": "Du bruker Ferdi uten en konto. Hvis du ønsker å bruke Ferdi med en konto og hold tjenestene dine synkronisert på tvers av installasjoner, velg en tjener i fanen innstillinger og logg inn.",
   "settings.account.buttonSave": "Oppdater profil",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Fakturaer",
   "settings.account.headlinePassword": "Endre passord",
   "settings.account.headlineProfile": "Oppdater profil",
-  "settings.account.headlineSubscription": "Abonnementet ditt",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Oppgrader din konto og få full tilgang til Ferdi-opplevelsen",
-  "settings.account.invoiceDownload": "Last ned",
-  "settings.account.manageSubscription.label": "Administrere ditt abonnement",
   "settings.account.successInfo": "Dine endringer har blitt lagret",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Prøv igjen",
   "settings.account.tryReloadUserInfoRequest": "Prøv igjen",
-  "settings.account.upgradeToPro.label": "Oppgrader til Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Kunne ikke laste brukerinformasjonen",
   "settings.account.yourLicense": "Din Ferdi lisens",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Aktiver stavekontroll",
   "settings.app.form.enableSystemTray": "Vis Ferdi i systemstatusfeltet",
   "settings.app.form.enableTodos": "Aktiver Ferdi gjøremål",
-  "settings.app.form.hibernate": "Aktiver dvalemodus for tjeneste",
   "settings.app.form.hibernateOnStartup": "Hold tjenestene i dvalemodus ved oppstart",
   "settings.app.form.hibernationStrategy": "Dvalemodus-strategi",
   "settings.app.form.iconSize": "Ikonstørrelse på tjenester",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Aktiver universelt mørkt tema",
   "settings.app.form.useTouchIdToUnlock": "Tillat å bruke TouchID for å låse opp Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Innstillinger",
   "settings.app.headlineAdvanced": "Avansert",
   "settings.app.headlineAppearance": "Utseende",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "Som standard vil Ferdi beholde alle tjenestene dine åpne og lastet i bakgrunnen slik at de er klare når du vil bruke dem. Dvalemodus for tjenester vil sette tjenestene dine i dvale etter et angitt tidsrom. Dette er nyttig for å spare minne eller sørge for at tjenestene ikke gjør datamaskinen din treg.",
   "settings.app.inactivityLockInfo": "Minutter med inaktivitet, hvorpå Ferdi burde låses automatisk. Bruk 0 for å deaktivere",
   "settings.app.languageDisclaimer": "Offisielle oversettelser er engelsk & tysk. Alle andre språk er samfunnsbaserte oversettelser.",
-  "settings.app.lockInfo": "Passordlås lar deg holde meldingene dine beskyttet.\nVed bruk av passord lås, så vil du bli bedt om å skrive inn passordet hver gang du starter Ferdi eller låser Ferdi selv ved hjelp av låsesymbolet i nedre venstre hjørne eller snarveien CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Passord",
   "settings.app.lockedPasswordInfo": "Vennligst angi et passord du vil huske.\nHvis du mister dette passordet må du installere Ferdi på nytt.",
   "settings.app.restartRequired": "Endringer krever omstart",
   "settings.app.scheduledDNDInfo": "Planlagt ikke-forstyrr lar deg definere en tidsperiode hvor du ikke vil få varsler fra Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Tider i 24-Hour-Format. Sluttiden kan være før starttiden (f.eks start 17:00, slutt 09:00) for å aktivere ikke-forstyrr over natten.",
-  "settings.app.sentryInfo": "Å sende telemetridata lar oss finne feil i Ferdi - vi vil ikke sende noen personlig informasjon som dine meldingsdata! Endring av dette valget krever at du starter om Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi bruker Mac'en sin innebygde stavekontroll, for å se etter skrivefeil. Hvis du vil endre språket på stavekontrollen, så kan du gjøre det under Mac'ens system-innstillinger.",
   "settings.app.subheadlineCache": "Hurtiglager",
   "settings.app.todoServerInfo": "Denne tjeneren vil ble brukt for \"Ferdi gjøremål\" funksjonen.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Åpne mappe",
   "settings.recipes.headline": "Tilgjengelige tjenester",
   "settings.recipes.missingService": "Mangler en tjeneste?",
-  "settings.recipes.mostPopular": "Mest populære",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Tjenesten ble vellykket lagt til",
   "settings.searchService": "Søk etter tjeneste",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Legg til {name}",
   "settings.service.form.availableServices": "Tilgjengelige tjenester",
   "settings.service.form.customUrl": "Egendefinert tjener",
-  "settings.service.form.customUrlPremiumInfo": "For å legge til selvbetjente tjenester, trenger du en Ferdi Premium Supporter konto.",
-  "settings.service.form.customUrlUpgradeAccount": "Oppgrader din konto",
   "settings.service.form.customUrlValidationError": "Kunne ikke validere egendefinert {name} tjener.",
   "settings.service.form.darkReaderBrightness": "Lysstyrke for lesing i mørket",
   "settings.service.form.darkReaderContrast": "Kontrast for lesing i mørket",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Ferdi team-administrasjon",
   "settings.team.copy": "Med Franz's Team-administrasjon kan du administrere Franz abonnementer for flere brukere. Vennligst husk at du som har et Franz Premium-abonnement vil ikke ha noen fordeler med deg når du bruker Ferdi: Den eneste grunnen til at du fortsatt har tilgang til teamhåndtering er slik at du kan administrere din eldre Franz team, og for at du ikke skal miste noen funksjoner ved administrasjon av kontoen din.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "Du bruker for øyeblikket Franz sine tjenere, derfor har du tilgang til Team-administrasjon.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Administrere ditt team på meetfranz.com",
   "settings.team.teamsUnavailable": "Team er utilgjengelig",
   "settings.team.teamsUnavailableInfo": "For øyeblikket er Team bare tilgjengelige når du bruker Franz sine tjenere og etter å ha betalt for Franz Professional. Vennligst bytt serveren til https://api.franzinfra.com for å bruke team.",
-  "settings.team.upgradeAction": "Oppgrader din konto",
   "settings.user.form.accountType.company": "Firma",
   "settings.user.form.accountType.individual": "Individuell",
   "settings.user.form.accountType.label": "Kontotype",
@@ -516,29 +431,20 @@
   "signup.link.login": "Har du allerede en konto, logg inn?",
   "signup.password.label": "Passord",
   "signup.submit.label": "Opprett konto",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "Se alle alternativer",
-  "subscription.cta.choosePlan": "Velg din funksjonsplan",
-  "subscription.includedProFeatures": "Ferdi Professional funksjonsplanen inkluderer:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per måned",
-  "subscription.interval.perMonthPerUser": "per måned og bruker",
-  "subscription.planItem.upgradeAccount": "Oppgrader din konto",
-  "subscription.teaser.includedFeatures": "Betalte Ferdi-funksjonsplaner inkluderer:",
-  "subscription.teaser.intro": "Ferdi 5 har en lang rekke nye funksjoner, for å styrke kommunikasjonen i hverdagen - batterier inkludert. Sjekk ut våre nye planer og finn ut hvilke som passer deg best!",
-  "subscriptionPopup.buttonCancel": "Avbryt",
-  "subscriptionPopup.buttonDone": "Ferdig",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Slett tjeneste",
   "tabs.item.disableAudio": "Deaktiver lyd",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Deaktiver varslinger",
   "tabs.item.disableService": "Deaktiver tjeneste",
   "tabs.item.edit": "Rediger",
   "tabs.item.enableAudio": "Aktiver lyd",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktiver varsler",
   "tabs.item.enableService": "Aktivere tjenesten",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Last inn på nytt",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} er ikke gyldig",
   "validation.minLength": "{field} bør være minst {length} tegn",
   "validation.oneRequired": "Minst en er påkrevd",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Arbeidsområder",
   "workspaceDrawer.item.contextMenuEdit": "rediger",
   "workspaceDrawer.item.noServicesAddedYet": "Ingen tjenester er lagt til ennå",
-  "workspaceDrawer.premiumCtaButtonLabel": "Opprett ditt første arbeidsområde",
-  "workspaceDrawer.proFeatureBadge": "Premium-funksjon",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reaktiver premium-konto",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi arbeidsområder lar deg fokusere på hva som er viktig akkurat nå. Sett opp forskjellige sett av tjenester, og veksle enkelt mellom dem når som helst.</p><p>Du bestemmer hvilke tjenester du trenger når og hvor, så vi kan hjelpe deg med å bli best i spillet - eller enkelt koble av fra jobb når du måtte trenge det.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Rediger innstillinger for arbeidsområder",
   "workspaces.switchingIndicator.switchingTo": "Bytter til"
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index f494da546..947c7347c 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "O nie! Ferdi stracił połączenie z {name}.",
   "feature.announcements.changelog.headline": "Co nowego w Ferdi {version}",
   "feature.debugger.title": "Opublikuj dane diagnostyczne",
-  "feature.delayApp.headline": "Aby nie czekać, kup licencję Ferdi Supporter",
-  "feature.delayApp.text": "Ferdi będzie kontynuował za {seconds} sekund.",
-  "feature.delayApp.trial.action": "Tak, chcę darmową 14-dniową wersję próbną Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Aktywuj darmową wersję próbną Ferdi Professional",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Uzyskaj licencję Ferdi Supporter",
-  "feature.delayApp.upgrade.actionShort": "Uaktualnij konto",
   "feature.nightlyBuilds.activate": "Aktywuj",
   "feature.nightlyBuilds.cancel": "Anuluj",
   "feature.nightlyBuilds.info": "Kompilacje testowe to wysoce eksperymentalne wersje Ferdi, które mogą zawierać niedopracowane lub nieukończone funkcje. Te kompilacje są przewidziane głównie dla programistów testujących nowe funkcje będące w opracowaniu oraz ostateczne działanie ukończonej kompilacji. Jeśli nie masz pewności co do tej funkcji, zalecamy nie włączać wersji testowych.",
   "feature.nightlyBuilds.title": "Kompilacje testowe",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "Wystąpił błąd podczas publikowania informacji o debugowaniu. Spróbuj ponownie później lub sprawdź konsolę po więcej informacji.",
   "feature.publishDebugInfo.info": "Publikowanie swoich informacji diagnostycznych pomaga nam znaleźć problemy i błędy w Ferdi. Publikując informacje diagnostyczne, wyrażasz zgodę na Politykę prywatności oraz Warunki użytkowania tej funkcji",
   "feature.publishDebugInfo.privacy": "Polityka prywatności",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Wybierz usługę naciskając TAB, ↑ oraz ↓. Otwórz usługę naciskając ENTER.",
   "feature.quickSwitch.search": "Szukaj...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "Dodałeś {amount} z {limit} usług, które oferuje twój plan. Ulepsz swoje konto, aby dodać więcej usług.",
   "feature.shareFranz.action.email": "Wyślij jako e-mail",
   "feature.shareFranz.action.facebook": "Udostępnij na Facebooku",
   "feature.shareFranz.action.twitter": "Udostępnij na Twitterze",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "Korzystam z {count} usług poprzez Ferdi! Pobierz bezpłatną aplikację do obsługi WhatsApp, Messenger, Slack, Skype i więcej na www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "Korzystam z {count} usług poprzez Ferdi! Pobierz bezpłatną aplikację do obsługi WhatsApp, Messenger, Slack, Skype i więcej na www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Powiedz znajomym i kolegom o tym, jak odlotowy jest Ferdi i pomóż nam go spopularyzować.",
-  "feature.todos.premium.info": "Listy zadań Ferdi są już dostępne dla użytkowników premium!",
-  "feature.todos.premium.rollout": "Wszyscy inni będą musieli zaczekać nieco dłużej.",
-  "feature.todos.premium.upgrade": "Ulepsz konto",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Nie można połączyć się z usługami Ferdi online",
-  "global.franzProRequired": "Wymagany Ferdi Professional",
   "global.notConnectedToTheInternet": "Nie masz połączenia z Internetem.",
   "global.spellchecker.useDefault": "Użyj domyślnego dla systemu ({default})",
   "global.spellchecking.autodetect": "Automatycznie wykryj język",
   "global.spellchecking.autodetect.short": "Automatycznie",
   "global.spellchecking.language": "Język sprawdzania pisowni",
-  "global.upgradeButton.upgradeToPro": "Ulepsz konto do Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importuj usługi Ferdi 4",
@@ -88,7 +52,6 @@
   "infobar.hide": "Ukryj",
   "infobar.requiredRequestsFailed": "Nie można załadować usług i informacji użytkownika",
   "infobar.servicesUpdated": "Usługi zostały zaktualizowane.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "Dostępna jest nowa wersja Ferdia.",
   "infobox.dismiss": "Odrzuć",
   "invite.email.label": "Adres email",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Automatycznie ukrywaj pasek menu",
   "menu.app.checkForUpdates": "Sprawdź aktualizacje",
   "menu.app.hide": "Ukryj",
-  "menu.app.hideOthers": "Ukryj pozostałe",
-  "menu.app.quit": "Zakończ",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Ustawienia",
-  "menu.app.unhide": "Pokaż więcej",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Edytuj",
-  "menu.edit.copy": "Skopiuj",
-  "menu.edit.cut": "Wytnij",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Usuń",
   "menu.edit.emojiSymbols": "Emoji i symbole",
   "menu.edit.findInPage": "Znajdź na stronie",
-  "menu.edit.paste": "Wklej",
-  "menu.edit.pasteAndMatchStyle": "Wklej i dopasuj styl",
-  "menu.edit.redo": "Ponów",
-  "menu.edit.selectAll": "Zaznacz wszystko",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Mowa",
   "menu.edit.startDictation": "Zacznij dyktować",
   "menu.edit.startSpeaking": "Zacznij mówić",
   "menu.edit.stopSpeaking": "Przestań mówić",
-  "menu.edit.undo": "Cofnij",
+  "menu.edit.undo": "Undo",
   "menu.file": "Plik",
-  "menu.help": "Pomoc",
+  "menu.help": "Help",
   "menu.help.changelog": "Lista zmian",
   "menu.help.debugInfo": "Kopiuj dane diagnostyczne",
   "menu.help.debugInfoCopiedBody": "Dane diagnostyczne zostały skopiowane do schowka.",
   "menu.help.debugInfoCopiedHeadline": "Dane diagnostyczne",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Dowiedz się więcej",
   "menu.help.privacy": "Polityka prywatności",
   "menu.help.publishDebugInfo": "Opublikuj dane diagnostyczne",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Włącz listę zadań",
   "menu.view": "Widok",
   "menu.view.back": "Wstecz",
-  "menu.view.enterFullScreen": "Włącz tryb pełnoekranowy",
-  "menu.view.exitFullScreen": "Zakończ tryb pełnoekranowy",
   "menu.view.forward": "Prześlij dalej",
   "menu.view.lockFerdi": "Zablokuj Ferdi",
   "menu.view.openQuickSwitch": "Otwórz Quick Switch",
-  "menu.view.reloadFranz": "Przeładuj Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Przeładuj usługę",
   "menu.view.reloadTodos": "Odśwież Zadania",
-  "menu.view.resetZoom": "Rzeczywisty rozmiar",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Tryb ciemny",
   "menu.view.toggleDevTools": "Pokaż narzędzia developerskie",
-  "menu.view.toggleFullScreen": "Przełącz tryb pełnoekranowy",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Włącz narzędzia developerskie usługi",
   "menu.view.toggleTodosDevTools": "Przełącz narzędzia deweloperskie Listy zadań",
-  "menu.view.zoomIn": "Powiększ",
-  "menu.view.zoomOut": "Pomniejsz",
-  "menu.window": "Okno",
-  "menu.window.close": "Zamknij",
-  "menu.window.minimize": "Zminimalizuj",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Obszary robocze",
   "menu.workspaces.addNewWorkspace": "Dodaj nowy obszar roboczy...",
   "menu.workspaces.closeWorkspaceDrawer": "Zamknij edytor obszaru roboczego",
@@ -194,11 +156,7 @@
   "password.noUser": "Nie znaleziono użytkownika z takim adresem email",
   "password.submit.label": "Wyślij",
   "password.successInfo": "Proszę sprawdzić swój email",
-  "premiumFeature.button.upgradeAccount": "Uaktualnij konto",
   "pricing.features.accountSync": "Synchronizacja konta",
-  "pricing.features.adFree": "Na zawsze bez reklam",
-  "pricing.features.appDelays": "Brak wygaszaczy ekranu",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Dodawanie dowolnych stron internetowych",
   "pricing.features.desktopNotifications": "Powiadomienia na pulpicie",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Zarządzanie zespołem",
   "pricing.features.thirdPartyServices": "Instalacja zewnętrznych usług",
   "pricing.features.unlimitedServices": "Dodawanie nielimitowanych usług",
-  "pricing.features.upToSixServices": "Dodaj do 6 usług",
-  "pricing.features.upToThreeServices": "Dodaj do 3 usług",
   "pricing.features.workspaces": "Obszary robocze",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Miesięczny Ferdi Personal",
-  "pricing.plan.personal-yearly": "Roczny Ferdi Personal",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Miesięczny Ferdi Professional",
-  "pricing.plan.pro-yearly": "Roczny Ferdi Professional",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Przeładuj {name}",
   "service.crashHandler.autoReload": "Próba automatycznego odnowienia {name} za {seconds} sekund/y",
   "service.crashHandler.headline": "O nie!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "O nie!",
   "service.errorHandler.message": "Błąd",
   "service.errorHandler.text": "Nie udało się załadować {name}.",
-  "service.restrictedHandler.action": "Ulepsz konto",
-  "service.restrictedHandler.customUrl.headline": "Wymagany plan Ferdi Professional",
-  "service.restrictedHandler.customUrl.text": "Uaktualnij swój plan do Ferdi Professional, aby używać własnych adresów URL i własnego hostowania usług.",
-  "service.restrictedHandler.serviceLimit.headline": "Osiągnięto limit usług.",
-  "service.restrictedHandler.serviceLimit.text": "Uaktualnij swoje konto, aby używać więcej niż {count} usług.",
   "service.webviewLoader.loading": "Wczytywanie {service}",
   "services.getStarted": "Zacznij",
   "services.login": "Zaloguj się, aby używać Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Używaj Ferdi bez konta",
   "services.welcome": "Witaj w programie Ferdi",
   "settings.account.account.editButton": "Modyfikuj konta",
-  "settings.account.accountType.basic": "Podstawowe konto",
-  "settings.account.accountType.premium": "Premium Supporter Account",
   "settings.account.accountUnavailable": "Konto jest niedostępne",
   "settings.account.accountUnavailableInfo": "Używasz Ferdi bez konta. Jeśli chcesz używać Ferdi z kontem i synchronizować swoje usługi pomiędzy klientami, wybierz serwer w zakładce Ustawienia i zaloguj się.",
   "settings.account.buttonSave": "Uaktualnij profil",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Faktury",
   "settings.account.headlinePassword": "Zmień hasło",
   "settings.account.headlineProfile": "Uaktualnij profil",
-  "settings.account.headlineSubscription": "Twoja subskrypcja",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Uaktualnij swoje konto i zyskaj pełną funkcjonalność Ferdi",
-  "settings.account.invoiceDownload": "Pobierz",
-  "settings.account.manageSubscription.label": "Zarządzaj swoimi subskrypcjami",
   "settings.account.successInfo": "Twoje zmiany zostały zapisane",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Spróbuj ponownie",
   "settings.account.tryReloadUserInfoRequest": "Spróbuj ponownie",
-  "settings.account.upgradeToPro.label": "Ulepsz konto do Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Nie można wczytać informacji o użytkowniku",
   "settings.account.yourLicense": "Twoja licencja Ferdi",
   "settings.app.accentColorInfo": "Zdefiniuj kolor akcentu w formacie zgodnym z CSS. (Domyślnie: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Włącz sprawdzanie pisowni",
   "settings.app.form.enableSystemTray": "Pokaż Ferdia w obszarze powiadomień",
   "settings.app.form.enableTodos": "Włącz Zadania Ferdi",
-  "settings.app.form.hibernate": "Włącz hibernację usługi",
   "settings.app.form.hibernateOnStartup": "Hibernacja usług po starcie systemu",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Rozmiar ikony usługi",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Włącz uniwersalny tryb ciemny",
   "settings.app.form.useTouchIdToUnlock": "Zezwól na odblokowanie Ferdi przez Touch ID",
   "settings.app.form.useVerticalStyle": "Użyj stylu pionowego",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Ustawienia",
   "settings.app.headlineAdvanced": "Zaawansowane",
   "settings.app.headlineAppearance": "Wygląd",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Oficjalnymi językami są Angielski i Niemiecki. Inne języki są tłumaczone przez społeczność Ferdi.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Hasło",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Zmiany wymagają ponownego uruchomienia",
   "settings.app.scheduledDNDInfo": "Zaplanowanie trybu Nie przeszkadzać umożliwia określić czas, gdy nie chcesz otrzymywać powiadomień z Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Przedział czasu w formacie 24-godzinnym. Czas zakończenia ustawiony przed czasem rozpoczęcia (np. od 17:00 do 9:00) pozwoli na działanie trybu Nie przeszkadzać przez noc.",
-  "settings.app.sentryInfo": "Wysyłanie danych telemetrii pozwala nam znaleźć błędy w Ferdi - żadne dane personalne, takie jak dane wiadomości, nie są wysyłane! Zmiana tej opcji wymaga ponownego uruchomienia Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi używa sprawdzania pisowni wbudowanego w Twojego Maca do sprawdzania pomyłek. Aby zmienić języki ze sprawdzaniem pisowni, przejdź do Preferencji systemowych swojego Maca.",
   "settings.app.subheadlineCache": "Pamięć podręczna",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Otwórz folder",
   "settings.recipes.headline": "Dostępne usługi",
   "settings.recipes.missingService": "Brak usługi?",
-  "settings.recipes.mostPopular": "Najpopularniejsze",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Usługa została dodana pomyślnie",
   "settings.searchService": "Wyszukaj usługę",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Dodaj {name}",
   "settings.service.form.availableServices": "Dostępne usługi",
   "settings.service.form.customUrl": "Spersonalizowany serwer",
-  "settings.service.form.customUrlPremiumInfo": "Aby dodać usługi hostowane lokalnie, musisz posiadać konto Premium.",
-  "settings.service.form.customUrlUpgradeAccount": "Ulepsz swoje konto",
   "settings.service.form.customUrlValidationError": "Nie można zweryfikować spersonalizowanego {name} serwera.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Zespół",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Ulepsz swoje konto",
   "settings.user.form.accountType.company": "Firma",
   "settings.user.form.accountType.individual": "Prywatne",
   "settings.user.form.accountType.label": "Typ konta",
@@ -516,29 +431,20 @@
   "signup.link.login": "Masz już konto, zalogować się?",
   "signup.password.label": "Hasło",
   "signup.submit.label": "Stwórz konto",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "Zobacz wszystkie opcje",
-  "subscription.cta.choosePlan": "Wybierz swój plan",
-  "subscription.includedProFeatures": "Plan Ferdi Professional zawiera:",
-  "subscription.interval.per": "co {interval}",
-  "subscription.interval.perMonth": "co miesiąc",
-  "subscription.interval.perMonthPerUser": "co miesiąc za 1 użytkownika",
-  "subscription.planItem.upgradeAccount": "Ulepsz konto",
-  "subscription.teaser.includedFeatures": "Płatne plany Ferdi zawierają:",
-  "subscription.teaser.intro": "Ferdi 5 zawiera szeroką gamę nowych funkcji pomagających polepszyć Twoją codzienną komunikację - baterie w zestawie. Sprawdź nasze nowe plany i dowiedz się, który najbardziej Ci odpowiada!",
-  "subscriptionPopup.buttonCancel": "Anuluj",
-  "subscriptionPopup.buttonDone": "Zrobione",
   "tabs.item.confirmDeleteService": "Czy na pewno chcesz usunąć usługę {serviceName}?",
   "tabs.item.deleteService": "Usuń usługę",
   "tabs.item.disableAudio": "Wyłącz dźwięk",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Wyłącz powiadomienia",
   "tabs.item.disableService": "Wyłącz usługę",
   "tabs.item.edit": "Edytuj",
   "tabs.item.enableAudio": "Włącz dźwięk",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktywuj powiadomienia",
   "tabs.item.enableService": "Aktywuj usługę",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Odśwież",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "Pole {field} nie jest poprawne",
   "validation.minLength": "Pole {field} powinno składać się z co najmniej {length} znaków",
   "validation.oneRequired": "Przynajmniej jeden jest wymagany",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Obszary robocze",
   "workspaceDrawer.item.contextMenuEdit": "Edycja",
   "workspaceDrawer.item.noServicesAddedYet": "Żadne usługi nie zostały jeszcze dodane",
-  "workspaceDrawer.premiumCtaButtonLabel": "Stwórz pierwszy obszar roboczy",
-  "workspaceDrawer.proFeatureBadge": "Funkcje Premium",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Aktywuj ponownie konto premium",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Obszary robocze programu Ferdi pozawala Ci na skupieniu się na tym co ważne w danym momencie. Ustaw różne zestawy usług i przełączaj się między nimi w łatwiejszy sposób w dowolnym momencie. </p><p>Decyduj, które usługi potrzebujesz  , więc pomagamy Ci pozostawać na szczycie gry - lub łatwiej wyłączyć się z pracy kiedy tego potrzebujesz.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edytuj ustawienia obszaru roboczego",
   "workspaces.switchingIndicator.switchingTo": "Przełącz do"
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index faed710d4..15dfc9185 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Ah não! Ferdi perdeu a conexão com {name}.",
   "feature.announcements.changelog.headline": "Alterações no Ferdi {version}",
   "feature.debugger.title": "Publicar informações de depuração",
-  "feature.delayApp.headline": "Por favor, compre uma Licença de Apoiador Ferdi para pular o tempo de espera",
-  "feature.delayApp.text": "Ferdi continuará em {seconds} segundos.",
-  "feature.delayApp.trial.action": "Sim, Quero a versão experimental do Ferdi Profissional de 14 dias",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Faça parte do grupo de apoiadores do Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Atualize sua conta",
   "feature.nightlyBuilds.activate": "Ativar",
   "feature.nightlyBuilds.cancel": "Cancelar",
   "feature.nightlyBuilds.info": "Versões noturnas são versões do Ferdi altamente experimentais que podem conter funcionalidades não finalizadas ou não concluídas. Essas compilações noturnas são usadas principalmente por desenvolvedores para testar seus recursos recém-desenvolvidos e como eles irão se comportar na versão final. Se você não sabe o que está fazendo, sugerimos não ativar versões noturnas.",
   "feature.nightlyBuilds.title": "Versões noturnas",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "Ocorreu um erro ao tentar publicar as informações de depuração. Por favor, tente novamente mais tarde ou verifique o console para mais informações.",
   "feature.publishDebugInfo.info": "Publicar suas informações de depuração nos permite encontrar erros no Ferdi. Para publicar essas informações é necessário aceitar os termos privacidade e serviço do Ferdi Debugger",
   "feature.publishDebugInfo.privacy": "Política de privacidade",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Selecione um serviço com TAB, ↑ e ↓. Abra um serviço com ENTER.",
   "feature.quickSwitch.search": "Buscar...",
   "feature.quickSwitch.title": "Troca Rápida",
-  "feature.serviceLimit.limitReached": "Você adicionou {amount} serviços de um total de {limit} que estão inclusos no seu plano. Por favor, atualize sua conta para adicionar mais serviços.",
   "feature.shareFranz.action.email": "Enviar por e-mail",
   "feature.shareFranz.action.facebook": "Compartilhar no Facebook",
   "feature.shareFranz.action.twitter": "Compartilhar no Twitter",
@@ -57,25 +33,13 @@
   "feature.shareFranz.shareText.email": "Eu adicionei {count} serviços ao Ferdi! Adquira o aplicativo gratuito para WhatsApp, Messenger, Slack, Skype e mais em www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "Eu adicionei uma contagem de serviços para o Ferdi! Baixe gratuitamente o aplicativo para WhatsApp, Messenger, Slack, Skype e outros em www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Conte aos seus amigos e colegas o quanto incrível o Ferdi é e nos ajude a espalhar a mensagem.",
-  "feature.todos.premium.info": "As Tarefas do Ferdi estão disponíveis para usuários premium!",
-  "feature.todos.premium.rollout": "As outras pessoas terão que esperar um pouquinho mais.",
-  "feature.todos.premium.upgrade": "Atualizar conta",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Não foi possível estabelecer ligação aos serviços do Ferdi",
-  "global.franzProRequired": "Ferdi Plano Profissional é necessário",
   "global.notConnectedToTheInternet": "Você não está conectado à internet.",
   "global.spellchecker.useDefault": "Utilizar o Padrão do Sistema ({default})",
   "global.spellchecking.autodetect": "Detectar a idioma automaticamente",
   "global.spellchecking.autodetect.short": "Automático",
   "global.spellchecking.language": "Idioma para correção ortográfica",
-  "global.upgradeButton.upgradeToPro": "Atualizar para o Ferdi Profissional",
-  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
+  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (para descobrir) ou 'https://developers.whatismybrowser.com/useragents/explore/' (para escolher) o agente de usuário desejado e copie e cole aqui.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importar os seus serviços do Ferdi 4",
   "import.notSupportedHeadline": "Serviços ainda não são suportados pelo Ferdi 5",
@@ -88,9 +52,8 @@
   "infobar.hide": "Ocultar",
   "infobar.requiredRequestsFailed": "Não foi possível carregar os serviços e informações do usuário",
   "infobar.servicesUpdated": "Os seus serviços foram atualizados.",
-  "infobar.trialActivated": "A tua versão experimental foi activada com êxito. Boas mensagens!",
   "infobar.updateAvailable": "Está disponível uma nova atualização para o Ferdi",
-  "infobox.dismiss": "Dismiss",
+  "infobox.dismiss": "Descartar",
   "invite.email.label": "Endereço de e-mail",
   "invite.headline.friends": "Convide 3 amigos ou colegas",
   "invite.name.label": "Nome",
@@ -124,10 +87,10 @@
   "menu.app.autohideMenuBar": "Auto-ocultar barra de menu",
   "menu.app.checkForUpdates": "Procurar atualizações",
   "menu.app.hide": "Ocultar",
-  "menu.app.hideOthers": "Ocultar Outros",
+  "menu.app.hideOthers": "Hide Others",
   "menu.app.quit": "Sair",
   "menu.app.settings": "Configurações",
-  "menu.app.unhide": "Mostrar",
+  "menu.app.unhide": "Reexibir",
   "menu.edit": "Editar",
   "menu.edit.copy": "Copiar",
   "menu.edit.cut": "Cortar",
@@ -135,7 +98,7 @@
   "menu.edit.emojiSymbols": "Emojis e Símbolos",
   "menu.edit.findInPage": "Localizar na página",
   "menu.edit.paste": "Colar",
-  "menu.edit.pasteAndMatchStyle": "Colar e Manter Estilo",
+  "menu.edit.pasteAndMatchStyle": "Colar e Combinar Estilo",
   "menu.edit.redo": "Refazer",
   "menu.edit.selectAll": "Selecionar Tudo",
   "menu.edit.speech": "Voz",
@@ -149,6 +112,7 @@
   "menu.help.debugInfo": "Copiar a informação Debug",
   "menu.help.debugInfoCopiedBody": "As Informações de Depuração foram copiadas para a área de transferência.",
   "menu.help.debugInfoCopiedHeadline": "Informações de Depuração do Ferdi",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Saber mais",
   "menu.help.privacy": "Declaração de privacidade",
   "menu.help.publishDebugInfo": "Publicar Informações de Depuração",
@@ -163,22 +127,20 @@
   "menu.todos.enableTodos": "Ativar Tarefas",
   "menu.view": "Ver",
   "menu.view.back": "Anterior",
-  "menu.view.enterFullScreen": "Ativar Modo Tela Cheia",
-  "menu.view.exitFullScreen": "Sair do Modo Tela Cheia",
   "menu.view.forward": "Próximo",
   "menu.view.lockFerdi": "Bloquear Ferdi",
   "menu.view.openQuickSwitch": "Abrir Troca Rápida",
-  "menu.view.reloadFranz": "Recarregar o Ferdi",
+  "menu.view.reloadFerdi": "Recarregar o Ferdi",
   "menu.view.reloadService": "Recarregar serviço",
   "menu.view.reloadTodos": "Atualizar Tarefas",
   "menu.view.resetZoom": "Tamanho Real",
   "menu.view.toggleDarkMode": "Alternar para tema escuro",
   "menu.view.toggleDevTools": "Ativar/Desativar Ferramentas de Desenvolvimento",
-  "menu.view.toggleFullScreen": "Ativar/Desativar Tela Cheia",
+  "menu.view.toggleFullScreen": "Tela inteira",
   "menu.view.toggleServiceDevTools": "Ativar/Desativar Ferramentas de Desenvolvimento de Serviços",
   "menu.view.toggleTodosDevTools": "Ativar Ferramentas de Desenvolvedor das Tarefas",
-  "menu.view.zoomIn": "Aumentar",
-  "menu.view.zoomOut": "Reduzir",
+  "menu.view.zoomIn": "Ampliar",
+  "menu.view.zoomOut": "Diminuir o zoom",
   "menu.window": "Janela",
   "menu.window.close": "Fechar",
   "menu.window.minimize": "Minimizar",
@@ -194,11 +156,7 @@
   "password.noUser": "Não existe nenhuma conta associada a esse endereço de e-mail",
   "password.submit.label": "Confirmar",
   "password.successInfo": "Por favor, verifique seu e-mail",
-  "premiumFeature.button.upgradeAccount": "Atualize sua conta",
   "pricing.features.accountSync": "Sincronização da conta",
-  "pricing.features.adFree": "Sem publicidade para sempre",
-  "pricing.features.appDelays": "Sem Telas de Espera",
-  "pricing.features.appDelaysEnabled": "Telas de Carregamento Ocasionais",
   "pricing.features.customWebsites": "Adicionar Websites Personalizados",
   "pricing.features.desktopNotifications": "Notificações no ambiente de trabalho",
   "pricing.features.onPremise": "On-Premise & Outros serviços hospedados",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Gestão de Equipes",
   "pricing.features.thirdPartyServices": "Instalar serviços de terceiros",
   "pricing.features.unlimitedServices": "Instalar serviços ilimitados",
-  "pricing.features.upToSixServices": "Adicionar até 6 serviços",
-  "pricing.features.upToThreeServices": "Adicionar até 3 serviços",
   "pricing.features.workspaces": "Áreas de trabalho",
-  "pricing.plan.free": "Ferdi Gratuito",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Pessoal",
-  "pricing.plan.personal-monthly": "Ferdi Pessoal Mensal",
-  "pricing.plan.personal-yearly": "Ferdi Pessoal Anual",
-  "pricing.plan.pro": "Ferdi Profissional",
-  "pricing.plan.pro-monthly": "Ferdi Profissional Mensal",
-  "pricing.plan.pro-yearly": "Ferdi Profissional Anual",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Recarregar {name}",
   "service.crashHandler.autoReload": "A tentar restaurar automaticamente {name} em {seconds} segundos",
   "service.crashHandler.headline": "Oh não!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Oh não!",
   "service.errorHandler.message": "Erro",
   "service.errorHandler.text": "{name} falhou o carregamento",
-  "service.restrictedHandler.action": "Atualizar conta",
-  "service.restrictedHandler.customUrl.headline": "É necessário um plano Ferdi Profissional",
-  "service.restrictedHandler.customUrl.text": "Por favor adquira um plano Ferdi Profesional para utilizar url's personalizadas e serviços próprios.",
-  "service.restrictedHandler.serviceLimit.headline": "Você atingiu seu limite de serviço.",
-  "service.restrictedHandler.serviceLimit.text": "Por favor, atualize sua conta para usar mais do que {count} serviços.",
   "service.webviewLoader.loading": "Carregando {service}",
   "services.getStarted": "Vamos começar",
   "services.login": "Por favor, inicie sua sessão para usar Ferdi.",
-  "services.serverInfo": "Opcionalmente, você pode mudar seu servidor Ferdi clicando no ícone de engrenagem localizada no canto inferior esquerdo.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi sem uma conta",
   "services.welcome": "Bem-vindo ao Ferdi",
   "settings.account.account.editButton": "Editar conta",
-  "settings.account.accountType.basic": "Conta Básica",
-  "settings.account.accountType.premium": "Conta Premium",
   "settings.account.accountUnavailable": "Conta indisponível",
   "settings.account.accountUnavailableInfo": "Você está utilizando Ferdis sem uma conta. Se você deseja usar o Ferdi com uma conta e manter seus serviços atualizados, Por favor selecione um servidor em Configurações seção Servidor.",
   "settings.account.buttonSave": "Atualizar o perfil",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Faturas",
   "settings.account.headlinePassword": "Alterar senha",
   "settings.account.headlineProfile": "Atualizar o perfil",
-  "settings.account.headlineSubscription": "Sua assinatura",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Dê um upgrade na sua conta e tenha uma completa experiência do Ferdi",
-  "settings.account.invoiceDownload": "Transferir",
-  "settings.account.manageSubscription.label": "Gerenciar minhas inscrições",
   "settings.account.successInfo": "As suas alterações foram efetuadas com sucesso",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Tentar novamente",
   "settings.account.tryReloadUserInfoRequest": "Tentar novamente",
-  "settings.account.upgradeToPro.label": "Atualizar para o Ferdi Profissional",
   "settings.account.userInfoRequestFailed": "Não é possível carregar a informação do utilizador",
   "settings.account.yourLicense": "Sua lincença Ferdi",
   "settings.app.accentColorInfo": "Informe sua cor de destaque em um formato compatível com CSS. (Padrão: {defaultAccentColor})",
@@ -289,7 +208,7 @@
   "settings.app.buttonSearchForUpdate": "Procurar atualizações",
   "settings.app.cacheInfo": "A cache do Ferdi está a usar {size} de espaço em disco.",
   "settings.app.cacheNotCleared": "Não foi possível limpar o cache",
-  "settings.app.closeSettings": "Close settings",
+  "settings.app.closeSettings": "Fechar configurações",
   "settings.app.currentVersion": "Versão atual",
   "settings.app.form.accentColor": "Cor de destaque",
   "settings.app.form.adaptableDarkMode": "Sincronizar o modo escuro com a configuração de modo escuro do meu SO",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Ativar verificação ortográfica",
   "settings.app.form.enableSystemTray": "Mostrar o Ferdi na barra do sistema",
   "settings.app.form.enableTodos": "Ativar Tarefas",
-  "settings.app.form.hibernate": "Ativar hibernação de serviço",
   "settings.app.form.hibernateOnStartup": "Manter os serviços em hibernação ao inicializar",
   "settings.app.form.hibernationStrategy": "Estratégia de Hibernação",
   "settings.app.form.iconSize": "Tamanho do ícone",
@@ -319,7 +237,7 @@
   "settings.app.form.minimizeToSystemTray": "Minimizar o Ferdi para a barra do sistema",
   "settings.app.form.navigationBarBehaviour": "Comportamento da barra de navegação",
   "settings.app.form.notifyTaskBarOnMessage": "Notificar TaskBar/Dock na nova mensagem",
-  "settings.app.form.passwordToggle": "Password toggle",
+  "settings.app.form.passwordToggle": "Alternar senhas",
   "settings.app.form.predefinedTodoServer": "Servidor de Tarefas",
   "settings.app.form.privateNotifications": "Não mostrar o conteúdo das mensagens nas notificações",
   "settings.app.form.reloadAfterResume": "Recarregar Ferdi após restabelecer o sistema",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Habilitar modo noturno universal",
   "settings.app.form.useTouchIdToUnlock": "Permitir usar TouchID para desbloquear Ferdi",
   "settings.app.form.useVerticalStyle": "Usar estilo vertical",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Configurações",
   "settings.app.headlineAdvanced": "Avançado",
   "settings.app.headlineAppearance": "Aparência",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "Por padrão, Ferdi manterá todos seus serviços abertos e carregados, assim eles estarão disponíveis quando você for usá-los. O Serviço de Hibernação irá finalizar seus serviços após um período específico. Isso é útil para evitar consumo excessivo de memória RAM evitando também que seu computador fique lento.",
   "settings.app.inactivityLockInfo": "Minutos de inatividade, após este tempo Ferdi irá automaticamente bloquear. Utilize 0 para desabilitar",
   "settings.app.languageDisclaimer": "As traduções oficiais são em inglês e alemão. As demais traduções são baseadas na ajuda da comunidade.",
-  "settings.app.lockInfo": "O bloqueio por senha permite a você proteger suas mensagens.\nUsando o bloqueio por senha, será necessário informar sua senha toda veze que o Ferdi for iniciado ou você solicite o bloqueio.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Senha",
   "settings.app.lockedPasswordInfo": "Tenha certeza que a senha definida será lembrada.\nCaso você esqueça a senha, será necessário reinstalar o Ferdi.",
   "settings.app.restartRequired": "Essa alteração requer uma reinicialização",
   "settings.app.scheduledDNDInfo": "O modo Não perturbe agendado permite definir um período de tempo em que você não deseja receber notificações do Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Horários no formato de 24 horas. O horário de término pode ser anterior ao horário de início (por exemplo, início às 17:00 e término às 09:00) para ativar a opção Não perturbe da noite para o dia.",
-  "settings.app.sentryInfo": "O envio de dados de telemetria nos permite encontrar erros no Ferdi. Não enviaremos nenhuma informação pessoal como seus dados de mensagem! Alterar esta opção requer que você reinicie o Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "O Ferdi utiliza o corretor ortográfico integrado do Mac para verificar se há erros de digitação. Se quiser alterar os idiomas que o corretor ortográfico verifica, você pode fazer isso nas Preferências do Sistema do Mac.",
   "settings.app.subheadlineCache": "Memória Cache",
   "settings.app.todoServerInfo": "Este servidor será usado para o recurso \"Tarefas do Ferdi\".",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Abrir pasta",
   "settings.recipes.headline": "Serviços disponíveis",
   "settings.recipes.missingService": "Falta um serviço?",
-  "settings.recipes.mostPopular": "Os mais populares",
   "settings.recipes.nothingFound": "Desculpe, nenhum serviço corresponde ao seu termo de pesquisa - mas você provavelmente pode adicioná-lo usando a opção \"Site personalizado\". Por favor, note que o site pode mostrar mais serviços que foram adicionados ao Ferdi desde a versão em que você está atualmente. Para obter esses novos serviços, por favor, considere atualizar para uma versão mais recente da Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Serviço adicionado com sucesso",
   "settings.searchService": "Pesquisar serviço",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Adicionar {name}",
   "settings.service.form.availableServices": "Serviços disponíveis",
   "settings.service.form.customUrl": "Servidor personalizado",
-  "settings.service.form.customUrlPremiumInfo": "Para adicionar serviços com domínio próprio, é necessário uma Conta Premium no Ferdi.",
-  "settings.service.form.customUrlUpgradeAccount": "Atualizar a conta",
   "settings.service.form.customUrlValidationError": "Não foi possível validar o servidor {name}.",
   "settings.service.form.darkReaderBrightness": "Brilho do Dark Reader",
   "settings.service.form.darkReaderContrast": "Contraste do Dark Reader",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Gerenciamento de Equipe Franz",
   "settings.team.copy": "O Gerenciamento de Equipes de Franz permite gerenciar assinaturas do Franz para múltiplos usuários. Por favor, entenda que ter uma assinatura Franz Premium não lhe dará nenhuma vantagem em usar o Ferdi. A única razão em manter o acesso ao Gerenciamento de Equipes é permitir o gerenciamento de suas equipes legadas e não perder nenhuma funcionalidade no gerenciamento da sua conta.",
   "settings.team.headline": "Equipa",
-  "settings.team.intro": "Atualmente você está utilizando os Servidores do Franz, o que permite a você ter acesso ao Gerenciamento de Equipes.",
+  "settings.team.intro": "Você está atualmente usando os Servidores de Franz, por isso tem acesso ao Gerenciamento de Times.",
   "settings.team.manageAction": "Gerencie sua Equipe em meetfranz.com",
   "settings.team.teamsUnavailable": "A funcionalidade de Equipes está indisponível",
   "settings.team.teamsUnavailableInfo": "Atualmente a funcionalidade de Equipes está disponível apenas utilizando o servidor Franz após adquirir um plano Franz Profissional. Por favor altere o seridor par https://api.franzinfra.com para utilizar esta funcionalidade.",
-  "settings.team.upgradeAction": "Atualizar sua conta",
   "settings.user.form.accountType.company": "Empresa",
   "settings.user.form.accountType.individual": "Indivíduo",
   "settings.user.form.accountType.label": "Tipo de conta",
@@ -516,29 +431,20 @@
   "signup.link.login": "Já tem uma conta, iniciar sessão?",
   "signup.password.label": "Senha",
   "signup.submit.label": "Criar uma conta",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "Ver todas as opções",
-  "subscription.cta.choosePlan": "Escolha seu plano",
-  "subscription.includedProFeatures": "O Ferdi Profissional incluí:",
-  "subscription.interval.per": "por {interval}",
-  "subscription.interval.perMonth": "por mês",
-  "subscription.interval.perMonthPerUser": "por mês e por utilizador",
-  "subscription.planItem.upgradeAccount": "Atualizar conta",
-  "subscription.teaser.includedFeatures": "Planos pagos Ferdi incluem:",
-  "subscription.teaser.intro": "O Ferdi 5 vem com uma variedade de novas funcionalidades para melhorar a sua comunicação diária - pilhas inclusas. Confira os nossos novos planos e encontre aquele que melhor serve para você!",
-  "subscriptionPopup.buttonCancel": "Cancelar",
-  "subscriptionPopup.buttonDone": "Concluído",
   "tabs.item.confirmDeleteService": "Tem certeza de que deseja excluir o serviço {serviceName}?",
   "tabs.item.deleteService": "Apagar serviço",
   "tabs.item.disableAudio": "Desativar áudio",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Desativar notificações",
   "tabs.item.disableService": "Desativar serviço",
   "tabs.item.edit": "Editar",
   "tabs.item.enableAudio": "Ativar áudio",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Ativar notificações",
   "tabs.item.enableService": "Ativar serviço",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Recarregar",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} não é válido",
   "validation.minLength": "{field} deveria ter pelo menos {length} caracteres",
   "validation.oneRequired": "É necessário pelo menos um",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Áreas de trabalho",
   "workspaceDrawer.item.contextMenuEdit": "editar",
   "workspaceDrawer.item.noServicesAddedYet": "Nenhum serviço foi adicionado",
-  "workspaceDrawer.premiumCtaButtonLabel": "Crie sua primeira área de trabalho",
-  "workspaceDrawer.proFeatureBadge": "Vantagem paga oferecida aos assinantes",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reative sua conta paga",
   "workspaceDrawer.workspaceFeatureInfo": "<p>As áreas de trabalho do Ferdi te ajuda a focar no que realmente é importante agora. Configure diferente cenários para serviços e mude entre eles facilmente em qualquer momento. </p><p>Você decide quais serviços precisa e onde deseja posicioná-los, e então nós iremos te ajudar em aumentar a sua produtividade. Você pode desligar os serviços que não são úteis para você.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Editar configurações das áreas de trabalho",
   "workspaces.switchingIndicator.switchingTo": "Trocando para"
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 07c6df438..61f97f3b4 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh não! O Ferdi perdeu a ligação com {name}.",
   "feature.announcements.changelog.headline": "Alterações no Ferdi {version}",
   "feature.debugger.title": "Publicar informações de depuração",
-  "feature.delayApp.headline": "Por favor, adquira uma licença de apoiante Ferdi para não ficar à espera",
-  "feature.delayApp.text": "Ferdi continuará em {seconds} segundos.",
-  "feature.delayApp.trial.action": "Sim, eu quero o período de testes gratuito de 14 dias do Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Ativar período de testes gratuito do Ferdi Professional",
-  "feature.delayApp.trial.headline": "Empieza el periodo de prueba de Ferdi Profesional por 14 días y cruza la linea.",
-  "feature.delayApp.upgrade.action": "Adquira uma licença de suporte Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Faça upgrade da conta",
   "feature.nightlyBuilds.activate": "Activar",
   "feature.nightlyBuilds.cancel": "Cancelar",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Despromover para Gratuito",
-  "feature.planSelection.cta.stayOnFree": "Continuar em Gratuito",
-  "feature.planSelection.cta.trial": "Iniciar meu teste grátis de 14 dias",
-  "feature.planSelection.cta.upgradePersonal": "Escolha Pessoal",
-  "feature.planSelection.cta.upgradePro": "Escolha Profissional",
-  "feature.planSelection.free.text": "Funcionalidade básica",
-  "feature.planSelection.fullFeatureList": "Comparação completa de todos os planos",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Despromover para Gratuito",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Escolha Pessoal",
-  "feature.planSelection.fullscreen.dialog.message": "Você está prestes a fazer a despromoção para nossa conta gratuita. Você tem certeza? Clique aqui para obter mais serviços e funcionalidade por apenas {currency}{price} por mês.",
-  "feature.planSelection.fullscreen.dialog.title": "Despromover o seu Plano Ferdi",
-  "feature.planSelection.fullscreen.subheadline": "Agora tem de fazer uma escolha. O Ferdi trabalha melhor em nossos planos pessoais e profissionais. Por favor, compare estes planos e escolha o que melhor se adapta a si.",
-  "feature.planSelection.fullscreen.welcome": "Está prestes a escolher, {name}",
-  "feature.planSelection.personal.text": "Mais serviços, sem espera - ideal para uso pessoal.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "Todos os preços são baseados no pagamento anual",
-  "feature.planSelection.pro.text": "Serviços ilimitados e recursos profissionais para si - e para a sua equipa.",
   "feature.publishDebugInfo.error": "Houve um erro ao tentar publicar as informações de depuração. Por favor, tente novamente mais tarde ou visualize a consola para mais informações.",
   "feature.publishDebugInfo.info": "Publicar as suas informações de depuração ajuda-nos a encontrar problemas e erros no Ferdi. Ao publicar as suas informações de depuração, aceita a política de privacidade e termos de serviço do depurador Ferdi",
   "feature.publishDebugInfo.privacy": "Política de Privacidade",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Seleccione um serviço com TAB, ↑ e ↓. Abra um serviço com ENTER.",
   "feature.quickSwitch.search": "A procurar...",
   "feature.quickSwitch.title": "Troca Rápida",
-  "feature.serviceLimit.limitReached": "Você adicionou {amount} serviços de um total de {limit} que estão inclusos no seu plano. Por favor, atualize sua conta para adicionar mais serviços.",
   "feature.shareFranz.action.email": "Enviar por e-mail",
   "feature.shareFranz.action.facebook": "Compartilhar no Facebook",
   "feature.shareFranz.action.twitter": "Compartilhar no Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "Eu adicionei {count} serviços ao Ferdi! Adquira a aplicação gratuita para WhatsApp, Messenger, Slack, Skype e mais em www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "Adicionei {count} serviços no Ferdi! Faça o download da aplicação para WhatsApp, Messenger, Slack, Skype e outros em www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Diga aos seus amigos e colegas o quão incrível é Ferdi e ajude-nos a espalhar a mensagem.",
-  "feature.todos.premium.info": "As Listas de Tarefas de Ferdi agora estão disponíveis para utilizadores premium!",
-  "feature.todos.premium.rollout": "Todas as outras pessoas terão que esperar um pouco mais.",
-  "feature.todos.premium.upgrade": "Faça upgrade da conta",
-  "feature.trialStatusBar.cta": "Promover agora",
-  "feature.trialStatusBar.expired": "Seu teste grátis Ferdi {plan} expirou, por favor actualize sua conta.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Despromover para Gratuito",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Escolha Pessoal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "Você está prestes a fazer a despromoção para nossa conta gratuita. Você tem certeza? Clique aqui para obter mais serviços e funcionalidade por apenas {currency}{price} por mês.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Despromover o seu Plano Ferdi",
-  "feature.trialStatusBar.restTime": "Seu teste grátis Ferdi {plan} termina em {time}.",
   "global.api.unhealthy": "Não é possível ligar aos serviços online de Ferdi",
-  "global.franzProRequired": "É necessária uma conta Ferdi Profissional",
   "global.notConnectedToTheInternet": "Não está ligado à internet.",
   "global.spellchecker.useDefault": "Use o padrão de sistema ({default})",
   "global.spellchecking.autodetect": "Detectar idioma automaticamente",
   "global.spellchecking.autodetect.short": "Automático",
   "global.spellchecking.language": "Idioma para corrector ortográfico",
-  "global.upgradeButton.upgradeToPro": "Faça upgrade para Ferdi Profissional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importe os seus serviços do Ferdi 4",
@@ -88,7 +52,6 @@
   "infobar.hide": "Ocultar",
   "infobar.requiredRequestsFailed": "Não foi possível reiniciar os serviços e informações de utilizador",
   "infobar.servicesUpdated": "Os seus serviços foram atualizados.",
-  "infobar.trialActivated": "O seu período de testes foi ativado com sucesso! Boas mensagens!",
   "infobar.updateAvailable": "Está disponível uma nova atualização de Ferdi.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Endereço de E-mail",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Ocultar barra de menu automaticamente",
   "menu.app.checkForUpdates": "Procurar atualizações",
   "menu.app.hide": "Ocultar",
-  "menu.app.hideOthers": "Ocultar Outros",
-  "menu.app.quit": "Sair",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Configurações",
-  "menu.app.unhide": "Mostrar",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Editar",
-  "menu.edit.copy": "Copiar",
-  "menu.edit.cut": "Cortar",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Apagar",
   "menu.edit.emojiSymbols": "Emoji & Símbolos",
   "menu.edit.findInPage": "Localizar na página",
-  "menu.edit.paste": "Colar",
-  "menu.edit.pasteAndMatchStyle": "Colar com a mesma formatação",
-  "menu.edit.redo": "Refazer",
-  "menu.edit.selectAll": "Selecionar Tudo",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Comando de voz",
   "menu.edit.startDictation": "Iniciar Ditado",
   "menu.edit.startSpeaking": "Começar a falar",
   "menu.edit.stopSpeaking": "Parar de Falar",
-  "menu.edit.undo": "Voltar",
+  "menu.edit.undo": "Undo",
   "menu.file": "Ficheiro",
-  "menu.help": "Ajuda",
+  "menu.help": "Help",
   "menu.help.changelog": "Histórico de alterações",
   "menu.help.debugInfo": "Copiar Informações de Debug",
   "menu.help.debugInfoCopiedBody": "As Informações de Debug foram copiadas para a área de transferência.",
   "menu.help.debugInfoCopiedHeadline": "Informações de Debug de Ferdi",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Saiba Mais",
   "menu.help.privacy": "Declaração de Privacidade",
   "menu.help.publishDebugInfo": "Publicar informações de debug",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Ativar Tarefas",
   "menu.view": "Visualizar",
   "menu.view.back": "Anterior",
-  "menu.view.enterFullScreen": "Entrar em Ecrã Completo",
-  "menu.view.exitFullScreen": "Sair do modo ecrã completo",
   "menu.view.forward": "Seguinte",
   "menu.view.lockFerdi": "Bloquear Ferdi",
   "menu.view.openQuickSwitch": "Abrir Troca Rápida",
-  "menu.view.reloadFranz": "Reiniciar Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Reiniciar serviço",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Tamanho real",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Ativar modo noturno",
   "menu.view.toggleDevTools": "Ativar/desativar ferramentas de programador",
-  "menu.view.toggleFullScreen": "Ativar/desativar Ecrâ Completo",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Ativar/desativar ferramentas de programador de serviço",
   "menu.view.toggleTodosDevTools": "Ativar/desativar Ferramentas de Programador para Tarefas",
-  "menu.view.zoomIn": "Ampliar",
-  "menu.view.zoomOut": "Reduzir",
-  "menu.window": "Janela",
-  "menu.window.close": "Fechar",
-  "menu.window.minimize": "Minimizar",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Áreas de trabalho",
   "menu.workspaces.addNewWorkspace": "Adicionar nova área de trabalho...",
   "menu.workspaces.closeWorkspaceDrawer": "Fechar barra da área de trabalho",
@@ -194,11 +156,7 @@
   "password.noUser": "Não foi encontrado nenhum utilizador com este e-mail",
   "password.submit.label": "Enviar",
   "password.successInfo": "Por favor, verifique o seu e-mail",
-  "premiumFeature.button.upgradeAccount": "Faça upgrade da conta",
   "pricing.features.accountSync": "Sincronização de conta",
-  "pricing.features.adFree": "Sem anúncios para sempre",
-  "pricing.features.appDelays": "Sem Ecrãs de Espera",
-  "pricing.features.appDelaysEnabled": "Ecrãs de Espera Ocasional",
   "pricing.features.customWebsites": "Adicionar Websites Personalizados",
   "pricing.features.desktopNotifications": "Notificações no ambiente de trabalho",
   "pricing.features.onPremise": "En sitio y otros servicios alojados",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Gestão de Equipa",
   "pricing.features.thirdPartyServices": "Instalar serviços de terceiros",
   "pricing.features.unlimitedServices": "Adicionar serviços ilimitados",
-  "pricing.features.upToSixServices": "Adicionar até 6 serviços",
-  "pricing.features.upToThreeServices": "Adicionar até 3 serviços",
   "pricing.features.workspaces": "Áreas de trabalho",
-  "pricing.plan.free": "Ferdi Gratuito",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Pessoal",
-  "pricing.plan.personal-monthly": "Ferdi Pessoal Mensal",
-  "pricing.plan.personal-yearly": "Ferdi Pessoal Anual",
-  "pricing.plan.pro": "Ferdi Profissional",
-  "pricing.plan.pro-monthly": "Ferdi Profissional Mensal",
-  "pricing.plan.pro-yearly": "Ferdi Profissional Anual",
-  "pricing.trial.cta.accept": "Sim, atualizar minha conta para o Ferdi Profissional",
-  "pricing.trial.cta.skip": "Continuar para o Ferdi",
-  "pricing.trial.cta.start": "Começar a usar Ferdi",
-  "pricing.trial.error": "Desculpe, não conseguimos ativar o seu período de testes",
-  "pricing.trial.features.headline": "Incluso no Ferdi Profissional:",
-  "pricing.trial.headline.pro": "Olá {name}, bem-vindo/a ao Ferdi",
-  "pricing.trial.intro.happyMessaging": "Mensagens felizes,",
-  "pricing.trial.intro.specialTreat": "Temos uma oferta especial para si.",
-  "pricing.trial.intro.tryPro": "Aproveite a experiência completa de Ferdi Profissional completamente gratuita durante 14 dias.",
-  "pricing.trial.terms.automaticTrialEnd": "Seu período de testes encerra automaticamente em 14 dias",
-  "pricing.trial.terms.headline": "Sem vínculos",
-  "pricing.trial.terms.noCreditCard": "No necesita tarjeta de crédito",
-  "pricing.trial.terms.trialWorth": "Teste gratuito (normalmente {currency}{price} por mês)",
   "service.crashHandler.action": "Recarregar {name}",
   "service.crashHandler.autoReload": "A tentar restabelecer {name} automaticamente em {seconds} segundos",
   "service.crashHandler.headline": "Oh não!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Oh não!",
   "service.errorHandler.message": "Erro",
   "service.errorHandler.text": "{name} não pôde ser iniciado.",
-  "service.restrictedHandler.action": "Faça upgrade da conta",
-  "service.restrictedHandler.customUrl.headline": "É necessária uma conta Ferdi Profissional",
-  "service.restrictedHandler.customUrl.text": "Por favor, faça o upgrade para o plano Ferdi Professional para usar Urls personalizadas e serviços auto-hospedados.",
-  "service.restrictedHandler.serviceLimit.headline": "Atingiu o seu limite de serviços.",
-  "service.restrictedHandler.serviceLimit.text": "Por favor, faça o upgrade da sua conta para usar mais de {count} serviços.",
   "service.webviewLoader.loading": "A iniciar {service}",
   "services.getStarted": "Iniciar",
   "services.login": "Por favor, inicie sua sessão para usar Ferdi.",
-  "services.serverInfo": "Opcionalmente, pode mudar o seu servidor Ferdi clicando no ícone da engrenagem no canto inferior esquerdo.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi sem conta",
   "services.welcome": "Bem-vindo ao Ferdi",
   "settings.account.account.editButton": "Editar conta",
-  "settings.account.accountType.basic": "Conta Básica",
-  "settings.account.accountType.premium": "Conta Apoiante Premium",
   "settings.account.accountUnavailable": "Conta indisponível",
   "settings.account.accountUnavailableInfo": "Está a usar o Ferdi sem uma conta. Se deseja usar o Ferdi com uma conta e manter os seus serviços sincronizados entre instalações, por favor, selecione um servidor no separador Configurações e faça a autenticação.",
   "settings.account.buttonSave": "Atualizar perfil",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Recibos",
   "settings.account.headlinePassword": "Mudar palavra-passe",
   "settings.account.headlineProfile": "Atualizar perfil",
-  "settings.account.headlineSubscription": "A sua subscrição",
-  "settings.account.headlineTrialUpgrade": "Consiga 14 días de prueba gratis de Ferdi Profesional ",
-  "settings.account.headlineUpgradeAccount": "Faça um upgrade à sua conta e usufrua da experiência completa Ferdi",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.manageSubscription.label": "Gerir assinatura",
   "settings.account.successInfo": "As suas alterações foram gravadas",
-  "settings.account.trial": "Prueba Gratis",
-  "settings.account.trialEndsIn": "Su prueba gratis finaliza en {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Por favor actualice su información de facturación para continuar utilizando {license} luego del periodo de prueba.",
   "settings.account.tryReloadServices": "Tente novamente",
   "settings.account.tryReloadUserInfoRequest": "Tente novamente",
-  "settings.account.upgradeToPro.label": "Faça upgrade para Ferdi Profissional",
   "settings.account.userInfoRequestFailed": "Não foi possível carregar as informações de utilizador",
   "settings.account.yourLicense": "A sua licença Ferdi",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Ativar correção ortográfica",
   "settings.app.form.enableSystemTray": "Mostrar Ferdi na barra de sistema",
   "settings.app.form.enableTodos": "Ativar Tarefas Ferdi",
-  "settings.app.form.hibernate": "Ativar hibernação do serviço",
   "settings.app.form.hibernateOnStartup": "Manter os serviços em hibernação durante a inicialização",
   "settings.app.form.hibernationStrategy": "Estratégia de hibernação",
   "settings.app.form.iconSize": "Tamanho de ícone de serviço",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Ativar o Modo Noturno Universal",
   "settings.app.form.useTouchIdToUnlock": "Permite usar o TouchID para desbloquear Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Configurações",
   "settings.app.headlineAdvanced": "Avançado",
   "settings.app.headlineAppearance": "Aparência",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "Por princípio, Ferdi manterá todos os serviços abertos e carregados em segundo plano para que estejam prontos sempre que os quiser utilizar. A hibernação do serviço suspende os serviços após um determinado tempo. Isto é útil para conservar memória RAM ou impedir que os serviços afetem o desempenho do computador.",
   "settings.app.inactivityLockInfo": "Minutos de inatividade, após os quais Ferdi bloqueará automaticamente. Use 0 para desativar",
   "settings.app.languageDisclaimer": "As traduções oficiais são Inglês e Alemão. Todas as outras traduções são feitas pela comunidade.",
-  "settings.app.lockInfo": "O bloqueio de palavra-passe permite manter as suas mensagens protegidas.\nAo usar o bloqueio de palavra-passe, será solicitado que volte a digitar a sua palavra-passe sempre que reiniciar Ferdi. Pode bloquear Ferdi usando o símbolo de bloquear no canto inferior esquerdo ou o atalho CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Palavra-passe",
   "settings.app.lockedPasswordInfo": "Por favor certifique-se de definir uma palavra-passe que se lembre.\nSe perder esta palavra-passe, terá que reinstalar Ferdi.",
   "settings.app.restartRequired": "As mudanças requerem reinício de sistema",
   "settings.app.scheduledDNDInfo": "O Não Incomodar permite definir um período de tempo em que não quer receber notificações.",
   "settings.app.scheduledDNDTimeInfo": "Horas em formato 24h. Pode definir a hora do fim antes da hora de início (p. ex. início 17:00, fim 09:00) para ativar o modo \"Não incomodar\" durante a noite.",
-  "settings.app.sentryInfo": "O envio de dados de telemetria permite que encontremos erros na Ferdi - não será enviada nenhuma informação pessoal como dados da sua mensagem! Mudar esta opção requer o reinício de Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi usa o corretor ortográfico do seu Mac para verificar se há erros ortográficos. Se você quiser alterar os idiomas que o corretor ortográfico verifica, pode fazê-lo nas Preferências do Sistema do Mac.",
   "settings.app.subheadlineCache": "Memória cache",
   "settings.app.todoServerInfo": "Este servidor será usado para a funcionalidade \"Tarefas Ferdi\".",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Abrir pasta",
   "settings.recipes.headline": "Serviços disponíveis",
   "settings.recipes.missingService": "Sente falta de algum serviço?",
-  "settings.recipes.mostPopular": "Mais populares",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Serviço adicionado com sucesso",
   "settings.searchService": "Procurar serviço",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Adicionar {name}",
   "settings.service.form.availableServices": "Serviços disponíveis",
   "settings.service.form.customUrl": "Servidor personalizado",
-  "settings.service.form.customUrlPremiumInfo": "Para adicionar serviços auto-hospedados, você precisa de uma conta Apoiador Ferdi Premium.",
-  "settings.service.form.customUrlUpgradeAccount": "Faça upgrade à sua conta",
   "settings.service.form.customUrlValidationError": "Não foi possível validar servidor personalizado {name}.",
   "settings.service.form.darkReaderBrightness": "Brilho do Leitor Escuro",
   "settings.service.form.darkReaderContrast": "Contraste do Leitor Noturno",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Gestão de Equipas Franz",
   "settings.team.copy": "A Gestão de Equipas Franz permite gerir as assinaturas Franz para múltiplos utilizadores. Por favor, lembre-se que ter uma assinatura Franz Premium não lhe dará nenhuma vantagem ao usar Ferdi: a única razão pela qual ainda tem acesso à Gestão de Equipas é para que possa gerir as suas equipas antigas e para que não perca nenhuma funcionalidade na gestão da sua conta.",
   "settings.team.headline": "Equipa",
-  "settings.team.intro": "Atualmente não tem acesso ao Gestor de Equipas porque está a usar os Servidores Franz.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Faça a gestão da sua Equipa em meetfranz.com",
   "settings.team.teamsUnavailable": "Equipas não estão disponíveis",
   "settings.team.teamsUnavailableInfo": "De momento, Equipas estão disponíveis apenas quando usar o Servidor Franz e após pagar o Franz Profissional. Por favor, altere o seu servidor para https://api.franzinfra.com para usar equipas.",
-  "settings.team.upgradeAction": "Faça upgrade à sua conta",
   "settings.user.form.accountType.company": "Empresa",
   "settings.user.form.accountType.individual": "Pessoal",
   "settings.user.form.accountType.label": "Tipo de conta",
@@ -516,29 +431,20 @@
   "signup.link.login": "Já tem uma conta, entrar?",
   "signup.password.label": "Palavra-passe",
   "signup.submit.label": "Criar conta",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "Ver todas as opções",
-  "subscription.cta.choosePlan": "Escolha o seu plano",
-  "subscription.includedProFeatures": "O plano Ferdi Professional inclui:",
-  "subscription.interval.per": "por {interval}",
-  "subscription.interval.perMonth": "por mês",
-  "subscription.interval.perMonthPerUser": "por mês e por utilizador",
-  "subscription.planItem.upgradeAccount": "Faça upgrade da conta",
-  "subscription.teaser.includedFeatures": "Planos pagos Ferdi incluem:",
-  "subscription.teaser.intro": "Ferdi 5 vem com uma grande variedade de novas funcionalidades para melhorar a sua comunicação diária - pilhas incluídas. Confira os nossos novos planos e encontre o que melhor serve as suas necessidades!",
-  "subscriptionPopup.buttonCancel": "Cancelar",
-  "subscriptionPopup.buttonDone": "Feito",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Apagar serviço",
   "tabs.item.disableAudio": "Desativar áudio",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Desativar notificações",
   "tabs.item.disableService": "Desativar serviço",
   "tabs.item.edit": "Editar",
   "tabs.item.enableAudio": "Ativar áudio",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Ativar notificações",
   "tabs.item.enableService": "Ativar serviço",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Atualizar",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} é inválido",
   "validation.minLength": "{field} deve ter pelo menos {length} caracteres",
   "validation.oneRequired": "É necessário pelo menos um",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Áreas de trabalho",
   "workspaceDrawer.item.contextMenuEdit": "editar",
   "workspaceDrawer.item.noServicesAddedYet": "Nenhum serviço adicionado",
-  "workspaceDrawer.premiumCtaButtonLabel": "Crie a sua primeira área de trabalho",
-  "workspaceDrawer.proFeatureBadge": "Funcionalidade Premium",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reative conta premium",
   "workspaceDrawer.workspaceFeatureInfo": "<p>As áreas de trabalho do Ferdi permitem que se concentre no que realmente é importante. Configure diferentes conjuntos de serviços e mude-os facilmente e a qualquer momento.</p><p>Você decide quais os serviços que precisa e onde colocá-los, para que o possamos ajudar a estar no seu melhor. - Ou desligar do trabalho quando quiser.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Editar configurações das áreas de trabalho",
   "workspaces.switchingIndicator.switchingTo": "A mudar para"
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index b210f3316..f86d2c280 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh nu! Ferdi a pierdut conexiunea cu {name}.",
   "feature.announcements.changelog.headline": "Modificări în Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
   "feature.nightlyBuilds.activate": "Activare",
   "feature.nightlyBuilds.cancel": "Cancel",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Politică de confidențialitate",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Căutare...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Trimite ca email",
   "feature.shareFranz.action.facebook": "Distribuiți pe Facebook",
   "feature.shareFranz.action.twitter": "Distribuiți pe Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "Am adăugat {count} servicii la Ferdi! Obține aplicația gratuită pentru WhatsApp, Messenger, Slack, Skype și co pe www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "Am adăugat {count} servicii la Ferdi! Obține aplicația gratuită pentru WhatsApp, Messenger, Slack, Skype și co pe www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Spuneți-le prietenilor și colegilor cât de minunat este Ferdi și ajutați-ne să răspândim cuvântul.",
-  "feature.todos.premium.info": "Ferdi Todos este disponibil acum utilizatorilor premium!",
-  "feature.todos.premium.rollout": "Toți ceilalți vor trebui să aștepte puțin mai mult.",
-  "feature.todos.premium.upgrade": "Upgradare cont",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Nu se pot conecta la Ferdi servicii online",
-  "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "Nu ești conectat la internet.",
   "global.spellchecker.useDefault": "Folosește sistemul implicit ({default})",
   "global.spellchecking.autodetect": "Detectează limba automat",
   "global.spellchecking.autodetect.short": "Automat",
   "global.spellchecking.language": "Limba de verificare a ortografiei",
-  "global.upgradeButton.upgradeToPro": "Upgrade la Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importă serviciile tale Ferdi 4",
@@ -88,7 +52,6 @@
   "infobar.hide": "Hide",
   "infobar.requiredRequestsFailed": "Could not load services and user information",
   "infobar.servicesUpdated": "Your services have been updated.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "A new update for Ferdi is available.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Email address",
@@ -149,6 +112,7 @@
   "menu.help.debugInfo": "Copy Debug Information",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Learn More",
   "menu.help.privacy": "Privacy Statement",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,12 +127,10 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "View",
   "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Enter Full Screen",
-  "menu.view.exitFullScreen": "Exit Full Screen",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.reloadTodos": "Reload ToDos",
   "menu.view.resetZoom": "Actual Size",
@@ -194,11 +156,7 @@
   "password.noUser": "No user with that email address was found",
   "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgradare cont",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Welcome to Ferdi",
   "settings.account.account.editButton": "Edit account",
-  "settings.account.accountType.basic": "Basic Account",
-  "settings.account.accountType.premium": "Premium Supporter Account",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Invoices",
   "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Update profile",
-  "settings.account.headlineSubscription": "Your subscription",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.manageSubscription.label": "Manage your subscription",
   "settings.account.successInfo": "Your changes have been saved",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Try again",
   "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.upgradeToPro.label": "Upgrade la Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Could not load user information",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Available services",
   "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
   "settings.searchService": "Search service",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Add {name}",
   "settings.service.form.availableServices": "Available services",
   "settings.service.form.customUrl": "Custom server",
-  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
   "settings.user.form.accountType.label": "Account type",
@@ -516,29 +431,20 @@
   "signup.link.login": "Already have an account, sign in?",
   "signup.password.label": "Password",
   "signup.submit.label": "Create account",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgradare cont",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Cancel",
-  "subscriptionPopup.buttonDone": "Done",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Disable audio",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
   "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Reîncărcare",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} is not valid",
   "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 46faaac56..bb7ed8abe 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "О нет! Ферди потерял связь с {name}.",
   "feature.announcements.changelog.headline": "Изменения в версии Ferdi {version}",
   "feature.debugger.title": "Опубликовать отладочную информацию",
-  "feature.delayApp.headline": "Пожалуйста приобретите лицензию Ferdi Supporter чтобы убрать ожидание",
-  "feature.delayApp.text": "Ferdi продолжит работу через {seconds} секунд.",
-  "feature.delayApp.trial.action": "Да, я хочу бесплатную 14-дневную триальную версию Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Активировать бесплатную триальную версию Ferdi Professional",
-  "feature.delayApp.trial.headline": "Получить бесплатную 14-дневную триальную версию Ferdi Professional и перейти к следующему полю",
-  "feature.delayApp.upgrade.action": "Получите лицензию поддержки Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Апгрейдить аккаунт",
   "feature.nightlyBuilds.activate": "Активировать",
   "feature.nightlyBuilds.cancel": "Отмена",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Выберите сервис с Tab, вверх и вниз. Откройте сервис нажав на ENTER.",
   "feature.quickSwitch.search": "Поиск...",
   "feature.quickSwitch.title": "Быстрое переключение",
-  "feature.serviceLimit.limitReached": "Вы добавили {amount} максимальное {limit} количество сервисов, входящих в ваш план. Пожалуйста, обновите свой план чтобы добавить больше сервисов.",
   "feature.shareFranz.action.email": "Отправить по email",
   "feature.shareFranz.action.facebook": "Поделиться на Facebook",
   "feature.shareFranz.action.twitter": "Поделиться в Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "Я добавил {count} сервисов во Ferdi! Теперь доступны такие мессенджеры как WhatsApp, Messenger, Slack, Skype и другие. Полый список вы найдете на www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "Я добавил {count} сервис(ов) в Ferdi! Скачай бесплатную аппку для WhatsApp, Messenger, Slack, Skype и иже на www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Расскажи своим друзьям и коллегам насколько прелестен Ferdi и помоги нам развиться",
-  "feature.todos.premium.info": "Ferdi Todos теперь доступны для премиум пользователей!",
-  "feature.todos.premium.rollout": "Все остальные должны будут ждать немного дольше.",
-  "feature.todos.premium.upgrade": "Повысить уровень учетной записи",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Невозможно подключиться к онлайн-сервисам Ferdi",
-  "global.franzProRequired": "Требуется Ferdi Professional",
   "global.notConnectedToTheInternet": "Вы не подключены к сети Интернет",
   "global.spellchecker.useDefault": "Использовать системные параметры по умолчанию ({default})",
   "global.spellchecking.autodetect": "Найти язык автоматически",
   "global.spellchecking.autodetect.short": "Авто",
   "global.spellchecking.language": "Проверка правописания",
-  "global.upgradeButton.upgradeToPro": "Повысьте до Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Импортировать ваши сервисы из Ferdi 4",
@@ -88,7 +52,6 @@
   "infobar.hide": "Скрыть",
   "infobar.requiredRequestsFailed": "Невозможно загрузить сервисы и информацию пользователя",
   "infobar.servicesUpdated": "Ваши сервисы были обновлены.",
-  "infobar.trialActivated": "Пробный период успешно активирован. Счастливых переписок!",
   "infobar.updateAvailable": "Доступно обновление Ferdi.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Адрес электронной почты",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Автоматически скрывать панель",
   "menu.app.checkForUpdates": "Проверить обновления",
   "menu.app.hide": "Скрыть",
-  "menu.app.hideOthers": "Скрыть остальные",
-  "menu.app.quit": "Выйти",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Настройки",
-  "menu.app.unhide": "Показать",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Правка",
-  "menu.edit.copy": "Копировать",
-  "menu.edit.cut": "Вырезать",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Удалить",
   "menu.edit.emojiSymbols": "Эмодзи и символы",
   "menu.edit.findInPage": "Find in Page",
-  "menu.edit.paste": "Вставить",
-  "menu.edit.pasteAndMatchStyle": "Вставить с соблюдением стиля",
-  "menu.edit.redo": "Вернуть",
-  "menu.edit.selectAll": "Выделить всё",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Речь",
   "menu.edit.startDictation": "Начать диктовать",
   "menu.edit.startSpeaking": "Начать говорить",
   "menu.edit.stopSpeaking": "Закончить говорить",
-  "menu.edit.undo": "Отменить",
+  "menu.edit.undo": "Undo",
   "menu.file": "Файл",
-  "menu.help": "Справка",
+  "menu.help": "Help",
   "menu.help.changelog": "Журнал изменений",
   "menu.help.debugInfo": "Скопировать отладочную информацию",
   "menu.help.debugInfoCopiedBody": "Ваша информация отладки была скопирована в буфер обмена.",
   "menu.help.debugInfoCopiedHeadline": "Отладочная информация Ferdi",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Подробнее",
   "menu.help.privacy": "Политика конфиденциальности",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Включить задачи",
   "menu.view": "Вид",
   "menu.view.back": "Назад",
-  "menu.view.enterFullScreen": "На весь экран",
-  "menu.view.exitFullScreen": "В окне",
   "menu.view.forward": "Переслать",
   "menu.view.lockFerdi": "Заблокировать Ferdi",
   "menu.view.openQuickSwitch": "Открыть быстрый переключатель",
-  "menu.view.reloadFranz": "Перезагрузить Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Перезапустить сервис",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Фактический размер",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Включить тёмную тему",
   "menu.view.toggleDevTools": "Показать инструменты разработчика",
-  "menu.view.toggleFullScreen": "Переключиться на полный экран",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Показать инструменты разработчика сервиса",
   "menu.view.toggleTodosDevTools": "Включить инструменты разработчика Todos",
-  "menu.view.zoomIn": "Увеличить масштаб",
-  "menu.view.zoomOut": "Уменьшить масштаб",
-  "menu.window": "Окно",
-  "menu.window.close": "Закрыть",
-  "menu.window.minimize": "Свернуть",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Окружение",
   "menu.workspaces.addNewWorkspace": "Добавить Новое Окружение...",
   "menu.workspaces.closeWorkspaceDrawer": "Закрыть меню окружений",
@@ -194,11 +156,7 @@
   "password.noUser": "Не найдено пользователя с таким адресом электронной почты",
   "password.submit.label": "Принять",
   "password.successInfo": "Проверьте вашу электронную почту",
-  "premiumFeature.button.upgradeAccount": "Апгрейдить аккаунт",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Всегда бесплатен с рекламой",
-  "pricing.features.appDelays": "Без экранов ожидания",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Добавить пользовательские веб-сайты",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Команда управления",
   "pricing.features.thirdPartyServices": "Установить сторонние сервисы",
   "pricing.features.unlimitedServices": "Добавить неограниченные сервисы",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Окружение",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Да, обновите мой аккаунт до Ferdi Professional",
-  "pricing.trial.cta.skip": "Перейти к Ферди",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "К сожалению, мы не смогли активировать ваш пробный период!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Перезагрузить {name}",
   "service.crashHandler.autoReload": "Пытаюсь автоматически восстановить {name} в течение {seconds} секунд",
   "service.crashHandler.headline": "О, нет!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "О, нет!",
   "service.errorHandler.message": "Ошибка",
   "service.errorHandler.text": "{name} не смог загрузиться.",
-  "service.restrictedHandler.action": "Повысить уровень учетной записи",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Начать работу",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Добро пожаловать во Ferdi",
   "settings.account.account.editButton": "Редактировать аккаунт",
-  "settings.account.accountType.basic": "Базовый аккаунт",
-  "settings.account.accountType.premium": "Премиум аккаунт",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Обновить профиль",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Счета",
   "settings.account.headlinePassword": "Сменить пароль",
   "settings.account.headlineProfile": "Обновить профиль",
-  "settings.account.headlineSubscription": "Ваша подписка",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Скачать",
-  "settings.account.manageSubscription.label": "Управление вашей подпиской",
   "settings.account.successInfo": "Ваши изменения были сохранены",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Попробовать снова",
   "settings.account.tryReloadUserInfoRequest": "Попробовать снова",
-  "settings.account.upgradeToPro.label": "Повысьте до Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Невозможно загрузить информацию пользователя",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Включить проверку правописания",
   "settings.app.form.enableSystemTray": "Показывать Ferdi в системном трее",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Настройки",
   "settings.app.headlineAdvanced": "Дополнительно",
   "settings.app.headlineAppearance": "Внешний вид",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Официальная поддержка только для английского и немецкого языков. Остальные языки переведены сообществом.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Пароль",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Изменения требуют перезагрузки приложения",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Отправка телеметрии позволяет нам находить ошибки в Ferdi - мы не будем отправлять никакой личной информации! Изменение этой опции требует перезапуска Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Кэш",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Открыть папку",
   "settings.recipes.headline": "Доступные сервисы",
   "settings.recipes.missingService": "Не можете найти сервис?",
-  "settings.recipes.mostPopular": "Самые популярные",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Сервис успешно добавлен",
   "settings.searchService": "Найти сервис",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Добавление {name}",
   "settings.service.form.availableServices": "Доступные сервисы",
   "settings.service.form.customUrl": "Пользовательский сервер",
-  "settings.service.form.customUrlPremiumInfo": "Для добавления сервиса на своем хостинге необходим премиум аккаунт Ferdi.",
-  "settings.service.form.customUrlUpgradeAccount": "Улучшить ваш аккаунт",
   "settings.service.form.customUrlValidationError": "Невозможно проверить сервер {name}.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Команда",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Улучшить ваш аккаунт",
   "settings.user.form.accountType.company": "Компания",
   "settings.user.form.accountType.individual": "Индивидуальный",
   "settings.user.form.accountType.label": "Тип аккаунта",
@@ -516,29 +431,20 @@
   "signup.link.login": "Уже есть аккаунт, войти?",
   "signup.password.label": "Пароль",
   "signup.submit.label": "Создать аккаунт",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "Показать все варианты",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Повысить уровень учетной записи",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Отмена",
-  "subscriptionPopup.buttonDone": "Готово",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Удалить сервис",
   "tabs.item.disableAudio": "Отключить звук",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Отключить уведомления",
   "tabs.item.disableService": "Отключить сервис",
   "tabs.item.edit": "Правка",
   "tabs.item.enableAudio": "Включить звук",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Включить уведомления",
   "tabs.item.enableService": "Включить сервис",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Перезагрузить",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} недействительно",
   "validation.minLength": "{field} должно быть не менее {length} символов",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Окружение",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Восстановить премиум аккаунт",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/si.json b/src/i18n/locales/si.json
index 346180959..940864fa0 100644
--- a/src/i18n/locales/si.json
+++ b/src/i18n/locales/si.json
@@ -5,30 +5,6 @@
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
-  "feature.delayApp.headline": "Upgrade your Ferdi plan to skip the wait",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14-days trial and skip the wait",
-  "feature.delayApp.upgrade.action": "Upgrade Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}?",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Send as email",
   "feature.shareFranz.action.facebook": "Share on Facebook",
   "feature.shareFranz.action.twitter": "Share on Twitter",
@@ -36,16 +12,6 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "ෆ්රාන්ස් මාර්ගගත සේවාවන් වෙත සම්බන්ධ වීමට නොහැක.",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "ඔබ අන්තර්ජාලයට සම්බන්ධ වී නැත.",
@@ -53,7 +19,6 @@
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "import.headline": "ඔබගේ ෆ්රාන්ස් සේවාවන් නැවත ඇතුලත් කරගන්න.",
   "import.notSupportedHeadline": "සේවාවන් සඳහා ෆ්රාන්ස් 5 හි තවමත් පහසුකම් සලසා නැත.",
   "import.skip.label": "සේවාවන් මවිසින් ඇතුලත් කල යුතුය. ",
@@ -63,7 +28,6 @@
   "infobar.buttonReloadServices": "සේවාවන් නැවත ඇරඹීම",
   "infobar.requiredRequestsFailed": "සේවාවන් සහ පරිශීලක තොරතුරු ලබාගත නොහැක.",
   "infobar.servicesUpdated": "ඔබගේ සේවාවන් යාවත්කාල කර ඇත.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "ෆ්රාන්ස් හි නව සංස්කරණයක් දැන් ලබා ගත හැක.",
   "invite.email.label": "විද්‍යුත් තැපැල් ලිපිනය ",
   "invite.headline.friends": "මිතුරන් 3කට ආරාධනා කරන්න.",
@@ -122,9 +86,7 @@
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "View",
-  "menu.view.enterFullScreen": "Enter Full Screen",
-  "menu.view.exitFullScreen": "Exit Full Screen",
-  "menu.view.reloadFranz": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.reloadTodos": "Reload ToDos",
   "menu.view.resetZoom": "Actual Size",
@@ -166,27 +128,6 @@
   "pricing.features.upToSixServices": "Add up to 6 services",
   "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Free",
-  "pricing.plan.legacy": "Premium",
-  "pricing.plan.personal": "Personal",
-  "pricing.plan.personal-monthly": "Personal Monthly",
-  "pricing.plan.personal-yearly": "Personal Yearly",
-  "pricing.plan.pro": "Professional",
-  "pricing.plan.pro-monthly": "Professional Monthly",
-  "pricing.plan.pro-yearly": "Professional Yearly",
-  "pricing.trial.cta.accept": "Start my 14-day Ferdi Professional Trial ",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "{name} නැවත ලබාගන්න",
   "service.crashHandler.autoReload": "{name} ස්වයංක්‍රීය ප්‍රතිෂ්ඨාපනය තවත් තත්පර {seconds}කින් ",
   "service.crashHandler.headline": "අපොයි!",
@@ -198,11 +139,6 @@
   "service.errorHandler.headline": "අපොයි!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading",
   "services.getStarted": "ආරම්භ කරන්න",
   "services.welcome": "ෆ්‍රාන්ස් වෙත සාදරයෙන් පිළිගනිමු",
@@ -219,18 +155,9 @@
   "settings.account.headlineInvoices": "ලදුපත් ",
   "settings.account.headlinePassword": "මුරපදය වෙනස් කරන්න",
   "settings.account.headlineProfile": "පැතිකඩ යාවත්කාල කරන්න ",
-  "settings.account.headlineSubscription": "ඔබගේ දායකත්වය ",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.manageSubscription.label": "Manage your subscription",
   "settings.account.successInfo": "Your changes have been saved",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Try again",
   "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Could not load user information",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.buttonClearAllCache": "Clear cache",
@@ -284,7 +211,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Available services",
   "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
   "settings.searchService": "Search service",
@@ -391,19 +317,6 @@
   "signup.link.login": "Already have an account, sign in?",
   "signup.password.label": "මුරපදය",
   "signup.submit.label": "Create account",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Cancel",
-  "subscriptionPopup.buttonDone": "Done",
   "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
@@ -431,7 +344,6 @@
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
   "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
   "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index d0a7fd565..03bd0d976 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh nie! Ferdi stratil pripojenie k {name}.",
   "feature.announcements.changelog.headline": "Zmeny vo Ferdi {version}",
   "feature.debugger.title": "Zverejniť informácie ladenia",
-  "feature.delayApp.headline": "Prosím, kúp si licenciu Ferdi Supporter a nebudeš musieť čakať",
-  "feature.delayApp.text": "Ferdi bude pokračovať v {seconds} sekundách.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Získajte licenciu pre Ferdi podporu",
-  "feature.delayApp.upgrade.actionShort": "Upgradovať účet",
   "feature.nightlyBuilds.activate": "Aktivovať",
   "feature.nightlyBuilds.cancel": "Zrušiť",
   "feature.nightlyBuilds.info": "Tzv. \"nočné verzie\" sú vysoko experimentálne verzie Ferdi, ktoré môžu obsahovať nedoladená alebo nedokončené funkcie. Tieto verzie sú používané predovšetkým vývojármi, aby otestovali novo-vyvíjané funkcie a spôsob, akým sa budú správať vo finálnej verzii. Ak neviete čo robíte, navrhujeme neaktivovať tieto experimentálne verzie.",
   "feature.nightlyBuilds.title": "Vývojárske verzie",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Ochrana osobných údajov",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Hľadať...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Odoslať ako e-mail",
   "feature.shareFranz.action.facebook": "Zdielať na Facebook-u",
   "feature.shareFranz.action.twitter": "Zdieľať na Twitter-i",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "Pridali sme {count} služieb do Ferdi! Získajte zadarmo aplikáciu pre WhatsApp, Messenger, Slack, Skype a iné na www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "Pridal som {count} služieb do Ferdi! Získajte zadarmo aplikáciu pre WhatsApp, Messenger, Slack, Skype a iné na www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Povedzte vašim priateľom a známym aký je Ferdi skvelý a pomôžte nám rozšíriť sa do sveta.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Vylepšite svoj účet",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Nedá sa pripojiť k online službám Ferdi",
-  "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "Nie ste pripojení k internetu.",
   "global.spellchecker.useDefault": "Použiť predvolené nastavenie systému ({default})",
   "global.spellchecking.autodetect": "Automaticky rozpoznať jazyk",
   "global.spellchecking.autodetect.short": "Automatický",
   "global.spellchecking.language": "Jazyk kontroly pravopisu",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importovať vaše služby z Ferdi 4",
@@ -88,7 +52,6 @@
   "infobar.hide": "Skryť",
   "infobar.requiredRequestsFailed": "Nie je možné načítať služby a informácie o používateľovi",
   "infobar.servicesUpdated": "Vaše služby boli aktualizované.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "Je k dispozícii nová aktualizácia Ferdi.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "E-mailová adresa",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Skontrolovať aktualizácie",
   "menu.app.hide": "Skryť",
-  "menu.app.hideOthers": "Skryť ostatné",
-  "menu.app.quit": "Ukončiť",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Nastavenia",
-  "menu.app.unhide": "Odkryť",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Upraviť",
-  "menu.edit.copy": "Kopírovať",
-  "menu.edit.cut": "Vystrihnúť",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Zmazať",
   "menu.edit.emojiSymbols": "Emoji a symboly",
   "menu.edit.findInPage": "Find in Page",
-  "menu.edit.paste": "Vložiť",
-  "menu.edit.pasteAndMatchStyle": "Vložiť s prevzatím jestvujúceho štýlu",
-  "menu.edit.redo": "Znovu",
-  "menu.edit.selectAll": "Vybrať všetko",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Rozprávanie",
   "menu.edit.startDictation": "Začať diktovanie",
   "menu.edit.startSpeaking": "Začať rozprávanie",
   "menu.edit.stopSpeaking": "Zastaviť rozprávanie",
-  "menu.edit.undo": "Späť",
+  "menu.edit.undo": "Undo",
   "menu.file": "Súbor",
-  "menu.help": "Pomocník",
+  "menu.help": "Help",
   "menu.help.changelog": "Záznam zmien",
   "menu.help.debugInfo": "Copy Debug Information",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Zistiť viac",
   "menu.help.privacy": "Vyhlásenie o ochrane súkromia",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Zobraziť",
   "menu.view.back": "Naspäť",
-  "menu.view.enterFullScreen": "Na celú obrazovku",
-  "menu.view.exitFullScreen": "Ukončiť režim na celú obrazovku",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Uzamknúť Ferdi",
   "menu.view.openQuickSwitch": "Otvoriť prepínač služieb",
-  "menu.view.reloadFranz": "Obnoviť Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Obnoviť službu",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Pôvodná veľkosť",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Zapnúť Tmavý Mód",
   "menu.view.toggleDevTools": "Prepnúť vývojárske nástroje",
-  "menu.view.toggleFullScreen": "Prepnúť na celú obrazovku",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Prepnúť vývojárske nástroje služby",
   "menu.view.toggleTodosDevTools": "Prepnúť vývojárske nástroje",
-  "menu.view.zoomIn": "Priblížiť",
-  "menu.view.zoomOut": "Oddialiť",
-  "menu.window": "Okno",
-  "menu.window.close": "Zatvoriť",
-  "menu.window.minimize": "Minimalizovať",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Pracovný priestor",
   "menu.workspaces.addNewWorkspace": "Pridať nový pracovný priestor ...",
   "menu.workspaces.closeWorkspaceDrawer": "Zavrieť workspace záložku",
@@ -194,11 +156,7 @@
   "password.noUser": "Používateľ s touto e-mailovou adresou nebol nájdený",
   "password.submit.label": "Odoslať",
   "password.successInfo": "Skontrolujte prosím váš e-mail",
-  "premiumFeature.button.upgradeAccount": "Upgradovať účet",
   "pricing.features.accountSync": "Synchronizácia účtu",
-  "pricing.features.adFree": "Navždy bez reklám",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Pridať vlastnú webstránku",
   "pricing.features.desktopNotifications": "Upozornenie na ploche",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Manažment tímu",
   "pricing.features.thirdPartyServices": "Inštalovať inú službu",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Pracovný priestor",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Mesačne",
-  "pricing.plan.pro-yearly": "Ferdi Professional Ročne",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Znovu načítať {name}",
   "service.crashHandler.autoReload": "Najbližší pokus o automatické obnovenie {name} o {seconds} sekúnd",
   "service.crashHandler.headline": "Ale nie!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Ale nie!",
   "service.errorHandler.message": "Chyba",
   "service.errorHandler.text": "{name} sa nepodarilo načítať.",
-  "service.restrictedHandler.action": "Vylepšite svoj účet",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "Dosiahli ste limit počtu zariadení.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Načítavam {service}",
   "services.getStarted": "Začíname",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Vítajte v aplikácii Ferdi",
   "settings.account.account.editButton": "Upraviť účet",
-  "settings.account.accountType.basic": "Základný účet",
-  "settings.account.accountType.premium": "Prémiový účet podporovateľa",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Aktualizovať profil",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Faktúry",
   "settings.account.headlinePassword": "Zmeniť heslo",
   "settings.account.headlineProfile": "Aktualizovať profil",
-  "settings.account.headlineSubscription": "Vaše odoberanie",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Prevziať",
-  "settings.account.manageSubscription.label": "Spravovať vaše odoberanie",
   "settings.account.successInfo": "Vaše zmeny boli uložené",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Skúsiť znova",
   "settings.account.tryReloadUserInfoRequest": "Skúsiť znova",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Nebolo možné načítať informácie o používateľovi",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Zapnúť kontrolu pravopisu",
   "settings.app.form.enableSystemTray": "Zobrazovať Ferdi v systémovej lište",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Nastavenia",
   "settings.app.headlineAdvanced": "Pokročilé",
   "settings.app.headlineAppearance": "Vzhľad",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Oficiálne preklady sú angličtina a nemčina. Všetky ostatné jazyky sú preklady založené na komunite.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Heslo",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Zmeny vyžadujú reštart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Vyrovnávacia pamäť",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Otvoriť priečinok",
   "settings.recipes.headline": "Dostupné služby",
   "settings.recipes.missingService": "Chýba vám služba?",
-  "settings.recipes.mostPopular": "Najpopulárnejšie",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Služba bola úspešne pridaná",
   "settings.searchService": "Vyhľadať službu",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Pridať {name}",
   "settings.service.form.availableServices": "Dostupné služby",
   "settings.service.form.customUrl": "Vlastný server",
-  "settings.service.form.customUrlPremiumInfo": "Ak chcete pridať vlastné hostované služby, potrebujete účet Ferdi Premium Supporter.",
-  "settings.service.form.customUrlUpgradeAccount": "Povýšte váš účet",
   "settings.service.form.customUrlValidationError": "Nebolo možné overiť vlastný server: {name}.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Tím",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Vylepšite svoj účet",
   "settings.user.form.accountType.company": "Spoločnosť",
   "settings.user.form.accountType.individual": "Osoba",
   "settings.user.form.accountType.label": "Typ účtu",
@@ -516,29 +431,20 @@
   "signup.link.login": "Už máte účet, chcete sa prihlásiť?",
   "signup.password.label": "Heslo",
   "signup.submit.label": "Vytvoriť účet",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "Pozrieť všetky nastavenia",
-  "subscription.cta.choosePlan": "Vyberte váš plán",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "za { interval}",
-  "subscription.interval.perMonth": "za mesiac",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Vylepšite svoj účet",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Zrušiť",
-  "subscriptionPopup.buttonDone": "Dokončiť",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Odstrániť službu",
   "tabs.item.disableAudio": "Vypnúť zvuk",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Zakázať oznámenia",
   "tabs.item.disableService": "Vypnúť službu",
   "tabs.item.edit": "Upraviť",
   "tabs.item.enableAudio": "Zapnúť zvuk",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Povoliť oznámenia",
   "tabs.item.enableService": "Povoliť službu",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Obnoviť",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} je neplatný",
   "validation.minLength": "{field} by malo byť dlhé aspoň {length} znakov",
   "validation.oneRequired": "Je nutné zadať aspoň jeden",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Pracovný priestor",
   "workspaceDrawer.item.contextMenuEdit": "Upraviť",
   "workspaceDrawer.item.noServicesAddedYet": "Zatiaľ žiadne služby",
-  "workspaceDrawer.premiumCtaButtonLabel": "Vytvorte váš prvý workspace",
-  "workspaceDrawer.proFeatureBadge": "Prémiová funkcia",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Obnovte svoj prémiový účet",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspace vám umožňujú sústrediť sa na to, čo je práve dôležité. Nastavte si rozličné skupiny služieb a jednoducho medzi nimi kedykoľvek prepínajte.</p><p>Vy rozhodujete ktoré služby, kedy a kde potrebujete, a my vám potom vieme pomôcť sústrediť sa na prácu - alebo jednoducho prepnúť z práce na čokoľvek iné. </p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Upraviť nastavenia workspace",
   "workspaces.switchingIndicator.switchingTo": "Prepínanie na"
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index 3447ea7ac..3e185e73b 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "Cancel",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Send as email",
   "feature.shareFranz.action.facebook": "Share on Facebook",
   "feature.shareFranz.action.twitter": "Share on Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Import your Ferdi 4 services",
@@ -88,7 +52,6 @@
   "infobar.hide": "Hide",
   "infobar.requiredRequestsFailed": "Could not load services and user information",
   "infobar.servicesUpdated": "Your services have been updated.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "A new update for Ferdi is available.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Email address",
@@ -149,6 +112,7 @@
   "menu.help.debugInfo": "Copy Debug Information",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Learn More",
   "menu.help.privacy": "Privacy Statement",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,12 +127,10 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "View",
   "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Enter Full Screen",
-  "menu.view.exitFullScreen": "Exit Full Screen",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.reloadTodos": "Reload ToDos",
   "menu.view.resetZoom": "Actual Size",
@@ -194,11 +156,7 @@
   "password.noUser": "No user with that email address was found",
   "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Welcome to Ferdi",
   "settings.account.account.editButton": "Edit account",
-  "settings.account.accountType.basic": "Basic Account",
-  "settings.account.accountType.premium": "Premium Supporter Account",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Invoices",
   "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Update profile",
-  "settings.account.headlineSubscription": "Your subscription",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.manageSubscription.label": "Manage your subscription",
   "settings.account.successInfo": "Your changes have been saved",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Try again",
   "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Could not load user information",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Available services",
   "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
   "settings.searchService": "Search service",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Add {name}",
   "settings.service.form.availableServices": "Available services",
   "settings.service.form.customUrl": "Custom server",
-  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
   "settings.user.form.accountType.label": "Account type",
@@ -516,29 +431,20 @@
   "signup.link.login": "Already have an account, sign in?",
   "signup.password.label": "Password",
   "signup.submit.label": "Create account",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Cancel",
-  "subscriptionPopup.buttonDone": "Done",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Disable audio",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
   "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Reload",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} is not valid",
   "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/sq.json b/src/i18n/locales/sq.json
index 09bb10fb2..fd1cbf1fd 100644
--- a/src/i18n/locales/sq.json
+++ b/src/i18n/locales/sq.json
@@ -5,30 +5,6 @@
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
-  "feature.delayApp.headline": "Upgrade your Ferdi plan to skip the wait",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14-days trial and skip the wait",
-  "feature.delayApp.upgrade.action": "Upgrade Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}?",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Send as email",
   "feature.shareFranz.action.facebook": "Share on Facebook",
   "feature.shareFranz.action.twitter": "Share on Twitter",
@@ -36,16 +12,6 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
@@ -53,7 +19,6 @@
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "import.headline": "Import your Ferdi 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
   "import.skip.label": "I want to add services manually",
@@ -63,7 +28,6 @@
   "infobar.buttonReloadServices": "Reload services",
   "infobar.requiredRequestsFailed": "Could not load services and user information",
   "infobar.servicesUpdated": "Your services have been updated.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "A new update for Ferdi is available.",
   "invite.email.label": "Email address",
   "invite.headline.friends": "Invite 3 of your friends or colleagues",
@@ -122,9 +86,7 @@
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "View",
-  "menu.view.enterFullScreen": "Enter Full Screen",
-  "menu.view.exitFullScreen": "Exit Full Screen",
-  "menu.view.reloadFranz": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.reloadTodos": "Reload ToDos",
   "menu.view.resetZoom": "Actual Size",
@@ -166,27 +128,6 @@
   "pricing.features.upToSixServices": "Add up to 6 services",
   "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Free",
-  "pricing.plan.legacy": "Premium",
-  "pricing.plan.personal": "Personal",
-  "pricing.plan.personal-monthly": "Personal Monthly",
-  "pricing.plan.personal-yearly": "Personal Yearly",
-  "pricing.plan.pro": "Professional",
-  "pricing.plan.pro-monthly": "Professional Monthly",
-  "pricing.plan.pro-yearly": "Professional Yearly",
-  "pricing.trial.cta.accept": "Start my 14-day Ferdi Professional Trial ",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -198,11 +139,6 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading",
   "services.getStarted": "Get started",
   "services.welcome": "Welcome to Ferdi",
@@ -219,18 +155,9 @@
   "settings.account.headlineInvoices": "Invoices",
   "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Update profile",
-  "settings.account.headlineSubscription": "Your subscription",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.manageSubscription.label": "Manage your subscription",
   "settings.account.successInfo": "Your changes have been saved",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Try again",
   "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Could not load user information",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.buttonClearAllCache": "Clear cache",
@@ -284,7 +211,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Available services",
   "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
   "settings.searchService": "Search service",
@@ -391,19 +317,6 @@
   "signup.link.login": "Already have an account, sign in?",
   "signup.password.label": "Password",
   "signup.submit.label": "Create account",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Cancel",
-  "subscriptionPopup.buttonDone": "Done",
   "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
@@ -431,7 +344,6 @@
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
   "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
   "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index a2eddf812..e92dd141f 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Надоградите налог",
   "feature.nightlyBuilds.activate": "Активирај",
   "feature.nightlyBuilds.cancel": "Odustani",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Пошаљите као Е-мејл",
   "feature.shareFranz.action.facebook": "Поделите на Фејсбуку",
   "feature.shareFranz.action.twitter": "Поделите на Твитеру",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Nije moguće pristupiti Ferdi-ovim on-line servisima. ",
-  "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "Niste povezani sa serverom.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Аутоматски",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Uvezite svoje Ferdi 4 servise",
@@ -88,7 +52,6 @@
   "infobar.hide": "Sakrij",
   "infobar.requiredRequestsFailed": "Nemoguće učitati servise i korisničke informacije",
   "infobar.servicesUpdated": "Vaši servisi su ažurirani. ",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "Novo ažuriranje Ferdi-a je dostupno.  ",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Vaša e-adresa",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Potraži ažuriranja",
   "menu.app.hide": "Sakrij",
-  "menu.app.hideOthers": "Sakrij ostale",
-  "menu.app.quit": "Izađi",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Postavke",
-  "menu.app.unhide": "Otkrij",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Uredi",
-  "menu.edit.copy": "Kopiraj",
-  "menu.edit.cut": "Iseci",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Obriši",
   "menu.edit.emojiSymbols": "Smajliji i simboli",
   "menu.edit.findInPage": "Find in Page",
-  "menu.edit.paste": "Nalepi",
-  "menu.edit.pasteAndMatchStyle": "Налепи не мењајући стил",
-  "menu.edit.redo": "Понови",
-  "menu.edit.selectAll": "Изабери све",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Говор",
   "menu.edit.startDictation": "Започни диктирање",
   "menu.edit.startSpeaking": "Започни изговор",
   "menu.edit.stopSpeaking": "Заустави изговор",
-  "menu.edit.undo": "Поништи",
+  "menu.edit.undo": "Undo",
   "menu.file": "Датотека",
-  "menu.help": "Помоћ",
+  "menu.help": "Help",
   "menu.help.changelog": "Дневник измена",
   "menu.help.debugInfo": "Copy Debug Information",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Сазнајте више",
   "menu.help.privacy": "Izjava o privatnosti",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Преглед",
   "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Отвори у целом екрану",
-  "menu.view.exitFullScreen": "Напусти цео екран",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Поново учитај Франз",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Поново учирај услугу",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Стварна величина",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Промени алатке за развој",
-  "menu.view.toggleFullScreen": "Преко целог екрана",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
   "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
-  "menu.view.zoomIn": "Увећај приказ",
-  "menu.view.zoomOut": "Умањи приказ",
-  "menu.window": "У прозору",
-  "menu.window.close": "Затвори",
-  "menu.window.minimize": "Умањи",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Workspaces",
   "menu.workspaces.addNewWorkspace": "Add New Workspace...",
   "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
@@ -194,11 +156,7 @@
   "password.noUser": "Ne postoji ni jedan korisnik s tom e-mail adresom",
   "password.submit.label": "Pošalji",
   "password.successInfo": "Molimo Vas da provjerite vašu e-mail adresu",
-  "premiumFeature.button.upgradeAccount": "Надоградите налог",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Osvježi {name}",
   "service.crashHandler.autoReload": "Pokušaću automatski povratiti {name} u {seconds} sekundi",
   "service.crashHandler.headline": "O, ne! ",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "O, ne! ",
   "service.errorHandler.message": "Greška ",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Započnimo! ",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Dobrodošli u Ferdi",
   "settings.account.account.editButton": "Uredi račun",
-  "settings.account.accountType.basic": "Osnovni račun",
-  "settings.account.accountType.premium": "Premium račun",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Ažuriraj profil",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Fakture",
   "settings.account.headlinePassword": "Promijenite lozinku",
   "settings.account.headlineProfile": "Ažuriraj profil",
-  "settings.account.headlineSubscription": "Vaša pretplata",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Preuzmite",
-  "settings.account.manageSubscription.label": "Upravljajte pretplatama",
   "settings.account.successInfo": "Vaše promjene su spremljene",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Pokušajte ponovno",
   "settings.account.tryReloadUserInfoRequest": "Pokušajte ponovno",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Nije moguće učitati informacije o korisniku",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Omogući provjeru pravopisa",
   "settings.app.form.enableSystemTray": "Prikaži aplikaciju u sustavskoj traci",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Postavke",
   "settings.app.headlineAdvanced": "Napredne alatke",
   "settings.app.headlineAppearance": "Izgled",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Лозинка",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Promjene postavki zahtijevaju ponovni pogon",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Кеш",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Dostupne usluge",
   "settings.recipes.missingService": "Da li neki servis nedostaje?",
-  "settings.recipes.mostPopular": "Najpopularniji",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Usluga uspješno dodana",
   "settings.searchService": "Претражи услуге",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Dodaj {name}",
   "settings.service.form.availableServices": "Dostupne usluge",
   "settings.service.form.customUrl": "Prilagođen server",
-  "settings.service.form.customUrlPremiumInfo": "Da bi ste dodali samo-hostovane usluge, potreban vam je Premium račun.",
-  "settings.service.form.customUrlUpgradeAccount": "Nadogradite Vaš račun",
   "settings.service.form.customUrlValidationError": "Nije moguće odobriti prilagođeno {name} servera.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Tim",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Tvrtka",
   "settings.user.form.accountType.individual": "Pojedinac",
   "settings.user.form.accountType.label": "Tip računa",
@@ -516,29 +431,20 @@
   "signup.link.login": "Imate račun? Prijavite se.",
   "signup.password.label": "Лозинка",
   "signup.submit.label": "Napravite novi račun",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Odustani",
-  "subscriptionPopup.buttonDone": "Završeno",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Izbriši uslugu",
   "tabs.item.disableAudio": "Onemogući zvuk",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Onemogući obavijesti",
   "tabs.item.disableService": "Onemogući servis",
   "tabs.item.edit": "Uredi",
   "tabs.item.enableAudio": "Omogućite zvuk",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Omogućite obavijesti",
   "tabs.item.enableService": "Omogućite usluge",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Ponovno učitavanje",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} није валидно",
   "validation.minLength": "{field} треба да буде најмање {length} карактера дугачко",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index c6bd739e6..9545511b4 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Åh nej! Ferdi förlorade anslutningen till {name}.",
   "feature.announcements.changelog.headline": "Ändringar i Ferdi {version}",
   "feature.debugger.title": "Skicka felsökningsinformation",
-  "feature.delayApp.headline": "Vänligen köp en Ferdi Supporter-licens för att slippa vänta",
-  "feature.delayApp.text": "Ferdi återupptas om {seconds} sekunder.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Skaffa en Ferdi Supporter-licens",
-  "feature.delayApp.upgrade.actionShort": "Uppgradera konto",
   "feature.nightlyBuilds.activate": "Aktivera",
   "feature.nightlyBuilds.cancel": "Avbryt",
   "feature.nightlyBuilds.info": "Nattliga kompileringar är väldigt experimentella versioner av Ferdi som kan innehålla ofärdiga och ännu ej testade funktioner. Nattliga kompilering är i första hand tänkt för utvecklare för att kunna testa hur nya funktioner fungerar och presterar. Är du osäker på vad detta innebär rekommenderas du att inte aktivera nattliga kompileringar.",
   "feature.nightlyBuilds.title": "Nattlig kompilering",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "Ett fel uppstod när felsökningsinformationen skulle skickas. Försök igen senare eller se konsolen för mer information.",
   "feature.publishDebugInfo.info": "Genom att skicka oss din felsökningsinformation hjälper du oss att hitta problem och fel i Ferdi. Genom att skicka din felsökningsinformation godkänner du Ferdi-debuggerns sekretesspolicy och användarvillkor",
   "feature.publishDebugInfo.privacy": "Integritetspolicy",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Välj en tjänst med TAB, ↑ and ↓. Öppna en tjänst med ENTER.",
   "feature.quickSwitch.search": "Sök...",
   "feature.quickSwitch.title": "Snabbväxling",
-  "feature.serviceLimit.limitReached": "Du har lagt till {amount} av {limit} tjänster som ingår i ditt abonnemang. Uppgradera ditt konto för att lägga till fler tjänster.",
   "feature.shareFranz.action.email": "Skicka som e-post",
   "feature.shareFranz.action.facebook": "Dela på Facebook",
   "feature.shareFranz.action.twitter": "Dela på Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "Jag har lagt till {count} tjänster till Ferdi! Skaffa en gratis app för WhatsApp, Messenger, Slack, Skype och många fler på www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "Jag har lagt till {count} tjänster till Ferdi! Skaffa en gratis app för WhatsApp, Messenger, Slack, Skype och många fler på www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Berätta för dina vänner och kollegor hur grymt Ferdi är och hjälp oss att sprida ordet.",
-  "feature.todos.premium.info": "Ferdi Todos är tillgängligt för premiumanvändare nu!",
-  "feature.todos.premium.rollout": "Alla andra får lov att vänta lite längre.",
-  "feature.todos.premium.upgrade": "Uppgradera konto",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Kan inte ansluta till Ferdis onlinetjänster",
-  "global.franzProRequired": "Ferdi Professional krävs",
   "global.notConnectedToTheInternet": "Du är inte ansluten till Internet.",
   "global.spellchecker.useDefault": "Använd systemstandard ({default})",
   "global.spellchecking.autodetect": "Identifiera språk automatiskt",
   "global.spellchecking.autodetect.short": "Automatisk",
   "global.spellchecking.language": "Rättstavningsspråk",
-  "global.upgradeButton.upgradeToPro": "Uppgradera till Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Importera dina Ferdi 4-tjänster",
@@ -88,7 +52,6 @@
   "infobar.hide": "Dölj",
   "infobar.requiredRequestsFailed": "Kunde inte ladda tjänster och användarinformation",
   "infobar.servicesUpdated": "Dina tjänster har uppdaterats.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "En ny uppdatering för Ferdi finns tillgänglig.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "E-postadress",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Dölj menyraden automatiskt",
   "menu.app.checkForUpdates": "Sök efter uppdateringar",
   "menu.app.hide": "Dölj",
-  "menu.app.hideOthers": "Dölj övriga",
-  "menu.app.quit": "Avsluta",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Inställningar",
-  "menu.app.unhide": "Sluta dölja",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Redigera",
-  "menu.edit.copy": "Kopiera",
-  "menu.edit.cut": "Klipp ut",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Radera",
   "menu.edit.emojiSymbols": "Emojis & symboler",
   "menu.edit.findInPage": "Hitta på sidan",
-  "menu.edit.paste": "Klistra in",
-  "menu.edit.pasteAndMatchStyle": "Klistra in och matcha stil",
-  "menu.edit.redo": "Gör om",
-  "menu.edit.selectAll": "Markera allt",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Tal",
   "menu.edit.startDictation": "Börja diktera",
   "menu.edit.startSpeaking": "Börja tala",
   "menu.edit.stopSpeaking": "Sluta prata",
-  "menu.edit.undo": "Ångra",
+  "menu.edit.undo": "Undo",
   "menu.file": "Fil",
-  "menu.help": "Hjälp",
+  "menu.help": "Help",
   "menu.help.changelog": "Ändringslogg",
   "menu.help.debugInfo": "Kopiera felsökningsinformation",
   "menu.help.debugInfoCopiedBody": "Din felsökningsinformation har kopierats till ditt urklipp.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi felsökningsinformation",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Läs mer",
   "menu.help.privacy": "Integritetspolicy",
   "menu.help.publishDebugInfo": "Skicka felsökningsinformation",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Aktivera Todos",
   "menu.view": "Visa",
   "menu.view.back": "Tillbaka",
-  "menu.view.enterFullScreen": "Helskärmsläge",
-  "menu.view.exitFullScreen": "Lämna helskärmsläget",
   "menu.view.forward": "Framåt",
   "menu.view.lockFerdi": "Lås Ferdi",
   "menu.view.openQuickSwitch": "Öppna snabbväxling",
-  "menu.view.reloadFranz": "Ladda om Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Ladda om tjänst",
   "menu.view.reloadTodos": "Ladda om: AttGöra",
-  "menu.view.resetZoom": "Originalstorlek",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Växla mörkt läge",
   "menu.view.toggleDevTools": "Växla utvecklarverktyg",
-  "menu.view.toggleFullScreen": "Växla helskärmsläge",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Växla tjänsteverktyg för utvecklare",
   "menu.view.toggleTodosDevTools": "Växla Todos utvecklarverktyg",
-  "menu.view.zoomIn": "Zooma in",
-  "menu.view.zoomOut": "Zooma ut",
-  "menu.window": "Fönster",
-  "menu.window.close": "Stäng",
-  "menu.window.minimize": "Minimera",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Arbetsytor",
   "menu.workspaces.addNewWorkspace": "Skapa ny arbetsyta...",
   "menu.workspaces.closeWorkspaceDrawer": "Stäng arbetsytan",
@@ -194,11 +156,7 @@
   "password.noUser": "Ingen användare med den e-postadressen hittades",
   "password.submit.label": "Skicka",
   "password.successInfo": "Vänligen kontrollera din e-post",
-  "premiumFeature.button.upgradeAccount": "Uppgradera konto",
   "pricing.features.accountSync": "Synkronisering av konto",
-  "pricing.features.adFree": "Reklamfritt för alltid",
-  "pricing.features.appDelays": "Inga vänteskärmar",
-  "pricing.features.appDelaysEnabled": "Tillfälliga väntande skärmar",
   "pricing.features.customWebsites": "Lägg till egna webbplatser",
   "pricing.features.desktopNotifications": "Skrivbordsaviseringar",
   "pricing.features.onPremise": "Lokala tjänster och andra värdtjänster",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Hantera grupp",
   "pricing.features.thirdPartyServices": "Installera tjänster från tredje part",
   "pricing.features.unlimitedServices": "Lägg till obegränsat antal tjänster",
-  "pricing.features.upToSixServices": "Lägg till upp till 6 tjänster",
-  "pricing.features.upToThreeServices": "Lägg till upp till 3 tjänster",
   "pricing.features.workspaces": "Arbetsytor",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal månatlig",
-  "pricing.plan.personal-yearly": "Ferdi Professional årsvis",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional månatlig",
-  "pricing.plan.pro-yearly": "Ferdi Professional årsvis",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Ladda om {name}",
   "service.crashHandler.autoReload": "Försöker automatiskt återställa {name} om {seconds} sekunder",
   "service.crashHandler.headline": "Åh nej!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Åh nej!",
   "service.errorHandler.message": "Fel",
   "service.errorHandler.text": "{name} kunde inte laddas.",
-  "service.restrictedHandler.action": "Uppgradera konto",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional krävs",
-  "service.restrictedHandler.customUrl.text": "Vänligen uppgradera till Ferdi Professional-abonnemanget för att använda anpassade webbadresser & själv-hostade tjänster.",
-  "service.restrictedHandler.serviceLimit.headline": "Du har nått gränsen för antalet tjänster.",
-  "service.restrictedHandler.serviceLimit.text": "Uppgradera ditt konto för att använda mer än {count} tjänster.",
   "service.webviewLoader.loading": "Laddar {service}",
   "services.getStarted": "Kom igång",
   "services.login": "Logga in för att använda Ferdi.",
-  "services.serverInfo": "Om du vill kan du ändra din Ferdi-server genom att klicka på kugghjulet i det nedre vänstra hörnet.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Använd Ferdi utan ett konto",
   "services.welcome": "Välkommen till Ferdi",
   "settings.account.account.editButton": "Redigera konto",
-  "settings.account.accountType.basic": "Standardkonto",
-  "settings.account.accountType.premium": "Premium Supporterkonto",
   "settings.account.accountUnavailable": "Kontot är inte tillgängligt",
   "settings.account.accountUnavailableInfo": "Du använder Ferdi utan ett konto. Om du vill använda Ferdi med ett konto och hålla dina tjänster synkroniserade mellan installationer, välj en server i fliken Inställningar och logga in.",
   "settings.account.buttonSave": "Uppdatera profil",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Fakturor",
   "settings.account.headlinePassword": "Ändra lösenord",
   "settings.account.headlineProfile": "Uppdatera profil",
-  "settings.account.headlineSubscription": "Ditt abonnemang",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Uppgradera ditt konto för att få den hela Ferdi-upplevelsen",
-  "settings.account.invoiceDownload": "Nerladdning",
-  "settings.account.manageSubscription.label": "Hantera ditt abonnemang",
   "settings.account.successInfo": "Dina ändringar har sparats",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Försök igen",
   "settings.account.tryReloadUserInfoRequest": "Försök igen",
-  "settings.account.upgradeToPro.label": "Uppgradera till Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Kunde inte ladda användarinformation",
   "settings.account.yourLicense": "Din Ferdi-licens",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Aktivera stavningskontroll",
   "settings.app.form.enableSystemTray": "Visa Ferdi i systemfältet",
   "settings.app.form.enableTodos": "Aktivera Ferdi Todos",
-  "settings.app.form.hibernate": "Sätt tjänst i vila",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Strategi för vila",
   "settings.app.form.iconSize": "Ikonstorlek för tjänster",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Aktivera globalt mörkt läge",
   "settings.app.form.useTouchIdToUnlock": "Tillåt att TouchID används för att låsa upp Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Inställningar",
   "settings.app.headlineAdvanced": "Avancerat",
   "settings.app.headlineAppearance": "Utseende",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "Som standard kommer Ferdi att hålla alla dina tjänster öppna och laddade i bakgrunden så att de är redo när du vill använda dem. Viloläget kommer att stänga dina tjänster efter ett angivet belopp. Detta är användbart för att spara på arbetsminne eller se till att tjänster inte saktar ner datorn.",
   "settings.app.inactivityLockInfo": "Antal minuter av inaktivitet, varefter Ferdi låses automatiskt. Ange 0 för att inaktivera",
   "settings.app.languageDisclaimer": "Engelska och tyska är officella översättningar. Övriga språk har översatts av gemenskapen.",
-  "settings.app.lockInfo": "Lösenordslås låter dig skydda dina meddelanden.\nMed lösenordslås kommer du bli ombedd att ange ditt lösenord varje gång du startar Ferdi. Du kan också låsa Ferdi själv med hjälp av låssymbolen i det nedre vänstra hörnet eller med kortkommandot CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Lösenord",
   "settings.app.lockedPasswordInfo": "Se till att du anger ett lösenord du kommer att komma ihåg.\nOm du tappar bort detta lösenord måste du installera om Ferdi.",
   "settings.app.restartRequired": "Ändringar kräver omstart",
   "settings.app.scheduledDNDInfo": "Schemalagd \"Stör ej\" låter dig definiera en tidsperiod inom vilken du inte vill få meddelanden från Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Tid i 24-timmarsformat. Sluttid kan vara före starttid (t.ex. start 17:00, slut 09:00) för att aktivera \"Stör ej\" över natten.",
-  "settings.app.sentryInfo": "Genom att skicka telemetridata kan vi hitta buggar i Ferdi - vi kommer inte att skicka någon personlig information (som dina meddelandedata)! Att ändra detta alternativ kräver en omstart av Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "Denna server kommer att användas för \"Ferdi Todo\"-funktionen.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Öppna mapp",
   "settings.recipes.headline": "Tillgängliga tjänster",
   "settings.recipes.missingService": "Saknar du en tjänst?",
-  "settings.recipes.mostPopular": "Mest populära",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Tjänsten har lagts till",
   "settings.searchService": "Sök efter tjänst",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Lägg till {name}",
   "settings.service.form.availableServices": "Tillgängliga tjänster",
   "settings.service.form.customUrl": "Anpassad server",
-  "settings.service.form.customUrlPremiumInfo": "För att lägga till egna tjänster behöver du ett Ferdi Premium supporter-konto.",
-  "settings.service.form.customUrlUpgradeAccount": "Uppgradera ditt konto",
   "settings.service.form.customUrlValidationError": "Kunde inte validera anpassad {name} -server.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Hantera Franz-grupp",
   "settings.team.copy": "Grupphanteringen i Franz låter dig hantera Franz-abonnemang för flera användare. Observera att ett Franz Premium-abonnemang inte ger dig några extra funktioner i Ferdi: Den enda anledningen till att du fortfarande har tillgång till grupphanteringen är att du kan hantera dina äldre Franz-grupper så att du inte förlorar någon funktionalitet i hanteringen av ditt konto.",
   "settings.team.headline": "Grupp",
-  "settings.team.intro": "Du använder för närvarande Franz servrar, vilket är anledningen till att du har tillgång till grupphanteringen.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Hantera din grupp på meetfranz.com",
   "settings.team.teamsUnavailable": "Grupper är inte tillgängliga",
   "settings.team.teamsUnavailableInfo": "Grupper är för närvarande endast tillgängliga när du använder Franz Server och har betalat för Franz Professional. Vänligen ändra din server till https://api.franzinfra.com för att använda gruppfunktionalitet.",
-  "settings.team.upgradeAction": "Uppgradera ditt konto",
   "settings.user.form.accountType.company": "Företag",
   "settings.user.form.accountType.individual": "Privatperson",
   "settings.user.form.accountType.label": "Kontotyp",
@@ -516,29 +431,20 @@
   "signup.link.login": "Har du redan ett konto? Logga in",
   "signup.password.label": "Lösenord",
   "signup.submit.label": "Skapa konto",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "Se alla alternativ",
-  "subscription.cta.choosePlan": "Välj abonnemang",
-  "subscription.includedProFeatures": "I Ferdi Professional-abonnemanget ingår:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per månad",
-  "subscription.interval.perMonthPerUser": "per månad & användare",
-  "subscription.planItem.upgradeAccount": "Uppgradera konto",
-  "subscription.teaser.includedFeatures": "De avgiftsbelagda Ferdi-abonnemangen inkluderar:",
-  "subscription.teaser.intro": "Ferdi 5 kommer med ett brett utbud av nya funktioner för att förbättra din dagliga kommunikation. Kolla in våra nya abonnemang och ta reda på vilket av dem som passar dig bäst!",
-  "subscriptionPopup.buttonCancel": "Avbryt",
-  "subscriptionPopup.buttonDone": "Klar",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Ta bort tjänst",
   "tabs.item.disableAudio": "Inaktivera ljud",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Inaktivera aviseringar",
   "tabs.item.disableService": "Inaktivera tjänst",
   "tabs.item.edit": "Redigera",
   "tabs.item.enableAudio": "Aktivera ljud",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktivera aviseringar",
   "tabs.item.enableService": "Aktivera tjänst",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Ladda om",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} är felaktig",
   "validation.minLength": "{field} bör vara minst {length} tecken lång",
   "validation.oneRequired": "Minst en krävs",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Arbetsytor",
   "workspaceDrawer.item.contextMenuEdit": "redigera",
   "workspaceDrawer.item.noServicesAddedYet": "Inga tjänster har lagts till",
-  "workspaceDrawer.premiumCtaButtonLabel": "Skapa din första arbetsyta",
-  "workspaceDrawer.proFeatureBadge": "Premium-funktion",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Återaktivera premiumkonto",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi-arbetsytor låter dig fokusera på det som är viktigt just nu. Konfigurera olika uppsättningar av tjänster och växla enkelt mellan dem när som helst.</p><p>Du bestämmer vilka tjänster du behöver när och var, så att vi kan hjälpa dig att hålla koll på läget - eller enkelt koppla bort från jobbet när du vill.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Redigera inställningar för arbetsytor",
   "workspaces.switchingIndicator.switchingTo": "Byter till"
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 25b528cd1..651f0da50 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Nayır, nolamaz! Ferdi {name} ile bağlantısını yitirdi.",
   "feature.announcements.changelog.headline": "Ferdi {version} Sürümündeki Değişiklikler",
   "feature.debugger.title": "Hata ayıklama bilgisini yayımla",
-  "feature.delayApp.headline": "Beklememek için Ferdi Destek Lisansı'nı satın alın",
-  "feature.delayApp.text": "Ferdi {seconds} saniye sonra devam edecek.",
-  "feature.delayApp.trial.action": "Evet, Ferdi Professional'ın 14 günlük ücretsiz denemesini istiyorum",
-  "feature.delayApp.trial.actionShort": "Ferdi Professional'ın denemesini aktive et",
-  "feature.delayApp.trial.headline": "Ferdi Professional'ın 14 günlük denemesini et ve sıranın önüne geç",
-  "feature.delayApp.upgrade.action": "Ferdi Destek Lisansı'nı alın",
-  "feature.delayApp.upgrade.actionShort": "Hesabı Yükselt",
   "feature.nightlyBuilds.activate": "Etkinleştir",
   "feature.nightlyBuilds.cancel": "İptal",
   "feature.nightlyBuilds.info": "Nightly yapılar Ferdi'nin deneysel sürümleri olup tamamlanmamış özellikler içerebilir. Bu nightly yapılar genellikle geliştiriciler tarafından yeni özellikleri deneyip geliştirmek için kullanılır. Ne yaptığınızı bilmiyorsanız nightly yapıları etkinleştirmeyin.",
   "feature.nightlyBuilds.title": "Nightly Yapılar",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "TAB, ↑ ve ↓ ile bir servis seç. ENTER ile bir servisi aç.",
   "feature.quickSwitch.search": "Ara...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "Hesabında {limit} adet servis limiti olmasına rağmen {amount} servis ekledin. Lütfen daha fazla servis eklemek için hesabını yükselt.",
   "feature.shareFranz.action.email": "Mail olarak gönder",
   "feature.shareFranz.action.facebook": "Facebook'ta Paylaş",
   "feature.shareFranz.action.twitter": "Twitter'da Paylaş",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "Ferdi'a {count} tane servis ekledim! WhatsApp, Messenger, Slack ve fazlasını içeren ücretsiz uygulamayı www.getferdi.com adresinden edinin.",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Arkadaşlarına ve meslektaşlarına Ferdi'ın ne kadar harika olduğunu söyle ve bize bu kelimeyi yaymamızda yardım et.",
-  "feature.todos.premium.info": "Ferdi Yapılacaklar Listesi şimdi Premium kullanıcılar için kullanılabilir!",
-  "feature.todos.premium.rollout": "Diğer herkes biraz daha beklemek zorunda.",
-  "feature.todos.premium.upgrade": "Hesabını Yükselt",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Ferdi hizmetlerine şu anda erişilemiyor",
-  "global.franzProRequired": "Ferdi Professional Gerekli",
   "global.notConnectedToTheInternet": "İnternete bağlı değilsiniz.",
   "global.spellchecker.useDefault": "Sistem Dilini Kullan ({default})",
   "global.spellchecking.autodetect": "Dili otomatik tespit et",
   "global.spellchecking.autodetect.short": "Otomatik",
   "global.spellchecking.language": "İmla kontrol dili",
-  "global.upgradeButton.upgradeToPro": "Ferdi Professional'a Yükselt",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Ferdi 4 servislerinizi içeri aktarın",
@@ -88,7 +52,6 @@
   "infobar.hide": "Gizle",
   "infobar.requiredRequestsFailed": "Hizmetler ve kullanıcı bilgileri yüklenemedi",
   "infobar.servicesUpdated": "Hizmetleriniz güncellendi.",
-  "infobar.trialActivated": "Denemen başarıyla aktifleştirildi. Mutlu mesajlaşmalar!",
   "infobar.updateAvailable": "Yeni Ferdi güncellemesi mevcut.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "E-posta adresi",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Menü çubuğunu otomatik otomatik olarak gizle",
   "menu.app.checkForUpdates": "Güncellemeleri kontrol et",
   "menu.app.hide": "Gizle",
-  "menu.app.hideOthers": "Diğerlerini Gizle",
-  "menu.app.quit": "Çıkış",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Ayarlar",
-  "menu.app.unhide": "Göster",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Düzenle",
-  "menu.edit.copy": "Kopyala",
-  "menu.edit.cut": "Kes",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Sil",
   "menu.edit.emojiSymbols": "Emoji & Semboller",
   "menu.edit.findInPage": "Find in Page",
-  "menu.edit.paste": "Yapıştır",
-  "menu.edit.pasteAndMatchStyle": "Yapıştır ve Stili Eşleştir",
-  "menu.edit.redo": "Yeniden Yap",
-  "menu.edit.selectAll": "Hepsini Seç",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Konuşma",
   "menu.edit.startDictation": "İmlaya Başla",
   "menu.edit.startSpeaking": "Konuşmaya Başla",
   "menu.edit.stopSpeaking": "Konuşmayı Bırak/Durdur",
-  "menu.edit.undo": "Geri al",
+  "menu.edit.undo": "Undo",
   "menu.file": "Dosya",
-  "menu.help": "Yardım",
+  "menu.help": "Help",
   "menu.help.changelog": "Değişim Günlüğü",
   "menu.help.debugInfo": "Hata ayıklama bilgisini kopyala",
   "menu.help.debugInfoCopiedBody": "Hata ayıklama bilgilerin panoya kopyalandı.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Hata Ayıklama Bilgisi",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Daha Fazlasını Öğrenin",
   "menu.help.privacy": "Gizlilik Sözleşmesi",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Yapılacaklar Listesi'ni Aç",
   "menu.view": "Görünüm",
   "menu.view.back": "Geri",
-  "menu.view.enterFullScreen": "Tam Ekrana Geç",
-  "menu.view.exitFullScreen": "Tam Ekrandan Çık",
   "menu.view.forward": "İleri",
   "menu.view.lockFerdi": "Ferdi'yi Kilitle",
   "menu.view.openQuickSwitch": "QuickSwitch'i aç",
-  "menu.view.reloadFranz": "Ferdi'ı Yeniden Yükle",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Servisi Tekrar Yükle",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Orijinal Boyut",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Gece Modunu kapat",
   "menu.view.toggleDevTools": "Geliştirici Araçlarına Geç",
-  "menu.view.toggleFullScreen": "Tam Ekrana Geç",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Hizmet Geliştirici Araçlarını Değiştir",
   "menu.view.toggleTodosDevTools": "Yapılacaklar Listesi Geliştirici Araçlarını Aç",
-  "menu.view.zoomIn": "Yakınlaştır",
-  "menu.view.zoomOut": "Uzaklaştır",
-  "menu.window": "Pencere",
-  "menu.window.close": "Kapat",
-  "menu.window.minimize": "Simge Durumuna Küçült",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Çalışma Alanları",
   "menu.workspaces.addNewWorkspace": "Yeni Çalışma Alanı ekle...",
   "menu.workspaces.closeWorkspaceDrawer": "Çalışma alanı çekmecesini kapat",
@@ -194,11 +156,7 @@
   "password.noUser": "Bu e-posta adresinde bir kullanıcı bulunamadı",
   "password.submit.label": "Gönder",
   "password.successInfo": "E-postanızı kontrol ediniz",
-  "premiumFeature.button.upgradeAccount": "Hesabı Yükselt",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Sonsuza dek reklamsız",
-  "pricing.features.appDelays": "Yükleme Ekranları Yok",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Özel Siteler Ekle",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Takım yönetimi",
   "pricing.features.thirdPartyServices": "3. parti servisleri yükleme",
   "pricing.features.unlimitedServices": "Sınırsız servis ekleme",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Çalışma Alanları",
-  "pricing.plan.free": "Ferdi - Ücretsiz",
-  "pricing.plan.legacy": "Ferdi - Premium",
-  "pricing.plan.personal": "Ferdi - Kişisel",
-  "pricing.plan.personal-monthly": "Ferdi - Aylık Kişisel",
-  "pricing.plan.personal-yearly": "Ferdi - Yıllık Kişisel",
-  "pricing.plan.pro": "Ferdi - Professional",
-  "pricing.plan.pro-monthly": "Ferdi - Aylık Professional",
-  "pricing.plan.pro-yearly": "Ferdi - Yıllık Professional",
-  "pricing.trial.cta.accept": "Evet, hesabını Ferdi Professional'a yükselt",
-  "pricing.trial.cta.skip": "Ferdi'ye Devam Et",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Üzgünüz, ücretsiz denemeni başlatamadık!",
-  "pricing.trial.features.headline": "Ferdi Professional şunları içerir:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "Kredi kartı gerektirmez",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "{name} yeniden yükle",
   "service.crashHandler.autoReload": "{name}'i {seconds} saniye içerisinde otomatik onarmayı deniyoruz",
   "service.crashHandler.headline": "Olamaz!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Olamaz!",
   "service.errorHandler.message": "Hata",
   "service.errorHandler.text": "{name} yüklenemedi.",
-  "service.restrictedHandler.action": "Hesabını Yükselt",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Haydi başlayalım",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Ferdi'yi bir hesap olmadan kullan",
   "services.welcome": "Ferdi'a Hoşgeldiniz",
   "settings.account.account.editButton": "Hesabı düzenle",
-  "settings.account.accountType.basic": "Basit Hesap",
-  "settings.account.accountType.premium": "Premium Destekçi Hesabı",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Profili güncelle",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Faturalar",
   "settings.account.headlinePassword": "Parolayı değiştir",
   "settings.account.headlineProfile": "Profili güncelle",
-  "settings.account.headlineSubscription": "Aboneliğin",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "İndir",
-  "settings.account.manageSubscription.label": "Aboneliğini yönet",
   "settings.account.successInfo": "Değişikliklerin kaydedildi",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Ücretsiz denemen {duration} içinde bitiyor.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Tekrar deneyin",
   "settings.account.tryReloadUserInfoRequest": "Tekrar deneyin",
-  "settings.account.upgradeToPro.label": "Ferdi Professional'a Yükselt",
   "settings.account.userInfoRequestFailed": "Kullanıcı bilgisi yüklenemedi",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Yazım denetimini etkinleştir",
   "settings.app.form.enableSystemTray": "Ferdi'ı sistem tepsisinde göster",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Ayarlar",
   "settings.app.headlineAdvanced": "Gelişmiş",
   "settings.app.headlineAppearance": "Görünüm",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Şifre",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Değişiklikler yeniden başlatmayı gerektiriyor",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Önbellek",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Mevcut servisler",
   "settings.recipes.missingService": "Aradığın servisi bulamadın mı?",
-  "settings.recipes.mostPopular": "En popüler",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Servis başarıyla eklendi",
   "settings.searchService": "Hizmeti ara",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "{name} Ekle",
   "settings.service.form.availableServices": "Mevcut servisler",
   "settings.service.form.customUrl": "Özel sunucu",
-  "settings.service.form.customUrlPremiumInfo": "Kendi barındırdığın servisi ekleyebilmek için Ferdi Premium Destek Hesabına ihtiyacın var.",
-  "settings.service.form.customUrlUpgradeAccount": "Hesabını yükselt",
   "settings.service.form.customUrlValidationError": "{name} özel sunucu doğrulanamadı.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Takım",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Kurum",
   "settings.user.form.accountType.individual": "Bireysel",
   "settings.user.form.accountType.label": "Hesap tipi",
@@ -516,29 +431,20 @@
   "signup.link.login": "Hali hazırda hesabınız varsa giriş yapmak ister misiniz?",
   "signup.password.label": "Şifre",
   "signup.submit.label": "Hesap oluştur",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Hesabını Yükselt",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "İptal",
-  "subscriptionPopup.buttonDone": "Tamamlandı",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Servisi sil",
   "tabs.item.disableAudio": "Sesi kapat",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Bildirimleri devre dışı bırak",
   "tabs.item.disableService": "Servisi devre dışı bırak",
   "tabs.item.edit": "Düzenle",
   "tabs.item.enableAudio": "Sesi etkinleştirin",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Bildirimleri etkinleştir",
   "tabs.item.enableService": "Servisi etkinleştir",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Yenile",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} geçerli değil",
   "validation.minLength": "{field} en az {length} karakter uzunluğunda olmalı",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Çalışma Alanları",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index fac58b028..3c6a01397 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "О ні! Ферді втратив з'єднання з {name}.",
   "feature.announcements.changelog.headline": "Зміни у Ferdi {version}",
   "feature.debugger.title": "Опублікувати інформацію для налагодження",
-  "feature.delayApp.headline": "Будь ласка, придбайте ліцензію Ferdi Supporter аби пропустити очікування",
-  "feature.delayApp.text": "Ferdi відновить роботу за {seconds} секунд",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Отримати ліцензію Ferdi Supporter ",
-  "feature.delayApp.upgrade.actionShort": "Преміум акаунт",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "Відмінити",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "Сталася помилка під час спроби опублікувати інформацію для налагодження. Будь ласка, спробуйте ще раз пізніше або перегляньте консоль для отримання додаткової інформації.",
   "feature.publishDebugInfo.info": "Публікація інформації для налагодження допоможе нам знайти проблеми та помилки у Fredi. Публікуючи вашу зневаджувальну інформацію, ви приймаєте політику конфіденційності Ferdi Debugger та умови використання",
   "feature.publishDebugInfo.privacy": "Політика конфіденційності",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Виберіть сервіс за допомогою TAB, стрілок ↑ та ↓. Натисніть ENTER, щоб відкрити.",
   "feature.quickSwitch.search": "Пошук...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Надіслати електронною поштою",
   "feature.shareFranz.action.facebook": "Поділитися на Facebook",
   "feature.shareFranz.action.twitter": "Поділитись у Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "Я додав {count} служб до Ферді! Завантажте безкоштовний додаток на WhatsApp, Messenger, Slack, Skype та co на www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "Я додав {count} служб до Ферді! Завантажте безкоштовний додаток на WhatsApp, Messenger, Slack, Skype та co на www.getferdi.com",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos доступні для преміум-користувачів!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Не можливо підключитись до онлайн сервісів Ferdi",
-  "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "Ви не підключені до Інтернету.",
   "global.spellchecker.useDefault": "Використовувати системні параметри за змовчуванням ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Мова перевірки правопису",
-  "global.upgradeButton.upgradeToPro": "Підвищити до Fredi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "Ідентифікатор браузера",
   "import.headline": "Імпортувати ваші сервіси з Ferdi 4",
@@ -88,7 +52,6 @@
   "infobar.hide": "Приховати",
   "infobar.requiredRequestsFailed": "Не вдалося завантажити сервіси та інформацію користувача",
   "infobar.servicesUpdated": "Ваші сервіси було оновлено.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "Нове оновлення для Ferdi доступне.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Email адреса",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Автоматично приховувати меню",
   "menu.app.checkForUpdates": "Перевірити наявність оновлень",
   "menu.app.hide": "Приховати",
-  "menu.app.hideOthers": "Приховати інші",
-  "menu.app.quit": "Вийти",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Налаштування",
-  "menu.app.unhide": "Показати",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Редагувати",
-  "menu.edit.copy": "Копіювати",
-  "menu.edit.cut": "Вирізати",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Видалити",
   "menu.edit.emojiSymbols": "Емодзі та символи",
   "menu.edit.findInPage": "Знайти на сторінці",
-  "menu.edit.paste": "Вставити",
-  "menu.edit.pasteAndMatchStyle": "Вставити з дотриманням стилю",
-  "menu.edit.redo": "Повернути",
-  "menu.edit.selectAll": "Виділити все",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Мова",
   "menu.edit.startDictation": "Почати диктувати",
   "menu.edit.startSpeaking": "Почати говорити",
   "menu.edit.stopSpeaking": "Закінчити говорити",
-  "menu.edit.undo": "Відмінити",
+  "menu.edit.undo": "Undo",
   "menu.file": "Файл",
-  "menu.help": "Довідка",
+  "menu.help": "Help",
   "menu.help.changelog": "Журнал змін",
   "menu.help.debugInfo": "Копіювати інформацію для налагодження",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Інформація для відладки",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Докладніше",
   "menu.help.privacy": "Заява про конфіденційність",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "Вигляд",
   "menu.view.back": "Назад",
-  "menu.view.enterFullScreen": "Вікно на повний екран",
-  "menu.view.exitFullScreen": "Вийти з повного екрану",
   "menu.view.forward": "Вперед",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Перезавантажити Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Перезавантажити сервіс",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "Фактичний розмір",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "Переключити інструмент розробника",
-  "menu.view.toggleFullScreen": "Переключитися на повний екран",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Переключити інструменти розробника сервісу",
   "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
-  "menu.view.zoomIn": "Збільшити масштаб",
-  "menu.view.zoomOut": "Зменшити масштаб",
-  "menu.window": "Вікно",
-  "menu.window.close": "Закрити",
-  "menu.window.minimize": "Згорнути",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Workspaces",
   "menu.workspaces.addNewWorkspace": "Add New Workspace...",
   "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
@@ -194,11 +156,7 @@
   "password.noUser": "Не знайдено жодного користувача з цією email адресою",
   "password.submit.label": "Подати",
   "password.successInfo": "Будь ласка, перевірте ваш email",
-  "premiumFeature.button.upgradeAccount": "Преміум акаунт",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Перезавантажити {name}",
   "service.crashHandler.autoReload": "Спробую автоматично відновити {name} через {seconds} с",
   "service.crashHandler.headline": "О, ні!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "О, ні!",
   "service.errorHandler.message": "Помилка",
   "service.errorHandler.text": "{name} не завантажено",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Завантаження {service}",
   "services.getStarted": "Почати",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Ласкаво просимо в Ferdi",
   "settings.account.account.editButton": "Редагувати акаунт",
-  "settings.account.accountType.basic": "Базовий акаунт",
-  "settings.account.accountType.premium": "Преміум Акаунт Прихильника",
   "settings.account.accountUnavailable": "Обліковий запис недоступний",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Оновити профіль",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Інвойси",
   "settings.account.headlinePassword": "Змінити пароль",
   "settings.account.headlineProfile": "Оновити профіль",
-  "settings.account.headlineSubscription": "Ваша підписка",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Завантажити",
-  "settings.account.manageSubscription.label": "Керування вашою підпискою",
   "settings.account.successInfo": "Ваші зміни були збережені",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Спробуйте ще раз",
   "settings.account.tryReloadUserInfoRequest": "Спробуйте ще раз",
-  "settings.account.upgradeToPro.label": "Підвищити до Fredi Professional",
   "settings.account.userInfoRequestFailed": "Не вдалося завантажити інформацію користувача",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Увімкнути перевірку орфографії",
   "settings.app.form.enableSystemTray": "Показувати Ferdi у системному лотку",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Увімкнути універсальний темний режим",
   "settings.app.form.useTouchIdToUnlock": "Дозволити використання TouchID для розблокування Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Налаштування",
   "settings.app.headlineAdvanced": "Додаткові налаштування",
   "settings.app.headlineAppearance": "Вигляд",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Пароль",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Зміни потребують перезапуску",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Кеш",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Доступні сервіси",
   "settings.recipes.missingService": "Не знайшли сервісу?",
-  "settings.recipes.mostPopular": "Найбільш популярні",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Сервіс успішно додано",
   "settings.searchService": "Знайти сервіс",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Додати {name}",
   "settings.service.form.availableServices": "Доступні сервіси",
   "settings.service.form.customUrl": "Користувацький сервер",
-  "settings.service.form.customUrlPremiumInfo": "Щоб додати самостійно розміщені сервіси, вам потріьно мати Преміумним Акаунт Прихильника Ferdi.",
-  "settings.service.form.customUrlUpgradeAccount": "Оновити ваш обліковий запис",
   "settings.service.form.customUrlValidationError": "Не вдалось підтвердити власний {name} сервер.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Команда",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Компанія",
   "settings.user.form.accountType.individual": "Індивідуальний",
   "settings.user.form.accountType.label": "Тип акаунту",
@@ -516,29 +431,20 @@
   "signup.link.login": "У вас вже є обліковий запис, увійти?",
   "signup.password.label": "Пароль",
   "signup.submit.label": "Створити акаунт",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Відмінити",
-  "subscriptionPopup.buttonDone": "Готово",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Видалити сервіс",
   "tabs.item.disableAudio": "відключити звук",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Вимкнути сповіщення",
   "tabs.item.disableService": "Вимкнути сервіс",
   "tabs.item.edit": "Редагувати",
   "tabs.item.enableAudio": "Увімкнути звук",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Увімкнути сповіщення",
   "tabs.item.enableService": "Увімкнути сервіс",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Перезавантажити",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} не валідне",
   "validation.minLength": "Кількість символів в {field} повина бути не меньше {length} ",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "Немає доданих сервісів",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index 83fc02f45..c67e9a067 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Mất kết nối tới {name}.",
   "feature.announcements.changelog.headline": "Những thay đổi trong phiên bản {version}",
   "feature.debugger.title": "Gửi thông tin gỡ lỗi",
-  "feature.delayApp.headline": "Hãy trả phí để không phải chờ đợi",
-  "feature.delayApp.text": "Vui lòng đợi {seconds} giây.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Lấy mã kích hoạt",
-  "feature.delayApp.upgrade.actionShort": "Nâng cấp tài khoản",
   "feature.nightlyBuilds.activate": "Kích hoạt",
   "feature.nightlyBuilds.cancel": "Hủy",
   "feature.nightlyBuilds.info": "Các bản Nightly là các phiên bản Ferdi mang tính thử nghiệm có thể chứa các tính năng chưa được hoàn thiện. Các bản Nightly chủ yếu được các nhà phát triển sử dụng để kiểm tra các tính năng mới được phát triển của họ và cách chúng sẽ hoạt động trong bản dựng cuối cùng. Nếu bạn không biết mình đang làm gì, chúng tôi khuyên bạn không nên kích hoạt các bản dựng hàng đêm.",
   "feature.nightlyBuilds.title": "Phiên bản Nightly",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Chính sách",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Tìm kiếm...",
   "feature.quickSwitch.title": "Chuyển đổi nhanh",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Gửi dưới dạng E-mail",
   "feature.shareFranz.action.facebook": "Chia sẻ lên Facebook",
   "feature.shareFranz.action.twitter": "Chia sẻ lên Twitter",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Nâng cấp Tài khoản",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Không thể kết nối đến máy chủ trực tuyến của Ferdi",
-  "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.spellchecker.useDefault": "Dùng mặc định hệ thống ({default})",
   "global.spellchecking.autodetect": "Tự động phát hiện ngôn ngữ",
   "global.spellchecking.autodetect.short": "Tự động",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Import your Ferdi 4 services",
@@ -88,7 +52,6 @@
   "infobar.hide": "Ẩn",
   "infobar.requiredRequestsFailed": "Could not load services and user information",
   "infobar.servicesUpdated": "Your services have been updated.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "A new update for Ferdi is available.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Địa chỉ E-mail",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Tự động ẩn thanh Menu",
   "menu.app.checkForUpdates": "Kiểm tra cập nhật",
   "menu.app.hide": "Ẩn",
-  "menu.app.hideOthers": "Ẩn các mục khác",
-  "menu.app.quit": "Thoát",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "Các thiết lập",
-  "menu.app.unhide": "Bỏ ẩn",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "Chỉnh sửa",
-  "menu.edit.copy": "Sao chép",
-  "menu.edit.cut": "Cắt",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "Xóa",
   "menu.edit.emojiSymbols": "Biểu tượng cảm xúc",
   "menu.edit.findInPage": "Tìm trong trang",
-  "menu.edit.paste": "Dán",
-  "menu.edit.pasteAndMatchStyle": "Dán và Khớp Kiểu",
-  "menu.edit.redo": "Làm lại",
-  "menu.edit.selectAll": "Chọn tất cả",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "Nói",
   "menu.edit.startDictation": "Bắt đầu đăng kí",
   "menu.edit.startSpeaking": "Bắt đầu nói",
   "menu.edit.stopSpeaking": "Dừng Nói",
-  "menu.edit.undo": "Hoàn tác",
+  "menu.edit.undo": "Undo",
   "menu.file": "Tập tin",
-  "menu.help": "Hỗ trợ",
+  "menu.help": "Help",
   "menu.help.changelog": "Nhật ký thay đổi",
   "menu.help.debugInfo": "Sao chép thông tin gỡ lỗi",
   "menu.help.debugInfoCopiedBody": "Thông tin sản phẩm đã được sao chép vào bộ nhớ tạm của bạn.",
   "menu.help.debugInfoCopiedHeadline": "Thông tin gỡ lỗi",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Tìm Hiểu Thêm",
   "menu.help.privacy": "Privacy Statement",
   "menu.help.publishDebugInfo": "Gửi thông tin gỡ lỗi",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Mở danh sách cần làm",
   "menu.view": "View",
   "menu.view.back": "Quay lại",
-  "menu.view.enterFullScreen": "Xem toàn màn hình",
-  "menu.view.exitFullScreen": "Thoát toàn màn hình",
   "menu.view.forward": "Tới trước",
   "menu.view.lockFerdi": "Khoá ứng dụng",
   "menu.view.openQuickSwitch": "Mở chuyển nhanh",
-  "menu.view.reloadFranz": "Làm mới",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Tải lại dịch vụ",
   "menu.view.reloadTodos": "Làm mới lại ds cần làm",
-  "menu.view.resetZoom": "Kích thước thật",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Chuyển sang Chế độ nền tối",
   "menu.view.toggleDevTools": "Chuyển sang Công cụ dành cho nhà phát triển",
-  "menu.view.toggleFullScreen": "Chuyển sang Chế độ toàn màn hình",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
   "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
-  "menu.view.zoomIn": "Phóng lớn",
-  "menu.view.zoomOut": "Thu nhỏ",
-  "menu.window": "Cửa sổ",
-  "menu.window.close": "Đóng",
-  "menu.window.minimize": "Thu nhỏ",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "Không gian làm việc",
   "menu.workspaces.addNewWorkspace": "Thêm mới Không gian làm việc...",
   "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
@@ -194,11 +156,7 @@
   "password.noUser": "Không tìm thấy người dùng được đăng ký với địa chỉ e-mail này",
   "password.submit.label": "Gửi",
   "password.successInfo": "Vui lòng kiểm tra hộp thư của bạn",
-  "premiumFeature.button.upgradeAccount": "Nâng cấp tài khoản",
   "pricing.features.accountSync": "Đồng bộ hóa Tài khoản",
-  "pricing.features.adFree": "Luôn miễn phí",
-  "pricing.features.appDelays": "Không có màn hình chờ",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Thêm Trang web tùy chỉnh",
   "pricing.features.desktopNotifications": "Thông báo",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Thêm dịch vụ không giới hạn",
-  "pricing.features.upToSixServices": "Lên đến 6 dịch vụ",
-  "pricing.features.upToThreeServices": "Lên đến 3 dịch vụ",
   "pricing.features.workspaces": "Không gian làm việc",
-  "pricing.plan.free": "Ferdi Miễn phí",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Cá nhân",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Ồ không!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Ồ không!",
   "service.errorHandler.message": "Lỗi",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Nâng cấp Tài khoản",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "Bạn đã đạt đến giới hạn dịch vụ.",
-  "service.restrictedHandler.serviceLimit.text": "Vui lòng nâng cấp tài khoản để sử dụng nhiều hơn {count} dịch vụ.",
   "service.webviewLoader.loading": "Đang tải {service}",
   "services.getStarted": "Bắt đầu",
   "services.login": "Vui lòng đăng nhập để sử dụng Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Sử dụng Ferdi không cần Đăng nhập Tài khoản",
   "services.welcome": "Chào mừng bạn đến với Ferdi",
   "settings.account.account.editButton": "Chỉnh sửa Tài khoản",
-  "settings.account.accountType.basic": "Basic Account",
-  "settings.account.accountType.premium": "Premium Supporter Account",
   "settings.account.accountUnavailable": "Tài khoản không hợp lệ",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Cập nhật Hồ sơ",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Thanh toán",
   "settings.account.headlinePassword": "Thay đổi Mật khẩu",
   "settings.account.headlineProfile": "Cập nhật Hồ sơ",
-  "settings.account.headlineSubscription": "Đăng ký của bạn",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Tải về",
-  "settings.account.manageSubscription.label": "Manage your subscription",
   "settings.account.successInfo": "Mọi thay đổi đã được lưu lại",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Thử lại",
   "settings.account.tryReloadUserInfoRequest": "Thử lại",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Không thể tải được thông tin người dùng",
   "settings.account.yourLicense": "Giấy phép Ferdi của bạn",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Cho phép Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Kích thước icon Dịch vụ",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "Các thiết lập",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Giao diện",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Mật khẩu",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Mở thư mục",
   "settings.recipes.headline": "Available services",
   "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.mostPopular": "Phổ biến nhất",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
   "settings.searchService": "Tìm kiếm dịch vụ",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Add {name}",
   "settings.service.form.availableServices": "Available services",
   "settings.service.form.customUrl": "Custom server",
-  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Nâng cấp Tài khoản",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
   "settings.user.form.accountType.label": "Loại tài khoản",
@@ -516,29 +431,20 @@
   "signup.link.login": "Already have an account, sign in?",
   "signup.password.label": "Mật khẩu",
   "signup.submit.label": "Tạo Tài khoản",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Chọn gói",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "trên tháng",
-  "subscription.interval.perMonthPerUser": "trên tháng & người dùng",
-  "subscription.planItem.upgradeAccount": "Nâng cấp Tài khoản",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Hủy",
-  "subscriptionPopup.buttonDone": "Xong",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Xóa dịch vụ",
   "tabs.item.disableAudio": "Disable audio",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
   "tabs.item.edit": "Chỉnh sửa",
   "tabs.item.enableAudio": "Cho phép âm thanh",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Tải lại",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} is not valid",
   "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Không gian làm việc",
   "workspaceDrawer.item.contextMenuEdit": "chỉnh sửa",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 70a18936a..057d86253 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -3,29 +3,6 @@
   "app.errorHandler.headline": "Something went wrong",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
@@ -36,7 +13,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Send as email",
   "feature.shareFranz.action.facebook": "Share on Facebook",
   "feature.shareFranz.action.twitter": "Share on Twitter",
@@ -44,16 +20,6 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
@@ -61,7 +27,6 @@
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "import.headline": "Import your Ferdi 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
   "import.skip.label": "I want to add services manually",
@@ -72,7 +37,6 @@
   "infobar.buttonReloadServices": "Reload services",
   "infobar.requiredRequestsFailed": "Could not load services and user information",
   "infobar.servicesUpdated": "Your services have been updated.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "A new update for Ferdi is available.",
   "invite.email.label": "Email address",
   "invite.headline.friends": "Invite 3 of your friends or colleagues",
@@ -142,12 +106,10 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "View",
   "menu.view.back": "Back",
-  "menu.view.enterFullScreen": "Enter Full Screen",
-  "menu.view.exitFullScreen": "Exit Full Screen",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "Reload Service",
   "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDevTools": "Toggle Developer Tools",
@@ -187,27 +149,6 @@
   "pricing.features.upToSixServices": "Add up to 6 services",
   "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -219,15 +160,10 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Welcome to Ferdi",
   "settings.account.account.editButton": "Edit account",
@@ -245,18 +181,9 @@
   "settings.account.headlineInvoices": "Invoices",
   "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Update profile",
-  "settings.account.headlineSubscription": "Your subscription",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.manageSubscription.label": "Manage your subscription",
   "settings.account.successInfo": "Your changes have been saved",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Try again",
   "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Could not load user information",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -276,7 +203,6 @@
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -309,13 +235,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
   "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
   "settings.app.subheadlineCache": "Cache",
@@ -344,7 +270,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Available services",
   "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
   "settings.searchService": "Search service",
@@ -457,19 +382,6 @@
   "signup.link.login": "Already have an account, sign in?",
   "signup.password.label": "Password",
   "signup.submit.label": "Create account",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Cancel",
-  "subscriptionPopup.buttonDone": "Done",
   "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
@@ -497,7 +409,6 @@
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
   "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
   "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
diff --git a/src/i18n/locales/zh-HANS.json b/src/i18n/locales/zh-HANS.json
index 3d329e18b..b7de29eb5 100644
--- a/src/i18n/locales/zh-HANS.json
+++ b/src/i18n/locales/zh-HANS.json
@@ -5,30 +5,6 @@
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "在{version}版本中的更改",
-  "feature.delayApp.headline": "升级您的Ferdi订阅计划以跳过等待",
-  "feature.delayApp.text": "Ferdi会在 {seconds} 秒后继续。",
-  "feature.delayApp.trial.action": "是的，我想开始14天的Ferdi 专业版免费试用",
-  "feature.delayApp.trial.actionShort": "激活免费的Ferdi 专业版试用",
-  "feature.delayApp.trial.headline": "免费获得Ferdi 专业版 14天试用版，无需等待",
-  "feature.delayApp.upgrade.action": "更新Ferdi",
-  "feature.delayApp.upgrade.actionShort": "升级账户",
-  "feature.planSelection.cta.ctaDowngradeFree": "降级到Free订阅计划",
-  "feature.planSelection.cta.stayOnFree": "保持Free订阅计划",
-  "feature.planSelection.cta.trial": "开始我的14天免费试用",
-  "feature.planSelection.cta.upgradePersonal": "选择Personal订阅计划",
-  "feature.planSelection.cta.upgradePro": "选择Professional订阅计划",
-  "feature.planSelection.free.text": "基本功能",
-  "feature.planSelection.fullFeatureList": "完整的对比所有订阅计划",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "降级到Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "选择Personal订阅计划",
-  "feature.planSelection.fullscreen.dialog.message": "您将降级到我们的免费帐户。您确定吗？单击此处每月只需{currency} {price}即可获得更多服务和功能。",
-  "feature.planSelection.fullscreen.dialog.title": "降级您的Ferdi订阅计划",
-  "feature.planSelection.fullscreen.subheadline": "是时候做出选择了。 Ferdi在我们的Personal和Professional订阅计划上表现最佳。请看看并为做出您的最佳选择。",
-  "feature.planSelection.fullscreen.welcome": "你已经准备好了吗, {name}?",
-  "feature.planSelection.personal.text": "更多的服务，无需等待 - 个人使用的理想选择。",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "所有价格均基于年度付款",
-  "feature.planSelection.pro.text": "为您和您的团队提供无限的服务和专业功能。",
-  "feature.serviceLimit.limitReached": "您已在计划中包含的{limit}个服务中添加了{amount}个。请升级您的帐户以添加更多服务。",
   "feature.shareFranz.action.email": "使用电子邮件发送",
   "feature.shareFranz.action.facebook": "在Facebook上分享",
   "feature.shareFranz.action.twitter": "在Twitter上分享",
@@ -36,16 +12,6 @@
   "feature.shareFranz.shareText.email": "我们在Ferdi里添加了 {count} 服务！请前往 www.getferdi.com 获得支持WhatsApp，Messenger，Slack，Skype的免费应用程序. ",
   "feature.shareFranz.shareText.twitter": "我已经为Ferdi添加了{count}个服务！在www.getferdi.com/cc @FerdiMessenger上获得适用于WhatsApp，Messenger，Slack，Skype和co的免费应用程序",
   "feature.shareFranz.text": "告诉你的朋友和同事Ferdi有多棒并且帮助我们传播Ferdi。",
-  "feature.todos.premium.info": "Ferdi Todos现在对高级用户可用！",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "升级帐户",
-  "feature.trialStatusBar.cta": "立即升级",
-  "feature.trialStatusBar.expired": "您的Ferdi免费订阅计划{plan}已过期，请升级您的帐户。",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "降级free订阅计划",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "选择Personal订阅计划",
-  "feature.trialStatusBar.fullscreen.dialog.message": "您将降级到我们的免费帐户。您确定吗？单击此处每月只需{currency} {price}即可获得更多服务和功能。",
-  "feature.trialStatusBar.fullscreen.dialog.title": "降级您的Ferdi订阅计划",
-  "feature.trialStatusBar.restTime": "您的 Ferdi 免费 {plan} 试用期在 {时间} 结束。",
   "global.api.unhealthy": "无法连接Ferdi在线服务",
   "global.franzProRequired": "需要 Ferdi 专业版。",
   "global.notConnectedToTheInternet": "没有网络服务",
@@ -53,7 +19,6 @@
   "global.spellchecking.autodetect": "自动检测语言",
   "global.spellchecking.autodetect.short": "自动",
   "global.spellchecking.language": "语言拼写检查",
-  "global.upgradeButton.upgradeToPro": "升级到 Ferdi 专业版。",
   "import.headline": "导入自定义Ferdi 4服务",
   "import.notSupportedHeadline": "Ferdi 5 目前不支持此项服务",
   "import.skip.label": "手动添加服务",
@@ -63,7 +28,6 @@
   "infobar.buttonReloadServices": "重新加载服务",
   "infobar.requiredRequestsFailed": "无法加载服务列表和用户信息",
   "infobar.servicesUpdated": "服务已更新",
-  "infobar.trialActivated": "您的试用已成功激活。祝您愉快！",
   "infobar.updateAvailable": "Ferdi更新可用.",
   "invite.email.label": "电子邮件地址",
   "invite.headline.friends": "邀请3个好友或同事",
@@ -122,9 +86,7 @@
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "视图",
-  "menu.view.enterFullScreen": "全屏",
-  "menu.view.exitFullScreen": "退出全屏",
-  "menu.view.reloadFranz": "重启Ferdi",
+  "menu.view.reloadFerdi": "重启Ferdi",
   "menu.view.reloadService": "重启服务",
   "menu.view.reloadTodos": "Reload ToDos",
   "menu.view.resetZoom": "实际尺寸",
@@ -166,27 +128,6 @@
   "pricing.features.upToSixServices": "Add up to 6 services",
   "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "工作组",
-  "pricing.plan.free": "免费",
-  "pricing.plan.legacy": "Premium",
-  "pricing.plan.personal": "Personal",
-  "pricing.plan.personal-monthly": "Personal Monthly",
-  "pricing.plan.personal-yearly": "Personal Yearly",
-  "pricing.plan.pro": "Professional",
-  "pricing.plan.pro-monthly": "Professional Monthly",
-  "pricing.plan.pro-yearly": "Professional Yearly",
-  "pricing.trial.cta.accept": "Start my 14-day Ferdi Professional Trial ",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "重新载入",
   "service.crashHandler.autoReload": "在{seconds}秒内尝试自动恢复{name}",
   "service.crashHandler.headline": "啊，糟糕！",
@@ -198,11 +139,6 @@
   "service.errorHandler.headline": "啊，糟糕！",
   "service.errorHandler.message": "错误",
   "service.errorHandler.text": "{name} 没有办法加载",
-  "service.restrictedHandler.action": "升级帐户",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "正在加载,请稍后",
   "services.getStarted": "开始",
   "services.welcome": "欢迎使用 Ferdi",
@@ -219,18 +155,9 @@
   "settings.account.headlineInvoices": "发票",
   "settings.account.headlinePassword": "修改密码",
   "settings.account.headlineProfile": "更新个人资料",
-  "settings.account.headlineSubscription": "您的订阅",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "下载",
-  "settings.account.manageSubscription.label": "管理您的订阅",
   "settings.account.successInfo": "已保存您的设置",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "重试",
   "settings.account.tryReloadUserInfoRequest": "重试",
-  "settings.account.upgradeToPro.label": "升级到 Ferdi 专业版。",
   "settings.account.userInfoRequestFailed": "无法加载用户信息",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.buttonClearAllCache": "清除缓存",
@@ -284,7 +211,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "可用的服务",
   "settings.recipes.missingService": "服务丢失？",
-  "settings.recipes.mostPopular": "最受欢迎的",
   "settings.recipes.nothingFound": "抱歉，没有找到相关服务",
   "settings.recipes.servicesSuccessfulAddedInfo": "服务添加成功",
   "settings.searchService": "搜索服务",
@@ -391,19 +317,6 @@
   "signup.link.login": "已有账户？登陆",
   "signup.password.label": "密码:",
   "signup.submit.label": "创建账户",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "升级帐户",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "取消",
-  "subscriptionPopup.buttonDone": "完成",
   "tabs.item.deleteService": "删除服务",
   "tabs.item.disableAudio": "禁止声音",
   "tabs.item.disableNotifications": "停止通知",
@@ -431,7 +344,6 @@
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
   "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
   "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index 637d7c9de..97b2e155a 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Ferdi 有了更新 {version}",
   "feature.debugger.title": "發布除錯訊息",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "升級帳戶",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "取消",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "隱私權政策",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "搜尋...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "送作為電子郵件",
   "feature.shareFranz.action.facebook": "在 Facebook 上分享",
   "feature.shareFranz.action.twitter": "在 Twitter 上分享",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "升级账户",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "無法連接到Ferdi網路服務",
-  "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "您未連上網際網路",
   "global.spellchecker.useDefault": "使用系統預設值({default})",
   "global.spellchecking.autodetect": "自動檢測語言",
   "global.spellchecking.autodetect.short": "自動",
   "global.spellchecking.language": "拼字檢查語言",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "匯入您的 Ferdi 4 服務",
@@ -88,7 +52,6 @@
   "infobar.hide": "隱藏",
   "infobar.requiredRequestsFailed": "無法載入服務與帳戶資訊",
   "infobar.servicesUpdated": "您的服務已更新",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "有新的更新可安裝",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "電子郵件信箱",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "自動隱藏功能表列",
   "menu.app.checkForUpdates": "檢查更新",
   "menu.app.hide": "隱藏",
-  "menu.app.hideOthers": "隱藏其他視窗",
-  "menu.app.quit": "退出",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "設置",
-  "menu.app.unhide": "顯示",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "編輯",
-  "menu.edit.copy": "複製",
-  "menu.edit.cut": "剪下",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "刪除",
   "menu.edit.emojiSymbols": "Emoji & Symbols",
   "menu.edit.findInPage": "Find in Page",
-  "menu.edit.paste": "貼上",
-  "menu.edit.pasteAndMatchStyle": "貼上並比對樣式",
-  "menu.edit.redo": "重做",
-  "menu.edit.selectAll": "選取全部",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "語音",
   "menu.edit.startDictation": "開始聽寫",
   "menu.edit.startSpeaking": "開始朗讀",
   "menu.edit.stopSpeaking": "停止朗讀",
-  "menu.edit.undo": "復原",
+  "menu.edit.undo": "Undo",
   "menu.file": "檔案",
-  "menu.help": "說明",
+  "menu.help": "Help",
   "menu.help.changelog": "更新日誌",
   "menu.help.debugInfo": "複製除錯資訊",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "了解更多",
   "menu.help.privacy": "隱私聲明",
   "menu.help.publishDebugInfo": "Publish Debug Information",
@@ -163,25 +127,23 @@
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "檢視",
   "menu.view.back": "返回",
-  "menu.view.enterFullScreen": "進入全螢幕",
-  "menu.view.exitFullScreen": "離開全螢幕",
   "menu.view.forward": "前進",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "重新載入",
   "menu.view.reloadTodos": "Reload ToDos",
-  "menu.view.resetZoom": "實際大小",
+  "menu.view.resetZoom": "Actual Size",
   "menu.view.toggleDarkMode": "Toggle Dark Mode",
   "menu.view.toggleDevTools": "切換開發人員工具",
-  "menu.view.toggleFullScreen": "切換全螢幕",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
   "menu.view.toggleServiceDevTools": "切換開發人員服務工具",
   "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
-  "menu.view.zoomIn": "放大",
-  "menu.view.zoomOut": "縮小",
-  "menu.window": "窗口",
-  "menu.window.close": "關閉",
-  "menu.window.minimize": "最小化",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
   "menu.workspaces": "工作區",
   "menu.workspaces.addNewWorkspace": "新增工作區…",
   "menu.workspaces.closeWorkspaceDrawer": "關閉工作區",
@@ -194,11 +156,7 @@
   "password.noUser": "此電子郵件帳戶不存在",
   "password.submit.label": "送出",
   "password.successInfo": "請重新確認您的電子郵件信箱",
-  "premiumFeature.button.upgradeAccount": "升級帳戶",
   "pricing.features.accountSync": "帳號同步",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "添加自訂網站",
   "pricing.features.desktopNotifications": "桌面通知",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "工作區",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "唉呀 糟糕!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "唉呀 糟糕!",
   "service.errorHandler.message": "錯誤",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "升级账户",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "正在載入 {service}",
   "services.getStarted": "開始使用",
   "services.login": "登入至 Ferdi",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "歡迎使用 Ferdi",
   "settings.account.account.editButton": "更改帳戶資訊",
-  "settings.account.accountType.basic": "基本帳戶",
-  "settings.account.accountType.premium": "Premium Supporter Account",
   "settings.account.accountUnavailable": "帳號無法使用",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "更新帳戶資訊",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "发票",
   "settings.account.headlinePassword": "更改密碼",
   "settings.account.headlineProfile": "更新帳戶資訊",
-  "settings.account.headlineSubscription": "您的訂閱",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "下載",
-  "settings.account.manageSubscription.label": "管理訂閱",
   "settings.account.successInfo": "您的更改已經儲存",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "再試一次",
   "settings.account.tryReloadUserInfoRequest": "再試一次",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "無法載入帳戶資訊",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "在系統匣上顯示",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "服務圖示大小",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "設置",
   "settings.app.headlineAdvanced": "高級設置",
   "settings.app.headlineAppearance": "外觀",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "密碼",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "更改需要重新開機",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "開啟資料夾",
   "settings.recipes.headline": "可用服務",
   "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.mostPopular": "熱門",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "新增服務成功",
   "settings.searchService": "Search service",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "新增 {name}",
   "settings.service.form.availableServices": "可用服務",
   "settings.service.form.customUrl": "Custom server",
-  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "升級帳戶",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "團隊",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "公司",
   "settings.user.form.accountType.individual": "個人",
   "settings.user.form.accountType.label": "帳戶類型",
@@ -516,29 +431,20 @@
   "signup.link.login": "您已有一個帳戶，請問是否要登入？",
   "signup.password.label": "密碼",
   "signup.submit.label": "建立帳戶",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "顯示所有選項",
-  "subscription.cta.choosePlan": "選擇你的計劃",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "每月",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "升级账户",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "取消",
-  "subscriptionPopup.buttonDone": "完成",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "刪除",
   "tabs.item.disableAudio": "停用音效",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "停用通知",
   "tabs.item.disableService": "停用服務",
   "tabs.item.edit": "編輯",
   "tabs.item.enableAudio": "啟用音效",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "啟用通知",
   "tabs.item.enableService": "啟用服務",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "重新加載",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} is not valid",
   "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "工作區",
   "workspaceDrawer.item.contextMenuEdit": "編輯",
   "workspaceDrawer.item.noServicesAddedYet": "未有添加服務",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "切換到"
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index f4bf16afb..d2b86d5ef 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -2,14 +2,6 @@
   "app.errorHandler.action": "重新整理",
   "app.errorHandler.headline": "糟糕！有些地方出問題了。",
   "feature.announcements.changelog.headline": "透過 email 傳送",
-  "feature.delayApp.headline": "請購買 Ferdi 支援授權以跳過等候",
-  "feature.delayApp.text": "Ferdi 會在 {seconds} 秒後繼續。",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "取得 Ferdi 支援授權",
-  "feature.delayApp.upgrade.actionShort": "升級帳號",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "以電子郵件傳送",
   "feature.shareFranz.action.facebook": "透過 Facebook 分享",
   "feature.shareFranz.action.twitter": "在 Twitter 上分享",
@@ -17,9 +9,6 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "告訴所有朋友和同事Ferdi有多棒！",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
   "global.api.unhealthy": "無法連線至 Ferdi 的伺服器",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "你沒有連上網路。",
@@ -27,7 +16,6 @@
   "global.spellchecking.autodetect": "自動偵測語言",
   "global.spellchecking.autodetect.short": "自動的",
   "global.spellchecking.language": "拼字檢查語言",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "import.headline": "匯入 Ferdi 4 的服務",
   "import.notSupportedHeadline": "Ferdi 5 尚未支援此服務",
   "import.skip.label": "手動添加服務",
@@ -37,7 +25,6 @@
   "infobar.buttonReloadServices": "重新載入服務",
   "infobar.requiredRequestsFailed": "無法載入服務和使用者資訊",
   "infobar.servicesUpdated": "已經更新你的服務",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "Ferdi 有可用的更新",
   "invite.email.label": "電子郵件地址",
   "invite.headline.friends": "邀請 3 位朋友或同事",
@@ -95,9 +82,7 @@
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "檢視",
-  "menu.view.enterFullScreen": "進入全螢幕模式",
-  "menu.view.exitFullScreen": "離開全螢幕模式",
-  "menu.view.reloadFranz": "重新載入 Ferdi",
+  "menu.view.reloadFerdi": "重新載入 Ferdi",
   "menu.view.reloadService": "重新載入服務",
   "menu.view.resetZoom": "實際大小",
   "menu.view.toggleDevTools": "切換開發者工具",
@@ -132,23 +117,6 @@
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
   "pricing.features.workspaces": "工作區",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline": "Ferdi Professional",
-  "pricing.trial.subheadline": "Your personal welcome offer:",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
   "service.crashHandler.action": "重新載入{name}",
   "service.crashHandler.autoReload": "嘗試在{seconds}秒內自動恢復{name}",
   "service.crashHandler.headline": "噢不!",
@@ -160,11 +128,6 @@
   "service.errorHandler.headline": "噢不！",
   "service.errorHandler.message": "錯誤",
   "service.errorHandler.text": "{name} 載入失敗。",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "正在載入",
   "services.getStarted": "開始",
   "services.welcome": "歡迎使用 Ferdi",
@@ -181,18 +144,9 @@
   "settings.account.headlineInvoices": "帳單",
   "settings.account.headlinePassword": "變更密碼",
   "settings.account.headlineProfile": "更新簡介",
-  "settings.account.headlineSubscription": "您的訂閱",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "下載",
-  "settings.account.manageSubscription.label": "管理您的訂閱",
   "settings.account.successInfo": "您的更變已經被儲存",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "再試一次",
   "settings.account.tryReloadUserInfoRequest": "再試一次",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "無法載入使用者資訊。",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.buttonClearAllCache": "清除快取",
@@ -247,7 +201,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "可使用的服務",
   "settings.recipes.missingService": "缺少服務?",
-  "settings.recipes.mostPopular": "最熱門",
   "settings.recipes.nothingFound": "很抱歉，沒有與您的搜尋字詞符合的服務",
   "settings.recipes.servicesSuccessfulAddedInfo": "服務已成功新增。",
   "settings.searchService": "尋找服務",
@@ -349,14 +302,6 @@
   "signup.link.login": "已經有一個帳戶，登入？",
   "signup.password.label": "密碼",
   "signup.submit.label": "建立帳號",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "取消",
-  "subscriptionPopup.buttonDone": "完成",
   "tabs.item.deleteService": "刪除服務",
   "tabs.item.disableAudio": "停用音訊",
   "tabs.item.disableNotifications": "停用通知",
@@ -379,7 +324,6 @@
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
   "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
   "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index c9a54b464..590d5093e 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -5,40 +5,17 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "服务器：",
   "changeserver.submit": "Submit",
-  "changeserver.urlError": "Enter a valid URL",
-  "changeserver.warning": "Extra settings offered by Ferdi will not be saved",
+  "changeserver.urlError": "输入有效的URL",
+  "changeserver.warning": "Ferdi提供的额外设置将不会被保存",
   "connectionLostBanner.cta": "重新加载服务",
-  "connectionLostBanner.informationLink": "What happened?",
-  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
+  "connectionLostBanner.informationLink": "发生了什么？",
+  "connectionLostBanner.message": "哦不！Ferdi失去了与 {name} 的连接。",
   "feature.announcements.changelog.headline": "Ferdi的变化",
   "feature.debugger.title": "发布调试信息",
-  "feature.delayApp.headline": "请购买Ferdi 支持者许可证来跳过等待",
-  "feature.delayApp.text": "Ferdi将在 {seconds} 秒后继续。",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "获得Ferdi 支持者许可证",
-  "feature.delayApp.upgrade.actionShort": "升级账户",
-  "feature.nightlyBuilds.activate": "Activate",
+  "feature.nightlyBuilds.activate": "激活",
   "feature.nightlyBuilds.cancel": "Cancel",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "发布调试信息时出错。请稍后再试或查看控制台以获取更多信息。",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "隐私权政策",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "搜索...",
   "feature.quickSwitch.title": "快速切换",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "以邮件形式发送",
   "feature.shareFranz.action.facebook": "在 Facebook 上分享",
   "feature.shareFranz.action.twitter": "在Twitter上分享",
@@ -57,24 +33,12 @@
   "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
-  "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
-  "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.franzProRequired": "需要Ferdi 专业版",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Import your Ferdi 4 services",
@@ -88,7 +52,6 @@
   "infobar.hide": "隐藏",
   "infobar.requiredRequestsFailed": "Could not load services and user information",
   "infobar.servicesUpdated": "Your services have been updated.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "A new update for Ferdi is available.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Email address",
@@ -124,31 +87,32 @@
   "menu.app.autohideMenuBar": "Auto-hide menu bar",
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "隐藏",
-  "menu.app.hideOthers": "隐藏其它",
-  "menu.app.quit": "退出",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
   "menu.app.settings": "设置",
-  "menu.app.unhide": "取消隐藏",
+  "menu.app.unhide": "Unhide",
   "menu.edit": "编辑",
-  "menu.edit.copy": "复制",
-  "menu.edit.cut": "剪切",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
   "menu.edit.delete": "删除",
   "menu.edit.emojiSymbols": "Emoji 和符号",
   "menu.edit.findInPage": "页内搜索",
-  "menu.edit.paste": "粘贴",
-  "menu.edit.pasteAndMatchStyle": "粘贴和匹配样式",
-  "menu.edit.redo": "重做",
-  "menu.edit.selectAll": "选择所有",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
   "menu.edit.speech": "语音",
   "menu.edit.startDictation": "Start Dictation",
   "menu.edit.startSpeaking": "开始说话",
   "menu.edit.stopSpeaking": "停止说话",
-  "menu.edit.undo": "撤销",
+  "menu.edit.undo": "Undo",
   "menu.file": "文件",
-  "menu.help": "帮助",
+  "menu.help": "Help",
   "menu.help.changelog": "更新日志",
   "menu.help.debugInfo": "复制调试信息",
   "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
   "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.importExportData": "Import/Export Configuration Data",
   "menu.help.learnMore": "Learn More",
   "menu.help.privacy": "Privacy Statement",
   "menu.help.publishDebugInfo": "发布调试信息",
@@ -163,12 +127,10 @@
   "menu.todos.enableTodos": "启用待办事项",
   "menu.view": "查看",
   "menu.view.back": "返回",
-  "menu.view.enterFullScreen": "进入全屏",
-  "menu.view.exitFullScreen": "退出全屏",
   "menu.view.forward": "Forward",
   "menu.view.lockFerdi": "Lock Ferdi",
   "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFranz": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Reload Ferdi",
   "menu.view.reloadService": "重新加载服务",
   "menu.view.reloadTodos": "Reload ToDos",
   "menu.view.resetZoom": "Actual Size",
@@ -194,11 +156,7 @@
   "password.noUser": "No user with that email address was found",
   "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
-  "premiumFeature.button.upgradeAccount": "升级账户",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +166,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -243,20 +178,13 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} has failed to load.",
-  "service.restrictedHandler.action": "Upgrade Account",
-  "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required",
-  "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
-  "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
-  "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Welcome to Ferdi",
   "settings.account.account.editButton": "Edit account",
-  "settings.account.accountType.basic": "Basic Account",
-  "settings.account.accountType.premium": "Premium Supporter Account",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
@@ -269,18 +197,9 @@
   "settings.account.headlineInvoices": "Invoices",
   "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Update profile",
-  "settings.account.headlineSubscription": "Your subscription",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.manageSubscription.label": "Manage your subscription",
   "settings.account.successInfo": "Your changes have been saved",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Try again",
   "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Could not load user information",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -308,7 +227,6 @@
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernate": "Enable service hibernation",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
@@ -337,6 +255,7 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use vertical style",
+  "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headline": "设置",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -347,13 +266,13 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
@@ -381,7 +300,6 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Available services",
   "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
   "settings.searchService": "Search service",
@@ -391,8 +309,6 @@
   "settings.service.form.addServiceHeadline": "Add {name}",
   "settings.service.form.availableServices": "Available services",
   "settings.service.form.customUrl": "Custom server",
-  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -462,11 +378,10 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
   "settings.user.form.accountType.label": "Account type",
@@ -516,29 +431,20 @@
   "signup.link.login": "Already have an account, sign in?",
   "signup.password.label": "Password",
   "signup.submit.label": "Create account",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Cancel",
-  "subscriptionPopup.buttonDone": "Done",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Disable audio",
+  "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
   "tabs.item.edit": "编辑",
   "tabs.item.enableAudio": "Enable audio",
+  "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "重新加载",
+  "tabs.item.wakeUpService": "Wake up service",
   "validation.email": "{field} is not valid",
   "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "At least one is required",
@@ -556,9 +462,6 @@
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/messages/src/components/TrialActivationInfoBar.json b/src/i18n/messages/src/components/TrialActivationInfoBar.json
deleted file mode 100644
index 65dd964a6..000000000
--- a/src/i18n/messages/src/components/TrialActivationInfoBar.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "infobar.trialActivated",
-    "defaultMessage": "!!!Your trial was successfully activated. Happy messaging!",
-    "file": "src/components/TrialActivationInfoBar.js",
-    "start": {
-      "line": 11,
-      "column": 11
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Pricing.json b/src/i18n/messages/src/components/auth/Pricing.json
deleted file mode 100644
index b5b7d72a8..000000000
--- a/src/i18n/messages/src/components/auth/Pricing.json
+++ /dev/null
@@ -1,171 +0,0 @@
-[
-  {
-    "id": "pricing.trial.headline.pro",
-    "defaultMessage": "!!!Hi {name}, welcome to Franz",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 14,
-      "column": 12
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.intro.specialTreat",
-    "defaultMessage": "!!!We have a special treat for you.",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 18,
-      "column": 16
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.intro.tryPro",
-    "defaultMessage": "!!!Enjoy the full Franz Professional experience completely free for 14 days.",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 22,
-      "column": 10
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.intro.happyMessaging",
-    "defaultMessage": "!!!Happy messaging,",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 26,
-      "column": 18
-    },
-    "end": {
-      "line": 29,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.headline",
-    "defaultMessage": "!!!No strings attached",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 30,
-      "column": 29
-    },
-    "end": {
-      "line": 33,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.noCreditCard",
-    "defaultMessage": "!!!No credit card required",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 34,
-      "column": 16
-    },
-    "end": {
-      "line": 37,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.automaticTrialEnd",
-    "defaultMessage": "!!!Your free trial ends automatically after 14 days",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 38,
-      "column": 21
-    },
-    "end": {
-      "line": 41,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.trialWorth",
-    "defaultMessage": "!!!Free trial (normally {currency}{price} per month)",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 42,
-      "column": 14
-    },
-    "end": {
-      "line": 45,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.error",
-    "defaultMessage": "!!!Sorry, we could not activate your trial!",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 46,
-      "column": 19
-    },
-    "end": {
-      "line": 49,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.cta.accept",
-    "defaultMessage": "!!!Start my 14-day Franz Professional Trial",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 50,
-      "column": 13
-    },
-    "end": {
-      "line": 53,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.cta.start",
-    "defaultMessage": "!!!Start using Franz",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 54,
-      "column": 12
-    },
-    "end": {
-      "line": 57,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.cta.skip",
-    "defaultMessage": "!!!Continue to Ferdi",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 58,
-      "column": 11
-    },
-    "end": {
-      "line": 61,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.features.headline",
-    "defaultMessage": "!!!Franz Professional includes:",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 62,
-      "column": 20
-    },
-    "end": {
-      "line": 65,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/SetupAssistant.json b/src/i18n/messages/src/components/auth/SetupAssistant.json
index 03593cfbc..f950228b7 100644
--- a/src/i18n/messages/src/components/auth/SetupAssistant.json
+++ b/src/i18n/messages/src/components/auth/SetupAssistant.json
@@ -21,7 +21,7 @@
       "column": 15
     },
     "end": {
-      "line": 26,
+      "line": 27,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Let's go",
     "file": "src/components/auth/SetupAssistant.js",
     "start": {
-      "line": 27,
+      "line": 28,
       "column": 21
     },
     "end": {
-      "line": 30,
+      "line": 31,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Invitations sent successfully",
     "file": "src/components/auth/SetupAssistant.js",
     "start": {
-      "line": 31,
+      "line": 32,
       "column": 21
     },
     "end": {
-      "line": 34,
+      "line": 35,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/auth/Signup.json b/src/i18n/messages/src/components/auth/Signup.json
index 2628c9aa3..4a32628ef 100644
--- a/src/i18n/messages/src/components/auth/Signup.json
+++ b/src/i18n/messages/src/components/auth/Signup.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Sign up",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 19,
+      "line": 20,
       "column": 12
     },
     "end": {
-      "line": 22,
+      "line": 23,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Firstname",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 23,
+      "line": 24,
       "column": 18
     },
     "end": {
-      "line": 26,
+      "line": 27,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Lastname",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 27,
+      "line": 28,
       "column": 17
     },
     "end": {
-      "line": 30,
+      "line": 31,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Email address",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 31,
+      "line": 32,
       "column": 14
     },
     "end": {
-      "line": 34,
+      "line": 35,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 39,
+      "line": 40,
       "column": 17
     },
     "end": {
-      "line": 42,
+      "line": 43,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!By creating a Ferdi account you accept the",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 43,
+      "line": 44,
       "column": 13
     },
     "end": {
-      "line": 46,
+      "line": 47,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Terms of service",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 47,
+      "line": 48,
       "column": 9
     },
     "end": {
-      "line": 50,
+      "line": 51,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Privacy Statement",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 51,
+      "line": 52,
       "column": 11
     },
     "end": {
-      "line": 54,
+      "line": 55,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Create account",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 55,
+      "line": 56,
       "column": 21
     },
     "end": {
-      "line": 58,
+      "line": 59,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Already have an account, sign in?",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 59,
+      "line": 60,
       "column": 13
     },
     "end": {
-      "line": 62,
+      "line": 63,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Change server",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 63,
+      "line": 64,
       "column": 16
     },
     "end": {
-      "line": 66,
+      "line": 67,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Use Ferdi without an Account",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 67,
+      "line": 68,
       "column": 14
     },
     "end": {
-      "line": 70,
+      "line": 71,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!A user with that email address already exists",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 71,
+      "line": 72,
       "column": 18
     },
     "end": {
-      "line": 74,
+      "line": 75,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/layout/AppLayout.json b/src/i18n/messages/src/components/layout/AppLayout.json
index 554758f82..e3f5658b2 100644
--- a/src/i18n/messages/src/components/layout/AppLayout.json
+++ b/src/i18n/messages/src/components/layout/AppLayout.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Your services have been updated.",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 32,
+      "line": 29,
       "column": 19
     },
     "end": {
-      "line": 35,
+      "line": 32,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Reload services",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 36,
+      "line": 33,
       "column": 24
     },
     "end": {
-      "line": 39,
+      "line": 36,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Could not load services and user information",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 40,
+      "line": 37,
       "column": 26
     },
     "end": {
-      "line": 43,
+      "line": 40,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 44,
+      "line": 41,
       "column": 21
     },
     "end": {
-      "line": 47,
+      "line": 45,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/layout/Sidebar.json b/src/i18n/messages/src/components/layout/Sidebar.json
index 2d8fe0676..f16baea32 100644
--- a/src/i18n/messages/src/components/layout/Sidebar.json
+++ b/src/i18n/messages/src/components/layout/Sidebar.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 20,
+      "line": 17,
       "column": 12
     },
     "end": {
-      "line": 23,
+      "line": 20,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Add new service",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 24,
+      "line": 21,
       "column": 17
     },
     "end": {
-      "line": 27,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 28,
+      "line": 25,
       "column": 8
     },
     "end": {
-      "line": 31,
+      "line": 28,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 32,
+      "line": 29,
       "column": 10
     },
     "end": {
-      "line": 35,
+      "line": 32,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 36,
+      "line": 33,
       "column": 23
     },
     "end": {
-      "line": 39,
+      "line": 36,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 40,
+      "line": 37,
       "column": 24
     },
     "end": {
-      "line": 43,
+      "line": 40,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Open Franz Todos",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 44,
+      "line": 41,
       "column": 19
     },
     "end": {
-      "line": 47,
+      "line": 44,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Close Franz Todos",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 48,
+      "line": 45,
       "column": 20
     },
     "end": {
-      "line": 51,
+      "line": 48,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Lock Ferdi",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 52,
+      "line": 49,
       "column": 13
     },
     "end": {
-      "line": 55,
+      "line": 52,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json b/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json
index bcfb6ab94..6805b4d67 100644
--- a/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json
+++ b/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Oh no! Ferdi lost the connection to {name}.",
     "file": "src/components/services/content/ConnectionLostBanner.js",
     "start": {
-      "line": 15,
+      "line": 13,
       "column": 8
     },
     "end": {
-      "line": 18,
+      "line": 16,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!What happened?",
     "file": "src/components/services/content/ConnectionLostBanner.js",
     "start": {
-      "line": 19,
+      "line": 17,
       "column": 19
     },
     "end": {
-      "line": 22,
+      "line": 20,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Reload Service",
     "file": "src/components/services/content/ConnectionLostBanner.js",
     "start": {
-      "line": 23,
+      "line": 21,
       "column": 7
     },
     "end": {
-      "line": 26,
+      "line": 24,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/services/content/ServiceRestricted.json b/src/i18n/messages/src/components/services/content/ServiceRestricted.json
deleted file mode 100644
index c1984afe3..000000000
--- a/src/i18n/messages/src/components/services/content/ServiceRestricted.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "service.restrictedHandler.serviceLimit.headline",
-    "defaultMessage": "!!!You have reached your service limit.",
-    "file": "src/components/services/content/ServiceRestricted.js",
-    "start": {
-      "line": 11,
-      "column": 24
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.restrictedHandler.serviceLimit.text",
-    "defaultMessage": "!!!Please upgrade your account to use more than {count} services.",
-    "file": "src/components/services/content/ServiceRestricted.js",
-    "start": {
-      "line": 15,
-      "column": 20
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.restrictedHandler.customUrl.headline",
-    "defaultMessage": "!!!Franz Professional Plan required",
-    "file": "src/components/services/content/ServiceRestricted.js",
-    "start": {
-      "line": 19,
-      "column": 21
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.restrictedHandler.customUrl.text",
-    "defaultMessage": "!!!Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
-    "file": "src/components/services/content/ServiceRestricted.js",
-    "start": {
-      "line": 23,
-      "column": 17
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.restrictedHandler.action",
-    "defaultMessage": "!!!Upgrade Account",
-    "file": "src/components/services/content/ServiceRestricted.js",
-    "start": {
-      "line": 27,
-      "column": 10
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/Services.json b/src/i18n/messages/src/components/services/content/Services.json
index 6a5eb052e..304c93f3c 100644
--- a/src/i18n/messages/src/components/services/content/Services.json
+++ b/src/i18n/messages/src/components/services/content/Services.json
@@ -53,7 +53,7 @@
   },
   {
     "id": "services.serverInfo",
-    "defaultMessage": "!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+    "defaultMessage": "!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
     "file": "src/components/services/content/Services.js",
     "start": {
       "line": 31,
diff --git a/src/i18n/messages/src/components/services/tabs/TabItem.json b/src/i18n/messages/src/components/services/tabs/TabItem.json
index a1b0d2435..92ff6fb14 100644
--- a/src/i18n/messages/src/components/services/tabs/TabItem.json
+++ b/src/i18n/messages/src/components/services/tabs/TabItem.json
@@ -78,8 +78,8 @@
     }
   },
   {
-    "id": "tabs.item.disableService",
-    "defaultMessage": "!!!Disable Service",
+    "id": "tabs.item.enableDarkMode",
+    "defaultMessage": "!!!Enable Dark mode",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
       "line": 44,
@@ -91,15 +91,67 @@
     }
   },
   {
+    "id": "tabs.item.disableDarkMode",
+    "defaultMessage": "!!!Disable Dark mode",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 48,
+      "column": 19
+    },
+    "end": {
+      "line": 51,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.disableService",
+    "defaultMessage": "!!!Disable Service",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 52,
+      "column": 18
+    },
+    "end": {
+      "line": 55,
+      "column": 3
+    }
+  },
+  {
     "id": "tabs.item.enableService",
     "defaultMessage": "!!!Enable Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 48,
+      "line": 56,
       "column": 17
     },
     "end": {
-      "line": 51,
+      "line": 59,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.hibernateService",
+    "defaultMessage": "!!!Hibernate Service",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 60,
+      "column": 20
+    },
+    "end": {
+      "line": 63,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.wakeUpService",
+    "defaultMessage": "!!!Wake Up Service",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 64,
+      "column": 17
+    },
+    "end": {
+      "line": 67,
       "column": 3
     }
   },
@@ -108,11 +160,11 @@
     "defaultMessage": "!!!Delete Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 52,
+      "line": 68,
       "column": 17
     },
     "end": {
-      "line": 55,
+      "line": 71,
       "column": 3
     }
   },
@@ -121,11 +173,11 @@
     "defaultMessage": "!!!Do you really want to delete the {serviceName} service?",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 56,
+      "line": 72,
       "column": 24
     },
     "end": {
-      "line": 59,
+      "line": 76,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/account/AccountDashboard.json b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
index f0bb087d6..b0cc2dcc7 100644
--- a/src/i18n/messages/src/components/settings/account/AccountDashboard.json
+++ b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
@@ -4,24 +4,11 @@
     "defaultMessage": "!!!Account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 17,
+      "line": 14,
       "column": 12
     },
     "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineSubscription",
-    "defaultMessage": "!!!Your Subscription",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 21,
-      "column": 24
-    },
-    "end": {
-      "line": 24,
+      "line": 17,
       "column": 3
     }
   },
@@ -30,63 +17,11 @@
     "defaultMessage": "!!Danger Zone",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 25,
+      "line": 18,
       "column": 22
     },
     "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.manageSubscription.label",
-    "defaultMessage": "!!!Manage your subscription",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 29,
-      "column": 33
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.upgradeToPro.label",
-    "defaultMessage": "!!!Upgrade to Franz Professional",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 33,
-      "column": 23
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.accountType.basic",
-    "defaultMessage": "!!!Basic Account",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 37,
-      "column": 20
-    },
-    "end": {
-      "line": 40,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.accountType.premium",
-    "defaultMessage": "!!!Premium Supporter Account",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 41,
-      "column": 22
-    },
-    "end": {
-      "line": 44,
+      "line": 21,
       "column": 3
     }
   },
@@ -95,11 +30,11 @@
     "defaultMessage": "!!!Edit Account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 45,
+      "line": 22,
       "column": 21
     },
     "end": {
-      "line": 48,
+      "line": 25,
       "column": 3
     }
   },
@@ -108,24 +43,11 @@
     "defaultMessage": "!!Invoices",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 49,
+      "line": 26,
       "column": 18
     },
     "end": {
-      "line": 52,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.invoiceDownload",
-    "defaultMessage": "!!!Download",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 53,
-      "column": 19
-    },
-    "end": {
-      "line": 56,
+      "line": 29,
       "column": 3
     }
   },
@@ -134,11 +56,11 @@
     "defaultMessage": "!!!Could not load user information",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 57,
+      "line": 30,
       "column": 25
     },
     "end": {
-      "line": 60,
+      "line": 33,
       "column": 3
     }
   },
@@ -147,11 +69,11 @@
     "defaultMessage": "!!!Try again",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 61,
+      "line": 34,
       "column": 28
     },
     "end": {
-      "line": 64,
+      "line": 37,
       "column": 3
     }
   },
@@ -160,11 +82,11 @@
     "defaultMessage": "!!!Delete account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 65,
+      "line": 38,
       "column": 17
     },
     "end": {
-      "line": 68,
+      "line": 41,
       "column": 3
     }
   },
@@ -173,11 +95,11 @@
     "defaultMessage": "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 69,
+      "line": 42,
       "column": 14
     },
     "end": {
-      "line": 73,
+      "line": 46,
       "column": 3
     }
   },
@@ -186,24 +108,11 @@
     "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 74,
+      "line": 47,
       "column": 19
     },
     "end": {
-      "line": 78,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.trial",
-    "defaultMessage": "!!!Free Trial",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 79,
-      "column": 9
-    },
-    "end": {
-      "line": 82,
+      "line": 51,
       "column": 3
     }
   },
@@ -212,37 +121,11 @@
     "defaultMessage": "!!!Your Franz License:",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 83,
-      "column": 15
-    },
-    "end": {
-      "line": 86,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.trialEndsIn",
-    "defaultMessage": "!!!Your free trial ends in {duration}.",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 87,
+      "line": 52,
       "column": 15
     },
     "end": {
-      "line": 90,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.trialUpdateBillingInfo",
-    "defaultMessage": "!!!Please update your billing info to continue using {license} after your trial period.",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 91,
-      "column": 33
-    },
-    "end": {
-      "line": 95,
+      "line": 55,
       "column": 3
     }
   },
@@ -251,11 +134,11 @@
     "defaultMessage": "Account is unavailable",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 96,
+      "line": 56,
       "column": 22
     },
     "end": {
-      "line": 99,
+      "line": 59,
       "column": 3
     }
   },
@@ -264,11 +147,11 @@
     "defaultMessage": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 100,
+      "line": 60,
       "column": 26
     },
     "end": {
-      "line": 103,
+      "line": 63,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
index d7906fa7d..705b7cee3 100644
--- a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
+++ b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Available services",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 17,
+      "line": 15,
       "column": 21
     },
     "end": {
-      "line": 20,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Your services",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 21,
+      "line": 19,
       "column": 16
     },
     "end": {
-      "line": 24,
+      "line": 22,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Your workspaces",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 25,
+      "line": 23,
       "column": 18
     },
     "end": {
-      "line": 28,
+      "line": 26,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Account",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 29,
+      "line": 27,
       "column": 11
     },
     "end": {
-      "line": 32,
+      "line": 30,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Manage Team",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 33,
+      "line": 31,
       "column": 8
     },
     "end": {
-      "line": 36,
+      "line": 34,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 37,
+      "line": 35,
       "column": 12
     },
     "end": {
-      "line": 40,
+      "line": 38,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!About Ferdi",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 41,
+      "line": 39,
       "column": 16
     },
     "end": {
-      "line": 44,
+      "line": 42,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Logout",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 45,
+      "line": 43,
       "column": 10
     },
     "end": {
-      "line": 48,
+      "line": 46,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json b/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
index bbb55c7a0..7ab2916f5 100644
--- a/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
+++ b/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Available Services",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 21,
+      "line": 19,
       "column": 12
     },
     "end": {
-      "line": 24,
+      "line": 22,
       "column": 3
     }
   },
@@ -17,24 +17,11 @@
     "defaultMessage": "!!!Search service",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 25,
+      "line": 23,
       "column": 17
     },
     "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.mostPopular",
-    "defaultMessage": "!!!Most popular",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 29,
-      "column": 22
-    },
-    "end": {
-      "line": 32,
+      "line": 26,
       "column": 3
     }
   },
@@ -43,11 +30,11 @@
     "defaultMessage": "!!!All services",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 33,
+      "line": 27,
       "column": 14
     },
     "end": {
-      "line": 36,
+      "line": 30,
       "column": 3
     }
   },
@@ -56,11 +43,11 @@
     "defaultMessage": "!!!Custom Services",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 37,
+      "line": 31,
       "column": 17
     },
     "end": {
-      "line": 40,
+      "line": 34,
       "column": 3
     }
   },
@@ -69,11 +56,11 @@
     "defaultMessage": "!!!Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 41,
+      "line": 35,
       "column": 16
     },
     "end": {
-      "line": 44,
+      "line": 38,
       "column": 3
     }
   },
@@ -82,11 +69,11 @@
     "defaultMessage": "!!!Service successfully added",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 45,
+      "line": 39,
       "column": 31
     },
     "end": {
-      "line": 48,
+      "line": 42,
       "column": 3
     }
   },
@@ -95,11 +82,11 @@
     "defaultMessage": "!!!Missing a service?",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 49,
+      "line": 43,
       "column": 18
     },
     "end": {
-      "line": 52,
+      "line": 46,
       "column": 3
     }
   },
@@ -108,11 +95,11 @@
     "defaultMessage": "!!!To add a custom service, copy the recipe folder into:",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 53,
+      "line": 47,
       "column": 21
     },
     "end": {
-      "line": 56,
+      "line": 50,
       "column": 3
     }
   },
@@ -121,11 +108,11 @@
     "defaultMessage": "!!!Open directory",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 57,
+      "line": 51,
       "column": 14
     },
     "end": {
-      "line": 60,
+      "line": 54,
       "column": 3
     }
   },
@@ -134,11 +121,11 @@
     "defaultMessage": "!!!Developer Documentation",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 61,
+      "line": 55,
       "column": 15
     },
     "end": {
-      "line": 64,
+      "line": 58,
       "column": 3
     }
   },
@@ -147,11 +134,11 @@
     "defaultMessage": "!!!Custom 3rd Party Recipes",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 65,
+      "line": 59,
       "column": 25
     },
     "end": {
-      "line": 68,
+      "line": 62,
       "column": 3
     }
   },
@@ -160,11 +147,11 @@
     "defaultMessage": "!!!Community 3rd Party Recipes",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 69,
+      "line": 63,
       "column": 28
     },
     "end": {
-      "line": 72,
+      "line": 66,
       "column": 3
     }
   },
@@ -173,11 +160,11 @@
     "defaultMessage": "!!!Your Development Service Recipes",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 73,
+      "line": 67,
       "column": 22
     },
     "end": {
-      "line": 76,
+      "line": 70,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/services/EditServiceForm.json b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
index 0aee52148..d7830f198 100644
--- a/src/i18n/messages/src/components/settings/services/EditServiceForm.json
+++ b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Save service",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 27,
+      "line": 23,
       "column": 15
     },
     "end": {
-      "line": 30,
+      "line": 26,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Delete Service",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 31,
+      "line": 27,
       "column": 17
     },
     "end": {
-      "line": 34,
+      "line": 30,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Open darkmode.css",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 35,
+      "line": 31,
       "column": 19
     },
     "end": {
-      "line": 38,
+      "line": 34,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Open user.css",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 39,
+      "line": 35,
       "column": 15
     },
     "end": {
-      "line": 42,
+      "line": 38,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Open user.js",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 43,
+      "line": 39,
       "column": 14
     },
     "end": {
-      "line": 46,
+      "line": 42,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 47,
+      "line": 43,
       "column": 18
     },
     "end": {
-      "line": 50,
+      "line": 46,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Available services",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 51,
+      "line": 47,
       "column": 21
     },
     "end": {
-      "line": 54,
+      "line": 50,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Your services",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 55,
+      "line": 51,
       "column": 16
     },
     "end": {
-      "line": 58,
+      "line": 54,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Add {name}",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 59,
+      "line": 55,
       "column": 22
     },
     "end": {
-      "line": 62,
+      "line": 58,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Edit {name}",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 63,
+      "line": 59,
       "column": 23
     },
     "end": {
-      "line": 66,
+      "line": 62,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Hosted",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 67,
+      "line": 63,
       "column": 13
     },
     "end": {
-      "line": 70,
+      "line": 66,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Self hosted ⭐️",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 71,
+      "line": 67,
       "column": 16
     },
     "end": {
-      "line": 74,
+      "line": 70,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Use the hosted {name} service.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 75,
+      "line": 71,
       "column": 20
     },
     "end": {
-      "line": 78,
+      "line": 74,
       "column": 3
     }
   },
@@ -173,37 +173,11 @@
     "defaultMessage": "!!!Could not validate custom {name} server.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 79,
+      "line": 75,
       "column": 28
     },
     "end": {
-      "line": 82,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.customUrlPremiumInfo",
-    "defaultMessage": "!!!To add self hosted services, you need a Ferdi Premium Supporter Account.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 83,
-      "column": 24
-    },
-    "end": {
-      "line": 86,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.customUrlUpgradeAccount",
-    "defaultMessage": "!!!Upgrade your account",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 87,
-      "column": 27
-    },
-    "end": {
-      "line": 90,
+      "line": 78,
       "column": 3
     }
   },
@@ -212,11 +186,11 @@
     "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 91,
+      "line": 79,
       "column": 23
     },
     "end": {
-      "line": 94,
+      "line": 82,
       "column": 3
     }
   },
@@ -225,11 +199,11 @@
     "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 95,
+      "line": 83,
       "column": 15
     },
     "end": {
-      "line": 98,
+      "line": 86,
       "column": 3
     }
   },
@@ -238,11 +212,11 @@
     "defaultMessage": "!!!When enabled, a service will be shut down after a period of time to save system resources.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 99,
+      "line": 87,
       "column": 28
     },
     "end": {
-      "line": 102,
+      "line": 90,
       "column": 3
     }
   },
@@ -251,11 +225,11 @@
     "defaultMessage": "!!!Notifications",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 103,
+      "line": 91,
       "column": 25
     },
     "end": {
-      "line": 106,
+      "line": 94,
       "column": 3
     }
   },
@@ -264,11 +238,11 @@
     "defaultMessage": "!!!Unread message badges",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 107,
+      "line": 95,
       "column": 18
     },
     "end": {
-      "line": 110,
+      "line": 98,
       "column": 3
     }
   },
@@ -277,11 +251,11 @@
     "defaultMessage": "!!!General",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 111,
+      "line": 99,
       "column": 19
     },
     "end": {
-      "line": 114,
+      "line": 102,
       "column": 3
     }
   },
@@ -290,11 +264,11 @@
     "defaultMessage": "!!!Dark Reader Settings",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 115,
+      "line": 103,
       "column": 30
     },
     "end": {
-      "line": 118,
+      "line": 106,
       "column": 3
     }
   },
@@ -303,11 +277,11 @@
     "defaultMessage": "!!!Delete",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 119,
+      "line": 107,
       "column": 14
     },
     "end": {
-      "line": 122,
+      "line": 110,
       "column": 3
     }
   },
@@ -316,11 +290,11 @@
     "defaultMessage": "!!!Drop your image, or click here",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 123,
+      "line": 111,
       "column": 14
     },
     "end": {
-      "line": 126,
+      "line": 114,
       "column": 3
     }
   },
@@ -329,11 +303,11 @@
     "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 127,
+      "line": 115,
       "column": 17
     },
     "end": {
-      "line": 130,
+      "line": 118,
       "column": 3
     }
   },
@@ -342,11 +316,11 @@
     "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 131,
+      "line": 119,
       "column": 20
     },
     "end": {
-      "line": 134,
+      "line": 122,
       "column": 3
     }
   },
@@ -355,11 +329,11 @@
     "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 135,
+      "line": 123,
       "column": 13
     },
     "end": {
-      "line": 138,
+      "line": 126,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/services/ServicesDashboard.json b/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
index fed05111e..7e7c5d67e 100644
--- a/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
+++ b/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Your services",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 16,
+      "line": 15,
       "column": 12
     },
     "end": {
-      "line": 19,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Search service",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 20,
+      "line": 19,
       "column": 17
     },
     "end": {
-      "line": 23,
+      "line": 22,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Start by adding a service.",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 24,
+      "line": 23,
       "column": 19
     },
     "end": {
-      "line": 27,
+      "line": 26,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 28,
+      "line": 27,
       "column": 18
     },
     "end": {
-      "line": 31,
+      "line": 30,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Discover services",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 32,
+      "line": 31,
       "column": 20
     },
     "end": {
-      "line": 35,
+      "line": 34,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Could not load your services",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 36,
+      "line": 35,
       "column": 25
     },
     "end": {
-      "line": 39,
+      "line": 38,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Try again",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 40,
+      "line": 39,
       "column": 21
     },
     "end": {
-      "line": 43,
+      "line": 42,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Your changes have been saved",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 44,
+      "line": 43,
       "column": 15
     },
     "end": {
-      "line": 47,
+      "line": 46,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Service has been deleted",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 48,
+      "line": 47,
       "column": 15
     },
     "end": {
-      "line": 51,
+      "line": 50,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index a1e8c714e..548d52af9 100644
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 24,
+      "line": 23,
       "column": 12
     },
     "end": {
-      "line": 27,
+      "line": 26,
       "column": 3
     }
   },
@@ -17,24 +17,24 @@
     "defaultMessage": "!!!General",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 28,
+      "line": 27,
       "column": 19
     },
     "end": {
-      "line": 31,
+      "line": 30,
       "column": 3
     }
   },
   {
     "id": "settings.app.sentryInfo",
-    "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
+    "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 32,
+      "line": 31,
       "column": 14
     },
     "end": {
-      "line": 35,
+      "line": 34,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 36,
+      "line": 35,
       "column": 17
     },
     "end": {
-      "line": 39,
+      "line": 38,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 40,
+      "line": 39,
       "column": 22
     },
     "end": {
-      "line": 43,
+      "line": 42,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 44,
+      "line": 43,
       "column": 18
     },
     "end": {
-      "line": 47,
+      "line": 46,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 48,
+      "line": 47,
       "column": 18
     },
     "end": {
-      "line": 51,
+      "line": 50,
       "column": 3
     }
   },
@@ -95,24 +95,24 @@
     "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 52,
+      "line": 51,
       "column": 22
     },
     "end": {
-      "line": 55,
+      "line": 54,
       "column": 3
     }
   },
   {
     "id": "settings.app.lockInfo",
-    "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+    "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 56,
+      "line": 55,
       "column": 12
     },
     "end": {
-      "line": 59,
+      "line": 58,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 60,
+      "line": 59,
       "column": 24
     },
     "end": {
-      "line": 63,
+      "line": 62,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 64,
+      "line": 63,
       "column": 20
     },
     "end": {
-      "line": 67,
+      "line": 66,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 68,
+      "line": 67,
       "column": 20
     },
     "end": {
-      "line": 71,
+      "line": 70,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 72,
+      "line": 71,
       "column": 19
     },
     "end": {
-      "line": 75,
+      "line": 74,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Appearance",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 76,
+      "line": 75,
       "column": 22
     },
     "end": {
-      "line": 79,
+      "line": 78,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 80,
+      "line": 79,
       "column": 25
     },
     "end": {
-      "line": 83,
+      "line": 82,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 84,
+      "line": 83,
       "column": 19
     },
     "end": {
-      "line": 87,
+      "line": 86,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!Privacy",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 88,
+      "line": 87,
       "column": 19
     },
     "end": {
-      "line": 91,
+      "line": 90,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!Advanced",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 92,
+      "line": 91,
       "column": 20
     },
     "end": {
-      "line": 95,
+      "line": 94,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!Help us to translate Ferdi into your language.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 96,
+      "line": 95,
       "column": 19
     },
     "end": {
-      "line": 99,
+      "line": 98,
       "column": 3
     }
   },
@@ -251,11 +251,11 @@
     "defaultMessage": "!!!Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 100,
+      "line": 99,
       "column": 28
     },
     "end": {
-      "line": 103,
+      "line": 102,
       "column": 3
     }
   },
@@ -264,11 +264,11 @@
     "defaultMessage": "!!!Cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 104,
+      "line": 103,
       "column": 20
     },
     "end": {
-      "line": 107,
+      "line": 106,
       "column": 3
     }
   },
@@ -277,11 +277,11 @@
     "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 108,
+      "line": 107,
       "column": 13
     },
     "end": {
-      "line": 111,
+      "line": 110,
       "column": 3
     }
   },
@@ -290,11 +290,11 @@
     "defaultMessage": "!!!Couldn't clear all cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 112,
+      "line": 111,
       "column": 19
     },
     "end": {
-      "line": 115,
+      "line": 114,
       "column": 3
     }
   },
@@ -303,11 +303,11 @@
     "defaultMessage": "!!!Clear cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 116,
+      "line": 115,
       "column": 23
     },
     "end": {
-      "line": 119,
+      "line": 118,
       "column": 3
     }
   },
@@ -316,11 +316,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 120,
+      "line": 119,
       "column": 25
     },
     "end": {
-      "line": 123,
+      "line": 122,
       "column": 3
     }
   },
@@ -329,11 +329,11 @@
     "defaultMessage": "!!!Restart & install update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 124,
+      "line": 123,
       "column": 23
     },
     "end": {
-      "line": 127,
+      "line": 126,
       "column": 3
     }
   },
@@ -342,11 +342,11 @@
     "defaultMessage": "!!!Is searching for update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 128,
+      "line": 127,
       "column": 25
     },
     "end": {
-      "line": 131,
+      "line": 130,
       "column": 3
     }
   },
@@ -355,11 +355,11 @@
     "defaultMessage": "!!!Update available, downloading...",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 132,
+      "line": 131,
       "column": 25
     },
     "end": {
-      "line": 135,
+      "line": 134,
       "column": 3
     }
   },
@@ -368,11 +368,11 @@
     "defaultMessage": "!!!You are using the latest version of Ferdi",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 136,
+      "line": 135,
       "column": 24
     },
     "end": {
-      "line": 139,
+      "line": 138,
       "column": 3
     }
   },
@@ -381,11 +381,11 @@
     "defaultMessage": "!!!Current version:",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 140,
+      "line": 139,
       "column": 18
     },
     "end": {
-      "line": 143,
+      "line": 142,
       "column": 3
     }
   },
@@ -394,11 +394,11 @@
     "defaultMessage": "!!!Changes require restart",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 144,
+      "line": 143,
       "column": 22
     },
     "end": {
-      "line": 147,
+      "line": 146,
       "column": 3
     }
   },
@@ -407,11 +407,11 @@
     "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 148,
+      "line": 147,
       "column": 22
     },
     "end": {
-      "line": 151,
+      "line": 150,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/team/TeamDashboard.json b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
index 0a3b818a7..ac42ad98a 100644
--- a/src/i18n/messages/src/components/settings/team/TeamDashboard.json
+++ b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Team",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 18,
+      "line": 15,
       "column": 12
     },
     "end": {
-      "line": 21,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Franz Team Management",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 22,
+      "line": 19,
       "column": 19
     },
     "end": {
-      "line": 25,
+      "line": 22,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Your are currently using Franz Servers, which is why you have access to Team Management.",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 26,
+      "line": 23,
       "column": 9
     },
     "end": {
-      "line": 29,
+      "line": 26,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 30,
+      "line": 27,
       "column": 8
     },
     "end": {
-      "line": 33,
+      "line": 30,
       "column": 3
     }
   },
@@ -56,24 +56,11 @@
     "defaultMessage": "!!!Manage your Team on meetfranz.com",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 34,
+      "line": 31,
       "column": 16
     },
     "end": {
-      "line": 37,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.upgradeAction",
-    "defaultMessage": "!!!Upgrade your Account",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 38,
-      "column": 17
-    },
-    "end": {
-      "line": 41,
+      "line": 34,
       "column": 3
     }
   },
@@ -82,11 +69,11 @@
     "defaultMessage": "!!!Teams are unavailable",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 42,
+      "line": 35,
       "column": 20
     },
     "end": {
-      "line": 45,
+      "line": 38,
       "column": 3
     }
   },
@@ -95,11 +82,11 @@
     "defaultMessage": "!!!Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 46,
+      "line": 39,
       "column": 24
     },
     "end": {
-      "line": 49,
+      "line": 42,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/subscription/SubscriptionForm.json b/src/i18n/messages/src/components/subscription/SubscriptionForm.json
deleted file mode 100644
index 6d235254e..000000000
--- a/src/i18n/messages/src/components/subscription/SubscriptionForm.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "subscription.cta.choosePlan",
-    "defaultMessage": "!!!Choose your plan",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 13,
-      "column": 21
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineUpgradeAccount",
-    "defaultMessage": "!!!Upgrade your account and get the full Franz experience",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 17,
-      "column": 18
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.teaser.intro",
-    "defaultMessage": "!!!Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 21,
-      "column": 14
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.teaser.includedFeatures",
-    "defaultMessage": "!!!Paid Franz Plans include:",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 25,
-      "column": 20
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/subscription/SubscriptionPopup.json b/src/i18n/messages/src/components/subscription/SubscriptionPopup.json
deleted file mode 100644
index c06da7531..000000000
--- a/src/i18n/messages/src/components/subscription/SubscriptionPopup.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "id": "subscriptionPopup.buttonCancel",
-    "defaultMessage": "!!!Cancel",
-    "file": "src/components/subscription/SubscriptionPopup.js",
-    "start": {
-      "line": 11,
-      "column": 16
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscriptionPopup.buttonDone",
-    "defaultMessage": "!!!Done",
-    "file": "src/components/subscription/SubscriptionPopup.js",
-    "start": {
-      "line": 15,
-      "column": 14
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/subscription/TrialForm.json b/src/i18n/messages/src/components/subscription/TrialForm.json
deleted file mode 100644
index 8b387ba36..000000000
--- a/src/i18n/messages/src/components/subscription/TrialForm.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "subscription.cta.activateTrial",
-    "defaultMessage": "!!!Yes, start the free Franz Professional trial",
-    "file": "src/components/subscription/TrialForm.js",
-    "start": {
-      "line": 14,
-      "column": 21
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.cta.allOptions",
-    "defaultMessage": "!!!See all options",
-    "file": "src/components/subscription/TrialForm.js",
-    "start": {
-      "line": 18,
-      "column": 20
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineTrialUpgrade",
-    "defaultMessage": "!!!Get the free 14 day Franz Professional Trial",
-    "file": "src/components/subscription/TrialForm.js",
-    "start": {
-      "line": 22,
-      "column": 18
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.includedProFeatures",
-    "defaultMessage": "!!!The Franz Professional Plan includes:",
-    "file": "src/components/subscription/TrialForm.js",
-    "start": {
-      "line": 26,
-      "column": 20
-    },
-    "end": {
-      "line": 29,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.headline",
-    "defaultMessage": "!!!No strings attached",
-    "file": "src/components/subscription/TrialForm.js",
-    "start": {
-      "line": 30,
-      "column": 29
-    },
-    "end": {
-      "line": 33,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.noCreditCard",
-    "defaultMessage": "!!!No credit card required",
-    "file": "src/components/subscription/TrialForm.js",
-    "start": {
-      "line": 34,
-      "column": 16
-    },
-    "end": {
-      "line": 37,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.automaticTrialEnd",
-    "defaultMessage": "!!!Your free trial ends automatically after 14 days",
-    "file": "src/components/subscription/TrialForm.js",
-    "start": {
-      "line": 38,
-      "column": 21
-    },
-    "end": {
-      "line": 41,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json b/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json
deleted file mode 100644
index fd969da78..000000000
--- a/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "feature.delayApp.upgrade.action",
-    "defaultMessage": "!!!Get a Franz Supporter License",
-    "file": "src/components/ui/ActivateTrialButton/index.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.delayApp.trial.action",
-    "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
-    "file": "src/components/ui/ActivateTrialButton/index.js",
-    "start": {
-      "line": 17,
-      "column": 15
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.delayApp.upgrade.actionShort",
-    "defaultMessage": "!!!Upgrade account",
-    "file": "src/components/ui/ActivateTrialButton/index.js",
-    "start": {
-      "line": 21,
-      "column": 15
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.delayApp.trial.actionShort",
-    "defaultMessage": "!!!Activate the free Franz Professional trial",
-    "file": "src/components/ui/ActivateTrialButton/index.js",
-    "start": {
-      "line": 25,
-      "column": 20
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.headline",
-    "defaultMessage": "!!!No strings attached",
-    "file": "src/components/ui/ActivateTrialButton/index.js",
-    "start": {
-      "line": 29,
-      "column": 29
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.noCreditCard",
-    "defaultMessage": "!!!No credit card required",
-    "file": "src/components/ui/ActivateTrialButton/index.js",
-    "start": {
-      "line": 33,
-      "column": 16
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.automaticTrialEnd",
-    "defaultMessage": "!!!Your free trial ends automatically after 14 days",
-    "file": "src/components/ui/ActivateTrialButton/index.js",
-    "start": {
-      "line": 37,
-      "column": 21
-    },
-    "end": {
-      "line": 40,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/FeatureList.json b/src/i18n/messages/src/components/ui/FeatureList.json
index 8d1dc4360..eb4bc483b 100644
--- a/src/i18n/messages/src/components/ui/FeatureList.json
+++ b/src/i18n/messages/src/components/ui/FeatureList.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Choose from more than 70 Services",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 9,
+      "line": 8,
       "column": 20
     },
     "end": {
-      "line": 12,
+      "line": 11,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Account Synchronisation",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 13,
+      "line": 12,
       "column": 15
     },
     "end": {
-      "line": 16,
+      "line": 15,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Desktop Notifications",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 17,
+      "line": 16,
       "column": 24
     },
     "end": {
-      "line": 20,
+      "line": 19,
       "column": 3
     }
   },
@@ -43,37 +43,11 @@
     "defaultMessage": "!!!Add unlimited services",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 21,
+      "line": 20,
       "column": 21
     },
     "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.upToThreeServices",
-    "defaultMessage": "!!!Add up to 3 services",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 25,
-      "column": 21
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.upToSixServices",
-    "defaultMessage": "!!!Add up to 6 services",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 29,
-      "column": 19
-    },
-    "end": {
-      "line": 32,
+      "line": 23,
       "column": 3
     }
   },
@@ -82,11 +56,11 @@
     "defaultMessage": "!!!Spellchecker support",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 33,
+      "line": 24,
       "column": 16
     },
     "end": {
-      "line": 36,
+      "line": 27,
       "column": 3
     }
   },
@@ -95,11 +69,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 37,
+      "line": 28,
       "column": 14
     },
     "end": {
-      "line": 40,
+      "line": 31,
       "column": 3
     }
   },
@@ -108,11 +82,11 @@
     "defaultMessage": "!!!Add Custom Websites",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 41,
+      "line": 32,
       "column": 18
     },
     "end": {
-      "line": 44,
+      "line": 35,
       "column": 3
     }
   },
@@ -121,11 +95,11 @@
     "defaultMessage": "!!!On-premise & other Hosted Services",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 45,
+      "line": 36,
       "column": 13
     },
     "end": {
-      "line": 48,
+      "line": 39,
       "column": 3
     }
   },
@@ -134,11 +108,11 @@
     "defaultMessage": "!!!Install 3rd party services",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 49,
+      "line": 40,
       "column": 22
     },
     "end": {
-      "line": 52,
+      "line": 43,
       "column": 3
     }
   },
@@ -147,11 +121,11 @@
     "defaultMessage": "!!!Service Proxies",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 53,
+      "line": 44,
       "column": 18
     },
     "end": {
-      "line": 56,
+      "line": 47,
       "column": 3
     }
   },
@@ -160,50 +134,11 @@
     "defaultMessage": "!!!Team Management",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 57,
+      "line": 48,
       "column": 18
     },
     "end": {
-      "line": 60,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.appDelays",
-    "defaultMessage": "!!!No Waiting Screens",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 61,
-      "column": 13
-    },
-    "end": {
-      "line": 64,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.adFree",
-    "defaultMessage": "!!!Forever ad-free",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 65,
-      "column": 10
-    },
-    "end": {
-      "line": 68,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.appDelaysEnabled",
-    "defaultMessage": "!!!Occasional Waiting Screens",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 69,
-      "column": 19
-    },
-    "end": {
-      "line": 72,
+      "line": 51,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json b/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
deleted file mode 100644
index 0cde4cee5..000000000
--- a/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "premiumFeature.button.upgradeAccount",
-    "defaultMessage": "!!!Upgrade account",
-    "file": "src/components/ui/PremiumFeatureContainer/index.js",
-    "start": {
-      "line": 16,
-      "column": 10
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/UpgradeButton/index.json b/src/i18n/messages/src/components/ui/UpgradeButton/index.json
deleted file mode 100644
index 28e44cb66..000000000
--- a/src/i18n/messages/src/components/ui/UpgradeButton/index.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "global.upgradeButton.upgradeToPro",
-    "defaultMessage": "!!!Upgrade to Franz Professional",
-    "file": "src/components/ui/UpgradeButton/index.js",
-    "start": {
-      "line": 13,
-      "column": 16
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditServiceScreen.json b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
index ad97781c4..6744a9ff3 100644
--- a/src/i18n/messages/src/containers/settings/EditServiceScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Name",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 29,
+      "line": 28,
       "column": 8
     },
     "end": {
-      "line": 32,
+      "line": 31,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Enable service",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 33,
+      "line": 32,
       "column": 17
     },
     "end": {
-      "line": 36,
+      "line": 35,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Enable hibernation",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 37,
+      "line": 36,
       "column": 21
     },
     "end": {
-      "line": 40,
+      "line": 39,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Enable Notifications",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 41,
+      "line": 40,
       "column": 22
     },
     "end": {
-      "line": 44,
+      "line": 43,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Show unread message badges",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 45,
+      "line": 44,
       "column": 15
     },
     "end": {
-      "line": 48,
+      "line": 47,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Enable audio",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 49,
+      "line": 48,
       "column": 15
     },
     "end": {
-      "line": 52,
+      "line": 51,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Team",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 53,
+      "line": 52,
       "column": 8
     },
     "end": {
-      "line": 56,
+      "line": 55,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Service URL",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 57,
+      "line": 56,
       "column": 13
     },
     "end": {
-      "line": 60,
+      "line": 59,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Show message badge for all new messages",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 61,
+      "line": 60,
       "column": 20
     },
     "end": {
-      "line": 64,
+      "line": 63,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Custom icon",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 65,
+      "line": 64,
       "column": 8
     },
     "end": {
-      "line": 68,
+      "line": 67,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Enable Dark Mode",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 69,
+      "line": 68,
       "column": 18
     },
     "end": {
-      "line": 72,
+      "line": 71,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Dark Reader Brightness",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 73,
+      "line": 72,
       "column": 24
     },
     "end": {
-      "line": 76,
+      "line": 75,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Dark Reader Contrast",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 77,
+      "line": 76,
       "column": 22
     },
     "end": {
-      "line": 80,
+      "line": 79,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Dark Reader Sepia",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 81,
+      "line": 80,
       "column": 19
     },
     "end": {
-      "line": 84,
+      "line": 83,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!Use Proxy",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 85,
+      "line": 84,
       "column": 15
     },
     "end": {
-      "line": 88,
+      "line": 87,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Proxy Host/IP",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 89,
+      "line": 88,
       "column": 13
     },
     "end": {
-      "line": 92,
+      "line": 91,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!Port",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 93,
+      "line": 92,
       "column": 13
     },
     "end": {
-      "line": 96,
+      "line": 95,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!User",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 97,
+      "line": 96,
       "column": 13
     },
     "end": {
-      "line": 100,
+      "line": 99,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 101,
+      "line": 100,
       "column": 17
     },
     "end": {
-      "line": 104,
+      "line": 103,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index cd5462b59..b98c54d7d 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Launch Ferdi on start",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 31,
+      "line": 32,
       "column": 21
     },
     "end": {
-      "line": 34,
+      "line": 35,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Open in background",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 35,
+      "line": 36,
       "column": 26
     },
     "end": {
-      "line": 38,
+      "line": 39,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Keep Ferdi in background when closing the window",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 39,
+      "line": 40,
       "column": 19
     },
     "end": {
-      "line": 42,
+      "line": 43,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Start minimized",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 43,
+      "line": 44,
       "column": 18
     },
     "end": {
-      "line": 46,
+      "line": 47,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Always show Ferdi in System Tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 47,
+      "line": 48,
       "column": 20
     },
     "end": {
-      "line": 50,
+      "line": 51,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Always show Ferdi in Menu Bar",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 51,
+      "line": 52,
       "column": 17
     },
     "end": {
-      "line": 54,
+      "line": 55,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Reload Ferdi after system resume",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 55,
+      "line": 56,
       "column": 21
     },
     "end": {
-      "line": 58,
+      "line": 59,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Minimize Ferdi to system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 59,
+      "line": 60,
       "column": 24
     },
     "end": {
-      "line": 62,
+      "line": 63,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Close Ferdi to system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 63,
+      "line": 64,
       "column": 21
     },
     "end": {
-      "line": 66,
+      "line": 67,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Don't show message content in notifications",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 67,
+      "line": 68,
       "column": 24
     },
     "end": {
-      "line": 70,
+      "line": 71,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Don't show notifications for clipboard events",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 71,
+      "line": 72,
       "column": 26
     },
     "end": {
-      "line": 74,
+      "line": 75,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Notify TaskBar/Dock on new message",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 75,
+      "line": 76,
       "column": 26
     },
     "end": {
-      "line": 78,
+      "line": 79,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Navigation bar behaviour",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 79,
+      "line": 80,
       "column": 26
     },
     "end": {
-      "line": 82,
+      "line": 83,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Search engine",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 83,
+      "line": 84,
       "column": 16
     },
     "end": {
-      "line": 86,
+      "line": 87,
       "column": 3
     }
   },
@@ -186,50 +186,50 @@
     "defaultMessage": "!!!Send telemetry data",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 87,
+      "line": 88,
       "column": 10
     },
     "end": {
-      "line": 90,
+      "line": 91,
       "column": 3
     }
   },
   {
-    "id": "settings.app.form.hibernate",
-    "defaultMessage": "!!!Enable service hibernation",
+    "id": "settings.app.form.hibernateOnStartup",
+    "defaultMessage": "!!!Keep services in hibernation on startup",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 91,
-      "column": 13
+      "line": 92,
+      "column": 22
     },
     "end": {
-      "line": 94,
+      "line": 95,
       "column": 3
     }
   },
   {
-    "id": "settings.app.form.hibernateOnStartup",
-    "defaultMessage": "!!!Keep services in hibernation on startup",
+    "id": "settings.app.form.hibernationStrategy",
+    "defaultMessage": "!!!Hibernation strategy",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 95,
-      "column": 22
+      "line": 96,
+      "column": 23
     },
     "end": {
-      "line": 98,
+      "line": 99,
       "column": 3
     }
   },
   {
-    "id": "settings.app.form.hibernationStrategy",
-    "defaultMessage": "!!!Hibernation strategy",
+    "id": "settings.app.form.wakeUpStrategy",
+    "defaultMessage": "!!!Wake up strategy",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 99,
-      "column": 23
+      "line": 100,
+      "column": 18
     },
     "end": {
-      "line": 102,
+      "line": 103,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!Todo Server",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 103,
+      "line": 104,
       "column": 24
     },
     "end": {
-      "line": 106,
+      "line": 107,
       "column": 3
     }
   },
@@ -251,11 +251,11 @@
     "defaultMessage": "!!!Custom TodoServer",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 107,
+      "line": 108,
       "column": 20
     },
     "end": {
-      "line": 110,
+      "line": 111,
       "column": 3
     }
   },
@@ -264,11 +264,11 @@
     "defaultMessage": "!!!Enable Password Lock",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 111,
+      "line": 112,
       "column": 14
     },
     "end": {
-      "line": 114,
+      "line": 115,
       "column": 3
     }
   },
@@ -277,11 +277,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 115,
+      "line": 116,
       "column": 16
     },
     "end": {
-      "line": 118,
+      "line": 119,
       "column": 3
     }
   },
@@ -290,11 +290,11 @@
     "defaultMessage": "!!!Allow using Touch ID to unlock",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 119,
+      "line": 120,
       "column": 22
     },
     "end": {
-      "line": 122,
+      "line": 123,
       "column": 3
     }
   },
@@ -303,11 +303,11 @@
     "defaultMessage": "!!!Lock after inactivity",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 123,
+      "line": 124,
       "column": 18
     },
     "end": {
-      "line": 126,
+      "line": 127,
       "column": 3
     }
   },
@@ -316,11 +316,11 @@
     "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 127,
+      "line": 128,
       "column": 23
     },
     "end": {
-      "line": 130,
+      "line": 131,
       "column": 3
     }
   },
@@ -329,11 +329,11 @@
     "defaultMessage": "!!!From",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 131,
+      "line": 132,
       "column": 21
     },
     "end": {
-      "line": 134,
+      "line": 135,
       "column": 3
     }
   },
@@ -342,11 +342,11 @@
     "defaultMessage": "!!!To",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 135,
+      "line": 136,
       "column": 19
     },
     "end": {
-      "line": 138,
+      "line": 139,
       "column": 3
     }
   },
@@ -355,11 +355,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 139,
+      "line": 140,
       "column": 12
     },
     "end": {
-      "line": 142,
+      "line": 143,
       "column": 3
     }
   },
@@ -368,11 +368,11 @@
     "defaultMessage": "!!!Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 143,
+      "line": 144,
       "column": 12
     },
     "end": {
-      "line": 146,
+      "line": 147,
       "column": 3
     }
   },
@@ -381,11 +381,11 @@
     "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 147,
+      "line": 148,
       "column": 21
     },
     "end": {
-      "line": 150,
+      "line": 151,
       "column": 3
     }
   },
@@ -394,11 +394,11 @@
     "defaultMessage": "!!!Enable universal Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 151,
+      "line": 152,
       "column": 21
     },
     "end": {
-      "line": 154,
+      "line": 155,
       "column": 3
     }
   },
@@ -407,11 +407,11 @@
     "defaultMessage": "!!!Sidebar width",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 155,
+      "line": 156,
       "column": 22
     },
     "end": {
-      "line": 158,
+      "line": 159,
       "column": 3
     }
   },
@@ -420,11 +420,11 @@
     "defaultMessage": "!!!Service icon size",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 159,
+      "line": 160,
       "column": 12
     },
     "end": {
-      "line": 162,
+      "line": 163,
       "column": 3
     }
   },
@@ -433,11 +433,11 @@
     "defaultMessage": "!!!Use vertical style",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 163,
+      "line": 164,
       "column": 20
     },
     "end": {
-      "line": 166,
+      "line": 167,
       "column": 3
     }
   },
@@ -446,11 +446,11 @@
     "defaultMessage": "!!!Always show workspace drawer",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 167,
+      "line": 168,
       "column": 24
     },
     "end": {
-      "line": 170,
+      "line": 171,
       "column": 3
     }
   },
@@ -459,11 +459,11 @@
     "defaultMessage": "!!!Accent color",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 171,
+      "line": 172,
       "column": 15
     },
     "end": {
-      "line": 174,
+      "line": 175,
       "column": 3
     }
   },
@@ -472,11 +472,11 @@
     "defaultMessage": "!!!Display disabled services tabs",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 175,
+      "line": 176,
       "column": 24
     },
     "end": {
-      "line": 178,
+      "line": 179,
       "column": 3
     }
   },
@@ -485,11 +485,11 @@
     "defaultMessage": "!!!Show unread message badge when notifications are disabled",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 179,
+      "line": 180,
       "column": 29
     },
     "end": {
-      "line": 182,
+      "line": 183,
       "column": 3
     }
   },
@@ -498,11 +498,11 @@
     "defaultMessage": "!!!Show draggable area on window",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 183,
+      "line": 184,
       "column": 16
     },
     "end": {
-      "line": 186,
+      "line": 187,
       "column": 3
     }
   },
@@ -511,11 +511,11 @@
     "defaultMessage": "!!!Enable spell checking",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 187,
+      "line": 188,
       "column": 23
     },
     "end": {
-      "line": 190,
+      "line": 191,
       "column": 3
     }
   },
@@ -524,11 +524,11 @@
     "defaultMessage": "!!!Enable GPU Acceleration",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 191,
+      "line": 192,
       "column": 25
     },
     "end": {
-      "line": 194,
+      "line": 195,
       "column": 3
     }
   },
@@ -537,11 +537,11 @@
     "defaultMessage": "!!!Include beta versions",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 195,
+      "line": 196,
       "column": 8
     },
     "end": {
-      "line": 198,
+      "line": 199,
       "column": 3
     }
   },
@@ -550,11 +550,11 @@
     "defaultMessage": "!!!Enable updates",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 199,
+      "line": 200,
       "column": 20
     },
     "end": {
-      "line": 202,
+      "line": 203,
       "column": 3
     }
   },
@@ -563,11 +563,11 @@
     "defaultMessage": "!!!Enable Franz Todos",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 203,
+      "line": 204,
       "column": 15
     },
     "end": {
-      "line": 206,
+      "line": 207,
       "column": 3
     }
   },
@@ -576,11 +576,11 @@
     "defaultMessage": "!!!Keep all workspaces loaded",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 207,
+      "line": 208,
       "column": 27
     },
     "end": {
-      "line": 210,
+      "line": 211,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/delayApp/Component.json b/src/i18n/messages/src/features/delayApp/Component.json
deleted file mode 100644
index 7ec0e69a0..000000000
--- a/src/i18n/messages/src/features/delayApp/Component.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "feature.delayApp.headline",
-    "defaultMessage": "!!!Please purchase license to skip waiting",
-    "file": "src/features/delayApp/Component.js",
-    "start": {
-      "line": 16,
-      "column": 12
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.delayApp.trial.headline",
-    "defaultMessage": "!!!Get the free Franz Professional 14 day trial and skip the line",
-    "file": "src/features/delayApp/Component.js",
-    "start": {
-      "line": 20,
-      "column": 17
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.delayApp.upgrade.action",
-    "defaultMessage": "!!!Upgrade Franz",
-    "file": "src/features/delayApp/Component.js",
-    "start": {
-      "line": 24,
-      "column": 10
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.delayApp.trial.action",
-    "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
-    "file": "src/features/delayApp/Component.js",
-    "start": {
-      "line": 28,
-      "column": 15
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.delayApp.text",
-    "defaultMessage": "!!!Ferdi will continue in {seconds} seconds.",
-    "file": "src/features/delayApp/Component.js",
-    "start": {
-      "line": 32,
-      "column": 8
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/planSelection/components/PlanItem.json b/src/i18n/messages/src/features/planSelection/components/PlanItem.json
deleted file mode 100644
index 5a94f32ee..000000000
--- a/src/i18n/messages/src/features/planSelection/components/PlanItem.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "subscription.interval.perMonth",
-    "defaultMessage": "!!!per month",
-    "file": "src/features/planSelection/components/PlanItem.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.interval.perMonthPerUser",
-    "defaultMessage": "!!!per month & user",
-    "file": "src/features/planSelection/components/PlanItem.js",
-    "start": {
-      "line": 19,
-      "column": 19
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.bestValue",
-    "defaultMessage": "!!!Best value",
-    "file": "src/features/planSelection/components/PlanItem.js",
-    "start": {
-      "line": 23,
-      "column": 13
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/planSelection/components/PlanSelection.json b/src/i18n/messages/src/features/planSelection/components/PlanSelection.json
deleted file mode 100644
index ed354146e..000000000
--- a/src/i18n/messages/src/features/planSelection/components/PlanSelection.json
+++ /dev/null
@@ -1,158 +0,0 @@
-[
-  {
-    "id": "feature.planSelection.fullscreen.welcome",
-    "defaultMessage": "!!!Are you ready to choose, {name}",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 17,
-      "column": 11
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.fullscreen.subheadline",
-    "defaultMessage": "!!!It's time to make a choice. Franz works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 21,
-      "column": 15
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.free.text",
-    "defaultMessage": "!!!Basic functionality",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 25,
-      "column": 12
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.personal.text",
-    "defaultMessage": "!!!More services, no waiting - ideal for personal use.",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 29,
-      "column": 16
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.pro.text",
-    "defaultMessage": "!!!Unlimited services and professional features for you - and your team.",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 33,
-      "column": 20
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.cta.stayOnFree",
-    "defaultMessage": "!!!Stay on Free",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 37,
-      "column": 17
-    },
-    "end": {
-      "line": 40,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.cta.ctaDowngradeFree",
-    "defaultMessage": "!!!Downgrade to Free",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 41,
-      "column": 20
-    },
-    "end": {
-      "line": 44,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.cta.trial",
-    "defaultMessage": "!!!Start my free 14-days Trial",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 45,
-      "column": 15
-    },
-    "end": {
-      "line": 48,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.cta.upgradePersonal",
-    "defaultMessage": "!!!Choose Personal",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 49,
-      "column": 23
-    },
-    "end": {
-      "line": 52,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.cta.upgradePro",
-    "defaultMessage": "!!!Choose Professional",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 53,
-      "column": 18
-    },
-    "end": {
-      "line": 56,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.fullFeatureList",
-    "defaultMessage": "!!!Complete comparison of all plans",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 57,
-      "column": 19
-    },
-    "end": {
-      "line": 60,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.pricesBasedOnAnnualPayment",
-    "defaultMessage": "!!!All prices based on yearly payment",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 61,
-      "column": 30
-    },
-    "end": {
-      "line": 64,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/planSelection/components/PlanTeaser.json b/src/i18n/messages/src/features/planSelection/components/PlanTeaser.json
deleted file mode 100644
index 015304a2e..000000000
--- a/src/i18n/messages/src/features/planSelection/components/PlanTeaser.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "id": "subscription.interval.per",
-    "defaultMessage": "!!!per {interval}",
-    "file": "src/features/planSelection/components/PlanTeaser.js",
-    "start": {
-      "line": 16,
-      "column": 7
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.planItem.upgradeAccount",
-    "defaultMessage": "!!!Upgrade Account",
-    "file": "src/features/planSelection/components/PlanTeaser.js",
-    "start": {
-      "line": 20,
-      "column": 7
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/planSelection/containers/PlanSelectionScreen.json b/src/i18n/messages/src/features/planSelection/containers/PlanSelectionScreen.json
deleted file mode 100644
index 40e08c233..000000000
--- a/src/i18n/messages/src/features/planSelection/containers/PlanSelectionScreen.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "feature.planSelection.fullscreen.dialog.title",
-    "defaultMessage": "!!!Downgrade your Franz Plan",
-    "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
-    "start": {
-      "line": 15,
-      "column": 15
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.fullscreen.dialog.message",
-    "defaultMessage": "!!!You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-    "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
-    "start": {
-      "line": 19,
-      "column": 17
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.fullscreen.dialog.cta.downgrade",
-    "defaultMessage": "!!!Downgrade to Free",
-    "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
-    "start": {
-      "line": 23,
-      "column": 22
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.fullscreen.dialog.cta.upgrade",
-    "defaultMessage": "!!!Choose Personal",
-    "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
-    "start": {
-      "line": 27,
-      "column": 20
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/serviceLimit/components/AnnouncementScreen.json b/src/i18n/messages/src/features/serviceLimit/components/AnnouncementScreen.json
deleted file mode 100644
index e6e3cef99..000000000
--- a/src/i18n/messages/src/features/serviceLimit/components/AnnouncementScreen.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "feature.announcements.changelog.headline",
-    "defaultMessage": "!!!Changes in Franz {version}",
-    "file": "src/features/serviceLimit/components/AnnouncementScreen.js",
-    "start": {
-      "line": 20,
-      "column": 12
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/serviceLimit/components/LimitReachedInfobox.json b/src/i18n/messages/src/features/serviceLimit/components/LimitReachedInfobox.json
deleted file mode 100644
index e35ad8dd8..000000000
--- a/src/i18n/messages/src/features/serviceLimit/components/LimitReachedInfobox.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "id": "feature.serviceLimit.limitReached",
-    "defaultMessage": "!!!You have added {amount} of {limit} services. Please upgrade your account to add more services.",
-    "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
-    "start": {
-      "line": 9,
-      "column": 16
-    },
-    "end": {
-      "line": 12,
-      "column": 3
-    }
-  },
-  {
-    "id": "premiumFeature.button.upgradeAccount",
-    "defaultMessage": "!!!Upgrade account",
-    "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/shareFranz/Component.json b/src/i18n/messages/src/features/shareFranz/Component.json
index 402865ec5..428bd5fbc 100644
--- a/src/i18n/messages/src/features/shareFranz/Component.json
+++ b/src/i18n/messages/src/features/shareFranz/Component.json
@@ -66,7 +66,7 @@
   },
   {
     "id": "feature.shareFranz.shareText.email",
-    "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+    "defaultMessage": "!!! I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
     "file": "src/features/shareFranz/Component.js",
     "start": {
       "line": 37,
@@ -79,7 +79,7 @@
   },
   {
     "id": "feature.shareFranz.shareText.twitter",
-    "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger",
+    "defaultMessage": "!!! I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger",
     "file": "src/features/shareFranz/Component.js",
     "start": {
       "line": 41,
diff --git a/src/i18n/messages/src/features/todos/components/TodosWebview.json b/src/i18n/messages/src/features/todos/components/TodosWebview.json
deleted file mode 100644
index ff6e037fc..000000000
--- a/src/i18n/messages/src/features/todos/components/TodosWebview.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "feature.todos.premium.info",
-    "defaultMessage": "!!!Franz Todos are available to premium users now!",
-    "file": "src/features/todos/components/TodosWebview.js",
-    "start": {
-      "line": 31,
-      "column": 15
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.todos.premium.upgrade",
-    "defaultMessage": "!!!Upgrade Account",
-    "file": "src/features/todos/components/TodosWebview.js",
-    "start": {
-      "line": 35,
-      "column": 14
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.todos.premium.rollout",
-    "defaultMessage": "!!!Everyone else will have to wait a little longer.",
-    "file": "src/features/todos/components/TodosWebview.js",
-    "start": {
-      "line": 39,
-      "column": 15
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/trialStatusBar/components/TrialStatusBar.json b/src/i18n/messages/src/features/trialStatusBar/components/TrialStatusBar.json
deleted file mode 100644
index bf211a016..000000000
--- a/src/i18n/messages/src/features/trialStatusBar/components/TrialStatusBar.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "feature.trialStatusBar.restTime",
-    "defaultMessage": "!!!Your Free Franz {plan} Trial ends in {time}.",
-    "file": "src/features/trialStatusBar/components/TrialStatusBar.js",
-    "start": {
-      "line": 13,
-      "column": 12
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.trialStatusBar.expired",
-    "defaultMessage": "!!!Your free Franz {plan} Trial has expired, please upgrade your account.",
-    "file": "src/features/trialStatusBar/components/TrialStatusBar.js",
-    "start": {
-      "line": 17,
-      "column": 11
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.trialStatusBar.cta",
-    "defaultMessage": "!!!Upgrade now",
-    "file": "src/features/trialStatusBar/components/TrialStatusBar.js",
-    "start": {
-      "line": 21,
-      "column": 7
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/trialStatusBar/containers/TrialStatusBarScreen.json b/src/i18n/messages/src/features/trialStatusBar/containers/TrialStatusBarScreen.json
deleted file mode 100644
index 306cd0fee..000000000
--- a/src/i18n/messages/src/features/trialStatusBar/containers/TrialStatusBarScreen.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "feature.trialStatusBar.fullscreen.dialog.title",
-    "defaultMessage": "!!!Downgrade your Franz Plan",
-    "file": "src/features/trialStatusBar/containers/TrialStatusBarScreen.js",
-    "start": {
-      "line": 16,
-      "column": 15
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.trialStatusBar.fullscreen.dialog.message",
-    "defaultMessage": "!!!You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-    "file": "src/features/trialStatusBar/containers/TrialStatusBarScreen.js",
-    "start": {
-      "line": 20,
-      "column": 17
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.trialStatusBar.fullscreen.dialog.cta.downgrade",
-    "defaultMessage": "!!!Downgrade to Free",
-    "file": "src/features/trialStatusBar/containers/TrialStatusBarScreen.js",
-    "start": {
-      "line": 24,
-      "column": 22
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.trialStatusBar.fullscreen.dialog.cta.upgrade",
-    "defaultMessage": "!!!Choose Personal",
-    "file": "src/features/trialStatusBar/containers/TrialStatusBarScreen.js",
-    "start": {
-      "line": 28,
-      "column": 20
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/webControls/components/WebControls.json b/src/i18n/messages/src/features/webControls/components/WebControls.json
index 969437e98..7676ec0b1 100644
--- a/src/i18n/messages/src/features/webControls/components/WebControls.json
+++ b/src/i18n/messages/src/features/webControls/components/WebControls.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Home",
     "file": "src/features/webControls/components/WebControls.js",
     "start": {
-      "line": 13,
+      "line": 17,
       "column": 10
     },
     "end": {
-      "line": 16,
+      "line": 20,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Open in Browser",
     "file": "src/features/webControls/components/WebControls.js",
     "start": {
-      "line": 17,
+      "line": 21,
       "column": 17
     },
     "end": {
-      "line": 20,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Back",
     "file": "src/features/webControls/components/WebControls.js",
     "start": {
-      "line": 21,
+      "line": 25,
       "column": 8
     },
     "end": {
-      "line": 24,
+      "line": 28,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Forward",
     "file": "src/features/webControls/components/WebControls.js",
     "start": {
-      "line": 25,
+      "line": 29,
       "column": 11
     },
     "end": {
-      "line": 28,
+      "line": 32,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Reload",
     "file": "src/features/webControls/components/WebControls.js",
     "start": {
-      "line": 29,
+      "line": 33,
       "column": 10
     },
     "end": {
-      "line": 32,
+      "line": 36,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
index 9f0935620..431f12710 100644
--- a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 16,
+      "line": 15,
       "column": 12
     },
     "end": {
-      "line": 19,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!All services",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 20,
+      "line": 19,
       "column": 15
     },
     "end": {
-      "line": 23,
+      "line": 22,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Workspaces settings",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 24,
+      "line": 23,
       "column": 29
     },
     "end": {
-      "line": 27,
+      "line": 26,
       "column": 3
     }
   },
@@ -43,37 +43,11 @@
     "defaultMessage": "!!!Info about workspace feature",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 28,
+      "line": 27,
       "column": 24
     },
     "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.premiumCtaButtonLabel",
-    "defaultMessage": "!!!Create your first workspace",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 32,
-      "column": 25
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.reactivatePremiumAccountLabel",
-    "defaultMessage": "!!!Reactivate premium account",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 36,
-      "column": 28
-    },
-    "end": {
-      "line": 39,
+      "line": 30,
       "column": 3
     }
   },
@@ -82,24 +56,11 @@
     "defaultMessage": "!!!add new workspace",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 40,
+      "line": 31,
       "column": 24
     },
     "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.proFeatureBadge",
-    "defaultMessage": "!!!Premium feature",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 44,
-      "column": 23
-    },
-    "end": {
-      "line": 47,
+      "line": 34,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
index d67bc492d..39c9c30fb 100644
--- a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Your workspaces",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 20,
+      "line": 17,
       "column": 12
     },
     "end": {
-      "line": 23,
+      "line": 20,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!You haven't created any workspaces yet.",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 24,
+      "line": 21,
       "column": 19
     },
     "end": {
-      "line": 27,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Could not load your workspaces",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 28,
+      "line": 25,
       "column": 27
     },
     "end": {
-      "line": 31,
+      "line": 28,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Try again",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 32,
+      "line": 29,
       "column": 23
     },
     "end": {
-      "line": 35,
+      "line": 32,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Your changes have been saved",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 36,
+      "line": 33,
       "column": 15
     },
     "end": {
-      "line": 39,
+      "line": 36,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Workspace has been deleted",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 40,
+      "line": 37,
       "column": 15
     },
     "end": {
-      "line": 43,
+      "line": 40,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Info about workspace feature",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 44,
+      "line": 41,
       "column": 24
     },
     "end": {
-      "line": 47,
+      "line": 44,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Less is More: Introducing Ferdi Workspaces",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 48,
+      "line": 45,
       "column": 28
     },
     "end": {
-      "line": 51,
+      "line": 48,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/helpers/plan-helpers.json b/src/i18n/messages/src/helpers/plan-helpers.json
deleted file mode 100644
index 3f3e7e85d..000000000
--- a/src/i18n/messages/src/helpers/plan-helpers.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "pricing.plan.pro",
-    "defaultMessage": "!!!Professional",
-    "file": "src/helpers/plan-helpers.js",
-    "start": {
-      "line": 5,
-      "column": 15
-    },
-    "end": {
-      "line": 8,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.plan.personal",
-    "defaultMessage": "!!!Personal",
-    "file": "src/helpers/plan-helpers.js",
-    "start": {
-      "line": 9,
-      "column": 20
-    },
-    "end": {
-      "line": 12,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.plan.free",
-    "defaultMessage": "!!!Free",
-    "file": "src/helpers/plan-helpers.js",
-    "start": {
-      "line": 13,
-      "column": 16
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.plan.legacy",
-    "defaultMessage": "!!!Premium",
-    "file": "src/helpers/plan-helpers.js",
-    "start": {
-      "line": 17,
-      "column": 18
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/helpers/pricing-helpers.json b/src/i18n/messages/src/helpers/pricing-helpers.json
deleted file mode 100644
index 4030a3e3b..000000000
--- a/src/i18n/messages/src/helpers/pricing-helpers.json
+++ /dev/null
@@ -1,80 +0,0 @@
-[
-  {
-    "id": "pricing.plan.pro-yearly",
-    "defaultMessage": "!!!Franz Professional Yearly",
-    "file": "src/helpers/pricing-helpers.js",
-    "start": {
-      "line": 5,
-      "column": 22
-    },
-    "end": {
-      "line": 8,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.plan.pro-monthly",
-    "defaultMessage": "!!!Franz Professional Monthly",
-    "file": "src/helpers/pricing-helpers.js",
-    "start": {
-      "line": 9,
-      "column": 23
-    },
-    "end": {
-      "line": 12,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.plan.personal-yearly",
-    "defaultMessage": "!!!Franz Personal Yearly",
-    "file": "src/helpers/pricing-helpers.js",
-    "start": {
-      "line": 13,
-      "column": 27
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.plan.personal-monthly",
-    "defaultMessage": "!!!Franz Personal Monthly",
-    "file": "src/helpers/pricing-helpers.js",
-    "start": {
-      "line": 17,
-      "column": 28
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.plan.free",
-    "defaultMessage": "!!!Franz Free",
-    "file": "src/helpers/pricing-helpers.js",
-    "start": {
-      "line": 21,
-      "column": 16
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.plan.legacy",
-    "defaultMessage": "!!!Franz Premium",
-    "file": "src/helpers/pricing-helpers.js",
-    "start": {
-      "line": 25,
-      "column": 18
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/i18n/globalMessages.json b/src/i18n/messages/src/i18n/globalMessages.json
index 5778a3389..ed2bfa092 100644
--- a/src/i18n/messages/src/i18n/globalMessages.json
+++ b/src/i18n/messages/src/i18n/globalMessages.json
@@ -102,18 +102,5 @@
       "line": 35,
       "column": 3
     }
-  },
-  {
-    "id": "global.franzProRequired",
-    "defaultMessage": "!!!Franz Professional Required",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 36,
-      "column": 15
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
   }
 ]
\ No newline at end of file
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index 5b185c4e7..e8fa0d10b 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Edit",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 19,
+      "line": 20,
       "column": 8
     },
     "end": {
-      "line": 22,
+      "line": 23,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Undo",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 23,
+      "line": 24,
       "column": 8
     },
     "end": {
-      "line": 26,
+      "line": 27,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Redo",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 27,
+      "line": 28,
       "column": 8
     },
     "end": {
-      "line": 30,
+      "line": 31,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Cut",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 31,
+      "line": 32,
       "column": 7
     },
     "end": {
-      "line": 34,
+      "line": 35,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Copy",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 35,
+      "line": 36,
       "column": 8
     },
     "end": {
-      "line": 38,
+      "line": 39,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Paste",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 39,
+      "line": 40,
       "column": 9
     },
     "end": {
-      "line": 42,
+      "line": 43,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Paste And Match Style",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 43,
+      "line": 44,
       "column": 22
     },
     "end": {
-      "line": 46,
+      "line": 47,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Delete",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 47,
+      "line": 48,
       "column": 10
     },
     "end": {
-      "line": 50,
+      "line": 51,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Select All",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 51,
+      "line": 52,
       "column": 13
     },
     "end": {
-      "line": 54,
+      "line": 55,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Find in Page",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 55,
+      "line": 56,
       "column": 14
     },
     "end": {
-      "line": 58,
+      "line": 59,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Speech",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 59,
+      "line": 60,
       "column": 10
     },
     "end": {
-      "line": 62,
+      "line": 63,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Start Speaking",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 63,
+      "line": 64,
       "column": 17
     },
     "end": {
-      "line": 66,
+      "line": 67,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Stop Speaking",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 67,
+      "line": 68,
       "column": 16
     },
     "end": {
-      "line": 70,
+      "line": 71,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Start Dictation",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 71,
+      "line": 72,
       "column": 18
     },
     "end": {
-      "line": 74,
+      "line": 75,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!Emoji & Symbols",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 75,
+      "line": 76,
       "column": 16
     },
     "end": {
-      "line": 78,
+      "line": 79,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Open Quick Switch",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 79,
+      "line": 80,
       "column": 19
     },
     "end": {
-      "line": 82,
+      "line": 83,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!Back",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 83,
+      "line": 84,
       "column": 8
     },
     "end": {
-      "line": 86,
+      "line": 87,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!Forward",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 87,
+      "line": 88,
       "column": 11
     },
     "end": {
-      "line": 90,
+      "line": 91,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!Actual Size",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 91,
+      "line": 92,
       "column": 13
     },
     "end": {
-      "line": 94,
+      "line": 95,
       "column": 3
     }
   },
@@ -251,11 +251,11 @@
     "defaultMessage": "!!!Zoom In",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 95,
+      "line": 96,
       "column": 10
     },
     "end": {
-      "line": 98,
+      "line": 99,
       "column": 3
     }
   },
@@ -264,37 +264,11 @@
     "defaultMessage": "!!!Zoom Out",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 99,
+      "line": 100,
       "column": 11
     },
     "end": {
-      "line": 102,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.enterFullScreen",
-    "defaultMessage": "!!!Enter Full Screen",
-    "file": "src/lib/Menu.js",
-    "start": {
       "line": 103,
-      "column": 19
-    },
-    "end": {
-      "line": 106,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.exitFullScreen",
-    "defaultMessage": "!!!Exit Full Screen",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 107,
-      "column": 18
-    },
-    "end": {
-      "line": 110,
       "column": 3
     }
   },
@@ -303,11 +277,11 @@
     "defaultMessage": "!!!Toggle Full Screen",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 111,
+      "line": 104,
       "column": 20
     },
     "end": {
-      "line": 114,
+      "line": 107,
       "column": 3
     }
   },
@@ -316,11 +290,11 @@
     "defaultMessage": "!!!Toggle Dark Mode",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 115,
+      "line": 108,
       "column": 18
     },
     "end": {
-      "line": 118,
+      "line": 111,
       "column": 3
     }
   },
@@ -329,11 +303,11 @@
     "defaultMessage": "!!!Toggle Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 119,
+      "line": 112,
       "column": 18
     },
     "end": {
-      "line": 122,
+      "line": 115,
       "column": 3
     }
   },
@@ -342,11 +316,11 @@
     "defaultMessage": "!!!Toggle Todos Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 123,
+      "line": 116,
       "column": 23
     },
     "end": {
-      "line": 126,
+      "line": 119,
       "column": 3
     }
   },
@@ -355,11 +329,11 @@
     "defaultMessage": "!!!Toggle Service Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 127,
+      "line": 120,
       "column": 25
     },
     "end": {
-      "line": 130,
+      "line": 123,
       "column": 3
     }
   },
@@ -368,24 +342,24 @@
     "defaultMessage": "!!!Reload Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 131,
+      "line": 124,
       "column": 17
     },
     "end": {
-      "line": 134,
+      "line": 127,
       "column": 3
     }
   },
   {
-    "id": "menu.view.reloadFranz",
+    "id": "menu.view.reloadFerdi",
     "defaultMessage": "!!!Reload Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 135,
+      "line": 128,
       "column": 15
     },
     "end": {
-      "line": 138,
+      "line": 131,
       "column": 3
     }
   },
@@ -394,11 +368,11 @@
     "defaultMessage": "!!!Lock Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 139,
+      "line": 132,
       "column": 13
     },
     "end": {
-      "line": 142,
+      "line": 135,
       "column": 3
     }
   },
@@ -407,11 +381,11 @@
     "defaultMessage": "!!!Reload ToDos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 143,
+      "line": 136,
       "column": 15
     },
     "end": {
-      "line": 146,
+      "line": 139,
       "column": 3
     }
   },
@@ -420,11 +394,11 @@
     "defaultMessage": "!!!Minimize",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 147,
+      "line": 140,
       "column": 12
     },
     "end": {
-      "line": 150,
+      "line": 143,
       "column": 3
     }
   },
@@ -433,11 +407,11 @@
     "defaultMessage": "!!!Close",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 151,
+      "line": 144,
       "column": 9
     },
     "end": {
-      "line": 154,
+      "line": 147,
       "column": 3
     }
   },
@@ -446,11 +420,11 @@
     "defaultMessage": "!!!Learn More",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 155,
+      "line": 148,
       "column": 13
     },
     "end": {
-      "line": 158,
+      "line": 151,
       "column": 3
     }
   },
@@ -459,11 +433,24 @@
     "defaultMessage": "!!!Changelog",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 159,
+      "line": 152,
       "column": 13
     },
     "end": {
-      "line": 162,
+      "line": 155,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help.importExportData",
+    "defaultMessage": "!!!Import/Export Configuration Data",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 156,
+      "column": 20
+    },
+    "end": {
+      "line": 159,
       "column": 3
     }
   },
@@ -472,11 +459,11 @@
     "defaultMessage": "!!!Support",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 163,
+      "line": 160,
       "column": 11
     },
     "end": {
-      "line": 166,
+      "line": 163,
       "column": 3
     }
   },
@@ -485,11 +472,11 @@
     "defaultMessage": "!!!Copy Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 167,
+      "line": 164,
       "column": 13
     },
     "end": {
-      "line": 170,
+      "line": 167,
       "column": 3
     }
   },
@@ -498,11 +485,11 @@
     "defaultMessage": "!!!Publish Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 171,
+      "line": 168,
       "column": 20
     },
     "end": {
-      "line": 174,
+      "line": 171,
       "column": 3
     }
   },
@@ -511,11 +498,11 @@
     "defaultMessage": "!!!Ferdi Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 175,
+      "line": 172,
       "column": 27
     },
     "end": {
-      "line": 178,
+      "line": 175,
       "column": 3
     }
   },
@@ -524,11 +511,11 @@
     "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 179,
+      "line": 176,
       "column": 23
     },
     "end": {
-      "line": 182,
+      "line": 179,
       "column": 3
     }
   },
@@ -537,11 +524,11 @@
     "defaultMessage": "!!!Unlock with Touch ID",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 183,
+      "line": 180,
       "column": 11
     },
     "end": {
-      "line": 186,
+      "line": 183,
       "column": 3
     }
   },
@@ -550,11 +537,11 @@
     "defaultMessage": "!!!unlock via Touch ID",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 187,
+      "line": 184,
       "column": 17
     },
     "end": {
-      "line": 190,
+      "line": 187,
       "column": 3
     }
   },
@@ -563,11 +550,11 @@
     "defaultMessage": "!!!Terms of Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 191,
+      "line": 188,
       "column": 7
     },
     "end": {
-      "line": 194,
+      "line": 191,
       "column": 3
     }
   },
@@ -576,11 +563,11 @@
     "defaultMessage": "!!!Privacy Statement",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 195,
+      "line": 192,
       "column": 11
     },
     "end": {
-      "line": 198,
+      "line": 195,
       "column": 3
     }
   },
@@ -589,11 +576,11 @@
     "defaultMessage": "!!!File",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 199,
+      "line": 196,
       "column": 8
     },
     "end": {
-      "line": 202,
+      "line": 199,
       "column": 3
     }
   },
@@ -602,11 +589,11 @@
     "defaultMessage": "!!!View",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 203,
+      "line": 200,
       "column": 8
     },
     "end": {
-      "line": 206,
+      "line": 203,
       "column": 3
     }
   },
@@ -615,11 +602,11 @@
     "defaultMessage": "!!!Services",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 207,
+      "line": 204,
       "column": 12
     },
     "end": {
-      "line": 210,
+      "line": 207,
       "column": 3
     }
   },
@@ -628,11 +615,11 @@
     "defaultMessage": "!!!Window",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 211,
+      "line": 208,
       "column": 10
     },
     "end": {
-      "line": 214,
+      "line": 211,
       "column": 3
     }
   },
@@ -641,11 +628,11 @@
     "defaultMessage": "!!!Help",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 215,
+      "line": 212,
       "column": 8
     },
     "end": {
-      "line": 218,
+      "line": 215,
       "column": 3
     }
   },
@@ -654,11 +641,11 @@
     "defaultMessage": "!!!About Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 219,
+      "line": 216,
       "column": 9
     },
     "end": {
-      "line": 222,
+      "line": 219,
       "column": 3
     }
   },
@@ -667,11 +654,11 @@
     "defaultMessage": "!!!What's new?",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 223,
+      "line": 220,
       "column": 16
     },
     "end": {
-      "line": 226,
+      "line": 223,
       "column": 3
     }
   },
@@ -680,11 +667,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 227,
+      "line": 224,
       "column": 12
     },
     "end": {
-      "line": 230,
+      "line": 227,
       "column": 3
     }
   },
@@ -693,11 +680,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 231,
+      "line": 228,
       "column": 19
     },
     "end": {
-      "line": 234,
+      "line": 231,
       "column": 3
     }
   },
@@ -706,11 +693,11 @@
     "defaultMessage": "!!!Hide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 235,
+      "line": 232,
       "column": 8
     },
     "end": {
-      "line": 238,
+      "line": 235,
       "column": 3
     }
   },
@@ -719,11 +706,11 @@
     "defaultMessage": "!!!Hide Others",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 239,
+      "line": 236,
       "column": 14
     },
     "end": {
-      "line": 242,
+      "line": 239,
       "column": 3
     }
   },
@@ -732,11 +719,11 @@
     "defaultMessage": "!!!Unhide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 243,
+      "line": 240,
       "column": 10
     },
     "end": {
-      "line": 246,
+      "line": 243,
       "column": 3
     }
   },
@@ -745,11 +732,11 @@
     "defaultMessage": "!!!Auto-hide menu bar",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 247,
+      "line": 244,
       "column": 19
     },
     "end": {
-      "line": 250,
+      "line": 247,
       "column": 3
     }
   },
@@ -758,11 +745,11 @@
     "defaultMessage": "!!!Quit",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 251,
+      "line": 248,
       "column": 8
     },
     "end": {
-      "line": 254,
+      "line": 251,
       "column": 3
     }
   },
@@ -771,11 +758,11 @@
     "defaultMessage": "!!!Add New Service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 255,
+      "line": 252,
       "column": 17
     },
     "end": {
-      "line": 258,
+      "line": 255,
       "column": 3
     }
   },
@@ -784,11 +771,11 @@
     "defaultMessage": "!!!Add New Workspace...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 259,
+      "line": 256,
       "column": 19
     },
     "end": {
-      "line": 262,
+      "line": 259,
       "column": 3
     }
   },
@@ -797,11 +784,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 263,
+      "line": 260,
       "column": 23
     },
     "end": {
-      "line": 266,
+      "line": 263,
       "column": 3
     }
   },
@@ -810,11 +797,11 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 267,
+      "line": 264,
       "column": 24
     },
     "end": {
-      "line": 270,
+      "line": 267,
       "column": 3
     }
   },
@@ -823,11 +810,11 @@
     "defaultMessage": "!!!Activate next service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 271,
+      "line": 268,
       "column": 23
     },
     "end": {
-      "line": 274,
+      "line": 271,
       "column": 3
     }
   },
@@ -836,11 +823,11 @@
     "defaultMessage": "!!!Activate previous service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 275,
+      "line": 272,
       "column": 27
     },
     "end": {
-      "line": 278,
+      "line": 275,
       "column": 3
     }
   },
@@ -849,11 +836,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 279,
+      "line": 276,
       "column": 11
     },
     "end": {
-      "line": 282,
+      "line": 279,
       "column": 3
     }
   },
@@ -862,11 +849,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 283,
+      "line": 280,
       "column": 13
     },
     "end": {
-      "line": 286,
+      "line": 283,
       "column": 3
     }
   },
@@ -875,11 +862,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 287,
+      "line": 284,
       "column": 14
     },
     "end": {
-      "line": 290,
+      "line": 287,
       "column": 3
     }
   },
@@ -888,11 +875,11 @@
     "defaultMessage": "!!!Default",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 291,
+      "line": 288,
       "column": 20
     },
     "end": {
-      "line": 294,
+      "line": 291,
       "column": 3
     }
   },
@@ -901,11 +888,11 @@
     "defaultMessage": "!!!Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 295,
+      "line": 292,
       "column": 9
     },
     "end": {
-      "line": 298,
+      "line": 295,
       "column": 3
     }
   },
@@ -914,11 +901,11 @@
     "defaultMessage": "!!!Open Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 299,
+      "line": 296,
       "column": 19
     },
     "end": {
-      "line": 302,
+      "line": 299,
       "column": 3
     }
   },
@@ -927,11 +914,11 @@
     "defaultMessage": "!!!Close Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 303,
+      "line": 300,
       "column": 20
     },
     "end": {
-      "line": 306,
+      "line": 303,
       "column": 3
     }
   },
@@ -940,11 +927,11 @@
     "defaultMessage": "!!!Enable Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 307,
+      "line": 304,
       "column": 15
     },
     "end": {
-      "line": 310,
+      "line": 307,
       "column": 3
     }
   },
@@ -953,11 +940,11 @@
     "defaultMessage": "!!!Home",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 311,
+      "line": 308,
       "column": 17
     },
     "end": {
-      "line": 314,
+      "line": 311,
       "column": 3
     }
   }
diff --git a/src/index.html b/src/index.html
index 6b67cc248..929aec3ad 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,60 +1,84 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-  <title>Ferdi</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-  <link rel="stylesheet" type="text/css" href="./styles/main.css" />
-  <script type="text/javascript" src="./app.js"></script>
-</head>
-<body>
-  <div class="window-draggable"></div>
-  <div class="dev-warning">DEV MODE</div>
-  <div id="root"></div>
-  <div id="portalContainer"></div>
-  <script>
-    document.querySelector('body').classList.add(process.env.OS_PLATFORM ? process.env.OS_PLATFORM : process.platform);
+  <head>
+    <title>Ferdi</title>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="stylesheet" type="text/css" href="./styles/main.css" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="./styles/animations.css"
+      media="(prefers-reduced-motion: no-preference)"
+    />
+    <script type="text/javascript" src="./app.js"></script>
+  </head>
+  <body>
+    <div class="window-draggable"></div>
+    <div class="dev-warning">DEV MODE</div>
+    <div id="root"></div>
+    <div id="portalContainer"></div>
+    <script>
+      document
+        .querySelector('body')
+        .classList.add(
+          process.env.OS_PLATFORM ? process.env.OS_PLATFORM : process.platform,
+        );
 
-    require('./sentry')
-    const { isDevMode } = require('./environment');
-    if (isDevMode) {
-      const debugging = require('debug');
-      debugging.enable(process.env.DEBUG);
+      require('./sentry');
+      const { isDevMode } = require('./environment');
+      if (isDevMode) {
+        const debugging = require('debug');
+        debugging.enable(process.env.DEBUG);
 
-      const debug = debugging('Index');
+        const debug = debugging('Index');
 
-      document.querySelector('body').classList.add('isDevMode');
+        document.querySelector('body').classList.add('isDevMode');
 
-      (function() {
-        const lrHost = 'http://localhost:35729';
-        const s = document.createElement('script');
-        s.async = true;
-        s.setAttribute('src', lrHost + '/livereload.js');
-        document.body.appendChild(s);
+        (function () {
+          const lrHost = 'http://localhost:35729';
+          const s = document.createElement('script');
+          s.async = true;
+          s.setAttribute('src', lrHost + '/livereload.js');
+          document.body.appendChild(s);
 
-        s.onload = () => {
-          debug('livereload loaded');
-          const originalReloadBehaviour = window._onLiveReloadFileChanged;
+          s.onload = () => {
+            debug('livereload loaded');
+            const originalReloadBehaviour = window._onLiveReloadFileChanged;
 
-          window._onLiveReloadFileChanged = (file) => {
-            const isTodoPreloadPath = file.path.includes('/build/features/todos/preload.js');
-            if (!file.path.includes('/build/webview/') && !file.path.includes('/build/index.js') && !file.path.includes('/build/electron/') && !isTodoPreloadPath) {
-              originalReloadBehaviour(file);
-            } else {
-              if (isTodoPreloadPath) {
-                debug('Livereload: Reloading all webviews');
-                const webview = document.querySelector('webview[partition="persist:todos"]');
-                if (webview) webview.reload();
-              } else if (file.path.includes('/build/webview/')) {
-                debug('Livereload: Reloading all webviews');
-                const webviews = document.querySelectorAll('webview').forEach(webview => webview.reload());
+            window._onLiveReloadFileChanged = file => {
+              const isTodoPreloadPath = file.path.includes(
+                '/build/features/todos/preload.js',
+              );
+              if (
+                !file.path.includes('/build/webview/') &&
+                !file.path.includes('/build/index.js') &&
+                !file.path.includes('/build/electron/') &&
+                !isTodoPreloadPath
+              ) {
+                originalReloadBehaviour(file);
               } else {
-                debug('Livereload: skip reload as only main process files have changed');
+                if (isTodoPreloadPath) {
+                  debug('Livereload: Reloading all webviews');
+                  const webview = document.querySelector(
+                    'webview[partition="persist:todos"]',
+                  );
+                  if (webview) webview.reload();
+                } else if (file.path.includes('/build/webview/')) {
+                  debug('Livereload: Reloading all webviews');
+                  const webviews = document
+                    .querySelectorAll('webview')
+                    .forEach(webview => webview.reload());
+                } else {
+                  debug(
+                    'Livereload: skip reload as only main process files have changed',
+                  );
+                }
               }
-            }
-          }
-        }
-      })();
-    }
-  </script>
-</body>
+            };
+          };
+        })();
+      }
+    </script>
+  </body>
 </html>
diff --git a/src/index.js b/src/index.js
index 91004aac7..9146a23da 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,15 +1,9 @@
 /* eslint-disable import/first */
 
-import {
-  app,
-  BrowserWindow,
-  shell,
-  ipcMain,
-  session,
-} from 'electron';
-
-import fs from 'fs-extra';
-import path from 'path';
+import { app, BrowserWindow, shell, ipcMain, session } from 'electron';
+
+import { emptyDirSync, ensureFileSync } from 'fs-extra';
+import { join } from 'path';
 import windowStateKeeper from 'electron-window-state';
 import { enforceMacOSAppLocation } from 'electron-util';
 import ms from 'ms';
@@ -25,6 +19,8 @@ import {
   isWindows,
   isLinux,
   aboutAppDetails,
+  userDataRecipesPath,
+  userDataPath,
 } from './environment';
 
 import { mainIpcHandler as basicAuthHandler } from './features/basicAuth';
@@ -69,8 +65,8 @@ function onDidLoad(fn) {
 }
 
 // Ensure that the recipe directory exists
-fs.emptyDirSync(path.join(app.getPath('userData'), 'recipes', 'temp'));
-fs.ensureFileSync(path.join(app.getPath('userData'), 'window-state.json'));
+emptyDirSync(userDataRecipesPath('temp'));
+ensureFileSync(userDataPath('window-state.json'));
 
 // Set App ID for Windows
 if (isWindows) {
@@ -90,7 +86,9 @@ if (settings.get('sentry')) {
 const liftSingleInstanceLock = settings.get('liftSingleInstanceLock') || false;
 
 // Force single window
-const gotTheLock = liftSingleInstanceLock ? true : app.requestSingleInstanceLock();
+const gotTheLock = liftSingleInstanceLock
+  ? true
+  : app.requestSingleInstanceLock();
 if (!gotTheLock) {
   app.quit();
 } else {
@@ -106,7 +104,7 @@ if (!gotTheLock) {
       mainWindow.focus();
 
       if (isWindows) {
-        onDidLoad((window) => {
+        onDidLoad(window => {
           // Keep only command line / deep linked arguments
           const url = argv.slice(1);
           if (url) {
@@ -117,8 +115,14 @@ if (!gotTheLock) {
             // Needs to be delayed to not interfere with mainWindow.restore();
             setTimeout(() => {
               debug('Resetting windows via Task');
-              window.setPosition(DEFAULT_WINDOW_OPTIONS.x + 100, DEFAULT_WINDOW_OPTIONS.y + 100);
-              window.setSize(DEFAULT_WINDOW_OPTIONS.width, DEFAULT_WINDOW_OPTIONS.height);
+              window.setPosition(
+                DEFAULT_WINDOW_OPTIONS.x + 100,
+                DEFAULT_WINDOW_OPTIONS.y + 100,
+              );
+              window.setSize(
+                DEFAULT_WINDOW_OPTIONS.width,
+                DEFAULT_WINDOW_OPTIONS.height,
+              );
             }, 1);
           } else if (argv.includes('--quit')) {
             // Needs to be delayed to not interfere with mainWindow.restore();
@@ -135,7 +139,10 @@ if (!gotTheLock) {
 
 // Fix Unity indicator issue
 // https://github.com/electron/electron/issues/9046
-if (isLinux && ['Pantheon', 'Unity:Unity7'].indexOf(process.env.XDG_CURRENT_DESKTOP) !== -1) {
+if (
+  isLinux &&
+  ['Pantheon', 'Unity:Unity7'].indexOf(process.env.XDG_CURRENT_DESKTOP) !== -1
+) {
   process.env.XDG_CURRENT_DESKTOP = 'Unity';
 }
 
@@ -169,7 +176,9 @@ const createWindow = () => {
   }
 
   // Create the browser window.
-  const backgroundColor = settings.get('darkMode') ? '#1E1E1E' : settings.get('accentColor');
+  const backgroundColor = settings.get('darkMode')
+    ? '#1E1E1E'
+    : settings.get('accentColor');
 
   mainWindow = new BrowserWindow({
     x: posX,
@@ -181,19 +190,20 @@ const createWindow = () => {
     show: false,
     titleBarStyle: isMac ? 'hidden' : '',
     frame: isLinux,
+    spellcheck: settings.get('enableSpellchecking'),
     backgroundColor,
     webPreferences: {
       nodeIntegration: true,
       contextIsolation: false,
       webviewTag: true,
-      preload: path.join(__dirname, 'sentry.js'),
+      preload: join(__dirname, 'sentry.js'),
       enableRemoteModule: true,
     },
   });
 
   app.on('web-contents-created', (e, contents) => {
     if (contents.getType() === 'webview') {
-      contents.on('new-window', (event) => {
+      contents.on('new-window', event => {
         event.preventDefault();
       });
     }
@@ -242,7 +252,7 @@ const createWindow = () => {
 
   // Windows deep linking handling on app launch
   if (isWindows) {
-    onDidLoad((window) => {
+    onDidLoad(window => {
       const url = process.argv.slice(1);
       if (url) {
         handleDeepLink(window, url.toString());
@@ -251,12 +261,16 @@ const createWindow = () => {
   }
 
   // Emitted when the window is closed.
-  mainWindow.on('close', (e) => {
+  mainWindow.on('close', e => {
     debug('Window: close window');
     // Dereference the window object, usually you would store windows
     // in an array if your app supports multi windows, this is the time
     // when you should delete the corresponding element.
-    if (!willQuitApp && (settings.get('runInBackground') === undefined || settings.get('runInBackground'))) {
+    if (
+      !willQuitApp &&
+      (settings.get('runInBackground') === undefined ||
+        settings.get('runInBackground'))
+    ) {
       e.preventDefault();
       if (isWindows) {
         debug('Window: minimize');
@@ -315,7 +329,7 @@ const createWindow = () => {
 
   if (isMac) {
     // eslint-disable-next-line global-require
-    const { default: askFormacOSPermissions } = require('./electron/macOSPermissions');
+    const { askFormacOSPermissions } = require('./electron/macOSPermissions');
     setTimeout(() => askFormacOSPermissions(mainWindow), ms('30s'));
   }
 
@@ -351,15 +365,24 @@ const createWindow = () => {
 const argv = require('minimist')(process.argv.slice(1));
 
 if (argv['auth-server-whitelist']) {
-  app.commandLine.appendSwitch('auth-server-whitelist', argv['auth-server-whitelist']);
+  app.commandLine.appendSwitch(
+    'auth-server-whitelist',
+    argv['auth-server-whitelist'],
+  );
 }
 if (argv['auth-negotiate-delegate-whitelist']) {
-  app.commandLine.appendSwitch('auth-negotiate-delegate-whitelist', argv['auth-negotiate-delegate-whitelist']);
+  app.commandLine.appendSwitch(
+    'auth-negotiate-delegate-whitelist',
+    argv['auth-negotiate-delegate-whitelist'],
+  );
 }
 
 // Disable Chromium's poor MPRIS implementation
 // and apply workaround for https://github.com/electron/electron/pull/26432
-app.commandLine.appendSwitch('disable-features', 'HardwareMediaKeyHandling,MediaSessionService,CrossOriginOpenerPolicy');
+app.commandLine.appendSwitch(
+  'disable-features',
+  'HardwareMediaKeyHandling,MediaSessionService,CrossOriginOpenerPolicy',
+);
 
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
@@ -369,26 +392,36 @@ app.on('ready', () => {
   enforceMacOSAppLocation();
 
   // Register App URL
-  app.setAsDefaultProtocolClient('ferdi');
-
   if (isDevMode) {
     app.setAsDefaultProtocolClient('ferdi-dev');
+  } else {
+    app.setAsDefaultProtocolClient('ferdi');
   }
 
   if (isWindows) {
-    app.setUserTasks([{
-      program: process.execPath,
-      arguments: `${isDevMode ? `${__dirname} ` : ''}--reset-window`,
-      iconPath: asarPath(path.join(isDevMode ? `${__dirname}../src/` : __dirname, 'assets/images/taskbar/win32/display.ico')),
-      iconIndex: 0,
-      title: 'Move Ferdi to Current Display',
-      description: 'Restore the position and size of Ferdi',
-    }, {
-      program: process.execPath,
-      arguments: `${isDevMode ? `${__dirname} ` : ''}--quit`,
-      iconIndex: 0,
-      title: 'Quit Ferdi',
-    }]);
+    app.setUserTasks([
+      {
+        program: process.execPath,
+        arguments: `${isDevMode ? `${__dirname} ` : ''}--reset-window`,
+        iconPath: asarPath(
+          join(
+            isDevMode ? `${__dirname}../src/` : __dirname,
+            'assets/images/taskbar/win32/display.ico',
+          ),
+        ),
+        iconIndex: 0,
+        title: 'Move Ferdi to Current Display',
+        description: 'Restore the position and size of Ferdi',
+      },
+      {
+        program: process.execPath,
+        arguments: `${isDevMode ? `${__dirname} ` : ''}--quit`,
+        iconIndex: 0,
+        iconPath: null,
+        title: 'Quit Ferdi',
+        description: null,
+      },
+    ]);
   }
 
   createWindow();
@@ -420,27 +453,35 @@ ipcMain.on('feature-basic-auth-credentials', (e, { user, password }) => {
 
 ipcMain.on('open-browser-window', (e, { url, serviceId }) => {
   const serviceSession = session.fromPartition(`persist:service-${serviceId}`);
-  const child = new BrowserWindow({ parent: mainWindow, webPreferences: { session: serviceSession } });
+  const child = new BrowserWindow({
+    parent: mainWindow,
+    webPreferences: { session: serviceSession },
+  });
   child.show();
   child.loadURL(url);
   debug('Received open-browser-window', url);
 });
 
-ipcMain.on('modifyRequestHeaders', (e, { modifiedRequestHeaders, serviceId }) => {
-  debug('Received modifyRequestHeaders', modifiedRequestHeaders, serviceId);
-  modifiedRequestHeaders.forEach((headerFilterSet) => {
-    const { headers, requestFilters } = headerFilterSet;
-    session.fromPartition(`persist:service-${serviceId}`).webRequest.onBeforeSendHeaders(requestFilters, (details, callback) => {
-      for (const key in headers) {
-        if (Object.prototype.hasOwnProperty.call(headers, key)) {
-          const value = headers[key];
-          details.requestHeaders[key] = value;
-        }
-      }
-      callback({ requestHeaders: details.requestHeaders });
+ipcMain.on(
+  'modifyRequestHeaders',
+  (e, { modifiedRequestHeaders, serviceId }) => {
+    debug('Received modifyRequestHeaders', modifiedRequestHeaders, serviceId);
+    modifiedRequestHeaders.forEach(headerFilterSet => {
+      const { headers, requestFilters } = headerFilterSet;
+      session
+        .fromPartition(`persist:service-${serviceId}`)
+        .webRequest.onBeforeSendHeaders(requestFilters, (details, callback) => {
+          for (const key in headers) {
+            if (Object.prototype.hasOwnProperty.call(headers, key)) {
+              const value = headers[key];
+              details.requestHeaders[key] = value;
+            }
+          }
+          callback({ requestHeaders: details.requestHeaders });
+        });
     });
-  });
-});
+  },
+);
 
 ipcMain.on('feature-basic-auth-cancel', () => {
   debug('Cancel basic auth');
@@ -449,16 +490,52 @@ ipcMain.on('feature-basic-auth-cancel', () => {
   authCallback = noop;
 });
 
+// Handle synchronous messages from service webviews.
+
+ipcMain.on('find-in-page', (e, text, options) => {
+  const { sender: webContents } = e;
+  if (webContents !== mainWindow.webContents && typeof text === 'string') {
+    const sanitizedOptions = {};
+    for (const option of ['forward', 'findNext', 'matchCase']) {
+      if (option in options) {
+        sanitizedOptions[option] = !!options[option];
+      }
+    }
+    const requestId = webContents.findInPage(text, sanitizedOptions);
+    debug('Find in page', text, options, requestId);
+    e.returnValue = requestId;
+  } else {
+    e.returnValue = null;
+  }
+});
+
+ipcMain.on('stop-find-in-page', (e, action) => {
+  const { sender: webContents } = e;
+  if (webContents !== mainWindow.webContents) {
+    const validActions = [
+      'clearSelection',
+      'keepSelection',
+      'activateSelection',
+    ];
+    if (validActions.includes(action)) {
+      webContents.stopFindInPage(action);
+    }
+  }
+  e.returnValue = null;
+});
+
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
   // On OS X it is common for applications and their menu bar
   // to stay active until the user quits explicitly with Cmd + Q
-  if (settings.get('runInBackground') === undefined
-    || settings.get('runInBackground')) {
+  if (
+    settings.get('runInBackground') === undefined ||
+    settings.get('runInBackground')
+  ) {
     debug('Window: all windows closed, quit app');
     app.quit();
   } else {
-    debug('Window: don\'t quit app');
+    debug("Window: don't quit app");
   }
 });
 
@@ -487,7 +564,7 @@ app.on('will-finish-launching', () => {
   app.on('open-url', (event, url) => {
     event.preventDefault();
 
-    onDidLoad((window) => {
+    onDidLoad(window => {
       debug('open-url event', url);
       handleDeepLink(window, url);
     });
diff --git a/src/internal-server b/src/internal-server
deleted file mode 160000
-Subproject 2e15f753b79491df2cad5e436e00c8cf44faf5c
diff --git a/src/internal-server/ace b/src/internal-server/ace
new file mode 100644
index 000000000..42f8f10d1
--- /dev/null
+++ b/src/internal-server/ace
@@ -0,0 +1,21 @@
+'use strict'
+
+/*
+|--------------------------------------------------------------------------
+| Ace Commands
+|--------------------------------------------------------------------------
+|
+| The ace file is just a regular Javascript file but with no extension. You
+| can call `node ace` followed by the command name and it just works.
+|
+| Also you can use `adonis` followed by the command name, since the adonis
+| global proxies all the ace commands.
+|
+*/
+
+const { Ignitor } = require('@adonisjs/ignitor')
+
+new Ignitor(require('@adonisjs/fold'))
+  .appRoot(__dirname)
+  .fireAce()
+  .catch(console.error)
diff --git a/src/internal-server/app/Controllers/Http/RecipeController.js b/src/internal-server/app/Controllers/Http/RecipeController.js
new file mode 100644
index 000000000..8a6b4f684
--- /dev/null
+++ b/src/internal-server/app/Controllers/Http/RecipeController.js
@@ -0,0 +1,120 @@
+const Recipe = use('App/Models/Recipe');
+const Drive = use('Drive');
+const {
+  validateAll,
+} = use('Validator');
+const Env = use('Env');
+
+const fetch = require('node-fetch');
+
+const RECIPES_URL = 'https://api.getferdi.com/v1/recipes';
+
+class RecipeController {
+  // List official and custom recipes
+  async list({
+    response,
+  }) {
+    const officialRecipes = JSON.parse(await (await fetch(RECIPES_URL)).text());
+    const customRecipesArray = (await Recipe.all()).rows;
+    const customRecipes = customRecipesArray.map(recipe => ({
+      id: recipe.recipeId,
+      name: recipe.name,
+      ...JSON.parse(recipe.data),
+    }));
+
+    const recipes = [
+      ...officialRecipes,
+      ...customRecipes,
+    ];
+
+    return response.send(recipes);
+  }
+
+  // Search official and custom recipes
+  async search({
+    request,
+    response,
+  }) {
+    // Validate user input
+    const validation = await validateAll(request.all(), {
+      needle: 'required',
+    });
+    if (validation.fails()) {
+      return response.status(401).send({
+        message: 'Please provide a needle',
+        messages: validation.messages(),
+        status: 401,
+      });
+    }
+
+    const needle = request.input('needle');
+
+    // Get results
+    let results;
+
+    if (needle === 'ferdi:custom') {
+      const dbResults = (await Recipe.all()).toJSON();
+      results = dbResults.map(recipe => ({
+        id: recipe.recipeId,
+        name: recipe.name,
+        ...JSON.parse(recipe.data),
+      }));
+    } else {
+      let remoteResults = [];
+      if (Env.get('CONNECT_WITH_FRANZ') == 'true') { // eslint-disable-line eqeqeq
+        remoteResults = JSON.parse(await (await fetch(`${RECIPES_URL}/search?needle=${encodeURIComponent(needle)}`)).text());
+      }
+      const localResultsArray = (await Recipe.query().where('name', 'LIKE', `%${needle}%`).fetch()).toJSON();
+      const localResults = localResultsArray.map(recipe => ({
+        id: recipe.recipeId,
+        name: recipe.name,
+        ...JSON.parse(recipe.data),
+      }));
+
+      results = [
+        ...localResults,
+        ...remoteResults || [],
+      ];
+    }
+
+    return response.send(results);
+  }
+
+  // Download a recipe
+  async download({
+    response,
+    params,
+  }) {
+    // Validate user input
+    const validation = await validateAll(params, {
+      recipe: 'required|accepted',
+    });
+    if (validation.fails()) {
+      return response.status(401).send({
+        message: 'Please provide a recipe ID',
+        messages: validation.messages(),
+        status: 401,
+      });
+    }
+
+    const service = params.recipe;
+
+    // Check for invalid characters
+    if (/\.{1,}/.test(service) || /\/{1,}/.test(service)) {
+      return response.send('Invalid recipe name');
+    }
+
+    // Check if recipe exists in recipes folder
+    if (await Drive.exists(`${service}.tar.gz`)) {
+      return response.send(await Drive.get(`${service}.tar.gz`));
+    } if (Env.get('CONNECT_WITH_FRANZ') == 'true') { // eslint-disable-line eqeqeq
+      return response.redirect(`${RECIPES_URL}/download/${service}`);
+    }
+    return response.status(400).send({
+      message: 'Recipe not found',
+      code: 'recipe-not-found',
+    });
+  }
+}
+
+module.exports = RecipeController;
diff --git a/src/internal-server/app/Controllers/Http/ServiceController.js b/src/internal-server/app/Controllers/Http/ServiceController.js
new file mode 100644
index 000000000..c76a287f7
--- /dev/null
+++ b/src/internal-server/app/Controllers/Http/ServiceController.js
@@ -0,0 +1,292 @@
+const Service = use('App/Models/Service');
+const { validateAll } = use('Validator');
+const Env = use('Env');
+
+const uuid = require('uuid/v4');
+const path = require('path');
+const fs = require('fs-extra');
+const { LOCAL_HOSTNAME } = require('../../../../config');
+
+const hostname = LOCAL_HOSTNAME;
+const port = Env.get('PORT');
+
+class ServiceController {
+  // Create a new service for user
+  async create({ request, response }) {
+    // Validate user input
+    const validation = await validateAll(request.all(), {
+      name: 'required|string',
+      recipeId: 'required',
+    });
+    if (validation.fails()) {
+      return response.status(401).send({
+        message: 'Invalid POST arguments',
+        messages: validation.messages(),
+        status: 401,
+      });
+    }
+
+    const data = request.all();
+
+    // Get new, unused uuid
+    let serviceId;
+    do {
+      serviceId = uuid();
+    } while (
+      (await Service.query().where('serviceId', serviceId).fetch()).rows
+        .length > 0
+    ); // eslint-disable-line no-await-in-loop
+
+    await Service.create({
+      serviceId,
+      name: data.name,
+      recipeId: data.recipeId,
+      settings: JSON.stringify(data),
+    });
+
+    return response.send({
+      data: {
+        userId: 1,
+        id: serviceId,
+        isEnabled: true,
+        isNotificationEnabled: true,
+        isBadgeEnabled: true,
+        isMuted: false,
+        isDarkModeEnabled: '', // TODO: This should ideally be a boolean (false). But, changing it caused the sidebar toggle to not work.
+        spellcheckerLanguage: '',
+        order: 1,
+        customRecipe: false,
+        hasCustomIcon: false,
+        workspaces: [],
+        iconUrl: null,
+        ...data,
+      },
+      status: ['created'],
+    });
+  }
+
+  // List all services a user has created
+  async list({ response }) {
+    const services = (await Service.all()).rows;
+    // Convert to array with all data Franz wants
+    const servicesArray = services.map(service => {
+      const settings =
+        typeof service.settings === 'string'
+          ? JSON.parse(service.settings)
+          : service.settings;
+
+      return {
+        customRecipe: false,
+        hasCustomIcon: false,
+        isBadgeEnabled: true,
+        isDarkModeEnabled: '', // TODO: This should ideally be a boolean (false). But, changing it caused the sidebar toggle to not work.
+        isEnabled: true,
+        isMuted: false,
+        isNotificationEnabled: true,
+        order: 1,
+        spellcheckerLanguage: '',
+        workspaces: [],
+        ...JSON.parse(service.settings),
+        iconUrl: settings.iconId
+          ? `http://${hostname}:${port}/v1/icon/${settings.iconId}`
+          : null,
+        id: service.serviceId,
+        name: service.name,
+        recipeId: service.recipeId,
+        userId: 1,
+      };
+    });
+
+    return response.send(servicesArray);
+  }
+
+  async edit({ request, response, params }) {
+    if (request.file('icon')) {
+      // Upload custom service icon
+      await fs.ensureDir(path.join(Env.get('USER_PATH'), 'icons'));
+
+      const icon = request.file('icon', {
+        types: ['image'],
+        size: '2mb',
+      });
+      const { id } = params;
+      const service = (await Service.query().where('serviceId', id).fetch())
+        .rows[0];
+      const settings =
+        typeof service.settings === 'string'
+          ? JSON.parse(service.settings)
+          : service.settings;
+
+      // Generate new icon ID
+      let iconId;
+      do {
+        iconId = uuid() + uuid();
+      } while (fs.existsSync(path.join(Env.get('USER_PATH'), 'icons', iconId)));
+
+      await icon.move(path.join(Env.get('USER_PATH'), 'icons'), {
+        name: iconId,
+        overwrite: true,
+      });
+
+      if (!icon.moved()) {
+        return response.status(500).send(icon.error());
+      }
+
+      const newSettings = {
+        ...settings,
+        ...{
+          iconId,
+          customIconVersion:
+            settings && settings.customIconVersion
+              ? settings.customIconVersion + 1
+              : 1,
+        },
+      };
+
+      // Update data in database
+      await Service.query()
+        .where('serviceId', id)
+        .update({
+          name: service.name,
+          settings: JSON.stringify(newSettings),
+        });
+
+      return response.send({
+        data: {
+          id,
+          name: service.name,
+          ...newSettings,
+          iconUrl: `http://${hostname}:${port}/v1/icon/${
+            newSettings.iconId
+          }`,
+          userId: 1,
+        },
+        status: ['updated'],
+      });
+    }
+    // Update service info
+    const data = request.all();
+    const { id } = params;
+
+    // Get current settings from db
+    const serviceData = (await Service.query().where('serviceId', id).fetch())
+      .rows[0];
+
+    const settings = {
+      ...(typeof serviceData.settings === 'string'
+        ? JSON.parse(serviceData.settings)
+        : serviceData.settings),
+      ...data,
+    };
+
+    // Update data in database
+    await Service.query()
+      .where('serviceId', id)
+      .update({
+        name: data.name,
+        settings: JSON.stringify(settings),
+      });
+
+    // Get updated row
+    const service = (await Service.query().where('serviceId', id).fetch())
+      .rows[0];
+
+    return response.send({
+      data: {
+        id,
+        name: service.name,
+        ...settings,
+        iconUrl: `${Env.get('APP_URL')}/v1/icon/${settings.iconId}`,
+        userId: 1,
+      },
+      status: ['updated'],
+    });
+  }
+
+  async icon({ params, response }) {
+    const { id } = params;
+
+    const iconPath = path.join(Env.get('USER_PATH'), 'icons', id);
+    if (!fs.existsSync(iconPath)) {
+      return response.status(404).send({
+        status: "Icon doesn't exist",
+      });
+    }
+
+    return response.download(iconPath);
+  }
+
+  async reorder({ request, response }) {
+    const data = request.all();
+
+    for (const service of Object.keys(data)) {
+      // Get current settings from db
+      const serviceData = (
+        await Service.query() // eslint-disable-line no-await-in-loop
+          .where('serviceId', service)
+          .fetch()
+      ).rows[0];
+
+      const settings = {
+        ...JSON.parse(serviceData.settings),
+        order: data[service],
+      };
+
+      // Update data in database
+      await Service.query() // eslint-disable-line no-await-in-loop
+        .where('serviceId', service)
+        .update({
+          settings: JSON.stringify(settings),
+        });
+    }
+
+    // Get new services
+    const services = (await Service.all()).rows;
+    // Convert to array with all data Franz wants
+    const servicesArray = services.map(service => {
+      const settings =
+        typeof service.settings === 'string'
+          ? JSON.parse(service.settings)
+          : service.settings;
+
+      return {
+        customRecipe: false,
+        hasCustomIcon: false,
+        isBadgeEnabled: true,
+        isDarkModeEnabled: '', // TODO: This should ideally be a boolean (false). But, changing it caused the sidebar toggle to not work.
+        isEnabled: true,
+        isMuted: false,
+        isNotificationEnabled: true,
+        order: 1,
+        spellcheckerLanguage: '',
+        workspaces: [],
+        ...JSON.parse(service.settings),
+        iconUrl: settings.iconId
+          ? `http://${hostname}:${port}/v1/icon/${settings.iconId}`
+          : null,
+        id: service.serviceId,
+        name: service.name,
+        recipeId: service.recipeId,
+        userId: 1,
+      };
+    });
+
+    return response.send(servicesArray);
+  }
+
+  update({ response }) {
+    return response.send([]);
+  }
+
+  async delete({ params, response }) {
+    // Update data in database
+    await Service.query().where('serviceId', params.id).delete();
+
+    return response.send({
+      message: 'Sucessfully deleted service',
+      status: 200,
+    });
+  }
+}
+
+module.exports = ServiceController;
diff --git a/src/internal-server/app/Controllers/Http/StaticController.js b/src/internal-server/app/Controllers/Http/StaticController.js
new file mode 100644
index 000000000..b9a145061
--- /dev/null
+++ b/src/internal-server/app/Controllers/Http/StaticController.js
@@ -0,0 +1,37 @@
+/**
+ * Controller for routes with static responses
+ */
+
+class StaticController {
+  // Enable all features
+  features({
+    response,
+  }) {
+    return response.send({
+      isServiceProxyEnabled: true,
+      isWorkspaceEnabled: true,
+      isAnnouncementsEnabled: true,
+      isSettingsWSEnabled: false,
+      isMagicBarEnabled: true,
+      isTodosEnabled: true,
+      subscribeURL: 'https://getferdi.com',
+      hasInlineCheckout: true,
+    });
+  }
+
+  // Return an empty array
+  emptyArray({
+    response,
+  }) {
+    return response.send([]);
+  }
+
+  // Show announcements
+  announcement({
+    response,
+  }) {
+    return response.send({});
+  }
+}
+
+module.exports = StaticController;
diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js
new file mode 100644
index 000000000..a3ad736fa
--- /dev/null
+++ b/src/internal-server/app/Controllers/Http/UserController.js
@@ -0,0 +1,370 @@
+const User = use('App/Models/User');
+const Service = use('App/Models/Service');
+const Workspace = use('App/Models/Workspace');
+const {
+  validateAll,
+} = use('Validator');
+
+const btoa = require('btoa');
+const fetch = require('node-fetch');
+const uuid = require('uuid/v4');
+const crypto = require('crypto');
+const { DEFAULT_APP_SETTINGS } = require('../../../../environment');
+
+const apiRequest = (url, route, method, auth) => new Promise((resolve, reject) => {
+  const base = `${url}/v1/`;
+  const user = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Ferdi/5.3.0-beta.1 Chrome/69.0.3497.128 Electron/4.2.4 Safari/537.36';
+
+  try {
+    fetch(base + route, {
+      method,
+      headers: {
+        Authorization: `Bearer ${auth}`,
+        'User-Agent': user,
+      },
+    })
+      .then(data => data.json())
+      .then(json => resolve(json));
+  } catch (e) {
+    reject();
+  }
+});
+
+class UserController {
+  // Register a new user
+  async signup({
+    request,
+    response,
+  }) {
+    // Validate user input
+    const validation = await validateAll(request.all(), {
+      firstname: 'required',
+      email: 'required|email',
+      password: 'required',
+    });
+    if (validation.fails()) {
+      return response.status(401).send({
+        message: 'Invalid POST arguments',
+        messages: validation.messages(),
+        status: 401,
+      });
+    }
+
+    return response.send({
+      message: 'Successfully created account',
+      token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJGZXJkaSBJbnRlcm5hbCBTZXJ2ZXIiLCJpYXQiOjE1NzEwNDAyMTUsImV4cCI6MjUzMzk1NDE3ODQ0LCJhdWQiOiJnZXRmZXJkaS5jb20iLCJzdWIiOiJmZXJkaUBsb2NhbGhvc3QiLCJ1c2VySWQiOiIxIn0.9_TWFGp6HROv8Yg82Rt6i1-95jqWym40a-HmgrdMC6M',
+    });
+  }
+
+  // Login using an existing user
+  async login({
+    request,
+    response,
+  }) {
+    if (!request.header('Authorization')) {
+      return response.status(401).send({
+        message: 'Please provide authorization',
+        status: 401,
+      });
+    }
+
+    return response.send({
+      message: 'Successfully logged in',
+      token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJGZXJkaSBJbnRlcm5hbCBTZXJ2ZXIiLCJpYXQiOjE1NzEwNDAyMTUsImV4cCI6MjUzMzk1NDE3ODQ0LCJhdWQiOiJnZXRmZXJkaS5jb20iLCJzdWIiOiJmZXJkaUBsb2NhbGhvc3QiLCJ1c2VySWQiOiIxIn0.9_TWFGp6HROv8Yg82Rt6i1-95jqWym40a-HmgrdMC6M',
+    });
+  }
+
+  // Return information about the current user
+  async me({
+    response,
+  }) {
+    const user = await User.find(1);
+
+    const settings = typeof user.settings === 'string' ? JSON.parse(user.settings) : user.settings;
+
+    return response.send({
+      accountType: 'individual',
+      beta: false,
+      donor: {},
+      email: '',
+      emailValidated: true,
+      features: {},
+      firstname: 'Ferdi',
+      id: '82c1cf9d-ab58-4da2-b55e-aaa41d2142d8',
+      isSubscriptionOwner: true,
+      lastname: 'Application',
+      locale: DEFAULT_APP_SETTINGS.fallbackLocale,
+      ...settings || {},
+    });
+  }
+
+  async updateMe({
+    request,
+    response,
+  }) {
+    const user = await User.find(1);
+
+    let settings = user.settings || {};
+    if (typeof settings === 'string') {
+      settings = JSON.parse(settings);
+    }
+
+    const newSettings = {
+      ...settings,
+      ...request.all(),
+    };
+
+    user.settings = JSON.stringify(newSettings);
+    await user.save();
+
+    return response.send({
+      data: {
+        accountType: 'individual',
+        beta: false,
+        donor: {},
+        email: '',
+        emailValidated: true,
+        features: {},
+        firstname: 'Ferdi',
+        id: '82c1cf9d-ab58-4da2-b55e-aaa41d2142d8',
+        isSubscriptionOwner: true,
+        lastname: 'Application',
+        locale: DEFAULT_APP_SETTINGS.fallbackLocale,
+        ...newSettings,
+      },
+      status: [
+        'data-updated',
+      ],
+    });
+  }
+
+  async import({
+    request,
+    response,
+  }) {
+    // Validate user input
+    const validation = await validateAll(request.all(), {
+      email: 'required|email',
+      password: 'required',
+      server: 'required',
+    });
+    if (validation.fails()) {
+      let errorMessage = 'There was an error while trying to import your account:\n';
+      for (const message of validation.messages()) {
+        if (message.validation === 'required') {
+          errorMessage += `- Please make sure to supply your ${message.field}\n`;
+        } else if (message.validation === 'unique') {
+          errorMessage += '- There is already a user with this email.\n';
+        } else {
+          errorMessage += `${message.message}\n`;
+        }
+      }
+      return response.status(401).send(errorMessage);
+    }
+
+    const {
+      email,
+      password,
+      server,
+    } = request.all();
+
+    const hashedPassword = crypto.createHash('sha256').update(password).digest('base64');
+
+    const base = `${server}/v1/`;
+    const userAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Ferdi/5.3.0-beta.1 Chrome/69.0.3497.128 Electron/4.2.4 Safari/537.36';
+
+    // Try to get an authentication token
+    let token;
+    try {
+      const basicToken = btoa(`${email}:${hashedPassword}`);
+
+      const rawResponse = await fetch(`${base}auth/login`, {
+        method: 'POST',
+        headers: {
+          Authorization: `Basic ${basicToken}`,
+          'User-Agent': userAgent,
+        },
+      });
+      const content = await rawResponse.json();
+
+      if (!content.message || content.message !== 'Successfully logged in') {
+        const errorMessage = 'Could not login into Franz with your supplied credentials. Please check and try again';
+        return response.status(401).send(errorMessage);
+      }
+
+      // eslint-disable-next-line prefer-destructuring
+      token = content.token;
+    } catch (e) {
+      return response.status(401).send({
+        message: 'Cannot login to Franz',
+        error: e,
+      });
+    }
+
+    // Get user information
+    let userInf = false;
+    try {
+      userInf = await apiRequest(server, 'me', 'GET', token);
+    } catch (e) {
+      const errorMessage = `Could not get your user info from Franz. Please check your credentials or try again later.\nError: ${e}`;
+      return response.status(401).send(errorMessage);
+    }
+    if (!userInf) {
+      const errorMessage = 'Could not get your user info from Franz. Please check your credentials or try again later';
+      return response.status(401).send(errorMessage);
+    }
+
+    const serviceIdTranslation = {};
+
+    // Import services
+    try {
+      const services = await apiRequest(server, 'me/services', 'GET', token);
+
+      for (const service of services) {
+        // Get new, unused uuid
+        let serviceId;
+        do {
+          serviceId = uuid();
+        } while ((await Service.query().where('serviceId', serviceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
+
+        await Service.create({ // eslint-disable-line no-await-in-loop
+          serviceId,
+          name: service.name,
+          recipeId: service.recipeId,
+          settings: JSON.stringify(service),
+        });
+
+        serviceIdTranslation[service.id] = serviceId;
+      }
+    } catch (e) {
+      const errorMessage = `Could not import your services into our system.\nError: ${e}`;
+      return response.status(401).send(errorMessage);
+    }
+
+    // Import workspaces
+    try {
+      const workspaces = await apiRequest(server, 'workspace', 'GET', token);
+
+      for (const workspace of workspaces) {
+        let workspaceId;
+        do {
+          workspaceId = uuid();
+        } while ((await Workspace.query().where('workspaceId', workspaceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
+
+        const services = workspace.services.map(service => serviceIdTranslation[service]);
+
+        await Workspace.create({ // eslint-disable-line no-await-in-loop
+          workspaceId,
+          name: workspace.name,
+          order: workspace.order,
+          services: JSON.stringify(services),
+          data: JSON.stringify({}),
+        });
+      }
+    } catch (e) {
+      const errorMessage = `Could not import your workspaces into our system.\nError: ${e}`;
+      return response.status(401).send(errorMessage);
+    }
+
+    return response.send('Your account has been imported. You can now use your Franz account in Ferdi.');
+  }
+
+  // Account import/export
+  async export({
+    // eslint-disable-next-line no-unused-vars
+    auth,
+    response,
+  }) {
+    const services = (await Service.all()).toJSON();
+    const workspaces = (await Workspace.all()).toJSON();
+
+    const exportData = {
+      username: 'Ferdi',
+      mail: 'internal@getferdi.com',
+      services,
+      workspaces,
+    };
+
+    return response
+      .header('Content-Type', 'application/force-download')
+      .header('Content-disposition', 'attachment; filename=export.ferdi-data')
+      .send(exportData);
+  }
+
+  async importFerdi({
+    request,
+    response,
+  }) {
+    const validation = await validateAll(request.all(), {
+      file: 'required',
+    });
+    if (validation.fails()) {
+      return response.send(validation.messages());
+    }
+
+    let file;
+    try {
+      file = JSON.parse(request.input('file'));
+    } catch (e) {
+      return response.send('Could not import: Invalid file, could not read file');
+    }
+
+    if (!file || !file.services || !file.workspaces) {
+      return response.send('Could not import: Invalid file (2)');
+    }
+
+    const serviceIdTranslation = {};
+
+    // Import services
+    try {
+      for (const service of file.services) {
+        // Get new, unused uuid
+        let serviceId;
+        do {
+          serviceId = uuid();
+        } while ((await Service.query().where('serviceId', serviceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
+
+        await Service.create({ // eslint-disable-line no-await-in-loop
+          serviceId,
+          name: service.name,
+          recipeId: service.recipeId,
+          settings: JSON.stringify(service.settings),
+        });
+
+        serviceIdTranslation[service.id] = serviceId;
+      }
+    } catch (e) {
+      const errorMessage = `Could not import your services into our system.\nError: ${e}`;
+      return response.send(errorMessage);
+    }
+
+    // Import workspaces
+    try {
+      for (const workspace of file.workspaces) {
+        let workspaceId;
+        do {
+          workspaceId = uuid();
+        } while ((await Workspace.query().where('workspaceId', workspaceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
+
+        const services = (workspace.services && typeof (workspace.services) === 'object') ?
+          workspace.services.map((service) => serviceIdTranslation[service]) :
+          [];
+
+        await Workspace.create({ // eslint-disable-line no-await-in-loop
+          workspaceId,
+          name: workspace.name,
+          order: workspace.order,
+          services: JSON.stringify(services),
+          data: JSON.stringify(workspace.data),
+        });
+      }
+    } catch (e) {
+      const errorMessage = `Could not import your workspaces into our system.\nError: ${e}`;
+      return response.status(401).send(errorMessage);
+    }
+
+    return response.send('Your account has been imported.');
+  }
+}
+
+module.exports = UserController;
diff --git a/src/internal-server/app/Controllers/Http/WorkspaceController.js b/src/internal-server/app/Controllers/Http/WorkspaceController.js
new file mode 100644
index 000000000..4189fbcdd
--- /dev/null
+++ b/src/internal-server/app/Controllers/Http/WorkspaceController.js
@@ -0,0 +1,148 @@
+const Workspace = use('App/Models/Workspace');
+const {
+  validateAll,
+} = use('Validator');
+
+const uuid = require('uuid/v4');
+
+class WorkspaceController {
+  // Create a new workspace for user
+  async create({
+    request,
+    response,
+  }) {
+    // Validate user input
+    const validation = await validateAll(request.all(), {
+      name: 'required',
+    });
+    if (validation.fails()) {
+      return response.status(401).send({
+        message: 'Invalid POST arguments',
+        messages: validation.messages(),
+        status: 401,
+      });
+    }
+
+    const data = request.all();
+
+    // Get new, unused uuid
+    let workspaceId;
+    do {
+      workspaceId = uuid();
+    } while ((await Workspace.query().where('workspaceId', workspaceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
+
+    const order = (await Workspace.all()).rows.length;
+
+    await Workspace.create({
+      workspaceId,
+      name: data.name,
+      order,
+      services: JSON.stringify([]),
+      data: JSON.stringify(data),
+    });
+
+    return response.send({
+      userId: 1,
+      name: data.name,
+      id: workspaceId,
+      order,
+      workspaces: [],
+    });
+  }
+
+  async edit({
+    request,
+    response,
+    params,
+  }) {
+    // Validate user input
+    const validation = await validateAll(request.all(), {
+      name: 'required',
+      services: 'required|array',
+    });
+    if (validation.fails()) {
+      return response.status(401).send({
+        message: 'Invalid POST arguments',
+        messages: validation.messages(),
+        status: 401,
+      });
+    }
+
+    const data = request.all();
+    const {
+      id,
+    } = params;
+
+    // Update data in database
+    await (Workspace.query()
+      .where('workspaceId', id)).update({
+      name: data.name,
+      services: JSON.stringify(data.services),
+    });
+
+    // Get updated row
+    const workspace = (await Workspace.query()
+      .where('workspaceId', id).fetch()).rows[0];
+
+    return response.send({
+      id: workspace.workspaceId,
+      name: data.name,
+      order: workspace.order,
+      services: data.services,
+      userId: 1,
+    });
+  }
+
+  async delete({
+    // eslint-disable-next-line no-unused-vars
+    request,
+    response,
+    params,
+  }) {
+    // Validate user input
+    const validation = await validateAll(params, {
+      id: 'required',
+    });
+    if (validation.fails()) {
+      return response.status(401).send({
+        message: 'Invalid arguments',
+        messages: validation.messages(),
+        status: 401,
+      });
+    }
+
+    const {
+      id,
+    } = params;
+
+    // Update data in database
+    await (Workspace.query()
+      .where('workspaceId', id)).delete();
+
+    return response.send({
+      message: 'Successfully deleted workspace',
+    });
+  }
+
+  // List all workspaces a user has created
+  async list({
+    response,
+  }) {
+    const workspaces = (await Workspace.all()).rows;
+    // Convert to array with all data Franz wants
+    let workspacesArray = [];
+    if (workspaces) {
+      workspacesArray = workspaces.map(workspace => ({
+        id: workspace.workspaceId,
+        name: workspace.name,
+        order: workspace.order,
+        services: typeof workspace.services === 'string' ? JSON.parse(workspace.services) : workspace.services,
+        userId: 1,
+      }));
+    }
+
+    return response.send(workspacesArray);
+  }
+}
+
+module.exports = WorkspaceController;
diff --git a/src/internal-server/app/Exceptions/Handler.js b/src/internal-server/app/Exceptions/Handler.js
new file mode 100644
index 000000000..ab323fd38
--- /dev/null
+++ b/src/internal-server/app/Exceptions/Handler.js
@@ -0,0 +1,40 @@
+const BaseExceptionHandler = use('BaseExceptionHandler');
+
+/**
+ * This class handles all exceptions thrown during
+ * the HTTP request lifecycle.
+ *
+ * @class ExceptionHandler
+ */
+class ExceptionHandler extends BaseExceptionHandler {
+  /**
+   * Handle exception thrown during the HTTP lifecycle
+   *
+   * @method handle
+   *
+   * @param  {Object} error
+   * @param  {object} options.response
+   *
+   * @return {Promise<void>}
+   */
+  async handle(error, { response }) {
+    if (error.name === 'ValidationException') {
+      return response.status(400).send('Invalid arguments');
+    }
+
+    return response.status(error.status).send(error.message);
+  }
+
+  /**
+   * Report exception for logging or debugging.
+   *
+   * @method report
+   *
+   * @return {Promise<boolean>}
+   */
+  async report() {
+    return true;
+  }
+}
+
+module.exports = ExceptionHandler;
diff --git a/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js b/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js
new file mode 100644
index 000000000..87f1f6c25
--- /dev/null
+++ b/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js
@@ -0,0 +1,15 @@
+class ConvertEmptyStringsToNull {
+  async handle({ request }, next) {
+    if (Object.keys(request.body).length) {
+      request.body = Object.assign(
+        ...Object.keys(request.body).map(key => ({
+          [key]: request.body[key] !== '' ? request.body[key] : null,
+        })),
+      );
+    }
+
+    await next();
+  }
+}
+
+module.exports = ConvertEmptyStringsToNull;
diff --git a/src/internal-server/app/Models/Recipe.js b/src/internal-server/app/Models/Recipe.js
new file mode 100644
index 000000000..bd9741114
--- /dev/null
+++ b/src/internal-server/app/Models/Recipe.js
@@ -0,0 +1,7 @@
+/** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
+const Model = use('Model');
+
+class Recipe extends Model {
+}
+
+module.exports = Recipe;
diff --git a/src/internal-server/app/Models/Service.js b/src/internal-server/app/Models/Service.js
new file mode 100644
index 000000000..a2e5c981e
--- /dev/null
+++ b/src/internal-server/app/Models/Service.js
@@ -0,0 +1,7 @@
+/** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
+const Model = use('Model');
+
+class Service extends Model {
+}
+
+module.exports = Service;
diff --git a/src/internal-server/app/Models/Token.js b/src/internal-server/app/Models/Token.js
new file mode 100644
index 000000000..83e989117
--- /dev/null
+++ b/src/internal-server/app/Models/Token.js
@@ -0,0 +1,7 @@
+/** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
+const Model = use('Model');
+
+class Token extends Model {
+}
+
+module.exports = Token;
diff --git a/src/internal-server/app/Models/Traits/NoTimestamp.js b/src/internal-server/app/Models/Traits/NoTimestamp.js
new file mode 100644
index 000000000..914f542f0
--- /dev/null
+++ b/src/internal-server/app/Models/Traits/NoTimestamp.js
@@ -0,0 +1,14 @@
+class NoTimestamp {
+  register(Model) {
+    Object.defineProperties(Model, {
+      createdAtColumn: {
+        get: () => null,
+      },
+      updatedAtColumn: {
+        get: () => null,
+      },
+    });
+  }
+}
+
+module.exports = NoTimestamp;
diff --git a/src/internal-server/app/Models/User.js b/src/internal-server/app/Models/User.js
new file mode 100644
index 000000000..907710d8d
--- /dev/null
+++ b/src/internal-server/app/Models/User.js
@@ -0,0 +1,8 @@
+// File is required by AdonisJS but not used by the server
+/** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
+const Model = use('Model');
+
+class User extends Model {
+}
+
+module.exports = User;
diff --git a/src/internal-server/app/Models/Workspace.js b/src/internal-server/app/Models/Workspace.js
new file mode 100644
index 000000000..dcf39ac75
--- /dev/null
+++ b/src/internal-server/app/Models/Workspace.js
@@ -0,0 +1,7 @@
+/** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
+const Model = use('Model');
+
+class Workspace extends Model {
+}
+
+module.exports = Workspace;
diff --git a/src/internal-server/config/app.js b/src/internal-server/config/app.js
new file mode 100644
index 000000000..0a1644932
--- /dev/null
+++ b/src/internal-server/config/app.js
@@ -0,0 +1,240 @@
+/** @type {import('@adonisjs/framework/src/Env')} */
+const Env = use('Env');
+
+module.exports = {
+
+  /*
+  |--------------------------------------------------------------------------
+  | Application Name
+  |--------------------------------------------------------------------------
+  |
+  | This value is the name of your application and can used when you
+  | need to place the application's name in a email, view or
+  | other location.
+  |
+  */
+
+  name: Env.get('APP_NAME', 'Ferdi Internal Server'),
+
+  /*
+  |--------------------------------------------------------------------------
+  | App Key
+  |--------------------------------------------------------------------------
+  |
+  | App key is a randomly generated 16 or 32 characters long string required
+  | to encrypt cookies, sessions and other sensitive data.
+  |
+  */
+  appKey: Env.getOrFail('APP_KEY'),
+
+  http: {
+    /*
+    |--------------------------------------------------------------------------
+    | Allow Method Spoofing
+    |--------------------------------------------------------------------------
+    |
+    | Method spoofing allows to make requests by spoofing the http verb.
+    | Which means you can make a GET request but instruct the server to
+    | treat as a POST or PUT request. If you want this feature, set the
+    | below value to true.
+    |
+    */
+    allowMethodSpoofing: true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Trust Proxy
+    |--------------------------------------------------------------------------
+    |
+    | Trust proxy defines whether X-Forwarded-* headers should be trusted or not.
+    | When your application is behind a proxy server like nginx, these values
+    | are set automatically and should be trusted. Apart from setting it
+    | to true or false Adonis supports handful or ways to allow proxy
+    | values. Read documentation for that.
+    |
+    */
+    trustProxy: false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Subdomains
+    |--------------------------------------------------------------------------
+    |
+    | Offset to be used for returning subdomains for a given request.For
+    | majority of applications it will be 2, until you have nested
+    | sudomains.
+    | cheatsheet.adonisjs.com      - offset - 2
+    | virk.cheatsheet.adonisjs.com - offset - 3
+    |
+    */
+    subdomainOffset: 2,
+
+    /*
+    |--------------------------------------------------------------------------
+    | JSONP Callback
+    |--------------------------------------------------------------------------
+    |
+    | Default jsonp callback to be used when callback query string is missing
+    | in request url.
+    |
+    */
+    jsonpCallback: 'callback',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Etag
+    |--------------------------------------------------------------------------
+    |
+    | Set etag on all HTTP response. In order to disable for selected routes,
+    | you can call the `response.send` with an options object as follows.
+    |
+    | response.send('Hello', { ignoreEtag: true })
+    |
+    */
+    etag: false,
+  },
+
+  views: {
+    /*
+    |--------------------------------------------------------------------------
+    | Cache Views
+    |--------------------------------------------------------------------------
+    |
+    | Define whether or not to cache the compiled view. Set it to true in
+    | production to optimize view loading time.
+    |
+    */
+    cache: Env.get('CACHE_VIEWS', true),
+  },
+
+  static: {
+    /*
+    |--------------------------------------------------------------------------
+    | Dot Files
+    |--------------------------------------------------------------------------
+    |
+    | Define how to treat dot files when trying to server static resources.
+    | By default it is set to ignore, which will pretend that dotfiles
+    | does not exists.
+    |
+    | Can be one of the following
+    | ignore, deny, allow
+    |
+    */
+    dotfiles: 'ignore',
+
+    /*
+    |--------------------------------------------------------------------------
+    | ETag
+    |--------------------------------------------------------------------------
+    |
+    | Enable or disable etag generation
+    |
+    */
+    etag: true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Extensions
+    |--------------------------------------------------------------------------
+    |
+    | Set file extension fallbacks. When set, if a file is not found, the given
+    | extensions will be added to the file name and search for. The first
+    | that exists will be served. Example: ['html', 'htm'].
+    |
+    */
+    extensions: false,
+  },
+
+  locales: {
+    /*
+    |--------------------------------------------------------------------------
+    | Loader
+    |--------------------------------------------------------------------------
+    |
+    | The loader to be used for fetching and updating locales. Below is the
+    | list of available options.
+    |
+    | file, database
+    |
+    */
+    loader: 'file',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Locale
+    |--------------------------------------------------------------------------
+    |
+    | Default locale to be used by Antl provider. You can always switch drivers
+    | in runtime or use the official Antl middleware to detect the driver
+    | based on HTTP headers/query string.
+    |
+    */
+    locale: 'en',
+  },
+
+  logger: {
+    /*
+    |--------------------------------------------------------------------------
+    | Transport
+    |--------------------------------------------------------------------------
+    |
+    | Transport to be used for logging messages. You can have multiple
+    | transports using same driver.
+    |
+    | Available drivers are: `file` and `console`.
+    |
+    */
+    transport: 'console',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Console Transport
+    |--------------------------------------------------------------------------
+    |
+    | Using `console` driver for logging. This driver writes to `stdout`
+    | and `stderr`
+    |
+    */
+    console: {
+      driver: 'console',
+      name: 'adonis-app',
+      level: 'info',
+    },
+
+    /*
+    |--------------------------------------------------------------------------
+    | File Transport
+    |--------------------------------------------------------------------------
+    |
+    | File transport uses file driver and writes log messages for a given
+    | file inside `tmp` directory for your app.
+    |
+    | For a different directory, set an absolute path for the filename.
+    |
+    */
+    file: {
+      driver: 'file',
+      name: 'adonis-app',
+      filename: 'adonis.log',
+      level: 'info',
+    },
+  },
+
+  /*
+  |--------------------------------------------------------------------------
+  | Generic Cookie Options
+  |--------------------------------------------------------------------------
+  |
+  | The following cookie options are generic settings used by AdonisJs to create
+  | cookies. However, some parts of the application like `sessions` can have
+  | separate settings for cookies inside `config/session.js`.
+  |
+  */
+  cookie: {
+    httpOnly: true,
+    sameSite: false,
+    path: '/',
+    maxAge: 7200,
+  },
+};
diff --git a/src/internal-server/config/auth.js b/src/internal-server/config/auth.js
new file mode 100644
index 000000000..adb38126a
--- /dev/null
+++ b/src/internal-server/config/auth.js
@@ -0,0 +1,92 @@
+/** @type {import('@adonisjs/framework/src/Env')} */
+const Env = use('Env');
+
+module.exports = {
+  /*
+  |--------------------------------------------------------------------------
+  | Authenticator
+  |--------------------------------------------------------------------------
+  |
+  | Authentication is a combination of serializer and scheme with extra
+  | config to define on how to authenticate a user.
+  |
+  | Available Schemes - basic, session, jwt, api
+  | Available Serializers - lucid, database
+  |
+  */
+  authenticator: 'jwt',
+
+  /*
+  |--------------------------------------------------------------------------
+  | Session
+  |--------------------------------------------------------------------------
+  |
+  | Session authenticator makes use of sessions to authenticate a user.
+  | Session authentication is always persistent.
+  |
+  */
+  session: {
+    serializer: 'lucid',
+    model: 'App/Models/User',
+    scheme: 'session',
+    uid: 'email',
+    password: 'password',
+  },
+
+  /*
+  |--------------------------------------------------------------------------
+  | Basic Auth
+  |--------------------------------------------------------------------------
+  |
+  | The basic auth authenticator uses basic auth header to authenticate a
+  | user.
+  |
+  | NOTE:
+  | This scheme is not persistent and users are supposed to pass
+  | login credentials on each request.
+  |
+  */
+  basic: {
+    serializer: 'lucid',
+    model: 'App/Models/User',
+    scheme: 'basic',
+    uid: 'email',
+    password: 'password',
+  },
+
+  /*
+  |--------------------------------------------------------------------------
+  | Jwt
+  |--------------------------------------------------------------------------
+  |
+  | The jwt authenticator works by passing a jwt token on each HTTP request
+  | via HTTP `Authorization` header.
+  |
+  */
+  jwt: {
+    serializer: 'lucid',
+    model: 'App/Models/User',
+    scheme: 'jwt',
+    uid: 'email',
+    password: 'password',
+    options: {
+      secret: Env.get('APP_KEY'),
+    },
+  },
+
+  /*
+  |--------------------------------------------------------------------------
+  | Api
+  |--------------------------------------------------------------------------
+  |
+  | The Api scheme makes use of API personal tokens to authenticate a user.
+  |
+  */
+  api: {
+    serializer: 'lucid',
+    model: 'App/Models/User',
+    scheme: 'api',
+    uid: 'email',
+    password: 'password',
+  },
+};
diff --git a/src/internal-server/config/bodyParser.js b/src/internal-server/config/bodyParser.js
new file mode 100644
index 000000000..8a5406f9e
--- /dev/null
+++ b/src/internal-server/config/bodyParser.js
@@ -0,0 +1,155 @@
+module.exports = {
+  /*
+  |--------------------------------------------------------------------------
+  | JSON Parser
+  |--------------------------------------------------------------------------
+  |
+  | Below settings are applied when the request body contains a JSON payload.
+  | If you want body parser to ignore JSON payloads, then simply set `types`
+  | to an empty array.
+  */
+  json: {
+    /*
+    |--------------------------------------------------------------------------
+    | limit
+    |--------------------------------------------------------------------------
+    |
+    | Defines the limit of JSON that can be sent by the client. If payload
+    | is over 1mb it will not be processed.
+    |
+    */
+    limit: '50mb',
+
+    /*
+    |--------------------------------------------------------------------------
+    | strict
+    |--------------------------------------------------------------------------
+    |
+    | When `strict` is set to true, body parser will only parse Arrays and
+    | Object. Otherwise everything parseable by `JSON.parse` is parsed.
+    |
+    */
+    strict: true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | types
+    |--------------------------------------------------------------------------
+    |
+    | Which content types are processed as JSON payloads. You are free to
+    | add your own types here, but the request body should be parseable
+    | by `JSON.parse` method.
+    |
+    */
+    types: [
+      'application/json',
+      'application/json-patch+json',
+      'application/vnd.api+json',
+      'application/csp-report',
+    ],
+  },
+
+  /*
+  |--------------------------------------------------------------------------
+  | Raw Parser
+  |--------------------------------------------------------------------------
+  |
+  |
+  |
+  */
+  raw: {
+    types: [
+      'text/*',
+    ],
+  },
+
+  /*
+  |--------------------------------------------------------------------------
+  | Form Parser
+  |--------------------------------------------------------------------------
+  |
+  |
+  |
+  */
+  form: {
+    types: [
+      'application/x-www-form-urlencoded',
+    ],
+  },
+
+  /*
+  |--------------------------------------------------------------------------
+  | Files Parser
+  |--------------------------------------------------------------------------
+  |
+  |
+  |
+  */
+  files: {
+    types: [
+      'multipart/form-data',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Max Size
+    |--------------------------------------------------------------------------
+    |
+    | Below value is the max size of all the files uploaded to the server. It
+    | is validated even before files have been processed and hard exception
+    | is thrown.
+    |
+    | Consider setting a reasonable value here, otherwise people may upload GB's
+    | of files which will keep your server busy.
+    |
+    | Also this value is considered when `autoProcess` is set to true.
+    |
+    */
+    maxSize: '20mb',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Auto Process
+    |--------------------------------------------------------------------------
+    |
+    | Whether or not to auto-process files. Since HTTP servers handle files via
+    | couple of specific endpoints. It is better to set this value off and
+    | manually process the files when required.
+    |
+    | This value can contain a boolean or an array of route patterns
+    | to be autoprocessed.
+    */
+    autoProcess: true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Process Manually
+    |--------------------------------------------------------------------------
+    |
+    | The list of routes that should not process files and instead rely on
+    | manual process. This list should only contain routes when autoProcess
+    | is to true. Otherwise everything is processed manually.
+    |
+    */
+    processManually: [],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Temporary file name
+    |--------------------------------------------------------------------------
+    |
+    | Define a function, which should return a string to be used as the
+    | tmp file name.
+    |
+    | If not defined, Bodyparser will use `uuid` as the tmp file name.
+    |
+    | To be defined as. If you are defining the function, then do make sure
+    | to return a value from it.
+    |
+    | tmpFileName () {
+    |   return 'some-unique-value'
+    | }
+    |
+    */
+  },
+};
diff --git a/src/internal-server/config/cors.js b/src/internal-server/config/cors.js
new file mode 100644
index 000000000..ca57dff0d
--- /dev/null
+++ b/src/internal-server/config/cors.js
@@ -0,0 +1,85 @@
+module.exports = {
+  /*
+  |--------------------------------------------------------------------------
+  | Origin
+  |--------------------------------------------------------------------------
+  |
+  | Set a list of origins to be allowed. The value can be one of the following
+  |
+  | Boolean: true - Allow current request origin
+  | Boolean: false - Disallow all
+  | String - Comma separated list of allowed origins
+  | Array - An array of allowed origins
+  | String: * - A wildcard to allow current request origin
+  | Function - Receives the current origin and should return one of the above values.
+  |
+  */
+  origin: false,
+
+  /*
+  |--------------------------------------------------------------------------
+  | Methods
+  |--------------------------------------------------------------------------
+  |
+  | HTTP methods to be allowed. The value can be one of the following
+  |
+  | String - Comma separated list of allowed methods
+  | Array - An array of allowed methods
+  |
+  */
+  methods: ['GET', 'PUT', 'PATCH', 'POST', 'DELETE'],
+
+  /*
+  |--------------------------------------------------------------------------
+  | Headers
+  |--------------------------------------------------------------------------
+  |
+  | List of headers to be allowed via Access-Control-Request-Headers header.
+  | The value can be one of the following.
+  |
+  | Boolean: true - Allow current request headers
+  | Boolean: false - Disallow all
+  | String - Comma separated list of allowed headers
+  | Array - An array of allowed headers
+  | String: * - A wildcard to allow current request headers
+  | Function - Receives the current header and should return one of the above values.
+  |
+  */
+  headers: true,
+
+  /*
+  |--------------------------------------------------------------------------
+  | Expose Headers
+  |--------------------------------------------------------------------------
+  |
+  | A list of headers to be exposed via `Access-Control-Expose-Headers`
+  | header. The value can be one of the following.
+  |
+  | Boolean: false - Disallow all
+  | String: Comma separated list of allowed headers
+  | Array - An array of allowed headers
+  |
+  */
+  exposeHeaders: false,
+
+  /*
+  |--------------------------------------------------------------------------
+  | Credentials
+  |--------------------------------------------------------------------------
+  |
+  | Define Access-Control-Allow-Credentials header. It should always be a
+  | boolean.
+  |
+  */
+  credentials: false,
+
+  /*
+  |--------------------------------------------------------------------------
+  | MaxAge
+  |--------------------------------------------------------------------------
+  |
+  | Define Access-Control-Allow-Max-Age
+  |
+  */
+  maxAge: 90,
+};
diff --git a/src/internal-server/config/database.js b/src/internal-server/config/database.js
new file mode 100644
index 000000000..1b5974359
--- /dev/null
+++ b/src/internal-server/config/database.js
@@ -0,0 +1,82 @@
+/** @type {import('@adonisjs/framework/src/Env')} */
+const Env = use('Env');
+
+const dbPath = process.env.DB_PATH;
+
+module.exports = {
+  /*
+  |--------------------------------------------------------------------------
+  | Default Connection
+  |--------------------------------------------------------------------------
+  |
+  | Connection defines the default connection settings to be used while
+  | interacting with SQL databases.
+  |
+  */
+  connection: Env.get('DB_CONNECTION', 'sqlite'),
+
+  /*
+  |--------------------------------------------------------------------------
+  | Sqlite
+  |--------------------------------------------------------------------------
+  |
+  | Sqlite is a flat file database and can be a good choice for a development
+  | environment.
+  |
+  | npm i --save sqlite3
+  |
+  */
+  sqlite: {
+    client: 'sqlite3',
+    connection: {
+      // filename: Helpers.databasePath(`${Env.get('DB_DATABASE', 'development')}.sqlite`),
+      filename: dbPath,
+    },
+    useNullAsDefault: true,
+    debug: Env.get('DB_DEBUG', false),
+  },
+
+  /*
+  |--------------------------------------------------------------------------
+  | MySQL
+  |--------------------------------------------------------------------------
+  |
+  | Here we define connection settings for MySQL database.
+  |
+  | npm i --save mysql
+  |
+  */
+  mysql: {
+    client: 'mysql',
+    connection: {
+      host: Env.get('DB_HOST', 'localhost'),
+      port: Env.get('DB_PORT', ''),
+      user: Env.get('DB_USER', 'root'),
+      password: Env.get('DB_PASSWORD', ''),
+      database: Env.get('DB_DATABASE', 'adonis'),
+    },
+    debug: Env.get('DB_DEBUG', false),
+  },
+
+  /*
+  |--------------------------------------------------------------------------
+  | PostgreSQL
+  |--------------------------------------------------------------------------
+  |
+  | Here we define connection settings for PostgreSQL database.
+  |
+  | npm i --save pg
+  |
+  */
+  pg: {
+    client: 'pg',
+    connection: {
+      host: Env.get('DB_HOST', 'localhost'),
+      port: Env.get('DB_PORT', ''),
+      user: Env.get('DB_USER', 'root'),
+      password: Env.get('DB_PASSWORD', ''),
+      database: Env.get('DB_DATABASE', 'adonis'),
+    },
+    debug: Env.get('DB_DEBUG', false),
+  },
+};
diff --git a/src/internal-server/config/drive.js b/src/internal-server/config/drive.js
new file mode 100644
index 000000000..617ce470a
--- /dev/null
+++ b/src/internal-server/config/drive.js
@@ -0,0 +1,45 @@
+const Env = use('Env');
+
+module.exports = {
+  /*
+  |--------------------------------------------------------------------------
+  | Default disk
+  |--------------------------------------------------------------------------
+  |
+  | The default disk is used when you interact with the file system without
+  | defining a disk name
+  |
+  */
+  default: 'local',
+
+  disks: {
+    /*
+    |--------------------------------------------------------------------------
+    | Local
+    |--------------------------------------------------------------------------
+    |
+    | Local disk interacts with the a local folder inside your application
+    |
+    */
+    local: {
+      root: `${__dirname}/../recipes`,
+      driver: 'local',
+    },
+
+    /*
+    |--------------------------------------------------------------------------
+    | S3
+    |--------------------------------------------------------------------------
+    |
+    | S3 disk interacts with a bucket on aws s3
+    |
+    */
+    s3: {
+      driver: 's3',
+      key: Env.get('S3_KEY'),
+      secret: Env.get('S3_SECRET'),
+      bucket: Env.get('S3_BUCKET'),
+      region: Env.get('S3_REGION'),
+    },
+  },
+};
diff --git a/src/internal-server/config/hash.js b/src/internal-server/config/hash.js
new file mode 100644
index 000000000..bbf32f691
--- /dev/null
+++ b/src/internal-server/config/hash.js
@@ -0,0 +1,47 @@
+/** @type {import('@adonisjs/framework/src/Env')} */
+const Env = use('Env');
+
+module.exports = {
+  /*
+  |--------------------------------------------------------------------------
+  | Driver
+  |--------------------------------------------------------------------------
+  |
+  | Driver to be used for hashing values. The same driver is used by the
+  | auth module too.
+  |
+  */
+  driver: Env.get('HASH_DRIVER', 'bcrypt'),
+
+  /*
+  |--------------------------------------------------------------------------
+  | Bcrypt
+  |--------------------------------------------------------------------------
+  |
+  | Config related to bcrypt hashing. https://www.npmjs.com/package/bcrypt
+  | package is used internally.
+  |
+  */
+  bcrypt: {
+    rounds: 10,
+  },
+
+  /*
+  |--------------------------------------------------------------------------
+  | Argon
+  |--------------------------------------------------------------------------
+  |
+  | Config related to argon. https://www.npmjs.com/package/argon2 package is
+  | used internally.
+  |
+  | Since argon is optional, you will have to install the dependency yourself
+  |
+  |============================================================================
+  | npm i argon2
+  |============================================================================
+  |
+  */
+  argon: {
+    type: 1,
+  },
+};
diff --git a/src/internal-server/config/session.js b/src/internal-server/config/session.js
new file mode 100644
index 000000000..3ce3cc4da
--- /dev/null
+++ b/src/internal-server/config/session.js
@@ -0,0 +1,97 @@
+const Env = use('Env');
+
+module.exports = {
+  /*
+  |--------------------------------------------------------------------------
+  | Session Driver
+  |--------------------------------------------------------------------------
+  |
+  | The session driver to be used for storing session values. It can be
+  | cookie, file or redis.
+  |
+  | For `redis` driver, make sure to install and register `@adonisjs/redis`
+  |
+  */
+  driver: Env.get('SESSION_DRIVER', 'cookie'),
+
+  /*
+  |--------------------------------------------------------------------------
+  | Cookie Name
+  |--------------------------------------------------------------------------
+  |
+  | The name of the cookie to be used for saving session id. Session ids
+  | are signed and encrypted.
+  |
+  */
+  cookieName: 'adonis-session',
+
+  /*
+  |--------------------------------------------------------------------------
+  | Clear session when browser closes
+  |--------------------------------------------------------------------------
+  |
+  | If this value is true, the session cookie will be temporary and will be
+  | removed when browser closes.
+  |
+  */
+  clearWithBrowser: true,
+
+  /*
+  |--------------------------------------------------------------------------
+  | Session age
+  |--------------------------------------------------------------------------
+  |
+  | This value is only used when `clearWithBrowser` is set to false. The
+  | age must be a valid https://npmjs.org/package/ms string or should
+  | be in milliseconds.
+  |
+  | Valid values are:
+  |  '2h', '10d', '5y', '2.5 hrs'
+  |
+  */
+  age: '2h',
+
+  /*
+  |--------------------------------------------------------------------------
+  | Cookie options
+  |--------------------------------------------------------------------------
+  |
+  | Cookie options defines the options to be used for setting up session
+  | cookie
+  |
+  */
+  cookie: {
+    httpOnly: true,
+    path: '/',
+    sameSite: false,
+  },
+
+  /*
+  |--------------------------------------------------------------------------
+  | Sessions location
+  |--------------------------------------------------------------------------
+  |
+  | If driver is set to file, we need to define the relative location from
+  | the temporary path or absolute url to any location.
+  |
+  */
+  file: {
+    location: 'sessions',
+  },
+
+  /*
+  |--------------------------------------------------------------------------
+  | Redis config
+  |--------------------------------------------------------------------------
+  |
+  | The configuration for the redis driver.
+  |
+  */
+  redis: {
+    host: 'localhost',
+    port: 6379,
+    password: null,
+    db: 0,
+    keyPrefix: '',
+  },
+};
diff --git a/src/internal-server/config/shield.js b/src/internal-server/config/shield.js
new file mode 100644
index 000000000..76f430e91
--- /dev/null
+++ b/src/internal-server/config/shield.js
@@ -0,0 +1,143 @@
+module.exports = {
+  /*
+  |--------------------------------------------------------------------------
+  | Content Security Policy
+  |--------------------------------------------------------------------------
+  |
+  | Content security policy filters out the origins not allowed to execute
+  | and load resources like scripts, styles and fonts. There are wide
+  | variety of options to choose from.
+  */
+  csp: {
+    /*
+    |--------------------------------------------------------------------------
+    | Directives
+    |--------------------------------------------------------------------------
+    |
+    | All directives are defined in camelCase and here is the list of
+    | available directives and their possible values.
+    |
+    | https://content-security-policy.com
+    |
+    | @example
+    | directives: {
+    |   defaultSrc: ['self', '@nonce', 'cdnjs.cloudflare.com']
+    | }
+    |
+    */
+    directives: {
+    },
+    /*
+    |--------------------------------------------------------------------------
+    | Report only
+    |--------------------------------------------------------------------------
+    |
+    | Setting `reportOnly=true` will not block the scripts from running and
+    | instead report them to a URL.
+    |
+    */
+    reportOnly: false,
+    /*
+    |--------------------------------------------------------------------------
+    | Set all headers
+    |--------------------------------------------------------------------------
+    |
+    | Headers staring with `X` have been depreciated, since all major browsers
+    | supports the standard CSP header. So its better to disable deperciated
+    | headers, unless you want them to be set.
+    |
+    */
+    setAllHeaders: false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Disable on android
+    |--------------------------------------------------------------------------
+    |
+    | Certain versions of android are buggy with CSP policy. So you can set
+    | this value to true, to disable it for Android versions with buggy
+    | behavior.
+    |
+    | Here is an issue reported on a different package, but helpful to read
+    | if you want to know the behavior. https://github.com/helmetjs/helmet/pull/82
+    |
+    */
+    disableAndroid: true,
+  },
+
+  /*
+  |--------------------------------------------------------------------------
+  | X-XSS-Protection
+  |--------------------------------------------------------------------------
+  |
+  | X-XSS Protection saves from applications from XSS attacks. It is adopted
+  | by IE and later followed by some other browsers.
+  |
+  | Learn more at https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-XSS-Protection
+  |
+  */
+  xss: {
+    enabled: true,
+    enableOnOldIE: false,
+  },
+
+  /*
+  |--------------------------------------------------------------------------
+  | Iframe Options
+  |--------------------------------------------------------------------------
+  |
+  | xframe defines whether or not your website can be embedded inside an
+  | iframe. Choose from one of the following options.
+  | @available options
+  | DENY, SAMEORIGIN, ALLOW-FROM http://example.com
+  |
+  | Learn more at https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options
+  */
+  xframe: 'DENY',
+
+  /*
+  |--------------------------------------------------------------------------
+  | No Sniff
+  |--------------------------------------------------------------------------
+  |
+  | Browsers have a habit of sniffing content-type of a response. Which means
+  | files with .txt extension containing Javascript code will be executed as
+  | Javascript. You can disable this behavior by setting nosniff to false.
+  |
+  | Learn more at https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options
+  |
+  */
+  nosniff: true,
+
+  /*
+  |--------------------------------------------------------------------------
+  | No Open
+  |--------------------------------------------------------------------------
+  |
+  | IE users can execute webpages in the context of your website, which is
+  | a serious security risk. Below option will manage this for you.
+  |
+  */
+  noopen: true,
+
+  /*
+  |--------------------------------------------------------------------------
+  | CSRF Protection
+  |--------------------------------------------------------------------------
+  |
+  | CSRF Protection adds another layer of security by making sure, actionable
+  | routes does have a valid token to execute an action.
+  |
+  */
+  csrf: {
+    enable: true,
+    methods: ['POST', 'PUT', 'DELETE'],
+    filterUris: [],
+    cookieOptions: {
+      httpOnly: false,
+      sameSite: true,
+      path: '/',
+      maxAge: 7200,
+    },
+  },
+};
diff --git a/src/internal-server/database/factory.js b/src/internal-server/database/factory.js
new file mode 100644
index 000000000..8534fc20a
--- /dev/null
+++ b/src/internal-server/database/factory.js
@@ -0,0 +1,19 @@
+/*
+|--------------------------------------------------------------------------
+| Factory
+|--------------------------------------------------------------------------
+|
+| Factories are used to define blueprints for database tables or Lucid
+| models. Later you can use these blueprints to seed your database
+| with dummy data.
+|
+*/
+
+/** @type {import('@adonisjs/lucid/src/Factory')} */
+// const Factory = use('Factory')
+
+// Factory.blueprint('App/Models/User', (faker) => {
+//   return {
+//     username: faker.username()
+//   }
+// })
diff --git a/src/internal-server/database/migrations/1503250034279_user.js b/src/internal-server/database/migrations/1503250034279_user.js
new file mode 100644
index 000000000..80b49020a
--- /dev/null
+++ b/src/internal-server/database/migrations/1503250034279_user.js
@@ -0,0 +1,18 @@
+/** @type {import('@adonisjs/lucid/src/Schema')} */
+const Schema = use('Schema');
+
+class UserSchema extends Schema {
+  up() {
+    this.create('users', (table) => {
+      table.increments();
+      table.json('settings');
+      table.timestamps();
+    });
+  }
+
+  down() {
+    this.drop('users');
+  }
+}
+
+module.exports = UserSchema;
diff --git a/src/internal-server/database/migrations/1566385379883_service_schema.js b/src/internal-server/database/migrations/1566385379883_service_schema.js
new file mode 100644
index 000000000..d887ef193
--- /dev/null
+++ b/src/internal-server/database/migrations/1566385379883_service_schema.js
@@ -0,0 +1,21 @@
+/** @type {import('@adonisjs/lucid/src/Schema')} */
+const Schema = use('Schema');
+
+class ServiceSchema extends Schema {
+  up() {
+    this.create('services', (table) => {
+      table.increments();
+      table.string('serviceId', 80).notNullable();
+      table.string('name', 80).notNullable();
+      table.string('recipeId', 254).notNullable();
+      table.json('settings');
+      table.timestamps();
+    });
+  }
+
+  down() {
+    this.drop('services');
+  }
+}
+
+module.exports = ServiceSchema;
diff --git a/src/internal-server/database/migrations/1566554231482_recipe_schema.js b/src/internal-server/database/migrations/1566554231482_recipe_schema.js
new file mode 100644
index 000000000..514d57600
--- /dev/null
+++ b/src/internal-server/database/migrations/1566554231482_recipe_schema.js
@@ -0,0 +1,20 @@
+/** @type {import('@adonisjs/lucid/src/Schema')} */
+const Schema = use('Schema');
+
+class RecipeSchema extends Schema {
+  up() {
+    this.create('recipes', (table) => {
+      table.increments();
+      table.string('name', 80).notNullable();
+      table.string('recipeId', 254).notNullable().unique();
+      table.json('data');
+      table.timestamps();
+    });
+  }
+
+  down() {
+    this.drop('recipes');
+  }
+}
+
+module.exports = RecipeSchema;
diff --git a/src/internal-server/database/migrations/1566554359294_workspace_schema.js b/src/internal-server/database/migrations/1566554359294_workspace_schema.js
new file mode 100644
index 000000000..421a406b5
--- /dev/null
+++ b/src/internal-server/database/migrations/1566554359294_workspace_schema.js
@@ -0,0 +1,22 @@
+/** @type {import('@adonisjs/lucid/src/Schema')} */
+const Schema = use('Schema');
+
+class WorkspaceSchema extends Schema {
+  up() {
+    this.create('workspaces', (table) => {
+      table.increments();
+      table.string('workspaceId', 80).notNullable().unique();
+      table.string('name', 80).notNullable();
+      table.integer('order');
+      table.json('services');
+      table.json('data');
+      table.timestamps();
+    });
+  }
+
+  down() {
+    this.drop('workspaces');
+  }
+}
+
+module.exports = WorkspaceSchema;
diff --git a/src/internal-server/database/template.sqlite b/src/internal-server/database/template.sqlite
new file mode 100644
index 000000000..3750f92c7
--- /dev/null
+++ b/src/internal-server/database/template.sqlite
diff --git a/src/internal-server/env.ini b/src/internal-server/env.ini
new file mode 100644
index 000000000..8df57db66
--- /dev/null
+++ b/src/internal-server/env.ini
@@ -0,0 +1,16 @@
+HOST=localhost
+PORT=45569
+NODE_ENV=development
+APP_NAME=Ferdi Internal Server
+APP_URL=http://${HOST}:${PORT}
+CACHE_VIEWS=false
+APP_KEY=FERDIINTERNALSERVER
+DB_CONNECTION=sqlite
+DB_HOST=localhost
+DB_PORT=3306
+DB_USER=root
+DB_PASSWORD=
+DB_DATABASE=ferdi
+HASH_DRIVER=bcrypt
+IS_CREATION_ENABLED=true
+CONNECT_WITH_FRANZ=true
diff --git a/src/internal-server/package.json b/src/internal-server/package.json
new file mode 100644
index 000000000..14ab704d8
--- /dev/null
+++ b/src/internal-server/package.json
@@ -0,0 +1,3 @@
+{
+  "main": "index.js"
+}
diff --git a/src/internal-server/public/css/main.css b/src/internal-server/public/css/main.css
new file mode 100644
index 000000000..b20b67922
--- /dev/null
+++ b/src/internal-server/public/css/main.css
@@ -0,0 +1,72 @@
+input {
+  margin-bottom: 1rem;
+  width: 100%;
+  padding: 0.5rem;
+}
+
+button,
+.button {
+  display: flex;
+  overflow: hidden;
+  padding: 12px 12px;
+  cursor: pointer;
+  width: 100%;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  @media (prefers-reduced-motion: no-preference) {
+    transition: all 150ms linear;
+  }
+  text-align: center;
+  white-space: nowrap;
+  text-decoration: none !important;
+  text-transform: none;
+  text-transform: capitalize;
+  color: #fff !important;
+  border: 0 none;
+  border-radius: 4px;
+  font-size: 13px;
+  font-weight: 500;
+  line-height: 1.3;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  justify-content: center;
+  align-items: center;
+  flex: 0 0 160px;
+  box-shadow: 2px 5px 10px #e4e4e4;
+  color: #ffffff;
+  background: #161616;
+}
+
+#dropzone {
+  width: 100%;
+  height: 30vh;
+  background-color: #ebebeb;
+
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+
+  cursor: pointer;
+}
+
+#dropzone p {
+  font-size: 0.85rem;
+}
+
+#files {
+  display: none;
+}
+
+.alert {
+  background-color: #e7a8a6;
+  padding: 0.8rem;
+  margin-bottom: 1rem;
+}
+
+td {
+  word-break: break-all;
+}
diff --git a/src/internal-server/public/css/vanilla.css b/src/internal-server/public/css/vanilla.css
new file mode 100644
index 000000000..37bc051a2
--- /dev/null
+++ b/src/internal-server/public/css/vanilla.css
@@ -0,0 +1,138 @@
+/* Reset */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed, 
+figure, figcaption, footer, header, hgroup, 
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    font-size: 100%;
+    font: inherit;
+    vertical-align: baseline;
+}
+* {
+    box-sizing: border-box;
+}
+
+
+
+/* Variables */
+:root {
+    --desktop-font-size: 1.3rem/1.5;
+    --mobile-font-size: 1.1rem/1.4;
+    --text-color: #2d2d2d;
+    --link-color: blue;
+    --primary-color: lightsteelblue;
+    --secondary-color: aliceblue;
+    --tertiary-color: whitesmoke;
+}
+
+
+
+
+/* Typography */
+body { 
+    color: var(--text-color);
+    padding: 3rem;
+    font: var(--desktop-font-size) -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto, Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji", "Segoe UI Symbol";
+}
+
+h1,h2,h3,h4,h5,h6,p,blockquote,dl,img,figure {
+    margin: 2rem 0;
+}
+
+h1,h2,h3,h4,h5,h6 { font-weight: bold; }
+h1 { font-size: 200%; }
+h2 { font-size: 150%; }
+h3 { font-size: 120%; }
+h4,h5,h6 { font-size: 100%; }
+h5, h6 { text-transform: uppercase; }
+
+header h1 { border-bottom: 1px solid; }
+
+p { margin: 2rem 0; }
+
+a,a:visited { color: var(--link-color); }
+
+strong, time, b { font-weight: bold; }
+em, dfn, i { font-style: italic; }
+sub { font-size: 60%; vertical-align: bottom; }
+small { font-size: 80%; }
+
+blockquote, q {
+    background: var(--secondary-color);
+    border-left: 10px solid var(--primary-color);
+    font-family: "Georgia", serif; 
+    padding: 1rem;
+}
+blockquote p:first-child { margin-top: 0; }
+cite { 
+    font-family: "Georgia", serif; 
+    font-style: italic;
+    font-weight: bold;
+}
+
+kbd,code,samp,pre,var { font-family: monospace; font-weight: bold; }
+code, pre {
+    background: var(--tertiary-color);
+    padding: 0.5rem 1rem;
+}
+code pre , pre code { padding: 0; }
+
+
+
+/* Elements */
+hr {
+    background: var(--text-color);
+    border: 0;
+    height: 1px;
+    margin: 4rem 0;
+}
+
+img { max-width: 100%; }
+
+figure { 
+    border: 1px solid var(--primary-color);
+    display: inline-block;
+    padding: 1rem; 
+    width: auto;
+}
+figure img { margin: 0; }
+figure figcaption { font-size: 80%; }
+
+ul, ol { margin: 2rem 0; padding: 0 0 0 4rem; }
+
+dl dd { padding-left: 2rem; }
+
+table {
+    border: 1px solid var(--primary-color);
+    border-collapse: collapse;
+    table-layout: fixed;
+    width: 100%; 
+}
+table caption { margin: 2rem 0; }
+table thead { text-align: center; }
+table tbody { text-align: right; }
+table tr { border-bottom: 1px solid var(--primary-color); }
+table tbody tr:nth-child(even) { background: var(--tertiary-color); }
+table th { background: var(--secondary-color); font-weight: bold; }
+table th, table td { padding: 1rem; }
+table th:not(last-of-type), table td:not(last-of-type) { border-right: 1px solid var(--primary-color); }
+
+
+
+/* Mobile Styling */
+@media screen and (max-width: 50rem) {
+    body {
+        font: var(--mobile-font-size) -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto, Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji", "Segoe UI Symbol"
+    }
+}
\ No newline at end of file
diff --git a/src/internal-server/public/images/logo.png b/src/internal-server/public/images/logo.png
new file mode 100644
index 000000000..4145a077a
--- /dev/null
+++ b/src/internal-server/public/images/logo.png
diff --git a/src/internal-server/public/js/transfer.js b/src/internal-server/public/js/transfer.js
new file mode 100644
index 000000000..8382bba02
--- /dev/null
+++ b/src/internal-server/public/js/transfer.js
@@ -0,0 +1,13 @@
+const submitBtn = document.getElementById('submit');
+const fileInput = document.getElementById('file');
+const fileOutput = document.getElementById('fileoutput');
+
+fileInput.addEventListener('change', () => {
+  const reader = new FileReader();
+  reader.onload = () => {
+    const text = reader.result;
+    fileOutput.value = text;
+    submitBtn.disabled = false;
+  };
+  reader.readAsText(fileInput.files[0]);
+});
diff --git a/src/internal-server/resources/views/import.edge b/src/internal-server/resources/views/import.edge
new file mode 100644
index 000000000..561021a0c
--- /dev/null
+++ b/src/internal-server/resources/views/import.edge
@@ -0,0 +1,18 @@
+@layout('layouts.main')
+
+@section('content')
+<h1>Import a Franz account</h1>
+<p>Please login using your Franz account. We will import your services and workspaces.</p>
+<form action="import" method="post">
+  <label for="email">E-Mail address</label><br />
+  <input type="email" name="email" placeholder="joe@example.com" required><br />
+
+  <label for="password">Password</label><br />
+  <input type="password" name="password" placeholder="********" required><br />
+
+  <label for="server">API Server to import from</label><br />
+  <input type="text" name="server" value="https://api.franzinfra.com" required><br />
+
+  <button type="submit" id="submitbutton">Import Franz account</button>
+</form>
+@endsection
diff --git a/src/internal-server/resources/views/index.edge b/src/internal-server/resources/views/index.edge
new file mode 100644
index 000000000..b01bd7569
--- /dev/null
+++ b/src/internal-server/resources/views/index.edge
@@ -0,0 +1,19 @@
+@layout('layouts.main')
+
+@section('content')
+<style>
+  ol,
+  p {
+    margin: 0.5rem 0;
+  }
+
+</style>
+<h1>Internal Ferdi Server</h1>
+<p>You are accessing the local server instance of your Ferdi application. This server is used to enable Ferdi's "Use without an Account" feature.</p>
+<p>
+  To use Ferdi without an account, log out of your current account (if you are already logged in) and choose "Use Ferdi without an Account".
+</p>
+<p>
+  Alternatively, you can <a href="/import">import your account from a remote server</a> or <a href="/transfer">import your data from a ".ferdi-data" file</a> or <a href="/transfer">export your data to a ".ferdi-data" file</a>.
+</p>
+@endsection
diff --git a/src/internal-server/resources/views/layouts/main.edge b/src/internal-server/resources/views/layouts/main.edge
new file mode 100644
index 000000000..8856b5d1e
--- /dev/null
+++ b/src/internal-server/resources/views/layouts/main.edge
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <title>ferdi-internal-server</title>
+
+  {{ style('css/vanilla') }}
+  {{ style('css/main') }}
+</head>
+
+<body>
+    <img src='images/logo.png' width='300' />
+    @!section('content')
+</body>
+
+</html>
diff --git a/src/internal-server/resources/views/transfer.edge b/src/internal-server/resources/views/transfer.edge
new file mode 100644
index 000000000..58febb24b
--- /dev/null
+++ b/src/internal-server/resources/views/transfer.edge
@@ -0,0 +1,32 @@
+@layout('layouts.main')
+
+@section('content')
+<h2>Import/Export data from another Ferdi server</h2>
+@if(success === true)
+    <div class="alert" style="background-color:#28C76F;">
+        Sucessfully imported your account data
+    </div>
+@endif
+
+<h3>Import data</h3>
+<div>
+  <label>Account data</label>
+  <div>
+    <input type="file" name="file" id="file" value="" accept=".json,.ferdi-data" required>
+  </div>
+</div>
+
+<form action="/transfer" method="POST">
+    <input type="hidden" name="file" id="fileoutput" value="">
+    <div>
+        <button style="background-color:#28C76F;margin-bottom:1rem;" id="submit" disabled>Import data</button>
+    </div>
+</form>
+
+<h3>Export data</h3>
+<a class="button" style="background-color:#28C76F;margin-bottom:1rem;" href="/export">Export data</a>
+
+</div>
+<script src="/js/transfer.js"></script>
+
+@endsection
\ No newline at end of file
diff --git a/src/internal-server/start.js b/src/internal-server/start.js
new file mode 100644
index 000000000..5ccc1330e
--- /dev/null
+++ b/src/internal-server/start.js
@@ -0,0 +1,51 @@
+/*
+|--------------------------------------------------------------------------
+| Http server
+|--------------------------------------------------------------------------
+|
+| This file bootstraps Adonisjs to start the HTTP server. You are free to
+| customize the process of booting the http server.
+|
+| """ Loading ace commands """
+|     At times you may want to load ace commands when starting the HTTP server.
+|     Same can be done by chaining `loadCommands()` method after
+|
+| """ Preloading files """
+|     Also you can preload files by calling `preLoad('path/to/file')` method.
+|     Make sure to pass a relative path from the project root.
+*/
+
+const fold = require('@adonisjs/fold');
+const { Ignitor } = require('@adonisjs/ignitor');
+const fs = require('fs-extra');
+const path = require('path');
+const { LOCAL_HOSTNAME } = require('../config');
+const { isWindows } = require('../environment');
+
+process.env.ENV_PATH = path.join(__dirname, 'env.ini');
+
+module.exports = async (userPath, port) => {
+  const dbPath = path.join(userPath, 'server.sqlite');
+  const dbTemplatePath = path.join(__dirname, 'database', 'template.sqlite');
+
+  if (!fs.existsSync(dbPath)) {
+    // Manually copy file
+    // We can't use copyFile here as it will cause the file to be readonly on Windows
+    const dbTemplate = await fs.readFile(dbTemplatePath);
+    await fs.writeFile(dbPath, dbTemplate);
+
+    // Change permissions to ensure to file is not read-only
+    if (isWindows) {
+      // eslint-disable-next-line no-bitwise
+      fs.chmodSync(dbPath, fs.statSync(dbPath).mode | 146);
+    }
+  }
+
+  // Note: These env vars are used by adonis as env vars
+  process.env.DB_PATH = dbPath;
+  process.env.USER_PATH = userPath;
+  process.env.HOST = LOCAL_HOSTNAME;
+  process.env.PORT = port;
+
+  new Ignitor(fold).appRoot(__dirname).fireHttpServer().catch(console.error); // eslint-disable-line no-console
+};
diff --git a/src/internal-server/start/app.js b/src/internal-server/start/app.js
new file mode 100644
index 000000000..8b1a49f57
--- /dev/null
+++ b/src/internal-server/start/app.js
@@ -0,0 +1,61 @@
+/*
+|--------------------------------------------------------------------------
+| Providers
+|--------------------------------------------------------------------------
+|
+| Providers are building blocks for your Adonis app. Anytime you install
+| a new Adonis specific package, chances are you will register the
+| provider here.
+|
+*/
+const providers = [
+  '@adonisjs/framework/providers/AppProvider',
+  '@adonisjs/bodyparser/providers/BodyParserProvider',
+  '@adonisjs/cors/providers/CorsProvider',
+  '@adonisjs/lucid/providers/LucidProvider',
+  '@adonisjs/drive/providers/DriveProvider',
+  '@adonisjs/validator/providers/ValidatorProvider',
+  '@adonisjs/framework/providers/ViewProvider',
+  '@adonisjs/shield/providers/ShieldProvider',
+];
+
+/*
+|--------------------------------------------------------------------------
+| Ace Providers
+|--------------------------------------------------------------------------
+|
+| Ace providers are required only when running ace commands. For example
+| Providers for migrations, tests etc.
+|
+*/
+const aceProviders = [
+  '@adonisjs/lucid/providers/MigrationsProvider',
+];
+
+/*
+|--------------------------------------------------------------------------
+| Aliases
+|--------------------------------------------------------------------------
+|
+| Aliases are short unique names for IoC container bindings. You are free
+| to create your own aliases.
+|
+| For example:
+|   { Route: 'Adonis/Src/Route' }
+|
+*/
+const aliases = {};
+
+/*
+|--------------------------------------------------------------------------
+| Commands
+|--------------------------------------------------------------------------
+|
+| Here you store ace commands for your package
+|
+*/
+const commands = [];
+
+module.exports = {
+  providers, aceProviders, aliases, commands,
+};
diff --git a/src/internal-server/start/kernel.js b/src/internal-server/start/kernel.js
new file mode 100644
index 000000000..7b540f829
--- /dev/null
+++ b/src/internal-server/start/kernel.js
@@ -0,0 +1,55 @@
+/** @type {import('@adonisjs/framework/src/Server')} */
+const Server = use('Server');
+
+/*
+|--------------------------------------------------------------------------
+| Global Middleware
+|--------------------------------------------------------------------------
+|
+| Global middleware are executed on each http request only when the routes
+| match.
+|
+*/
+const globalMiddleware = [
+  'Adonis/Middleware/BodyParser',
+  'App/Middleware/ConvertEmptyStringsToNull',
+];
+
+/*
+|--------------------------------------------------------------------------
+| Named Middleware
+|--------------------------------------------------------------------------
+|
+| Named middleware is key/value object to conditionally add middleware on
+| specific routes or group of routes.
+|
+| // define
+| {
+|   auth: 'Adonis/Middleware/Auth'
+| }
+|
+| // use
+| Route.get().middleware('auth')
+|
+*/
+const namedMiddleware = {
+};
+
+/*
+|--------------------------------------------------------------------------
+| Server Middleware
+|--------------------------------------------------------------------------
+|
+| Server level middleware are executed even when route for a given URL is
+| not registered. Features like `static assets` and `cors` needs better
+| control over request lifecycle.
+|
+*/
+const serverMiddleware = [
+  'Adonis/Middleware/Static',
+];
+
+Server
+  .registerGlobal(globalMiddleware)
+  .registerNamed(namedMiddleware)
+  .use(serverMiddleware);
diff --git a/src/internal-server/start/migrate.js b/src/internal-server/start/migrate.js
new file mode 100644
index 000000000..c27e07bc5
--- /dev/null
+++ b/src/internal-server/start/migrate.js
@@ -0,0 +1,46 @@
+const { ferdiVersion } = require('../../environment');
+
+/**
+ * Migrate server database to work with current Ferdi version
+ */
+const Database = use('Database');
+const User = use('App/Models/User');
+
+const migrateLog = (text) => {
+  console.log('\x1b[36m%s\x1b[0m', 'Ferdi Migration:', '\x1b[0m', text);
+};
+
+module.exports = async () => {
+  migrateLog('🧙‍  Running database migration wizard');
+
+  // Make sure user table exists
+  await Database.raw('CREATE TABLE IF NOT EXISTS `users` (`id` integer not null primary key autoincrement, `settings` text, `created_at` datetime, `updated_at` datetime);');
+
+  const user = await User.find(1);
+  let settings;
+  if (!user) {
+    migrateLog('🎩  Migrating from old Ferdi version as user doesn\'t exist');
+
+    // Create new user
+    await Database.raw('INSERT INTO  "users" ("id") VALUES (\'1\');');
+  } else {
+    settings = typeof user.settings === 'string' ? JSON.parse(user.settings) : user.settings;
+  }
+
+  if (!settings || !settings.db_version || settings.db_version !== ferdiVersion) {
+    const srcVersion = settings && settings.db_version ? settings.db_version : '5.4.0-beta.2';
+    migrateLog(`🔮  Migrating table from ${srcVersion} to ${ferdiVersion}`);
+
+    // Migrate database to current Ferdi version
+    // Currently no migrations
+
+    // Update version number in database
+    if (!settings) settings = {};
+    settings.db_version = ferdiVersion;
+    const newUser = await User.find(1); // Fetch user again as we might have only just created it
+    newUser.settings = JSON.stringify(settings);
+    await newUser.save();
+  } else {
+    migrateLog('🔧  Nothing to migrate, already on the newest version');
+  }
+};
diff --git a/src/internal-server/start/routes.js b/src/internal-server/start/routes.js
new file mode 100644
index 000000000..6668f3062
--- /dev/null
+++ b/src/internal-server/start/routes.js
@@ -0,0 +1,86 @@
+/*
+|--------------------------------------------------------------------------
+| Routes
+|--------------------------------------------------------------------------
+|
+*/
+
+/** @type {typeof import('@adonisjs/framework/src/Route/Manager')} */
+const Route = use('Route');
+
+// Run latest database migration
+const migrate = require('./migrate');
+
+migrate();
+
+const OnlyAllowFerdi = async ({ request, response }, next) => {
+  const version = request.header('X-Franz-Version');
+  if (!version) {
+    return response.status(403).redirect('/');
+  }
+
+  await next();
+  return true;
+};
+
+// Health: Returning if all systems function correctly
+Route.get('health', ({
+  response,
+}) => response.send({
+  api: 'success',
+  db: 'success',
+})).middleware(OnlyAllowFerdi);
+
+// API is grouped under '/v1/' route
+Route.group(() => {
+  // User authentification
+  Route.post('auth/signup', 'UserController.signup');
+  Route.post('auth/login', 'UserController.login');
+
+  // User info
+  Route.get('me', 'UserController.me');
+  Route.put('me', 'UserController.updateMe');
+
+  // Service info
+  Route.post('service', 'ServiceController.create');
+  Route.put('service/reorder', 'ServiceController.reorder');
+  Route.put('service/:id', 'ServiceController.edit');
+  Route.delete('service/:id', 'ServiceController.delete');
+  Route.get('me/services', 'ServiceController.list');
+
+  // Recipe store
+  Route.get('recipe', 'ServiceController.list');
+  Route.post('recipes/update', 'ServiceController.update');
+  Route.get('recipes', 'RecipeController.list');
+  Route.get('recipes/download/:recipe', 'RecipeController.download');
+  Route.get('recipes/search', 'RecipeController.search');
+  Route.get('recipes/update', 'StaticController.emptyArray');
+
+  // Workspaces
+  Route.put('workspace/:id', 'WorkspaceController.edit');
+  Route.delete('workspace/:id', 'WorkspaceController.delete');
+  Route.post('workspace', 'WorkspaceController.create');
+  Route.get('workspace', 'WorkspaceController.list');
+
+  // Static responses
+  Route.get('features/:mode?', 'StaticController.features');
+  Route.get('services', 'StaticController.emptyArray');
+  Route.get('news', 'StaticController.emptyArray');
+  Route.get('announcements/:version', 'StaticController.announcement');
+}).prefix('v1').middleware(OnlyAllowFerdi);
+
+Route.group(() => {
+  Route.get('icon/:id', 'ServiceController.icon');
+}).prefix('v1');
+
+// Franz account import
+Route.post('import', 'UserController.import');
+Route.get('import', ({ view }) => view.render('import'));
+
+// Account transfer
+Route.get('export', 'UserController.export');
+Route.post('transfer', 'UserController.importFerdi');
+Route.get('transfer', ({ view }) => view.render('transfer'));
+
+// Index
+Route.get('/', ({ view }) => view.render('index'));
diff --git a/src/internal-server/test.js b/src/internal-server/test.js
new file mode 100644
index 000000000..8d4807d06
--- /dev/null
+++ b/src/internal-server/test.js
@@ -0,0 +1,9 @@
+const path = require('path');
+const fs = require('fs-extra');
+const server = require('./start');
+
+const dummyUserFolder = path.join(__dirname, 'user_data');
+
+fs.ensureDirSync(dummyUserFolder);
+
+server(dummyUserFolder, 45568);
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index c60536f0c..e4056e536 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -6,7 +6,7 @@ import { autorun, observable } from 'mobx';
 import { defineMessages } from 'react-intl';
 import { CUSTOM_WEBSITE_RECIPE_ID, GITHUB_FERDI_URL, LIVE_API_FERDI_WEBSITE } from '../config';
 import {
-  cmdKey, ctrlKey, isLinux, isMac, aboutAppDetails, termsBase,
+  shortcutKey, altKey, shiftKey, settingsShortcutKey, isLinux, isMac, aboutAppDetails, lockFerdiShortcutKey, todosToggleShortcutKey, workspaceToggleShortcutKey, addNewServiceShortcutKey, muteFerdiShortcutKey,
 } from '../environment';
 import { announcementsStore } from '../features/announcements';
 import { announcementActions } from '../features/announcements/actions';
@@ -14,6 +14,7 @@ import { todosStore } from '../features/todos';
 import { todoActions } from '../features/todos/actions';
 import { workspaceActions } from '../features/workspaces/actions';
 import { workspaceStore } from '../features/workspaces/index';
+import apiBase, { termsBase } from '../api/apiBase';
 
 const menuItems = defineMessages({
   edit: {
@@ -100,14 +101,6 @@ const menuItems = defineMessages({
     id: 'menu.view.zoomOut',
     defaultMessage: '!!!Zoom Out',
   },
-  enterFullScreen: {
-    id: 'menu.view.enterFullScreen',
-    defaultMessage: '!!!Enter Full Screen',
-  },
-  exitFullScreen: {
-    id: 'menu.view.exitFullScreen',
-    defaultMessage: '!!!Exit Full Screen',
-  },
   toggleFullScreen: {
     id: 'menu.view.toggleFullScreen',
     defaultMessage: '!!!Toggle Full Screen',
@@ -132,8 +125,8 @@ const menuItems = defineMessages({
     id: 'menu.view.reloadService',
     defaultMessage: '!!!Reload Service',
   },
-  reloadFranz: {
-    id: 'menu.view.reloadFranz',
+  reloadFerdi: {
+    id: 'menu.view.reloadFerdi',
     defaultMessage: '!!!Reload Ferdi',
   },
   lockFerdi: {
@@ -160,6 +153,10 @@ const menuItems = defineMessages({
     id: 'menu.help.changelog',
     defaultMessage: '!!!Changelog',
   },
+  importExportData: {
+    id: 'menu.help.importExportData',
+    defaultMessage: '!!!Import/Export Configuration Data',
+  },
   support: {
     id: 'menu.help.support',
     defaultMessage: '!!!Support',
@@ -318,9 +315,10 @@ function getActiveWebview() {
   return window.ferdi.stores.services.active.webview;
 }
 
-const _templateFactory = (intl, locked) => [
+const _titleBarTemplateFactory = (intl, locked) => [
   {
     label: intl.formatMessage(menuItems.edit),
+    accelerator: `${altKey}+E`,
     submenu: [
       {
         label: intl.formatMessage(menuItems.undo),
@@ -335,23 +333,23 @@ const _templateFactory = (intl, locked) => [
       },
       {
         label: intl.formatMessage(menuItems.cut),
-        accelerator: 'Cmd+X',
-        selector: 'cut:',
+        accelerator: `${shortcutKey()}+X`,
+        role: 'cut',
       },
       {
         label: intl.formatMessage(menuItems.copy),
-        accelerator: 'Cmd+C',
-        selector: 'copy:',
+        accelerator: `${shortcutKey()}+C`,
+        role: 'copy',
       },
       {
         label: intl.formatMessage(menuItems.paste),
-        accelerator: 'Cmd+V',
-        selector: 'paste:',
+        accelerator: `${shortcutKey()}+V`,
+        role: 'paste',
       },
       {
         label: intl.formatMessage(menuItems.pasteAndMatchStyle),
-        accelerator: 'Cmd+Shift+V',
-        selector: 'pasteAndMatchStyle:',
+        accelerator: `${shortcutKey()}+${shiftKey}+V`, // Override the accelerator since this adds new key combo in macos
+        role: 'pasteAndMatchStyle',
         click() {
           getActiveWebview().pasteAndMatchStyle();
         },
@@ -362,13 +360,14 @@ const _templateFactory = (intl, locked) => [
       },
       {
         label: intl.formatMessage(menuItems.selectAll),
-        accelerator: 'Cmd+A',
-        selector: 'selectAll:',
+        accelerator: `${shortcutKey()}+A`,
+        role: 'selectall',
       },
     ],
   },
   {
     label: intl.formatMessage(menuItems.view),
+    accelerator: `${altKey}+V`,
     visible: !locked,
     submenu: [
       {
@@ -376,7 +375,7 @@ const _templateFactory = (intl, locked) => [
       },
       {
         label: intl.formatMessage(menuItems.openQuickSwitch),
-        accelerator: 'CmdOrCtrl+S',
+        accelerator: `${shortcutKey()}+S`,
         click() {
           window.ferdi.features.quickSwitch.state.isModalVisible = true;
         },
@@ -386,7 +385,7 @@ const _templateFactory = (intl, locked) => [
       },
       {
         label: intl.formatMessage(menuItems.findInPage),
-        accelerator: 'CmdOrCtrl+F',
+        accelerator: `${shortcutKey()}+F`,
         click() {
           // Check if there is a service active
           if (!window.ferdi.stores.services.active) return;
@@ -407,18 +406,16 @@ const _templateFactory = (intl, locked) => [
       },
       {
         label: intl.formatMessage(menuItems.back),
-        accelerator: 'CmdOrCtrl+Left',
+        accelerator: `${shortcutKey()}+Left`,
         click() {
-          const activeService = getActiveWebview();
-          activeService.goBack();
+          getActiveWebview().goBack();
         },
       },
       {
         label: intl.formatMessage(menuItems.forward),
-        accelerator: 'CmdOrCtrl+Right',
+        accelerator: `${shortcutKey()}+Right`,
         click() {
-          const activeService = getActiveWebview();
-          activeService.goForward();
+          getActiveWebview().goForward();
         },
       },
       {
@@ -426,14 +423,16 @@ const _templateFactory = (intl, locked) => [
       },
       {
         label: intl.formatMessage(menuItems.resetZoom),
-        accelerator: 'Cmd+0',
+        accelerator: `${shortcutKey()}+0`,
+        role: 'resetZoom',
         click() {
           getActiveWebview().setZoomLevel(0);
         },
       },
       {
         label: intl.formatMessage(menuItems.zoomIn),
-        accelerator: 'Cmd+plus',
+        accelerator: `${shortcutKey()}+plus`,
+        role: 'zoomIn',
         click() {
           const activeService = getActiveWebview();
           const level = activeService.getZoomLevel();
@@ -444,7 +443,8 @@ const _templateFactory = (intl, locked) => [
       },
       {
         label: intl.formatMessage(menuItems.zoomOut),
-        accelerator: 'Cmd+-',
+        accelerator: `${shortcutKey()}+-`,
+        role: 'zoomOut',
         click() {
           const activeService = getActiveWebview();
           const level = activeService.getZoomLevel();
@@ -457,15 +457,13 @@ const _templateFactory = (intl, locked) => [
         type: 'separator',
       },
       {
-        label: app.mainWindow.isFullScreen() // label doesn't work, gets overridden by Electron
-          ? intl.formatMessage(menuItems.exitFullScreen)
-          : intl.formatMessage(menuItems.enterFullScreen),
-        role: 'togglefullscreen',
+        label: intl.formatMessage(menuItems.toggleFullScreen),
+        role: 'toggleFullScreen',
       },
       {
         label: intl.formatMessage(menuItems.toggleDarkMode),
         type: 'checkbox',
-        accelerator: `${cmdKey}+Shift+D`,
+        accelerator: `${shortcutKey()}+${shiftKey}+D`,
         checked: window.ferdi.stores.settings.app.darkMode,
         click: () => {
           window.ferdi.actions.settings.update({
@@ -480,11 +478,13 @@ const _templateFactory = (intl, locked) => [
   },
   {
     label: intl.formatMessage(menuItems.services),
+    accelerator: `${altKey}+S`,
     visible: !locked,
     submenu: [],
   },
   {
     label: intl.formatMessage(menuItems.workspaces),
+    accelerator: `${altKey}+W`,
     submenu: [],
     visible: !locked && workspaceStore.isFeatureEnabled,
   },
@@ -509,6 +509,7 @@ const _templateFactory = (intl, locked) => [
   },
   {
     label: intl.formatMessage(menuItems.help),
+    accelerator: `${altKey}+H`,
     role: 'help',
     submenu: [
       {
@@ -516,274 +517,23 @@ const _templateFactory = (intl, locked) => [
         click() { shell.openExternal(LIVE_API_FERDI_WEBSITE); },
       },
       {
-        label: intl.formatMessage(menuItems.announcement),
-        click: () => {
-          announcementActions.show();
-        },
-        visible: !locked && window.ferdi.stores.user.isLoggedIn && announcementsStore.areNewsAvailable,
-      },
-      {
-        type: 'separator',
-      },
-      {
-        label: intl.formatMessage(menuItems.support),
-        click() { shell.openExternal(`${LIVE_API_FERDI_WEBSITE}/contact`); },
-      },
-      {
-        type: 'separator',
-      },
-      {
-        label: intl.formatMessage(menuItems.tos),
-        click() { shell.openExternal(`${termsBase()}/terms`); },
-      },
-      {
-        label: intl.formatMessage(menuItems.privacy),
-        click() { shell.openExternal(`${termsBase()}/privacy`); },
-      },
-    ],
-  },
-];
-
-const _titleBarTemplateFactory = (intl, locked) => [
-  {
-    label: intl.formatMessage(menuItems.edit),
-    accelerator: 'Alt+E',
-    submenu: [
-      {
-        label: intl.formatMessage(menuItems.undo),
-        accelerator: `${ctrlKey}+Z`,
-        click() {
-          getActiveWebview().undo();
-        },
-      },
-      {
-        label: intl.formatMessage(menuItems.redo),
-        accelerator: `${ctrlKey}+Y`,
-        click() {
-          getActiveWebview().redo();
-        },
-      },
-      {
-        type: 'separator',
-      },
-      {
-        label: intl.formatMessage(menuItems.cut),
-        accelerator: `${ctrlKey}+X`,
-        click() {
-          getActiveWebview().cut();
-        },
-      },
-      {
-        label: intl.formatMessage(menuItems.copy),
-        accelerator: `${ctrlKey}+C`,
-        click() {
-          getActiveWebview().copy();
-        },
-      },
-      {
-        label: intl.formatMessage(menuItems.paste),
-        accelerator: `${ctrlKey}+V`,
-        click() {
-          getActiveWebview().paste();
-        },
-      },
-      {
-        label: intl.formatMessage(menuItems.pasteAndMatchStyle),
-        accelerator: `${ctrlKey}+Shift+V`,
-        click() {
-          getActiveWebview().pasteAndMatchStyle();
-        },
-      },
-      {
-        label: intl.formatMessage(menuItems.delete),
-        click() {
-          getActiveWebview().delete();
-        },
-      },
-      {
-        label: intl.formatMessage(menuItems.selectAll),
-        accelerator: `${ctrlKey}+A`,
-        click() {
-          getActiveWebview().selectAll();
-        },
-      },
-    ],
-  },
-  {
-    label: intl.formatMessage(menuItems.view),
-    accelerator: 'Alt+V',
-    visible: !locked,
-    submenu: [
-      {
-        type: 'separator',
-      },
-      {
-        label: intl.formatMessage(menuItems.openQuickSwitch),
-        accelerator: 'CmdOrCtrl+S',
-        click() {
-          window.ferdi.features.quickSwitch.state.isModalVisible = true;
-        },
-      },
-      {
-        type: 'separator',
-      },
-      {
-        label: intl.formatMessage(menuItems.findInPage),
-        accelerator: 'CmdOrCtrl+F',
-        click() {
-          // Check if there is a service active
-          if (!window.ferdi.stores.services.active) return;
-
-          // Focus webview so find in page popup gets focused
-          window.ferdi.stores.services.active.webview.focus();
-
-          const currentService = window.ferdi.stores.services.active.id;
-          window.ferdi.actions.service.sendIPCMessage({
-            serviceId: currentService,
-            channel: 'find-in-page',
-            args: {},
-          });
-        },
-      },
-      {
-        type: 'separator',
-      },
-      {
-        label: intl.formatMessage(menuItems.back),
-        accelerator: 'CmdOrCtrl+Left',
-        click() {
-          const activeService = getActiveWebview();
-          activeService.goBack();
-        },
-      },
-      {
-        label: intl.formatMessage(menuItems.forward),
-        accelerator: 'CmdOrCtrl+Right',
-        click() {
-          const activeService = getActiveWebview();
-          activeService.goForward();
-        },
-      },
-      {
-        type: 'separator',
-      },
-      {
-        label: intl.formatMessage(menuItems.resetZoom),
-        accelerator: `${ctrlKey}+0`,
-        click() {
-          getActiveWebview().setZoomLevel(0);
-        },
-      },
-      {
-        label: intl.formatMessage(menuItems.zoomIn),
-        accelerator: `${ctrlKey}+=`,
-        click() {
-          const activeService = getActiveWebview();
-          const level = activeService.getZoomLevel();
-
-          // level 9 =~ +300% and setZoomLevel wouldnt zoom in further
-          if (level < 9) activeService.setZoomLevel(level + 1);
-        },
+        label: intl.formatMessage(menuItems.changelog),
+        click() { shell.openExternal(`${GITHUB_FERDI_URL}/ferdi/blob/master/CHANGELOG.md`); },
       },
       {
-        label: intl.formatMessage(menuItems.zoomOut),
-        accelerator: `${ctrlKey}+-`,
-        click() {
-          const activeService = getActiveWebview();
-          const level = activeService.getZoomLevel();
-
-          // level -9 =~ -50% and setZoomLevel wouldnt zoom out further
-          if (level > -9) activeService.setZoomLevel(level - 1);
-        },
+        label: intl.formatMessage(menuItems.importExportData),
+        click() { shell.openExternal(apiBase(false)); },
+        enabled: !locked,
       },
       {
         type: 'separator',
       },
       {
-        label: app.mainWindow.isFullScreen() // label doesn't work, gets overridden by Electron
-          ? intl.formatMessage(menuItems.exitFullScreen)
-          : intl.formatMessage(menuItems.enterFullScreen),
-        accelerator: 'F11',
-        click(menuItem, browserWindow) {
-          browserWindow.setFullScreen(!browserWindow.isFullScreen());
-        },
-      },
-      {
-        label: intl.formatMessage(menuItems.toggleDarkMode),
-        type: 'checkbox',
-        accelerator: `${cmdKey}+Shift+D`,
-        checked: window.ferdi.stores.settings.app.darkMode,
-        click: () => {
-          window.ferdi.actions.settings.update({
-            type: 'app',
-            data: {
-              darkMode: !window.ferdi.stores.settings.app.darkMode,
-            },
-          });
-        },
-      },
-      {
-        label: intl.formatMessage(menuItems.autohideMenuBar),
-        type: 'checkbox',
-        checked: window.ferdi.stores.settings.app.autohideMenuBar,
+        label: intl.formatMessage(menuItems.announcement),
         click: () => {
-          window.ferdi.actions.settings.update({
-            type: 'app',
-            data: {
-              autohideMenuBar: !window.ferdi.stores.settings.app.autohideMenuBar,
-            },
-          });
-        },
-      },
-    ],
-  },
-  {
-    label: intl.formatMessage(menuItems.services),
-    accelerator: 'Alt+S',
-    visible: !locked,
-    submenu: [],
-  },
-  {
-    label: intl.formatMessage(menuItems.workspaces),
-    accelerator: 'Alt+W',
-    submenu: [],
-    visible: !locked && workspaceStore.isFeatureEnabled,
-  },
-  {
-    label: intl.formatMessage(menuItems.todos),
-    submenu: [],
-    visible: !locked && todosStore.isFeatureEnabled,
-  },
-  {
-    label: intl.formatMessage(menuItems.window),
-    submenu: [
-      {
-        label: intl.formatMessage(menuItems.minimize),
-        accelerator: 'Ctrl+M',
-        click(menuItem, browserWindow) {
-          browserWindow.minimize();
+          announcementActions.show();
         },
-      },
-      {
-        label: intl.formatMessage(menuItems.close),
-        accelerator: 'Ctrl+W',
-        click(menuItem, browserWindow) {
-          browserWindow.close();
-        },
-      },
-    ],
-  },
-  {
-    label: '?',
-    accelerator: 'Alt+?',
-    submenu: [
-      {
-        label: intl.formatMessage(menuItems.learnMore),
-        click() { shell.openExternal(LIVE_API_FERDI_WEBSITE); },
-      },
-      {
-        label: intl.formatMessage(menuItems.changelog),
-        click() { shell.openExternal(`${GITHUB_FERDI_URL}/ferdi/blob/master/CHANGELOG.md`); },
+        enabled: !locked && window.ferdi.stores.user.isLoggedIn && announcementsStore.areNewsAvailable,
       },
       {
         type: 'separator',
@@ -831,30 +581,44 @@ export default class FranzMenu {
     // need to clone object so we don't modify computed (cached) object
     const serviceTpl = Object.assign([], this.serviceTpl());
 
-    // Don't initialize when window.franz is undefined or when we are on a payment window route
-    if (window.ferdi === undefined || this.stores.router.location.pathname.startsWith('/payment/')) {
+    // Don't initialize when window.ferdi is undefined
+    if (window.ferdi === undefined) {
       console.log('skipping menu init');
       return;
     }
 
     const { intl } = window.ferdi;
-    const tpl = isMac
-      ? _templateFactory(intl, this.stores.settings.app.locked)
-      : _titleBarTemplateFactory(intl, this.stores.settings.app.locked);
+    const tpl = _titleBarTemplateFactory(intl, this.stores.settings.app.locked);
     const { actions } = this;
 
+    if (!isMac) {
+      tpl[1].submenu.push({
+        label: intl.formatMessage(menuItems.autohideMenuBar),
+        type: 'checkbox',
+        checked: window.ferdi.stores.settings.app.autohideMenuBar,
+        click: () => {
+          window.ferdi.actions.settings.update({
+            type: 'app',
+            data: {
+              autohideMenuBar: !window.ferdi.stores.settings.app.autohideMenuBar,
+            },
+          });
+        },
+      });
+    }
+
     if (!this.stores.settings.app.locked) {
       tpl[1].submenu.push({
         type: 'separator',
       }, {
         label: intl.formatMessage(menuItems.toggleDevTools),
-        accelerator: `${cmdKey}+Alt+I`,
+        accelerator: `${shortcutKey()}+${altKey}+I`,
         click: (menuItem, browserWindow) => {
           browserWindow.webContents.toggleDevTools();
         },
       }, {
         label: intl.formatMessage(menuItems.toggleServiceDevTools),
-        accelerator: `${cmdKey}+Shift+Alt+I`,
+        accelerator: `${shortcutKey()}+${shiftKey}+${altKey}+I`,
         click: () => {
           this.actions.service.openDevToolsForActiveService();
         },
@@ -864,7 +628,7 @@ export default class FranzMenu {
       if (this.stores.features.features.isTodosEnabled) {
         tpl[1].submenu.push({
           label: intl.formatMessage(menuItems.toggleTodosDevTools),
-          accelerator: `${cmdKey}+Shift+Alt+O`,
+          accelerator: `${shortcutKey()}+${shiftKey}+${altKey}+O`,
           click: () => {
             const webview = document.querySelector('#todos-panel webview');
             if (webview) this.actions.todos.openDevTools();
@@ -875,7 +639,7 @@ export default class FranzMenu {
       tpl[1].submenu.unshift({
         label: intl.formatMessage(menuItems.reloadService),
         id: 'reloadService', // TODO: needed?
-        accelerator: `${cmdKey}+R`,
+        accelerator: `${shortcutKey()}+R`,
         click: () => {
           if (this.stores.user.isLoggedIn
           && this.stores.services.enabled.length > 0) {
@@ -889,14 +653,14 @@ export default class FranzMenu {
           }
         },
       }, {
-        label: intl.formatMessage(menuItems.reloadFranz),
-        accelerator: `${cmdKey}+Shift+R`,
+        label: intl.formatMessage(menuItems.reloadFerdi),
+        accelerator: `${shortcutKey()}+${shiftKey}+R`,
         click: () => {
           window.location.reload();
         },
       }, {
         label: intl.formatMessage(menuItems.reloadTodos),
-        accelerator: `${cmdKey}+Shift+Alt+R`,
+        accelerator: `${shortcutKey()}+${shiftKey}+${altKey}+R`,
         click: () => {
           this.actions.todos.reload();
         },
@@ -904,7 +668,7 @@ export default class FranzMenu {
         type: 'separator',
       }, {
         label: intl.formatMessage(menuItems.lockFerdi),
-        accelerator: 'CmdOrCtrl+Shift+L',
+        accelerator: `${lockFerdiShortcutKey()}`,
         enabled: this.stores.user.isLoggedIn && this.stores.settings.app.lockingFeatureEnabled,
         click() {
           actions.settings.update({
@@ -932,7 +696,7 @@ export default class FranzMenu {
 
       tpl[0].submenu.unshift({
         label: intl.formatMessage(menuItems.touchId),
-        accelerator: 'CmdOrCtrl+Shift+L',
+        accelerator: `${lockFerdiShortcutKey()}`,
         visible: touchIdEnabled,
         click() {
           systemPreferences.promptTouchID(intl.formatMessage(menuItems.touchIdPrompt)).then(() => {
@@ -952,7 +716,7 @@ export default class FranzMenu {
 
     tpl.unshift({
       label: isMac ? app.name : intl.formatMessage(menuItems.file),
-      accelerator: 'Alt+F',
+      accelerator: `${altKey}+F`,
       submenu: [
         {
           label: intl.formatMessage(menuItems.about),
@@ -963,7 +727,7 @@ export default class FranzMenu {
         },
         {
           label: intl.formatMessage(menuItems.settings),
-          accelerator: 'CmdOrCtrl+,',
+          accelerator: `${settingsShortcutKey()}`,
           click: () => {
             this.actions.ui.openSettings({ path: 'app' });
           },
@@ -995,7 +759,7 @@ export default class FranzMenu {
         },
         {
           label: intl.formatMessage(menuItems.hideOthers),
-          role: 'hideothers',
+          role: 'hideOthers',
         },
         {
           label: intl.formatMessage(menuItems.unhide),
@@ -1016,6 +780,7 @@ export default class FranzMenu {
 
     const about = {
       label: intl.formatMessage(menuItems.about),
+      role: 'about',
       click: () => {
         dialog.showMessageBox({
           type: 'info',
@@ -1054,7 +819,7 @@ export default class FranzMenu {
       tpl[0].submenu = [
         {
           label: intl.formatMessage(menuItems.settings),
-          accelerator: 'Ctrl+P',
+          accelerator: `${settingsShortcutKey()}`,
           click: () => {
             this.actions.ui.openSettings({ path: 'app' });
           },
@@ -1067,7 +832,7 @@ export default class FranzMenu {
         {
           label: intl.formatMessage(menuItems.quit),
           role: 'quit',
-          accelerator: 'Ctrl+Q',
+          accelerator: `${shortcutKey()}+Q`,
           click() {
             app.quit();
           },
@@ -1110,7 +875,7 @@ export default class FranzMenu {
 
     menu.push({
       label: intl.formatMessage(menuItems.addNewService),
-      accelerator: `${cmdKey}+N`,
+      accelerator: `${addNewServiceShortcutKey()}`,
       click: () => {
         this.actions.ui.openSettings({ path: 'recipes' });
       },
@@ -1118,29 +883,29 @@ export default class FranzMenu {
       type: 'separator',
     }, {
       label: intl.formatMessage(menuItems.activateNextService),
-      accelerator: `${cmdKey}+tab`,
+      accelerator: `${shortcutKey()}+tab`,
       click: () => this.actions.service.setActiveNext(),
       visible: !cmdAltShortcutsVisibile,
     }, {
       label: intl.formatMessage(menuItems.activateNextService),
-      accelerator: `${cmdKey}+alt+right`,
+      accelerator: `${shortcutKey()}+${altKey}+right`,
       click: () => this.actions.service.setActiveNext(),
       visible: cmdAltShortcutsVisibile,
     }, {
       label: intl.formatMessage(menuItems.activatePreviousService),
-      accelerator: `${cmdKey}+shift+tab`,
+      accelerator: `${shortcutKey()}+${shiftKey}+tab`,
       click: () => this.actions.service.setActivePrev(),
       visible: !cmdAltShortcutsVisibile,
     }, {
       label: intl.formatMessage(menuItems.activatePreviousService),
-      accelerator: `${cmdKey}+alt+left`,
+      accelerator: `${shortcutKey()}+${altKey}+left`,
       click: () => this.actions.service.setActivePrev(),
       visible: cmdAltShortcutsVisibile,
     }, {
       label: intl.formatMessage(
         settings.all.app.isAppMuted ? menuItems.unmuteApp : menuItems.muteApp,
       ).replace('&', '&&'),
-      accelerator: `${cmdKey}+shift+m`,
+      accelerator: `${muteFerdiShortcutKey()}`,
       click: () => this.actions.app.toggleMuteApp(),
     }, {
       type: 'separator',
@@ -1148,7 +913,7 @@ export default class FranzMenu {
 
     services.allDisplayed.forEach((service, i) => (menu.push({
       label: this._getServiceName(service),
-      accelerator: i < 9 ? `${cmdKey}+${i + 1}` : null,
+      accelerator: i < 9 ? `${shortcutKey()}+${i + 1}` : null,
       type: 'radio',
       checked: service.isActive,
       click: () => {
@@ -1165,7 +930,7 @@ export default class FranzMenu {
         type: 'separator',
       }, {
         label: intl.formatMessage(menuItems.serviceGoHome),
-        accelerator: `${cmdKey}+shift+H`,
+        accelerator: `${shortcutKey()}+${shiftKey}+H`,
         click: () => this.actions.service.reloadActive(),
       });
     }
@@ -1181,7 +946,7 @@ export default class FranzMenu {
     // Add new workspace item:
     menu.push({
       label: intl.formatMessage(menuItems.addNewWorkspace),
-      accelerator: `${cmdKey}+Shift+N`,
+      accelerator: `${shortcutKey()}+${shiftKey}+N`,
       click: () => {
         workspaceActions.openWorkspaceSettings();
       },
@@ -1195,7 +960,7 @@ export default class FranzMenu {
       );
       menu.push({
         label: intl.formatMessage(drawerLabel),
-        accelerator: `${cmdKey}+D`,
+        accelerator: `${workspaceToggleShortcutKey()}`,
         click: () => {
           workspaceActions.toggleWorkspaceDrawer();
         },
@@ -1210,7 +975,7 @@ export default class FranzMenu {
     // Default workspace
     menu.push({
       label: intl.formatMessage(menuItems.defaultWorkspace),
-      accelerator: `${cmdKey}+Alt+0`,
+      accelerator: `${shortcutKey()}+${altKey}+0`,
       type: 'radio',
       checked: !activeWorkspace,
       click: () => {
@@ -1219,17 +984,15 @@ export default class FranzMenu {
     });
 
     // Workspace items
-    if (this.stores.user.isPremium) {
-      workspaces.forEach((workspace, i) => menu.push({
-        label: workspace.name,
-        accelerator: i < 9 ? `${cmdKey}+Alt+${i + 1}` : null,
-        type: 'radio',
-        checked: activeWorkspace ? workspace.id === activeWorkspace.id : false,
-        click: () => {
-          workspaceActions.activate({ workspace });
-        },
-      }));
-    }
+    workspaces.forEach((workspace, i) => menu.push({
+      label: workspace.name,
+      accelerator: i < 9 ? `${shortcutKey()}+${altKey}+${i + 1}` : null,
+      type: 'radio',
+      checked: activeWorkspace ? workspace.id === activeWorkspace.id : false,
+      click: () => {
+        workspaceActions.activate({ workspace });
+      },
+    }));
 
     return menu;
   }
@@ -1243,7 +1006,7 @@ export default class FranzMenu {
 
     menu.push({
       label: intl.formatMessage(drawerLabel),
-      accelerator: `${cmdKey}+T`,
+      accelerator: `${todosToggleShortcutKey()}`,
       click: () => {
         todoActions.toggleTodosPanel();
       },
diff --git a/src/lib/TouchBar.js b/src/lib/TouchBar.js
index 781cd0895..3397afdb2 100644
--- a/src/lib/TouchBar.js
+++ b/src/lib/TouchBar.js
@@ -23,10 +23,6 @@ export default class FranzTouchBar {
   _build() {
     const currentWindow = getCurrentWindow();
 
-    if (this.stores.router.location.pathname.startsWith('/payment/')) {
-      return;
-    }
-
     if (this.stores.user.isLoggedIn) {
       const { TouchBarButton, TouchBarSpacer } = TouchBar;
 
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index f37b4eb7b..f5970f7e7 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -1,7 +1,7 @@
 import {
   app, Menu, nativeImage, nativeTheme, systemPreferences, Tray, ipcMain,
 } from 'electron';
-import path from 'path';
+import { join } from 'path';
 import macosVersion from 'macos-version';
 import { isMac, isWindows, isLinux } from '../environment';
 
@@ -174,7 +174,7 @@ export default class TrayIcon {
       platform = `${platform}-dark`;
     }
 
-    return nativeImage.createFromPath(path.join(
+    return nativeImage.createFromPath(join(
       __dirname, '..', 'assets', 'images', type, platform, `${asset}.${FILE_EXTENSION}`,
     ));
   }
diff --git a/src/models/Plan.js b/src/models/Plan.js
deleted file mode 100644
index 3dedf0d5e..000000000
--- a/src/models/Plan.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// @flow
-
-export default class Plan {
-  month = {
-    id: '',
-    price: 0,
-  }
-
-  year = {
-    id: '',
-    price: 0,
-  }
-
-  constructor(data) {
-    Object.assign(this, data);
-  }
-}
diff --git a/src/models/Recipe.js b/src/models/Recipe.js
index 4db056f26..0d97d4472 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -1,9 +1,9 @@
-import emailParser from 'address-rfc2822';
 import semver from 'semver';
-import fs from 'fs-extra';
-import path from 'path';
+import { pathExistsSync } from 'fs-extra';
+import { join } from 'path';
 
 export default class Recipe {
+  // Note: Do NOT change these default values. If they change, then the corresponding changes in the recipes needs to be done
   id = '';
 
   name = '';
@@ -12,6 +12,8 @@ export default class Recipe {
 
   version = '';
 
+  aliases = [];
+
   path = '';
 
   serviceURL = '';
@@ -60,9 +62,8 @@ export default class Recipe {
 
     this.id = data.id || this.id;
     this.name = data.name || this.name;
-    this.rawAuthor = data.author || this.author;
-    this.description = data.description || this.description;
     this.version = data.version || this.version;
+    this.aliases = data.aliases || this.aliases;
     this.path = data.path;
 
     this.serviceURL = data.config.serviceURL || this.serviceURL;
@@ -86,18 +87,12 @@ export default class Recipe {
     this.message = data.config.message || this.message;
   }
 
+  // TODO: Need to remove this if its not used anywhere
   get author() {
-    try {
-      const addresses = emailParser.parse(this.rawAuthor);
-      return addresses.map(a => ({ email: a.address, name: a.phrase }));
-    } catch (err) {
-      console.warn(`Not a valid author for ${this.name}`);
-    }
-
     return [];
   }
 
   get hasDarkMode() {
-    return fs.pathExistsSync(path.join(this.path, 'darkmode.css'));
+    return pathExistsSync(join(this.path, 'darkmode.css'));
   }
 }
diff --git a/src/models/RecipePreview.js b/src/models/RecipePreview.js
index cfb22f860..6a9ce3080 100644
--- a/src/models/RecipePreview.js
+++ b/src/models/RecipePreview.js
@@ -7,9 +7,10 @@ export default class RecipePreview {
 
   icon = '';
 
-  // TODO: check if this isn't replaced by `icons`
   featured = false;
 
+  aliases = [];
+
   constructor(data) {
     if (!data.id) {
       throw Error('RecipePreview requires Id');
diff --git a/src/models/Service.js b/src/models/Service.js
index 5656295da..fe56e5a76 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -2,7 +2,7 @@ import { autorun, computed, observable } from 'mobx';
 import { ipcRenderer } from 'electron';
 import { webContents } from '@electron/remote';
 import normalizeUrl from 'normalize-url';
-import path from 'path';
+import { join } from 'path';
 
 import { todosStore } from '../features/todos';
 import { isValidExternalURL } from '../helpers/url-helpers';
@@ -10,11 +10,6 @@ import UserAgent from './UserAgent';
 
 const debug = require('debug')('Ferdi:Service');
 
-export const RESTRICTION_TYPES = {
-  SERVICE_LIMIT: 0,
-  CUSTOM_URL: 1,
-};
-
 export default class Service {
   id = '';
 
@@ -42,8 +37,6 @@ export default class Service {
 
   @observable isMuted = false;
 
-  @observable isHibernating = false;
-
   @observable team = '';
 
   @observable customUrl = '';
@@ -82,10 +75,12 @@ export default class Service {
 
   @observable isHibernationEnabled = false;
 
-  @observable isHibernating = false;
+  @observable isHibernationRequested = false;
 
   @observable lastUsed = Date.now(); // timestamp
 
+  @observable lastHibernated = null; // timestamp
+
   @observable lastPoll = Date.now();
 
   @observable lastPollAnswer = Date.now();
@@ -150,14 +145,11 @@ export default class Service {
     this.recipe = recipe;
 
     // Check if "Hibernate on Startup" is enabled and hibernate all services except active one
-    const {
-      hibernate,
-      hibernateOnStartup,
-    } = window.ferdi.stores.settings.app;
+    const { hibernateOnStartup } = window.ferdi.stores.settings.app;
     // The service store is probably not loaded yet so we need to use localStorage data to get active service
     const isActive = window.localStorage.service && JSON.parse(window.localStorage.service).activeService === this.id;
-    if (hibernate && hibernateOnStartup && !isActive) {
-      this.isHibernating = true;
+    if (hibernateOnStartup && !isActive) {
+      this.isHibernationRequested = true;
     }
 
     autorun(() => {
@@ -190,6 +182,14 @@ export default class Service {
     return this.recipe.id === todosStore.todoRecipeId;
   }
 
+  @computed get canHibernate() {
+    return this.isHibernationEnabled;
+  }
+
+  @computed get isHibernating() {
+    return this.canHibernate && this.isHibernationRequested;
+  }
+
   get webview() {
     if (this.isTodosService) {
       return todosStore.webview;
@@ -230,7 +230,7 @@ export default class Service {
       return this.iconUrl;
     }
 
-    return path.join(this.recipe.path, 'icon.svg');
+    return join(this.recipe.path, 'icon.svg');
   }
 
   @computed get hasCustomIcon() {
@@ -275,11 +275,17 @@ export default class Service {
       debug(this.name, 'modifyRequestHeaders is not defined in the recipe');
     }
 
-    this.webview.addEventListener('ipc-message', e => handleIPCMessage({
-      serviceId: this.id,
-      channel: e.channel,
-      args: e.args,
-    }));
+    this.webview.addEventListener('ipc-message', async (e) => {
+      if (e.channel === 'inject-js-unsafe') {
+        await Promise.all(e.args.map((script) => this.webview.executeJavaScript(`"use strict"; (() => { ${script} })();`)));
+      } else {
+        handleIPCMessage({
+          serviceId: this.id,
+          channel: e.channel,
+          args: e.args,
+        });
+      }
+    });
 
     this.webview.addEventListener('new-window', (event, url, frameName, options) => {
       debug('new-window', event, url, frameName, options);
@@ -334,6 +340,11 @@ export default class Service {
       this.hasCrashed = true;
     });
 
+    this.webview.addEventListener('found-in-page', ({ result }) => {
+      debug('Found in page', result);
+      this.webview.send('found-in-page', result);
+    });
+
     webviewWebContents.on('login', (event, request, authInfo, callback) => {
       // const authCallback = callback;
       debug('browser login event', authInfo);
diff --git a/src/models/User.js b/src/models/User.js
index 74a39926b..d864dde0c 100644
--- a/src/models/User.js
+++ b/src/models/User.js
@@ -24,8 +24,6 @@ export default class User {
 
   @observable hadSubscription = false;
 
-  @observable isPremium = true;
-
   @observable beta = false;
 
   @observable donor = {};
@@ -49,7 +47,6 @@ export default class User {
     this.lastname = data.lastname || this.lastname;
     this.organization = data.organization || this.organization;
     this.accountType = data.accountType || this.accountType;
-    this.isPremium = true;
     this.beta = data.beta || this.beta;
     this.donor = data.donor || this.donor;
     this.isDonor = data.isDonor || this.isDonor;
diff --git a/src/models/UserAgent.js b/src/models/UserAgent.js
index 6f91d4ed0..930ae19ef 100644
--- a/src/models/UserAgent.js
+++ b/src/models/UserAgent.js
@@ -95,10 +95,10 @@ export default class UserAgent {
   _addWebviewEvents(webview) {
     debug('Adding event handlers');
 
-    this._willNavigateListener = event => this._handleNavigate(event.url, true);
+    this._willNavigateListener = (event) => this._handleNavigate(event.url, true);
     webview.addEventListener('will-navigate', this._willNavigateListener);
 
-    this._didNavigateListener = event => this._handleNavigate(event.url);
+    this._didNavigateListener = (event) => this._handleNavigate(event.url);
     webview.addEventListener('did-navigate', this._didNavigateListener);
   }
 
diff --git a/src/routes.js b/src/routes.js
index 5017ed837..d67ccee13 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -23,11 +23,9 @@ import PasswordScreen from './containers/auth/PasswordScreen';
 import ChangeServerScreen from './containers/auth/ChangeServerScreen';
 import SignupScreen from './containers/auth/SignupScreen';
 import ImportScreen from './containers/auth/ImportScreen';
-import PricingScreen from './containers/auth/PricingScreen';
 import SetupAssistentScreen from './containers/auth/SetupAssistantScreen';
 import InviteScreen from './containers/auth/InviteScreen';
 import AuthLayoutContainer from './containers/auth/AuthLayoutContainer';
-import SubscriptionPopupScreen from './containers/subscription/SubscriptionPopupScreen';
 import WorkspacesScreen from './features/workspaces/containers/WorkspacesScreen';
 import EditWorkspaceScreen from './features/workspaces/containers/EditWorkspaceScreen';
 import { WORKSPACES_ROUTES } from './features/workspaces/constants';
@@ -79,7 +77,6 @@ export default @inject('stores', 'actions') @observer class Routes extends Compo
           <Route path="/auth/signup">
             <IndexRedirect to="/auth/signup/form" />
             <Route path="/auth/signup/form" component={SignupScreen} />
-            <Route path="/auth/signup/pricing" component={PricingScreen} />
             <Route path="/auth/signup/import" component={ImportScreen} />
             <Route path="/auth/signup/setup" component={SetupAssistentScreen} />
             <Route path="/auth/signup/invite" component={InviteScreen} />
@@ -87,7 +84,6 @@ export default @inject('stores', 'actions') @observer class Routes extends Compo
           <Route path="/auth/password" component={PasswordScreen} />
           <Route path="/auth/logout" component={LoginScreen} />
         </Route>
-        <Route path="/payment/:url" component={SubscriptionPopupScreen} />
         <Route path="*" component={AppLayoutContainer} />
       </Router>
     );
diff --git a/src/scripts/add-crowdin-contributors.js b/src/scripts/add-crowdin-contributors.js
index efe981b6e..ed29a0daf 100644
--- a/src/scripts/add-crowdin-contributors.js
+++ b/src/scripts/add-crowdin-contributors.js
@@ -58,7 +58,7 @@ const fs = require('fs-extra');
 const path = require('path');
 const allContributors = require('all-contributors-cli');
 
-const infoPath = path.join(__dirname, '../../.all-contributorsrc');
+const infoPath = path.join(__dirname, '..', '..', '.all-contributorsrc');
 
 (async () => {
   const info = await fs.readJSON(infoPath);
diff --git a/src/scripts/build-theme-info.js b/src/scripts/build-theme-info.js
index cff33e3c4..4058be942 100644
--- a/src/scripts/build-theme-info.js
+++ b/src/scripts/build-theme-info.js
@@ -15,8 +15,8 @@ const accentColors = [
   '#5e50ee',
 ];
 
-const cssFile = path.join(__dirname, '../../', 'build', 'styles', 'main.css');
-const outputFile = path.join(__dirname, '../', 'assets', 'themeInfo.json');
+const cssFile = path.join(__dirname, '..', '..', 'build', 'styles', 'main.css');
+const outputFile = path.join(__dirname, '..', 'assets', 'themeInfo.json');
 
 // Parse and extract the rules from a CSS stylesheet file
 async function getRulesFromCssFile(file) {
diff --git a/src/scripts/link-readme.js b/src/scripts/link-readme.js
index 694b89700..1e47cddf8 100644
--- a/src/scripts/link-readme.js
+++ b/src/scripts/link-readme.js
@@ -11,7 +11,7 @@ const path = require('path');
 
 console.log('Linking issues and PRs in README.md');
 
-const readmepath = path.join(__dirname, '../../', 'README.md');
+const readmepath = path.join(__dirname, '..', '..', 'README.md');
 
 // Read README.md
 let readme = fs.readFileSync(readmepath, 'utf-8');
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() {
diff --git a/src/styles/badge.scss b/src/styles/badge.scss
index 69879de31..1f58b8089 100644
--- a/src/styles/badge.scss
+++ b/src/styles/badge.scss
@@ -5,8 +5,7 @@
   border-radius: $theme-border-radius-small;
   color: $dark-theme-gray-lightest;
 
-  &.badge--primary,
-  &.badge--premium {
+  &.badge--primary {
     background: $theme-brand-primary;
     color: $dark-theme-gray-lightest;
   }
@@ -21,8 +20,7 @@
   padding: 5px 10px;
   letter-spacing: 0;
 
-  &.badge--primary,
-  &.badge--premium {
+  &.badge--primary {
     background: $theme-brand-primary;
     color: #FFF;
   }
diff --git a/src/styles/button.scss b/src/styles/button.scss
index d18b683d5..86b3501f0 100644
--- a/src/styles/button.scss
+++ b/src/styles/button.scss
@@ -4,29 +4,45 @@
   background: $theme-brand-primary;
   color: $dark-theme-text-color;
 
-  &:hover { background: darken($theme-brand-primary, 5%); }
-  &:active { background: lighten($theme-brand-primary, 5%); }
+  &:hover {
+    background: darken($theme-brand-primary, 5%);
+  }
+  &:active {
+    background: lighten($theme-brand-primary, 5%);
+  }
 
   &.franz-form__button--secondary {
     background: $dark-theme-gray-dark;
     color: $dark-theme-text-color;
 
-    &:hover { background: lighten($dark-theme-gray-dark, 10%); }
-    &:active { background: lighten($dark-theme-gray-dark, 20%); }
+    &:hover {
+      background: lighten($dark-theme-gray-dark, 10%);
+    }
+    &:active {
+      background: lighten($dark-theme-gray-dark, 20%);
+    }
   }
 
   &.franz-form__button--danger {
     background: $theme-brand-danger;
 
-    &:hover { background: darken($theme-brand-danger, 5%); }
-    &:active { background: lighten($theme-brand-danger, 5%); }
+    &:hover {
+      background: darken($theme-brand-danger, 5%);
+    }
+    &:active {
+      background: lighten($theme-brand-danger, 5%);
+    }
   }
 
   &.franz-form__button--warning {
     background: $theme-brand-warning;
 
-    &:hover { background: darken($theme-brand-warning, 5%); }
-    &:active { background: lighten($theme-brand-warning, 5%); }
+    &:hover {
+      background: darken($theme-brand-warning, 5%);
+    }
+    &:active {
+      background: lighten($theme-brand-warning, 5%);
+    }
   }
 
   &.franz-form__button--inverted {
@@ -39,27 +55,35 @@
     }
   }
 
-  &:disabled { opacity: .5; }
+  &:disabled {
+    opacity: 0.5;
+  }
 }
 
 .franz-form__button {
   background: $theme-brand-primary;
   border-radius: 3px;
   display: block;
-  color: #FFF;
+  color: #fff;
   padding: 10px 20px;
   position: relative;
-  transition: background .5s;
+  @media (prefers-reduced-motion: no-preference) {
+    transition: background 0.5s;
+  }
   text-align: center;
 
-  &:hover { background: darken($theme-brand-primary, 5%) }
+  &:hover {
+    background: darken($theme-brand-primary, 5%);
+  }
 
   &:active {
     background: lighten($theme-brand-primary, 5%);
     transition: none;
   }
 
-  &:disabled { opacity: .2; }
+  &:disabled {
+    opacity: 0.2;
+  }
 
   &.franz-form__button--large {
     width: 100%;
@@ -70,22 +94,34 @@
     background: $theme-gray-lighter;
     color: $theme-gray;
 
-    &:hover { background: darken($theme-gray-lighter, 5%); }
-    &:active { background: lighten($theme-gray-lighter, 5%); }
+    &:hover {
+      background: darken($theme-gray-lighter, 5%);
+    }
+    &:active {
+      background: lighten($theme-gray-lighter, 5%);
+    }
   }
 
   &.franz-form__button--danger {
     background: $theme-brand-danger;
 
-    &:hover { background: darken($theme-brand-danger, 5%); }
-    &:active { background: lighten($theme-brand-danger, 5%); }
+    &:hover {
+      background: darken($theme-brand-danger, 5%);
+    }
+    &:active {
+      background: lighten($theme-brand-danger, 5%);
+    }
   }
 
   &.franz-form__button--warning {
     background: $theme-brand-warning;
 
-    &:hover { background: darken($theme-brand-warning, 5%); }
-    &:active { background: lighten($theme-brand-warning, 5%); }
+    &:hover {
+      background: darken($theme-brand-warning, 5%);
+    }
+    &:active {
+      background: lighten($theme-brand-warning, 5%);
+    }
   }
 
   &.franz-form__button--inverted {
@@ -93,11 +129,12 @@
     border: 2px solid $theme-brand-primary;
     color: $theme-brand-primary;
     padding: 10px 20px;
-    transition: background .5s, color .5s;
-
+    @media (prefers-reduced-motion: no-preference) {
+      transition: background 0.5s, color 0.5s;
+    }
     &:hover {
       background: darken($theme-brand-primary, 5%);
-      color: #FFF;
+      color: #fff;
     }
   }
 
@@ -122,20 +159,20 @@
   z-index: 9998;
   list-style: none;
   background: $theme-brand-primary;
-  
+
   position: absolute;
   bottom: 20px;
   right: 20px;
 
   cursor: pointer;
-  
+
   display: flex;
   justify-content: center;
   align-items: center;
-  
+
   a {
     font-size: 30px;
-    color: #FFFFFF;
-    cursor: pointer;  
+    color: #ffffff;
+    cursor: pointer;
   }
 }
diff --git a/src/styles/content-tabs.scss b/src/styles/content-tabs.scss
index 03befedcb..41bd2c251 100644
--- a/src/styles/content-tabs.scss
+++ b/src/styles/content-tabs.scss
@@ -9,7 +9,7 @@
     .content-tabs__tabs {
       .content-tabs__item {
         background: $dark-theme-gray;
-        color: #FFF;
+        color: #fff;
         border: 0;
       }
     }
@@ -24,19 +24,26 @@
     overflow: hidden;
 
     .content-tabs__item {
-      background: linear-gradient($theme-gray-lightest 80%, darken($theme-gray-lightest, 3%));
+      background: linear-gradient(
+        $theme-gray-lightest 80%,
+        darken($theme-gray-lightest, 3%)
+      );
       border-right: 1px solid $theme-gray-lighter;
       color: $theme-gray-dark;
       flex: 1;
       padding: 10px;
-      transition: background $theme-transition-time;
+      @media (prefers-reduced-motion: no-preference) {
+        transition: background $theme-transition-time;
+      }
 
-      &:last-of-type { border-right: 0; }
+      &:last-of-type {
+        border-right: 0;
+      }
 
       &.is-active {
         background: $theme-brand-primary;
         box-shadow: none;
-        color: #FFF;
+        color: #fff;
       }
     }
   }
@@ -51,10 +58,16 @@
       display: none;
       top: 0;
 
-      &.is-active { display: block; }
+      &.is-active {
+        display: block;
+      }
     }
 
-    .franz-form__input-wrapper { background: #FFF; }
-    .franz-form__field:last-of-type { margin-bottom: 0; }
+    .franz-form__input-wrapper {
+      background: #fff;
+    }
+    .franz-form__field:last-of-type {
+      margin-bottom: 0;
+    }
   }
 }
diff --git a/src/styles/fonts.scss b/src/styles/fonts.scss
index bd96ea867..1b2c99945 100644
--- a/src/styles/fonts.scss
+++ b/src/styles/fonts.scss
@@ -1,44 +1,49 @@
 @import './config.scss';
-// @import './node_modules/mdi/scss/materialdesignicons.scss';
 
 @font-face {
   font-family: 'Open Sans';
-  src:  url('../assets/fonts/OpenSans-Light.ttf');
+  src: url('../assets/fonts/OpenSans-Light.ttf');
   font-weight: 300;
   font-style: normal;
+  display: swap;
 }
 
 @font-face {
   font-family: 'Open Sans';
-  src:  url('../assets/fonts/OpenSans-Regular.ttf');
+  src: url('../assets/fonts/OpenSans-Regular.ttf');
   font-weight: normal;
   font-style: normal;
+  display: swap;
 }
 
 @font-face {
   font-family: 'Open Sans';
-  src:  url('../assets/fonts/OpenSans-Bold.ttf');
+  src: url('../assets/fonts/OpenSans-Bold.ttf');
   font-weight: bold;
   font-style: normal;
+  display: swap;
 }
 
 @font-face {
   font-family: 'Open Sans';
-  src:  url('../assets/fonts/OpenSans-BoldItalic.ttf');
+  src: url('../assets/fonts/OpenSans-BoldItalic.ttf');
   font-weight: bold;
   font-style: italic;
+  display: swap;
 }
 
 @font-face {
   font-family: 'Open Sans';
-  src:  url('../assets/fonts/OpenSans-ExtraBold.ttf');
+  src: url('../assets/fonts/OpenSans-ExtraBold.ttf');
   font-weight: 800;
   font-style: normal;
+  display: swap;
 }
 
 @font-face {
   font-family: 'Open Sans';
-  src:  url('../assets/fonts/OpenSans-ExtraBoldItalic.ttf');
+  src: url('../assets/fonts/OpenSans-ExtraBoldItalic.ttf');
   font-weight: 800;
   font-style: italic;
+  display: swap;
 }
diff --git a/src/styles/image-upload.scss b/src/styles/image-upload.scss
index 31300c227..b5f6d5cd4 100644
--- a/src/styles/image-upload.scss
+++ b/src/styles/image-upload.scss
@@ -5,17 +5,23 @@
     color: $dark-theme-gray-lighter;
 
     &__action {
-      &-background { background: rgba($dark-theme-black, .7); }
+      &-background {
+        background: rgba($dark-theme-black, 0.7);
+      }
 
       button {
         color: $dark-theme-gray-lightest;
 
-        .mdi { color: $dark-theme-gray-lightest; }
+        .mdi {
+          color: $dark-theme-gray-lightest;
+        }
       }
     }
   }
 
-  .image-upload-wrapper .mdi { color: $dark-theme-gray-light; }
+  .image-upload-wrapper .mdi {
+    color: $dark-theme-gray-light;
+  }
 }
 
 .image-upload {
@@ -49,11 +55,13 @@
     justify-content: center;
     opacity: 0;
     position: relative;
-    transition: opacity .5s;
+    @media (prefers-reduced-motion: no-preference) {
+      transition: opacity 0.5s;
+    }
     z-index: 10;
 
     &-background {
-      background: rgba($theme-gray, .7);
+      background: rgba($theme-gray, 0.7);
       bottom: 0;
       left: 0;
       position: absolute;
@@ -63,11 +71,13 @@
     }
 
     button {
-      color: #FFF;
+      color: #fff;
       position: relative;
       z-index: 100;
 
-      .mdi { color: #FFF; }
+      .mdi {
+        color: #fff;
+      }
     }
   }
 
@@ -83,7 +93,9 @@
 
   &__dropzone,
   button {
-    .mdi { margin-bottom: 5px; }
+    .mdi {
+      margin-bottom: 5px;
+    }
 
     p {
       font-size: 10px;
@@ -91,7 +103,9 @@
     }
   }
 
-  &:hover .image-upload__action { opacity: 1; }
+  &:hover .image-upload__action {
+    opacity: 1;
+  }
 }
 
 .image-upload-wrapper .mdi {
diff --git a/src/styles/layout.scss b/src/styles/layout.scss
index acbd65ad1..49e041022 100644
--- a/src/styles/layout.scss
+++ b/src/styles/layout.scss
@@ -1,6 +1,8 @@
 @import './config.scss';
 
-html { overflow: hidden; }
+html {
+  overflow: hidden;
+}
 
 @keyframes pulse-danger {
   0% {
@@ -21,7 +23,7 @@ html { overflow: hidden; }
 
     &::after {
       box-shadow: inset 0 0 5px 0 $dark-theme-black,
-                  inset 0 0 2px 0 rgba(0, 0, 0, 0.4);
+        inset 0 0 2px 0 rgba(0, 0, 0, 0.4);
     }
 
     .sidebar__add-service {
@@ -48,12 +50,12 @@ html { overflow: hidden; }
         filter: grayscale(1);
       }
 
-      .update-available { 
+      .update-available {
         align-items: center;
         background: $theme-brand-danger;
         border-radius: 20px;
         bottom: 5px;
-        color: #FFF;
+        color: #fff;
         display: flex;
         justify-content: center;
         padding: 0px 5px;
@@ -71,7 +73,9 @@ html { overflow: hidden; }
     }
   }
 
-  .app-loader .app-loader__title { color: $dark-theme-gray-lightest; }
+  .app-loader .app-loader__title {
+    color: $dark-theme-gray-lightest;
+  }
 }
 
 body.win32:not(.isFullScreen) .app .app__content {
@@ -96,7 +100,9 @@ body.win32:not(.isFullScreen) .app .app__content {
   }
 }
 
-.electron-app-title-bar { z-index: 99999999; }
+.electron-app-title-bar {
+  z-index: 99999999;
+}
 
 .window-draggable {
   height: 22px;
@@ -109,7 +115,9 @@ body.win32:not(.isFullScreen) .app .app__content {
   -webkit-app-region: drag;
 }
 
-.darwin .sidebar { padding-top: 23px; }
+.darwin .sidebar {
+  padding-top: 23px;
+}
 
 .sidebar {
   position: relative;
@@ -133,8 +141,8 @@ body.win32:not(.isFullScreen) .app .app__content {
     z-index: 1000;
     pointer-events: none;
     clip-path: inset(10px 0 10px 10px);
-    box-shadow: inset 0 0 10px 0 rgba(0, 0, 0, .12),
-                inset 0 0 2px 0 rgba(0, 0, 0, 0.24);
+    box-shadow: inset 0 0 10px 0 rgba(0, 0, 0, 0.12),
+      inset 0 0 2px 0 rgba(0, 0, 0, 0.24);
   }
 
   .sidebar__add-service {
@@ -154,16 +162,25 @@ body.win32:not(.isFullScreen) .app .app__content {
     width: $theme-sidebar-width;
 
     &:hover,
-    &:active { color: lighten($theme-gray-light, 10%); }
-    &.is-muted, &.is-active { color: $theme-brand-primary; }
-    &--new-service { padding-bottom: 6px; }
+    &:active {
+      color: lighten($theme-gray-light, 10%);
+    }
+    &.is-muted,
+    &.is-active {
+      color: $theme-brand-primary;
+    }
+    &--new-service {
+      padding-bottom: 6px;
+    }
   }
 
   & > div {
     display: flex;
     overflow-y: scroll;
 
-    &::-webkit-scrollbar { display: none; }
+    &::-webkit-scrollbar {
+      display: none;
+    }
   }
 }
 
@@ -171,8 +188,12 @@ body.win32:not(.isFullScreen) .app .app__content {
   display: flex;
   flex-direction: row;
 
-  & > * { margin-right: 20px; }
-  & :last-child { margin-right: 0; }
+  & > * {
+    margin-right: 20px;
+  }
+  & :last-child {
+    margin-right: 0;
+  }
 }
 
 .app-loader {
@@ -181,19 +202,23 @@ body.win32:not(.isFullScreen) .app .app__content {
   justify-content: center;
 
   .app-loader__title {
-    color: #FFF;
+    color: #fff;
     font-size: 40px;
   }
 
-  & > span { height: auto; }
+  & > span {
+    height: auto;
+  }
 }
 
-.dev-warning { display: none; }
+.dev-warning {
+  display: none;
+}
 
 .isDevMode .dev-warning {
   border-radius: 3px;
   background: $theme-brand-warning;
-  color: #FFF;
+  color: #fff;
   display: block;
   font-size: 8px;
   height: auto;
@@ -201,12 +226,15 @@ body.win32:not(.isFullScreen) .app .app__content {
   position: fixed;
   left: 9px;
   bottom: 0px;
-  transition: opacity .5s ease;
+  @media (prefers-reduced-motion: no-preference) {
+    transition: opacity 0.5s ease;
+  }
   width: auto;
   z-index: 999999999;
   pointer-events: none;
 }
 
-a, button {
+a,
+button {
   cursor: pointer;
 }
diff --git a/src/styles/main.scss b/src/styles/main.scss
index c57dc6fcd..b0815e086 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -1,9 +1,9 @@
-$mdi-font-path: '../node_modules/mdi/fonts';
+$mdi-font-path: '../node_modules/@mdi/font/fonts';
 @if $env == development {
-  $mdi-font-path: '../../node_modules/mdi/fonts';
+  $mdi-font-path: '../../node_modules/@mdi/font/fonts';
 }
 
-@import './node_modules/mdi/scss/materialdesignicons.scss';
+@import './node_modules/@mdi/font/scss/materialdesignicons.scss';
 @import './node_modules/electron-react-titlebar/assets/style';
 
 // modules
@@ -22,11 +22,8 @@ $mdi-font-path: '../node_modules/mdi/fonts';
 @import './tooltip.scss';
 @import './info-bar.scss';
 @import './status-bar-target-url.scss';
-@import './animations.scss';
 @import './infobox.scss';
 @import './badge.scss';
-@import './subscription.scss';
-@import './subscription-popup.scss';
 @import './content-tabs.scss';
 @import './invite.scss';
 @import './title-bar.scss';
@@ -40,4 +37,4 @@ $mdi-font-path: '../node_modules/mdi/fonts';
 @import './searchInput.scss';
 @import './select.scss';
 @import './image-upload.scss';
-@import './slider.scss';
\ No newline at end of file
+@import './slider.scss';
diff --git a/src/styles/radio.scss b/src/styles/radio.scss
index b1e148ca0..e8297408d 100644
--- a/src/styles/radio.scss
+++ b/src/styles/radio.scss
@@ -11,9 +11,10 @@
   }
 }
 
-
 .franz-form {
-  .franz-form__radio-wrapper { display: flex; }
+  .franz-form__radio-wrapper {
+    display: flex;
+  }
 
   .franz-form__radio {
     border: 2px solid $theme-gray-lighter;
@@ -24,18 +25,24 @@
     margin-right: 20px;
     padding: 11px;
     text-align: center;
-    transition: background $theme-transition-time;
+    @media (prefers-reduced-motion: no-preference) {
+      transition: background $theme-transition-time;
+    }
 
-    &:last-of-type { margin-right: 0; }
+    &:last-of-type {
+      margin-right: 0;
+    }
 
     &.is-selected {
-      background: #FFF;
+      background: #fff;
       border-width: 2px;
       border-style: solid;
       border-color: $theme-brand-primary;
       color: $theme-brand-primary;
     }
 
-    input { display: none; }
+    input {
+      display: none;
+    }
   }
 }
diff --git a/src/styles/recipes.scss b/src/styles/recipes.scss
index 5bdc60a57..628d28f05 100644
--- a/src/styles/recipes.scss
+++ b/src/styles/recipes.scss
@@ -4,7 +4,9 @@
   background-color: $dark-theme-gray-dark;
   color: $dark-theme-text-color;
 
-  &:hover { background-color: $dark-theme-gray; }
+  &:hover {
+    background-color: $dark-theme-gray;
+  }
 }
 
 .recipes {
@@ -17,7 +19,7 @@
 
     &.recipes__list--disabled {
       filter: grayscale(100%);
-      opacity: .3;
+      opacity: 0.3;
       pointer-events: none;
     }
   }
@@ -26,16 +28,20 @@
     height: auto;
     margin-bottom: 35px;
 
-    .badge { margin-right: 10px; }
+    .badge {
+      margin-right: 10px;
+    }
 
     &.recipes__navigation--disabled {
       filter: grayscale(100%);
-      opacity: .3;
+      opacity: 0.3;
       pointer-events: none;
     }
   }
 
-  &__service-request { float: right; }
+  &__service-request {
+    float: right;
+  }
 }
 
 .recipe-teaser {
@@ -45,24 +51,37 @@
   margin: 0 20px 20px 0;
   overflow: hidden;
   position: relative;
-  transition: background $theme-transition-time;
+  @media (prefers-reduced-motion: no-preference) {
+    transition: background $theme-transition-time;
+  }
   width: calc(25% - 20px);
 
-  &:hover { background-color: $theme-gray-lighter; }
+  &:hover {
+    background-color: $theme-gray-lighter;
+  }
 
   .recipe-teaser__icon {
     margin-bottom: 10px;
     width: 50px;
   }
 
-  .recipe-teaser__label { display: block; }
+  .recipe-teaser__label {
+    display: block;
+  }
+
+  .recipe-teaser__alias_label {
+    display: block;
+    font-size: x-small;
+  }
 
-  h2 { z-index: 10; }
+  h2 {
+    z-index: 10;
+  }
 
   &__dev-badge {
     background: $theme-brand-warning;
-    box-shadow: 0 0 4px rgba(black, .2);
-    color: #FFF;
+    box-shadow: 0 0 4px rgba(black, 0.2);
+    color: #fff;
     font-size: 10px;
     position: absolute;
     right: -13px;
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index a25759f48..501f97b98 100644
--- a/src/styles/settings.scss
+++ b/src/styles/settings.scss
@@ -1,69 +1,85 @@
 @import './config.scss';
 
 %headline {
-  color: #FFF;
+  color: #fff;
   font-size: 20px;
   font-weight: 400;
   letter-spacing: -1px;
 
-  a { color: #FFF }
+  a {
+    color: #fff;
+  }
 }
 
 %headline__dark {
-  color: #FFF;
+  color: #fff;
   font-size: 20px;
   font-weight: 400;
   letter-spacing: -1px;
 
-  a { color: #FFF }
+  a {
+    color: #fff;
+  }
 }
 
 .theme__dark {
-  .settings-wrapper { background: rgba($dark-theme-black, .8); }
+  .settings-wrapper {
+    background: rgba($dark-theme-black, 0.8);
+  }
 
   .settings {
     .settings__header {
-      .mdi { color: #FFF }
+      .mdi {
+        color: #fff;
+      }
     }
 
     .settings__main {
       background: $dark-theme-gray-darkest;
     }
 
-    .settings__body::-webkit-scrollbar-thumb { background: $dark-theme-gray; }
+    .settings__body::-webkit-scrollbar-thumb {
+      background: $dark-theme-gray;
+    }
 
     .settings__close {
-      color: #FFF;
+      color: #fff;
     }
 
-    &__settings-group h3 { color: $dark-theme-gray-lightest; }
+    &__settings-group h3 {
+      color: $dark-theme-gray-lightest;
+    }
 
     .settings__message {
       border-top: 1px solid $theme-gray-lighter;
       color: $dark-theme-gray-lightest;
 
-      .mdi { color: $dark-theme-gray-lightest; }
+      .mdi {
+        color: $dark-theme-gray-lightest;
+      }
     }
 
-    .settings__help { color: $dark-theme-gray-lightest; }
+    .settings__help {
+      color: $dark-theme-gray-lightest;
+    }
 
     .settings__controls {
       background: $dark-theme-gray-darker;
 
-      .franz-form__button.franz-form__button--secondary { background: $theme-gray-light; }
+      .franz-form__button.franz-form__button--secondary {
+        background: $theme-gray-light;
+      }
     }
 
     .account {
-      .account__box { background: $dark-theme-gray-darker; }
+      .account__box {
+        background: $dark-theme-gray-darker;
+      }
     }
 
-    .premium-info {
-      background: $dark-theme-gray-darker;
-      border-width: 2px;
-      border-style: solid;
-      border-color: $theme-brand-primary;
+    .legal {
+      color: $theme-gray-light;
     }
-    .legal { color: $theme-gray-light; }
   }
 
   .settings-navigation {
@@ -75,7 +91,7 @@
       border-bottom: 1px solid darken($dark-theme-gray-darker, 3%);
 
       &:last-child {
-        border: 0,
+        border: 0;
       }
 
       .badge {
@@ -93,7 +109,7 @@
       }
 
       &.is-disabled {
-        filter: grayscale(100%) opacity(.2);
+        filter: grayscale(100%) opacity(0.2);
       }
 
       &.is-active {
@@ -107,13 +123,15 @@
       }
     }
 
-    .settings-navigation__action-badge { background: $theme-brand-danger; }
+    .settings-navigation__action-badge {
+      background: $theme-brand-danger;
+    }
   }
 }
 
 .settings-wrapper {
   align-items: center;
-  background: rgba(black, .5);
+  background: rgba(black, 0.5);
   display: flex;
   height: 100%;
   left: 0;
@@ -135,7 +153,7 @@
 
 .settings {
   border-radius: $theme-border-radius;
-  box-shadow: 0 20px 50px rgba($dark-theme-black, .5);
+  box-shadow: 0 20px 50px rgba($dark-theme-black, 0.5);
   display: flex;
   height: 100%;
   max-height: 720px;
@@ -153,7 +171,7 @@
     height: auto;
     border-radius: 0 $theme-border-radius $theme-border-radius 0;
     overflow: hidden;
-    background: #FFF;
+    background: #fff;
   }
 
   .settings__header {
@@ -163,7 +181,7 @@
     height: 50px;
     padding: 0 40px;
     width: calc(100% - 60px);
-    color: #FFF;
+    color: #fff;
 
     h1 {
       @extend %headline;
@@ -183,11 +201,13 @@
       transform: skew(15deg) rotate(2deg);
     }
 
-    .mdi { color: $theme-gray-light; }
+    .mdi {
+      color: $theme-gray-light;
+    }
   }
 
   .settings_titles {
-    display:inline-block;
+    display: inline-block;
   }
 
   .settings__body {
@@ -196,9 +216,13 @@
     overflow-y: scroll;
     padding: 25px 15px 15px 25px;
 
-    .badge { margin-right: 10px; }
+    .badge {
+      margin-right: 10px;
+    }
 
-    &::-webkit-scrollbar { width: 8px; }
+    &::-webkit-scrollbar {
+      width: 8px;
+    }
 
     /* Track */
     &::-webkit-scrollbar-track {
@@ -214,9 +238,16 @@
       -webkit-border-radius: 10px;
     }
 
-    &::-webkit-scrollbar-thumb:window-inactive { background: none; }
-    .service-flex-grid { display: flex; }
-    .service-name,.user-agent { flex: 1px; }
+    &::-webkit-scrollbar-thumb:window-inactive {
+      background: none;
+    }
+    .service-flex-grid {
+      display: flex;
+    }
+    .service-name,
+    .user-agent {
+      flex: 1px;
+    }
 
     .service-icon {
       float: right;
@@ -238,20 +269,28 @@
   .settings__close {
     background: $theme-brand-primary;
     // border-left: 1px solid darken($theme-brand-primary, 8%);
-    color: #FFF;
+    color: #fff;
     font-size: 20px;
     height: 50px;
     padding: 0 20px;
     position: absolute;
     right: 0;
-    transition: background $theme-transition-time;
+    @media (prefers-reduced-motion: no-preference) {
+      transition: background $theme-transition-time;
+    }
     cursor: pointer;
 
-    &::before { cursor: pointer; }
-    &:hover { background: darken($theme-brand-primary, 5%); }
+    &::before {
+      cursor: pointer;
+    }
+    &:hover {
+      background: darken($theme-brand-primary, 5%);
+    }
   }
 
-  .search-input { margin-bottom: 30px; }
+  .search-input {
+    margin-bottom: 30px;
+  }
 
   &__options {
     flex: 1;
@@ -264,10 +303,12 @@
     h3 {
       color: $theme-gray-light;
       font-weight: bold;
-      letter-spacing: -.1px;
+      letter-spacing: -0.1px;
       margin: 25px 0 15px;
 
-      &:first-of-type { margin-top: 0; }
+      &:first-of-type {
+        margin-top: 0;
+      }
 
       .badge {
         font-weight: normal;
@@ -308,14 +349,20 @@
     padding: 10px 20px;
 
     .franz-form__button {
-      &[type='submit'] { margin-left: auto; }
-      &.franz-form__button--secondary { background: $theme-gray-light; }
+      &[type='submit'] {
+        margin-left: auto;
+      }
+      &.franz-form__button--secondary {
+        background: $theme-gray-light;
+      }
     }
   }
 
-  .settings__delete-button { right: 0; }
+  .settings__delete-button {
+    right: 0;
+  }
   .settings__open-recipe-file-button {
-    cursor:pointer;
+    cursor: pointer;
     margin-right: 10px;
   }
   .settings__open-recipe-file-container {
@@ -336,7 +383,9 @@
       margin-bottom: 1em;
     }
 
-    a.button { margin-top: 40px; }
+    a.button {
+      margin-top: 40px;
+    }
   }
 
   .account {
@@ -349,8 +398,12 @@
       margin-bottom: 40px;
       padding: 20px;
 
-      &.account__box--flex { display: flex; }
-      &.account__box--last { margin-bottom: 0; }
+      &.account__box--flex {
+        display: flex;
+      }
+      &.account__box--last {
+        margin-bottom: 0;
+      }
 
       .auth__button {
         margin-top: 10px;
@@ -366,38 +419,44 @@
     .account__info {
       flex: 1;
 
-      h2 { margin-bottom: 5px; }
-      .badge { margin-top: 5px; }
-      .username { margin-right: 10 }
+      h2 {
+        margin-bottom: 5px;
+      }
+      .badge {
+        margin-top: 5px;
+      }
+      .username {
+        margin-right: 10;
+      }
     }
 
     .account__subscription {
       align-items: center;
       display: flex;
 
-      .badge { margin-left: 10px; }
-    }
-
-    .badge--premium {
-      margin-left: 1px;
-      position: relative;
-      top: -3px;
-      padding-top: 4px;
-      color: #FFF;
-      border-radius: 3px;
+      .badge {
+        margin-left: 10px;
+      }
     }
 
-
     .manage-user-links {
       margin-top: 20px;
       display: flex;
       justify-content: space-between;
     }
 
-    .account__subscription-button { margin-left: auto; }
-    .franz-form__button { white-space: nowrap; }
-    div { height: auto; }
-    [data-type="franz-button"] div { height: 20px }
+    .account__subscription-button {
+      margin-left: auto;
+    }
+    .franz-form__button {
+      white-space: nowrap;
+    }
+    div {
+      height: auto;
+    }
+    [data-type='franz-button'] div {
+      height: 20px;
+    }
 
     .invoices {
       width: 100%;
@@ -415,7 +474,9 @@
       .invoices__action {
         text-align: right;
 
-        button { color: $theme-brand-primary; }
+        button {
+          color: $theme-brand-primary;
+        }
       }
     }
   }
@@ -425,16 +486,12 @@
     font-size: 40px;
     margin-bottom: 20px;
 
-    img { width: 40px; }
-  }
-
-  .premium-info {
-    background: lighten($theme-brand-primary, 40%);
-    border-radius: $theme-border-radius;
-    padding: 20px;
+    img {
+      width: 40px;
+    }
   }
 
-  .content-tabs .premium-info {
+  .content-tabs {
     background: none;
     padding: 0;
   }
@@ -454,8 +511,8 @@
   width: 240px;
   height: 100%;
   align-self: center;
-  border-top-left-radius: $theme-border-radius;;
-  border-bottom-left-radius: $theme-border-radius;;
+  border-top-left-radius: $theme-border-radius;
+  border-bottom-left-radius: $theme-border-radius;
   overflow: hidden;
 
   .settings-navigation__link {
@@ -467,12 +524,15 @@
     height: 51px;
     padding: 0 20px;
     text-decoration: none;
-    transition: background $theme-transition-time, color $theme-transition-time;
+    @media (prefers-reduced-motion: no-preference) {
+      transition: background $theme-transition-time,
+        color $theme-transition-time;
+    }
     border-bottom: 1px solid darken($theme-gray-lightest, 3%);
 
     .badge {
       background: $theme-gray-light;
-      color: #FFF;
+      color: #fff;
     }
 
     &:hover {
@@ -480,26 +540,31 @@
 
       .badge {
         background: $theme-gray-light;
-        color: #FFF;
+        color: #fff;
       }
     }
 
     &.is-active {
       background: $theme-brand-primary;
-      color: #FFF;
+      color: #fff;
 
       .badge {
-        background: #FFF;
+        background: #fff;
         color: $theme-brand-primary;
       }
     }
   }
 
-  .settings-navigation__expander { flex: 1; }
+  .settings-navigation__expander {
+    flex: 1;
+  }
 
   .badge {
     display: initial;
-    transition: background $theme-transition-time, color $theme-transition-time;
+    @media (prefers-reduced-motion: no-preference) {
+      transition: background $theme-transition-time,
+        color $theme-transition-time;
+    }
   }
 
   .settings-navigation__action-badge {
@@ -513,5 +578,7 @@
 }
 
 .settings__support-badges {
-  a { margin-right: 10px }
+  a {
+    margin-right: 10px;
+  }
 }
diff --git a/src/styles/slider.scss b/src/styles/slider.scss
index 8bb771586..85b31660f 100644
--- a/src/styles/slider.scss
+++ b/src/styles/slider.scss
@@ -3,43 +3,44 @@
 .theme__dark .franz-form .franz-form__slider-wrapper .slider {
   border: 1px solid $dark-theme-gray;
   background: $dark-theme-gray;
-
 }
 
-
 .franz-form {
-  .franz-form__slider-wrapper { 
+  .franz-form__slider-wrapper {
     display: flex;
     flex-direction: row;
 
-    .franz-form__label { margin-left: 20px; }
+    .franz-form__label {
+      margin-left: 20px;
+    }
 
     .slider-container {
-      width: 100%; /* Width of the outside container */ 
+      width: 100%; /* Width of the outside container */
     }
-      
+
     /* The slider itself */
     .slider {
       -webkit-appearance: none;
       width: 100%;
       height: 14px;
-      border-radius: $theme-border-radius;  
+      border-radius: $theme-border-radius;
       background: $theme-gray-lighter;
       outline: none;
-      opacity: 1.0;
-      -webkit-transition: .2s;
-      transition: opacity .2s;
+      opacity: 1;
+      @media (prefers-reduced-motion: no-preference) {
+        transition: opacity 0.2s;
+      }
     }
-    
+
     .slider::-webkit-slider-thumb {
       -webkit-appearance: none;
       appearance: none;
       width: 14px;
       height: 14px;
-      border-radius: 50%; 
+      border-radius: 50%;
       background: $theme-brand-primary;
-      box-shadow: 0 1px 4px rgba(0, 0, 0, .3);
+      box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
       cursor: pointer;
     }
-    }
+  }
 }
diff --git a/src/styles/subscription-popup.scss b/src/styles/subscription-popup.scss
deleted file mode 100644
index 14e05e65d..000000000
--- a/src/styles/subscription-popup.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-.subscription-popup {
-  height: 100%;
-
-  &__content { height: calc(100% - 60px); }
-  &__webview {
-    height: 100%;
-    background: #FFF;
-  }
-
-  &__toolbar {
-    background: $theme-gray-lightest;
-    border-top: 1px solid $theme-gray-lighter;
-    display: flex;
-    height: 60px;
-    justify-content: space-between;
-    padding: 10px;
-  }
-}
diff --git a/src/styles/subscription.scss b/src/styles/subscription.scss
deleted file mode 100644
index 70fb41cde..000000000
--- a/src/styles/subscription.scss
+++ /dev/null
@@ -1,49 +0,0 @@
-.subscription {
-  .subscription__premium-features {
-    margin: 10px 0;
-
-    li {
-      align-items: center;
-      display: flex;
-      height: 30px;
-
-      &:before {
-        content: "👍";
-        margin-right: 10px;
-      }
-
-      .badge { margin-left: 10px; }
-    }
-  }
-
-  .subscription__premium-info { margin: 15px 0 25px; }
-}
-
-.paymentTiers .franz-form__radio-wrapper {
-  flex-flow: wrap;
-
-  .franz-form__radio {
-    flex: initial;
-    margin-right: 2%;
-    width: 32%;
-
-    &:nth-child(3) { margin-right: 0; }
-
-    &:nth-child(4) {
-      margin-right: 0;
-      margin-top: 2%;
-      width: 100%;
-    }
-  }
-}
-
-.settings .paymentTiers .franz-form__radio-wrapper .franz-form__radio {
-  width: 49%;
-
-  &:nth-child(2) { margin-right: 0; }
-
-  &:nth-child(3) {
-    margin-top: 2%;
-    width: 100%;
-  }
-}
diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss
index 31a239387..df10da77c 100644
--- a/src/styles/tabs.scss
+++ b/src/styles/tabs.scss
@@ -4,11 +4,17 @@
   &.is-active {
     background: $dark-theme-gray;
 
-    .tab-item__icon { margin-left: -4px; }
+    .tab-item__icon {
+      margin-left: -4px;
+    }
   }
 
-  &.is-disabled .tab-item__icon { filter: grayscale(100%) opacity(.2); }
-  .tab-item__icon { width: 34px; }
+  &.is-disabled .tab-item__icon {
+    filter: grayscale(100%) opacity(0.2);
+  }
+  .tab-item__icon {
+    width: 34px;
+  }
 }
 
 .tabs {
@@ -29,22 +35,34 @@
   justify-content: center;
   min-height: 50px;
   position: relative;
-  transition: background $theme-transition-time;
+  @media (prefers-reduced-motion: no-preference) {
+    transition: background $theme-transition-time;
+  }
   width: $theme-sidebar-width;
 
   &.is-active {
-    background: change-color($theme-brand-primary,
-                             $lightness: min(lightness($theme-brand-primary) * 1.35, 100));
+    background: change-color(
+      $theme-brand-primary,
+      $lightness: min(lightness($theme-brand-primary) * 1.35, 100)
+    );
     border-left-width: 4px;
     border-left-style: solid;
     color: $theme-brand-primary;
 
-    .tab-item__icon { margin-left: -4px; }
+    .tab-item__icon {
+      margin-left: -4px;
+    }
   }
 
-  &.is-disabled .tab-item__icon { filter: grayscale(100%) opacity(0.2); }
-  &.has-custom-icon .tab-item__icon { border-radius: $theme-border-radius; }
-  &:active .tab-item__icon { opacity: .7; }
+  &.is-disabled .tab-item__icon {
+    filter: grayscale(100%) opacity(0.2);
+  }
+  &.has-custom-icon .tab-item__icon {
+    border-radius: $theme-border-radius;
+  }
+  &:active .tab-item__icon {
+    opacity: 0.7;
+  }
 
   .tab-item__icon {
     height: auto;
@@ -56,7 +74,7 @@
     background: $theme-brand-danger;
     border-radius: 20px;
     bottom: 8px;
-    color: #FFF;
+    color: #fff;
     display: flex;
     font-size: 11px;
     justify-content: center;
@@ -66,13 +84,13 @@
     position: absolute;
     right: 8px;
 
-    &.is-indirect { 
+    &.is-indirect {
       padding-top: 0;
       background: #0088cc;
-        }
-    &.hibernating { 
-      padding-top: 0; 
-      background: $theme-gray; 
+    }
+    &.hibernating {
+      padding-top: 0;
+      background: $theme-gray;
       font-size: 0px;
       min-height: 10px;
       min-width: 10px;
@@ -96,11 +114,13 @@
     right: 8px;
     width: 17px;
 
-    &.is-indirect { 
+    &.is-indirect {
       padding-top: 0;
       background: #0088cc;
-        }
+    }
   }
 
-  &.is-reordering { z-index: 99999; }
+  &.is-reordering {
+    z-index: 99999;
+  }
 }
diff --git a/src/styles/toggle.scss b/src/styles/toggle.scss
index 5cd9e4526..ed4c0d11b 100644
--- a/src/styles/toggle.scss
+++ b/src/styles/toggle.scss
@@ -39,7 +39,9 @@ $toggle-button-size: 22px;
       left: 1px;
       top: 1px;
       position: absolute;
-      transition: all 0.5s;
+      @media (prefers-reduced-motion: no-preference) {
+        transition: all 0.5s;
+      }
       width: $toggle-size - 2;
     }
 
diff --git a/src/styles/type.scss b/src/styles/type.scss
index 37ec0bcca..234c4d5c4 100644
--- a/src/styles/type.scss
+++ b/src/styles/type.scss
@@ -2,9 +2,15 @@
 @import './mixins.scss';
 
 .theme__dark {
-  a { color: $dark-theme-gray-smoke; }
-  .label { color: $dark-theme-gray-lightest; }
-  .footnote { color: $dark-theme-gray-lightest; }
+  a {
+    color: $dark-theme-gray-smoke;
+  }
+  .label {
+    color: $dark-theme-gray-lightest;
+  }
+  .footnote {
+    color: $dark-theme-gray-lightest;
+  }
 }
 
 h1 {
@@ -21,36 +27,45 @@ h2 {
   margin-bottom: 25px;
   margin-top: 5px;
 
-  &:first-of-type { margin-top: 0; }
+  &:first-of-type {
+    margin-top: 0;
+  }
 }
 
 p {
   margin-bottom: 10px;
   line-height: 1.7rem;
 
-  &:last-of-type { margin-bottom: 0; }
+  &:last-of-type {
+    margin-bottom: 0;
+  }
 }
 
-strong { font-weight: bold; }
+strong {
+  font-weight: bold;
+}
 
-a, button {
+a,
+button {
   color: $theme-text-color;
   text-decoration: none;
 
   &.button {
     background: $theme-brand-primary;
-    color: #FFF;
+    color: #fff;
     border-radius: 3px;
     display: inline-block;
     padding: 10px 20px;
     position: relative;
     text-align: center;
-    transition: background .5s, color .5s;
+    @media (prefers-reduced-motion: no-preference) {
+      transition: background 0.5s, color 0.5s;
+    }
     cursor: pointer;
 
     &:hover {
       background: darken($theme-brand-primary, 10%);
-      color: #FFF;
+      color: #fff;
     }
   }
 
@@ -60,14 +75,19 @@ a, button {
   }
 }
 
-.error-message, .error-message:last-of-type {
+.error-message,
+.error-message:last-of-type {
   color: $theme-brand-danger;
   margin: 10px 0;
 }
 
-.center { text-align: center; }
+.center {
+  text-align: center;
+}
 
-.label { @include formLabel(); }
+.label {
+  @include formLabel();
+}
 
 .footnote {
   color: $theme-gray-light;
diff --git a/src/styles/welcome.scss b/src/styles/welcome.scss
index c1f85391e..7202fe148 100644
--- a/src/styles/welcome.scss
+++ b/src/styles/welcome.scss
@@ -1,24 +1,26 @@
 .auth .welcome {
   height: auto;
-  
+
   &__content {
     align-items: center;
-    color: #FFF;
+    color: #fff;
     display: flex;
     justify-content: center;
     height: auto;
   }
 
-  &__logo { width: 100px; }
+  &__logo {
+    width: 100px;
+  }
 
   &__text {
-    border-left: 1px solid #FFF;
+    border-left: 1px solid #fff;
     margin-left: 40px;
     padding-left: 40px;
 
     h1 {
       font-size: 60px;
-      letter-spacing: -.4rem;
+      letter-spacing: -0.4rem;
       margin-bottom: 5px;
     }
 
@@ -42,33 +44,35 @@
     text-align: center;
     height: auto;
 
-    .button:first-of-type { margin-right: 25px; }
+    .button:first-of-type {
+      margin-right: 25px;
+    }
   }
 
   .button {
-    border-color: #FFF;
-    color: #FFF;
+    border-color: #fff;
+    color: #fff;
     cursor: pointer;
 
     &:hover {
-      background: #FFF;
+      background: #fff;
       color: $theme-brand-primary;
     }
 
     &__inverted {
-      background: #FFF;
+      background: #fff;
       color: $theme-brand-primary;
     }
 
     &__inverted:hover {
       background: none;
-      color: #FFF;
+      color: #fff;
     }
   }
 
   &__featured-services {
     align-items: center;
-    background: #FFF;
+    background: #fff;
     border-radius: 6px;
     display: flex;
     flex-wrap: wrap;
@@ -82,9 +86,13 @@
   &__featured-service {
     margin: 0 10px 15px;
     height: 35px;
-    transition: .5s filter, .5s opacity;
+    @media (prefers-reduced-motion: no-preference) {
+      transition: 0.5s filter, 0.5s opacity;
+    }
     width: 35px;
 
-    img { width: 35px; }
+    img {
+      width: 35px;
+    }
   }
 }
diff --git a/src/webview/badge.js b/src/webview/badge.js
new file mode 100644
index 000000000..1e02fb56a
--- /dev/null
+++ b/src/webview/badge.js
@@ -0,0 +1,33 @@
+const { ipcRenderer } = require('electron');
+
+const debug = require('debug')('Ferdi:Plugin:BadgeHandler');
+
+export class BadgeHandler {
+  constructor() {
+    this.countCache = {
+      direct: 0,
+      indirect: 0,
+    };
+  }
+
+  setBadge(direct, indirect) {
+    if (this.countCache.direct === direct
+        && this.countCache.indirect === indirect) return;
+
+    // Parse number to integer
+    // This will correct errors that recipes may introduce, e.g.
+    // by sending a String instead of an integer
+    const directInt = parseInt(direct, 10);
+    const indirectInt = parseInt(indirect, 10);
+
+    const count = {
+      direct: Math.max(directInt, 0),
+      indirect: Math.max(indirectInt, 0),
+    };
+
+    ipcRenderer.sendToHost('message-counts', count);
+    Object.assign(this.countCache, count);
+
+    debug('Sending badge count to host', count);
+  }
+}
diff --git a/src/webview/contextMenuBuilder.js b/src/webview/contextMenuBuilder.js
index 63eed2ebe..602ce06f5 100644
--- a/src/webview/contextMenuBuilder.js
+++ b/src/webview/contextMenuBuilder.js
@@ -10,7 +10,7 @@ import {
   clipboard, ipcRenderer, nativeImage, shell,
 } from 'electron';
 import { Menu, MenuItem } from '@electron/remote';
-import { isMac } from '../environment';
+import { shortcutKey, isMac } from '../environment';
 
 import { SEARCH_ENGINE_NAMES, SEARCH_ENGINE_URLS } from '../config';
 
@@ -28,6 +28,7 @@ const contextMenuStringTable = {
   cut: () => 'Cut',
   copy: () => 'Copy',
   paste: () => 'Paste',
+  pasteAndMatchStyle: () => 'Paste and match style',
   searchWith: ({ searchEngine }) => `Search with ${searchEngine}`,
   openLinkUrl: () => 'Open Link',
   openLinkInFerdiUrl: () => 'Open Link in Ferdi',
@@ -61,7 +62,7 @@ module.exports = class ContextMenuBuilder {
    * @param  {function} processMenu If passed, this method will be passed the menu to change
    *                                it prior to display. Signature: (menu, info) => menu
    */
-  constructor(webContents, debugMode = false, processMenu = m => m) {
+  constructor(webContents, debugMode = false, processMenu = (m) => m) {
     this.debugMode = debugMode;
     this.processMenu = processMenu;
     this.menu = null;
@@ -261,7 +262,7 @@ module.exports = class ContextMenuBuilder {
     if (menuInfo.misspelledWord) {
       menu.append(
         new MenuItem({
-          label: 'Add to dictionary',
+          label: this.stringTable.addToDictionary(),
           click: () => webContents.session.addWordToSpellCheckerDictionary(menuInfo.misspelledWord),
         }),
       );
@@ -320,7 +321,7 @@ module.exports = class ContextMenuBuilder {
       label: this.stringTable.copyImage(),
       click: () => {
         const result = this.convertImageToBase64(menuInfo.srcURL,
-          dataURL => clipboard.writeImage(nativeImage.createFromDataURL(dataURL)));
+          (dataURL) => clipboard.writeImage(nativeImage.createFromDataURL(dataURL)));
 
         this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Image copied from URL: ${menuInfo.srcURL}`);
         return result;
@@ -375,7 +376,7 @@ module.exports = class ContextMenuBuilder {
     const webContents = this.getWebContents();
     menu.append(new MenuItem({
       label: this.stringTable.cut(),
-      accelerator: 'CommandOrControl+X',
+      accelerator: `${shortcutKey()}+X`,
       enabled: menuInfo.editFlags.canCut,
       click: () => webContents.cut(),
     }));
@@ -390,7 +391,7 @@ module.exports = class ContextMenuBuilder {
     const webContents = this.getWebContents();
     menu.append(new MenuItem({
       label: this.stringTable.copy(),
-      accelerator: 'CommandOrControl+C',
+      accelerator: `${shortcutKey()}+C`,
       enabled: menuInfo.editFlags.canCopy,
       click: () => webContents.copy(),
     }));
@@ -405,7 +406,7 @@ module.exports = class ContextMenuBuilder {
     const webContents = this.getWebContents();
     menu.append(new MenuItem({
       label: this.stringTable.paste(),
-      accelerator: 'CommandOrControl+V',
+      accelerator: `${shortcutKey()}+V`,
       enabled: menuInfo.editFlags.canPaste,
       click: () => webContents.paste(),
     }));
@@ -422,8 +423,8 @@ module.exports = class ContextMenuBuilder {
       const webContents = this.getWebContents();
       menu.append(
         new MenuItem({
-          label: 'Paste as plain text',
-          accelerator: 'CommandOrControl+Shift+V',
+          label: this.stringTable.pasteAndMatchStyle(),
+          accelerator: `${shortcutKey()}+Shift+V`,
           click: () => webContents.pasteAndMatchStyle(),
         }),
       );
@@ -489,7 +490,7 @@ module.exports = class ContextMenuBuilder {
     const webContents = this.getWebContents();
     menu.append(new MenuItem({
       label: this.stringTable.goBack(),
-      accelerator: 'CommandOrControl+left',
+      accelerator: `${shortcutKey()}+left`,
       enabled: webContents.canGoBack(),
       click: () => webContents.goBack(),
     }));
@@ -504,7 +505,7 @@ module.exports = class ContextMenuBuilder {
     const webContents = this.getWebContents();
     menu.append(new MenuItem({
       label: this.stringTable.goForward(),
-      accelerator: 'CommandOrControl+right',
+      accelerator: `${shortcutKey()}+right`,
       enabled: webContents.canGoForward(),
       click: () => webContents.goForward(),
     }));
@@ -535,7 +536,7 @@ module.exports = class ContextMenuBuilder {
     const baseURL = new URL(menuInfo.pageURL);
     menu.append(new MenuItem({
       label: this.stringTable.goToHomePage(),
-      accelerator: 'CommandOrControl+Home',
+      accelerator: `${shortcutKey()}+Home`,
       enabled: true,
       click: () => {
         // webContents.loadURL(baseURL.origin);
diff --git a/src/webview/darkmode.js b/src/webview/darkmode.js
index ab629435c..7435d6404 100644
--- a/src/webview/darkmode.js
+++ b/src/webview/darkmode.js
@@ -1,7 +1,7 @@
 /* eslint no-bitwise: ["error", { "int32Hint": true }] */
 
-import path from 'path';
-import fs from 'fs-extra';
+import { join } from 'path';
+import { pathExistsSync, readFileSync } from 'fs-extra';
 
 const debug = require('debug')('Ferdi:DarkMode');
 
@@ -10,9 +10,9 @@ const chars = [...'abcdefghijklmnopqrstuvwxyz'];
 const ID = [...Array(20)].map(() => chars[Math.random() * chars.length | 0]).join``;
 
 export function injectDarkModeStyle(recipePath) {
-  const darkModeStyle = path.join(recipePath, 'darkmode.css');
-  if (fs.pathExistsSync(darkModeStyle)) {
-    const data = fs.readFileSync(darkModeStyle);
+  const darkModeStyle = join(recipePath, 'darkmode.css');
+  if (pathExistsSync(darkModeStyle)) {
+    const data = readFileSync(darkModeStyle);
     const styles = document.createElement('style');
     styles.id = ID;
     styles.innerHTML = data.toString();
diff --git a/src/webview/find.js b/src/webview/find.js
new file mode 100644
index 000000000..040811d68
--- /dev/null
+++ b/src/webview/find.js
@@ -0,0 +1,23 @@
+import { ipcRenderer } from 'electron';
+import { FindInPage as ElectronFindInPage } from 'electron-find';
+
+// Shim to expose webContents functionality to electron-find without @electron/remote
+const webContentsShim = {
+  findInPage: (text, options = {}) => ipcRenderer.sendSync('find-in-page', text, options),
+  stopFindInPage: (action) => {
+    ipcRenderer.sendSync('stop-find-in-page', action);
+  },
+  on: (eventName, listener) => {
+    if (eventName === 'found-in-page') {
+      ipcRenderer.on('found-in-page', (_, result) => {
+        listener({ sender: this }, result);
+      });
+    }
+  },
+};
+
+export default class FindInPage extends ElectronFindInPage {
+  constructor(options = {}) {
+    super(webContentsShim, options);
+  }
+}
diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js
index b8fe7dc52..96caa125e 100644
--- a/src/webview/lib/RecipeWebview.js
+++ b/src/webview/lib/RecipeWebview.js
@@ -1,14 +1,12 @@
 import { ipcRenderer } from 'electron';
-import { pathExistsSync, readFile } from 'fs-extra';
+import { exists, pathExistsSync, readFileSync } from 'fs-extra';
 
 const debug = require('debug')('Ferdi:Plugin:RecipeWebview');
 
 class RecipeWebview {
-  constructor() {
-    this.countCache = {
-      direct: 0,
-      indirect: 0,
-    };
+  constructor(badgeHandler, notificationsHandler) {
+    this.badgeHandler = badgeHandler;
+    this.notificationsHandler = notificationsHandler;
 
     ipcRenderer.on('poll', () => {
       this.loopFunc();
@@ -45,24 +43,7 @@ class RecipeWebview {
    *                          me directly to me eg. in a channel
    */
   setBadge(direct = 0, indirect = 0) {
-    if (this.countCache.direct === direct
-      && this.countCache.indirect === indirect) return;
-
-    // Parse number to integer
-    // This will correct errors that recipes may introduce, e.g.
-    // by sending a String instead of an integer
-    const directInt = parseInt(direct, 10);
-    const indirectInt = parseInt(indirect, 10);
-
-    const count = {
-      direct: Math.max(directInt, 0),
-      indirect: Math.max(indirectInt, 0),
-    };
-
-    ipcRenderer.sendToHost('message-counts', count);
-    Object.assign(this.countCache, count);
-
-    debug('Sending badge count to host', count);
+    this.badgeHandler.setBadge(direct, indirect);
   }
 
   /**
@@ -74,9 +55,8 @@ class RecipeWebview {
   injectCSS(...files) {
     files.forEach(async (file) => {
       if (pathExistsSync(file)) {
-        const data = await readFile(file, 'utf8');
         const styles = document.createElement('style');
-        styles.innerHTML = data;
+        styles.innerHTML = readFileSync(file, 'utf8');
 
         document.querySelector('head').appendChild(styles);
 
@@ -85,6 +65,22 @@ class RecipeWebview {
     });
   }
 
+  injectJSUnsafe(...files) {
+    Promise.all(files.map(async (file) => {
+      if (await exists(file)) {
+        return readFileSync(file, 'utf8');
+      }
+      debug('Script not found', file);
+      return null;
+    })).then(async (scripts) => {
+      const scriptsFound = scripts.filter((script) => script !== null);
+      if (scriptsFound.length > 0) {
+        debug('Inject scripts to main world', scriptsFound);
+        ipcRenderer.sendToHost('inject-js-unsafe', ...scriptsFound);
+      }
+    });
+  }
+
   /**
    * Set a custom handler for turning on and off dark mode
    *
@@ -96,7 +92,7 @@ class RecipeWebview {
 
   onNotify(fn) {
     if (typeof fn === 'function') {
-      window.Notification.prototype.onNotify = fn;
+      this.notificationsHandler.onNotify = fn;
     }
   }
 
diff --git a/src/webview/notifications.js b/src/webview/notifications.js
index 021f05cc3..205a3220c 100644
--- a/src/webview/notifications.js
+++ b/src/webview/notifications.js
@@ -3,49 +3,65 @@ import uuidV1 from 'uuid/v1';
 
 const debug = require('debug')('Ferdi:Notifications');
 
-class Notification {
-  static permission = 'granted';
-
-  constructor(title = '', options = {}) {
-    debug('New notification', title, options);
-    this.title = title;
-    this.options = options;
-    this.notificationId = uuidV1();
-
-    ipcRenderer.sendToHost('notification', this.onNotify({
-      title: this.title,
-      options: this.options,
-      notificationId: this.notificationId,
-    }));
-
-    ipcRenderer.once(`notification-onclick:${this.notificationId}`, () => {
-      if (typeof this.onclick === 'function') {
-        this.onclick();
-      }
+export class NotificationsHandler {
+  onNotify = (data) => data;
+
+  displayNotification(title, options) {
+    return new Promise((resolve) => {
+      debug('New notification', title, options);
+
+      const notificationId = uuidV1();
+
+      ipcRenderer.sendToHost('notification', this.onNotify({
+        title,
+        options,
+        notificationId,
+      }));
+
+      ipcRenderer.once(`notification-onclick:${notificationId}`, () => {
+        resolve();
+      });
     });
   }
+}
 
-  static requestPermission(cb = null) {
-    if (!cb) {
-      return new Promise((resolve) => {
-        resolve(Notification.permission);
-      });
-    }
+export const notificationsClassDefinition = `(() => {
+  class Notification {
+    static permission = 'granted';
 
-    if (typeof (cb) === 'function') {
-      return cb(Notification.permission);
+    constructor(title = '', options = {}) {
+      this.title = title;
+      this.options = options;
+      window.ferdi.displayNotification(title, options)
+        .then(() => {
+          if (typeof (this.onClick) === 'function') {
+            this.onClick();
+          }
+        });
     }
 
-    return Notification.permission;
-  }
+    static requestPermission(cb = null) {
+      if (!cb) {
+        return new Promise((resolve) => {
+          resolve(Notification.permission);
+        });
+      }
 
-  onNotify(data) {
-    return data;
-  }
+      if (typeof (cb) === 'function') {
+        return cb(Notification.permission);
+      }
 
-  onClick() {}
+      return Notification.permission;
+    }
 
-  close() {}
-}
+    onNotify(data) {
+      return data;
+    }
+
+    onClick() {}
+
+    close() {}
+  }
 
-window.Notification = Notification;
+  window.Notification = Notification;
+})();`;
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 8da45864b..a45c34002 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -1,11 +1,9 @@
 /* eslint-disable import/first */
-import { ipcRenderer } from 'electron';
-import { getCurrentWebContents } from '@electron/remote';
-import path from 'path';
+import { contextBridge, ipcRenderer } from 'electron';
+import { join } from 'path';
 import { autorun, computed, observable } from 'mobx';
-import fs from 'fs-extra';
+import { pathExistsSync, readFileSync } from 'fs-extra';
 import { debounce } from 'lodash';
-import { FindInPage } from 'electron-find';
 
 // For some services darkreader tries to use the chrome extension message API
 // This will cause the service to fail loading
@@ -23,16 +21,99 @@ import customDarkModeCss from './darkmode/custom';
 import RecipeWebview from './lib/RecipeWebview';
 import Userscript from './lib/Userscript';
 
-import { switchDict, getSpellcheckerLocaleByFuzzyIdentifier } from './spellchecker';
-import { injectDarkModeStyle, isDarkModeStyleInjected, removeDarkModeStyle } from './darkmode';
+import { BadgeHandler } from './badge';
 import contextMenu from './contextMenu';
-import './notifications';
-import { screenShareCss } from './screenshare';
+import {
+  injectDarkModeStyle,
+  isDarkModeStyleInjected,
+  removeDarkModeStyle,
+} from './darkmode';
+import FindInPage from './find';
+import {
+  NotificationsHandler,
+  notificationsClassDefinition,
+} from './notifications';
+import {
+  getDisplayMediaSelector,
+  screenShareCss,
+  screenShareJs,
+} from './screenshare';
+import {
+  switchDict,
+  getSpellcheckerLocaleByFuzzyIdentifier,
+} from './spellchecker';
 
-import { DEFAULT_APP_SETTINGS, isDevMode } from '../environment';
+import { DEFAULT_APP_SETTINGS } from '../environment';
 
 const debug = require('debug')('Ferdi:Plugin');
 
+const badgeHandler = new BadgeHandler();
+
+const notificationsHandler = new NotificationsHandler();
+
+// Patching window.open
+const originalWindowOpen = window.open;
+
+window.open = (url, frameName, features) => {
+  debug('window.open', url, frameName, features);
+  if (!url) {
+    // The service hasn't yet supplied a URL (as used in Skype).
+    // Return a new dummy window object and wait for the service to change the properties
+    const newWindow = {
+      location: {
+        href: '',
+      },
+    };
+
+    const checkInterval = setInterval(() => {
+      // Has the service changed the URL yet?
+      if (newWindow.location.href !== '') {
+        if (features) {
+          originalWindowOpen(newWindow.location.href, frameName, features);
+        } else {
+          // Open the new URL
+          ipcRenderer.sendToHost('new-window', newWindow.location.href);
+        }
+        clearInterval(checkInterval);
+      }
+    }, 0);
+
+    setTimeout(() => {
+      // Stop checking for location changes after 1 second
+      clearInterval(checkInterval);
+    }, 1000);
+
+    return newWindow;
+  }
+
+  // We need to differentiate if the link should be opened in a popup or in the systems default browser
+  if (!frameName && !features && typeof features !== 'string') {
+    return ipcRenderer.sendToHost('new-window', url);
+  }
+
+  if (url) {
+    return originalWindowOpen(url, frameName, features);
+  }
+};
+
+// We can't override APIs here, so we first expose functions via window.ferdi,
+// then overwrite the corresponding field of the window object by injected JS.
+contextBridge.exposeInMainWorld('ferdi', {
+  open: window.open,
+  setBadge: (direct, indirect) =>
+    badgeHandler.setBadge(direct || 0, indirect || 0),
+  displayNotification: (title, options) =>
+    notificationsHandler.displayNotification(title, options),
+  getDisplayMediaSelector,
+});
+
+ipcRenderer.sendToHost(
+  'inject-js-unsafe',
+  'window.open = window.ferdi.open;',
+  notificationsClassDefinition,
+  screenShareJs,
+);
+
 class RecipeController {
   @observable settings = {
     overrideSpellcheckerLanguage: false,
@@ -66,7 +147,9 @@ class RecipeController {
   }
 
   @computed get spellcheckerLanguage() {
-    const selected = this.settings.service.spellcheckerLanguage || this.settings.app.spellcheckerLanguage;
+    const selected =
+      this.settings.service.spellcheckerLanguage ||
+      this.settings.app.spellcheckerLanguage;
     return selected;
   }
 
@@ -75,7 +158,7 @@ class RecipeController {
   findInPage = null;
 
   async initialize() {
-    Object.keys(this.ipcEvents).forEach((channel) => {
+    Object.keys(this.ipcEvents).forEach(channel => {
       ipcRenderer.on(channel, (...args) => {
         debug('Received IPC event for channel', channel, 'with', ...args);
         this[this.ipcEvents[channel]](...args);
@@ -97,7 +180,7 @@ class RecipeController {
     autorun(() => this.update());
 
     document.addEventListener('DOMContentLoaded', () => {
-      this.findInPage = new FindInPage(getCurrentWebContents(), {
+      this.findInPage = new FindInPage({
         inputFocusColor: '#CE9FFC',
         textColor: '#212121',
       });
@@ -106,14 +189,14 @@ class RecipeController {
 
   loadRecipeModule(event, config, recipe) {
     debug('loadRecipeModule');
-    const modulePath = path.join(recipe.path, 'webview.js');
+    const modulePath = join(recipe.path, 'webview.js');
     debug('module path', modulePath);
     // Delete module from cache
     delete require.cache[require.resolve(modulePath)];
     try {
-      this.recipe = new RecipeWebview();
+      this.recipe = new RecipeWebview(badgeHandler, notificationsHandler);
       // eslint-disable-next-line
-      require(modulePath)(this.recipe, {...config, recipe,});
+      require(modulePath)(this.recipe, { ...config, recipe });
       debug('Initialize Recipe', config, recipe);
 
       this.settings.service = Object.assign(config, { recipe });
@@ -131,15 +214,15 @@ class RecipeController {
     const styles = document.createElement('style');
     styles.innerHTML = screenShareCss;
 
-    const userCss = path.join(recipe.path, 'user.css');
-    if (await fs.exists(userCss)) {
-      const data = await fs.readFile(userCss);
+    const userCss = join(recipe.path, 'user.css');
+    if (pathExistsSync(userCss)) {
+      const data = readFileSync(userCss);
       styles.innerHTML += data.toString();
     }
     document.querySelector('head').appendChild(styles);
 
-    const userJs = path.join(recipe.path, 'user.js');
-    if (await fs.exists(userJs)) {
+    const userJs = join(recipe.path, 'user.js');
+    if (pathExistsSync(userJs)) {
       const loadUserJs = () => {
         // eslint-disable-next-line
         const userJsModule = require(userJs);
@@ -167,8 +250,14 @@ class RecipeController {
   update() {
     debug('enableSpellchecking', this.settings.app.enableSpellchecking);
     debug('isDarkModeEnabled', this.settings.service.isDarkModeEnabled);
-    debug('System spellcheckerLanguage', this.settings.app.spellcheckerLanguage);
-    debug('Service spellcheckerLanguage', this.settings.service.spellcheckerLanguage);
+    debug(
+      'System spellcheckerLanguage',
+      this.settings.app.spellcheckerLanguage,
+    );
+    debug(
+      'Service spellcheckerLanguage',
+      this.settings.service.spellcheckerLanguage,
+    );
     debug('darkReaderSettigs', this.settings.service.darkReaderSettings);
     debug('searchEngine', this.settings.app.searchEngine);
 
@@ -181,7 +270,10 @@ class RecipeController {
       let { spellcheckerLanguage } = this;
       if (spellcheckerLanguage.includes('automatic')) {
         this.automaticLanguageDetection();
-        debug('Found `automatic` locale, falling back to user locale until detected', this.settings.app.locale);
+        debug(
+          'Found `automatic` locale, falling back to user locale until detected',
+          this.settings.app.locale,
+        );
         spellcheckerLanguage = this.settings.app.locale;
       }
       switchDict(spellcheckerLanguage);
@@ -193,7 +285,7 @@ class RecipeController {
       this.hasUpdatedBeforeRecipeLoaded = true;
     }
 
-    console.log(
+    debug(
       'Darkmode enabled?',
       this.settings.service.isDarkModeEnabled,
       'Dark theme active?',
@@ -204,22 +296,29 @@ class RecipeController {
       removeDarkModeStyle,
       disableDarkMode,
       enableDarkMode,
-      injectDarkModeStyle: () => injectDarkModeStyle(this.settings.service.recipe.path),
+      injectDarkModeStyle: () =>
+        injectDarkModeStyle(this.settings.service.recipe.path),
       isDarkModeStyleInjected,
     };
 
-    if (this.settings.service.isDarkModeEnabled && this.settings.app.isDarkThemeActive !== false) {
+    if (
+      this.settings.service.isDarkModeEnabled &&
+      this.settings.app.isDarkThemeActive !== false
+    ) {
       debug('Enable dark mode');
 
       // Check if recipe has a darkmode.css
-      const darkModeStyle = path.join(this.settings.service.recipe.path, 'darkmode.css');
-      const darkModeExists = fs.pathExistsSync(darkModeStyle);
+      const darkModeStyle = join(
+        this.settings.service.recipe.path,
+        'darkmode.css',
+      );
+      const darkModeExists = pathExistsSync(darkModeStyle);
 
-      console.log('darkmode.css exists? ', darkModeExists ? 'Yes' : 'No');
+      debug('darkmode.css exists? ', darkModeExists ? 'Yes' : 'No');
 
       // Check if recipe has a custom dark mode handler
       if (this.recipe && this.recipe.darkModeHandler) {
-        console.log('Using custom dark mode handler');
+        debug('Using custom dark mode handler');
 
         // Remove other dark mode styles if they were already loaded
         if (this.hasUpdatedBeforeRecipeLoaded) {
@@ -230,25 +329,32 @@ class RecipeController {
 
         this.recipe.darkModeHandler(true, handlerConfig);
       } else if (darkModeExists) {
-        console.log('Injecting darkmode.css');
+        debug('Injecting darkmode.css');
         injectDarkModeStyle(this.settings.service.recipe.path);
 
         // Make sure universal dark mode is disabled
         disableDarkMode();
         this.universalDarkModeInjected = false;
-      } else if (this.settings.app.universalDarkMode && !ignoreList.includes(window.location.host)) {
-        console.log('Injecting Dark Reader');
+      } else if (
+        this.settings.app.universalDarkMode &&
+        !ignoreList.includes(window.location.host)
+      ) {
+        debug('Injecting Dark Reader');
 
         // Use Dark Reader instead
-        const { brightness, contrast, sepia } = this.settings.service.darkReaderSettings;
-        enableDarkMode({ brightness, contrast, sepia }, {
-          css: customDarkModeCss[window.location.host] || '',
-        });
+        const { brightness, contrast, sepia } =
+          this.settings.service.darkReaderSettings;
+        enableDarkMode(
+          { brightness, contrast, sepia },
+          {
+            css: customDarkModeCss[window.location.host] || '',
+          },
+        );
         this.universalDarkModeInjected = true;
       }
     } else {
       debug('Remove dark mode');
-      console.log('DarkMode disabled - removing remaining styles');
+      debug('DarkMode disabled - removing remaining styles');
 
       if (this.recipe && this.recipe.darkModeHandler) {
         // Remove other dark mode styles if they were already loaded
@@ -260,10 +366,10 @@ class RecipeController {
 
         this.recipe.darkModeHandler(false, handlerConfig);
       } else if (isDarkModeStyleInjected()) {
-        console.log('Removing injected darkmode.css');
+        debug('Removing injected darkmode.css');
         removeDarkModeStyle();
       } else {
-        console.log('Removing Dark Reader');
+        debug('Removing Dark Reader');
 
         disableDarkMode();
         this.universalDarkModeInjected = false;
@@ -273,9 +379,9 @@ class RecipeController {
     // Remove dark reader if (universal) dark mode was just disabled
     if (this.universalDarkModeInjected) {
       if (
-        !this.settings.app.darkMode
-        || !this.settings.service.isDarkModeEnabled
-        || !this.settings.app.universalDarkMode
+        !this.settings.app.darkMode ||
+        !this.settings.service.isDarkModeEnabled ||
+        !this.settings.app.universalDarkMode
       ) {
         disableDarkMode();
         this.universalDarkModeInjected = false;
@@ -297,82 +403,42 @@ class RecipeController {
   }
 
   async automaticLanguageDetection() {
-    window.addEventListener('keyup', debounce(async (e) => {
-      const element = e.target;
-
-      if (!element) return;
-
-      let value = '';
-      if (element.isContentEditable) {
-        value = element.textContent;
-      } else if (element.value) {
-        value = element.value;
-      }
+    window.addEventListener(
+      'keyup',
+      debounce(async e => {
+        const element = e.target;
+
+        if (!element) return;
+
+        let value = '';
+        if (element.isContentEditable) {
+          value = element.textContent;
+        } else if (element.value) {
+          value = element.value;
+        }
 
-      // Force a minimum length to get better detection results
-      if (value.length < 25) return;
+        // Force a minimum length to get better detection results
+        if (value.length < 25) return;
 
-      debug('Detecting language for', value);
-      const locale = await ipcRenderer.invoke('detect-language', { sample: value });
+        debug('Detecting language for', value);
+        const locale = await ipcRenderer.invoke('detect-language', {
+          sample: value,
+        });
 
-      const spellcheckerLocale = getSpellcheckerLocaleByFuzzyIdentifier(locale);
-      debug('Language detected reliably, setting spellchecker language to', spellcheckerLocale);
-      if (spellcheckerLocale) {
-        switchDict(spellcheckerLocale);
-      }
-    }, 225));
+        const spellcheckerLocale =
+          getSpellcheckerLocaleByFuzzyIdentifier(locale);
+        debug(
+          'Language detected reliably, setting spellchecker language to',
+          spellcheckerLocale,
+        );
+        if (spellcheckerLocale) {
+          switchDict(spellcheckerLocale);
+        }
+      }, 225),
+    );
   }
 }
 
 /* eslint-disable no-new */
 new RecipeController();
 /* eslint-enable no-new */
-
-// Patching window.open
-const originalWindowOpen = window.open;
-
-window.open = (url, frameName, features) => {
-  debug('window.open', url, frameName, features);
-  if (!url) {
-    // The service hasn't yet supplied a URL (as used in Skype).
-    // Return a new dummy window object and wait for the service to change the properties
-    const newWindow = {
-      location: {
-        href: '',
-      },
-    };
-
-    const checkInterval = setInterval(() => {
-      // Has the service changed the URL yet?
-      if (newWindow.location.href !== '') {
-        if (features) {
-          originalWindowOpen(newWindow.location.href, frameName, features);
-        } else {
-          // Open the new URL
-          ipcRenderer.sendToHost('new-window', newWindow.location.href);
-        }
-        clearInterval(checkInterval);
-      }
-    }, 0);
-
-    setTimeout(() => {
-      // Stop checking for location changes after 1 second
-      clearInterval(checkInterval);
-    }, 1000);
-
-    return newWindow;
-  }
-
-  // We need to differentiate if the link should be opened in a popup or in the systems default browser
-  if (!frameName && !features && typeof features !== 'string') {
-    return ipcRenderer.sendToHost('new-window', url);
-  }
-
-  if (url) {
-    return originalWindowOpen(url, frameName, features);
-  }
-};
-
-if (isDevMode) {
-  window.log = console.log;
-}
diff --git a/src/webview/screenshare.js b/src/webview/screenshare.js
index 84d2e1e95..e7e43c04e 100644
--- a/src/webview/screenshare.js
+++ b/src/webview/screenshare.js
@@ -2,6 +2,33 @@ import { desktopCapturer } from 'electron';
 
 const CANCEL_ID = 'desktop-capturer-selection__cancel';
 
+export async function getDisplayMediaSelector() {
+  const sources = await desktopCapturer.getSources({
+    types: ['screen', 'window'],
+  });
+  return `<div class="desktop-capturer-selection__scroller">
+  <ul class="desktop-capturer-selection__list">
+    ${sources
+    .map(
+      ({ id, name, thumbnail }) => `
+      <li class="desktop-capturer-selection__item">
+        <button class="desktop-capturer-selection__btn" data-id="${id}" title="${name}">
+          <img class="desktop-capturer-selection__thumbnail" src="${thumbnail.toDataURL()}" />
+          <span class="desktop-capturer-selection__name">${name}</span>
+        </button>
+      </li>
+    `,
+    )
+    .join('')}
+    <li class="desktop-capturer-selection__item">
+      <button class="desktop-capturer-selection__btn" data-id="${CANCEL_ID}" title="Cancel">
+        <span class="desktop-capturer-selection__name desktop-capturer-selection__name--cancel">Cancel</span>
+      </button>
+    </li>
+  </ul>
+</div>`;
+}
+
 export const screenShareCss = `
 .desktop-capturer-selection {
   position: fixed;
@@ -46,7 +73,9 @@ export const screenShareCss = `
   padding: 4px;
   background: #252626;
   text-align: left;
-  transition: background-color .15s, box-shadow .15s, color .15s;
+  @media (prefers-reduced-motion: no-preference) {
+    transition: background-color .15s, box-shadow .15s, color .15s;
+  }
   color: #dedede;
 }
 .desktop-capturer-selection__btn:hover,
@@ -72,38 +101,12 @@ export const screenShareCss = `
 }
 `;
 
-// Patch getDisplayMedia for screen sharing
-window.navigator.mediaDevices.getDisplayMedia = () => async (resolve, reject) => {
+export const screenShareJs = `
+window.navigator.mediaDevices.getDisplayMedia = () => new Promise(async (resolve, reject) => {
   try {
-    const sources = await desktopCapturer.getSources({
-      types: ['screen', 'window'],
-    });
-
     const selectionElem = document.createElement('div');
-    selectionElem.classList = 'desktop-capturer-selection';
-    selectionElem.innerHTML = `
-        <div class="desktop-capturer-selection__scroller">
-          <ul class="desktop-capturer-selection__list">
-            ${sources
-    .map(
-      ({ id, name, thumbnail }) => `
-              <li class="desktop-capturer-selection__item">
-                <button class="desktop-capturer-selection__btn" data-id="${id}" title="${name}">
-                  <img class="desktop-capturer-selection__thumbnail" src="${thumbnail.toDataURL()}" />
-                  <span class="desktop-capturer-selection__name">${name}</span>
-                </button>
-              </li>
-            `,
-    )
-    .join('')}
-            <li class="desktop-capturer-selection__item">
-              <button class="desktop-capturer-selection__btn" data-id="${CANCEL_ID}" title="Cancel">
-                <span class="desktop-capturer-selection__name desktop-capturer-selection__name--cancel">Cancel</span>
-              </button>
-            </li>
-          </ul>
-        </div>
-      `;
+    selectionElem.classList = ['desktop-capturer-selection'];
+    selectionElem.innerHTML = await window.ferdi.getDisplayMediaSelector();
     document.body.appendChild(selectionElem);
 
     document
@@ -112,25 +115,18 @@ window.navigator.mediaDevices.getDisplayMedia = () => async (resolve, reject) =>
         button.addEventListener('click', async () => {
           try {
             const id = button.getAttribute('data-id');
-            if (id === CANCEL_ID) {
+            if (id === '${CANCEL_ID}') {
               reject(new Error('Cancelled by user'));
             } else {
-              const mediaSource = sources.find((source) => source.id === id);
-              if (!mediaSource) {
-                throw new Error(`Source with id ${id} does not exist`);
-              }
-
-              const stream = await window.navigator.mediaDevices.getUserMedia(
-                {
-                  audio: false,
-                  video: {
-                    mandatory: {
-                      chromeMediaSource: 'desktop',
-                      chromeMediaSourceId: mediaSource.id,
-                    },
+              const stream = await window.navigator.mediaDevices.getUserMedia({
+                audio: false,
+                video: {
+                  mandatory: {
+                    chromeMediaSource: 'desktop',
+                    chromeMediaSourceId: id,
                   },
                 },
-              );
+              });
               resolve(stream);
             }
           } catch (err) {
@@ -143,4 +139,5 @@ window.navigator.mediaDevices.getDisplayMedia = () => async (resolve, reject) =>
   } catch (err) {
     reject(err);
   }
-};
+});
+`;
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index 58a04b728..0f4715207 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -1,6 +1,6 @@
 import { getCurrentWebContents } from '@electron/remote';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
-import { isMac } from '../environment';
+import { DEFAULT_APP_SETTINGS, isMac } from '../environment';
 
 const debug = require('debug')('Ferdi:spellchecker');
 
@@ -9,7 +9,7 @@ const [defaultLocale] = webContents.session.getSpellCheckerLanguages();
 debug('Spellchecker default locale is', defaultLocale);
 
 export function getSpellcheckerLocaleByFuzzyIdentifier(identifier) {
-  const locales = Object.keys(SPELLCHECKER_LOCALES).filter(key => key.toLocaleLowerCase() === identifier.toLowerCase() || key.split('-')[0] === identifier.toLowerCase());
+  const locales = Object.keys(SPELLCHECKER_LOCALES).filter((key) => key.toLocaleLowerCase() === identifier.toLowerCase() || key.split('-')[0] === identifier.toLowerCase());
 
   if (locales.length >= 1) {
     return locales[0];
@@ -33,7 +33,7 @@ export function switchDict(locale) {
     locales.push(foundLocale);
   }
 
-  locales.push(defaultLocale, 'de');
+  locales.push(defaultLocale, DEFAULT_APP_SETTINGS.fallbackLocale);
 
   webContents.session.setSpellCheckerLanguages(locales);
 }