Merge tag 'v5.1.0'

# Conflicts:
#	README.md
#	src/components/layout/AppLayout.js

192 files changed, 15859 insertions, 1870 deletions

diff --git a/src/actions/index.js b/src/actions/index.js
index 59acabb0b..fc525afeb 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -11,6 +11,8 @@ 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';
 
 const actions = Object.assign({}, {
   service,
@@ -25,4 +27,8 @@ const actions = Object.assign({}, {
   requests,
 });
 
-export default defineActions(actions, PropTypes.checkPropTypes);
+export default Object.assign(
+  defineActions(actions, PropTypes.checkPropTypes),
+  { announcements },
+  { workspaces },
+);
diff --git a/src/actions/lib/actions.js b/src/actions/lib/actions.js
index 499018d70..b38db9946 100644
--- a/src/actions/lib/actions.js
+++ b/src/actions/lib/actions.js
@@ -1,18 +1,27 @@
+export const createActionsFromDefinitions = (actionDefinitions, validate) => {
+  const actions = {};
+  Object.keys(actionDefinitions).forEach((actionName) => {
+    const action = (params = {}) => {
+      const schema = actionDefinitions[actionName];
+      validate(schema, params, actionName);
+      action.notify(params);
+    };
+    actions[actionName] = action;
+    action.listeners = [];
+    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));
+  });
+  return actions;
+};
+
 export default (definitions, validate) => {
   const newActions = {};
   Object.keys(definitions).forEach((scopeName) => {
-    newActions[scopeName] = {};
-    Object.keys(definitions[scopeName]).forEach((actionName) => {
-      const action = (params) => {
-        const schema = definitions[scopeName][actionName];
-        validate(schema, params, actionName);
-        action.notify(params);
-      };
-      newActions[scopeName][actionName] = action;
-      action.listeners = [];
-      action.listen = listener => action.listeners.push(listener);
-      action.notify = params => action.listeners.forEach(listener => listener(params));
-    });
+    newActions[scopeName] = createActionsFromDefinitions(definitions[scopeName], validate);
   });
   return newActions;
 };
diff --git a/src/actions/service.js b/src/actions/service.js
index 5d483b12a..ce62560a9 100644
--- a/src/actions/service.js
+++ b/src/actions/service.js
@@ -1,9 +1,11 @@
 import PropTypes from 'prop-types';
+import ServiceModel from '../models/Service';
 
 export default {
   setActive: {
     serviceId: PropTypes.string.isRequired,
   },
+  blurActive: {},
   setActiveNext: {},
   setActivePrev: {},
   showAddServiceInterface: {
@@ -36,6 +38,9 @@ export default {
     serviceId: PropTypes.string.isRequired,
     webview: PropTypes.object.isRequired,
   },
+  detachService: {
+    service: PropTypes.instanceOf(ServiceModel).isRequired,
+  },
   focusService: {
     serviceId: PropTypes.string.isRequired,
   },
diff --git a/src/api/PaymentApi.js b/src/api/PaymentApi.js
index 3f6bb442e..7325151e9 100644
--- a/src/api/PaymentApi.js
+++ b/src/api/PaymentApi.js
@@ -11,12 +11,4 @@ export default class PaymentApi {
   getHostedPage(planId) {
     return this.server.getHostedPage(planId);
   }
-
-  getDashboardUrl() {
-    return this.server.getPaymentDashboardUrl();
-  }
-
-  getOrders() {
-    return this.server.getSubscriptionOrders();
-  }
 }
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 2871769a9..a9ce202ff 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -3,7 +3,6 @@ import path from 'path';
 import tar from 'tar';
 import fs from 'fs-extra';
 import { remote } from 'electron';
-import localStorage from 'mobx-localstorage';
 
 import ServiceModel from '../../models/Service';
 import RecipePreviewModel from '../../models/RecipePreview';
@@ -16,6 +15,7 @@ import OrderModel from '../../models/Order';
 import { sleep } from '../../helpers/async-helpers';
 
 import { API } from '../../environment';
+import { prepareAuthRequest, sendAuthRequest } from '../utils/auth';
 
 import {
   getRecipeDirectory,
@@ -39,6 +39,7 @@ const { default: fetch } = remote.require('electron-fetch');
 
 const SERVER_URL = API;
 const API_VERSION = 'v1';
+const API_URL = `${SERVER_URL}/${API_VERSION}`;
 
 export default class ServerApi {
   recipePreviews = [];
@@ -47,12 +48,12 @@ export default class ServerApi {
 
   // User
   async login(email, passwordHash) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/auth/login`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/auth/login`, {
       method: 'POST',
       headers: {
         Authorization: `Basic ${window.btoa(`${email}:${passwordHash}`)}`,
       },
-    }, false));
+    }, false);
     if (!request.ok) {
       throw request;
     }
@@ -63,10 +64,10 @@ export default class ServerApi {
   }
 
   async signup(data) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/auth/signup`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/auth/signup`, {
       method: 'POST',
       body: JSON.stringify(data),
-    }, false));
+    }, false);
     if (!request.ok) {
       throw request;
     }
@@ -77,10 +78,10 @@ export default class ServerApi {
   }
 
   async inviteUser(data) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/invite`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/invite`, {
       method: 'POST',
       body: JSON.stringify(data),
-    }));
+    });
     if (!request.ok) {
       throw request;
     }
@@ -90,12 +91,12 @@ export default class ServerApi {
   }
 
   async retrievePassword(email) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/auth/password`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/auth/password`, {
       method: 'POST',
       body: JSON.stringify({
         email,
       }),
-    }, false));
+    }, false);
     if (!request.ok) {
       throw request;
     }
@@ -106,9 +107,7 @@ export default class ServerApi {
   }
 
   async userInfo() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/me`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
+    const request = await sendAuthRequest(`${API_URL}/me`);
     if (!request.ok) {
       throw request;
     }
@@ -121,10 +120,10 @@ export default class ServerApi {
   }
 
   async updateUserInfo(data) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/me`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/me`, {
       method: 'PUT',
       body: JSON.stringify(data),
-    }));
+    });
     if (!request.ok) {
       throw request;
     }
@@ -136,9 +135,9 @@ export default class ServerApi {
   }
 
   async deleteAccount() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/me`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/me`, {
       method: 'DELETE',
-    }));
+    });
     if (!request.ok) {
       throw request;
     }
@@ -150,9 +149,7 @@ export default class ServerApi {
 
   // Services
   async getServices() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/me/services`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
+    const request = await sendAuthRequest(`${API_URL}/me/services`);
     if (!request.ok) {
       throw request;
     }
@@ -165,12 +162,12 @@ export default class ServerApi {
   }
 
   async createService(recipeId, data) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/service`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/service`, {
       method: 'POST',
       body: JSON.stringify(Object.assign({
         recipeId,
       }, data)),
-    }));
+    });
     if (!request.ok) {
       throw request;
     }
@@ -195,10 +192,10 @@ export default class ServerApi {
       await this.uploadServiceIcon(serviceId, data.iconFile);
     }
 
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/service/${serviceId}`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/service/${serviceId}`, {
       method: 'PUT',
       body: JSON.stringify(data),
-    }));
+    });
 
     if (!request.ok) {
       throw request;
@@ -216,14 +213,14 @@ export default class ServerApi {
     const formData = new FormData();
     formData.append('icon', icon);
 
-    const requestData = this._prepareAuthRequest({
+    const requestData = prepareAuthRequest({
       method: 'PUT',
       body: formData,
     });
 
     delete requestData.headers['Content-Type'];
 
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/service/${serviceId}`, requestData);
+    const request = await window.fetch(`${API_URL}/service/${serviceId}`, requestData);
 
     if (!request.ok) {
       throw request;
@@ -235,10 +232,10 @@ export default class ServerApi {
   }
 
   async reorderService(data) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/service/reorder`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/service/reorder`, {
       method: 'PUT',
       body: JSON.stringify(data),
-    }));
+    });
     if (!request.ok) {
       throw request;
     }
@@ -248,9 +245,9 @@ export default class ServerApi {
   }
 
   async deleteService(id) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/service/${id}`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/service/${id}`, {
       method: 'DELETE',
-    }));
+    });
     if (!request.ok) {
       throw request;
     }
@@ -264,30 +261,26 @@ export default class ServerApi {
 
   // Features
   async getDefaultFeatures() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/features/default`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
+    const request = await sendAuthRequest(`${API_URL}/features/default`);
     if (!request.ok) {
       throw request;
     }
     const data = await request.json();
 
     const features = data;
-    console.debug('ServerApi::getDefaultFeatures resolves', features);
+    debug('ServerApi::getDefaultFeatures resolves', features);
     return features;
   }
 
   async getFeatures() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/features`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
+    const request = await sendAuthRequest(`${API_URL}/features`);
     if (!request.ok) {
       throw request;
     }
     const data = await request.json();
 
     const features = data;
-    console.debug('ServerApi::getFeatures resolves', features);
+    debug('ServerApi::getFeatures resolves', features);
     return features;
   }
 
@@ -314,10 +307,10 @@ export default class ServerApi {
   }
 
   async getRecipeUpdates(recipeVersions) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/recipes/update`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/recipes/update`, {
       method: 'POST',
       body: JSON.stringify(recipeVersions),
-    }));
+    });
     if (!request.ok) {
       throw request;
     }
@@ -328,29 +321,19 @@ export default class ServerApi {
 
   // Recipes Previews
   async getRecipePreviews() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/recipes`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
-    if (!request.ok) {
-      throw request;
-    }
+    const request = await sendAuthRequest(`${API_URL}/recipes`);
+    if (!request.ok) throw request;
     const data = await request.json();
-
     const recipePreviews = this._mapRecipePreviewModel(data);
     debug('ServerApi::getRecipes resolves', recipePreviews);
-
     return recipePreviews;
   }
 
   async getFeaturedRecipePreviews() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/recipes/popular`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
-    if (!request.ok) {
-      throw request;
-    }
-    const data = await request.json();
+    const request = await sendAuthRequest(`${API_URL}/recipes/popular`);
+    if (!request.ok) throw request;
 
+    const data = await request.json();
     // data = this._addLocalRecipesToPreviews(data);
 
     const recipePreviews = this._mapRecipePreviewModel(data);
@@ -359,14 +342,11 @@ export default class ServerApi {
   }
 
   async searchRecipePreviews(needle) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/recipes/search?needle=${needle}`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
-    if (!request.ok) {
-      throw request;
-    }
-    const data = await request.json();
+    const url = `${API_URL}/recipes/search?needle=${needle}`;
+    const request = await sendAuthRequest(url);
+    if (!request.ok) throw request;
 
+    const data = await request.json();
     const recipePreviews = this._mapRecipePreviewModel(data);
     debug('ServerApi::searchRecipePreviews resolves', recipePreviews);
     return recipePreviews;
@@ -375,10 +355,9 @@ export default class ServerApi {
   async getRecipePackage(recipeId) {
     try {
       const recipesDirectory = path.join(app.getPath('userData'), 'recipes');
-
       const recipeTempDirectory = path.join(recipesDirectory, 'temp', recipeId);
       const archivePath = path.join(recipeTempDirectory, 'recipe.tar.gz');
-      const packageUrl = `${SERVER_URL}/${API_VERSION}/recipes/download/${recipeId}`;
+      const packageUrl = `${API_URL}/recipes/download/${recipeId}`;
 
       fs.ensureDirSync(recipeTempDirectory);
       const res = await fetch(packageUrl);
@@ -415,26 +394,21 @@ export default class ServerApi {
 
   // Payment
   async getPlans() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/payment/plans`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
-    if (!request.ok) {
-      throw request;
-    }
+    const request = await sendAuthRequest(`${API_URL}/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 window.fetch(`${SERVER_URL}/${API_VERSION}/payment/init`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${API_URL}/payment/init`, {
       method: 'POST',
       body: JSON.stringify({
         planId,
       }),
-    }));
+    });
     if (!request.ok) {
       throw request;
     }
@@ -444,43 +418,11 @@ export default class ServerApi {
     return data;
   }
 
-  async getPaymentDashboardUrl() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/me/billing`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
-    if (!request.ok) {
-      throw request;
-    }
-    const data = await request.json();
-
-    debug('ServerApi::getPaymentDashboardUrl resolves', data);
-    return data;
-  }
-
-  async getSubscriptionOrders() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/me/subscription`, this._prepareAuthRequest({
-      method: 'GET',
-    }));
-    if (!request.ok) {
-      throw request;
-    }
-    const data = await request.json();
-    const orders = this._mapOrderModels(data);
-    debug('ServerApi::getSubscriptionOrders resolves', orders);
-    return orders;
-  }
-
   // News
   async getLatestNews() {
-    // eslint-disable-next-line
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`,
-      this._prepareAuthRequest({
-        method: 'GET',
-      }));
-
-    if (!request.ok) {
-      throw request;
-    }
+    const url = `${API_URL}/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`;
+    const request = await sendAuthRequest(url);
+    if (!request.ok) throw request;
     const data = await request.json();
     const news = this._mapNewsModels(data);
     debug('ServerApi::getLatestNews resolves', news);
@@ -488,23 +430,16 @@ export default class ServerApi {
   }
 
   async hideNews(id) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/news/${id}/read`,
-      this._prepareAuthRequest({
-        method: 'GET',
-      }));
-
-    if (!request.ok) {
-      throw request;
-    }
-
+    const request = await sendAuthRequest(`${API_URL}/news/${id}/read`);
+    if (!request.ok) throw request;
     debug('ServerApi::hideNews resolves', id);
   }
 
   // Health Check
   async healthCheck() {
-    const request = await window.fetch(`${SERVER_URL}/health`, this._prepareAuthRequest({
+    const request = await sendAuthRequest(`${SERVER_URL}/health`, {
       method: 'GET',
-    }, false));
+    }, false);
     if (!request.ok) {
       throw request;
     }
@@ -520,10 +455,7 @@ export default class ServerApi {
       if (Object.prototype.hasOwnProperty.call(config, 'services')) {
         const services = await Promise.all(config.services.map(async (s) => {
           const service = s;
-          const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/recipes/${s.service}`,
-            this._prepareAuthRequest({
-              method: 'GET',
-            }));
+          const request = await sendAuthRequest(`${API_URL}/recipes/${s.service}`);
 
           if (request.status === 200) {
             const data = await request.json();
@@ -546,9 +478,7 @@ export default class ServerApi {
   // Helper
   async _mapServiceModels(services) {
     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)));
     /* eslint-enable no-return-await */
@@ -632,26 +562,6 @@ export default class ServerApi {
     }).filter(orderItem => orderItem !== null);
   }
 
-  _prepareAuthRequest(options, auth = true) {
-    const request = Object.assign(options, {
-      mode: 'cors',
-      headers: Object.assign({
-        'Content-Type': 'application/json',
-        'X-Franz-Source': 'desktop',
-        'X-Franz-Version': app.getVersion(),
-        'X-Franz-platform': process.platform,
-        'X-Franz-Timezone-Offset': new Date().getTimezoneOffset(),
-        'X-Franz-System-Locale': app.getLocale(),
-      }, options.headers),
-    });
-
-    if (auth) {
-      request.headers.Authorization = `Bearer ${localStorage.getItem('authToken')}`;
-    }
-
-    return request;
-  }
-
   _getDevRecipes() {
     const recipesDirectory = getDevRecipeDirectory();
     try {
diff --git a/src/api/utils/auth.js b/src/api/utils/auth.js
new file mode 100644
index 000000000..6dbdeaa7f
--- /dev/null
+++ b/src/api/utils/auth.js
@@ -0,0 +1,28 @@
+import { remote } from 'electron';
+import localStorage from 'mobx-localstorage';
+
+const { app } = remote;
+
+export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) => {
+  const request = Object.assign(options, {
+    mode: 'cors',
+    headers: Object.assign({
+      'Content-Type': 'application/json',
+      'X-Franz-Source': 'desktop',
+      'X-Franz-Version': app.getVersion(),
+      'X-Franz-platform': process.platform,
+      'X-Franz-Timezone-Offset': new Date().getTimezoneOffset(),
+      'X-Franz-System-Locale': app.getLocale(),
+    }, options.headers),
+  });
+
+  if (auth) {
+    request.headers.Authorization = `Bearer ${localStorage.getItem('authToken')}`;
+  }
+
+  return request;
+};
+
+export const sendAuthRequest = (url, options, auth) => (
+  window.fetch(url, prepareAuthRequest(options, auth))
+);
diff --git a/src/app.js b/src/app.js
index 6660feb46..f6092bf60 100644
--- a/src/app.js
+++ b/src/app.js
@@ -27,6 +27,7 @@ import RecipesScreen from './containers/settings/RecipesScreen';
 import ServicesScreen from './containers/settings/ServicesScreen';
 import EditServiceScreen from './containers/settings/EditServiceScreen';
 import AccountScreen from './containers/settings/AccountScreen';
+import TeamScreen from './containers/settings/TeamScreen';
 import EditUserScreen from './containers/settings/EditUserScreen';
 import EditSettingsScreen from './containers/settings/EditSettingsScreen';
 import InviteSettingsScreen from './containers/settings/InviteScreen';
@@ -39,6 +40,9 @@ import PricingScreen from './containers/auth/PricingScreen';
 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';
 
 // Add Polyfills
 smoothScroll.polyfill();
@@ -75,8 +79,11 @@ window.addEventListener('load', () => {
                   <Route path="/settings/recipes/:filter" component={RecipesScreen} />
                   <Route path="/settings/services" component={ServicesScreen} />
                   <Route path="/settings/services/:action/:id" component={EditServiceScreen} />
+                  <Route path={WORKSPACES_ROUTES.ROOT} component={WorkspacesScreen} />
+                  <Route path={WORKSPACES_ROUTES.EDIT} component={EditWorkspaceScreen} />
                   <Route path="/settings/user" component={AccountScreen} />
                   <Route path="/settings/user/edit" component={EditUserScreen} />
+                  <Route path="/settings/team" component={TeamScreen} />
                   <Route path="/settings/app" component={EditSettingsScreen} />
                   <Route path="/settings/invite" component={InviteSettingsScreen} />
                 </Route>
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index a1641bc4a..d0476ef04 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -3,14 +3,20 @@ import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 import { TitleBar } from 'electron-react-titlebar';
+import injectSheet from 'react-jss';
 
 import InfoBar from '../ui/InfoBar';
 import { Component as BasicAuth } from '../../features/basicAuth';
+import { Component as ShareFranz } from '../../features/shareFranz';
 import ErrorBoundary from '../util/ErrorBoundary';
 
 // import globalMessages from '../../i18n/globalMessages';
 
 import { isWindows } from '../../environment';
+import AnnouncementScreen from '../../features/announcements/components/AnnouncementScreen';
+import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator';
+import { workspaceStore } from '../../features/workspaces';
+import { announcementActions } from '../../features/announcements/actions';
 
 function createMarkup(HTMLString) {
   return { __html: HTMLString };
@@ -43,18 +49,30 @@ const messages = defineMessages({
   },
 });
 
-export default
-@observer
+const styles = theme => ({
+  appContent: {
+    width: `calc(100% + ${theme.workspaces.drawer.width}px)`,
+    transition: 'transform 0.5s ease',
+    transform() {
+      return workspaceStore.isWorkspaceDrawerOpen ? 'translateX(0)' : `translateX(-${theme.workspaces.drawer.width}px)`;
+    },
+  },
+});
+
+@injectSheet(styles) @observer
 class AppLayout extends Component {
   static propTypes = {
+    classes: PropTypes.object.isRequired,
     isFullScreen: PropTypes.bool.isRequired,
     sidebar: PropTypes.element.isRequired,
+    workspacesDrawer: PropTypes.element.isRequired,
     services: PropTypes.element.isRequired,
     children: PropTypes.element,
     news: MobxPropTypes.arrayOrObservableArray.isRequired,
     // isOnline: PropTypes.bool.isRequired,
     showServicesUpdatedInfoBar: PropTypes.bool.isRequired,
     appUpdateIsDownloaded: PropTypes.bool.isRequired,
+    nextAppReleaseVersion: PropTypes.string,
     removeNewsItem: PropTypes.func.isRequired,
     reloadServicesAfterUpdate: PropTypes.func.isRequired,
     installAppUpdate: PropTypes.func.isRequired,
@@ -63,10 +81,13 @@ class AppLayout extends Component {
     retryRequiredRequests: PropTypes.func.isRequired,
     areRequiredRequestsLoading: PropTypes.bool.isRequired,
     darkMode: PropTypes.bool.isRequired,
+    isDelayAppScreenVisible: PropTypes.bool.isRequired,
+    isAnnouncementVisible: PropTypes.bool.isRequired,
   };
 
   static defaultProps = {
     children: [],
+    nextAppReleaseVersion: null,
   };
 
   static contextTypes = {
@@ -75,7 +96,9 @@ class AppLayout extends Component {
 
   render() {
     const {
+      classes,
       isFullScreen,
+      workspacesDrawer,
       sidebar,
       services,
       children,
@@ -83,6 +106,7 @@ class AppLayout extends Component {
       news,
       showServicesUpdatedInfoBar,
       appUpdateIsDownloaded,
+      nextAppReleaseVersion,
       removeNewsItem,
       reloadServicesAfterUpdate,
       installAppUpdate,
@@ -91,6 +115,8 @@ class AppLayout extends Component {
       retryRequiredRequests,
       areRequiredRequestsLoading,
       darkMode,
+      isDelayAppScreenVisible,
+      isAnnouncementVisible,
     } = this.props;
 
     const { intl } = this.context;
@@ -99,29 +125,23 @@ class AppLayout extends Component {
       <ErrorBoundary>
         <div className={darkMode ? 'theme__dark' : ''}>
           <div className="app">
-            {isWindows && !isFullScreen && (
-              <TitleBar
-                menu={window.franz.menu.template}
-                icon="assets/images/logo.svg"
-              />
-            )}
-            <div className="app__content">
+            {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon="assets/images/logo.svg" />}
+            <div className={`app__content ${classes.appContent}`}>
+              {workspacesDrawer}
               {sidebar}
               <div className="app__service">
-                {news.length > 0
-                  && news.map(item => (
-                    <InfoBar
-                      key={item.id}
-                      position="top"
-                      type={item.type}
-                      sticky={item.sticky}
-                      onHide={() => removeNewsItem({ newsId: item.id })}
-                    >
-                      <span
-                        dangerouslySetInnerHTML={createMarkup(item.message)}
-                      />
-                    </InfoBar>
-                  ))}
+                <WorkspaceSwitchingIndicator />
+                {news.length > 0 && news.map(item => (
+                  <InfoBar
+                    key={item.id}
+                    position="top"
+                    type={item.type}
+                    sticky={item.sticky}
+                    onHide={() => removeNewsItem({ newsId: item.id })}
+                  >
+                    <span dangerouslySetInnerHTML={createMarkup(item.message)} />
+                  </InfoBar>
+                ))}
                 {/* {!isOnline && (
                   <InfoBar
                     type="danger"
@@ -164,12 +184,18 @@ class AppLayout extends Component {
                     <span className="mdi mdi-information" />
                     {intl.formatMessage(messages.updateAvailable)}
                     {' '}
-                    <a href="https://meetfranz.com/changelog" target="_blank">
+                    <button
+                      className="info-bar__inline-button"
+                      type="button"
+                      onClick={() => announcementActions.show({ targetVersion: nextAppReleaseVersion })}
+                    >
                       <u>{intl.formatMessage(messages.changelog)}</u>
-                    </a>
+                    </button>
                   </InfoBar>
                 )}
                 <BasicAuth />
+                <ShareFranz />
+                {isAnnouncementVisible && (<AnnouncementScreen />)}
                 {services}
               </div>
             </div>
@@ -180,3 +206,5 @@ class AppLayout extends Component {
     );
   }
 }
+
+export default AppLayout;
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 609a3b604..36c1f2e39 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -6,6 +6,8 @@ import { observer } from 'mobx-react';
 
 import Tabbar from '../services/tabs/Tabbar';
 import { ctrlKey } from '../../environment';
+import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../../features/workspaces';
+import { gaEvent } from '../../lib/analytics';
 
 const messages = defineMessages({
   settings: {
@@ -24,6 +26,14 @@ const messages = defineMessages({
     id: 'sidebar.unmuteApp',
     defaultMessage: '!!!Enable notifications & audio',
   },
+  openWorkspaceDrawer: {
+    id: 'sidebar.openWorkspaceDrawer',
+    defaultMessage: '!!!Open workspace drawer',
+  },
+  closeWorkspaceDrawer: {
+    id: 'sidebar.closeWorkspaceDrawer',
+    defaultMessage: '!!!Close workspace drawer',
+  },
 });
 
 export default @observer class Sidebar extends Component {
@@ -31,7 +41,9 @@ export default @observer class Sidebar extends Component {
     openSettings: PropTypes.func.isRequired,
     toggleMuteApp: PropTypes.func.isRequired,
     isAppMuted: PropTypes.bool.isRequired,
-  }
+    isWorkspaceDrawerOpen: PropTypes.bool.isRequired,
+    toggleWorkspaceDrawer: PropTypes.func.isRequired,
+  };
 
   static contextTypes = {
     intl: intlShape,
@@ -53,9 +65,23 @@ export default @observer class Sidebar extends Component {
     this.setState({ tooltipEnabled: false });
   }
 
+  updateToolTip() {
+    this.disableToolTip();
+    setTimeout(this.enableToolTip.bind(this));
+  }
+
   render() {
-    const { openSettings, toggleMuteApp, isAppMuted } = this.props;
+    const {
+      openSettings,
+      toggleMuteApp,
+      isAppMuted,
+      isWorkspaceDrawerOpen,
+      toggleWorkspaceDrawer,
+    } = this.props;
     const { intl } = this.context;
+    const workspaceToggleMessage = (
+      isWorkspaceDrawerOpen ? messages.closeWorkspaceDrawer : messages.openWorkspaceDrawer
+    );
 
     return (
       <div className="sidebar">
@@ -64,9 +90,26 @@ export default @observer class Sidebar extends Component {
           enableToolTip={() => this.enableToolTip()}
           disableToolTip={() => this.disableToolTip()}
         />
+        {workspaceStore.isFeatureEnabled ? (
+          <button
+            type="button"
+            onClick={() => {
+              toggleWorkspaceDrawer();
+              this.updateToolTip();
+              gaEvent(GA_CATEGORY_WORKSPACES, 'toggleDrawer', 'sidebar');
+            }}
+            className={`sidebar__button sidebar__button--workspaces ${isWorkspaceDrawerOpen ? 'is-active' : ''}`}
+            data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${ctrlKey}+D)`}
+          >
+            <i className="mdi mdi-view-grid" />
+          </button>
+        ) : null}
         <button
           type="button"
-          onClick={toggleMuteApp}
+          onClick={() => {
+            toggleMuteApp();
+            this.updateToolTip();
+          }}
           className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
           data-tip={`${intl.formatMessage(isAppMuted ? messages.unmute : messages.mute)} (${ctrlKey}+Shift+M)`}
         >
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
new file mode 100644
index 000000000..13148b9b3
--- /dev/null
+++ b/src/components/services/content/ServiceView.js
@@ -0,0 +1,139 @@
+import React, { Component, Fragment } from 'react';
+import PropTypes from 'prop-types';
+import { autorun } from 'mobx';
+import { observer } from 'mobx-react';
+import classnames from 'classnames';
+
+import ServiceModel from '../../../models/Service';
+import StatusBarTargetUrl from '../../ui/StatusBarTargetUrl';
+import WebviewLoader from '../../ui/WebviewLoader';
+import WebviewCrashHandler from './WebviewCrashHandler';
+import WebviewErrorHandler from './ErrorHandlers/WebviewErrorHandler';
+import ServiceDisabled from './ServiceDisabled';
+import ServiceWebview from './ServiceWebview';
+
+export default @observer class ServiceView extends Component {
+  static propTypes = {
+    service: PropTypes.instanceOf(ServiceModel).isRequired,
+    setWebviewReference: PropTypes.func.isRequired,
+    detachService: PropTypes.func.isRequired,
+    reload: PropTypes.func.isRequired,
+    edit: PropTypes.func.isRequired,
+    enable: PropTypes.func.isRequired,
+    isActive: PropTypes.bool,
+  };
+
+  static defaultProps = {
+    isActive: false,
+  };
+
+  state = {
+    forceRepaint: false,
+    targetUrl: '',
+    statusBarVisible: false,
+  };
+
+  autorunDisposer = null;
+
+  forceRepaintTimeout = null;
+
+  componentDidMount() {
+    this.autorunDisposer = autorun(() => {
+      if (this.props.service.isActive) {
+        this.setState({ forceRepaint: true });
+        this.forceRepaintTimeout = setTimeout(() => {
+          this.setState({ forceRepaint: false });
+        }, 100);
+      }
+    });
+  }
+
+  componentWillUnmount() {
+    this.autorunDisposer();
+    clearTimeout(this.forceRepaintTimeout);
+  }
+
+  updateTargetUrl = (event) => {
+    let visible = true;
+    if (event.url === '' || event.url === '#') {
+      visible = false;
+    }
+    this.setState({
+      targetUrl: event.url,
+      statusBarVisible: visible,
+    });
+  };
+
+  render() {
+    const {
+      detachService,
+      service,
+      setWebviewReference,
+      reload,
+      edit,
+      enable,
+    } = this.props;
+
+    const webviewClasses = classnames({
+      services__webview: true,
+      'services__webview-wrapper': true,
+      'is-active': service.isActive,
+      'services__webview--force-repaint': this.state.forceRepaint,
+    });
+
+    let statusBar = null;
+    if (this.state.statusBarVisible) {
+      statusBar = (
+        <StatusBarTargetUrl text={this.state.targetUrl} />
+      );
+    }
+
+    return (
+      <div className={webviewClasses}>
+        {service.isActive && service.isEnabled && (
+          <Fragment>
+            {service.hasCrashed && (
+              <WebviewCrashHandler
+                name={service.recipe.name}
+                webview={service.webview}
+                reload={reload}
+              />
+            )}
+            {service.isEnabled && service.isLoading && service.isFirstLoad && (
+              <WebviewLoader
+                loaded={false}
+                name={service.name}
+              />
+            )}
+            {service.isError && (
+              <WebviewErrorHandler
+                name={service.recipe.name}
+                errorMessage={service.errorMessage}
+                reload={reload}
+                edit={edit}
+              />
+            )}
+          </Fragment>
+        )}
+        {!service.isEnabled ? (
+          <Fragment>
+            {service.isActive && (
+              <ServiceDisabled
+                name={service.recipe.name}
+                webview={service.webview}
+                enable={enable}
+              />
+            )}
+          </Fragment>
+        ) : (
+          <ServiceWebview
+            service={service}
+            setWebviewReference={setWebviewReference}
+            detachService={detachService}
+          />
+        )}
+        {statusBar}
+      </div>
+    );
+  }
+}
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index bb577e4cc..7252c695f 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -1,145 +1,50 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { autorun } from 'mobx';
 import { observer } from 'mobx-react';
-import Webview from 'react-electron-web-view';
-import classnames from 'classnames';
+import ElectronWebView from 'react-electron-web-view';
 
 import ServiceModel from '../../../models/Service';
-import StatusBarTargetUrl from '../../ui/StatusBarTargetUrl';
-import WebviewLoader from '../../ui/WebviewLoader';
-import WebviewCrashHandler from './WebviewCrashHandler';
-import WebviewErrorHandler from './ErrorHandlers/WebviewErrorHandler';
-import ServiceDisabled from './ServiceDisabled';
 
-export default @observer class ServiceWebview extends Component {
+@observer
+class ServiceWebview extends Component {
   static propTypes = {
     service: PropTypes.instanceOf(ServiceModel).isRequired,
     setWebviewReference: PropTypes.func.isRequired,
-    reload: PropTypes.func.isRequired,
-    edit: PropTypes.func.isRequired,
-    enable: PropTypes.func.isRequired,
-    isActive: PropTypes.bool,
+    detachService: PropTypes.func.isRequired,
   };
 
-  static defaultProps = {
-    isActive: false,
-  };
-
-  state = {
-    forceRepaint: false,
-    targetUrl: '',
-    statusBarVisible: false,
-  };
-
-  autorunDisposer = null;
-
   webview = null;
 
-  componentDidMount() {
-    this.autorunDisposer = autorun(() => {
-      if (this.props.service.isActive) {
-        this.setState({ forceRepaint: true });
-        setTimeout(() => {
-          this.setState({ forceRepaint: false });
-        }, 100);
-      }
-    });
-  }
-
   componentWillUnmount() {
-    this.autorunDisposer();
-  }
-
-  updateTargetUrl = (event) => {
-    let visible = true;
-    if (event.url === '' || event.url === '#') {
-      visible = false;
-    }
-    this.setState({
-      targetUrl: event.url,
-      statusBarVisible: visible,
-    });
+    const { service, detachService } = this.props;
+    detachService({ service });
   }
 
   render() {
     const {
       service,
       setWebviewReference,
-      reload,
-      edit,
-      enable,
     } = this.props;
 
-    const webviewClasses = classnames({
-      services__webview: true,
-      'services__webview-wrapper': true,
-      'is-active': service.isActive,
-      'services__webview--force-repaint': this.state.forceRepaint,
-    });
-
-    let statusBar = null;
-    if (this.state.statusBarVisible) {
-      statusBar = (
-        <StatusBarTargetUrl text={this.state.targetUrl} />
-      );
-    }
-
     return (
-      <div className={webviewClasses}>
-        {service.isActive && service.isEnabled && (
-          <Fragment>
-            {service.hasCrashed && (
-              <WebviewCrashHandler
-                name={service.recipe.name}
-                webview={service.webview}
-                reload={reload}
-              />
-            )}
-            {service.isEnabled && service.isLoading && service.isFirstLoad && (
-              <WebviewLoader
-                loaded={false}
-                name={service.name}
-              />
-            )}
-            {service.isError && (
-              <WebviewErrorHandler
-                name={service.recipe.name}
-                errorMessage={service.errorMessage}
-                reload={reload}
-                edit={edit}
-              />
-            )}
-          </Fragment>
-        )}
-        {!service.isEnabled ? (
-          <Fragment>
-            {service.isActive && (
-              <ServiceDisabled
-                name={service.recipe.name}
-                webview={service.webview}
-                enable={enable}
-              />
-            )}
-          </Fragment>
-        ) : (
-          <Webview
-            ref={(element) => { this.webview = element; }}
-            autosize
-            src={service.url}
-            preload="./webview/recipe.js"
-            partition={`persist:service-${service.id}`}
-            onDidAttach={() => setWebviewReference({
-              serviceId: service.id,
-              webview: this.webview.view,
-            })}
-            onUpdateTargetUrl={this.updateTargetUrl}
-            useragent={service.userAgent}
-            allowpopups
-          />
-        )}
-        {statusBar}
-      </div>
+      <ElectronWebView
+        ref={(webview) => { this.webview = webview; }}
+        autosize
+        src={service.url}
+        preload="./webview/recipe.js"
+        partition={`persist:service-${service.id}`}
+        onDidAttach={() => {
+          setWebviewReference({
+            serviceId: service.id,
+            webview: this.webview.view,
+          });
+        }}
+        onUpdateTargetUrl={this.updateTargetUrl}
+        useragent={service.userAgent}
+        allowpopups
+      />
     );
   }
 }
+
+export default ServiceWebview;
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index 54f16ba12..8f8c38a11 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -4,7 +4,7 @@ import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { Link } from 'react-router';
 import { defineMessages, intlShape } from 'react-intl';
 
-import Webview from './ServiceWebview';
+import ServiceView from './ServiceView';
 import Appear from '../../ui/effects/Appear';
 
 const messages = defineMessages({
@@ -22,6 +22,7 @@ export default @observer class Services extends Component {
   static propTypes = {
     services: MobxPropTypes.arrayOrObservableArray,
     setWebviewReference: PropTypes.func.isRequired,
+    detachService: PropTypes.func.isRequired,
     handleIPCMessage: PropTypes.func.isRequired,
     openWindow: PropTypes.func.isRequired,
     reload: PropTypes.func.isRequired,
@@ -42,6 +43,7 @@ export default @observer class Services extends Component {
       services,
       handleIPCMessage,
       setWebviewReference,
+      detachService,
       openWindow,
       reload,
       openSettings,
@@ -71,11 +73,12 @@ export default @observer class Services extends Component {
           </Appear>
         )}
         {services.map(service => (
-          <Webview
+          <ServiceView
             key={service.id}
             service={service}
             handleIPCMessage={handleIPCMessage}
             setWebviewReference={setWebviewReference}
+            detachService={detachService}
             openWindow={openWindow}
             reload={() => reload({ serviceId: service.id })}
             edit={() => openSettings({ path: `services/edit/${service.id}` })}
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js
index 42bc3c877..7a69dba87 100644
--- a/src/components/services/content/WebviewCrashHandler.js
+++ b/src/components/services/content/WebviewCrashHandler.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
+import ms from 'ms';
 
 import Button from '../../ui/Button';
 
@@ -35,12 +36,12 @@ export default @observer class WebviewCrashHandler extends Component {
   };
 
   state = {
-    countdown: 10000,
+    countdown: ms('10s'),
   }
 
   countdownInterval = null;
 
-  countdownIntervalTimeout = 1000;
+  countdownIntervalTimeout = ms('1s');
 
 
   componentDidMount() {
@@ -75,7 +76,7 @@ export default @observer class WebviewCrashHandler extends Component {
         <p className="footnote">
           {intl.formatMessage(messages.autoReload, {
             name,
-            seconds: this.state.countdown / 1000,
+            seconds: this.state.countdown / ms('1s'),
           })}
         </p>
       </div>
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js
index dd5c2140f..5e8260ad0 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.js
@@ -19,7 +19,7 @@ export default @observer class TabBar extends Component {
     updateService: PropTypes.func.isRequired,
     showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
     showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
-  }
+  };
 
   onSortEnd = ({ oldIndex, newIndex }) => {
     const {
@@ -45,7 +45,7 @@ export default @observer class TabBar extends Component {
         redirect: false,
       });
     }
-  }
+  };
 
   disableService({ serviceId }) {
     this.toggleService({ serviceId, isEnabled: false });
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 9c9543749..3f6964b6b 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -3,12 +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 moment from 'moment';
+import { ProBadge } from '@meetfranz/ui';
 
 import Loader from '../../ui/Loader';
 import Button from '../../ui/Button';
 import Infobox from '../../ui/Infobox';
-import Link from '../../ui/Link';
 import SubscriptionForm from '../../../containers/subscription/SubscriptionFormScreen';
 
 const messages = defineMessages({
@@ -24,10 +23,6 @@ const messages = defineMessages({
     id: 'settings.account.headlineUpgrade',
     defaultMessage: '!!!Upgrade your Account',
   },
-  headlineInvoices: {
-    id: 'settings.account.headlineInvoices',
-    defaultMessage: '!!Invoices',
-  },
   headlineDangerZone: {
     id: 'settings.account.headlineDangerZone',
     defaultMessage: '!!Danger Zone',
@@ -44,14 +39,14 @@ const messages = defineMessages({
     id: 'settings.account.accountType.premium',
     defaultMessage: '!!!Premium Supporter Account',
   },
-  accountTypeEnterprise: {
-    id: 'settings.account.accountType.enterprise',
-    defaultMessage: '!!!Enterprise Account',
-  },
   accountEditButton: {
     id: 'settings.account.account.editButton',
     defaultMessage: '!!!Edit Account',
   },
+  invoicesButton: {
+    id: 'settings.account.headlineInvoices',
+    defaultMessage: '!!Invoices',
+  },
   invoiceDownload: {
     id: 'settings.account.invoiceDownload',
     defaultMessage: '!!!Download',
@@ -81,19 +76,17 @@ const messages = defineMessages({
 export default @observer class AccountDashboard extends Component {
   static propTypes = {
     user: MobxPropTypes.observableObject.isRequired,
-    orders: MobxPropTypes.arrayOrObservableArray.isRequired,
     isLoading: PropTypes.bool.isRequired,
-    isLoadingOrdersInfo: PropTypes.bool.isRequired,
     isLoadingPlans: PropTypes.bool.isRequired,
-    isCreatingPaymentDashboardUrl: PropTypes.bool.isRequired,
     userInfoRequestFailed: PropTypes.bool.isRequired,
     retryUserInfoRequest: PropTypes.func.isRequired,
-    openDashboard: PropTypes.func.isRequired,
-    openExternalUrl: PropTypes.func.isRequired,
     onCloseSubscriptionWindow: PropTypes.func.isRequired,
     deleteAccount: PropTypes.func.isRequired,
     isLoadingDeleteAccount: PropTypes.bool.isRequired,
     isDeleteAccountSuccessful: PropTypes.bool.isRequired,
+    openEditAccount: PropTypes.func.isRequired,
+    openBilling: PropTypes.func.isRequired,
+    openInvoices: PropTypes.func.isRequired,
   };
 
   static contextTypes = {
@@ -103,12 +96,7 @@ export default @observer class AccountDashboard extends Component {
   render() {
     const {
       user,
-      orders,
       isLoading,
-      isCreatingPaymentDashboardUrl,
-      openDashboard,
-      openExternalUrl,
-      isLoadingOrdersInfo,
       isLoadingPlans,
       userInfoRequestFailed,
       retryUserInfoRequest,
@@ -116,6 +104,9 @@ export default @observer class AccountDashboard extends Component {
       deleteAccount,
       isLoadingDeleteAccount,
       isDeleteAccountSuccessful,
+      openEditAccount,
+      openBilling,
+      openInvoices,
     } = this.props;
     const { intl } = this.context;
 
@@ -153,116 +144,56 @@ export default @observer class AccountDashboard extends Component {
                         src="./assets/images/logo.svg"
                         alt=""
                       />
-                      {user.isPremium && (
-                        <span
-                          className="account__avatar-premium emoji"
-                          data-tip="Premium Supporter Account"
-                        >
-                          <img src="./assets/images/emoji/star.png" alt="" />
-                        </span>
-                      )}
                     </div>
                     <div className="account__info">
                       <h2>
-                        {`${user.firstname} ${user.lastname}`}
+                        <span className="username">{`${user.firstname} ${user.lastname}`}</span>
+                        {user.isPremium && (
+                          <>
+                            {' '}
+                            <ProBadge />
+                            <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span>
+                          </>
+                        )}
                       </h2>
                       {user.organization && `${user.organization}, `}
                       {user.email}
-                      <br />
-                      {!user.isEnterprise && !user.isPremium && (
-                        <span className="badge badge">{intl.formatMessage(messages.accountTypeBasic)}</span>
-                      )}
                       {user.isPremium && (
-                        <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span>
-                      )}
-                      {user.isEnterprise && (
-                        <span className="badge badge--success">{intl.formatMessage(messages.accountTypeEnterprise)}</span>
+                        <div className="manage-user-links">
+                          <Button
+                            label={intl.formatMessage(messages.accountEditButton)}
+                            className="franz-form__button--inverted"
+                            onClick={openEditAccount}
+                          />
+                          {user.isSubscriptionOwner && (
+                            <>
+                              <Button
+                                label={intl.formatMessage(messages.manageSubscriptionButtonLabel)}
+                                className="franz-form__button--inverted"
+                                onClick={openBilling}
+                              />
+                              <Button
+                                label={intl.formatMessage(messages.invoicesButton)}
+                                className="franz-form__button--inverted"
+                                onClick={openInvoices}
+                              />
+                            </>
+                          )}
+                        </div>
                       )}
                     </div>
-                    <Link to="/settings/user/edit" className="button">
-                      {intl.formatMessage(messages.accountEditButton)}
-                    </Link>
-                    {user.emailValidated}
-                  </div>
-                </div>
-              )}
-
-              {user.isSubscriptionOwner && (
-                isLoadingOrdersInfo ? (
-                  <Loader />
-                ) : (
-                  <div className="account franz-form">
-                    {orders.length > 0 && (
-                      <Fragment>
-                        <div className="account__box">
-                          <h2>{intl.formatMessage(messages.headlineSubscription)}</h2>
-                          <div className="account__subscription">
-                            {orders[0].name}
-                            <span className="badge">{orders[0].price}</span>
-                            <Button
-                              label={intl.formatMessage(messages.manageSubscriptionButtonLabel)}
-                              className="account__subscription-button franz-form__button--inverted"
-                              loaded={!isCreatingPaymentDashboardUrl}
-                              onClick={() => openDashboard()}
-                            />
-                          </div>
-                        </div>
-                        <div className="account__box">
-                          <h2>{intl.formatMessage(messages.headlineInvoices)}</h2>
-                          <table className="invoices">
-                            <tbody>
-                              {orders.map(order => (
-                                <tr key={order.id}>
-                                  <td className="invoices__date">
-                                    {moment(order.date).format('DD.MM.YYYY')}
-                                  </td>
-                                  <td className="invoices__action">
-                                    <button
-                                      type="button"
-                                      onClick={() => openExternalUrl(order.invoiceUrl)}
-                                    >
-                                      {intl.formatMessage(messages.invoiceDownload)}
-                                    </button>
-                                  </td>
-                                </tr>
-                              ))}
-                            </tbody>
-                          </table>
-                        </div>
-                      </Fragment>
+                    {!user.isPremium && (
+                      <Button
+                        label={intl.formatMessage(messages.accountEditButton)}
+                        className="franz-form__button--inverted"
+                        onClick={openEditAccount}
+                      />
                     )}
                   </div>
-                )
-              )}
-
-              {user.isEnterprise && (
-                <div className="account">
-                  <div className="account__box">
-                    <h2>{user.company.name}</h2>
-                    <p>
-                      Technical contact:&nbsp;
-                      <Link
-                        className="link"
-                        target="_blank"
-                        to={`mailto:${user.company.contact.technical}?subject=Franz`}
-                      >
-                        {user.company.contact.technical}
-                      </Link>
-                      <br />
-                      General contact:&nbsp;
-                      <Link
-                        className="link"
-                        target="_blank"
-                        to={`mailto:${user.company.contact.default}?subject=Franz`}
-                      >
-                        {user.company.contact.default}
-                      </Link>
-                    </p>
-                  </div>
                 </div>
               )}
 
-              {!user.isEnterprise && !user.isPremium && (
+              {!user.isPremium && (
                 isLoadingPlans ? (
                   <Loader />
                 ) : (
@@ -277,27 +208,25 @@ export default @observer class AccountDashboard extends Component {
                 )
               )}
 
-              {!user.isEnterprise && (
-                <div className="account franz-form">
-                  <div className="account__box">
-                    <h2>{intl.formatMessage(messages.headlineDangerZone)}</h2>
-                    {!isDeleteAccountSuccessful && (
-                      <div className="account__subscription">
-                        <p>{intl.formatMessage(messages.deleteInfo)}</p>
-                        <Button
-                          label={intl.formatMessage(messages.deleteAccount)}
-                          buttonType="danger"
-                          onClick={() => deleteAccount()}
-                          loaded={!isLoadingDeleteAccount}
-                        />
-                      </div>
-                    )}
-                    {isDeleteAccountSuccessful && (
-                      <p>{intl.formatMessage(messages.deleteEmailSent)}</p>
-                    )}
+              <div className="account franz-form">
+                <div className="account__box">
+                  <h2>{intl.formatMessage(messages.headlineDangerZone)}</h2>
+                  {!isDeleteAccountSuccessful && (
+                  <div className="account__subscription">
+                    <p>{intl.formatMessage(messages.deleteInfo)}</p>
+                    <Button
+                      label={intl.formatMessage(messages.deleteAccount)}
+                      buttonType="danger"
+                      onClick={() => deleteAccount()}
+                      loaded={!isLoadingDeleteAccount}
+                    />
                   </div>
+                  )}
+                  {isDeleteAccountSuccessful && (
+                  <p>{intl.formatMessage(messages.deleteEmailSent)}</p>
+                  )}
                 </div>
-              )}
+              </div>
             </Fragment>
           )}
         </div>
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 953f702f8..df4b3b3b2 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -2,8 +2,12 @@ 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 Link from '../../ui/Link';
+import { workspaceStore } from '../../../features/workspaces';
+import UIStore from '../../../stores/UIStore';
+import UserStore from '../../../stores/UserStore';
 
 const messages = defineMessages({
   availableServices: {
@@ -14,10 +18,18 @@ const messages = defineMessages({
     id: 'settings.navigation.yourServices',
     defaultMessage: '!!!Your services',
   },
+  yourWorkspaces: {
+    id: 'settings.navigation.yourWorkspaces',
+    defaultMessage: '!!!Your workspaces',
+  },
   account: {
     id: 'settings.navigation.account',
     defaultMessage: '!!!Account',
   },
+  team: {
+    id: 'settings.navigation.team',
+    defaultMessage: '!!!Manage Team',
+  },
   settings: {
     id: 'settings.navigation.settings',
     defaultMessage: '!!!Settings',
@@ -34,7 +46,12 @@ const messages = defineMessages({
 
 export default @inject('stores') @observer class SettingsNavigation extends Component {
   static propTypes = {
+    stores: PropTypes.shape({
+      ui: PropTypes.instanceOf(UIStore).isRequired,
+      user: PropTypes.instanceOf(UserStore).isRequired,
+    }).isRequired,
     serviceCount: PropTypes.number.isRequired,
+    workspaceCount: PropTypes.number.isRequired,
   };
 
   static contextTypes = {
@@ -42,7 +59,9 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp
   };
 
   render() {
-    const { serviceCount } = this.props;
+    const { serviceCount, workspaceCount, stores } = this.props;
+    const { isDarkThemeActive } = stores.ui;
+    const { router, user } = stores;
     const { intl } = this.context;
 
     return (
@@ -63,6 +82,21 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp
           {' '}
           <span className="badge">{serviceCount}</span>
         </Link>
+        {workspaceStore.isFeatureEnabled ? (
+          <Link
+            to="/settings/workspaces"
+            className="settings-navigation__link"
+            activeClassName="is-active"
+          >
+            {intl.formatMessage(messages.yourWorkspaces)}
+            {' '}
+            {workspaceStore.isPremiumUpgradeRequired ? (
+              <ProBadge inverted={!isDarkThemeActive && workspaceStore.isSettingsRouteActive} />
+            ) : (
+              <span className="badge">{workspaceCount}</span>
+            )}
+          </Link>
+        ) : null}
         <Link
           to="/settings/user"
           className="settings-navigation__link"
@@ -71,6 +105,16 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp
           {intl.formatMessage(messages.account)}
         </Link>
         <Link
+          to="/settings/team"
+          className="settings-navigation__link"
+          activeClassName="is-active"
+        >
+          {intl.formatMessage(messages.team)}
+          {!user.data.isPremium && (
+            <ProBadge inverted={!isDarkThemeActive && router.location.pathname === '/settings/team'} />
+          )}
+        </Link>
+        <Link
           to="/settings/app"
           className="settings-navigation__link"
           activeClassName="is-active"
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 468d85c45..4ba2eb844 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -128,7 +128,8 @@ export default @observer class EditServiceForm extends Component {
     isSaving: PropTypes.bool.isRequired,
     isDeleting: PropTypes.bool.isRequired,
     isProxyFeatureEnabled: PropTypes.bool.isRequired,
-    isProxyFeaturePremiumFeature: PropTypes.bool.isRequired,
+    isProxyPremiumFeature: PropTypes.bool.isRequired,
+    isSpellcheckerPremiumFeature: PropTypes.bool.isRequired,
   };
 
   static defaultProps = {
@@ -191,7 +192,8 @@ export default @observer class EditServiceForm extends Component {
       isDeleting,
       onDelete,
       isProxyFeatureEnabled,
-      isProxyFeaturePremiumFeature,
+      isProxyPremiumFeature,
+      isSpellcheckerPremiumFeature,
     } = this.props;
     const { intl } = this.context;
 
@@ -339,14 +341,20 @@ export default @observer class EditServiceForm extends Component {
               </div>
             </div>
 
-            <PremiumFeatureContainer>
+            <PremiumFeatureContainer
+              condition={isSpellcheckerPremiumFeature}
+              gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }}
+            >
               <div className="settings__settings-group">
                 <Select field={form.$('spellcheckerLanguage')} />
               </div>
             </PremiumFeatureContainer>
 
             {isProxyFeatureEnabled && (
-              <PremiumFeatureContainer condition={isProxyFeaturePremiumFeature}>
+              <PremiumFeatureContainer
+                condition={isProxyPremiumFeature}
+                gaEventInfo={{ category: 'User', event: 'upgrade', label: 'proxy' }}
+              >
                 <div className="settings__settings-group">
                   <h3>
                     {intl.formatMessage(messages.headlineProxy)}
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js
index a12df7372..53bae12df 100644
--- a/src/components/settings/services/ServicesDashboard.js
+++ b/src/components/settings/services/ServicesDashboard.js
@@ -65,7 +65,7 @@ export default @observer class ServicesDashboard extends Component {
 
   static defaultProps = {
     searchNeedle: '',
-  }
+  };
 
   static contextTypes = {
     intl: intlShape,
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index a92e559f3..efd453356 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -81,6 +81,10 @@ const messages = defineMessages({
     id: 'settings.app.restartRequired',
     defaultMessage: '!!!Changes require restart',
   },
+  languageDisclaimer: {
+    id: 'settings.app.languageDisclaimer',
+    defaultMessage: '!!!Official translations are English & German. All other languages are community based translations.',
+  },
 });
 
 export default @observer class EditSettingsForm extends Component {
@@ -170,6 +174,7 @@ export default @observer class EditSettingsForm extends Component {
             <Select field={form.$('locale')} showLabel={false} />
             <PremiumFeatureContainer
               condition={isSpellcheckerPremiumFeature}
+              gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }}
             >
               <Fragment>
                 <Toggle
@@ -238,6 +243,10 @@ export default @observer class EditSettingsForm extends Component {
             {intl.formatMessage(messages.currentVersion)}
             {' '}
             {remote.app.getVersion()}
+            <p className="settings__message">
+              <span className="mdi mdi-information" />
+              {intl.formatMessage(messages.languageDisclaimer)}
+            </p>
           </form>
         </div>
       </div>
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js
new file mode 100644
index 000000000..82c517fcb
--- /dev/null
+++ b/src/components/settings/team/TeamDashboard.js
@@ -0,0 +1,152 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import ReactTooltip from 'react-tooltip';
+import injectSheet from 'react-jss';
+
+import Loader from '../../ui/Loader';
+import Button from '../../ui/Button';
+import Infobox from '../../ui/Infobox';
+import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
+
+const messages = defineMessages({
+  headline: {
+    id: 'settings.team.headline',
+    defaultMessage: '!!!Team',
+  },
+  contentHeadline: {
+    id: 'settings.team.contentHeadline',
+    defaultMessage: '!!!Franz for Teams',
+  },
+  intro: {
+    id: 'settings.team.intro',
+    defaultMessage: '!!!You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.',
+  },
+  copy: {
+    id: 'settings.team.copy',
+    defaultMessage: '!!!Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!',
+  },
+  manageButton: {
+    id: 'settings.team.manageAction',
+    defaultMessage: '!!!Manage your Team on meetfranz.com',
+  },
+  upgradeButton: {
+    id: 'settings.team.upgradeAction',
+    defaultMessage: '!!!Upgrade your Account',
+  },
+});
+
+const styles = {
+  cta: {
+    margin: [40, 'auto'],
+  },
+  container: {
+    display: 'flex',
+    flexDirection: 'column',
+    height: 'auto',
+
+    '@media(min-width: 800px)': {
+      flexDirection: 'row',
+    },
+  },
+  content: {
+    height: 'auto',
+    order: 1,
+
+    '@media(min-width: 800px)': {
+      order: 0,
+    },
+  },
+  image: {
+    display: 'block',
+    height: 150,
+    order: 0,
+    margin: [0, 'auto', 40, 'auto'],
+
+    '@media(min-width: 800px)': {
+      marginLeft: 40,
+      order: 1,
+    },
+  },
+};
+
+
+export default @injectSheet(styles) @observer class TeamDashboard extends Component {
+  static propTypes = {
+    isLoading: PropTypes.bool.isRequired,
+    userInfoRequestFailed: PropTypes.bool.isRequired,
+    retryUserInfoRequest: PropTypes.func.isRequired,
+    openTeamManagement: PropTypes.func.isRequired,
+    classes: PropTypes.object.isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  render() {
+    const {
+      isLoading,
+      userInfoRequestFailed,
+      retryUserInfoRequest,
+      openTeamManagement,
+      classes,
+    } = this.props;
+    const { intl } = this.context;
+
+    return (
+      <div className="settings__main">
+        <div className="settings__header">
+          <span className="settings__header-item">
+            {intl.formatMessage(messages.headline)}
+          </span>
+        </div>
+        <div className="settings__body">
+          {isLoading && (
+            <Loader />
+          )}
+
+          {!isLoading && userInfoRequestFailed && (
+            <Infobox
+              icon="alert"
+              type="danger"
+              ctaLabel={intl.formatMessage(messages.tryReloadUserInfoRequest)}
+              ctaLoading={isLoading}
+              ctaOnClick={retryUserInfoRequest}
+            >
+              {intl.formatMessage(messages.userInfoRequestFailed)}
+            </Infobox>
+          )}
+
+          {!userInfoRequestFailed && (
+            <>
+              {!isLoading && (
+                <>
+                  <PremiumFeatureContainer>
+                    <>
+                      <h1>{intl.formatMessage(messages.contentHeadline)}</h1>
+                      <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" />
+                      </div>
+                      <Button
+                        label={intl.formatMessage(messages.manageButton)}
+                        onClick={openTeamManagement}
+                        className={classes.cta}
+                      />
+                    </>
+                  </PremiumFeatureContainer>
+                </>
+              )}
+            </>
+          )}
+        </div>
+        <ReactTooltip place="right" type="dark" effect="solid" />
+      </div>
+    );
+  }
+}
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js
index 0e3ac6b10..a1a353e57 100644
--- a/src/components/settings/user/EditUserForm.js
+++ b/src/components/settings/user/EditUserForm.js
@@ -3,11 +3,10 @@ import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 import { Link } from 'react-router';
-
-// import { Link } from 'react-router';
+import { Input } from '@meetfranz/forms';
 
 import Form from '../../../lib/Form';
-import Input from '../../ui/Input';
+// import Input from '../../ui/Input';
 import Button from '../../ui/Button';
 import Radio from '../../ui/Radio';
 import Infobox from '../../ui/Infobox';
@@ -39,13 +38,12 @@ const messages = defineMessages({
   },
 });
 
-export default @observer class EditServiceForm extends Component {
+export default @observer class EditUserForm extends Component {
   static propTypes = {
     status: MobxPropTypes.observableArray.isRequired,
     form: PropTypes.instanceOf(Form).isRequired,
     onSubmit: PropTypes.func.isRequired,
     isSaving: PropTypes.bool.isRequired,
-    isEnterprise: PropTypes.bool.isRequired,
   };
 
   static contextTypes = {
@@ -68,7 +66,6 @@ export default @observer class EditServiceForm extends Component {
       // user,
       status,
       form,
-      isEnterprise,
       isSaving,
     } = this.props;
     const { intl } = this.context;
@@ -98,23 +95,21 @@ export default @observer class EditServiceForm extends Component {
             )}
             <h2>{intl.formatMessage(messages.headlineAccount)}</h2>
             <div className="grid__row">
-              <Input field={form.$('firstname')} focus />
-              <Input field={form.$('lastname')} />
+              <Input {...form.$('firstname').bind()} focus />
+              <Input {...form.$('lastname').bind()} />
             </div>
-            <Input field={form.$('email')} />
-            {!isEnterprise && (
-              <Radio field={form.$('accountType')} />
-            )}
-            {!isEnterprise && form.$('accountType').value === 'company' && (
+            <Input {...form.$('email').bind()} />
+            <Radio field={form.$('accountType')} />
+            {form.$('accountType').value === 'company' && (
               <Input field={form.$('organization')} />
             )}
             <h2>{intl.formatMessage(messages.headlinePassword)}</h2>
             <Input
-              field={form.$('oldPassword')}
+              {...form.$('oldPassword').bind()}
               showPasswordToggle
             />
             <Input
-              field={form.$('newPassword')}
+              {...form.$('newPassword').bind()}
               showPasswordToggle
               scorePassword
             />
diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js
index 90da8ddc3..50f1e0522 100644
--- a/src/components/subscription/SubscriptionForm.js
+++ b/src/components/subscription/SubscriptionForm.js
@@ -35,31 +35,33 @@ const messages = defineMessages({
     id: 'subscription.includedFeatures',
     defaultMessage: '!!!The Franz Premium Supporter Account includes',
   },
-  features: {
-    onpremise: {
-      id: 'subscription.features.onpremise.mattermost',
-      defaultMessage: '!!!Add on-premise/hosted services like Mattermost',
-    },
-    noInterruptions: {
-      id: 'subscription.features.noInterruptions',
-      defaultMessage: '!!!No app delays & nagging to upgrade license',
-    },
-    proxy: {
-      id: 'subscription.features.proxy',
-      defaultMessage: '!!!Proxy support for services',
-    },
-    spellchecker: {
-      id: 'subscription.features.spellchecker',
-      defaultMessage: '!!!Support for Spellchecker',
-    },
-    ads: {
-      id: 'subscription.features.ads',
-      defaultMessage: '!!!No ads, ever!',
-    },
-    comingSoon: {
-      id: 'subscription.features.comingSoon',
-      defaultMessage: '!!!coming soon',
-    },
+  onpremise: {
+    id: 'subscription.features.onpremise.mattermost',
+    defaultMessage: '!!!Add on-premise/hosted services like Mattermost',
+  },
+  noInterruptions: {
+    id: 'subscription.features.noInterruptions',
+    defaultMessage: '!!!No app delays & nagging to upgrade license',
+  },
+  proxy: {
+    id: 'subscription.features.proxy',
+    defaultMessage: '!!!Proxy support for services',
+  },
+  spellchecker: {
+    id: 'subscription.features.spellchecker',
+    defaultMessage: '!!!Support for Spellchecker',
+  },
+  workspaces: {
+    id: 'subscription.features.workspaces',
+    defaultMessage: '!!!Organize your services in workspaces',
+  },
+  ads: {
+    id: 'subscription.features.ads',
+    defaultMessage: '!!!No ads, ever!',
+  },
+  comingSoon: {
+    id: 'subscription.features.comingSoon',
+    defaultMessage: '!!!coming soon',
   },
   euTaxInfo: {
     id: 'subscription.euTaxInfo',
@@ -85,7 +87,7 @@ export default @observer class SubscriptionForm extends Component {
     showSkipOption: false,
     skipAction: () => null,
     skipButtonLabel: '',
-  }
+  };
 
   static contextTypes = {
     intl: intlShape,
@@ -162,18 +164,21 @@ export default @observer class SubscriptionForm extends Component {
             </p>
             <div className="subscription">
               <ul className="subscription__premium-features">
-                <li>{intl.formatMessage(messages.features.onpremise)}</li>
+                <li>{intl.formatMessage(messages.onpremise)}</li>
+                <li>
+                  {intl.formatMessage(messages.noInterruptions)}
+                </li>
                 <li>
-                  {intl.formatMessage(messages.features.noInterruptions)}
+                  {intl.formatMessage(messages.spellchecker)}
                 </li>
                 <li>
-                  {intl.formatMessage(messages.features.spellchecker)}
+                  {intl.formatMessage(messages.proxy)}
                 </li>
                 <li>
-                  {intl.formatMessage(messages.features.proxy)}
+                  {intl.formatMessage(messages.workspaces)}
                 </li>
                 <li>
-                  {intl.formatMessage(messages.features.ads)}
+                  {intl.formatMessage(messages.ads)}
                 </li>
               </ul>
             </div>
diff --git a/src/components/subscription/SubscriptionPopup.js b/src/components/subscription/SubscriptionPopup.js
index b5d7c4b2d..0f6f0260f 100644
--- a/src/components/subscription/SubscriptionPopup.js
+++ b/src/components/subscription/SubscriptionPopup.js
@@ -3,6 +3,7 @@ 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';
 
@@ -42,7 +43,7 @@ export default @observer class SubscriptionPopup extends Component {
 
     setTimeout(() => {
       this.props.closeWindow();
-    }, 4000);
+    }, ms('4s'));
   }
 
   render() {
diff --git a/src/components/ui/AppLoader/index.js b/src/components/ui/AppLoader/index.js
index 61053f6d1..b0c7fed7b 100644
--- a/src/components/ui/AppLoader/index.js
+++ b/src/components/ui/AppLoader/index.js
@@ -23,11 +23,11 @@ export default @injectSheet(styles) @withTheme class AppLoader extends Component
   static propTypes = {
     classes: PropTypes.object.isRequired,
     theme: PropTypes.object.isRequired,
-  }
+  };
 
   state = {
     step: 0,
-  }
+  };
 
   interval = null;
 
diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js
index 6ecf4d395..06dab1eb6 100644
--- a/src/components/ui/FullscreenLoader/index.js
+++ b/src/components/ui/FullscreenLoader/index.js
@@ -16,13 +16,13 @@ export default @observer @withTheme @injectSheet(styles) class FullscreenLoader
     theme: PropTypes.object.isRequired,
     spinnerColor: PropTypes.string,
     children: PropTypes.node,
-  }
+  };
 
   static defaultProps = {
     className: null,
     spinnerColor: null,
     children: null,
-  }
+  };
 
   render() {
     const {
diff --git a/src/components/ui/Infobox.js b/src/components/ui/Infobox.js
index a33c6474a..0917ee9f0 100644
--- a/src/components/ui/Infobox.js
+++ b/src/components/ui/Infobox.js
@@ -13,6 +13,8 @@ export default @observer class Infobox extends Component {
     ctaLabel: PropTypes.string,
     ctaLoading: PropTypes.bool,
     dismissable: PropTypes.bool,
+    onDismiss: PropTypes.func,
+    onSeen: PropTypes.func,
   };
 
   static defaultProps = {
@@ -22,12 +24,19 @@ export default @observer class Infobox extends Component {
     ctaOnClick: () => null,
     ctaLabel: '',
     ctaLoading: false,
+    onDismiss: () => null,
+    onSeen: () => null,
   };
 
   state = {
     dismissed: false,
   };
 
+  componentDidMount() {
+    const { onSeen } = this.props;
+    if (onSeen) onSeen();
+  }
+
   render() {
     const {
       children,
@@ -37,6 +46,7 @@ export default @observer class Infobox extends Component {
       ctaLoading,
       ctaOnClick,
       dismissable,
+      onDismiss,
     } = this.props;
 
     if (this.state.dismissed) {
@@ -76,9 +86,10 @@ export default @observer class Infobox extends Component {
         {dismissable && (
           <button
             type="button"
-            onClick={() => this.setState({
-              dismissed: true,
-            })}
+            onClick={() => {
+              this.setState({ dismissed: true });
+              if (onDismiss) onDismiss();
+            }}
             className="infobox__delete mdi mdi-close"
           />
         )}
diff --git a/src/components/ui/Modal/index.js b/src/components/ui/Modal/index.js
index d84e4c713..0b7154760 100644
--- a/src/components/ui/Modal/index.js
+++ b/src/components/ui/Modal/index.js
@@ -3,9 +3,12 @@ import ReactModal from 'react-modal';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import injectCSS from 'react-jss';
+import { Icon } from '@meetfranz/ui';
 
 import styles from './styles';
 
+// ReactModal.setAppElement('#root');
+
 export default @injectCSS(styles) class Modal extends Component {
   static propTypes = {
     children: PropTypes.node.isRequired,
@@ -14,11 +17,15 @@ export default @injectCSS(styles) class Modal extends Component {
     isOpen: PropTypes.bool.isRequired,
     portal: PropTypes.string,
     close: PropTypes.func.isRequired,
+    shouldCloseOnOverlayClick: PropTypes.bool,
+    showClose: PropTypes.bool,
   }
 
   static defaultProps = {
     className: null,
     portal: 'modal-portal',
+    shouldCloseOnOverlayClick: false,
+    showClose: true,
   }
 
   render() {
@@ -29,6 +36,8 @@ export default @injectCSS(styles) class Modal extends Component {
       isOpen,
       portal,
       close,
+      shouldCloseOnOverlayClick,
+      showClose,
     } = this.props;
 
     return (
@@ -42,14 +51,17 @@ export default @injectCSS(styles) class Modal extends Component {
         overlayClassName={classes.overlay}
         portal={portal}
         onRequestClose={close}
+        shouldCloseOnOverlayClick={shouldCloseOnOverlayClick}
       >
-        {/* <button
-          type="button"
-          className={classnames({
-            [`${classes.close}`]: true,
-            'mdi mdi-close': true,
-          })}
-        /> */}
+        {showClose && close && (
+          <button
+            type="button"
+            className={classes.close}
+            onClick={close}
+          >
+            <Icon icon="mdiClose" size={1.5} />
+          </button>
+        )}
         <div className={classes.content}>
           {children}
         </div>
diff --git a/src/components/ui/Modal/styles.js b/src/components/ui/Modal/styles.js
index 56fecbf55..49b970c97 100644
--- a/src/components/ui/Modal/styles.js
+++ b/src/components/ui/Modal/styles.js
@@ -28,5 +28,6 @@ export default theme => ({
     position: 'absolute',
     top: 0,
     right: 0,
+    padding: 20,
   },
 });
diff --git a/src/components/ui/PremiumFeatureContainer/index.js b/src/components/ui/PremiumFeatureContainer/index.js
index 67cd6af0b..3c1e0fac3 100644
--- a/src/components/ui/PremiumFeatureContainer/index.js
+++ b/src/components/ui/PremiumFeatureContainer/index.js
@@ -9,6 +9,7 @@ import { oneOrManyChildElements } from '../../../prop-types';
 import UserStore from '../../../stores/UserStore';
 
 import styles from './styles';
+import { gaEvent } from '../../../lib/analytics';
 
 const messages = defineMessages({
   action: {
@@ -17,14 +18,21 @@ const messages = defineMessages({
   },
 });
 
-export default @inject('stores', 'actions') @injectSheet(styles) @observer class PremiumFeatureContainer extends Component {
+@inject('stores', 'actions') @injectSheet(styles) @observer
+class PremiumFeatureContainer extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
     condition: PropTypes.bool,
+    gaEventInfo: PropTypes.shape({
+      category: PropTypes.string.isRequired,
+      event: PropTypes.string.isRequired,
+      label: PropTypes.string,
+    }),
   };
 
   static defaultProps = {
     condition: true,
+    gaEventInfo: null,
   };
 
   static contextTypes = {
@@ -38,6 +46,7 @@ export default @inject('stores', 'actions') @injectSheet(styles) @observer class
       actions,
       condition,
       stores,
+      gaEventInfo,
     } = this.props;
 
     const { intl } = this.context;
@@ -49,7 +58,13 @@ export default @inject('stores', 'actions') @injectSheet(styles) @observer class
           <button
             className={classes.actionButton}
             type="button"
-            onClick={() => actions.ui.openSettings({ path: 'user' })}
+            onClick={() => {
+              actions.ui.openSettings({ path: 'user' });
+              if (gaEventInfo) {
+                const { category, event, label } = gaEventInfo;
+                gaEvent(category, event, label);
+              }
+            }}
           >
             {intl.formatMessage(messages.action)}
           </button>
@@ -73,3 +88,5 @@ PremiumFeatureContainer.wrappedComponent.propTypes = {
     }).isRequired,
   }).isRequired,
 };
+
+export default PremiumFeatureContainer;
diff --git a/src/components/ui/PremiumFeatureContainer/styles.js b/src/components/ui/PremiumFeatureContainer/styles.js
index 81d6666c6..41881e044 100644
--- a/src/components/ui/PremiumFeatureContainer/styles.js
+++ b/src/components/ui/PremiumFeatureContainer/styles.js
@@ -6,6 +6,7 @@ export default theme => ({
     padding: 20,
     'border-radius': theme.borderRadius,
     pointerEvents: 'none',
+    height: 'auto',
   },
   titleContainer: {
     display: 'flex',
@@ -19,14 +20,14 @@ export default theme => ({
     color: theme.colorSubscriptionContainerActionButtonColor,
     'margin-left': 'auto',
     'border-radius': theme.borderRadiusSmall,
-    padding: [2, 4],
+    padding: [4, 8],
     'font-size': 12,
     pointerEvents: 'initial',
   },
   content: {
     opacity: 0.5,
     'margin-top': 20,
-    '& :last-child': {
+    '& > :last-child': {
       'margin-bottom': 0,
     },
   },
diff --git a/src/components/ui/ServiceIcon.js b/src/components/ui/ServiceIcon.js
new file mode 100644
index 000000000..0b9155a4e
--- /dev/null
+++ b/src/components/ui/ServiceIcon.js
@@ -0,0 +1,67 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import injectSheet from 'react-jss';
+import classnames from 'classnames';
+
+import ServiceModel from '../../models/Service';
+
+const styles = theme => ({
+  root: {
+    height: 'auto',
+  },
+  icon: {
+    width: theme.serviceIcon.width,
+  },
+  isCustomIcon: {
+    width: theme.serviceIcon.isCustom.width,
+    border: theme.serviceIcon.isCustom.border,
+    borderRadius: theme.serviceIcon.isCustom.borderRadius,
+  },
+  isDisabled: {
+    filter: 'grayscale(100%)',
+    opacity: '.5',
+  },
+});
+
+@injectSheet(styles) @observer
+class ServiceIcon extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    service: PropTypes.instanceOf(ServiceModel).isRequired,
+    className: PropTypes.string,
+  };
+
+  static defaultProps = {
+    className: '',
+  };
+
+  render() {
+    const {
+      classes,
+      className,
+      service,
+    } = this.props;
+
+    return (
+      <div
+        className={classnames([
+          classes.root,
+          className,
+        ])}
+      >
+        <img
+          src={service.icon}
+          className={classnames([
+            classes.icon,
+            service.isEnabled ? null : classes.isDisabled,
+            service.hasCustomIcon ? classes.isCustomIcon : null,
+          ])}
+          alt=""
+        />
+      </div>
+    );
+  }
+}
+
+export default ServiceIcon;
diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js
index 3a3dbbe49..58b6b6f1b 100644
--- a/src/components/ui/WebviewLoader/index.js
+++ b/src/components/ui/WebviewLoader/index.js
@@ -2,23 +2,35 @@ 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 FullscreenLoader from '../FullscreenLoader';
-
 import styles from './styles';
 
+const messages = defineMessages({
+  loading: {
+    id: 'service.webviewLoader.loading',
+    defaultMessage: '!!!Loading',
+  },
+});
+
 export default @observer @injectSheet(styles) class WebviewLoader extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
     classes: PropTypes.object.isRequired,
-  }
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
 
   render() {
     const { classes, name } = this.props;
+    const { intl } = this.context;
     return (
       <FullscreenLoader
         className={classes.component}
-        title={`Loading ${name}`}
+        title={`${intl.formatMessage(messages.loading)} ${name}`}
       />
     );
   }
diff --git a/src/config.js b/src/config.js
index 789ddd1a0..5bc318545 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,14 +1,30 @@
 import electron from 'electron';
 import path from 'path';
+import isDevMode from 'electron-is-dev';
+import ms from 'ms';
+
+import { asarPath } from './helpers/asar-helpers';
 
 const app = process.type === 'renderer' ? electron.remote.app : electron.app;
 const systemPreferences = process.type === 'renderer' ? electron.remote.systemPreferences : electron.systemPreferences;
 
-export const CHECK_INTERVAL = 1000 * 3600; // How often should we perform checks
+export const CHECK_INTERVAL = ms('1h'); // How often should we perform checks
+
 export const LOCAL_API = 'http://localhost:3000';
 export const DEV_API = 'https://dev.franzinfra.com';
 export const LIVE_API = 'https://api.franzinfra.com';
-export const GA_ID = 'UA-74126766-10';
+
+export const LOCAL_WS_API = 'ws://localhost:3000';
+export const DEV_WS_API = 'wss://dev.franzinfra.com';
+export const LIVE_WS_API = 'wss://api.franzinfra.com';
+
+export const LOCAL_API_WEBSITE = 'http://localhost:3333';
+export const DEV_API_WEBSITE = 'https://meetfranz.com';
+export const LIVE_API_WEBSITE = 'https://meetfranz.com';
+
+export const STATS_API = 'https://stats.franzinfra.com';
+
+export const GA_ID = !isDevMode ? 'UA-74126766-10' : 'UA-74126766-12';
 
 export const DEFAULT_APP_SETTINGS = {
   autoLaunchInBackground: false,
@@ -32,11 +48,14 @@ export const DEFAULT_FEATURES_CONFIG = {
   isSpellcheckerPremiumFeature: false,
   needToWaitToProceed: false,
   needToWaitToProceedConfig: {
-    delayOffset: 3600000,
-    wait: 10000,
+    delayOffset: ms('1h'),
+    wait: ms('10s'),
   },
   isServiceProxyEnabled: false,
   isServiceProxyPremiumFeature: true,
+  isAnnouncementsEnabled: true,
+  isWorkspacePremiumFeature: true,
+  isWorkspaceEnabled: false,
 };
 
 export const DEFAULT_WINDOW_OPTIONS = {
@@ -57,4 +76,10 @@ export const FILE_SYSTEM_SETTINGS_TYPES = [
 export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config');
 
 // Replacing app.asar is not beautiful but unforunately necessary
-export const DICTIONARY_PATH = path.join(__dirname, 'dictionaries').replace('app.asar', 'app.asar.unpacked');
+export const DICTIONARY_PATH = asarPath(path.join(__dirname, 'dictionaries'));
+
+export const ALLOWED_PROTOCOLS = [
+  'https:',
+  'http:',
+  'ftp:',
+];
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js
index 762929dc6..e63f40c06 100644
--- a/src/containers/auth/AuthLayoutContainer.js
+++ b/src/containers/auth/AuthLayoutContainer.js
@@ -1,6 +1,8 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
+import { ThemeProvider } from 'react-jss';
+import { theme } from '@meetfranz/theme';
 
 import AuthLayout from '../../components/auth/AuthLayout';
 import AppStore from '../../stores/AppStore';
@@ -21,30 +23,38 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer
     const {
       stores, actions, children, location,
     } = this.props;
-    const { app, features, globalError } = stores;
+    const {
+      app, features, globalError, settings,
+    } = stores;
 
     const isLoadingBaseFeatures = features.defaultFeaturesRequest.isExecuting
       && !features.defaultFeaturesRequest.wasExecuted;
 
+    const themeType = theme(settings.app.darkMode ? 'dark' : 'default');
+
     if (isLoadingBaseFeatures) {
       return (
-        <AppLoader />
+        <ThemeProvider theme={theme(themeType)}>
+          <AppLoader />
+        </ThemeProvider>
       );
     }
 
     return (
-      <AuthLayout
-        error={globalError.response}
-        pathname={location.pathname}
-        isOnline={app.isOnline}
-        isAPIHealthy={!app.healthCheckRequest.isError}
-        retryHealthCheck={actions.app.healthCheck}
-        isHealthCheckLoading={app.healthCheckRequest.isExecuting}
-        isFullScreen={app.isFullScreen}
-        darkMode={app.isSystemDarkModeEnabled}
-      >
-        {children}
-      </AuthLayout>
+      <ThemeProvider theme={theme(themeType)}>
+        <AuthLayout
+          error={globalError.response}
+          pathname={location.pathname}
+          isOnline={app.isOnline}
+          isAPIHealthy={!app.healthCheckRequest.isError}
+          retryHealthCheck={actions.app.healthCheck}
+          isHealthCheckLoading={app.healthCheckRequest.isExecuting}
+          isFullScreen={app.isFullScreen}
+          darkMode={app.isSystemDarkModeEnabled}
+        >
+          {children}
+        </AuthLayout>
+      </ThemeProvider>
     );
   }
 }
diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js
index fc46f8b54..4a93891d6 100644
--- a/src/containers/auth/ImportScreen.js
+++ b/src/containers/auth/ImportScreen.js
@@ -3,13 +3,8 @@ import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import Import from '../../components/auth/Import';
 import UserStore from '../../stores/UserStore';
-import { gaPage } from '../../lib/analytics';
 
 export default @inject('stores', 'actions') @observer class ImportScreen extends Component {
-  componentDidMount() {
-    gaPage('Auth/Import');
-  }
-
   render() {
     const { actions, stores } = this.props;
 
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js
index 26bf97038..66afaf7e1 100644
--- a/src/containers/auth/InviteScreen.js
+++ b/src/containers/auth/InviteScreen.js
@@ -2,13 +2,8 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import Invite from '../../components/auth/Invite';
-import { gaPage } from '../../lib/analytics';
 
 export default @inject('stores', 'actions') @observer class InviteScreen extends Component {
-  componentDidMount() {
-    gaPage('Auth/Invite');
-  }
-
   render() {
     const { actions } = this.props;
 
diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js
index 865bd38f8..e5ee10785 100644
--- a/src/containers/auth/LoginScreen.js
+++ b/src/containers/auth/LoginScreen.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import Login from '../../components/auth/Login';
 import UserStore from '../../stores/UserStore';
-import { gaPage } from '../../lib/analytics';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
@@ -12,10 +11,6 @@ export default @inject('stores', 'actions') @observer class LoginScreen extends
     error: globalErrorPropType.isRequired,
   };
 
-  componentDidMount() {
-    gaPage('Auth/Login');
-  }
-
   render() {
     const { actions, stores, error } = this.props;
     return (
diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.js
index 236fd2031..5b238860e 100644
--- a/src/containers/auth/PasswordScreen.js
+++ b/src/containers/auth/PasswordScreen.js
@@ -3,13 +3,8 @@ import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import Password from '../../components/auth/Password';
 import UserStore from '../../stores/UserStore';
-import { gaPage } from '../../lib/analytics';
 
 export default @inject('stores', 'actions') @observer class PasswordScreen extends Component {
-  componentDidMount() {
-    gaPage('Auth/Password Retrieve');
-  }
-
   render() {
     const { actions, stores } = this.props;
 
diff --git a/src/containers/auth/PricingScreen.js b/src/containers/auth/PricingScreen.js
index 34b512e15..8d179a170 100644
--- a/src/containers/auth/PricingScreen.js
+++ b/src/containers/auth/PricingScreen.js
@@ -6,7 +6,6 @@ import { RouterStore } from 'mobx-react-router';
 import Pricing from '../../components/auth/Pricing';
 import UserStore from '../../stores/UserStore';
 import PaymentStore from '../../stores/PaymentStore';
-import { gaPage } from '../../lib/analytics';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
@@ -15,10 +14,6 @@ export default @inject('stores', 'actions') @observer class PricingScreen extend
     error: globalErrorPropType.isRequired,
   };
 
-  componentDidMount() {
-    gaPage('Auth/Pricing');
-  }
-
   render() {
     const { actions, stores, error } = this.props;
 
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js
index caf75de90..efc7ea4c1 100644
--- a/src/containers/auth/SignupScreen.js
+++ b/src/containers/auth/SignupScreen.js
@@ -4,7 +4,6 @@ import { inject, observer } from 'mobx-react';
 
 import Signup from '../../components/auth/Signup';
 import UserStore from '../../stores/UserStore';
-import { gaPage } from '../../lib/analytics';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
@@ -13,10 +12,6 @@ export default @inject('stores', 'actions') @observer class SignupScreen extends
     error: globalErrorPropType.isRequired,
   };
 
-  componentDidMount() {
-    gaPage('Auth/Signup');
-  }
-
   render() {
     const { actions, stores, error } = this.props;
     return (
diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js
index 2c120f81c..75182345a 100644
--- a/src/containers/auth/WelcomeScreen.js
+++ b/src/containers/auth/WelcomeScreen.js
@@ -5,13 +5,8 @@ import { inject, observer } from 'mobx-react';
 import Welcome from '../../components/auth/Welcome';
 import UserStore from '../../stores/UserStore';
 import RecipePreviewsStore from '../../stores/RecipePreviewsStore';
-import { gaPage } from '../../lib/analytics';
 
 export default @inject('stores', 'actions') @observer class LoginScreen extends Component {
-  componentDidMount() {
-    gaPage('Auth/Welcome');
-  }
-
   render() {
     const { user, recipePreviews } = this.props.stores;
 
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 749912c59..d2891a6a4 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -20,6 +20,10 @@ 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';
+import { announcementsStore } from '../../features/announcements';
 
 export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component {
   static defaultProps = {
@@ -42,6 +46,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
       setActive,
       handleIPCMessage,
       setWebviewReference,
+      detachService,
       openWindow,
       reorder,
       reload,
@@ -81,6 +86,15 @@ 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)
+        )}
+        onUpgradeAccountClick={() => openSettings({ path: 'user' })}
+      />
+    );
+
     const sidebar = (
       <Sidebar
         services={services.allDisplayed}
@@ -95,6 +109,8 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
         deleteService={deleteService}
         updateService={updateService}
         toggleMuteApp={toggleMuteApp}
+        toggleWorkspaceDrawer={workspaceActions.toggleWorkspaceDrawer}
+        isWorkspaceDrawerOpen={workspaceStore.isWorkspaceDrawerOpen}
         showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted}
         showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted}
       />
@@ -105,6 +121,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
         services={services.allDisplayedUnordered}
         handleIPCMessage={handleIPCMessage}
         setWebviewReference={setWebviewReference}
+        detachService={detachService}
         openWindow={openWindow}
         reload={reload}
         openSettings={openSettings}
@@ -119,7 +136,9 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
           isOnline={app.isOnline}
           showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar}
           appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED}
+          nextAppReleaseVersion={app.nextAppReleaseVersion}
           sidebar={sidebar}
+          workspacesDrawer={workspacesDrawer}
           services={servicesContainer}
           news={news.latest}
           removeNewsItem={hide}
@@ -132,6 +151,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
           areRequiredRequestsLoading={requests.areRequiredRequestsLoading}
           darkMode={settings.all.app.darkMode}
           isDelayAppScreenVisible={delayAppState.isDelayAppScreenVisible}
+          isAnnouncementVisible={announcementsStore.isAnnouncementVisible}
         >
           {React.Children.count(children) > 0 ? children : null}
         </AppLayout>
@@ -160,6 +180,7 @@ AppLayoutContainer.wrappedComponent.propTypes = {
       toggleAudio: PropTypes.func.isRequired,
       handleIPCMessage: PropTypes.func.isRequired,
       setWebviewReference: PropTypes.func.isRequired,
+      detachService: PropTypes.func.isRequired,
       openWindow: PropTypes.func.isRequired,
       reloadUpdatedServices: PropTypes.func.isRequired,
       updateService: PropTypes.func.isRequired,
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index d681d5226..b3f967353 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -1,4 +1,3 @@
-import { remote } from 'electron';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
@@ -6,92 +5,55 @@ import { inject, observer } from 'mobx-react';
 import PaymentStore from '../../stores/PaymentStore';
 import UserStore from '../../stores/UserStore';
 import AppStore from '../../stores/AppStore';
-import { gaPage } from '../../lib/analytics';
 
 import AccountDashboard from '../../components/settings/account/AccountDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
-
-const { BrowserWindow } = remote;
+import { WEBSITE } from '../../environment';
 
 export default @inject('stores', 'actions') @observer class AccountScreen extends Component {
-  componentWillMount() {
-    const {
-      user,
-    } = this.props.stores;
-
-    user.getUserInfoRequest.invalidate({ immediately: true });
-  }
-
-  componentDidMount() {
-    gaPage('Settings/Account Dashboard');
-  }
-
   onCloseWindow() {
-    const { user, payment } = this.props.stores;
+    const { user } = this.props.stores;
     user.getUserInfoRequest.invalidate({ immediately: true });
-    payment.ordersDataRequest.invalidate({ immediately: true });
   }
 
   reloadData() {
     const { user, payment } = this.props.stores;
 
     user.getUserInfoRequest.reload();
-    payment.ordersDataRequest.reload();
     payment.plansRequest.reload();
   }
 
-  async handlePaymentDashboard() {
+  handleWebsiteLink(route) {
     const { actions, stores } = this.props;
 
-    actions.payment.createDashboardUrl();
-
-    const dashboard = await stores.payment.createDashboardUrlRequest;
-
-    if (dashboard.url) {
-      const paymentWindow = new BrowserWindow({
-        title: '🔒 Franz Subscription Dashboard',
-        parent: remote.getCurrentWindow(),
-        modal: false,
-        width: 900,
-        minWidth: 600,
-        webPreferences: {
-          nodeIntegration: false,
-        },
-      });
-      paymentWindow.loadURL(dashboard.url);
+    const url = `${WEBSITE}${route}?authToken=${stores.user.authToken}&utm_source=app&utm_medium=account_dashboard`;
+    console.log(url);
 
-      paymentWindow.on('closed', () => {
-        this.onCloseWindow();
-      });
-    }
+    actions.app.openExternalUrl({ url });
   }
 
   render() {
     const { user, payment } = this.props.stores;
-    const { openExternalUrl } = this.props.actions.app;
     const { user: userActions } = this.props.actions;
 
     const isLoadingUserInfo = user.getUserInfoRequest.isExecuting;
-    const isLoadingOrdersInfo = payment.ordersDataRequest.isExecuting;
     const isLoadingPlans = payment.plansRequest.isExecuting;
 
     return (
       <ErrorBoundary>
         <AccountDashboard
           user={user.data}
-          orders={payment.orders}
           isLoading={isLoadingUserInfo}
-          isLoadingOrdersInfo={isLoadingOrdersInfo}
           isLoadingPlans={isLoadingPlans}
           userInfoRequestFailed={user.getUserInfoRequest.wasExecuted && user.getUserInfoRequest.isError}
           retryUserInfoRequest={() => this.reloadData()}
-          isCreatingPaymentDashboardUrl={payment.createDashboardUrlRequest.isExecuting}
-          openDashboard={price => this.handlePaymentDashboard(price)}
-          openExternalUrl={url => openExternalUrl({ url })}
           onCloseSubscriptionWindow={() => this.onCloseWindow()}
           deleteAccount={userActions.delete}
           isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting}
           isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError}
+          openEditAccount={() => this.handleWebsiteLink('/user/profile')}
+          openBilling={() => this.handleWebsiteLink('/user/billing')}
+          openInvoices={() => this.handleWebsiteLink('/user/invoices')}
         />
       </ErrorBoundary>
     );
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index b46908344..870ca4ecd 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -9,7 +9,6 @@ import ServicesStore from '../../stores/ServicesStore';
 import SettingsStore from '../../stores/SettingsStore';
 import FeaturesStore from '../../stores/FeaturesStore';
 import Form from '../../lib/Form';
-import { gaPage } from '../../lib/analytics';
 
 import ServiceError from '../../components/settings/services/ServiceError';
 import EditServiceForm from '../../components/settings/services/EditServiceForm';
@@ -19,9 +18,12 @@ 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';
 
+import globalMessages from '../../i18n/globalMessages';
+
 const messages = defineMessages({
   name: {
     id: 'settings.service.form.name',
@@ -83,14 +85,6 @@ const messages = defineMessages({
     id: 'settings.service.form.proxy.password',
     defaultMessage: '!!!Password',
   },
-  spellcheckerLanguage: {
-    id: 'settings.service.form.spellcheckerLanguage',
-    defaultMessage: '!!!Spell checking Language',
-  },
-  spellcheckerSystemDefault: {
-    id: 'settings.service.form.spellcheckerLanguage.default',
-    defaultMessage: '!!!Use System Default ({default})',
-  },
 });
 
 export default @inject('stores', 'actions') @observer class EditServiceScreen extends Component {
@@ -98,10 +92,6 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
     intl: intlShape,
   };
 
-  componentDidMount() {
-    gaPage('Settings/Service/Edit');
-  }
-
   onSubmit(data) {
     const { action } = this.props.router.params;
     const { recipes, services } = this.props.stores;
@@ -118,12 +108,26 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
   }
 
   prepareForm(recipe, service, proxy) {
+    const {
+      intl,
+    } = this.context;
+
+    const {
+      stores,
+    } = this.props;
+
+    let defaultSpellcheckerLanguage = SPELLCHECKER_LOCALES[stores.settings.app.spellcheckerLanguage];
+
+    if (stores.settings.app.spellcheckerLanguage === 'automatic') {
+      defaultSpellcheckerLanguage = intl.formatMessage(globalMessages.spellcheckerAutomaticDetectionShort);
+    }
+
     const spellcheckerLanguage = getSelectOptions({
       locales: SPELLCHECKER_LOCALES,
-      resetToDefaultText: this.context.intl.formatMessage(messages.spellcheckerSystemDefault, { default: SPELLCHECKER_LOCALES[this.props.stores.settings.app.spellcheckerLanguage] }),
+      resetToDefaultText: intl.formatMessage(globalMessages.spellcheckerSystemDefault, { default: defaultSpellcheckerLanguage }),
+      automaticDetectionText: stores.settings.app.spellcheckerLanguage !== 'automatic' ? intl.formatMessage(globalMessages.spellcheckerAutomaticDetection) : '',
     });
 
-    const { intl } = this.context;
     const config = {
       fields: {
         name: {
@@ -160,13 +164,13 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
         isDarkModeEnabled: {
           label: intl.formatMessage(messages.enableDarkMode),
           value: service.isDarkModeEnabled,
-          default: this.props.stores.settings.app.darkMode,
+          default: stores.settings.app.darkMode,
         },
         spellcheckerLanguage: {
-          label: intl.formatMessage(messages.spellcheckerLanguage),
+          label: intl.formatMessage(globalMessages.spellcheckerLanguage),
           value: service.spellcheckerLanguage,
           options: spellcheckerLanguage,
-          disabled: !this.props.stores.settings.app.enableSpellchecking,
+          disabled: !stores.settings.app.enableSpellchecking,
         },
       },
     };
@@ -220,7 +224,7 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
     }
 
     if (proxy.isEnabled) {
-      const serviceProxyConfig = this.props.stores.settings.proxy[service.id] || {};
+      const serviceProxyConfig = stores.settings.proxy[service.id] || {};
 
       Object.assign(config.fields, {
         proxy: {
@@ -326,7 +330,8 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
           onSubmit={d => this.onSubmit(d)}
           onDelete={() => this.deleteService()}
           isProxyFeatureEnabled={proxyFeature.isEnabled}
-          isProxyFeaturePremiumFeature={proxyFeature.isPremium}
+          isProxyPremiumFeature={proxyFeature.isPremium}
+          isSpellcheckerPremiumFeature={spellcheckerFeature.isPremium}
         />
       </ErrorBoundary>
     );
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index f1706a721..97c1fa3b1 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -8,16 +8,16 @@ import SettingsStore from '../../stores/SettingsStore';
 import UserStore from '../../stores/UserStore';
 import Form from '../../lib/Form';
 import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
-import { gaPage } from '../../lib/analytics';
 import { DEFAULT_APP_SETTINGS } from '../../config';
 import { config as spellcheckerConfig } from '../../features/spellchecker';
 
 import { getSelectOptions } from '../../helpers/i18n-helpers';
 
-
 import EditSettingsForm from '../../components/settings/settings/EditSettingsForm';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 
+import globalMessages from '../../i18n/globalMessages';
+
 const messages = defineMessages({
   autoLaunchOnStart: {
     id: 'settings.app.form.autoLaunchOnStart',
@@ -63,10 +63,6 @@ const messages = defineMessages({
     id: 'settings.app.form.enableGPUAcceleration',
     defaultMessage: '!!!Enable GPU Acceleration',
   },
-  spellcheckerLanguage: {
-    id: 'settings.app.form.spellcheckerLanguage',
-    defaultMessage: '!!!Language for spell checking',
-  },
   beta: {
     id: 'settings.app.form.beta',
     defaultMessage: '!!!Include beta versions',
@@ -78,10 +74,6 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
     intl: intlShape,
   };
 
-  componentDidMount() {
-    gaPage('Settings/App');
-  }
-
   onSubmit(settingsData) {
     const { app, settings, user } = this.props.actions;
 
@@ -125,6 +117,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
 
     const spellcheckingLanguages = getSelectOptions({
       locales: SPELLCHECKER_LOCALES,
+      automaticDetectionText: this.context.intl.formatMessage(globalMessages.spellcheckerAutomaticDetection),
     });
 
     const config = {
@@ -166,11 +159,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         },
         enableSpellchecking: {
           label: intl.formatMessage(messages.enableSpellchecking),
-          value: !this.props.stores.user.data.isPremium && spellcheckerConfig.isPremiumFeature ? false : settings.all.app.enableSpellchecking,
-          default: !this.props.stores.user.data.isPremium && spellcheckerConfig.isPremiumFeature ? false : DEFAULT_APP_SETTINGS.enableSpellchecking,
+          value: !this.props.stores.user.data.isPremium && spellcheckerConfig.isPremium ? false : settings.all.app.enableSpellchecking,
+          default: !this.props.stores.user.data.isPremium && spellcheckerConfig.isPremium ? false : DEFAULT_APP_SETTINGS.enableSpellchecking,
         },
         spellcheckerLanguage: {
-          label: intl.formatMessage(messages.spellcheckerLanguage),
+          label: intl.formatMessage(globalMessages.spellcheckerLanguage),
           value: settings.all.app.spellcheckerLanguage,
           options: spellcheckingLanguages,
           default: DEFAULT_APP_SETTINGS.spellcheckerLanguage,
@@ -230,7 +223,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           cacheSize={cacheSize}
           isClearingAllCache={isClearingAllCache}
           onClearAllCache={clearAllCache}
-          isSpellcheckerPremiumFeature={spellcheckerConfig.isPremiumFeature}
+          isSpellcheckerPremiumFeature={spellcheckerConfig.isPremium}
         />
       </ErrorBoundary>
     );
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index 3d35effc5..81f689400 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -9,7 +9,6 @@ import EditUserForm from '../../components/settings/user/EditUserForm';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 
 import { required, email, minLength } from '../../helpers/validation-helpers';
-import { gaPage } from '../../lib/analytics';
 
 const messages = defineMessages({
   firstname: {
@@ -24,23 +23,21 @@ const messages = defineMessages({
     id: 'settings.user.form.email',
     defaultMessage: '!!!Email',
   },
-  accountType: {
-    label: {
-      id: 'settings.user.form.accountType.label',
-      defaultMessage: '!!!Account type',
-    },
-    individual: {
-      id: 'settings.user.form.accountType.individual',
-      defaultMessage: '!!!Individual',
-    },
-    nonProfit: {
-      id: 'settings.user.form.accountType.non-profit',
-      defaultMessage: '!!!Non-Profit',
-    },
-    company: {
-      id: 'settings.user.form.accountType.company',
-      defaultMessage: '!!!Company',
-    },
+  accountTypeLabel: {
+    id: 'settings.user.form.accountType.label',
+    defaultMessage: '!!!Account type',
+  },
+  accountTypeIndividual: {
+    id: 'settings.user.form.accountType.individual',
+    defaultMessage: '!!!Individual',
+  },
+  accountTypeNonProfit: {
+    id: 'settings.user.form.accountType.non-profit',
+    defaultMessage: '!!!Non-Profit',
+  },
+  accountTypeCompany: {
+    id: 'settings.user.form.accountType.company',
+    defaultMessage: '!!!Company',
   },
   currentPassword: {
     id: 'settings.user.form.currentPassword',
@@ -57,10 +54,6 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
     intl: intlShape,
   };
 
-  componentDidMount() {
-    gaPage('Settings/Account/Edit');
-  }
-
   componentWillUnmount() {
     this.props.actions.user.resetStatus();
   }
@@ -99,21 +92,21 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
         accountType: {
           value: user.accountType,
           validators: [required],
-          label: intl.formatMessage(messages.accountType.label),
+          label: intl.formatMessage(messages.accountTypeLabel),
           options: [{
             value: 'individual',
-            label: intl.formatMessage(messages.accountType.individual),
+            label: intl.formatMessage(messages.accountTypeIndividual),
           }, {
             value: 'non-profit',
-            label: intl.formatMessage(messages.accountType.nonProfit),
+            label: intl.formatMessage(messages.accountTypeNonProfit),
           }, {
             value: 'company',
-            label: intl.formatMessage(messages.accountType.company),
+            label: intl.formatMessage(messages.accountTypeCompany),
           }],
         },
         organization: {
-          label: intl.formatMessage(messages.accountType.company),
-          placeholder: intl.formatMessage(messages.accountType.company),
+          label: intl.formatMessage(messages.accountTypeCompany),
+          placeholder: intl.formatMessage(messages.accountTypeCompany),
           value: user.organization,
         },
         oldPassword: {
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js
index cd36610e4..cc36849e8 100644
--- a/src/containers/settings/InviteScreen.js
+++ b/src/containers/settings/InviteScreen.js
@@ -5,13 +5,7 @@ import { inject, observer } from 'mobx-react';
 import Invite from '../../components/auth/Invite';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 
-import { gaPage } from '../../lib/analytics';
-
 export default @inject('stores', 'actions') @observer class InviteScreen extends Component {
-  componentDidMount() {
-    gaPage('Settings/Invite');
-  }
-
   componentWillUnmount() {
     this.props.stores.user.inviteRequest.reset();
   }
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index b3d758c87..eda5ae54c 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -7,7 +7,6 @@ import RecipePreviewsStore from '../../stores/RecipePreviewsStore';
 import RecipeStore from '../../stores/RecipesStore';
 import ServiceStore from '../../stores/ServicesStore';
 import UserStore from '../../stores/UserStore';
-import { gaPage } from '../../lib/analytics';
 
 import RecipesDashboard from '../../components/settings/recipes/RecipesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
@@ -33,20 +32,15 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
   autorunDisposer = null;
 
   componentDidMount() {
-    gaPage('Settings/Recipe Dashboard/Featured');
-
     this.autorunDisposer = autorun(() => {
       const { filter } = this.props.params;
       const { currentFilter } = this.state;
 
       if (filter === 'all' && currentFilter !== 'all') {
-        gaPage('Settings/Recipe Dashboard/All');
         this.setState({ currentFilter: 'all' });
       } else if (filter === 'featured' && currentFilter !== 'featured') {
-        gaPage('Settings/Recipe Dashboard/Featured');
         this.setState({ currentFilter: 'featured' });
       } else if (filter === 'dev' && currentFilter !== 'dev') {
-        gaPage('Settings/Recipe Dashboard/Dev');
         this.setState({ currentFilter: 'dev' });
       }
     });
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js
index b70a5506e..a501bf530 100644
--- a/src/containers/settings/ServicesScreen.js
+++ b/src/containers/settings/ServicesScreen.js
@@ -6,16 +6,11 @@ import { RouterStore } from 'mobx-react-router';
 // import RecipePreviewsStore from '../../stores/RecipePreviewsStore';
 import UserStore from '../../stores/UserStore';
 import ServiceStore from '../../stores/ServicesStore';
-import { gaPage } from '../../lib/analytics';
 
 import ServicesDashboard from '../../components/settings/services/ServicesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 
 export default @inject('stores', 'actions') @observer class ServicesScreen extends Component {
-  componentDidMount() {
-    gaPage('Settings/Service Dashboard');
-  }
-
   componentWillUnmount() {
     this.props.actions.service.resetFilter();
     this.props.actions.service.resetStatus();
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js
index 6d9e0ee77..663b9e2e4 100644
--- a/src/containers/settings/SettingsWindow.js
+++ b/src/containers/settings/SettingsWindow.js
@@ -7,6 +7,7 @@ import ServicesStore from '../../stores/ServicesStore';
 import Layout from '../../components/settings/SettingsLayout';
 import Navigation from '../../components/settings/navigation/SettingsNavigation';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
+import { workspaceStore } from '../../features/workspaces';
 
 export default @inject('stores', 'actions') @observer class SettingsContainer extends Component {
   render() {
@@ -16,6 +17,7 @@ export default @inject('stores', 'actions') @observer class SettingsContainer ex
     const navigation = (
       <Navigation
         serviceCount={stores.services.all.length}
+        workspaceCount={workspaceStore.workspaces.length}
       />
     );
 
diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js
new file mode 100644
index 000000000..c69d5ad08
--- /dev/null
+++ b/src/containers/settings/TeamScreen.js
@@ -0,0 +1,57 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { inject, observer } from 'mobx-react';
+
+import UserStore from '../../stores/UserStore';
+import AppStore from '../../stores/AppStore';
+
+import TeamDashboard from '../../components/settings/team/TeamDashboard';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
+import { WEBSITE } from '../../environment';
+
+export default @inject('stores', 'actions') @observer class TeamScreen extends Component {
+  handleWebsiteLink(route) {
+    const { actions, stores } = this.props;
+
+    const url = `${WEBSITE}${route}?authToken=${stores.user.authToken}&utm_source=app&utm_medium=account_dashboard`;
+    console.log(url);
+
+    actions.app.openExternalUrl({ url });
+  }
+
+  render() {
+    const { user } = this.props.stores;
+
+    const isLoadingUserInfo = user.getUserInfoRequest.isExecuting;
+
+    return (
+      <ErrorBoundary>
+        <TeamDashboard
+          isLoading={isLoadingUserInfo}
+          userInfoRequestFailed={user.getUserInfoRequest.wasExecuted && user.getUserInfoRequest.isError}
+          retryUserInfoRequest={() => this.reloadData()}
+          openTeamManagement={() => this.handleWebsiteLink('/user/team')}
+        />
+      </ErrorBoundary>
+    );
+  }
+}
+
+TeamScreen.wrappedComponent.propTypes = {
+  stores: PropTypes.shape({
+    user: PropTypes.instanceOf(UserStore).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
+  }).isRequired,
+  actions: PropTypes.shape({
+    payment: PropTypes.shape({
+      createDashboardUrl: PropTypes.func.isRequired,
+    }).isRequired,
+    app: PropTypes.shape({
+      openExternalUrl: PropTypes.func.isRequired,
+    }).isRequired,
+    user: PropTypes.shape({
+      update: PropTypes.func.isRequired,
+      delete: PropTypes.func.isRequired,
+    }).isRequired,
+  }).isRequired,
+};
diff --git a/src/containers/subscription/SubscriptionFormScreen.js b/src/containers/subscription/SubscriptionFormScreen.js
index 3eb7b6255..cb67ee7f2 100644
--- a/src/containers/subscription/SubscriptionFormScreen.js
+++ b/src/containers/subscription/SubscriptionFormScreen.js
@@ -43,26 +43,31 @@ export default @inject('stores', 'actions') @observer class SubscriptionFormScre
     });
 
     const hostedPage = await stores.payment.createHostedPageRequest;
-    const url = `file://${__dirname}/../../index.html#/payment/${encodeURIComponent(hostedPage.url)}`;
 
     if (hostedPage.url) {
-      const paymentWindow = new BrowserWindow({
-        parent: remote.getCurrentWindow(),
-        modal: true,
-        title: '🔒 Franz Supporter License',
-        width: 600,
-        height: window.innerHeight - 100,
-        maxWidth: 600,
-        minWidth: 600,
-        webPreferences: {
-          nodeIntegration: true,
-        },
-      });
-      paymentWindow.loadURL(url);
+      if (hostedPage.legacyCheckoutFlow) {
+        const paymentWindow = new BrowserWindow({
+          parent: remote.getCurrentWindow(),
+          modal: true,
+          title: '🔒 Franz Supporter License',
+          width: 600,
+          height: window.innerHeight - 100,
+          maxWidth: 600,
+          minWidth: 600,
+          webPreferences: {
+            nodeIntegration: true,
+          },
+        });
+        paymentWindow.loadURL(`file://${__dirname}/../../index.html#/payment/${encodeURIComponent(hostedPage.url)}`);
 
-      paymentWindow.on('closed', () => {
-        onCloseWindow();
-      });
+        paymentWindow.on('closed', () => {
+          onCloseWindow();
+        });
+      } else {
+        actions.app.openExternalUrl({
+          url: hostedPage.url,
+        });
+      }
     }
   }
 
diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.js
index 83dd83712..9a04c1958 100644
--- a/src/electron/ipc-api/autoUpdate.js
+++ b/src/electron/ipc-api/autoUpdate.js
@@ -4,7 +4,7 @@ import { autoUpdater } from 'electron-updater';
 const debug = require('debug')('Franz:ipcApi:autoUpdate');
 
 export default (params) => {
-  if (process.platform === 'darwin' || process.platform === 'win32') {
+  if (process.platform === 'darwin' || process.platform === 'win32' || process.env.APPIMAGE) {
     ipcMain.on('autoUpdate', (event, args) => {
       try {
         autoUpdater.autoInstallOnAppQuit = false;
@@ -30,9 +30,12 @@ export default (params) => {
       params.mainWindow.webContents.send('autoUpdate', { available: false });
     });
 
-    autoUpdater.on('update-available', () => {
+    autoUpdater.on('update-available', (event) => {
       debug('update-available');
-      params.mainWindow.webContents.send('autoUpdate', { available: true });
+      params.mainWindow.webContents.send('autoUpdate', {
+        version: event.version,
+        available: true,
+      });
     });
 
     autoUpdater.on('download-progress', (progressObj) => {
diff --git a/src/environment.js b/src/environment.js
index e1762129b..ae7a67e4d 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -1,10 +1,22 @@
-import { LIVE_API, DEV_API, LOCAL_API } from './config';
+import isDev from 'electron-is-dev';
 
-export const isDevMode = Boolean(process.execPath.match(/[\\/]electron/));
+import {
+  LIVE_API,
+  DEV_API,
+  LOCAL_API,
+  LOCAL_API_WEBSITE,
+  DEV_API_WEBSITE,
+  LIVE_API_WEBSITE,
+  LIVE_WS_API,
+  LOCAL_WS_API,
+  DEV_WS_API,
+} from './config';
+
+export const isDevMode = isDev;
 export const useLiveAPI = process.env.LIVE_API;
 export const useLocalAPI = process.env.LOCAL_API;
 
-let platform = process.platform;
+let { platform } = process;
 if (process.env.OS_PLATFORM) {
   platform = process.env.OS_PLATFORM;
 }
@@ -17,12 +29,23 @@ export const ctrlKey = isMac ? '⌘' : 'Ctrl';
 export const cmdKey = isMac ? 'Cmd' : 'Ctrl';
 
 let api;
+let wsApi;
+let web;
 if (!isDevMode || (isDevMode && useLiveAPI)) {
   api = LIVE_API;
+  wsApi = LIVE_WS_API;
+  web = LIVE_API_WEBSITE;
 } else if (isDevMode && useLocalAPI) {
   api = LOCAL_API;
+  wsApi = LOCAL_WS_API;
+  web = LOCAL_API_WEBSITE;
 } else {
   api = DEV_API;
+  wsApi = DEV_WS_API;
+  web = DEV_API_WEBSITE;
 }
 
 export const API = api;
+export const API_VERSION = 'v1';
+export const WS_API = wsApi;
+export const WEBSITE = web;
diff --git a/src/features/announcements/actions.js b/src/features/announcements/actions.js
new file mode 100644
index 000000000..bab496314
--- /dev/null
+++ b/src/features/announcements/actions.js
@@ -0,0 +1,10 @@
+import PropTypes from 'prop-types';
+import { createActionsFromDefinitions } from '../../actions/lib/actions';
+
+export const announcementActions = createActionsFromDefinitions({
+  show: {
+    targetVersion: PropTypes.string,
+  },
+}, PropTypes.checkPropTypes);
+
+export default announcementActions;
diff --git a/src/features/announcements/api.js b/src/features/announcements/api.js
new file mode 100644
index 000000000..a581bd8de
--- /dev/null
+++ b/src/features/announcements/api.js
@@ -0,0 +1,33 @@
+import { remote } from 'electron';
+import Request from '../../stores/lib/Request';
+import { API, API_VERSION } from '../../environment';
+
+const debug = require('debug')('Franz:feature:announcements:api');
+
+export const announcementsApi = {
+  async getCurrentVersion() {
+    debug('getting current version of electron app');
+    return Promise.resolve(remote.app.getVersion());
+  },
+
+  async getChangelog(version) {
+    debug('fetching release changelog from Github');
+    const url = `https://api.github.com/repos/meetfranz/franz/releases/tags/v${version}`;
+    const request = await window.fetch(url, { method: 'GET' });
+    if (!request.ok) return null;
+    const data = await request.json();
+    return data.body;
+  },
+
+  async getAnnouncement(version) {
+    debug('fetching release announcement from api');
+    const url = `${API}/${API_VERSION}/announcements/${version}`;
+    const response = await window.fetch(url, { method: 'GET' });
+    if (!response.ok) return null;
+    return response.json();
+  },
+};
+
+export const getCurrentVersionRequest = new Request(announcementsApi, 'getCurrentVersion');
+export const getChangelogRequest = new Request(announcementsApi, 'getChangelog');
+export const getAnnouncementRequest = new Request(announcementsApi, 'getAnnouncement');
diff --git a/src/features/announcements/components/AnnouncementScreen.js b/src/features/announcements/components/AnnouncementScreen.js
new file mode 100644
index 000000000..dfce6cdd5
--- /dev/null
+++ b/src/features/announcements/components/AnnouncementScreen.js
@@ -0,0 +1,286 @@
+import React, { Component } from 'react';
+import marked from 'marked';
+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 { announcementsStore } from '../index';
+import UIStore from '../../../stores/UIStore';
+import { gaEvent } from '../../../lib/analytics';
+
+const renderer = new marked.Renderer();
+
+renderer.link = (href, title, text) => `<a target="_blank" href="${href}" title="${title}">${text}</a>`;
+
+const markedOptions = { sanitize: true, renderer };
+
+const messages = defineMessages({
+  headline: {
+    id: 'feature.announcements.changelog.headline',
+    defaultMessage: '!!!Changes in Franz {version}',
+  },
+});
+
+const smallScreen = '1000px';
+
+const styles = theme => ({
+  container: {
+    background: theme.colorBackground,
+    position: 'absolute',
+    top: 0,
+    zIndex: 140,
+    width: '100%',
+    height: '100%',
+    overflowY: 'auto',
+  },
+  headline: {
+    color: theme.colorHeadline,
+    margin: [25, 0, 40],
+    // 'max-width': 500,
+    'text-align': 'center',
+    'line-height': '1.3em',
+  },
+  announcement: {
+    height: 'auto',
+
+    [`@media(min-width: ${smallScreen})`]: {
+      display: 'flex',
+      flexDirection: 'column',
+      justifyContent: 'center',
+      height: '100vh',
+    },
+  },
+  main: {
+    display: 'flex',
+    flexDirection: 'column',
+    flexGrow: 1,
+    justifyContent: 'center',
+
+    '& h1': {
+      margin: [40, 0, 15],
+      fontSize: 70,
+      color: theme.styleTypes.primary.accent,
+      textAlign: 'center',
+
+      [`@media(min-width: ${smallScreen})`]: {
+        marginTop: 0,
+      },
+    },
+    '& h2': {
+      fontSize: 30,
+      fontWeight: 300,
+      color: theme.colorText,
+      textAlign: 'center',
+      marginBottom: 60,
+    },
+  },
+  mainBody: {
+    display: 'flex',
+    flexDirection: 'column',
+    alignItems: 'center',
+    width: 'calc(100% - 80px)',
+    height: 'auto',
+    margin: '0 auto',
+    [`@media(min-width: ${smallScreen})`]: {
+      flexDirection: 'row',
+      justifyContent: 'center',
+    },
+  },
+  mainImage: {
+    minWidth: 250,
+    maxWidth: 400,
+    margin: '0 auto',
+    marginBottom: 40,
+    '& img': {
+      width: '100%',
+    },
+    [`@media(min-width: ${smallScreen})`]: {
+      margin: 0,
+    },
+  },
+  mainText: {
+    height: 'auto',
+    maxWidth: 600,
+    textAlign: 'center',
+    '& p': {
+      lineHeight: '1.5em',
+    },
+    [`@media(min-width: ${smallScreen})`]: {
+      textAlign: 'left',
+    },
+  },
+  mainCtaButton: {
+    textAlign: 'center',
+    marginTop: 40,
+    [`@media(min-width: ${smallScreen})`]: {
+      textAlign: 'left',
+    },
+  },
+  spotlight: {
+    height: 'auto',
+    background: theme.announcements.spotlight.background,
+    padding: [40, 0],
+    marginTop: 80,
+    [`@media(min-width: ${smallScreen})`]: {
+      marginTop: 0,
+      justifyContent: 'center',
+      alignItems: 'flex-start',
+      display: 'flex',
+      flexDirection: 'row',
+    },
+  },
+  spotlightTopicContainer: {
+    textAlign: 'center',
+    marginBottom: 20,
+
+    [`@media(min-width: ${smallScreen})`]: {
+      marginBottom: 0,
+      minWidth: 250,
+      maxWidth: 330,
+      width: '100%',
+      textAlign: 'right',
+      marginRight: 60,
+    },
+  },
+  spotlightContentContainer: {
+    textAlign: 'center',
+    [`@media(min-width: ${smallScreen})`]: {
+      height: 'auto',
+      maxWidth: 600,
+      paddingRight: 40,
+      textAlign: 'left',
+    },
+    '& p': {
+      lineHeight: '1.5em',
+    },
+  },
+  spotlightTopic: {
+    fontSize: 20,
+    marginBottom: 5,
+    letterSpacing: 0,
+    fontWeight: 100,
+  },
+  spotlightSubject: {
+    fontSize: 20,
+  },
+  changelog: {
+    padding: [0, 60],
+    maxWidth: 700,
+    margin: [100, 'auto'],
+    height: 'auto',
+
+    '& h3': {
+      fontSize: '24px',
+      margin: '1.5em 0 1em 0',
+    },
+    '& li': {
+      marginBottom: '1em',
+      lineHeight: '1.4em',
+    },
+    '& div': {
+      height: 'auto',
+    },
+  },
+});
+
+
+@inject('stores', 'actions') @injectSheet(styles) @observer
+class AnnouncementScreen extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    stores: PropTypes.shape({
+      ui: PropTypes.instanceOf(UIStore).isRequired,
+    }).isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  render() {
+    const { classes, stores } = this.props;
+    const { intl } = this.context;
+    const { changelog, announcement } = announcementsStore;
+    const themeImage = stores.ui.isDarkThemeActive ? 'dark' : 'light';
+    return (
+      <div className={classes.container}>
+        {announcement && (
+          <div className={classes.announcement}>
+            <div className={classes.main}>
+              <h1>{announcement.main.headline}</h1>
+              <h2>{announcement.main.subHeadline}</h2>
+              <div className={classes.mainBody}>
+                <div className={classes.mainImage}>
+                  <img
+                    src={announcement.main.image[themeImage]}
+                    alt=""
+                  />
+                </div>
+                <div className={classes.mainText}>
+                  <div
+                    dangerouslySetInnerHTML={{
+                      __html: marked(announcement.main.text, markedOptions),
+                    }}
+                  />
+                  <div className={classes.mainCtaButton}>
+                    <Button
+                      label={announcement.main.cta.label}
+                      onClick={() => {
+                        const { analytics } = announcement.main.cta;
+                        window.location.href = `#${announcement.main.cta.href}`;
+                        gaEvent(analytics.category, analytics.action, announcement.main.cta.label);
+                      }}
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+            {announcement.spotlight && (
+              <div className={classes.spotlight}>
+                <div className={classes.spotlightTopicContainer}>
+                  <h2 className={classes.spotlightTopic}>{announcement.spotlight.title}</h2>
+                  <h3 className={classes.spotlightSubject}>{announcement.spotlight.subject}</h3>
+                </div>
+                <div className={classes.spotlightContentContainer}>
+                  <div
+                    dangerouslySetInnerHTML={{
+                      __html: marked(announcement.spotlight.text, markedOptions),
+                    }}
+                  />
+                  <div className={classes.mainCtaButton}>
+                    <Button
+                      label={announcement.spotlight.cta.label}
+                      onClick={() => {
+                        const { analytics } = announcement.spotlight.cta;
+                        window.location.href = `#${announcement.spotlight.cta.href}`;
+                        gaEvent(analytics.category, analytics.action, announcement.spotlight.cta.label);
+                      }}
+                    />
+                  </div>
+                </div>
+              </div>
+            )}
+          </div>
+        )}
+        {changelog && (
+          <div className={classes.changelog}>
+            <h1 className={classes.headline}>
+              {intl.formatMessage(messages.headline, {
+                version: announcementsStore.currentVersion,
+              })}
+            </h1>
+            <div
+              dangerouslySetInnerHTML={{
+                __html: marked(changelog, markedOptions),
+              }}
+            />
+          </div>
+        )}
+      </div>
+    );
+  }
+}
+
+export default AnnouncementScreen;
diff --git a/src/features/announcements/index.js b/src/features/announcements/index.js
new file mode 100644
index 000000000..4658b976f
--- /dev/null
+++ b/src/features/announcements/index.js
@@ -0,0 +1,32 @@
+import { reaction } from 'mobx';
+import { AnnouncementsStore } from './store';
+
+const debug = require('debug')('Franz:feature:announcements');
+
+export const GA_CATEGORY_ANNOUNCEMENTS = 'Announcements';
+
+export const announcementsStore = new AnnouncementsStore();
+
+export default function initAnnouncements(stores, actions) {
+  // const { features } = stores;
+
+  // Toggle workspace feature
+  reaction(
+    () => (
+      true
+      // features.features.isAnnouncementsEnabled
+    ),
+    (isEnabled) => {
+      if (isEnabled) {
+        debug('Initializing `announcements` feature');
+        announcementsStore.start(stores, actions);
+      } else if (announcementsStore.isFeatureActive) {
+        debug('Disabling `announcements` feature');
+        announcementsStore.stop();
+      }
+    },
+    {
+      fireImmediately: true,
+    },
+  );
+}
diff --git a/src/features/announcements/store.js b/src/features/announcements/store.js
new file mode 100644
index 000000000..7ecc0e346
--- /dev/null
+++ b/src/features/announcements/store.js
@@ -0,0 +1,144 @@
+import {
+  action,
+  computed,
+  observable,
+  reaction,
+} from 'mobx';
+import semver from 'semver';
+import localStorage from 'mobx-localstorage';
+
+import { FeatureStore } from '../utils/FeatureStore';
+import { GA_CATEGORY_ANNOUNCEMENTS } from '.';
+import { getAnnouncementRequest, getChangelogRequest, getCurrentVersionRequest } from './api';
+import { announcementActions } from './actions';
+import { createActionBindings } from '../utils/ActionBinding';
+import { createReactions } from '../../stores/lib/Reaction';
+import { gaEvent } from '../../lib/analytics';
+
+const LOCAL_STORAGE_KEY = 'announcements';
+
+const debug = require('debug')('Franz:feature:announcements:store');
+
+export class AnnouncementsStore extends FeatureStore {
+  @observable targetVersion = null;
+
+  @observable isAnnouncementVisible = false;
+
+  @observable isFeatureActive = false;
+
+  @computed get changelog() {
+    return getChangelogRequest.result;
+  }
+
+  @computed get announcement() {
+    return getAnnouncementRequest.result;
+  }
+
+  @computed get areNewsAvailable() {
+    const isChangelogAvailable = getChangelogRequest.wasExecuted && !!this.changelog;
+    const isAnnouncementAvailable = getAnnouncementRequest.wasExecuted && !!this.announcement;
+    return isChangelogAvailable || isAnnouncementAvailable;
+  }
+
+  @computed get settings() {
+    return localStorage.getItem(LOCAL_STORAGE_KEY) || {};
+  }
+
+  @computed get lastSeenAnnouncementVersion() {
+    return this.settings.lastSeenAnnouncementVersion || null;
+  }
+
+  @computed get currentVersion() {
+    return getCurrentVersionRequest.result;
+  }
+
+  @computed get isNewUser() {
+    return this.stores.settings.stats.appStarts <= 1;
+  }
+
+  async start(stores, actions) {
+    debug('AnnouncementsStore::start');
+    this.stores = stores;
+    this.actions = actions;
+    getCurrentVersionRequest.execute();
+
+    this._registerActions(createActionBindings([
+      [announcementActions.show, this._showAnnouncement],
+    ]));
+
+    this._reactions = createReactions([
+      this._fetchAnnouncements,
+      this._showAnnouncementToUsersWhoUpdatedApp,
+    ]);
+    this._registerReactions(this._reactions);
+    this.isFeatureActive = true;
+  }
+
+  stop() {
+    super.stop();
+    debug('AnnouncementsStore::stop');
+    this.isFeatureActive = false;
+    this.isAnnouncementVisible = false;
+  }
+
+  // ======= HELPERS ======= //
+
+  _updateSettings = (changes) => {
+    localStorage.setItem(LOCAL_STORAGE_KEY, {
+      ...this.settings,
+      ...changes,
+    });
+  };
+
+  // ======= ACTIONS ======= //
+
+  @action _showAnnouncement = ({ targetVersion } = {}) => {
+    if (!this.areNewsAvailable) return;
+    this.targetVersion = targetVersion || this.currentVersion;
+    this.isAnnouncementVisible = true;
+    this.actions.service.blurActive();
+    this._updateSettings({
+      lastSeenAnnouncementVersion: this.currentVersion,
+    });
+    const dispose = reaction(
+      () => this.stores.services.active,
+      () => {
+        this._hideAnnouncement();
+        dispose();
+      },
+    );
+
+    gaEvent(GA_CATEGORY_ANNOUNCEMENTS, 'show');
+  };
+
+  @action _hideAnnouncement() {
+    this.isAnnouncementVisible = false;
+  }
+
+  // ======= REACTIONS ========
+
+  _showAnnouncementToUsersWhoUpdatedApp = () => {
+    const { announcement, isNewUser } = this;
+    // Check if there is an announcement and on't show announcements to new users
+    if (!announcement || isNewUser) return;
+
+    // Check if the user has already used current version (= has seen the announcement)
+    const { currentVersion, lastSeenAnnouncementVersion } = this;
+    if (semver.gt(currentVersion, lastSeenAnnouncementVersion || '0.0.0')) {
+      debug(`${currentVersion} < ${lastSeenAnnouncementVersion}: announcement is shown`);
+      this._showAnnouncement();
+    }
+  };
+
+  _fetchAnnouncements = () => {
+    const targetVersion = this.targetVersion || this.currentVersion;
+    if (!targetVersion) return;
+    getChangelogRequest.execute(targetVersion);
+    // We only fetch announcements for current / older versions
+    if (targetVersion <= this.currentVersion) {
+      getAnnouncementRequest.execute(targetVersion);
+    } else {
+      getAnnouncementRequest.reset();
+    }
+  }
+}
diff --git a/src/features/basicAuth/Component.js b/src/features/basicAuth/Component.js
index 13395fb40..a8252acb7 100644
--- a/src/features/basicAuth/Component.js
+++ b/src/features/basicAuth/Component.js
@@ -62,6 +62,7 @@ export default @injectSheet(styles) @observer class BasicAuthModal extends Compo
         isOpen={isModalVisible}
         className={classes.modal}
         close={this.cancel.bind(this)}
+        showClose={false}
       >
         <h1>Sign in</h1>
         <p>
diff --git a/src/features/basicAuth/index.js b/src/features/basicAuth/index.js
index 03269582c..89607824b 100644
--- a/src/features/basicAuth/index.js
+++ b/src/features/basicAuth/index.js
@@ -6,7 +6,7 @@ import BasicAuthComponent from './Component';
 const debug = require('debug')('Franz:feature:basicAuth');
 
 const defaultState = {
-  isModalVisible: false,
+  isModalVisible: true,
   service: null,
   authInfo: null,
 };
@@ -15,7 +15,6 @@ export const state = observable(defaultState);
 
 export function resetState() {
   Object.assign(state, defaultState);
-  console.log('reset state', state);
 }
 
 export default function initialize() {
@@ -31,15 +30,6 @@ export default function initialize() {
     state.authInfo = data.authInfo;
     state.isModalVisible = true;
   });
-
-  // autorun(() => {
-  //   // if (state.serviceId) {
-  //   // const service = stores.services.one(state.serviceId);
-  //   // if (service) {
-  //   //   state.service = service;
-  //   // }
-  //   // }
-  // });
 }
 
 export function mainIpcHandler(mainWindow, authInfo) {
diff --git a/src/features/delayApp/Component.js b/src/features/delayApp/Component.js
index ff84510e8..ff0f1f2f8 100644
--- a/src/features/delayApp/Component.js
+++ b/src/features/delayApp/Component.js
@@ -38,7 +38,7 @@ export default @inject('actions') @injectSheet(styles) @observer class DelayApp
 
   state = {
     countdown: config.delayDuration,
-  }
+  };
 
   countdownInterval = null;
 
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
index 28aa50eb2..67f0fc5e6 100644
--- a/src/features/delayApp/index.js
+++ b/src/features/delayApp/index.js
@@ -3,7 +3,7 @@ import moment from 'moment';
 import DelayAppComponent from './Component';
 
 import { DEFAULT_FEATURES_CONFIG } from '../../config';
-import { gaEvent } from '../../lib/analytics';
+import { gaEvent, gaPage } from '../../lib/analytics';
 
 const debug = require('debug')('Franz:feature:delayApp');
 
@@ -28,8 +28,12 @@ export default function init(stores) {
   let shownAfterLaunch = false;
   let timeLastDelay = moment();
 
+  window.franz.features.delayApp = {
+    state,
+  };
+
   reaction(
-    () => stores.features.features.needToWaitToProceed && !stores.user.data.isPremium,
+    () => stores.user.isLoggedIn && stores.features.features.needToWaitToProceed && !stores.user.data.isPremium,
     (isEnabled) => {
       if (isEnabled) {
         debug('Enabling `delayApp` feature');
@@ -50,7 +54,8 @@ export default function init(stores) {
             debug(`App will be delayed for ${config.delayDuration / 1000}s`);
 
             setVisibility(true);
-            gaEvent('delayApp', 'show', 'Delay App Feature');
+            gaPage('/delayApp');
+            gaEvent('DelayApp', 'show', 'Delay App Feature');
 
             timeLastDelay = moment();
             shownAfterLaunch = true;
diff --git a/src/features/settingsWS/actions.js b/src/features/settingsWS/actions.js
new file mode 100755
index 000000000..631670c8a
--- /dev/null
+++ b/src/features/settingsWS/actions.js
@@ -0,0 +1,10 @@
+import PropTypes from 'prop-types';
+import { createActionsFromDefinitions } from '../../actions/lib/actions';
+
+export const settingsWSActions = createActionsFromDefinitions({
+  greet: {
+    name: PropTypes.string.isRequired,
+  },
+}, PropTypes.checkPropTypes);
+
+export default settingsWSActions;
diff --git a/src/features/settingsWS/index.js b/src/features/settingsWS/index.js
new file mode 100755
index 000000000..2064d2973
--- /dev/null
+++ b/src/features/settingsWS/index.js
@@ -0,0 +1,29 @@
+import { reaction } from 'mobx';
+import { SettingsWSStore } from './store';
+
+const debug = require('debug')('Franz:feature:settingsWS');
+
+export const settingsStore = new SettingsWSStore();
+
+export default function initSettingsWebSocket(stores, actions) {
+  const { features } = stores;
+
+  // Toggle SettingsWebSocket feature
+  reaction(
+    () => (
+      features.features.isSettingsWSEnabled
+    ),
+    (isEnabled) => {
+      if (isEnabled) {
+        debug('Initializing `settingsWS` feature');
+        settingsStore.start(stores, actions);
+      } else if (settingsStore) {
+        debug('Disabling `settingsWS` feature');
+        settingsStore.stop();
+      }
+    },
+    {
+      fireImmediately: true,
+    },
+  );
+}
diff --git a/src/features/settingsWS/state.js b/src/features/settingsWS/state.js
new file mode 100755
index 000000000..7b16b2b6e
--- /dev/null
+++ b/src/features/settingsWS/state.js
@@ -0,0 +1,13 @@
+import { observable } from 'mobx';
+
+const defaultState = {
+  isFeatureActive: false,
+};
+
+export const settingsWSState = observable(defaultState);
+
+export function resetState() {
+  Object.assign(settingsWSState, defaultState);
+}
+
+export default settingsWSState;
diff --git a/src/features/settingsWS/store.js b/src/features/settingsWS/store.js
new file mode 100755
index 000000000..167a70d10
--- /dev/null
+++ b/src/features/settingsWS/store.js
@@ -0,0 +1,130 @@
+import { observable } from 'mobx';
+import WebSocket from 'ws';
+import ms from 'ms';
+
+import { FeatureStore } from '../utils/FeatureStore';
+import { createReactions } from '../../stores/lib/Reaction';
+import { WS_API } from '../../environment';
+
+const debug = require('debug')('Franz:feature:settingsWS:store');
+
+export class SettingsWSStore extends FeatureStore {
+  stores = null;
+
+  actions = null;
+
+  ws = null;
+
+  pingTimeout = null;
+
+  reconnectTimeout = null;
+
+  @observable connected = false;
+
+  start(stores, actions) {
+    this.stores = stores;
+    this.actions = actions;
+
+    this._registerReactions(createReactions([
+      this._initialize.bind(this),
+      this._reconnect.bind(this),
+      this._close.bind(this),
+    ]));
+  }
+
+  connect() {
+    try {
+      const wsURL = `${WS_API}/ws/${this.stores.user.data.id}`;
+      debug('Setting up WebSocket to', wsURL);
+
+      this.ws = new WebSocket(wsURL);
+
+      this.ws.on('open', () => {
+        debug('Opened WebSocket');
+        this.send({
+          action: 'authorize',
+          token: this.stores.user.authToken,
+        });
+
+        this.connected = true;
+
+        this.heartbeat();
+      });
+
+      this.ws.on('message', (data) => {
+        const resp = JSON.parse(data);
+        debug('Received message', resp);
+
+        if (resp.id) {
+          this.stores.user.getUserInfoRequest.patch((result) => {
+            if (!result) return;
+
+            debug('Patching user object with new values');
+            Object.assign(result, resp);
+          });
+        }
+      });
+
+      this.ws.on('ping', this.heartbeat.bind(this));
+    } catch (err) {
+      console.err(err);
+    }
+  }
+
+  heartbeat() {
+    debug('Heartbeat');
+    clearTimeout(this.pingTimeout);
+
+    this.pingTimeout = setTimeout(() => {
+      debug('Terminating connection, reconnecting in 35');
+      this.ws.terminate();
+
+      this.connected = false;
+    }, ms('35s'));
+  }
+
+  send(data) {
+    if (this.ws && this.ws.readyState === 1) {
+      this.ws.send(JSON.stringify(data));
+      debug('Sending data', data);
+    } else {
+      debug('WebSocket is not initialized');
+    }
+  }
+
+  // Reactions
+
+  _initialize() {
+    if (this.stores.user.data.id && !this.ws) {
+      this.connect();
+    }
+  }
+
+  _reconnect() {
+    if (!this.connected) {
+      debug('Trying to reconnect in 30s');
+      this.reconnectTimeout = setInterval(() => {
+        debug('Trying to reconnect');
+        this.connect();
+      }, ms('30s'));
+    } else {
+      debug('Clearing reconnect interval');
+      clearInterval(this.reconnectTimeout);
+    }
+  }
+
+  _close() {
+    if (!this.stores.user.isLoggedIn) {
+      debug('Stopping reactions');
+      this._stopReactions();
+
+      if (this.ws) {
+        debug('Terminating connection');
+        this.ws.terminate();
+        this.ws = null;
+      }
+    }
+  }
+}
+
+export default SettingsWSStore;
diff --git a/src/features/shareFranz/Component.js b/src/features/shareFranz/Component.js
new file mode 100644
index 000000000..8d1d595c5
--- /dev/null
+++ b/src/features/shareFranz/Component.js
@@ -0,0 +1,166 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer, inject } from 'mobx-react';
+import injectSheet from 'react-jss';
+import { defineMessages, intlShape } from 'react-intl';
+import { Button } from '@meetfranz/forms';
+import { H1, Icon } from '@meetfranz/ui';
+
+import Modal from '../../components/ui/Modal';
+import { state } from '.';
+import { gaEvent } from '../../lib/analytics';
+import ServicesStore from '../../stores/ServicesStore';
+
+const messages = defineMessages({
+  headline: {
+    id: 'feature.shareFranz.headline',
+    defaultMessage: '!!!Franz is better together!',
+  },
+  text: {
+    id: 'feature.shareFranz.text',
+    defaultMessage: '!!!Tell your friends and colleagues how awesome Franz is and help us to spread the word.',
+  },
+  actionsEmail: {
+    id: 'feature.shareFranz.action.email',
+    defaultMessage: '!!!Share as email',
+  },
+  actionsFacebook: {
+    id: 'feature.shareFranz.action.facebook',
+    defaultMessage: '!!!Share on Facebook',
+  },
+  actionsTwitter: {
+    id: 'feature.shareFranz.action.twitter',
+    defaultMessage: '!!!Share on Twitter',
+  },
+  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',
+  },
+  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',
+  },
+});
+
+const styles = theme => ({
+  modal: {
+    width: '80%',
+    maxWidth: 600,
+    background: theme.styleTypes.primary.accent,
+    textAlign: 'center',
+    color: theme.styleTypes.primary.contrast,
+  },
+  heartContainer: {
+    display: 'flex',
+    justifyContent: 'center',
+    borderRadius: '100%',
+    background: theme.brandDanger,
+    padding: 20,
+    width: 100,
+    height: 100,
+    margin: [-70, 'auto', 30],
+  },
+  heart: {
+    fill: theme.styleTypes.primary.contrast,
+  },
+  headline: {
+    textAlign: 'center',
+    fontSize: 40,
+    marginBottom: 20,
+  },
+  actions: {
+    display: 'flex',
+    justifyContent: 'space-between',
+    marginTop: 30,
+  },
+  cta: {
+    background: theme.styleTypes.primary.contrast,
+    color: theme.styleTypes.primary.accent,
+
+    '& svg': {
+      fill: theme.styleTypes.primary.accent,
+    },
+  },
+});
+
+export default @injectSheet(styles) @inject('stores') @observer class ShareFranzModal extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  close() {
+    state.isModalVisible = false;
+  }
+
+  render() {
+    const { isModalVisible } = state;
+
+    const {
+      classes,
+      stores,
+    } = this.props;
+
+    const serviceCount = stores.services.all.length;
+
+    const { intl } = this.context;
+
+    return (
+      <Modal
+        isOpen={isModalVisible}
+        className={classes.modal}
+        shouldCloseOnOverlayClick
+        close={this.close.bind(this)}
+      >
+        <div className={classes.heartContainer}>
+          <Icon icon="mdiHeart" className={classes.heart} size={4} />
+        </div>
+        <H1 className={classes.headline}>
+          {intl.formatMessage(messages.headline)}
+        </H1>
+        <p>{intl.formatMessage(messages.text)}</p>
+        <div className={classes.actions}>
+          <Button
+            label={intl.formatMessage(messages.actionsEmail)}
+            className={classes.cta}
+            icon="mdiEmail"
+            href={`mailto:?subject=Meet the cool app Franz&body=${intl.formatMessage(messages.shareTextEmail, { count: serviceCount })}}`}
+            target="_blank"
+            onClick={() => {
+              gaEvent('Share Franz', 'share', 'Share via email');
+            }}
+          />
+          <Button
+            label={intl.formatMessage(messages.actionsFacebook)}
+            className={classes.cta}
+            icon="mdiFacebookBox"
+            href="https://www.facebook.com/sharer/sharer.php?u=https://www.meetfranz.com?utm_source=facebook&utm_medium=referral&utm_campaign=share-button"
+            target="_blank"
+            onClick={() => {
+              gaEvent('Share Franz', 'share', 'Share via Facebook');
+            }}
+          />
+          <Button
+            label={intl.formatMessage(messages.actionsTwitter)}
+            className={classes.cta}
+            icon="mdiTwitter"
+            href={`http://twitter.com/intent/tweet?status=${intl.formatMessage(messages.shareTextTwitter, { count: serviceCount })}`}
+            target="_blank"
+            onClick={() => {
+              gaEvent('Share Franz', 'share', 'Share via Twitter');
+            }}
+          />
+        </div>
+      </Modal>
+    );
+  }
+}
+
+ShareFranzModal.wrappedComponent.propTypes = {
+  stores: PropTypes.shape({
+    services: PropTypes.instanceOf(ServicesStore).isRequired,
+  }).isRequired,
+};
diff --git a/src/features/shareFranz/index.js b/src/features/shareFranz/index.js
new file mode 100644
index 000000000..87deacef4
--- /dev/null
+++ b/src/features/shareFranz/index.js
@@ -0,0 +1,52 @@
+import { observable, reaction } from 'mobx';
+import ms from 'ms';
+
+import { state as delayAppState } from '../delayApp';
+import { gaEvent, gaPage } from '../../lib/analytics';
+
+export { default as Component } from './Component';
+
+const debug = require('debug')('Franz:feature:shareFranz');
+
+const defaultState = {
+  isModalVisible: false,
+  lastShown: null,
+};
+
+export const state = observable(defaultState);
+
+export default function initialize(stores) {
+  debug('Initialize shareFranz feature');
+
+  window.franz.features.shareFranz = {
+    state,
+  };
+
+  function showModal() {
+    debug('Showing share window');
+
+    state.isModalVisible = true;
+
+    gaEvent('Share Franz', 'show');
+    gaPage('/share-modal');
+  }
+
+  reaction(
+    () => stores.user.isLoggedIn,
+    () => {
+      setTimeout(() => {
+        if (stores.settings.stats.appStarts % 50 === 0) {
+          if (delayAppState.isDelayAppScreenVisible) {
+            debug('Delaying share modal by 5 minutes');
+            setTimeout(() => showModal(), ms('5m'));
+          } else {
+            showModal();
+          }
+        }
+      }, ms('2s'));
+    },
+    {
+      fireImmediately: true,
+    },
+  );
+}
diff --git a/src/features/spellchecker/index.js b/src/features/spellchecker/index.js
index 63506103c..79a2172b4 100644
--- a/src/features/spellchecker/index.js
+++ b/src/features/spellchecker/index.js
@@ -5,7 +5,7 @@ import { DEFAULT_FEATURES_CONFIG } from '../../config';
 const debug = require('debug')('Franz:feature:spellchecker');
 
 export const config = observable({
-  isPremiumFeature: DEFAULT_FEATURES_CONFIG.isSpellcheckerPremiumFeature,
+  isPremium: DEFAULT_FEATURES_CONFIG.isSpellcheckerPremiumFeature,
 });
 
 export default function init(stores) {
@@ -14,9 +14,9 @@ export default function init(stores) {
   autorun(() => {
     const { isSpellcheckerPremiumFeature } = stores.features.features;
 
-    config.isPremiumFeature = isSpellcheckerPremiumFeature !== undefined ? isSpellcheckerPremiumFeature : DEFAULT_FEATURES_CONFIG.isSpellcheckerPremiumFeature;
+    config.isPremium = isSpellcheckerPremiumFeature !== undefined ? isSpellcheckerPremiumFeature : DEFAULT_FEATURES_CONFIG.isSpellcheckerPremiumFeature;
 
-    if (!stores.user.data.isPremium && config.isPremiumFeature && stores.settings.app.enableSpellchecking) {
+    if (!stores.user.data.isPremium && config.isPremium && stores.settings.app.enableSpellchecking) {
       debug('Override settings.spellcheckerEnabled flag to false');
 
       Object.assign(stores.settings.app, {
diff --git a/src/features/utils/ActionBinding.js b/src/features/utils/ActionBinding.js
new file mode 100644
index 000000000..497aa071b
--- /dev/null
+++ b/src/features/utils/ActionBinding.js
@@ -0,0 +1,29 @@
+export default class ActionBinding {
+  action;
+
+  isActive = false;
+
+  constructor(action) {
+    this.action = action;
+  }
+
+  start() {
+    if (!this.isActive) {
+      const { action } = this;
+      action[0].listen(action[1]);
+      this.isActive = true;
+    }
+  }
+
+  stop() {
+    if (this.isActive) {
+      const { action } = this;
+      action[0].off(action[1]);
+      this.isActive = false;
+    }
+  }
+}
+
+export const createActionBindings = actions => (
+  actions.map(a => new ActionBinding(a))
+);
diff --git a/src/features/utils/FeatureStore.js b/src/features/utils/FeatureStore.js
new file mode 100644
index 000000000..0bc10e176
--- /dev/null
+++ b/src/features/utils/FeatureStore.js
@@ -0,0 +1,40 @@
+export class FeatureStore {
+  _actions = [];
+
+  _reactions = [];
+
+  stop() {
+    this._stopActions();
+    this._stopReactions();
+  }
+
+  // ACTIONS
+
+  _registerActions(actions) {
+    this._actions = actions;
+    this._startActions();
+  }
+
+  _startActions(actions = this._actions) {
+    actions.forEach(a => a.start());
+  }
+
+  _stopActions(actions = this._actions) {
+    actions.forEach(a => a.stop());
+  }
+
+  // REACTIONS
+
+  _registerReactions(reactions) {
+    this._reactions = reactions;
+    this._startReactions();
+  }
+
+  _startReactions(reactions = this._reactions) {
+    reactions.forEach(r => r.start());
+  }
+
+  _stopReactions(reactions = this._reactions) {
+    reactions.forEach(r => r.stop());
+  }
+}
diff --git a/src/features/utils/FeatureStore.test.js b/src/features/utils/FeatureStore.test.js
new file mode 100644
index 000000000..92308bf52
--- /dev/null
+++ b/src/features/utils/FeatureStore.test.js
@@ -0,0 +1,92 @@
+import PropTypes from 'prop-types';
+import { observable } from 'mobx';
+import { FeatureStore } from './FeatureStore';
+import { createActionsFromDefinitions } from '../../actions/lib/actions';
+import { createActionBindings } from './ActionBinding';
+import { createReactions } from '../../stores/lib/Reaction';
+
+const actions = createActionsFromDefinitions({
+  countUp: {},
+}, PropTypes.checkPropTypes);
+
+class TestFeatureStore extends FeatureStore {
+  @observable count = 0;
+
+  reactionInvokedCount = 0;
+
+  start() {
+    this._registerActions(createActionBindings([
+      [actions.countUp, this._countUp],
+    ]));
+    this._registerReactions(createReactions([
+      this._countReaction,
+    ]));
+  }
+
+  _countUp = () => {
+    this.count += 1;
+  };
+
+  _countReaction = () => {
+    this.reactionInvokedCount += 1;
+  }
+}
+
+describe('FeatureStore', () => {
+  let store = null;
+
+  beforeEach(() => {
+    store = new TestFeatureStore();
+  });
+
+  describe('registering actions', () => {
+    it('starts the actions', () => {
+      store.start();
+      actions.countUp();
+      expect(store.count).toBe(1);
+    });
+    it('starts the reactions', () => {
+      store.start();
+      actions.countUp();
+      expect(store.reactionInvokedCount).toBe(1);
+    });
+  });
+
+  describe('stopping the store', () => {
+    it('stops the actions', () => {
+      store.start();
+      actions.countUp();
+      store.stop();
+      actions.countUp();
+      expect(store.count).toBe(1);
+    });
+    it('stops the reactions', () => {
+      store.start();
+      actions.countUp();
+      store.stop();
+      store.count += 1;
+      expect(store.reactionInvokedCount).toBe(1);
+    });
+  });
+
+  describe('toggling the store', () => {
+    it('restarts the actions correctly', () => {
+      store.start();
+      actions.countUp();
+      store.stop();
+      actions.countUp();
+      store.start();
+      actions.countUp();
+      expect(store.count).toBe(2);
+    });
+    it('restarts the reactions correctly', () => {
+      store.start();
+      actions.countUp();
+      store.stop();
+      actions.countUp();
+      store.start();
+      actions.countUp();
+      expect(store.count).toBe(2);
+    });
+  });
+});
diff --git a/src/features/workspaces/actions.js b/src/features/workspaces/actions.js
new file mode 100644
index 000000000..a85f8f57f
--- /dev/null
+++ b/src/features/workspaces/actions.js
@@ -0,0 +1,26 @@
+import PropTypes from 'prop-types';
+import Workspace from './models/Workspace';
+import { createActionsFromDefinitions } from '../../actions/lib/actions';
+
+export const workspaceActions = createActionsFromDefinitions({
+  edit: {
+    workspace: PropTypes.instanceOf(Workspace).isRequired,
+  },
+  create: {
+    name: PropTypes.string.isRequired,
+  },
+  delete: {
+    workspace: PropTypes.instanceOf(Workspace).isRequired,
+  },
+  update: {
+    workspace: PropTypes.instanceOf(Workspace).isRequired,
+  },
+  activate: {
+    workspace: PropTypes.instanceOf(Workspace).isRequired,
+  },
+  deactivate: {},
+  toggleWorkspaceDrawer: {},
+  openWorkspaceSettings: {},
+}, PropTypes.checkPropTypes);
+
+export default workspaceActions;
diff --git a/src/features/workspaces/api.js b/src/features/workspaces/api.js
new file mode 100644
index 000000000..0ec20c9ea
--- /dev/null
+++ b/src/features/workspaces/api.js
@@ -0,0 +1,66 @@
+import { pick } from 'lodash';
+import { sendAuthRequest } from '../../api/utils/auth';
+import { API, API_VERSION } from '../../environment';
+import Request from '../../stores/lib/Request';
+import Workspace from './models/Workspace';
+
+const debug = require('debug')('Franz:feature:workspaces:api');
+
+export const workspaceApi = {
+  getUserWorkspaces: async () => {
+    const url = `${API}/${API_VERSION}/workspace`;
+    debug('getUserWorkspaces GET', url);
+    const result = await sendAuthRequest(url, { method: 'GET' });
+    debug('getUserWorkspaces RESULT', result);
+    if (!result.ok) throw result;
+    const workspaces = await result.json();
+    return workspaces.map(data => new Workspace(data));
+  },
+
+  createWorkspace: async (name) => {
+    const url = `${API}/${API_VERSION}/workspace`;
+    const options = {
+      method: 'POST',
+      body: JSON.stringify({ name }),
+    };
+    debug('createWorkspace POST', url, options);
+    const result = await sendAuthRequest(url, options);
+    debug('createWorkspace RESULT', result);
+    if (!result.ok) throw result;
+    return new Workspace(await result.json());
+  },
+
+  deleteWorkspace: async (workspace) => {
+    const url = `${API}/${API_VERSION}/workspace/${workspace.id}`;
+    debug('deleteWorkspace DELETE', url);
+    const result = await sendAuthRequest(url, { method: 'DELETE' });
+    debug('deleteWorkspace RESULT', result);
+    if (!result.ok) throw result;
+    return true;
+  },
+
+  updateWorkspace: async (workspace) => {
+    const url = `${API}/${API_VERSION}/workspace/${workspace.id}`;
+    const options = {
+      method: 'PUT',
+      body: JSON.stringify(pick(workspace, ['name', 'services'])),
+    };
+    debug('updateWorkspace UPDATE', url, options);
+    const result = await sendAuthRequest(url, options);
+    debug('updateWorkspace RESULT', result);
+    if (!result.ok) throw result;
+    return new Workspace(await result.json());
+  },
+};
+
+export const getUserWorkspacesRequest = new Request(workspaceApi, 'getUserWorkspaces');
+export const createWorkspaceRequest = new Request(workspaceApi, 'createWorkspace');
+export const deleteWorkspaceRequest = new Request(workspaceApi, 'deleteWorkspace');
+export const updateWorkspaceRequest = new Request(workspaceApi, 'updateWorkspace');
+
+export const resetApiRequests = () => {
+  getUserWorkspacesRequest.reset();
+  createWorkspaceRequest.reset();
+  deleteWorkspaceRequest.reset();
+  updateWorkspaceRequest.reset();
+};
diff --git a/src/features/workspaces/components/CreateWorkspaceForm.js b/src/features/workspaces/components/CreateWorkspaceForm.js
new file mode 100644
index 000000000..cddbb2b04
--- /dev/null
+++ b/src/features/workspaces/components/CreateWorkspaceForm.js
@@ -0,0 +1,100 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import { Input, Button } from '@meetfranz/forms';
+import injectSheet from 'react-jss';
+import Form from '../../../lib/Form';
+import { required } from '../../../helpers/validation-helpers';
+import { gaEvent } from '../../../lib/analytics';
+import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../index';
+
+const messages = defineMessages({
+  submitButton: {
+    id: 'settings.workspace.add.form.submitButton',
+    defaultMessage: '!!!Create workspace',
+  },
+  name: {
+    id: 'settings.workspace.add.form.name',
+    defaultMessage: '!!!Name',
+  },
+});
+
+const styles = () => ({
+  form: {
+    display: 'flex',
+  },
+  input: {
+    flexGrow: 1,
+    marginRight: '10px',
+  },
+  submitButton: {
+    height: 'inherit',
+  },
+});
+
+@injectSheet(styles) @observer
+class CreateWorkspaceForm extends Component {
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    isSubmitting: PropTypes.bool.isRequired,
+    onSubmit: PropTypes.func.isRequired,
+  };
+
+  form = (() => {
+    const { intl } = this.context;
+    return new Form({
+      fields: {
+        name: {
+          label: intl.formatMessage(messages.name),
+          placeholder: intl.formatMessage(messages.name),
+          value: '',
+          validators: [required],
+        },
+      },
+    });
+  })();
+
+  submitForm() {
+    const { form } = this;
+    form.submit({
+      onSuccess: async (f) => {
+        const { onSubmit } = this.props;
+        const values = f.values();
+        onSubmit(values);
+        gaEvent(GA_CATEGORY_WORKSPACES, 'create', values.name);
+      },
+    });
+  }
+
+  render() {
+    const { intl } = this.context;
+    const { classes, isSubmitting } = this.props;
+    const { form } = this;
+    return (
+      <div className={classes.form}>
+        <Input
+          className={classes.input}
+          {...form.$('name').bind()}
+          showLabel={false}
+          onEnterKey={this.submitForm.bind(this, form)}
+          focus={workspaceStore.isUserAllowedToUseFeature}
+        />
+        <Button
+          className={classes.submitButton}
+          type="submit"
+          label={intl.formatMessage(messages.submitButton)}
+          onClick={this.submitForm.bind(this, form)}
+          busy={isSubmitting}
+          buttonType={isSubmitting ? 'secondary' : 'primary'}
+        />
+      </div>
+    );
+  }
+}
+
+export default CreateWorkspaceForm;
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js
new file mode 100644
index 000000000..e602ebd5a
--- /dev/null
+++ b/src/features/workspaces/components/EditWorkspaceForm.js
@@ -0,0 +1,212 @@
+import React, { Component, Fragment } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import { Link } from 'react-router';
+import { Input, Button } from '@meetfranz/forms';
+import injectSheet from 'react-jss';
+
+import Workspace from '../models/Workspace';
+import Service from '../../../models/Service';
+import Form from '../../../lib/Form';
+import { required } from '../../../helpers/validation-helpers';
+import WorkspaceServiceListItem from './WorkspaceServiceListItem';
+import Request from '../../../stores/lib/Request';
+import { gaEvent } from '../../../lib/analytics';
+import { GA_CATEGORY_WORKSPACES } from '../index';
+
+const messages = defineMessages({
+  buttonDelete: {
+    id: 'settings.workspace.form.buttonDelete',
+    defaultMessage: '!!!Delete workspace',
+  },
+  buttonSave: {
+    id: 'settings.workspace.form.buttonSave',
+    defaultMessage: '!!!Save workspace',
+  },
+  name: {
+    id: 'settings.workspace.form.name',
+    defaultMessage: '!!!Name',
+  },
+  yourWorkspaces: {
+    id: 'settings.workspace.form.yourWorkspaces',
+    defaultMessage: '!!!Your workspaces',
+  },
+  servicesInWorkspaceHeadline: {
+    id: 'settings.workspace.form.servicesInWorkspaceHeadline',
+    defaultMessage: '!!!Services in this Workspace',
+  },
+  noServicesAdded: {
+    id: 'settings.services.noServicesAdded',
+    defaultMessage: '!!!You haven\'t added any services yet.',
+  },
+  discoverServices: {
+    id: 'settings.services.discoverServices',
+    defaultMessage: '!!!Discover services',
+  },
+});
+
+const styles = () => ({
+  nameInput: {
+    height: 'auto',
+  },
+  serviceList: {
+    height: 'auto',
+  },
+});
+
+@injectSheet(styles) @observer
+class EditWorkspaceForm extends Component {
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    onDelete: PropTypes.func.isRequired,
+    onSave: PropTypes.func.isRequired,
+    services: PropTypes.arrayOf(PropTypes.instanceOf(Service)).isRequired,
+    workspace: PropTypes.instanceOf(Workspace).isRequired,
+    updateWorkspaceRequest: PropTypes.instanceOf(Request).isRequired,
+    deleteWorkspaceRequest: PropTypes.instanceOf(Request).isRequired,
+  };
+
+  form = this.prepareWorkspaceForm(this.props.workspace);
+
+  componentWillReceiveProps(nextProps) {
+    const { workspace } = this.props;
+    if (workspace.id !== nextProps.workspace.id) {
+      this.form = this.prepareWorkspaceForm(nextProps.workspace);
+    }
+  }
+
+  prepareWorkspaceForm(workspace) {
+    const { intl } = this.context;
+    return new Form({
+      fields: {
+        name: {
+          label: intl.formatMessage(messages.name),
+          placeholder: intl.formatMessage(messages.name),
+          value: workspace.name,
+          validators: [required],
+        },
+        services: {
+          value: workspace.services.slice(),
+        },
+      },
+    });
+  }
+
+  save(form) {
+    form.submit({
+      onSuccess: async (f) => {
+        const { onSave } = this.props;
+        const values = f.values();
+        onSave(values);
+        gaEvent(GA_CATEGORY_WORKSPACES, 'save');
+      },
+      onError: async () => {},
+    });
+  }
+
+  delete() {
+    const { onDelete } = this.props;
+    onDelete();
+    gaEvent(GA_CATEGORY_WORKSPACES, 'delete');
+  }
+
+  toggleService(service) {
+    const servicesField = this.form.$('services');
+    const serviceIds = servicesField.value;
+    if (serviceIds.includes(service.id)) {
+      serviceIds.splice(serviceIds.indexOf(service.id), 1);
+    } else {
+      serviceIds.push(service.id);
+    }
+    servicesField.set(serviceIds);
+  }
+
+  render() {
+    const { intl } = this.context;
+    const {
+      classes,
+      workspace,
+      services,
+      deleteWorkspaceRequest,
+      updateWorkspaceRequest,
+    } = this.props;
+    const { form } = this;
+    const workspaceServices = form.$('services').value;
+    const isDeleting = deleteWorkspaceRequest.isExecuting;
+    const isSaving = updateWorkspaceRequest.isExecuting;
+    return (
+      <div className="settings__main">
+        <div className="settings__header">
+          <span className="settings__header-item">
+            <Link to="/settings/workspaces">
+              {intl.formatMessage(messages.yourWorkspaces)}
+            </Link>
+          </span>
+          <span className="separator" />
+          <span className="settings__header-item">
+            {workspace.name}
+          </span>
+        </div>
+        <div className="settings__body">
+          <div className={classes.nameInput}>
+            <Input {...form.$('name').bind()} />
+          </div>
+          <h2>{intl.formatMessage(messages.servicesInWorkspaceHeadline)}</h2>
+          <div className={classes.serviceList}>
+            {services.length === 0 ? (
+              <div className="align-middle settings__empty-state">
+                {/* ===== Empty state ===== */}
+                <p className="settings__empty-text">
+                  <span className="emoji">
+                    <img src="./assets/images/emoji/sad.png" alt="" />
+                  </span>
+                  {intl.formatMessage(messages.noServicesAdded)}
+                </p>
+                <Link to="/settings/recipes" className="button">{intl.formatMessage(messages.discoverServices)}</Link>
+              </div>
+            ) : (
+              <Fragment>
+                {services.map(s => (
+                  <WorkspaceServiceListItem
+                    key={s.id}
+                    service={s}
+                    isInWorkspace={workspaceServices.includes(s.id)}
+                    onToggle={() => this.toggleService(s)}
+                  />
+                ))}
+              </Fragment>
+            )}
+          </div>
+        </div>
+        <div className="settings__controls">
+          {/* ===== Delete Button ===== */}
+          <Button
+            label={intl.formatMessage(messages.buttonDelete)}
+            loaded={false}
+            busy={isDeleting}
+            buttonType={isDeleting ? 'secondary' : 'danger'}
+            className="settings__delete-button"
+            disabled={isDeleting}
+            onClick={this.delete.bind(this)}
+          />
+          {/* ===== Save Button ===== */}
+          <Button
+            type="submit"
+            label={intl.formatMessage(messages.buttonSave)}
+            busy={isSaving}
+            buttonType={isSaving ? 'secondary' : 'primary'}
+            onClick={this.save.bind(this, form)}
+            disabled={isSaving}
+          />
+        </div>
+      </div>
+    );
+  }
+}
+
+export default EditWorkspaceForm;
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js
new file mode 100644
index 000000000..684e50dd0
--- /dev/null
+++ b/src/features/workspaces/components/WorkspaceDrawer.js
@@ -0,0 +1,246 @@
+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 ReactTooltip from 'react-tooltip';
+
+import WorkspaceDrawerItem from './WorkspaceDrawerItem';
+import { workspaceActions } from '../actions';
+import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../index';
+import { gaEvent } from '../../../lib/analytics';
+
+const messages = defineMessages({
+  headline: {
+    id: 'workspaceDrawer.headline',
+    defaultMessage: '!!!Workspaces',
+  },
+  allServices: {
+    id: 'workspaceDrawer.allServices',
+    defaultMessage: '!!!All services',
+  },
+  workspacesSettingsTooltip: {
+    id: 'workspaceDrawer.workspacesSettingsTooltip',
+    defaultMessage: '!!!Workspaces settings',
+  },
+  workspaceFeatureInfo: {
+    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 => ({
+  drawer: {
+    background: theme.workspaces.drawer.background,
+    width: `${theme.workspaces.drawer.width}px`,
+  },
+  headline: {
+    fontSize: '24px',
+    marginTop: '38px',
+    marginBottom: '25px',
+    marginLeft: theme.workspaces.drawer.padding,
+  },
+  headlineProBadge: {
+    marginRight: 15,
+  },
+  workspacesSettingsButton: {
+    float: 'right',
+    marginRight: theme.workspaces.drawer.padding,
+    marginTop: '2px',
+  },
+  workspacesSettingsButtonIcon: {
+    fill: theme.workspaces.drawer.buttons.color,
+    '&:hover': {
+      fill: theme.workspaces.drawer.buttons.hoverColor,
+    },
+  },
+  workspaces: {
+    height: '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,
+    marginTop: 40,
+    textAlign: 'center',
+    '& > svg': {
+      fill: theme.workspaces.drawer.buttons.color,
+    },
+    '& > span': {
+      fontSize: '13px',
+      marginLeft: 10,
+      position: 'relative',
+      top: -3,
+    },
+    '&:hover': {
+      color: theme.workspaces.drawer.buttons.hoverColor,
+      '& > svg': {
+        fill: theme.workspaces.drawer.buttons.hoverColor,
+      },
+    },
+  },
+});
+
+@injectSheet(styles) @observer
+class WorkspaceDrawer extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    getServicesForWorkspace: PropTypes.func.isRequired,
+    onUpgradeAccountClick: PropTypes.func.isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  componentDidMount() {
+    ReactTooltip.rebuild();
+  }
+
+  render() {
+    const {
+      classes,
+      getServicesForWorkspace,
+      onUpgradeAccountClick,
+    } = this.props;
+    const { intl } = this.context;
+    const {
+      activeWorkspace,
+      isSwitchingWorkspace,
+      nextWorkspace,
+      workspaces,
+    } = workspaceStore;
+    const actualWorkspace = isSwitchingWorkspace ? nextWorkspace : activeWorkspace;
+    return (
+      <div className={classes.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}
+            onClick={() => {
+              workspaceActions.openWorkspaceSettings();
+              gaEvent(GA_CATEGORY_WORKSPACES, 'settings', 'drawerHeadline');
+            }}
+            data-tip={`${intl.formatMessage(messages.workspacesSettingsTooltip)}`}
+          >
+            <Icon
+              icon="mdiSettings"
+              size={1.5}
+              className={classes.workspacesSettingsButtonIcon}
+            />
+          </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();
+                  gaEvent('User', 'upgrade', 'workspaceDrawer');
+                }}
+              />
+            ) : (
+              <Button
+                className={classes.premiumCtaButton}
+                buttonType="primary"
+                label={intl.formatMessage(messages.premiumCtaButtonLabel)}
+                icon="mdiPlusBox"
+                onClick={() => {
+                  workspaceActions.openWorkspaceSettings();
+                  gaEvent(GA_CATEGORY_WORKSPACES, 'add', 'drawerPremiumCta');
+                }}
+              />
+            )}
+          </div>
+        ) : (
+          <div className={classes.workspaces}>
+            <WorkspaceDrawerItem
+              name={intl.formatMessage(messages.allServices)}
+              onClick={() => {
+                workspaceActions.deactivate();
+                workspaceActions.toggleWorkspaceDrawer();
+                gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'drawer');
+              }}
+              services={getServicesForWorkspace(null)}
+              isActive={actualWorkspace == null}
+            />
+            {workspaces.map(workspace => (
+              <WorkspaceDrawerItem
+                key={workspace.id}
+                name={workspace.name}
+                isActive={actualWorkspace === workspace}
+                onClick={() => {
+                  if (actualWorkspace === workspace) return;
+                  workspaceActions.activate({ workspace });
+                  workspaceActions.toggleWorkspaceDrawer();
+                  gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'drawer');
+                }}
+                onContextMenuEditClick={() => workspaceActions.edit({ workspace })}
+                services={getServicesForWorkspace(workspace)}
+              />
+            ))}
+            <div
+              className={classes.addNewWorkspaceLabel}
+              onClick={() => {
+                workspaceActions.openWorkspaceSettings();
+                gaEvent(GA_CATEGORY_WORKSPACES, 'add', 'drawerAddLabel');
+              }}
+            >
+              <Icon
+                icon="mdiPlusBox"
+                size={1}
+                className={classes.workspacesSettingsButtonIcon}
+              />
+              <span>
+                {intl.formatMessage(messages.addNewWorkspaceLabel)}
+              </span>
+            </div>
+          </div>
+        )}
+        <ReactTooltip place="right" type="dark" effect="solid" />
+      </div>
+    );
+  }
+}
+
+export default WorkspaceDrawer;
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.js b/src/features/workspaces/components/WorkspaceDrawerItem.js
new file mode 100644
index 000000000..59a2144d3
--- /dev/null
+++ b/src/features/workspaces/components/WorkspaceDrawerItem.js
@@ -0,0 +1,137 @@
+import { remote } from 'electron';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import injectSheet from 'react-jss';
+import classnames from 'classnames';
+import { defineMessages, intlShape } from 'react-intl';
+
+const { Menu } = remote;
+
+const messages = defineMessages({
+  noServicesAddedYet: {
+    id: 'workspaceDrawer.item.noServicesAddedYet',
+    defaultMessage: '!!!No services added yet',
+  },
+  contextMenuEdit: {
+    id: 'workspaceDrawer.item.contextMenuEdit',
+    defaultMessage: '!!!edit',
+  },
+});
+
+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',
+    '&:first-child': {
+      borderTop: `1px solid ${theme.workspaces.drawer.listItem.border}`,
+    },
+    '&:hover': {
+      backgroundColor: theme.workspaces.drawer.listItem.hoverBackground,
+    },
+  },
+  isActiveItem: {
+    backgroundColor: theme.workspaces.drawer.listItem.activeBackground,
+    '&:hover': {
+      backgroundColor: theme.workspaces.drawer.listItem.activeBackground,
+    },
+  },
+  name: {
+    marginTop: '4px',
+    color: theme.workspaces.drawer.listItem.name.color,
+  },
+  activeName: {
+    color: theme.workspaces.drawer.listItem.name.activeColor,
+  },
+  services: {
+    display: 'block',
+    fontSize: '11px',
+    marginTop: '5px',
+    color: theme.workspaces.drawer.listItem.services.color,
+    whiteSpace: 'nowrap',
+    textOverflow: 'ellipsis',
+    overflow: 'hidden',
+    lineHeight: '15px',
+  },
+  activeServices: {
+    color: theme.workspaces.drawer.listItem.services.active,
+  },
+});
+
+@injectSheet(styles) @observer
+class WorkspaceDrawerItem extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    isActive: PropTypes.bool.isRequired,
+    name: PropTypes.string.isRequired,
+    onClick: PropTypes.func.isRequired,
+    services: PropTypes.arrayOf(PropTypes.string).isRequired,
+    onContextMenuEditClick: PropTypes.func,
+  };
+
+  static defaultProps = {
+    onContextMenuEditClick: null,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  render() {
+    const {
+      classes,
+      isActive,
+      name,
+      onClick,
+      onContextMenuEditClick,
+      services,
+    } = this.props;
+    const { intl } = this.context;
+
+    const contextMenuTemplate = [{
+      label: name,
+      enabled: false,
+    }, {
+      type: 'separator',
+    }, {
+      label: intl.formatMessage(messages.contextMenuEdit),
+      click: onContextMenuEditClick,
+    }];
+
+    const contextMenu = Menu.buildFromTemplate(contextMenuTemplate);
+
+    return (
+      <div
+        className={classnames([
+          classes.item,
+          isActive ? classes.isActiveItem : null,
+        ])}
+        onClick={onClick}
+        onContextMenu={() => (
+          onContextMenuEditClick && contextMenu.popup(remote.getCurrentWindow())
+        )}
+      >
+        <span
+          className={classnames([
+            classes.name,
+            isActive ? classes.activeName : null,
+          ])}
+        >
+          {name}
+        </span>
+        <span
+          className={classnames([
+            classes.services,
+            isActive ? classes.activeServices : null,
+          ])}
+        >
+          {services.length ? services.join(', ') : intl.formatMessage(messages.noServicesAddedYet)}
+        </span>
+      </div>
+    );
+  }
+}
+
+export default WorkspaceDrawerItem;
diff --git a/src/features/workspaces/components/WorkspaceItem.js b/src/features/workspaces/components/WorkspaceItem.js
new file mode 100644
index 000000000..cc4b1a3ba
--- /dev/null
+++ b/src/features/workspaces/components/WorkspaceItem.js
@@ -0,0 +1,45 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { intlShape } from 'react-intl';
+import { observer } from 'mobx-react';
+import injectSheet from 'react-jss';
+
+import Workspace from '../models/Workspace';
+
+const styles = theme => ({
+  row: {
+    height: theme.workspaces.settings.listItems.height,
+    borderBottom: `1px solid ${theme.workspaces.settings.listItems.borderColor}`,
+    '&:hover': {
+      background: theme.workspaces.settings.listItems.hoverBgColor,
+    },
+  },
+  columnName: {},
+});
+
+@injectSheet(styles) @observer
+class WorkspaceItem extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    workspace: PropTypes.instanceOf(Workspace).isRequired,
+    onItemClick: PropTypes.func.isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  render() {
+    const { classes, workspace, onItemClick } = this.props;
+
+    return (
+      <tr className={classes.row}>
+        <td onClick={() => onItemClick(workspace)}>
+          {workspace.name}
+        </td>
+      </tr>
+    );
+  }
+}
+
+export default WorkspaceItem;
diff --git a/src/features/workspaces/components/WorkspaceServiceListItem.js b/src/features/workspaces/components/WorkspaceServiceListItem.js
new file mode 100644
index 000000000..e05b21440
--- /dev/null
+++ b/src/features/workspaces/components/WorkspaceServiceListItem.js
@@ -0,0 +1,75 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import injectSheet from 'react-jss';
+import classnames from 'classnames';
+import { Toggle } from '@meetfranz/forms';
+
+import Service from '../../../models/Service';
+import ServiceIcon from '../../../components/ui/ServiceIcon';
+
+const styles = theme => ({
+  listItem: {
+    height: theme.workspaces.settings.listItems.height,
+    borderBottom: `1px solid ${theme.workspaces.settings.listItems.borderColor}`,
+    display: 'flex',
+    alignItems: 'center',
+  },
+  serviceIcon: {
+    padding: theme.workspaces.settings.listItems.padding,
+  },
+  toggle: {
+    height: 'auto',
+    margin: 0,
+  },
+  label: {
+    padding: theme.workspaces.settings.listItems.padding,
+    flexGrow: 1,
+  },
+  disabledLabel: {
+    color: theme.workspaces.settings.listItems.disabled.color,
+  },
+});
+
+@injectSheet(styles) @observer
+class WorkspaceServiceListItem extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    isInWorkspace: PropTypes.bool.isRequired,
+    onToggle: PropTypes.func.isRequired,
+    service: PropTypes.instanceOf(Service).isRequired,
+  };
+
+  render() {
+    const {
+      classes,
+      isInWorkspace,
+      onToggle,
+      service,
+    } = this.props;
+
+    return (
+      <div className={classes.listItem}>
+        <ServiceIcon
+          className={classes.serviceIcon}
+          service={service}
+        />
+        <span
+          className={classnames([
+            classes.label,
+            service.isEnabled ? null : classes.disabledLabel,
+          ])}
+        >
+          {service.name}
+        </span>
+        <Toggle
+          className={classes.toggle}
+          checked={isInWorkspace}
+          onChange={onToggle}
+        />
+      </div>
+    );
+  }
+}
+
+export default WorkspaceServiceListItem;
diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
new file mode 100644
index 000000000..c4a800a7b
--- /dev/null
+++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
@@ -0,0 +1,91 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import injectSheet from 'react-jss';
+import classnames from 'classnames';
+import { Loader } from '@meetfranz/ui';
+import { defineMessages, intlShape } from 'react-intl';
+
+import { workspaceStore } from '../index';
+
+const messages = defineMessages({
+  switchingTo: {
+    id: 'workspaces.switchingIndicator.switchingTo',
+    defaultMessage: '!!!Switching to',
+  },
+});
+
+const styles = theme => ({
+  wrapper: {
+    display: 'flex',
+    alignItems: 'flex-start',
+    position: 'absolute',
+    transition: 'width 0.5s ease',
+    width: '100%',
+    marginTop: '20px',
+  },
+  wrapperWhenDrawerIsOpen: {
+    width: `calc(100% - ${theme.workspaces.drawer.width}px)`,
+  },
+  component: {
+    background: 'rgba(20, 20, 20, 0.4)',
+    padding: '10px 20px',
+    display: 'flex',
+    width: 'auto',
+    height: 'auto',
+    margin: [0, 'auto'],
+    borderRadius: 6,
+    alignItems: 'center',
+    zIndex: 200,
+  },
+  spinner: {
+    width: 40,
+    height: 40,
+    marginRight: 10,
+  },
+  message: {
+    fontSize: 16,
+    whiteSpace: 'nowrap',
+    color: theme.colorAppLoaderSpinner,
+  },
+});
+
+@injectSheet(styles) @observer
+class WorkspaceSwitchingIndicator extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    theme: PropTypes.object.isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  render() {
+    const { classes, theme } = this.props;
+    const { intl } = this.context;
+    const { isSwitchingWorkspace, isWorkspaceDrawerOpen, nextWorkspace } = workspaceStore;
+    if (!isSwitchingWorkspace) return null;
+    const nextWorkspaceName = nextWorkspace ? nextWorkspace.name : 'All services';
+    return (
+      <div
+        className={classnames([
+          classes.wrapper,
+          isWorkspaceDrawerOpen ? classes.wrapperWhenDrawerIsOpen : null,
+        ])}
+      >
+        <div className={classes.component}>
+          <Loader
+            className={classes.spinner}
+            color={theme.workspaces.switchingIndicator.spinnerColor}
+          />
+          <p className={classes.message}>
+            {`${intl.formatMessage(messages.switchingTo)} ${nextWorkspaceName}`}
+          </p>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default WorkspaceSwitchingIndicator;
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
new file mode 100644
index 000000000..09c98ab8c
--- /dev/null
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -0,0 +1,209 @@
+import React, { Component, Fragment } from 'react';
+import PropTypes from 'prop-types';
+import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import injectSheet from 'react-jss';
+import { Infobox } from '@meetfranz/ui';
+
+import Loader from '../../../components/ui/Loader';
+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 PremiumFeatureContainer from '../../../components/ui/PremiumFeatureContainer';
+
+const messages = defineMessages({
+  headline: {
+    id: 'settings.workspaces.headline',
+    defaultMessage: '!!!Your workspaces',
+  },
+  noServicesAdded: {
+    id: 'settings.workspaces.noWorkspacesAdded',
+    defaultMessage: '!!!You haven\'t added any workspaces yet.',
+  },
+  workspacesRequestFailed: {
+    id: 'settings.workspaces.workspacesRequestFailed',
+    defaultMessage: '!!!Could not load your workspaces',
+  },
+  tryReloadWorkspaces: {
+    id: 'settings.workspaces.tryReloadWorkspaces',
+    defaultMessage: '!!!Try again',
+  },
+  updatedInfo: {
+    id: 'settings.workspaces.updatedInfo',
+    defaultMessage: '!!!Your changes have been saved',
+  },
+  deletedInfo: {
+    id: 'settings.workspaces.deletedInfo',
+    defaultMessage: '!!!Workspace has been deleted',
+  },
+  workspaceFeatureInfo: {
+    id: 'settings.workspaces.workspaceFeatureInfo',
+    defaultMessage: '!!!Info about workspace feature',
+  },
+  workspaceFeatureHeadline: {
+    id: 'settings.workspaces.workspaceFeatureHeadline',
+    defaultMessage: '!!!Less is More: Introducing Franz Workspaces',
+  },
+});
+
+const styles = theme => ({
+  table: {
+    width: '100%',
+    '& td': {
+      padding: '10px',
+    },
+  },
+  createForm: {
+    height: 'auto',
+  },
+  appear: {
+    height: 'auto',
+  },
+  premiumAnnouncement: {
+    padding: '20px',
+    backgroundColor: '#3498db',
+    marginLeft: '-20px',
+    marginBottom: '20px',
+    height: 'auto',
+    color: 'white',
+    borderRadius: theme.borderRadius,
+  },
+});
+
+@injectSheet(styles) @observer
+class WorkspacesDashboard extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    getUserWorkspacesRequest: PropTypes.instanceOf(Request).isRequired,
+    createWorkspaceRequest: PropTypes.instanceOf(Request).isRequired,
+    deleteWorkspaceRequest: PropTypes.instanceOf(Request).isRequired,
+    updateWorkspaceRequest: PropTypes.instanceOf(Request).isRequired,
+    onCreateWorkspaceSubmit: PropTypes.func.isRequired,
+    onWorkspaceClick: PropTypes.func.isRequired,
+    workspaces: MobxPropTypes.arrayOrObservableArray.isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  render() {
+    const {
+      classes,
+      getUserWorkspacesRequest,
+      createWorkspaceRequest,
+      deleteWorkspaceRequest,
+      updateWorkspaceRequest,
+      onCreateWorkspaceSubmit,
+      onWorkspaceClick,
+      workspaces,
+    } = this.props;
+    const { intl } = this.context;
+    return (
+      <div className="settings__main">
+        <div className="settings__header">
+          <h1>{intl.formatMessage(messages.headline)}</h1>
+        </div>
+        <div className="settings__body">
+
+          {/* ===== Workspace updated info ===== */}
+          {updateWorkspaceRequest.wasExecuted && updateWorkspaceRequest.result && (
+            <Appear className={classes.appear}>
+              <Infobox
+                type="success"
+                icon="mdiCheckboxMarkedCircleOutline"
+                dismissable
+                onUnmount={updateWorkspaceRequest.reset}
+              >
+                {intl.formatMessage(messages.updatedInfo)}
+              </Infobox>
+            </Appear>
+          )}
+
+          {/* ===== Workspace deleted info ===== */}
+          {deleteWorkspaceRequest.wasExecuted && deleteWorkspaceRequest.result && (
+            <Appear className={classes.appear}>
+              <Infobox
+                type="success"
+                icon="mdiCheckboxMarkedCircleOutline"
+                dismissable
+                onUnmount={deleteWorkspaceRequest.reset}
+              >
+                {intl.formatMessage(messages.deletedInfo)}
+              </Infobox>
+            </Appear>
+          )}
+
+          {workspaceStore.isPremiumUpgradeRequired && (
+            <div className={classes.premiumAnnouncement}>
+              <h2>{intl.formatMessage(messages.workspaceFeatureHeadline)}</h2>
+              <p>{intl.formatMessage(messages.workspaceFeatureInfo)}</p>
+            </div>
+          )}
+
+          <PremiumFeatureContainer
+            condition={workspaceStore.isPremiumFeature}
+            gaEventInfo={{ category: 'User', event: 'upgrade', label: 'workspaces' }}
+          >
+            {/* ===== Create workspace form ===== */}
+            <div className={classes.createForm}>
+              <CreateWorkspaceForm
+                isSubmitting={createWorkspaceRequest.isExecuting}
+                onSubmit={onCreateWorkspaceSubmit}
+              />
+            </div>
+            {getUserWorkspacesRequest.isExecuting ? (
+              <Loader />
+            ) : (
+              <Fragment>
+                {/* ===== 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>
+                ) : (
+                  <Fragment>
+                    {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>
+                    )}
+                  </Fragment>
+                )}
+              </Fragment>
+            )}
+          </PremiumFeatureContainer>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default WorkspacesDashboard;
diff --git a/src/features/workspaces/containers/EditWorkspaceScreen.js b/src/features/workspaces/containers/EditWorkspaceScreen.js
new file mode 100644
index 000000000..248b40131
--- /dev/null
+++ b/src/features/workspaces/containers/EditWorkspaceScreen.js
@@ -0,0 +1,60 @@
+import React, { Component } from 'react';
+import { inject, observer } from 'mobx-react';
+import PropTypes from 'prop-types';
+
+import ErrorBoundary from '../../../components/util/ErrorBoundary';
+import EditWorkspaceForm from '../components/EditWorkspaceForm';
+import ServicesStore from '../../../stores/ServicesStore';
+import Workspace from '../models/Workspace';
+import { workspaceStore } from '../index';
+import { deleteWorkspaceRequest, updateWorkspaceRequest } from '../api';
+
+@inject('stores', 'actions') @observer
+class EditWorkspaceScreen extends Component {
+  static propTypes = {
+    actions: PropTypes.shape({
+      workspace: PropTypes.shape({
+        delete: PropTypes.func.isRequired,
+      }),
+    }).isRequired,
+    stores: PropTypes.shape({
+      services: PropTypes.instanceOf(ServicesStore).isRequired,
+    }).isRequired,
+  };
+
+  onDelete = () => {
+    const { workspaceBeingEdited } = workspaceStore;
+    const { actions } = this.props;
+    if (!workspaceBeingEdited) return null;
+    actions.workspaces.delete({ workspace: workspaceBeingEdited });
+  };
+
+  onSave = (values) => {
+    const { workspaceBeingEdited } = workspaceStore;
+    const { actions } = this.props;
+    const workspace = new Workspace(
+      Object.assign({}, workspaceBeingEdited, values),
+    );
+    actions.workspaces.update({ workspace });
+  };
+
+  render() {
+    const { workspaceBeingEdited } = workspaceStore;
+    const { stores } = this.props;
+    if (!workspaceBeingEdited) return null;
+    return (
+      <ErrorBoundary>
+        <EditWorkspaceForm
+          workspace={workspaceBeingEdited}
+          services={stores.services.all}
+          onDelete={this.onDelete}
+          onSave={this.onSave}
+          updateWorkspaceRequest={updateWorkspaceRequest}
+          deleteWorkspaceRequest={deleteWorkspaceRequest}
+        />
+      </ErrorBoundary>
+    );
+  }
+}
+
+export default EditWorkspaceScreen;
diff --git a/src/features/workspaces/containers/WorkspacesScreen.js b/src/features/workspaces/containers/WorkspacesScreen.js
new file mode 100644
index 000000000..2ab565fa1
--- /dev/null
+++ b/src/features/workspaces/containers/WorkspacesScreen.js
@@ -0,0 +1,42 @@
+import React, { Component } from 'react';
+import { inject, observer } from 'mobx-react';
+import PropTypes from 'prop-types';
+import WorkspacesDashboard from '../components/WorkspacesDashboard';
+import ErrorBoundary from '../../../components/util/ErrorBoundary';
+import { workspaceStore } from '../index';
+import {
+  createWorkspaceRequest,
+  deleteWorkspaceRequest,
+  getUserWorkspacesRequest,
+  updateWorkspaceRequest,
+} from '../api';
+
+@inject('actions') @observer
+class WorkspacesScreen extends Component {
+  static propTypes = {
+    actions: PropTypes.shape({
+      workspace: PropTypes.shape({
+        edit: PropTypes.func.isRequired,
+      }),
+    }).isRequired,
+  };
+
+  render() {
+    const { actions } = this.props;
+    return (
+      <ErrorBoundary>
+        <WorkspacesDashboard
+          workspaces={workspaceStore.workspaces}
+          getUserWorkspacesRequest={getUserWorkspacesRequest}
+          createWorkspaceRequest={createWorkspaceRequest}
+          deleteWorkspaceRequest={deleteWorkspaceRequest}
+          updateWorkspaceRequest={updateWorkspaceRequest}
+          onCreateWorkspaceSubmit={data => actions.workspaces.create(data)}
+          onWorkspaceClick={w => actions.workspaces.edit({ workspace: w })}
+        />
+      </ErrorBoundary>
+    );
+  }
+}
+
+export default WorkspacesScreen;
diff --git a/src/features/workspaces/index.js b/src/features/workspaces/index.js
new file mode 100644
index 000000000..ad9023b8b
--- /dev/null
+++ b/src/features/workspaces/index.js
@@ -0,0 +1,37 @@
+import { reaction } from 'mobx';
+import WorkspacesStore from './store';
+import { resetApiRequests } from './api';
+
+const debug = require('debug')('Franz:feature:workspaces');
+
+export const GA_CATEGORY_WORKSPACES = 'Workspaces';
+
+export const workspaceStore = new WorkspacesStore();
+
+export default function initWorkspaces(stores, actions) {
+  stores.workspaces = workspaceStore;
+  const { features } = stores;
+
+  // Toggle workspace feature
+  reaction(
+    () => features.features.isWorkspaceEnabled,
+    (isEnabled) => {
+      if (isEnabled && !workspaceStore.isFeatureActive) {
+        debug('Initializing `workspaces` feature');
+        workspaceStore.start(stores, actions);
+      } else if (workspaceStore.isFeatureActive) {
+        debug('Disabling `workspaces` feature');
+        workspaceStore.stop();
+        resetApiRequests();
+      }
+    },
+    {
+      fireImmediately: true,
+    },
+  );
+}
+
+export const WORKSPACES_ROUTES = {
+  ROOT: '/settings/workspaces',
+  EDIT: '/settings/workspaces/:action/:id',
+};
diff --git a/src/features/workspaces/models/Workspace.js b/src/features/workspaces/models/Workspace.js
new file mode 100644
index 000000000..6c73d7095
--- /dev/null
+++ b/src/features/workspaces/models/Workspace.js
@@ -0,0 +1,25 @@
+import { observable } from 'mobx';
+
+export default class Workspace {
+  id = null;
+
+  @observable name = null;
+
+  @observable order = null;
+
+  @observable services = [];
+
+  @observable userId = null;
+
+  constructor(data) {
+    if (!data.id) {
+      throw Error('Workspace requires Id');
+    }
+
+    this.id = data.id;
+    this.name = data.name;
+    this.order = data.order;
+    this.services.replace(data.services);
+    this.userId = data.userId;
+  }
+}
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
new file mode 100644
index 000000000..e11513d1f
--- /dev/null
+++ b/src/features/workspaces/store.js
@@ -0,0 +1,323 @@
+import {
+  computed,
+  observable,
+  action,
+} from 'mobx';
+import localStorage from 'mobx-localstorage';
+import { matchRoute } from '../../helpers/routing-helpers';
+import { workspaceActions } from './actions';
+import { FeatureStore } from '../utils/FeatureStore';
+import {
+  createWorkspaceRequest,
+  deleteWorkspaceRequest,
+  getUserWorkspacesRequest,
+  updateWorkspaceRequest,
+} from './api';
+import { WORKSPACES_ROUTES } from './index';
+import { createReactions } from '../../stores/lib/Reaction';
+import { createActionBindings } from '../utils/ActionBinding';
+
+const debug = require('debug')('Franz:feature:workspaces:store');
+
+export default class WorkspacesStore extends FeatureStore {
+  @observable isFeatureEnabled = false;
+
+  @observable isFeatureActive = false;
+
+  @observable isPremiumFeature = true;
+
+  @observable isPremiumUpgradeRequired = true;
+
+  @observable activeWorkspace = null;
+
+  @observable nextWorkspace = null;
+
+  @observable workspaceBeingEdited = null;
+
+  @observable isSwitchingWorkspace = false;
+
+  @observable isWorkspaceDrawerOpen = false;
+
+  @observable isSettingsRouteActive = null;
+
+  @computed get workspaces() {
+    if (!this.isFeatureActive) return [];
+    return getUserWorkspacesRequest.result || [];
+  }
+
+  @computed get settings() {
+    return localStorage.getItem('workspaces') || {};
+  }
+
+  @computed get userHasWorkspaces() {
+    return getUserWorkspacesRequest.wasExecuted && this.workspaces.length > 0;
+  }
+
+  @computed get isUserAllowedToUseFeature() {
+    return !this.isPremiumUpgradeRequired;
+  }
+
+  // ========== PRIVATE PROPERTIES ========= //
+
+  _wasDrawerOpenBeforeSettingsRoute = null;
+
+  _freeUserActions = [];
+
+  _premiumUserActions = [];
+
+  _allActions = [];
+
+  _freeUserReactions = [];
+
+  _premiumUserReactions = [];
+
+  _allReactions = [];
+
+  // ========== PUBLIC API ========= //
+
+  start(stores, actions) {
+    debug('WorkspacesStore::start');
+    this.stores = stores;
+    this.actions = actions;
+
+    // ACTIONS
+
+    this._freeUserActions = createActionBindings([
+      [workspaceActions.toggleWorkspaceDrawer, this._toggleWorkspaceDrawer],
+      [workspaceActions.openWorkspaceSettings, this._openWorkspaceSettings],
+    ]);
+    this._premiumUserActions = createActionBindings([
+      [workspaceActions.edit, this._edit],
+      [workspaceActions.create, this._create],
+      [workspaceActions.delete, this._delete],
+      [workspaceActions.update, this._update],
+      [workspaceActions.activate, this._setActiveWorkspace],
+      [workspaceActions.deactivate, this._deactivateActiveWorkspace],
+    ]);
+    this._allActions = this._freeUserActions.concat(this._premiumUserActions);
+    this._registerActions(this._allActions);
+
+    // REACTIONS
+
+    this._freeUserReactions = createReactions([
+      this._stopPremiumActionsAndReactions,
+      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();
+    this.isFeatureActive = true;
+  }
+
+  stop() {
+    super.stop();
+    debug('WorkspacesStore::stop');
+    this.isFeatureActive = false;
+    this.activeWorkspace = null;
+    this.nextWorkspace = null;
+    this.workspaceBeingEdited = null;
+    this.isSwitchingWorkspace = false;
+    this.isWorkspaceDrawerOpen = false;
+  }
+
+  filterServicesByActiveWorkspace = (services) => {
+    const { activeWorkspace, isFeatureActive } = this;
+    if (isFeatureActive && activeWorkspace) {
+      return this.getWorkspaceServices(activeWorkspace);
+    }
+    return services;
+  };
+
+  getWorkspaceServices(workspace) {
+    const { services } = this.stores;
+    return workspace.services.map(id => services.one(id)).filter(s => !!s);
+  }
+
+  // ========== PRIVATE METHODS ========= //
+
+  _getWorkspaceById = id => this.workspaces.find(w => w.id === id);
+
+  _updateSettings = (changes) => {
+    localStorage.setItem('workspaces', {
+      ...this.settings,
+      ...changes,
+    });
+  };
+
+  // Actions
+
+  @action _edit = ({ workspace }) => {
+    this.stores.router.push(`/settings/workspaces/edit/${workspace.id}`);
+  };
+
+  @action _create = async ({ name }) => {
+    try {
+      const workspace = await createWorkspaceRequest.execute(name);
+      await getUserWorkspacesRequest.result.push(workspace);
+      this._edit({ workspace });
+    } catch (error) {
+      throw error;
+    }
+  };
+
+  @action _delete = async ({ workspace }) => {
+    try {
+      await deleteWorkspaceRequest.execute(workspace);
+      await getUserWorkspacesRequest.result.remove(workspace);
+      this.stores.router.push('/settings/workspaces');
+    } catch (error) {
+      throw error;
+    }
+  };
+
+  @action _update = async ({ workspace }) => {
+    try {
+      await updateWorkspaceRequest.execute(workspace);
+      // Path local result optimistically
+      const localWorkspace = this._getWorkspaceById(workspace.id);
+      Object.assign(localWorkspace, workspace);
+      this.stores.router.push('/settings/workspaces');
+    } catch (error) {
+      throw error;
+    }
+  };
+
+  @action _setActiveWorkspace = ({ workspace }) => {
+    // Indicate that we are switching to another workspace
+    this.isSwitchingWorkspace = true;
+    this.nextWorkspace = workspace;
+    // Delay switching to next workspace so that the services loading does not drag down UI
+    setTimeout(() => {
+      this.activeWorkspace = workspace;
+      this._updateSettings({ lastActiveWorkspace: workspace.id });
+    }, 100);
+    // Indicate that we are done switching to the next workspace
+    setTimeout(() => {
+      this.isSwitchingWorkspace = false;
+      this.nextWorkspace = null;
+    }, 1000);
+  };
+
+  @action _deactivateActiveWorkspace = () => {
+    // Indicate that we are switching to default workspace
+    this.isSwitchingWorkspace = true;
+    this.nextWorkspace = null;
+    this._updateSettings({ lastActiveWorkspace: null });
+    // Delay switching to next workspace so that the services loading does not drag down UI
+    setTimeout(() => {
+      this.activeWorkspace = null;
+    }, 100);
+    // Indicate that we are done switching to the default workspace
+    setTimeout(() => { this.isSwitchingWorkspace = false; }, 1000);
+  };
+
+  @action _toggleWorkspaceDrawer = () => {
+    this.isWorkspaceDrawerOpen = !this.isWorkspaceDrawerOpen;
+  };
+
+  @action _openWorkspaceSettings = () => {
+    this.actions.ui.openSettings({ path: 'workspaces' });
+  };
+
+  // Reactions
+
+  _setFeatureEnabledReaction = () => {
+    const { isWorkspaceEnabled } = this.stores.features.features;
+    this.isFeatureEnabled = isWorkspaceEnabled;
+  };
+
+  _setIsPremiumFeatureReaction = () => {
+    const { features, user } = this.stores;
+    const { isPremium } = user.data;
+    const { isWorkspacePremiumFeature } = features.features;
+    this.isPremiumFeature = isWorkspacePremiumFeature;
+    this.isPremiumUpgradeRequired = isWorkspacePremiumFeature && !isPremium;
+  };
+
+  _setWorkspaceBeingEditedReaction = () => {
+    const { pathname } = this.stores.router.location;
+    const match = matchRoute('/settings/workspaces/edit/:id', pathname);
+    if (match) {
+      this.workspaceBeingEdited = this._getWorkspaceById(match.id);
+    }
+  };
+
+  _setActiveServiceOnWorkspaceSwitchReaction = () => {
+    if (!this.isFeatureActive) return;
+    if (this.activeWorkspace) {
+      const services = this.stores.services.allDisplayed;
+      const activeService = services.find(s => s.isActive);
+      const workspaceServices = this.getWorkspaceServices(this.activeWorkspace);
+      if (workspaceServices.length <= 0) return;
+      const isActiveServiceInWorkspace = workspaceServices.includes(activeService);
+      if (!isActiveServiceInWorkspace) {
+        this.actions.service.setActive({ serviceId: workspaceServices[0].id });
+      }
+    }
+  };
+
+  _activateLastUsedWorkspaceReaction = () => {
+    if (!this.activeWorkspace && this.userHasWorkspaces) {
+      const { lastActiveWorkspace } = this.settings;
+      if (lastActiveWorkspace) {
+        const workspace = this._getWorkspaceById(lastActiveWorkspace);
+        if (workspace) this._setActiveWorkspace({ workspace });
+      }
+    }
+  };
+
+  _openDrawerWithSettingsReaction = () => {
+    const { router } = this.stores;
+    const isWorkspaceSettingsRoute = router.location.pathname.includes(WORKSPACES_ROUTES.ROOT);
+    const isSwitchingToSettingsRoute = !this.isSettingsRouteActive && isWorkspaceSettingsRoute;
+    const isLeavingSettingsRoute = !isWorkspaceSettingsRoute && this.isSettingsRouteActive;
+
+    if (isSwitchingToSettingsRoute) {
+      this.isSettingsRouteActive = true;
+      this._wasDrawerOpenBeforeSettingsRoute = this.isWorkspaceDrawerOpen;
+      if (!this._wasDrawerOpenBeforeSettingsRoute) {
+        workspaceActions.toggleWorkspaceDrawer();
+      }
+    } else if (isLeavingSettingsRoute) {
+      this.isSettingsRouteActive = false;
+      if (!this._wasDrawerOpenBeforeSettingsRoute && this.isWorkspaceDrawerOpen) {
+        workspaceActions.toggleWorkspaceDrawer();
+      }
+    }
+  };
+
+  _cleanupInvalidServiceReferences = () => {
+    const { services } = this.stores;
+    let invalidServiceReferencesExist = false;
+    this.workspaces.forEach((workspace) => {
+      workspace.services.forEach((serviceId) => {
+        if (!services.one(serviceId)) {
+          invalidServiceReferencesExist = true;
+        }
+      });
+    });
+    if (invalidServiceReferencesExist) {
+      getUserWorkspacesRequest.execute();
+    }
+  };
+
+  _stopPremiumActionsAndReactions = () => {
+    if (!this.isUserAllowedToUseFeature) {
+      this._stopActions(this._premiumUserActions);
+      this._stopReactions(this._premiumUserReactions);
+    } else {
+      this._startActions(this._premiumUserActions);
+      this._startReactions(this._premiumUserReactions);
+    }
+  }
+}
diff --git a/src/helpers/asar-helpers.js b/src/helpers/asar-helpers.js
new file mode 100644
index 000000000..9e4380c06
--- /dev/null
+++ b/src/helpers/asar-helpers.js
@@ -0,0 +1,3 @@
+export function asarPath(dir = '') {
+  return dir.replace('app.asar', 'app.asar.unpacked');
+}
diff --git a/src/helpers/i18n-helpers.js b/src/helpers/i18n-helpers.js
index 091b86b06..84146dd8c 100644
--- a/src/helpers/i18n-helpers.js
+++ b/src/helpers/i18n-helpers.js
@@ -28,22 +28,33 @@ export function getLocale({
   return localeStr;
 }
 
-export function getSelectOptions({ locales, resetToDefaultText = '' }) {
-  let options = [];
+export function getSelectOptions({ locales, resetToDefaultText = '', automaticDetectionText = '' }) {
+  const options = [];
 
   if (resetToDefaultText) {
-    options = [
+    options.push(
       {
         value: '',
         label: resetToDefaultText,
-      }, {
-        value: '───',
-        label: '───',
-        disabled: true,
       },
-    ];
+    );
   }
 
+  if (automaticDetectionText) {
+    options.push(
+      {
+        value: 'automatic',
+        label: automaticDetectionText,
+      },
+    );
+  }
+
+  options.push({
+    value: '───',
+    label: '───',
+    disabled: true,
+  });
+
   Object.keys(locales).sort(Intl.Collator().compare).forEach((key) => {
     options.push({
       value: key,
diff --git a/src/helpers/url-helpers.js b/src/helpers/url-helpers.js
new file mode 100644
index 000000000..750d1f00c
--- /dev/null
+++ b/src/helpers/url-helpers.js
@@ -0,0 +1,15 @@
+import { URL } from 'url';
+
+import { ALLOWED_PROTOCOLS } from '../config';
+
+const debug = require('debug')('Franz:Helpers:url');
+
+export function isValidExternalURL(url) {
+  const parsedUrl = new URL(url);
+
+  const isAllowed = ALLOWED_PROTOCOLS.includes(parsedUrl.protocol);
+
+  debug('protocol check is', isAllowed, 'for:', url);
+
+  return isAllowed;
+}
diff --git a/src/i18n/globalMessages.js b/src/i18n/globalMessages.js
index 2c724ff6f..1b5ece223 100644
--- a/src/i18n/globalMessages.js
+++ b/src/i18n/globalMessages.js
@@ -1,10 +1,6 @@
 import { defineMessages } from 'react-intl';
 
 export default defineMessages({
-  upgradeAccount: {
-    id: 'global.premium.upgradeAccount',
-    defaultMessage: '!!!Please upgrade your account to add a new service.',
-  },
   APIUnhealthy: {
     id: 'global.api.unhealthy',
     defaultMessage: '!!!Can\'t connect to Franz Online Services',
@@ -13,4 +9,20 @@ export default defineMessages({
     id: 'global.notConnectedToTheInternet',
     defaultMessage: '!!!You are not connected to the internet.',
   },
+  spellcheckerLanguage: {
+    id: 'global.spellchecking.language',
+    defaultMessage: '!!!Spell checking language',
+  },
+  spellcheckerSystemDefault: {
+    id: 'global.spellchecker.useDefault',
+    defaultMessage: '!!!Use System Default ({default})',
+  },
+  spellcheckerAutomaticDetection: {
+    id: 'global.spellchecking.autodetect',
+    defaultMessage: '!!!Detect language automatically',
+  },
+  spellcheckerAutomaticDetectionShort: {
+    id: 'global.spellchecking.autodetect.short',
+    defaultMessage: '!!!Automatic',
+  },
 });
diff --git a/src/i18n/languages.js b/src/i18n/languages.js
index aa3f2316a..9ddcc3519 100644
--- a/src/i18n/languages.js
+++ b/src/i18n/languages.js
@@ -35,7 +35,8 @@ export const SPELLCHECKER_LOCALES = {
   'da-dk': 'Dansk',
   'de-de': 'Deutsch',
   'el-gr': 'ελληνικά (Greek)',
-  'en-us': 'English',
+  'en-gb': 'English (GB)',
+  'en-us': 'English (US)',
   'es-es': 'Español',
   'et-ee': 'Estonian',
   'fa-ir': '�ارسی (Persian)',
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index ed6f7bacd..b2aaaa070 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -1,11 +1,23 @@
 {
    "app.errorHandler.action" : "Recarrega",
-   "app.errorHandler.headline" : "Something went wrong",
+   "app.errorHandler.headline" : "Quelcom ha anat malament",
+   "feature.announcements.changelog.headline" : "Canvis en Franz {version}",
    "feature.delayApp.action" : "Aconsegueix una llicència de suport per a Franz",
    "feature.delayApp.headline" : "Si us plau, compra una llicència de suport per a Franz per saltar l'espera",
    "feature.delayApp.text" : "Franz continuarà en {seconds} segons",
+   "feature.shareFranz.action.email" : "Envia com a correu",
+   "feature.shareFranz.action.facebook" : "Compartir en Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "No es pot connectar amb els serveis en línia de Franz",
    "global.notConnectedToTheInternet" : "No esteu connectat a Internet.",
+   "global.spellchecker.useDefault" : "Utilitzar el predeterminat del sistema ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Corrector ortogràfic",
    "import.headline" : "Importa els teus serveis Franz 4",
    "import.notSupportedHeadline" : "Serveis que encara no s'admeten a Franz 5",
    "import.skip.label" : "Vull afegir serveis manualment",
@@ -32,6 +44,7 @@
    "login.submit.label" : "Accedir",
    "login.tokenExpired" : "La teva sessió ha caducat, torna a iniciar la sessió.",
    "menu.app.about" : "Sobre Franz",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Amaga",
    "menu.app.hideOthers" : "Amaga altres",
    "menu.app.quit" : "Surt",
@@ -59,7 +72,9 @@
    "menu.help.support" : "Suport",
    "menu.help.tos" : "Condicions del Servei",
    "menu.services" : "Serveis",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Afegeix un servei...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Visualitza",
    "menu.view.enterFullScreen" : "Inicia la pantalla completa",
    "menu.view.exitFullScreen" : "Surt de pantalla completa",
@@ -74,6 +89,11 @@
    "menu.window" : "Finestra",
    "menu.window.close" : "Tanca",
    "menu.window.minimize" : "Minimitza",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Tots els serveis",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "Correu electrònic",
    "password.headline" : "Restablir contrasenya",
    "password.link.login" : "Inicia la sessió al teu compte",
@@ -96,7 +116,8 @@
    "service.errorHandler.editAction" : "Edita {name}",
    "service.errorHandler.headline" : "Oh no!",
    "service.errorHandler.message" : "Error",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} ha fallat al carregar",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "Introducció",
    "services.welcome" : "Benvingut a Franz",
    "settings.account.account.editButton" : "Editar Compte",
@@ -117,6 +138,7 @@
    "settings.account.invoiceDownload" : "Descarregar",
    "settings.account.manageSubscription.label" : "Gestioneu la vostra subscripció",
    "settings.account.successInfo" : "S'han desat els canvis",
+   "settings.account.tryReloadServices" : "Torna a provar-ho",
    "settings.account.tryReloadUserInfoRequest" : "Torna a provar-ho",
    "settings.account.userInfoRequestFailed" : "No s'ha pogut carregar la informació de l'usuari",
    "settings.app.buttonClearAllCache" : "Buida la memòria cau",
@@ -129,22 +151,20 @@
    "settings.app.form.beta" : "Inclou versions beta",
    "settings.app.form.darkMode" : "Uneix-te al Cantó Fosc",
    "settings.app.form.enableGPUAcceleration" : "Activar acceleració GPU",
-   "settings.app.form.enableMenuBar" : "Mostra Franz a la barra de menú",
    "settings.app.form.enableSpellchecking" : "Habilita la comprobació ortogràfica",
    "settings.app.form.enableSystemTray" : "Mostra Franz a la safata del sistema",
-   "settings.app.form.hideDockIcon" : "Oculta la icona de Franz al Dock",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimitza Franz a la safata del sistema",
    "settings.app.form.runInBackground" : "Mantén a Franz en segon pla en tancar la finestra",
    "settings.app.form.showDisabledServices" : "Mostra les pestanyes dels serveis desactivats",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Mostra la insígnia de missatges no llegits quan les notificacions estiguin desactivades",
-   "settings.app.form.spellcheckerLanguage" : "Corrector ortogràfic",
    "settings.app.headline" : "Configuració",
    "settings.app.headlineAdvanced" : "Avançat",
    "settings.app.headlineAppearance" : "Aparença",
    "settings.app.headlineGeneral" : "General",
    "settings.app.headlineLanguage" : "Idioma",
    "settings.app.headlineUpdates" : "Actualitzacions",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "Els canvis requereixen reiniciar",
    "settings.app.subheadlineCache" : "Memòria cau",
    "settings.app.translationHelp" : "Ajuda'ns a traduir Franz en la teva llengua.",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "Convidar amics",
    "settings.navigation.logout" : "Sortir",
    "settings.navigation.settings" : "Configuració",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "Els vostres serveis",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "Tots els serveis",
    "settings.recipes.dev" : "Desenvolupament",
    "settings.recipes.headline" : "Serveis disponibles",
@@ -192,17 +214,15 @@
    "settings.service.form.indirectMessages" : "Mostra la insígnia de missatge per a tots els missatges nous",
    "settings.service.form.isMutedInfo" : "Quan es desactiva, tots els sons de notificació i reproducció d'àudio es silenciaran",
    "settings.service.form.name" : "Nom",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "Ajustaments Proxy HTTP\/HTTPS",
    "settings.service.form.proxy.host" : "Host Proxy \/ IP",
    "settings.service.form.proxy.info" : "Els ajustaments del Proxy no es sincronitzaran amb els servidors de Franz",
    "settings.service.form.proxy.isEnabled" : "Utilitzar Proxy",
    "settings.service.form.proxy.password" : "Contrasenya (opcional)",
    "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.restartInfo" : "Siusplau, reinicieu el Franz després de canviar els ajustaments de proxy",
    "settings.service.form.proxy.user" : "Usuari (opcional)",
    "settings.service.form.saveButton" : "Desa el servei",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Allotjat",
    "settings.service.form.tabOnPremise" : "Allotjat per si mateix ��",
    "settings.service.form.team" : "Equip",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "Descobrir serveis",
    "settings.services.headline" : "Els vostres serveis",
    "settings.services.noServicesAdded" : "Encara no heu afegit cap servei.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "El servei està desactivat",
    "settings.services.tooltip.isMuted" : "Tots els sons estan desactivats",
    "settings.services.tooltip.notificationsDisabled" : "Les notificacions estan desactivades",
    "settings.services.updatedInfo" : "S'han desat els canvis",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Equip",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "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",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "Nom",
    "settings.user.form.lastname" : "Cognoms",
    "settings.user.form.newPassword" : "Nova contrasenya",
+   "settings.workspace.add.form.name" : "Nom",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Nom",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Torna a provar-ho",
+   "settings.workspaces.updatedInfo" : "S'han desat els canvis",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "Afegeix nou servei",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "Desactivar notificacions i àudio",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Configuració",
    "sidebar.unmuteApp" : "Activar notificacions i àudio",
    "signup.company.label" : "Empresa",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "Residents d'EU: es poden aplicar impostos locals",
    "subscription.features.ads" : "Sense anuncis, mai!",
    "subscription.features.comingSoon" : "properament",
-   "subscription.features.encryptedSync" : "Sincronització de sessió xifrada",
    "subscription.features.noInterruptions" : "Sense retards ni molestes actualitzacions de llicències ",
-   "subscription.features.onpremise" : "Afegiu serveis en premissa\/allotjats com HipChat",
    "subscription.features.onpremise.mattermost" : "Afegir serveis allotjats com Mattermost",
    "subscription.features.proxy" : "Suport de Proxy per a serveis",
    "subscription.features.spellchecker" : "Suport per corrector ortogràfic",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "El compte de pagament Franz Premium Supporter inclou",
    "subscription.paymentSessionError" : "No s'ha pogut inicialitzar el formulari de pagament",
    "subscription.submit.label" : "Vull donar suport al desenvolupament de Franz",
@@ -269,9 +312,20 @@
    "tabs.item.reload" : "Recarrega",
    "validation.email" : "{field} no es vàlid",
    "validation.minLength" : "{field} ha de ser al menys {length} caràcters de llargada",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} es requerit",
    "validation.url" : "{field} es una URL no vàlida",
    "welcome.loginButton" : "Inicia sessió al teu compte",
    "welcome.signupButton" : "Crea un compte gratuït",
-   "welcome.slogan" : "Crea un compte gratuït"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Tots els serveis",
+   "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>Franz 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 b8bfd2526..aadfeffbc 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -1,11 +1,23 @@
 {
    "app.errorHandler.action" : "Obnovit",
-   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.headline" : "Něco se pokazilo",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "feature.delayApp.action" : "Podpoř Franz a získej Supporter licenci",
+   "feature.delayApp.headline" : "Kup si Franz Supporter licenci a nebudeš už muset �ekat",
+   "feature.delayApp.text" : "Franz bude pokra�ovat v {seconds} sekundách.",
+   "feature.shareFranz.action.email" : "Poslat jako e-mail",
+   "feature.shareFranz.action.facebook" : "Sdílet na Facebooku",
+   "feature.shareFranz.action.twitter" : "Sdílet na Twitteru",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Nemůžeme připojit Franz k online službám",
    "global.notConnectedToTheInternet" : "Připojení k internetu není k dispozici.",
+   "global.spellchecker.useDefault" : "Use System Default ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Oprava překlepů jazyka",
    "import.headline" : "Importovat služby z Franz 4",
    "import.notSupportedHeadline" : "Služby nejsou podporovány ve verzi Franz 5",
    "import.skip.label" : "Chci přidat službu ru�ně",
@@ -32,6 +44,7 @@
    "login.submit.label" : "Přihlásit se",
    "login.tokenExpired" : "Sezení vypršelo, prosím přihlaste se znovu",
    "menu.app.about" : "O aplikaci",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Skrýt",
    "menu.app.hideOthers" : "Skryt ostatní",
    "menu.app.quit" : "Ukon�it",
@@ -59,7 +72,9 @@
    "menu.help.support" : "Podpora",
    "menu.help.tos" : "Podmínky použití",
    "menu.services" : "Služby",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Přidat novou službu...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Zobrazení",
    "menu.view.enterFullScreen" : "Spustit režim celé obrazovky",
    "menu.view.exitFullScreen" : "Ukon�it celoobrazovkový režim",
@@ -74,6 +89,11 @@
    "menu.window" : "Okno",
    "menu.window.close" : "Zavřít",
    "menu.window.minimize" : "Minimalizovat",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Všechny služby",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "E-mailová adresa",
    "password.headline" : "Obnovit heslo",
    "password.link.login" : "Přihlásit se k ú�tu",
@@ -81,7 +101,7 @@
    "password.noUser" : "Pro emailovou adresu nebyl nalezený žádný uživatel",
    "password.submit.label" : "Odeslat",
    "password.successInfo" : "Prosím, zkontrolujte svůj e-mail",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Vylepši si svůj ú�et",
    "pricing.headline" : "Podpořit Franz",
    "pricing.link.skipPayment" : "Nechci podporovat vývoj aplikace Franz.",
    "pricing.submit.label" : "Chci podpořit vývoj aplikace Franz",
@@ -96,7 +116,8 @@
    "service.errorHandler.editAction" : "Upravit {name}",
    "service.errorHandler.headline" : "Ale ne!",
    "service.errorHandler.message" : "Chyba",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} se nepodařilo na�íst.",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "Za�něme",
    "services.welcome" : "Vítejte v programu Franz",
    "settings.account.account.editButton" : "Upravit ú�et",
@@ -117,6 +138,7 @@
    "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.tryReloadServices" : "Zkusit opět",
    "settings.account.tryReloadUserInfoRequest" : "Zkusit opět",
    "settings.account.userInfoRequestFailed" : "Nelze na�íst informace o uživateli.",
    "settings.app.buttonClearAllCache" : "Vyprázdnit mezipaměti",
@@ -127,24 +149,22 @@
    "settings.app.form.autoLaunchInBackground" : "Spustit na pozadí",
    "settings.app.form.autoLaunchOnStart" : "Spustit Franz při startu",
    "settings.app.form.beta" : "Zahrnout beta verze",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Připoj se k Temné straně",
    "settings.app.form.enableGPUAcceleration" : "Aktivovat GPU zrychlení",
-   "settings.app.form.enableMenuBar" : "Zobraz Franz v Menu nabídce",
    "settings.app.form.enableSpellchecking" : "Zapnout kontrolu pravopisu",
    "settings.app.form.enableSystemTray" : "Zobrazit Franz v systémové liště",
-   "settings.app.form.hideDockIcon" : "Schovej ikonu Franz v Docku",
    "settings.app.form.language" : "Jazyk",
    "settings.app.form.minimizeToSystemTray" : "Minimalizovat Franz do systémové lišty",
    "settings.app.form.runInBackground" : "Ponechat Franze v pozadí při zavírání okna",
    "settings.app.form.showDisabledServices" : "Zobrazit záložky vypnutých služeb",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Zobrazit odznak pro nepře�tené zprávy když jsou upozornění vypnutá",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Nastavení",
    "settings.app.headlineAdvanced" : "Pokro�ilé",
    "settings.app.headlineAppearance" : "Vzhled",
    "settings.app.headlineGeneral" : "Obecné",
    "settings.app.headlineLanguage" : "Jazyk",
    "settings.app.headlineUpdates" : "Aktualizace",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "Změny vyžadují restart",
    "settings.app.subheadlineCache" : "Mezipaměť",
    "settings.app.translationHelp" : "Pomozte nám přeložit Franz do svého jazyka.",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "Pozvi přátele",
    "settings.navigation.logout" : "Odhlásit",
    "settings.navigation.settings" : "Nastavení",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "Vaše služby",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "Všechny služby",
    "settings.recipes.dev" : "Vývoj",
    "settings.recipes.headline" : "Dostupné služby",
@@ -179,7 +201,7 @@
    "settings.service.form.editServiceHeadline" : "Upravit {name}",
    "settings.service.form.enableAudio" : "Zapnout zvuk",
    "settings.service.form.enableBadge" : "Ukázat odznaky nepře�tených zpráv",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Povolit Tmavý vzhled",
    "settings.service.form.enableNotification" : "Povolit upozornění",
    "settings.service.form.enableService" : "Povolit službu",
    "settings.service.form.headlineBadges" : "Odznaky nepře�tených zpráv",
@@ -192,7 +214,7 @@
    "settings.service.form.indirectMessages" : "Zobrazovat znak zprávy pro všechny nové zprávy",
    "settings.service.form.isMutedInfo" : "Pokud je vypnuto, všechny zvuky notifikací a jiného audia budou ztišeny",
    "settings.service.form.name" : "Jméno",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "Nastavení HTTP\/HTTPS Proxy",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
@@ -201,8 +223,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Uložit službu",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hostováno",
    "settings.service.form.tabOnPremise" : "Samostatně hostované ��",
    "settings.service.form.team" : "Tým",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "Objevte služby",
    "settings.services.headline" : "Vaše služby",
    "settings.services.noServicesAdded" : "Doposud jste nepřidali žádné služby.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Služba je zakázána",
    "settings.services.tooltip.isMuted" : "Všechny zvuky jsou ztišeny",
    "settings.services.tooltip.notificationsDisabled" : "Oznámení jsou zakázána",
    "settings.services.updatedInfo" : "Vaše změny byly uloženy",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Tým",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "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",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "Jméno",
    "settings.user.form.lastname" : "Příjmení",
    "settings.user.form.newPassword" : "Nové heslo",
+   "settings.workspace.add.form.name" : "Jméno",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Jméno",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Zkusit opět",
+   "settings.workspaces.updatedInfo" : "Vaše změny byly uloženy",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "Přidat novou službu",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "Vypnout upozornění a zvuky",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Nastavení",
    "sidebar.unmuteApp" : "Zapnout upozornění a zvuky",
    "signup.company.label" : "Spole�nost",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "Pro obyvatelé EU: mohou být aplikovány lokální daně",
    "subscription.features.ads" : "Žádné reklamy, nikdy!",
    "subscription.features.comingSoon" : "již brzy",
-   "subscription.features.encryptedSync" : "Šifrovaná synchronizace relací",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Přidat hostované služby jako HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "Placený ú�et Premium Supporter Franz zahrnuje",
    "subscription.paymentSessionError" : "Nebylo možné inicializovat platbu od",
    "subscription.submit.label" : "Chci podpořit vývoj aplikace Franz",
@@ -269,9 +312,20 @@
    "tabs.item.reload" : "Obnovit",
    "validation.email" : "{field} není validní",
    "validation.minLength" : "{field} musí být alespoň {length} znaků dlouhé",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} je povinné",
    "validation.url" : "{field} není validní URL",
    "welcome.loginButton" : "Přihlášení do vašeho ú�tu",
    "welcome.signupButton" : "Vytvořit ú�et zdarma",
-   "welcome.slogan" : "Zprávy, které pracují pro vás"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Všechny služby",
+   "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>Franz 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/de.json b/src/i18n/locales/de.json
index b5abb56d4..bd5193177 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -1,30 +1,42 @@
 {
-   "app.errorHandler.action" : "Neuladen",
-   "app.errorHandler.headline" : "Es trat ein Fehler auf",
-   "feature.delayApp.action" : "Upgrade deinen Account",
-   "feature.delayApp.headline" : "Erspare dir das Warten mit einer Franz Supporter Lizenz",
-   "feature.delayApp.text" : "Es geht in {seconds} Sekunden weiter.",
-   "global.api.unhealthy" : "Verbindung mit dem Franz Online Service fehlgeschlagen",
+   "app.errorHandler.action" : "Neu laden",
+   "app.errorHandler.headline" : "Es ist ein Fehler aufgetreten",
+   "feature.announcements.changelog.headline" : "Was ist neu in Franz {version}",
+   "feature.delayApp.action" : "Hol dir Franz Premium!",
+   "feature.delayApp.headline" : "Erspare dir das Warten mit Franz Premium!",
+   "feature.delayApp.text" : "In {seconds} Sekunden geht's weiter!",
+   "feature.shareFranz.action.email" : "Als E-Mail senden",
+   "feature.shareFranz.action.facebook" : "Auf Facebook teilen",
+   "feature.shareFranz.action.twitter" : "Auf Twitter teilen",
+   "feature.shareFranz.headline" : "Gemeinsam ist Franz noch besser!",
+   "feature.shareFranz.shareText.email" : "Ich verwende Franz! Hol dir jetzt die kostenlose App für WhatsApp, Messenger, Slack, Skype und viele mehr auf www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "Ich habe {count} Services zu Franz hinzugefügt! Hol dir die kostenlose App für WhatsApp, Messenger, Slack, Skype und viele mehr auf www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Bitte erzähle deinen Freunden und Kolleginnen, warum du Franz toll findest.",
+   "global.api.unhealthy" : "Verbindung zum Franz Online Service fehlgeschlagen",
    "global.notConnectedToTheInternet" : "Du bist nicht mit dem Internet verbunden.",
-   "import.headline" : "Deine Franz 4 Dienste importieren",
+   "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",
+   "import.headline" : "Deine Franz-4-Dienste importieren",
    "import.notSupportedHeadline" : "Dienste, die noch nicht von Franz 5 unterstützt werden",
    "import.skip.label" : "Ich möchte Dienste selbst hinzufügen",
    "import.submit.label" : "Dienste importieren",
-   "infobar.buttonChangelog" : "Was ist neu?",
+   "infobar.buttonChangelog" : "Was gibt es Neues?",
    "infobar.buttonInstallUpdate" : "Neu starten & Update installieren",
-   "infobar.buttonReloadServices" : "Dienste neuladen",
+   "infobar.buttonReloadServices" : "Dienste neu laden",
    "infobar.requiredRequestsFailed" : "Dienste und Benutzerinformationen konnten nicht geladen werden",
    "infobar.servicesUpdated" : "Deine Dienste wurden aktualisiert.",
-   "infobar.updateAvailable" : "Eine neue Version von Franz ist verfügbar.",
+   "infobar.updateAvailable" : "Eine neue Version von Franz ist verfügbar!",
    "invite.email.label" : "E-Mail-Adresse",
-   "invite.headline.friends" : "Lade 3 Freunde oder Kollegen ein",
+   "invite.headline.friends" : "Lade drei Freunde oder Kolleginnen ein!",
    "invite.name.label" : "Name",
-   "invite.skip.label" : "Ich möchte das später tun",
+   "invite.skip.label" : "Jetzt nicht! Ich möchte das später tun.",
    "invite.submit.label" : "Einladungen schicken",
-   "invite.successInfo" : "Die Einladungen wurden erfolgreich gesendet.",
+   "invite.successInfo" : "Die Einladungen wurden erfolgreich versendet.",
    "login.email.label" : "E-Mail-Adresse",
    "login.headline" : "Anmelden",
-   "login.invalidCredentials" : "E-Mail Adresse oder Passwort ungültig",
+   "login.invalidCredentials" : "E-Mail-Adresse oder Passwort ungültig",
    "login.link.password" : "Passwort zurücksetzen",
    "login.link.signup" : "Kostenloses Konto erstellen",
    "login.password.label" : "Passwort",
@@ -32,6 +44,7 @@
    "login.submit.label" : "Anmelden",
    "login.tokenExpired" : "Deine Sitzung ist abgelaufen, bitte melde Dich erneut an.",
    "menu.app.about" : "Ãœber Franz",
+   "menu.app.announcement" : "Was ist neu?",
    "menu.app.hide" : "Ausblenden",
    "menu.app.hideOthers" : "Andere ausblenden",
    "menu.app.quit" : "Beenden",
@@ -59,7 +72,9 @@
    "menu.help.support" : "Hilfe",
    "menu.help.tos" : "Nutzungsbedingungen",
    "menu.services" : "Dienste",
+   "menu.services.activatePreviousService" : "Vorheriger Dienst",
    "menu.services.addNewService" : "Dienst hinzufügen",
+   "menu.services.setNextServiceActive" : "Nächster Dienst",
    "menu.view" : "Darstellung",
    "menu.view.enterFullScreen" : "Vollbildmodus",
    "menu.view.exitFullScreen" : "Vollbildmodus aus",
@@ -74,9 +89,14 @@
    "menu.window" : "Fenster",
    "menu.window.close" : "Schließen",
    "menu.window.minimize" : "Minimieren",
-   "password.email.label" : "E-Mail Adresse",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Neuen Workspace hinzufügen",
+   "menu.workspaces.closeWorkspaceDrawer" : "Workspaces öffnen",
+   "menu.workspaces.defaultWorkspace" : "Alle Dienste",
+   "menu.workspaces.openWorkspaceDrawer" : "Workspaces schließen",
+   "password.email.label" : "E-Mail-Adresse",
    "password.headline" : "Passwort zurücksetzen",
-   "password.link.login" : "An Deinem Konto anmelden",
+   "password.link.login" : "Mit deinem Konto anmelden",
    "password.link.signup" : "Kostenloses Konto erstellen",
    "password.noUser" : "Es wurde kein Benutzer mit dieser E-Mail-Adresse gefunden.",
    "password.submit.label" : "Absenden",
@@ -86,28 +106,29 @@
    "pricing.link.skipPayment" : "Ich möchte die Entwicklung von Franz nicht unterstützen.",
    "pricing.submit.label" : "Ich möchte die Entwicklung von Franz unterstützen.",
    "pricing.support.label" : "Wie möchtest Du Franz unterstützen?",
-   "service.crashHandler.action" : "{name} neuladen",
+   "service.crashHandler.action" : "{name} neu laden",
    "service.crashHandler.autoReload" : "{name} wird in {seconds} Sekunden automatisch wiederhergestellt",
    "service.crashHandler.headline" : "Oh nein!",
    "service.crashHandler.text" : "{name} hat einen Fehler verursacht.",
    "service.disabledHandler.action" : "{name} aktivieren",
    "service.disabledHandler.headline" : "{name} ist deaktiviert",
-   "service.errorHandler.action" : "{name} neuladen",
+   "service.errorHandler.action" : "{name} neu laden",
    "service.errorHandler.editAction" : "{name} bearbeiten",
    "service.errorHandler.headline" : "Oh nein!",
    "service.errorHandler.message" : "Fehler",
    "service.errorHandler.text" : "{name} konnte nicht geladen werden.",
-   "services.getStarted" : "Loslegen",
-   "services.welcome" : "Willkommen bei Franz.",
+   "service.webviewLoader.loading" : "Lade",
+   "services.getStarted" : "Los geht's!",
+   "services.welcome" : "Willkommen bei Franz!",
    "settings.account.account.editButton" : "Konto bearbeiten",
-   "settings.account.accountType.basic" : "Basis Konto",
-   "settings.account.accountType.premium" : "Premium-Supporter Konto",
+   "settings.account.accountType.basic" : "Basis-Konto",
+   "settings.account.accountType.premium" : "Premium Lizenz",
    "settings.account.buttonSave" : "Profil aktualisieren",
    "settings.account.deleteAccount" : "Benutzerkonto löschen",
-   "settings.account.deleteEmailSent" : "Du hast eine Email zur Bestätigung der Löschung Deines Benutzerkontos erhalten. Dein Benutzerkonto und Deine Daten können nach der Löschung nicht wiederhergestellt werden!",
-   "settings.account.deleteInfo" : "Wenn du dein Franz Benutzerkonto nicht mehr länger benötigst, kannst du hier deinen Account und alle dazugehörigen Daten löschen.",
+   "settings.account.deleteEmailSent" : "Du hast eine E-Mail zur Bestätigung der Löschung Deines Benutzerkontos erhalten. Dein Benutzerkonto und Deine Daten können nach der Löschung nicht wiederhergestellt werden!",
+   "settings.account.deleteInfo" : "Wenn du dein Franz-Benutzerkonto nicht mehr länger benötigst, kannst du es hier mit allen dazugehörigen Daten löschen.",
    "settings.account.headline" : "Konto",
-   "settings.account.headlineAccount" : "Konto Informationen",
+   "settings.account.headlineAccount" : "Konto-Informationen",
    "settings.account.headlineDangerZone" : "Benutzerkonto löschen",
    "settings.account.headlineInvoices" : "Rechnungen",
    "settings.account.headlinePassword" : "Passwort ändern",
@@ -117,6 +138,7 @@
    "settings.account.invoiceDownload" : "Herunterladen",
    "settings.account.manageSubscription.label" : "Dein Abonnement verwalten",
    "settings.account.successInfo" : "Deine Änderungen wurden gespeichert",
+   "settings.account.tryReloadServices" : "Erneut versuchen",
    "settings.account.tryReloadUserInfoRequest" : "Erneut versuchen",
    "settings.account.userInfoRequestFailed" : "Benutzerinformationen konnten nicht geladen werden",
    "settings.app.buttonClearAllCache" : "Cache leeren",
@@ -127,43 +149,43 @@
    "settings.app.form.autoLaunchInBackground" : "Im Hintergrund öffnen",
    "settings.app.form.autoLaunchOnStart" : "Franz beim Systemstart ausführen",
    "settings.app.form.beta" : "Beta-Versionen einbeziehen",
-   "settings.app.form.darkMode" : "Die dunkle Seite erwartet dich (Dark Mode)",
+   "settings.app.form.darkMode" : "Die dunkle Seite erwartet dich! (Dark Mode)",
    "settings.app.form.enableGPUAcceleration" : "Hardwarebeschleunigung aktivieren",
-   "settings.app.form.enableMenuBar" : "Franz in Menüleiste anzeigen",
    "settings.app.form.enableSpellchecking" : "Rechtschreibprüfung aktivieren",
    "settings.app.form.enableSystemTray" : "Franz im Infobereich anzeigen",
-   "settings.app.form.hideDockIcon" : "Franz Icon im Dock ausblenden",
    "settings.app.form.language" : "Sprache",
    "settings.app.form.minimizeToSystemTray" : "Franz in den Infobereich minimieren",
    "settings.app.form.runInBackground" : "Franz im Hintergrund behalten, wenn das Fenster geschlossen wird",
    "settings.app.form.showDisabledServices" : "Deaktivierte Services-Tabs anzeigen",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Ungelesene Nachrichten zeigen, wenn die Benachrichtigungen deaktiviert sind",
-   "settings.app.form.spellcheckerLanguage" : "Sprache für Rechtschreibprüfung",
    "settings.app.headline" : "Einstellungen",
    "settings.app.headlineAdvanced" : "Erweitert",
    "settings.app.headlineAppearance" : "Darstellung",
    "settings.app.headlineGeneral" : "Allgemeines",
    "settings.app.headlineLanguage" : "Sprache",
    "settings.app.headlineUpdates" : "Updates",
+   "settings.app.languageDisclaimer" : "Offizielle Ãœbersetzungen: Englisch & Deutsch. Alle anderen Sprachen sind Ãœbersetzungen der Franz Community.",
    "settings.app.restartRequired" : "Änderungen werden erst nach einem Neustart wirksam.",
    "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Hilf uns, Franz in Deine Sprache zu übersetzen.",
-   "settings.app.updateStatusAvailable" : "Update verfügbar, lädt herunter...",
+   "settings.app.updateStatusAvailable" : "Update verfügbar, lädt herunter ...",
    "settings.app.updateStatusSearching" : "Suche nach Updates",
    "settings.app.updateStatusUpToDate" : "Du nutzt die aktuellste Version von Franz",
-   "settings.invite.headline" : "Lade 3 Deiner Freunde ein",
+   "settings.invite.headline" : "Lade drei Deiner Freunde ein",
    "settings.navigation.account" : "Konto",
    "settings.navigation.availableServices" : "Verfügbare Dienste",
    "settings.navigation.inviteFriends" : "Freunde einladen",
    "settings.navigation.logout" : "Abmelden",
    "settings.navigation.settings" : "Einstellungen",
+   "settings.navigation.team" : "Team verwalten",
    "settings.navigation.yourServices" : "Deine Dienste",
+   "settings.navigation.yourWorkspaces" : "Deine Workspaces",
    "settings.recipes.all" : "Alle Dienste",
    "settings.recipes.dev" : "Entwicklung",
    "settings.recipes.headline" : "Verfügbare Dienste",
    "settings.recipes.missingService" : "Fehlt ein Dienst?",
    "settings.recipes.mostPopular" : "Am beliebtesten",
-   "settings.recipes.nothingFound" : "Entschuldigung, aber der von Dir gesuchte Dienst konnte nicht gefunden werden.",
+   "settings.recipes.nothingFound" : "Entschuldigung, der gesuchte Dienst konnte nicht gefunden werden.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Dienst erfolgreich hinzugefügt",
    "settings.searchService" : "Dienst suchen",
    "settings.service.error.goBack" : "Zurück zu den Diensten",
@@ -172,7 +194,7 @@
    "settings.service.form.addServiceHeadline" : "{name} hinzufügen",
    "settings.service.form.availableServices" : "Verfügbare Dienste",
    "settings.service.form.customUrl" : "Eigener Server",
-   "settings.service.form.customUrlPremiumInfo" : "Um einen selbst gehosteten Dienst hinzuzufügen, brauchst Du ein Franz Premium-Supporter Konto.",
+   "settings.service.form.customUrlPremiumInfo" : "Um einen selbst gehosteten Dienst hinzuzufügen, brauchst Du ein Franz Premium Konto.",
    "settings.service.form.customUrlUpgradeAccount" : "Dein Konto upgraden",
    "settings.service.form.customUrlValidationError" : "Dein {name}-Server konnte nicht verifiziert werden.",
    "settings.service.form.deleteButton" : "Dienst löschen",
@@ -192,17 +214,15 @@
    "settings.service.form.indirectMessages" : "Nachrichten-Badge für alle neuen Nachrichten anzeigen",
    "settings.service.form.isMutedInfo" : "Sämtliche Wiedergabe von Tönen wird deaktiviert",
    "settings.service.form.name" : "Name",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Einstellungen",
+   "settings.service.form.proxy.headline" : "HTTP-\/HTTPS-Proxy-Einstellungen",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy Einstellungen werden nicht mit den Franz Servern synchronisiert.",
-   "settings.service.form.proxy.isEnabled" : "Proxy Server verwenden",
+   "settings.service.form.proxy.info" : "Proxy-Einstellungen werden nicht mit den Franz Servern synchronisiert.",
+   "settings.service.form.proxy.isEnabled" : "Proxy-Server verwenden",
    "settings.service.form.proxy.password" : "Passwort (optional)",
    "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Bitte starte Franz nach dem Ändern der Proxy Einstellungen neu.",
+   "settings.service.form.proxy.restartInfo" : "Bitte starte Franz nach dem Ändern der Proxy-Einstellungen neu.",
    "settings.service.form.proxy.user" : "Benutzer (optional)",
    "settings.service.form.saveButton" : "Dienst speichern",
-   "settings.service.form.spellcheckerLanguage" : "Sprache für Rechtschreibprüfung",
-   "settings.service.form.spellcheckerLanguage.default" : "Standard benutzen ({default})",
    "settings.service.form.tabHosted" : "Gehostet",
    "settings.service.form.tabOnPremise" : "Selbst gehostet ��",
    "settings.service.form.team" : "Team",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "Dienste entdecken",
    "settings.services.headline" : "Deine Dienste",
    "settings.services.noServicesAdded" : "Du hast noch keine Dienste hinzugefügt.",
+   "settings.services.servicesRequestFailed" : "Dienste konnten nicht geladen werden",
    "settings.services.tooltip.isDisabled" : "Dienst ist deaktiviert",
    "settings.services.tooltip.isMuted" : "Alle Töne sind deaktiviert",
    "settings.services.tooltip.notificationsDisabled" : "Benachrichtigungen deaktiviert",
    "settings.services.updatedInfo" : "Deine Änderungen wurden gespeichert",
+   "settings.team.contentHeadline" : "Franz für Teams",
+   "settings.team.copy" : "Mit Franz für Teams kannst du Kolleginnen und Kollegen per Email-Invite in dein Team einladen und ihre Abonnments in den Einstellungen deines Accounts verwalten. Verschwende keine Zeit mehr damit, Lizenzen für jedes Teammitglied einzeln einzurichten, vergiss mehrfache Rechnungen und unterschiedliche Abrechnungszeiträume - alles unter einem Dach.",
+   "settings.team.headline" : "Team",
+   "settings.team.intro" : "Mit Franz für Teams kannst du Premium Lizenzen für Kolleginnen und Kollegen oder Freunde und Familienmitglieder kaufen und verwalten - so viele du willst.",
+   "settings.team.manageAction" : "Verwalte dein Team auf meetfranz.com",
+   "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",
@@ -225,32 +252,48 @@
    "settings.user.form.firstname" : "Vorname",
    "settings.user.form.lastname" : "Nachname",
    "settings.user.form.newPassword" : "Neues Passwort",
+   "settings.workspace.add.form.name" : "Name",
+   "settings.workspace.add.form.submitButton" : "Workspace erstellen",
+   "settings.workspace.form.buttonDelete" : "Workspace löschen",
+   "settings.workspace.form.buttonSave" : "Workspace speichern",
+   "settings.workspace.form.name" : "Name",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in diesem Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Deine Workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace wurde gelöscht",
+   "settings.workspaces.headline" : "Deine Workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "Du hast noch keine Workspaces hinzugefügt",
+   "settings.workspaces.tryReloadWorkspaces" : "Erneut versuchen",
+   "settings.workspaces.updatedInfo" : "Deine Änderungen wurden gespeichert",
+   "settings.workspaces.workspaceFeatureHeadline" : "Weniger ist mehr: Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Mit Franz 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.",
+   "settings.workspaces.workspacesRequestFailed" : "Workspaces konnte nicht geladen werden",
    "sidebar.addNewService" : "Neuen Dienst hinzufügen",
+   "sidebar.closeWorkspaceDrawer" : "Workspaces schließen",
    "sidebar.muteApp" : "Benachrichtigungen & Audio deaktivieren",
+   "sidebar.openWorkspaceDrawer" : "Workspaces öffnen",
    "sidebar.settings" : "Einstellungen",
    "sidebar.unmuteApp" : "Benachrichtigungen & Audio aktivieren",
    "signup.company.label" : "Firma",
-   "signup.email.label" : "E-Mail Adresse",
+   "signup.email.label" : "E-Mail-Adresse",
    "signup.emailDuplicate" : "Es existiert bereits ein Benutzer mit dieser E-Mail Adresse.",
    "signup.firstname.label" : "Vorname",
    "signup.headline" : "Anmelden",
    "signup.lastname.label" : "Nachname",
-   "signup.legal.info" : "Mit der Erstellung eines Franz Kontos akzeptierst Du die",
+   "signup.legal.info" : "Mit der Erstellung eines Franz-Kontos akzeptierst Du die",
    "signup.legal.privacy" : "Datenschutzerklärung",
    "signup.legal.terms" : "Nutzungsbedingungen",
    "signup.link.login" : "Du hast bereits ein Konto? Melde Dich an.",
    "signup.password.label" : "Passwort",
    "signup.submit.label" : "Konto erstellen",
-   "subscription.euTaxInfo" : "Preise sind exklusive Steuern.",
+   "subscription.euTaxInfo" : "Preise zuzüglich allfälliger Steuern",
    "subscription.features.ads" : "Werbefrei auf Lebenszeit!",
    "subscription.features.comingSoon" : "folgt bald",
-   "subscription.features.encryptedSync" : "Verschlüsselte Sitzungs-Synchronisation",
-   "subscription.features.noInterruptions" : "Keine Wartezeiten um Franz zu verwenden",
-   "subscription.features.onpremise" : "Integration von gehosteten Diensten, wie HipChat",
-   "subscription.features.onpremise.mattermost" : "Integration von gehosteten Diensten, wie Mattermost",
+   "subscription.features.noInterruptions" : "Verwende Franz ohne Wartezeiten",
+   "subscription.features.onpremise.mattermost" : "Integration von gehosteten Diensten wie Mattermost",
    "subscription.features.proxy" : "Proxy Support für Dienste",
    "subscription.features.spellchecker" : "Unterstützung für Rechtschreibprüfung",
-   "subscription.includedFeatures" : "Bezahlte Franz Premium Support Konten beinhalten",
+   "subscription.features.workspaces" : "Organisiere deine Services in Workspaces",
+   "subscription.includedFeatures" : "Bezahlte Franz Premium Lizenzen beinhalten",
    "subscription.paymentSessionError" : "Das Zahlungs-Formular konnte nicht geladen werden.",
    "subscription.submit.label" : "Ich möchte die Entwicklung von Franz unterstützen",
    "subscription.type.free" : "kostenlos",
@@ -266,12 +309,23 @@
    "tabs.item.enableAudio" : "Audio aktivieren",
    "tabs.item.enableNotification" : "Benachrichtigungen aktivieren",
    "tabs.item.enableService" : "Dienst aktivieren",
-   "tabs.item.reload" : "Neuladen",
+   "tabs.item.reload" : "Neu laden",
    "validation.email" : "{field} ist ungültig",
    "validation.minLength" : "{field} muss mindestens {length} Zeichen enthalten",
+   "validation.oneRequired" : "Mindestens ein Wert wird benötigt",
    "validation.required" : "{field} wird benötigt",
    "validation.url" : "{field} ist keine gültige URL",
    "welcome.loginButton" : "Bei Franz einloggen",
    "welcome.signupButton" : "Kostenloses Konto erstellen",
-   "welcome.slogan" : "Kommunikation, die für Dich funktioniert"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Neuen Workspace hinzufügen",
+   "workspaceDrawer.allServices" : "Alle Dienste",
+   "workspaceDrawer.headline" : "Workspaces",
+   "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 Franz 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
new file mode 100644
index 000000000..632eb38fd
--- /dev/null
+++ b/src/i18n/locales/defaultMessages.json
@@ -0,0 +1,4603 @@
+[
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Import your Franz 4 services",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/auth/Import.js",
+        "id": "import.headline",
+        "start": {
+          "column": 12,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Services not yet supported in Franz 5",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/components/auth/Import.js",
+        "id": "import.notSupportedHeadline",
+        "start": {
+          "column": 24,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Import {count} services",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/components/auth/Import.js",
+        "id": "import.submit.label",
+        "start": {
+          "column": 21,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!I want to add services manually",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/auth/Import.js",
+        "id": "import.skip.label",
+        "start": {
+          "column": 19,
+          "line": 25
+        }
+      }
+    ],
+    "path": "src/components/auth/Import.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Invite Friends",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/components/auth/Invite.js",
+        "id": "settings.invite.headline",
+        "start": {
+          "column": 20,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!Invite 3 of your friends or colleagues",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/components/auth/Invite.js",
+        "id": "invite.headline.friends",
+        "start": {
+          "column": 12,
+          "line": 20
+        }
+      },
+      {
+        "defaultMessage": "!!!Name",
+        "end": {
+          "column": 3,
+          "line": 27
+        },
+        "file": "src/components/auth/Invite.js",
+        "id": "invite.name.label",
+        "start": {
+          "column": 13,
+          "line": 24
+        }
+      },
+      {
+        "defaultMessage": "!!!Email address",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "file": "src/components/auth/Invite.js",
+        "id": "invite.email.label",
+        "start": {
+          "column": 14,
+          "line": 28
+        }
+      },
+      {
+        "defaultMessage": "!!!Send invites",
+        "end": {
+          "column": 3,
+          "line": 35
+        },
+        "file": "src/components/auth/Invite.js",
+        "id": "invite.submit.label",
+        "start": {
+          "column": 21,
+          "line": 32
+        }
+      },
+      {
+        "defaultMessage": "!!!I want to do this later",
+        "end": {
+          "column": 3,
+          "line": 39
+        },
+        "file": "src/components/auth/Invite.js",
+        "id": "invite.skip.label",
+        "start": {
+          "column": 19,
+          "line": 36
+        }
+      },
+      {
+        "defaultMessage": "!!!Invitations sent successfully",
+        "end": {
+          "column": 3,
+          "line": 43
+        },
+        "file": "src/components/auth/Invite.js",
+        "id": "invite.successInfo",
+        "start": {
+          "column": 21,
+          "line": 40
+        }
+      }
+    ],
+    "path": "src/components/auth/Invite.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Sign in",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.headline",
+        "start": {
+          "column": 12,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Email address",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.email.label",
+        "start": {
+          "column": 14,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Password",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.password.label",
+        "start": {
+          "column": 17,
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Sign in",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.submit.label",
+        "start": {
+          "column": 21,
+          "line": 29
+        }
+      },
+      {
+        "defaultMessage": "!!!Email or password not valid",
+        "end": {
+          "column": 3,
+          "line": 36
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.invalidCredentials",
+        "start": {
+          "column": 22,
+          "line": 33
+        }
+      },
+      {
+        "defaultMessage": "!!!Your session expired, please login again.",
+        "end": {
+          "column": 3,
+          "line": 40
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.tokenExpired",
+        "start": {
+          "column": 16,
+          "line": 37
+        }
+      },
+      {
+        "defaultMessage": "!!!Your session expired, please login again.",
+        "end": {
+          "column": 3,
+          "line": 44
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.serverLogout",
+        "start": {
+          "column": 16,
+          "line": 41
+        }
+      },
+      {
+        "defaultMessage": "!!!Create a free account",
+        "end": {
+          "column": 3,
+          "line": 48
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.link.signup",
+        "start": {
+          "column": 14,
+          "line": 45
+        }
+      },
+      {
+        "defaultMessage": "!!!Forgot password",
+        "end": {
+          "column": 3,
+          "line": 52
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.link.password",
+        "start": {
+          "column": 16,
+          "line": 49
+        }
+      }
+    ],
+    "path": "src/components/auth/Login.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Forgot password",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
+        "file": "src/components/auth/Password.js",
+        "id": "password.headline",
+        "start": {
+          "column": 12,
+          "line": 14
+        }
+      },
+      {
+        "defaultMessage": "!!!Email address",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/components/auth/Password.js",
+        "id": "password.email.label",
+        "start": {
+          "column": 14,
+          "line": 18
+        }
+      },
+      {
+        "defaultMessage": "!!!Submit",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/components/auth/Password.js",
+        "id": "password.submit.label",
+        "start": {
+          "column": 21,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!!Your new password was sent to your email address",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/components/auth/Password.js",
+        "id": "password.successInfo",
+        "start": {
+          "column": 15,
+          "line": 26
+        }
+      },
+      {
+        "defaultMessage": "!!!No user affiliated with that email address",
+        "end": {
+          "column": 3,
+          "line": 33
+        },
+        "file": "src/components/auth/Password.js",
+        "id": "password.noUser",
+        "start": {
+          "column": 10,
+          "line": 30
+        }
+      },
+      {
+        "defaultMessage": "!!!Create a free account",
+        "end": {
+          "column": 3,
+          "line": 37
+        },
+        "file": "src/components/auth/Password.js",
+        "id": "password.link.signup",
+        "start": {
+          "column": 14,
+          "line": 34
+        }
+      },
+      {
+        "defaultMessage": "!!!Sign in to your account",
+        "end": {
+          "column": 3,
+          "line": 41
+        },
+        "file": "src/components/auth/Password.js",
+        "id": "password.link.login",
+        "start": {
+          "column": 13,
+          "line": 38
+        }
+      }
+    ],
+    "path": "src/components/auth/Password.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Support Franz",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/auth/Pricing.js",
+        "id": "pricing.headline",
+        "start": {
+          "column": 12,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Select your support plan",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/components/auth/Pricing.js",
+        "id": "pricing.support.label",
+        "start": {
+          "column": 23,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Support the development of Franz",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/components/auth/Pricing.js",
+        "id": "pricing.submit.label",
+        "start": {
+          "column": 21,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!I don't want to support the development of Franz.",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/auth/Pricing.js",
+        "id": "pricing.link.skipPayment",
+        "start": {
+          "column": 15,
+          "line": 25
+        }
+      }
+    ],
+    "path": "src/components/auth/Pricing.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Sign up",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.headline",
+        "start": {
+          "column": 12,
+          "line": 18
+        }
+      },
+      {
+        "defaultMessage": "!!!Firstname",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.firstname.label",
+        "start": {
+          "column": 18,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!!Lastname",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.lastname.label",
+        "start": {
+          "column": 17,
+          "line": 26
+        }
+      },
+      {
+        "defaultMessage": "!!!Email address",
+        "end": {
+          "column": 3,
+          "line": 33
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.email.label",
+        "start": {
+          "column": 14,
+          "line": 30
+        }
+      },
+      {
+        "defaultMessage": "!!!Company",
+        "end": {
+          "column": 3,
+          "line": 37
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.company.label",
+        "start": {
+          "column": 16,
+          "line": 34
+        }
+      },
+      {
+        "defaultMessage": "!!!Password",
+        "end": {
+          "column": 3,
+          "line": 41
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.password.label",
+        "start": {
+          "column": 17,
+          "line": 38
+        }
+      },
+      {
+        "defaultMessage": "!!!By creating a Franz account you accept the",
+        "end": {
+          "column": 3,
+          "line": 45
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.legal.info",
+        "start": {
+          "column": 13,
+          "line": 42
+        }
+      },
+      {
+        "defaultMessage": "!!!Terms of service",
+        "end": {
+          "column": 3,
+          "line": 49
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.legal.terms",
+        "start": {
+          "column": 9,
+          "line": 46
+        }
+      },
+      {
+        "defaultMessage": "!!!Privacy Statement",
+        "end": {
+          "column": 3,
+          "line": 53
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.legal.privacy",
+        "start": {
+          "column": 11,
+          "line": 50
+        }
+      },
+      {
+        "defaultMessage": "!!!Create account",
+        "end": {
+          "column": 3,
+          "line": 57
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.submit.label",
+        "start": {
+          "column": 21,
+          "line": 54
+        }
+      },
+      {
+        "defaultMessage": "!!!Already have an account, sign in?",
+        "end": {
+          "column": 3,
+          "line": 61
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.link.login",
+        "start": {
+          "column": 13,
+          "line": 58
+        }
+      },
+      {
+        "defaultMessage": "!!!A user with that email address already exists",
+        "end": {
+          "column": 3,
+          "line": 65
+        },
+        "file": "src/components/auth/Signup.js",
+        "id": "signup.emailDuplicate",
+        "start": {
+          "column": 18,
+          "line": 62
+        }
+      }
+    ],
+    "path": "src/components/auth/Signup.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Create a free account",
+        "end": {
+          "column": 3,
+          "line": 12
+        },
+        "file": "src/components/auth/Welcome.js",
+        "id": "welcome.signupButton",
+        "start": {
+          "column": 16,
+          "line": 9
+        }
+      },
+      {
+        "defaultMessage": "!!!Login to your account",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/auth/Welcome.js",
+        "id": "welcome.loginButton",
+        "start": {
+          "column": 15,
+          "line": 13
+        }
+      }
+    ],
+    "path": "src/components/auth/Welcome.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Your services have been updated.",
+        "end": {
+          "column": 3,
+          "line": 30
+        },
+        "file": "src/components/layout/AppLayout.js",
+        "id": "infobar.servicesUpdated",
+        "start": {
+          "column": 19,
+          "line": 27
+        }
+      },
+      {
+        "defaultMessage": "!!!A new update for Franz is available.",
+        "end": {
+          "column": 3,
+          "line": 34
+        },
+        "file": "src/components/layout/AppLayout.js",
+        "id": "infobar.updateAvailable",
+        "start": {
+          "column": 19,
+          "line": 31
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload services",
+        "end": {
+          "column": 3,
+          "line": 38
+        },
+        "file": "src/components/layout/AppLayout.js",
+        "id": "infobar.buttonReloadServices",
+        "start": {
+          "column": 24,
+          "line": 35
+        }
+      },
+      {
+        "defaultMessage": "!!!Changelog",
+        "end": {
+          "column": 3,
+          "line": 42
+        },
+        "file": "src/components/layout/AppLayout.js",
+        "id": "infobar.buttonChangelog",
+        "start": {
+          "column": 13,
+          "line": 39
+        }
+      },
+      {
+        "defaultMessage": "!!!Restart & install update",
+        "end": {
+          "column": 3,
+          "line": 46
+        },
+        "file": "src/components/layout/AppLayout.js",
+        "id": "infobar.buttonInstallUpdate",
+        "start": {
+          "column": 23,
+          "line": 43
+        }
+      },
+      {
+        "defaultMessage": "!!!Could not load services and user information",
+        "end": {
+          "column": 3,
+          "line": 50
+        },
+        "file": "src/components/layout/AppLayout.js",
+        "id": "infobar.requiredRequestsFailed",
+        "start": {
+          "column": 26,
+          "line": 47
+        }
+      }
+    ],
+    "path": "src/components/layout/AppLayout.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Settings",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/layout/Sidebar.js",
+        "id": "sidebar.settings",
+        "start": {
+          "column": 12,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Add new service",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/components/layout/Sidebar.js",
+        "id": "sidebar.addNewService",
+        "start": {
+          "column": 17,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Disable notifications & audio",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/components/layout/Sidebar.js",
+        "id": "sidebar.muteApp",
+        "start": {
+          "column": 8,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable notifications & audio",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/layout/Sidebar.js",
+        "id": "sidebar.unmuteApp",
+        "start": {
+          "column": 10,
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Open workspace drawer",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/components/layout/Sidebar.js",
+        "id": "sidebar.openWorkspaceDrawer",
+        "start": {
+          "column": 23,
+          "line": 29
+        }
+      },
+      {
+        "defaultMessage": "!!!Close workspace drawer",
+        "end": {
+          "column": 3,
+          "line": 36
+        },
+        "file": "src/components/layout/Sidebar.js",
+        "id": "sidebar.closeWorkspaceDrawer",
+        "start": {
+          "column": 24,
+          "line": 33
+        }
+      }
+    ],
+    "path": "src/components/layout/Sidebar.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Oh no!",
+        "end": {
+          "column": 3,
+          "line": 15
+        },
+        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+        "id": "service.errorHandler.headline",
+        "start": {
+          "column": 12,
+          "line": 12
+        }
+      },
+      {
+        "defaultMessage": "!!!{name} has failed to load.",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+        "id": "service.errorHandler.text",
+        "start": {
+          "column": 8,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload {name}",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+        "id": "service.errorHandler.action",
+        "start": {
+          "column": 10,
+          "line": 20
+        }
+      },
+      {
+        "defaultMessage": "!!!Edit {name}",
+        "end": {
+          "column": 3,
+          "line": 27
+        },
+        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+        "id": "service.errorHandler.editAction",
+        "start": {
+          "column": 14,
+          "line": 24
+        }
+      },
+      {
+        "defaultMessage": "!!!Error:",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+        "id": "service.errorHandler.message",
+        "start": {
+          "column": 16,
+          "line": 28
+        }
+      }
+    ],
+    "path": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!{name} is disabled",
+        "end": {
+          "column": 3,
+          "line": 12
+        },
+        "file": "src/components/services/content/ServiceDisabled.js",
+        "id": "service.disabledHandler.headline",
+        "start": {
+          "column": 12,
+          "line": 9
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable {name}",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/services/content/ServiceDisabled.js",
+        "id": "service.disabledHandler.action",
+        "start": {
+          "column": 10,
+          "line": 13
+        }
+      }
+    ],
+    "path": "src/components/services/content/ServiceDisabled.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Welcome to Franz",
+        "end": {
+          "column": 3,
+          "line": 14
+        },
+        "file": "src/components/services/content/Services.js",
+        "id": "services.welcome",
+        "start": {
+          "column": 11,
+          "line": 11
+        }
+      },
+      {
+        "defaultMessage": "!!!Get started",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/services/content/Services.js",
+        "id": "services.getStarted",
+        "start": {
+          "column": 14,
+          "line": 15
+        }
+      }
+    ],
+    "path": "src/components/services/content/Services.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Oh no!",
+        "end": {
+          "column": 3,
+          "line": 13
+        },
+        "file": "src/components/services/content/WebviewCrashHandler.js",
+        "id": "service.crashHandler.headline",
+        "start": {
+          "column": 12,
+          "line": 10
+        }
+      },
+      {
+        "defaultMessage": "!!!{name} has caused an error.",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
+        "file": "src/components/services/content/WebviewCrashHandler.js",
+        "id": "service.crashHandler.text",
+        "start": {
+          "column": 8,
+          "line": 14
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload {name}",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/components/services/content/WebviewCrashHandler.js",
+        "id": "service.crashHandler.action",
+        "start": {
+          "column": 10,
+          "line": 18
+        }
+      },
+      {
+        "defaultMessage": "!!!Trying to automatically restore {name} in {seconds} seconds",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/components/services/content/WebviewCrashHandler.js",
+        "id": "service.crashHandler.autoReload",
+        "start": {
+          "column": 14,
+          "line": 22
+        }
+      }
+    ],
+    "path": "src/components/services/content/WebviewCrashHandler.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Reload",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.reload",
+        "start": {
+          "column": 10,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!Edit",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.edit",
+        "start": {
+          "column": 8,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Disable notifications",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.disableNotifications",
+        "start": {
+          "column": 24,
+          "line": 23
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable notifications",
+        "end": {
+          "column": 3,
+          "line": 30
+        },
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.enableNotification",
+        "start": {
+          "column": 23,
+          "line": 27
+        }
+      },
+      {
+        "defaultMessage": "!!!Disable audio",
+        "end": {
+          "column": 3,
+          "line": 34
+        },
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.disableAudio",
+        "start": {
+          "column": 16,
+          "line": 31
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable audio",
+        "end": {
+          "column": 3,
+          "line": 38
+        },
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.enableAudio",
+        "start": {
+          "column": 15,
+          "line": 35
+        }
+      },
+      {
+        "defaultMessage": "!!!Disable Service",
+        "end": {
+          "column": 3,
+          "line": 42
+        },
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.disableService",
+        "start": {
+          "column": 18,
+          "line": 39
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable Service",
+        "end": {
+          "column": 3,
+          "line": 46
+        },
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.enableService",
+        "start": {
+          "column": 17,
+          "line": 43
+        }
+      },
+      {
+        "defaultMessage": "!!!Delete Service",
+        "end": {
+          "column": 3,
+          "line": 50
+        },
+        "file": "src/components/services/tabs/TabItem.js",
+        "id": "tabs.item.deleteService",
+        "start": {
+          "column": 17,
+          "line": 47
+        }
+      }
+    ],
+    "path": "src/components/services/tabs/TabItem.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Account",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.headline",
+        "start": {
+          "column": 12,
+          "line": 14
+        }
+      },
+      {
+        "defaultMessage": "!!!Your Subscription",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.headlineSubscription",
+        "start": {
+          "column": 24,
+          "line": 18
+        }
+      },
+      {
+        "defaultMessage": "!!!Upgrade your Account",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.headlineUpgrade",
+        "start": {
+          "column": 19,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!Danger Zone",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.headlineDangerZone",
+        "start": {
+          "column": 22,
+          "line": 26
+        }
+      },
+      {
+        "defaultMessage": "!!!Manage your subscription",
+        "end": {
+          "column": 3,
+          "line": 33
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.manageSubscription.label",
+        "start": {
+          "column": 33,
+          "line": 30
+        }
+      },
+      {
+        "defaultMessage": "!!!Basic Account",
+        "end": {
+          "column": 3,
+          "line": 37
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.accountType.basic",
+        "start": {
+          "column": 20,
+          "line": 34
+        }
+      },
+      {
+        "defaultMessage": "!!!Premium Supporter Account",
+        "end": {
+          "column": 3,
+          "line": 41
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.accountType.premium",
+        "start": {
+          "column": 22,
+          "line": 38
+        }
+      },
+      {
+        "defaultMessage": "!!!Edit Account",
+        "end": {
+          "column": 3,
+          "line": 45
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.account.editButton",
+        "start": {
+          "column": 21,
+          "line": 42
+        }
+      },
+      {
+        "defaultMessage": "!!Invoices",
+        "end": {
+          "column": 3,
+          "line": 49
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.headlineInvoices",
+        "start": {
+          "column": 18,
+          "line": 46
+        }
+      },
+      {
+        "defaultMessage": "!!!Download",
+        "end": {
+          "column": 3,
+          "line": 53
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.invoiceDownload",
+        "start": {
+          "column": 19,
+          "line": 50
+        }
+      },
+      {
+        "defaultMessage": "!!!Could not load user information",
+        "end": {
+          "column": 3,
+          "line": 57
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.userInfoRequestFailed",
+        "start": {
+          "column": 25,
+          "line": 54
+        }
+      },
+      {
+        "defaultMessage": "!!!Try again",
+        "end": {
+          "column": 3,
+          "line": 61
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.tryReloadUserInfoRequest",
+        "start": {
+          "column": 28,
+          "line": 58
+        }
+      },
+      {
+        "defaultMessage": "!!!Delete account",
+        "end": {
+          "column": 3,
+          "line": 65
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.deleteAccount",
+        "start": {
+          "column": 17,
+          "line": 62
+        }
+      },
+      {
+        "defaultMessage": "!!!If you don't need your Franz account any longer, you can delete your account and all related data here.",
+        "end": {
+          "column": 3,
+          "line": 69
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.deleteInfo",
+        "start": {
+          "column": 14,
+          "line": 66
+        }
+      },
+      {
+        "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": 73
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.deleteEmailSent",
+        "start": {
+          "column": 19,
+          "line": 70
+        }
+      }
+    ],
+    "path": "src/components/settings/account/AccountDashboard.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Available services",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.availableServices",
+        "start": {
+          "column": 21,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Your services",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.yourServices",
+        "start": {
+          "column": 16,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Your workspaces",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.yourWorkspaces",
+        "start": {
+          "column": 18,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Account",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.account",
+        "start": {
+          "column": 11,
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Manage Team",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.team",
+        "start": {
+          "column": 8,
+          "line": 29
+        }
+      },
+      {
+        "defaultMessage": "!!!Settings",
+        "end": {
+          "column": 3,
+          "line": 36
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.settings",
+        "start": {
+          "column": 12,
+          "line": 33
+        }
+      },
+      {
+        "defaultMessage": "!!!Invite Friends",
+        "end": {
+          "column": 3,
+          "line": 40
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.inviteFriends",
+        "start": {
+          "column": 17,
+          "line": 37
+        }
+      },
+      {
+        "defaultMessage": "!!!Logout",
+        "end": {
+          "column": 3,
+          "line": 44
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.logout",
+        "start": {
+          "column": 10,
+          "line": 41
+        }
+      }
+    ],
+    "path": "src/components/settings/navigation/SettingsNavigation.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Available Services",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.headline",
+        "start": {
+          "column": 12,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!Search service",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.searchService",
+        "start": {
+          "column": 17,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Most popular",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.mostPopular",
+        "start": {
+          "column": 22,
+          "line": 23
+        }
+      },
+      {
+        "defaultMessage": "!!!All services",
+        "end": {
+          "column": 3,
+          "line": 30
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.all",
+        "start": {
+          "column": 14,
+          "line": 27
+        }
+      },
+      {
+        "defaultMessage": "!!!Development",
+        "end": {
+          "column": 3,
+          "line": 34
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.dev",
+        "start": {
+          "column": 14,
+          "line": 31
+        }
+      },
+      {
+        "defaultMessage": "!!!Sorry, but no service matched your search term.",
+        "end": {
+          "column": 3,
+          "line": 38
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.nothingFound",
+        "start": {
+          "column": 16,
+          "line": 35
+        }
+      },
+      {
+        "defaultMessage": "!!!Service successfully added",
+        "end": {
+          "column": 3,
+          "line": 42
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.servicesSuccessfulAddedInfo",
+        "start": {
+          "column": 31,
+          "line": 39
+        }
+      },
+      {
+        "defaultMessage": "!!!Missing a service?",
+        "end": {
+          "column": 3,
+          "line": 46
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.missingService",
+        "start": {
+          "column": 18,
+          "line": 43
+        }
+      }
+    ],
+    "path": "src/components/settings/recipes/RecipesDashboard.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Save service",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.saveButton",
+        "start": {
+          "column": 15,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!!Delete Service",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.deleteButton",
+        "start": {
+          "column": 17,
+          "line": 26
+        }
+      },
+      {
+        "defaultMessage": "!!!Available services",
+        "end": {
+          "column": 3,
+          "line": 33
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.availableServices",
+        "start": {
+          "column": 21,
+          "line": 30
+        }
+      },
+      {
+        "defaultMessage": "!!!Your services",
+        "end": {
+          "column": 3,
+          "line": 37
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.yourServices",
+        "start": {
+          "column": 16,
+          "line": 34
+        }
+      },
+      {
+        "defaultMessage": "!!!Add {name}",
+        "end": {
+          "column": 3,
+          "line": 41
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.addServiceHeadline",
+        "start": {
+          "column": 22,
+          "line": 38
+        }
+      },
+      {
+        "defaultMessage": "!!!Edit {name}",
+        "end": {
+          "column": 3,
+          "line": 45
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.editServiceHeadline",
+        "start": {
+          "column": 23,
+          "line": 42
+        }
+      },
+      {
+        "defaultMessage": "!!!Hosted",
+        "end": {
+          "column": 3,
+          "line": 49
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.tabHosted",
+        "start": {
+          "column": 13,
+          "line": 46
+        }
+      },
+      {
+        "defaultMessage": "!!!Self hosted ��",
+        "end": {
+          "column": 3,
+          "line": 53
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.tabOnPremise",
+        "start": {
+          "column": 16,
+          "line": 50
+        }
+      },
+      {
+        "defaultMessage": "!!!Use the hosted {name} service.",
+        "end": {
+          "column": 3,
+          "line": 57
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.useHostedService",
+        "start": {
+          "column": 20,
+          "line": 54
+        }
+      },
+      {
+        "defaultMessage": "!!!Could not validate custom {name} server.",
+        "end": {
+          "column": 3,
+          "line": 61
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.customUrlValidationError",
+        "start": {
+          "column": 28,
+          "line": 58
+        }
+      },
+      {
+        "defaultMessage": "!!!To add self hosted services, you need a Franz Premium Supporter Account.",
+        "end": {
+          "column": 3,
+          "line": 65
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.customUrlPremiumInfo",
+        "start": {
+          "column": 24,
+          "line": 62
+        }
+      },
+      {
+        "defaultMessage": "!!!Upgrade your account",
+        "end": {
+          "column": 3,
+          "line": 69
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.customUrlUpgradeAccount",
+        "start": {
+          "column": 27,
+          "line": 66
+        }
+      },
+      {
+        "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
+        "end": {
+          "column": 3,
+          "line": 73
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.indirectMessageInfo",
+        "start": {
+          "column": 23,
+          "line": 70
+        }
+      },
+      {
+        "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
+        "end": {
+          "column": 3,
+          "line": 77
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.isMutedInfo",
+        "start": {
+          "column": 15,
+          "line": 74
+        }
+      },
+      {
+        "defaultMessage": "!!!Notifications",
+        "end": {
+          "column": 3,
+          "line": 81
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.headlineNotifications",
+        "start": {
+          "column": 25,
+          "line": 78
+        }
+      },
+      {
+        "defaultMessage": "!!!Unread message badges",
+        "end": {
+          "column": 3,
+          "line": 85
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.headlineBadges",
+        "start": {
+          "column": 18,
+          "line": 82
+        }
+      },
+      {
+        "defaultMessage": "!!!General",
+        "end": {
+          "column": 3,
+          "line": 89
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.headlineGeneral",
+        "start": {
+          "column": 19,
+          "line": 86
+        }
+      },
+      {
+        "defaultMessage": "!!!Delete",
+        "end": {
+          "column": 3,
+          "line": 93
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.iconDelete",
+        "start": {
+          "column": 14,
+          "line": 90
+        }
+      },
+      {
+        "defaultMessage": "!!!Drop your image, or click here",
+        "end": {
+          "column": 3,
+          "line": 97
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.iconUpload",
+        "start": {
+          "column": 14,
+          "line": 94
+        }
+      },
+      {
+        "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
+        "end": {
+          "column": 3,
+          "line": 101
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.proxy.headline",
+        "start": {
+          "column": 17,
+          "line": 98
+        }
+      },
+      {
+        "defaultMessage": "!!!Please restart Franz after changing proxy Settings.",
+        "end": {
+          "column": 3,
+          "line": 105
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.proxy.restartInfo",
+        "start": {
+          "column": 20,
+          "line": 102
+        }
+      },
+      {
+        "defaultMessage": "!!!Proxy settings will not be synchronized with the Franz servers.",
+        "end": {
+          "column": 3,
+          "line": 109
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.proxy.info",
+        "start": {
+          "column": 13,
+          "line": 106
+        }
+      }
+    ],
+    "path": "src/components/settings/services/EditServiceForm.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Error",
+        "end": {
+          "column": 3,
+          "line": 13
+        },
+        "file": "src/components/settings/services/ServiceError.js",
+        "id": "settings.service.error.headline",
+        "start": {
+          "column": 12,
+          "line": 10
+        }
+      },
+      {
+        "defaultMessage": "!!!Back to services",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
+        "file": "src/components/settings/services/ServiceError.js",
+        "id": "settings.service.error.goBack",
+        "start": {
+          "column": 10,
+          "line": 14
+        }
+      },
+      {
+        "defaultMessage": "!!!Available services",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/components/settings/services/ServiceError.js",
+        "id": "settings.service.form.availableServices",
+        "start": {
+          "column": 21,
+          "line": 18
+        }
+      },
+      {
+        "defaultMessage": "!!!Could not load service recipe.",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/components/settings/services/ServiceError.js",
+        "id": "settings.service.error.message",
+        "start": {
+          "column": 16,
+          "line": 22
+        }
+      }
+    ],
+    "path": "src/components/settings/services/ServiceError.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Service is disabled",
+        "end": {
+          "column": 3,
+          "line": 14
+        },
+        "file": "src/components/settings/services/ServiceItem.js",
+        "id": "settings.services.tooltip.isDisabled",
+        "start": {
+          "column": 21,
+          "line": 11
+        }
+      },
+      {
+        "defaultMessage": "!!!Notifications are disabled",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/settings/services/ServiceItem.js",
+        "id": "settings.services.tooltip.notificationsDisabled",
+        "start": {
+          "column": 32,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!All sounds are muted",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/components/settings/services/ServiceItem.js",
+        "id": "settings.services.tooltip.isMuted",
+        "start": {
+          "column": 18,
+          "line": 19
+        }
+      }
+    ],
+    "path": "src/components/settings/services/ServiceItem.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Your services",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
+        "file": "src/components/settings/services/ServicesDashboard.js",
+        "id": "settings.services.headline",
+        "start": {
+          "column": 12,
+          "line": 14
+        }
+      },
+      {
+        "defaultMessage": "!!!Search service",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/components/settings/services/ServicesDashboard.js",
+        "id": "settings.searchService",
+        "start": {
+          "column": 17,
+          "line": 18
+        }
+      },
+      {
+        "defaultMessage": "!!!You haven't added any services yet.",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/components/settings/services/ServicesDashboard.js",
+        "id": "settings.services.noServicesAdded",
+        "start": {
+          "column": 19,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!!Sorry, but no service matched your search term.",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/components/settings/services/ServicesDashboard.js",
+        "id": "settings.recipes.nothingFound",
+        "start": {
+          "column": 18,
+          "line": 26
+        }
+      },
+      {
+        "defaultMessage": "!!!Discover services",
+        "end": {
+          "column": 3,
+          "line": 33
+        },
+        "file": "src/components/settings/services/ServicesDashboard.js",
+        "id": "settings.services.discoverServices",
+        "start": {
+          "column": 20,
+          "line": 30
+        }
+      },
+      {
+        "defaultMessage": "!!!Could not load your services",
+        "end": {
+          "column": 3,
+          "line": 37
+        },
+        "file": "src/components/settings/services/ServicesDashboard.js",
+        "id": "settings.services.servicesRequestFailed",
+        "start": {
+          "column": 25,
+          "line": 34
+        }
+      },
+      {
+        "defaultMessage": "!!!Try again",
+        "end": {
+          "column": 3,
+          "line": 41
+        },
+        "file": "src/components/settings/services/ServicesDashboard.js",
+        "id": "settings.account.tryReloadServices",
+        "start": {
+          "column": 21,
+          "line": 38
+        }
+      },
+      {
+        "defaultMessage": "!!!Your changes have been saved",
+        "end": {
+          "column": 3,
+          "line": 45
+        },
+        "file": "src/components/settings/services/ServicesDashboard.js",
+        "id": "settings.services.updatedInfo",
+        "start": {
+          "column": 15,
+          "line": 42
+        }
+      },
+      {
+        "defaultMessage": "!!!Service has been deleted",
+        "end": {
+          "column": 3,
+          "line": 49
+        },
+        "file": "src/components/settings/services/ServicesDashboard.js",
+        "id": "settings.services.deletedInfo",
+        "start": {
+          "column": 15,
+          "line": 46
+        }
+      }
+    ],
+    "path": "src/components/settings/services/ServicesDashboard.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Settings",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.headline",
+        "start": {
+          "column": 12,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!General",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.headlineGeneral",
+        "start": {
+          "column": 19,
+          "line": 20
+        }
+      },
+      {
+        "defaultMessage": "!!!Language",
+        "end": {
+          "column": 3,
+          "line": 27
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.headlineLanguage",
+        "start": {
+          "column": 20,
+          "line": 24
+        }
+      },
+      {
+        "defaultMessage": "!!!Updates",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.headlineUpdates",
+        "start": {
+          "column": 19,
+          "line": 28
+        }
+      },
+      {
+        "defaultMessage": "!!!Appearance",
+        "end": {
+          "column": 3,
+          "line": 35
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.headlineAppearance",
+        "start": {
+          "column": 22,
+          "line": 32
+        }
+      },
+      {
+        "defaultMessage": "!!!Advanced",
+        "end": {
+          "column": 3,
+          "line": 39
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.headlineAdvanced",
+        "start": {
+          "column": 20,
+          "line": 36
+        }
+      },
+      {
+        "defaultMessage": "!!!Help us to translate Franz into your language.",
+        "end": {
+          "column": 3,
+          "line": 43
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.translationHelp",
+        "start": {
+          "column": 19,
+          "line": 40
+        }
+      },
+      {
+        "defaultMessage": "!!!Cache",
+        "end": {
+          "column": 3,
+          "line": 47
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.subheadlineCache",
+        "start": {
+          "column": 20,
+          "line": 44
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz cache is currently using {size} of disk space.",
+        "end": {
+          "column": 3,
+          "line": 51
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.cacheInfo",
+        "start": {
+          "column": 13,
+          "line": 48
+        }
+      },
+      {
+        "defaultMessage": "!!!Clear cache",
+        "end": {
+          "column": 3,
+          "line": 55
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.buttonClearAllCache",
+        "start": {
+          "column": 23,
+          "line": 52
+        }
+      },
+      {
+        "defaultMessage": "!!!Check for updates",
+        "end": {
+          "column": 3,
+          "line": 59
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.buttonSearchForUpdate",
+        "start": {
+          "column": 25,
+          "line": 56
+        }
+      },
+      {
+        "defaultMessage": "!!!Restart & install update",
+        "end": {
+          "column": 3,
+          "line": 63
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.buttonInstallUpdate",
+        "start": {
+          "column": 23,
+          "line": 60
+        }
+      },
+      {
+        "defaultMessage": "!!!Is searching for update",
+        "end": {
+          "column": 3,
+          "line": 67
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.updateStatusSearching",
+        "start": {
+          "column": 25,
+          "line": 64
+        }
+      },
+      {
+        "defaultMessage": "!!!Update available, downloading...",
+        "end": {
+          "column": 3,
+          "line": 71
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.updateStatusAvailable",
+        "start": {
+          "column": 25,
+          "line": 68
+        }
+      },
+      {
+        "defaultMessage": "!!!You are using the latest version of Franz",
+        "end": {
+          "column": 3,
+          "line": 75
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.updateStatusUpToDate",
+        "start": {
+          "column": 24,
+          "line": 72
+        }
+      },
+      {
+        "defaultMessage": "!!!Current version:",
+        "end": {
+          "column": 3,
+          "line": 79
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.currentVersion",
+        "start": {
+          "column": 18,
+          "line": 76
+        }
+      },
+      {
+        "defaultMessage": "!!!Changes require restart",
+        "end": {
+          "column": 3,
+          "line": 83
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.restartRequired",
+        "start": {
+          "column": 29,
+          "line": 80
+        }
+      },
+      {
+        "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
+        "end": {
+          "column": 3,
+          "line": 87
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.languageDisclaimer",
+        "start": {
+          "column": 22,
+          "line": 84
+        }
+      }
+    ],
+    "path": "src/components/settings/settings/EditSettingsForm.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Team",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
+        "file": "src/components/settings/team/TeamDashboard.js",
+        "id": "settings.team.headline",
+        "start": {
+          "column": 12,
+          "line": 14
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz for Teams",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/components/settings/team/TeamDashboard.js",
+        "id": "settings.team.contentHeadline",
+        "start": {
+          "column": 19,
+          "line": 18
+        }
+      },
+      {
+        "defaultMessage": "!!!You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/components/settings/team/TeamDashboard.js",
+        "id": "settings.team.intro",
+        "start": {
+          "column": 9,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/components/settings/team/TeamDashboard.js",
+        "id": "settings.team.copy",
+        "start": {
+          "column": 8,
+          "line": 26
+        }
+      },
+      {
+        "defaultMessage": "!!!Manage your Team on meetfranz.com",
+        "end": {
+          "column": 3,
+          "line": 33
+        },
+        "file": "src/components/settings/team/TeamDashboard.js",
+        "id": "settings.team.manageAction",
+        "start": {
+          "column": 16,
+          "line": 30
+        }
+      },
+      {
+        "defaultMessage": "!!!Upgrade your Account",
+        "end": {
+          "column": 3,
+          "line": 37
+        },
+        "file": "src/components/settings/team/TeamDashboard.js",
+        "id": "settings.team.upgradeAction",
+        "start": {
+          "column": 17,
+          "line": 34
+        }
+      }
+    ],
+    "path": "src/components/settings/team/TeamDashboard.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Account",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/settings/user/EditUserForm.js",
+        "id": "settings.account.headline",
+        "start": {
+          "column": 12,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!Update Profile",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/components/settings/user/EditUserForm.js",
+        "id": "settings.account.headlineProfile",
+        "start": {
+          "column": 19,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Account Information",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/components/settings/user/EditUserForm.js",
+        "id": "settings.account.headlineAccount",
+        "start": {
+          "column": 19,
+          "line": 23
+        }
+      },
+      {
+        "defaultMessage": "!!!Change Password",
+        "end": {
+          "column": 3,
+          "line": 30
+        },
+        "file": "src/components/settings/user/EditUserForm.js",
+        "id": "settings.account.headlinePassword",
+        "start": {
+          "column": 20,
+          "line": 27
+        }
+      },
+      {
+        "defaultMessage": "!!!Your changes have been saved",
+        "end": {
+          "column": 3,
+          "line": 34
+        },
+        "file": "src/components/settings/user/EditUserForm.js",
+        "id": "settings.account.successInfo",
+        "start": {
+          "column": 15,
+          "line": 31
+        }
+      },
+      {
+        "defaultMessage": "!!!Update profile",
+        "end": {
+          "column": 3,
+          "line": 38
+        },
+        "file": "src/components/settings/user/EditUserForm.js",
+        "id": "settings.account.buttonSave",
+        "start": {
+          "column": 14,
+          "line": 35
+        }
+      }
+    ],
+    "path": "src/components/settings/user/EditUserForm.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Support the development of Franz",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.submit.label",
+        "start": {
+          "column": 21,
+          "line": 14
+        }
+      },
+      {
+        "defaultMessage": "!!!Could not initialize payment form",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.paymentSessionError",
+        "start": {
+          "column": 23,
+          "line": 18
+        }
+      },
+      {
+        "defaultMessage": "!!!free",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.type.free",
+        "start": {
+          "column": 12,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!!month",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.type.month",
+        "start": {
+          "column": 15,
+          "line": 26
+        }
+      },
+      {
+        "defaultMessage": "!!!year",
+        "end": {
+          "column": 3,
+          "line": 33
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.type.year",
+        "start": {
+          "column": 14,
+          "line": 30
+        }
+      },
+      {
+        "defaultMessage": "!!!The Franz Premium Supporter Account includes",
+        "end": {
+          "column": 3,
+          "line": 37
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.includedFeatures",
+        "start": {
+          "column": 20,
+          "line": 34
+        }
+      },
+      {
+        "defaultMessage": "!!!Add on-premise/hosted services like Mattermost",
+        "end": {
+          "column": 3,
+          "line": 41
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.features.onpremise.mattermost",
+        "start": {
+          "column": 13,
+          "line": 38
+        }
+      },
+      {
+        "defaultMessage": "!!!No app delays & nagging to upgrade license",
+        "end": {
+          "column": 3,
+          "line": 45
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.features.noInterruptions",
+        "start": {
+          "column": 19,
+          "line": 42
+        }
+      },
+      {
+        "defaultMessage": "!!!Proxy support for services",
+        "end": {
+          "column": 3,
+          "line": 49
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.features.proxy",
+        "start": {
+          "column": 9,
+          "line": 46
+        }
+      },
+      {
+        "defaultMessage": "!!!Support for Spellchecker",
+        "end": {
+          "column": 3,
+          "line": 53
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.features.spellchecker",
+        "start": {
+          "column": 16,
+          "line": 50
+        }
+      },
+      {
+        "defaultMessage": "!!!Organize your services in workspaces",
+        "end": {
+          "column": 3,
+          "line": 57
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.features.workspaces",
+        "start": {
+          "column": 14,
+          "line": 54
+        }
+      },
+      {
+        "defaultMessage": "!!!No ads, ever!",
+        "end": {
+          "column": 3,
+          "line": 61
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.features.ads",
+        "start": {
+          "column": 7,
+          "line": 58
+        }
+      },
+      {
+        "defaultMessage": "!!!coming soon",
+        "end": {
+          "column": 3,
+          "line": 65
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.features.comingSoon",
+        "start": {
+          "column": 14,
+          "line": 62
+        }
+      },
+      {
+        "defaultMessage": "!!!EU residents: local sales tax may apply",
+        "end": {
+          "column": 3,
+          "line": 69
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.euTaxInfo",
+        "start": {
+          "column": 13,
+          "line": 66
+        }
+      }
+    ],
+    "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": "!!!Upgrade account",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/ui/PremiumFeatureContainer/index.js",
+        "id": "premiumFeature.button.upgradeAccount",
+        "start": {
+          "column": 10,
+          "line": 15
+        }
+      }
+    ],
+    "path": "src/components/ui/PremiumFeatureContainer/index.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Loading",
+        "end": {
+          "column": 3,
+          "line": 14
+        },
+        "file": "src/components/ui/WebviewLoader/index.js",
+        "id": "service.webviewLoader.loading",
+        "start": {
+          "column": 11,
+          "line": 11
+        }
+      }
+    ],
+    "path": "src/components/ui/WebviewLoader/index.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Something went wrong.",
+        "end": {
+          "column": 3,
+          "line": 14
+        },
+        "file": "src/components/util/ErrorBoundary/index.js",
+        "id": "app.errorHandler.headline",
+        "start": {
+          "column": 12,
+          "line": 11
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/util/ErrorBoundary/index.js",
+        "id": "app.errorHandler.action",
+        "start": {
+          "column": 10,
+          "line": 15
+        }
+      }
+    ],
+    "path": "src/components/util/ErrorBoundary/index.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Name",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.name",
+        "start": {
+          "column": 8,
+          "line": 28
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable service",
+        "end": {
+          "column": 3,
+          "line": 35
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.enableService",
+        "start": {
+          "column": 17,
+          "line": 32
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable Notifications",
+        "end": {
+          "column": 3,
+          "line": 39
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.enableNotification",
+        "start": {
+          "column": 22,
+          "line": 36
+        }
+      },
+      {
+        "defaultMessage": "!!!Show unread message badges",
+        "end": {
+          "column": 3,
+          "line": 43
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.enableBadge",
+        "start": {
+          "column": 15,
+          "line": 40
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable audio",
+        "end": {
+          "column": 3,
+          "line": 47
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.enableAudio",
+        "start": {
+          "column": 15,
+          "line": 44
+        }
+      },
+      {
+        "defaultMessage": "!!!Team",
+        "end": {
+          "column": 3,
+          "line": 51
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.team",
+        "start": {
+          "column": 8,
+          "line": 48
+        }
+      },
+      {
+        "defaultMessage": "!!!Custom server",
+        "end": {
+          "column": 3,
+          "line": 55
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.customUrl",
+        "start": {
+          "column": 13,
+          "line": 52
+        }
+      },
+      {
+        "defaultMessage": "!!!Show message badge for all new messages",
+        "end": {
+          "column": 3,
+          "line": 59
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.indirectMessages",
+        "start": {
+          "column": 20,
+          "line": 56
+        }
+      },
+      {
+        "defaultMessage": "!!!Custom icon",
+        "end": {
+          "column": 3,
+          "line": 63
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.icon",
+        "start": {
+          "column": 8,
+          "line": 60
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable Dark Mode",
+        "end": {
+          "column": 3,
+          "line": 67
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.enableDarkMode",
+        "start": {
+          "column": 18,
+          "line": 64
+        }
+      },
+      {
+        "defaultMessage": "!!!Use Proxy",
+        "end": {
+          "column": 3,
+          "line": 71
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.proxy.isEnabled",
+        "start": {
+          "column": 15,
+          "line": 68
+        }
+      },
+      {
+        "defaultMessage": "!!!Proxy Host/IP",
+        "end": {
+          "column": 3,
+          "line": 75
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.proxy.host",
+        "start": {
+          "column": 13,
+          "line": 72
+        }
+      },
+      {
+        "defaultMessage": "!!!Port",
+        "end": {
+          "column": 3,
+          "line": 79
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.proxy.port",
+        "start": {
+          "column": 13,
+          "line": 76
+        }
+      },
+      {
+        "defaultMessage": "!!!User",
+        "end": {
+          "column": 3,
+          "line": 83
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.proxy.user",
+        "start": {
+          "column": 13,
+          "line": 80
+        }
+      },
+      {
+        "defaultMessage": "!!!Password",
+        "end": {
+          "column": 3,
+          "line": 87
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.proxy.password",
+        "start": {
+          "column": 17,
+          "line": 84
+        }
+      }
+    ],
+    "path": "src/containers/settings/EditServiceScreen.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Launch Franz on start",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.autoLaunchOnStart",
+        "start": {
+          "column": 21,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!!Open in background",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.autoLaunchInBackground",
+        "start": {
+          "column": 26,
+          "line": 26
+        }
+      },
+      {
+        "defaultMessage": "!!!Keep Franz in background when closing the window",
+        "end": {
+          "column": 3,
+          "line": 33
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.runInBackground",
+        "start": {
+          "column": 19,
+          "line": 30
+        }
+      },
+      {
+        "defaultMessage": "!!!Show Franz in system tray",
+        "end": {
+          "column": 3,
+          "line": 37
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.enableSystemTray",
+        "start": {
+          "column": 20,
+          "line": 34
+        }
+      },
+      {
+        "defaultMessage": "!!!Minimize Franz to system tray",
+        "end": {
+          "column": 3,
+          "line": 41
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.minimizeToSystemTray",
+        "start": {
+          "column": 24,
+          "line": 38
+        }
+      },
+      {
+        "defaultMessage": "!!!Language",
+        "end": {
+          "column": 3,
+          "line": 45
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.language",
+        "start": {
+          "column": 12,
+          "line": 42
+        }
+      },
+      {
+        "defaultMessage": "!!!Dark Mode",
+        "end": {
+          "column": 3,
+          "line": 49
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.darkMode",
+        "start": {
+          "column": 12,
+          "line": 46
+        }
+      },
+      {
+        "defaultMessage": "!!!Display disabled services tabs",
+        "end": {
+          "column": 3,
+          "line": 53
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.showDisabledServices",
+        "start": {
+          "column": 24,
+          "line": 50
+        }
+      },
+      {
+        "defaultMessage": "!!!Show unread message badge when notifications are disabled",
+        "end": {
+          "column": 3,
+          "line": 57
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.showMessagesBadgesWhenMuted",
+        "start": {
+          "column": 29,
+          "line": 54
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable spell checking",
+        "end": {
+          "column": 3,
+          "line": 61
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.enableSpellchecking",
+        "start": {
+          "column": 23,
+          "line": 58
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable GPU Acceleration",
+        "end": {
+          "column": 3,
+          "line": 65
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.enableGPUAcceleration",
+        "start": {
+          "column": 25,
+          "line": 62
+        }
+      },
+      {
+        "defaultMessage": "!!!Include beta versions",
+        "end": {
+          "column": 3,
+          "line": 69
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.beta",
+        "start": {
+          "column": 8,
+          "line": 66
+        }
+      }
+    ],
+    "path": "src/containers/settings/EditSettingsScreen.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Firstname",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
+        "file": "src/containers/settings/EditUserScreen.js",
+        "id": "settings.user.form.firstname",
+        "start": {
+          "column": 13,
+          "line": 14
+        }
+      },
+      {
+        "defaultMessage": "!!!Lastname",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/containers/settings/EditUserScreen.js",
+        "id": "settings.user.form.lastname",
+        "start": {
+          "column": 12,
+          "line": 18
+        }
+      },
+      {
+        "defaultMessage": "!!!Email",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/containers/settings/EditUserScreen.js",
+        "id": "settings.user.form.email",
+        "start": {
+          "column": 9,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!!Account type",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/containers/settings/EditUserScreen.js",
+        "id": "settings.user.form.accountType.label",
+        "start": {
+          "column": 20,
+          "line": 26
+        }
+      },
+      {
+        "defaultMessage": "!!!Individual",
+        "end": {
+          "column": 3,
+          "line": 33
+        },
+        "file": "src/containers/settings/EditUserScreen.js",
+        "id": "settings.user.form.accountType.individual",
+        "start": {
+          "column": 25,
+          "line": 30
+        }
+      },
+      {
+        "defaultMessage": "!!!Non-Profit",
+        "end": {
+          "column": 3,
+          "line": 37
+        },
+        "file": "src/containers/settings/EditUserScreen.js",
+        "id": "settings.user.form.accountType.non-profit",
+        "start": {
+          "column": 24,
+          "line": 34
+        }
+      },
+      {
+        "defaultMessage": "!!!Company",
+        "end": {
+          "column": 3,
+          "line": 41
+        },
+        "file": "src/containers/settings/EditUserScreen.js",
+        "id": "settings.user.form.accountType.company",
+        "start": {
+          "column": 22,
+          "line": 38
+        }
+      },
+      {
+        "defaultMessage": "!!!Current password",
+        "end": {
+          "column": 3,
+          "line": 45
+        },
+        "file": "src/containers/settings/EditUserScreen.js",
+        "id": "settings.user.form.currentPassword",
+        "start": {
+          "column": 19,
+          "line": 42
+        }
+      },
+      {
+        "defaultMessage": "!!!New password",
+        "end": {
+          "column": 3,
+          "line": 49
+        },
+        "file": "src/containers/settings/EditUserScreen.js",
+        "id": "settings.user.form.newPassword",
+        "start": {
+          "column": 15,
+          "line": 46
+        }
+      }
+    ],
+    "path": "src/containers/settings/EditUserScreen.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Changes in Franz {version}",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/features/announcements/components/AnnouncementScreen.js",
+        "id": "feature.announcements.changelog.headline",
+        "start": {
+          "column": 12,
+          "line": 20
+        }
+      }
+    ],
+    "path": "src/features/announcements/components/AnnouncementScreen.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Please purchase license to skip waiting",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/features/delayApp/Component.js",
+        "id": "feature.delayApp.headline",
+        "start": {
+          "column": 12,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!Get a Franz Supporter License",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/features/delayApp/Component.js",
+        "id": "feature.delayApp.action",
+        "start": {
+          "column": 10,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz will continue in {seconds} seconds.",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/features/delayApp/Component.js",
+        "id": "feature.delayApp.text",
+        "start": {
+          "column": 8,
+          "line": 23
+        }
+      }
+    ],
+    "path": "src/features/delayApp/Component.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Franz is better together!",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/features/shareFranz/Component.js",
+        "id": "feature.shareFranz.headline",
+        "start": {
+          "column": 12,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/features/shareFranz/Component.js",
+        "id": "feature.shareFranz.text",
+        "start": {
+          "column": 8,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Share as email",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/features/shareFranz/Component.js",
+        "id": "feature.shareFranz.action.email",
+        "start": {
+          "column": 16,
+          "line": 23
+        }
+      },
+      {
+        "defaultMessage": "!!!Share on Facebook",
+        "end": {
+          "column": 3,
+          "line": 30
+        },
+        "file": "src/features/shareFranz/Component.js",
+        "id": "feature.shareFranz.action.facebook",
+        "start": {
+          "column": 19,
+          "line": 27
+        }
+      },
+      {
+        "defaultMessage": "!!!Share on Twitter",
+        "end": {
+          "column": 3,
+          "line": 34
+        },
+        "file": "src/features/shareFranz/Component.js",
+        "id": "feature.shareFranz.action.twitter",
+        "start": {
+          "column": 18,
+          "line": 31
+        }
+      },
+      {
+        "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+        "end": {
+          "column": 3,
+          "line": 38
+        },
+        "file": "src/features/shareFranz/Component.js",
+        "id": "feature.shareFranz.shareText.email",
+        "start": {
+          "column": 18,
+          "line": 35
+        }
+      },
+      {
+        "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",
+        "end": {
+          "column": 3,
+          "line": 42
+        },
+        "file": "src/features/shareFranz/Component.js",
+        "id": "feature.shareFranz.shareText.twitter",
+        "start": {
+          "column": 20,
+          "line": 39
+        }
+      }
+    ],
+    "path": "src/features/shareFranz/Component.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Create workspace",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
+        "id": "settings.workspace.add.form.submitButton",
+        "start": {
+          "column": 16,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Name",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
+        "id": "settings.workspace.add.form.name",
+        "start": {
+          "column": 8,
+          "line": 17
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/CreateWorkspaceForm.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Delete workspace",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.buttonDelete",
+        "start": {
+          "column": 16,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Save workspace",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.buttonSave",
+        "start": {
+          "column": 14,
+          "line": 23
+        }
+      },
+      {
+        "defaultMessage": "!!!Name",
+        "end": {
+          "column": 3,
+          "line": 30
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.name",
+        "start": {
+          "column": 8,
+          "line": 27
+        }
+      },
+      {
+        "defaultMessage": "!!!Your workspaces",
+        "end": {
+          "column": 3,
+          "line": 34
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.yourWorkspaces",
+        "start": {
+          "column": 18,
+          "line": 31
+        }
+      },
+      {
+        "defaultMessage": "!!!Services in this Workspace",
+        "end": {
+          "column": 3,
+          "line": 38
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.servicesInWorkspaceHeadline",
+        "start": {
+          "column": 31,
+          "line": 35
+        }
+      },
+      {
+        "defaultMessage": "!!!You haven't added any services yet.",
+        "end": {
+          "column": 3,
+          "line": 42
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.services.noServicesAdded",
+        "start": {
+          "column": 19,
+          "line": 39
+        }
+      },
+      {
+        "defaultMessage": "!!!Discover services",
+        "end": {
+          "column": 3,
+          "line": 46
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.services.discoverServices",
+        "start": {
+          "column": 20,
+          "line": 43
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/EditWorkspaceForm.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Workspaces",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+        "id": "workspaceDrawer.headline",
+        "start": {
+          "column": 12,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!All services",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+        "id": "workspaceDrawer.allServices",
+        "start": {
+          "column": 15,
+          "line": 20
+        }
+      },
+      {
+        "defaultMessage": "!!!Workspaces settings",
+        "end": {
+          "column": 3,
+          "line": 27
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+        "id": "workspaceDrawer.workspacesSettingsTooltip",
+        "start": {
+          "column": 29,
+          "line": 24
+        }
+      },
+      {
+        "defaultMessage": "!!!Info about workspace feature",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "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
+        }
+      },
+      {
+        "defaultMessage": "!!!add new workspace",
+        "end": {
+          "column": 3,
+          "line": 43
+        },
+        "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
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/WorkspaceDrawer.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!No services added yet",
+        "end": {
+          "column": 3,
+          "line": 15
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
+        "id": "workspaceDrawer.item.noServicesAddedYet",
+        "start": {
+          "column": 22,
+          "line": 12
+        }
+      },
+      {
+        "defaultMessage": "!!!edit",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
+        "id": "workspaceDrawer.item.contextMenuEdit",
+        "start": {
+          "column": 19,
+          "line": 16
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/WorkspaceDrawerItem.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Your workspaces",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.headline",
+        "start": {
+          "column": 12,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!You haven't added any workspaces yet.",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.noWorkspacesAdded",
+        "start": {
+          "column": 19,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Could not load your workspaces",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.workspacesRequestFailed",
+        "start": {
+          "column": 27,
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Try again",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.tryReloadWorkspaces",
+        "start": {
+          "column": 23,
+          "line": 29
+        }
+      },
+      {
+        "defaultMessage": "!!!Your changes have been saved",
+        "end": {
+          "column": 3,
+          "line": 36
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.updatedInfo",
+        "start": {
+          "column": 15,
+          "line": 33
+        }
+      },
+      {
+        "defaultMessage": "!!!Workspace has been deleted",
+        "end": {
+          "column": 3,
+          "line": 40
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.deletedInfo",
+        "start": {
+          "column": 15,
+          "line": 37
+        }
+      },
+      {
+        "defaultMessage": "!!!Info about workspace feature",
+        "end": {
+          "column": 3,
+          "line": 44
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.workspaceFeatureInfo",
+        "start": {
+          "column": 24,
+          "line": 41
+        }
+      },
+      {
+        "defaultMessage": "!!!Less is More: Introducing Franz Workspaces",
+        "end": {
+          "column": 3,
+          "line": 48
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.workspaceFeatureHeadline",
+        "start": {
+          "column": 28,
+          "line": 45
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/WorkspacesDashboard.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Switching to",
+        "end": {
+          "column": 3,
+          "line": 15
+        },
+        "file": "src/features/workspaces/components/WorkspaceSwitchingIndicator.js",
+        "id": "workspaces.switchingIndicator.switchingTo",
+        "start": {
+          "column": 15,
+          "line": 12
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/WorkspaceSwitchingIndicator.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Field is required",
+        "end": {
+          "column": 3,
+          "line": 7
+        },
+        "file": "src/helpers/validation-helpers.js",
+        "id": "validation.required",
+        "start": {
+          "column": 12,
+          "line": 4
+        }
+      },
+      {
+        "defaultMessage": "!!!Email not valid",
+        "end": {
+          "column": 3,
+          "line": 11
+        },
+        "file": "src/helpers/validation-helpers.js",
+        "id": "validation.email",
+        "start": {
+          "column": 9,
+          "line": 8
+        }
+      },
+      {
+        "defaultMessage": "!!!Not a valid URL",
+        "end": {
+          "column": 3,
+          "line": 15
+        },
+        "file": "src/helpers/validation-helpers.js",
+        "id": "validation.url",
+        "start": {
+          "column": 7,
+          "line": 12
+        }
+      },
+      {
+        "defaultMessage": "!!!Too few characters",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/helpers/validation-helpers.js",
+        "id": "validation.minLength",
+        "start": {
+          "column": 13,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!At least one is required",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/helpers/validation-helpers.js",
+        "id": "validation.oneRequired",
+        "start": {
+          "column": 15,
+          "line": 20
+        }
+      }
+    ],
+    "path": "src/helpers/validation-helpers.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Can't connect to Franz Online Services",
+        "end": {
+          "column": 3,
+          "line": 7
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.api.unhealthy",
+        "start": {
+          "column": 16,
+          "line": 4
+        }
+      },
+      {
+        "defaultMessage": "!!!You are not connected to the internet.",
+        "end": {
+          "column": 3,
+          "line": 11
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.notConnectedToTheInternet",
+        "start": {
+          "column": 29,
+          "line": 8
+        }
+      },
+      {
+        "defaultMessage": "!!!Spell checking language",
+        "end": {
+          "column": 3,
+          "line": 15
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.spellchecking.language",
+        "start": {
+          "column": 24,
+          "line": 12
+        }
+      },
+      {
+        "defaultMessage": "!!!Use System Default ({default})",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.spellchecker.useDefault",
+        "start": {
+          "column": 29,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!Detect language automatically",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.spellchecking.autodetect",
+        "start": {
+          "column": 34,
+          "line": 20
+        }
+      },
+      {
+        "defaultMessage": "!!!Automatic",
+        "end": {
+          "column": 3,
+          "line": 27
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.spellchecking.autodetect.short",
+        "start": {
+          "column": 39,
+          "line": 24
+        }
+      }
+    ],
+    "path": "src/i18n/globalMessages.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Edit",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit",
+        "start": {
+          "column": 8,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!Undo",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.undo",
+        "start": {
+          "column": 8,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Redo",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.redo",
+        "start": {
+          "column": 8,
+          "line": 23
+        }
+      },
+      {
+        "defaultMessage": "!!!Cut",
+        "end": {
+          "column": 3,
+          "line": 30
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.cut",
+        "start": {
+          "column": 7,
+          "line": 27
+        }
+      },
+      {
+        "defaultMessage": "!!!Copy",
+        "end": {
+          "column": 3,
+          "line": 34
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.copy",
+        "start": {
+          "column": 8,
+          "line": 31
+        }
+      },
+      {
+        "defaultMessage": "!!!Paste",
+        "end": {
+          "column": 3,
+          "line": 38
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.paste",
+        "start": {
+          "column": 9,
+          "line": 35
+        }
+      },
+      {
+        "defaultMessage": "!!!Paste And Match Style",
+        "end": {
+          "column": 3,
+          "line": 42
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.pasteAndMatchStyle",
+        "start": {
+          "column": 22,
+          "line": 39
+        }
+      },
+      {
+        "defaultMessage": "!!!Delete",
+        "end": {
+          "column": 3,
+          "line": 46
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.delete",
+        "start": {
+          "column": 10,
+          "line": 43
+        }
+      },
+      {
+        "defaultMessage": "!!!Select All",
+        "end": {
+          "column": 3,
+          "line": 50
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.selectAll",
+        "start": {
+          "column": 13,
+          "line": 47
+        }
+      },
+      {
+        "defaultMessage": "!!!Speech",
+        "end": {
+          "column": 3,
+          "line": 54
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.speech",
+        "start": {
+          "column": 10,
+          "line": 51
+        }
+      },
+      {
+        "defaultMessage": "!!!Start Speaking",
+        "end": {
+          "column": 3,
+          "line": 58
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.startSpeaking",
+        "start": {
+          "column": 17,
+          "line": 55
+        }
+      },
+      {
+        "defaultMessage": "!!!Stop Speaking",
+        "end": {
+          "column": 3,
+          "line": 62
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.stopSpeaking",
+        "start": {
+          "column": 16,
+          "line": 59
+        }
+      },
+      {
+        "defaultMessage": "!!!Start Dictation",
+        "end": {
+          "column": 3,
+          "line": 66
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.startDictation",
+        "start": {
+          "column": 18,
+          "line": 63
+        }
+      },
+      {
+        "defaultMessage": "!!!Emoji & Symbols",
+        "end": {
+          "column": 3,
+          "line": 70
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.edit.emojiSymbols",
+        "start": {
+          "column": 16,
+          "line": 67
+        }
+      },
+      {
+        "defaultMessage": "!!!Actual Size",
+        "end": {
+          "column": 3,
+          "line": 74
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.resetZoom",
+        "start": {
+          "column": 13,
+          "line": 71
+        }
+      },
+      {
+        "defaultMessage": "!!!Zoom In",
+        "end": {
+          "column": 3,
+          "line": 78
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.zoomIn",
+        "start": {
+          "column": 10,
+          "line": 75
+        }
+      },
+      {
+        "defaultMessage": "!!!Zoom Out",
+        "end": {
+          "column": 3,
+          "line": 82
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.zoomOut",
+        "start": {
+          "column": 11,
+          "line": 79
+        }
+      },
+      {
+        "defaultMessage": "!!!Enter Full Screen",
+        "end": {
+          "column": 3,
+          "line": 86
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.enterFullScreen",
+        "start": {
+          "column": 19,
+          "line": 83
+        }
+      },
+      {
+        "defaultMessage": "!!!Exit Full Screen",
+        "end": {
+          "column": 3,
+          "line": 90
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.exitFullScreen",
+        "start": {
+          "column": 18,
+          "line": 87
+        }
+      },
+      {
+        "defaultMessage": "!!!Toggle Full Screen",
+        "end": {
+          "column": 3,
+          "line": 94
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.toggleFullScreen",
+        "start": {
+          "column": 20,
+          "line": 91
+        }
+      },
+      {
+        "defaultMessage": "!!!Toggle Developer Tools",
+        "end": {
+          "column": 3,
+          "line": 98
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.toggleDevTools",
+        "start": {
+          "column": 18,
+          "line": 95
+        }
+      },
+      {
+        "defaultMessage": "!!!Toggle Service Developer Tools",
+        "end": {
+          "column": 3,
+          "line": 102
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.toggleServiceDevTools",
+        "start": {
+          "column": 25,
+          "line": 99
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload Service",
+        "end": {
+          "column": 3,
+          "line": 106
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.reloadService",
+        "start": {
+          "column": 17,
+          "line": 103
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload Franz",
+        "end": {
+          "column": 3,
+          "line": 110
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.reloadFranz",
+        "start": {
+          "column": 15,
+          "line": 107
+        }
+      },
+      {
+        "defaultMessage": "!!!Minimize",
+        "end": {
+          "column": 3,
+          "line": 114
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.window.minimize",
+        "start": {
+          "column": 12,
+          "line": 111
+        }
+      },
+      {
+        "defaultMessage": "!!!Close",
+        "end": {
+          "column": 3,
+          "line": 118
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.window.close",
+        "start": {
+          "column": 9,
+          "line": 115
+        }
+      },
+      {
+        "defaultMessage": "!!!Learn More",
+        "end": {
+          "column": 3,
+          "line": 122
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.help.learnMore",
+        "start": {
+          "column": 13,
+          "line": 119
+        }
+      },
+      {
+        "defaultMessage": "!!!Changelog",
+        "end": {
+          "column": 3,
+          "line": 126
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.help.changelog",
+        "start": {
+          "column": 13,
+          "line": 123
+        }
+      },
+      {
+        "defaultMessage": "!!!Support",
+        "end": {
+          "column": 3,
+          "line": 130
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.help.support",
+        "start": {
+          "column": 11,
+          "line": 127
+        }
+      },
+      {
+        "defaultMessage": "!!!Terms of Service",
+        "end": {
+          "column": 3,
+          "line": 134
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.help.tos",
+        "start": {
+          "column": 7,
+          "line": 131
+        }
+      },
+      {
+        "defaultMessage": "!!!Privacy Statement",
+        "end": {
+          "column": 3,
+          "line": 138
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.help.privacy",
+        "start": {
+          "column": 11,
+          "line": 135
+        }
+      },
+      {
+        "defaultMessage": "!!!File",
+        "end": {
+          "column": 3,
+          "line": 142
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.file",
+        "start": {
+          "column": 8,
+          "line": 139
+        }
+      },
+      {
+        "defaultMessage": "!!!View",
+        "end": {
+          "column": 3,
+          "line": 146
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view",
+        "start": {
+          "column": 8,
+          "line": 143
+        }
+      },
+      {
+        "defaultMessage": "!!!Services",
+        "end": {
+          "column": 3,
+          "line": 150
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.services",
+        "start": {
+          "column": 12,
+          "line": 147
+        }
+      },
+      {
+        "defaultMessage": "!!!Window",
+        "end": {
+          "column": 3,
+          "line": 154
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.window",
+        "start": {
+          "column": 10,
+          "line": 151
+        }
+      },
+      {
+        "defaultMessage": "!!!Help",
+        "end": {
+          "column": 3,
+          "line": 158
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.help",
+        "start": {
+          "column": 8,
+          "line": 155
+        }
+      },
+      {
+        "defaultMessage": "!!!About Franz",
+        "end": {
+          "column": 3,
+          "line": 162
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.app.about",
+        "start": {
+          "column": 9,
+          "line": 159
+        }
+      },
+      {
+        "defaultMessage": "!!!What's new?",
+        "end": {
+          "column": 3,
+          "line": 166
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.app.announcement",
+        "start": {
+          "column": 16,
+          "line": 163
+        }
+      },
+      {
+        "defaultMessage": "!!!Settings",
+        "end": {
+          "column": 3,
+          "line": 170
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.app.settings",
+        "start": {
+          "column": 12,
+          "line": 167
+        }
+      },
+      {
+        "defaultMessage": "!!!Hide",
+        "end": {
+          "column": 3,
+          "line": 174
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.app.hide",
+        "start": {
+          "column": 8,
+          "line": 171
+        }
+      },
+      {
+        "defaultMessage": "!!!Hide Others",
+        "end": {
+          "column": 3,
+          "line": 178
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.app.hideOthers",
+        "start": {
+          "column": 14,
+          "line": 175
+        }
+      },
+      {
+        "defaultMessage": "!!!Unhide",
+        "end": {
+          "column": 3,
+          "line": 182
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.app.unhide",
+        "start": {
+          "column": 10,
+          "line": 179
+        }
+      },
+      {
+        "defaultMessage": "!!!Quit",
+        "end": {
+          "column": 3,
+          "line": 186
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.app.quit",
+        "start": {
+          "column": 8,
+          "line": 183
+        }
+      },
+      {
+        "defaultMessage": "!!!Add New Service...",
+        "end": {
+          "column": 3,
+          "line": 190
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.services.addNewService",
+        "start": {
+          "column": 17,
+          "line": 187
+        }
+      },
+      {
+        "defaultMessage": "!!!Add New Workspace...",
+        "end": {
+          "column": 3,
+          "line": 194
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces.addNewWorkspace",
+        "start": {
+          "column": 19,
+          "line": 191
+        }
+      },
+      {
+        "defaultMessage": "!!!Open workspace drawer",
+        "end": {
+          "column": 3,
+          "line": 198
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces.openWorkspaceDrawer",
+        "start": {
+          "column": 23,
+          "line": 195
+        }
+      },
+      {
+        "defaultMessage": "!!!Close workspace drawer",
+        "end": {
+          "column": 3,
+          "line": 202
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces.closeWorkspaceDrawer",
+        "start": {
+          "column": 24,
+          "line": 199
+        }
+      },
+      {
+        "defaultMessage": "!!!Activate next service...",
+        "end": {
+          "column": 3,
+          "line": 206
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.services.setNextServiceActive",
+        "start": {
+          "column": 23,
+          "line": 203
+        }
+      },
+      {
+        "defaultMessage": "!!!Activate previous service...",
+        "end": {
+          "column": 3,
+          "line": 210
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.services.activatePreviousService",
+        "start": {
+          "column": 27,
+          "line": 207
+        }
+      },
+      {
+        "defaultMessage": "!!!Disable notifications & audio",
+        "end": {
+          "column": 3,
+          "line": 214
+        },
+        "file": "src/lib/Menu.js",
+        "id": "sidebar.muteApp",
+        "start": {
+          "column": 11,
+          "line": 211
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable notifications & audio",
+        "end": {
+          "column": 3,
+          "line": 218
+        },
+        "file": "src/lib/Menu.js",
+        "id": "sidebar.unmuteApp",
+        "start": {
+          "column": 13,
+          "line": 215
+        }
+      },
+      {
+        "defaultMessage": "!!!Workspaces",
+        "end": {
+          "column": 3,
+          "line": 222
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces",
+        "start": {
+          "column": 14,
+          "line": 219
+        }
+      },
+      {
+        "defaultMessage": "!!!Default",
+        "end": {
+          "column": 3,
+          "line": 226
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces.defaultWorkspace",
+        "start": {
+          "column": 20,
+          "line": 223
+        }
+      }
+    ],
+    "path": "src/lib/Menu.json"
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 671eecd41..0ff4b5abb 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -1,11 +1,23 @@
 {
    "app.errorHandler.action" : "Επαναφό�τωση",
-   "app.errorHandler.headline" : "Something went wrong",
+   "app.errorHandler.headline" : "Κάτι δεν λειτου�γεί",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.delayApp.text" : "Franz θα συνεχίσει σε {seconds} δευτε�όλεπτα.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Δεν είναι δυνατή η σ�νδεση με τις ζωντανές υπη�εσίες του Franz",
    "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",
    "import.headline" : "Εισαγάγετε τις υπη�εσίες σας Franz 4",
    "import.notSupportedHeadline" : "Υπη�εσίες που δεν υποστη�ίζονται ακόμα στο Franz 5",
    "import.skip.label" : "Θέλω να π�οσθέσω υπη�εσίες χει�οκίνητα",
@@ -32,6 +44,7 @@
    "login.submit.label" : "Σ�νδεση",
    "login.tokenExpired" : "Η συνεδ�ία σας έληξε, συνδεθείτε ξανά.",
    "menu.app.about" : "Σχετικά με το Franz",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Απόκ�υψη",
    "menu.app.hideOthers" : "Απόκ�υψη των άλλων",
    "menu.app.quit" : "Έξοδος",
@@ -59,7 +72,9 @@
    "menu.help.support" : "Υποστή�ιξη",
    "menu.help.tos" : "Ό�οι Χ�ήσης",
    "menu.services" : "Υπη�εσίες",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "�έα Υπη�εσία",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Π�οβολή",
    "menu.view.enterFullScreen" : "Πλή�ης Οθόνη",
    "menu.view.exitFullScreen" : "Έξοδος από πλή�η οθόνη",
@@ -74,6 +89,11 @@
    "menu.window" : "Πα�άθυ�ο",
    "menu.window.close" : "Κλείσιμο",
    "menu.window.minimize" : "Ελαχιστοποίηση",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Όλες οι υπη�εσίες",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "Διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου",
    "password.headline" : "Επαναφο�ά κωδικο� π�όσβασης",
    "password.link.login" : "Σ�νδεση στο λογα�ιασμό σας",
@@ -97,6 +117,7 @@
    "service.errorHandler.headline" : "Ω, όχι!",
    "service.errorHandler.message" : "Σφάλμα",
    "service.errorHandler.text" : "{name} has failed to load.",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "Ξεκινήστε",
    "services.welcome" : "Καλώς ο�ίσατε στον Franz",
    "settings.account.account.editButton" : "Επεξε�γασία λογα�ιασμο�",
@@ -117,6 +138,7 @@
    "settings.account.invoiceDownload" : "Λήψη",
    "settings.account.manageSubscription.label" : "Διαχεί�ιση της συνδ�ομής σας",
    "settings.account.successInfo" : "Οι αλλαγές σας έχουν αποθηκευτεί",
+   "settings.account.tryReloadServices" : "Δοκιμάστε ξανά",
    "settings.account.tryReloadUserInfoRequest" : "Δοκιμάστε ξανά",
    "settings.account.userInfoRequestFailed" : "Δεν ήταν δυνατή η φό�τωση πλη�οφο�ιών χ�ήστη",
    "settings.app.buttonClearAllCache" : "Καθα�ισμός λανθάνουσας μνήμης",
@@ -129,22 +151,20 @@
    "settings.app.form.beta" : "Συμπε�ιλάβετε εκδόσεις beta",
    "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Ενε�γοποιήση Ενίσχυσης GPU ",
-   "settings.app.form.enableMenuBar" : "Εμφάνιση Γ�αμμής Μενο� Franz",
    "settings.app.form.enableSpellchecking" : "Ενε�γοποίηση ο�θογ�αφικο� ελέγχου",
    "settings.app.form.enableSystemTray" : "Εμφάνιση του Franz στη γ�αμμή ειδοποιήσεων",
-   "settings.app.form.hideDockIcon" : "Απόκ�υψη εικονιδίου Franz",
    "settings.app.form.language" : "Γλώσσα",
    "settings.app.form.minimizeToSystemTray" : "Ελαχιστοποίηση του Franz στη γ�αμμή ειδοποιήσεων",
    "settings.app.form.runInBackground" : "Κ�ατήστε το Franz στο πα�ασκήνιο κατά το κλείσιμο του πα�αθ��ου",
    "settings.app.form.showDisabledServices" : "Π�οβολή κα�τελών των απενε�γοποιημένων υπη�εσιών",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Π�οβολή του εικονιδίου μη αναγνωσμένου μην�ματος όταν οι ειδοποιήσεις είναι απενε�γοποιημένες",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Ρυθμίσεις",
    "settings.app.headlineAdvanced" : "Για π�οχω�ημένους",
    "settings.app.headlineAppearance" : "Εμφάνιση",
    "settings.app.headlineGeneral" : "Γενικά",
    "settings.app.headlineLanguage" : "Γλώσσα",
    "settings.app.headlineUpdates" : "Ενημε�ώσεις",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "Οι αλλαγές απαιτο�ν επανεκκίνηση",
    "settings.app.subheadlineCache" : "Λανθάνουσα μνήμη",
    "settings.app.translationHelp" : "Βοηθήστε μας να μεταφ�άσουμε το Franz στη δική σας γλώσσα.",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "Π�ασκαλέστε Φίλους",
    "settings.navigation.logout" : "Αποσ�νδεση",
    "settings.navigation.settings" : "Ρυθμίσεις",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "Οι υπη�εσίες σας",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "Όλες οι υπη�εσίες",
    "settings.recipes.dev" : "Ανάπτυξη",
    "settings.recipes.headline" : "Διαθέσιμες υπη�εσίες",
@@ -201,8 +223,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Αποθήκευση υπη�εσίας",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Φιλοξενείται",
    "settings.service.form.tabOnPremise" : "Αυτο-φιλοξενείται ��",
    "settings.service.form.team" : "Ομάδα",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "Ανακαλ�ψτε υπη�εσίες",
    "settings.services.headline" : "Οι υπη�εσίες σας",
    "settings.services.noServicesAdded" : "Δεν έχετε π�οσθέσει ακόμα υπη�εσίες.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Η υπη�εσία είναι απενε�γοποιημένη",
    "settings.services.tooltip.isMuted" : "Όλοι οι ήχοι είναι απενε�γοποιημένοι",
    "settings.services.tooltip.notificationsDisabled" : "Οι ειδοποιήσεις είναι απενε�γοποιημένες",
    "settings.services.updatedInfo" : "Οι αλλαγές σας έχουν αποθηκευτεί",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Ομάδα",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
    "settings.user.form.accountType.company" : "Εται�εία",
    "settings.user.form.accountType.individual" : "Ατομικός",
    "settings.user.form.accountType.label" : "Τ�πος λογα�ιασμο�",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "Όνομα",
    "settings.user.form.lastname" : "Επίθετο",
    "settings.user.form.newPassword" : "�έος κωδικός π�όσβασης",
+   "settings.workspace.add.form.name" : "Όνομα",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Όνομα",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Δοκιμάστε ξανά",
+   "settings.workspaces.updatedInfo" : "Οι αλλαγές σας έχουν αποθηκευτεί",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "Π�οσθήκη νέας υπη�εσίας",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "Απενε�γοποίηση ειδοποιήσεων & ήχου",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Ρυθμίσεις",
    "sidebar.unmuteApp" : "Ενε�γοποίηση ειδοποιήσεων & ήχου",
    "signup.company.label" : "Εται�εία",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "Πολίτες Ε.Ε.: Στις τιμές δεν πε�ιλαμβάνονται τυχόν φό�οι και άλλες τοπικές επιβα��νσεις",
    "subscription.features.ads" : "Τέλος στις διαφημίσεις",
    "subscription.features.comingSoon" : "σ�ντομα",
-   "subscription.features.encryptedSync" : "Κ�υπτογ�αφημένος συγχ�ονισμός πε�ιόδου σ�νδεσης",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Add on-premise \/ hosted services όπως το HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "Ο Premium λογα�ιασμός υποστή�ιξης Franz πε�ιλαμβάνει",
    "subscription.paymentSessionError" : "Δεν ήταν δυνατή η π�οετοιμασία της φό�μας πλη�ωμής",
    "subscription.submit.label" : "Θέλω να βοηθήσω στην ανάπτυξη του Franz",
@@ -269,9 +312,20 @@
    "tabs.item.reload" : "Επαναφό�τωση",
    "validation.email" : "{field} δεν είναι έγκυ�ο",
    "validation.minLength" : "{field} π�έπει να είναι τουλάχιστον {length} χα�ακτή�ες",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} είναι υποχ�εωτικό",
    "validation.url" : "{field} δεν είναι έγκυ�ος σ�νδεσμος URL",
    "welcome.loginButton" : "Σ�νδεση στο λογα�ιασμό σας",
    "welcome.signupButton" : "Δημιου�γία δω�εάν λογα�ιασμο�",
-   "welcome.slogan" : "Επικοινωνία που λειτου�γεί για εσάς"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Όλες οι υπη�εσίες",
+   "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>Franz 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 99df6a0ca..6c2759dcc 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -1,277 +1,331 @@
 {
+  "app.errorHandler.action": "Reload",
+  "app.errorHandler.headline": "Something went wrong",
+  "feature.announcements.changelog.headline": "Changes in Franz {version}",
+  "feature.delayApp.action": "Get a Franz Supporter License",
+  "feature.delayApp.headline": "Please purchase a Franz Supporter License to skip waiting",
+  "feature.delayApp.text": "Franz will continue in {seconds} seconds.",
+  "feature.shareFranz.action.email": "Send as email",
+  "feature.shareFranz.action.facebook": "Share on Facebook",
+  "feature.shareFranz.action.twitter": "Share on Twitter",
+  "feature.shareFranz.headline": "Franz is better together!",
+  "feature.shareFranz.shareText.email": "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+  "feature.shareFranz.shareText.twitter": "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger",
+  "feature.shareFranz.text": "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
   "global.api.unhealthy": "Can't connect to Franz online services",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
-  "welcome.signupButton": "Create a free account",
-  "welcome.loginButton": "Login to your account",
-  "welcome.slogan": "Messaging that works for you",
-  "login.headline": "Sign in",
+  "global.spellchecker.useDefault": "Use System Default ({default})",
+  "global.spellchecking.autodetect": "Detect language automatically",
+  "global.spellchecking.autodetect.short": "Automatic",
+  "global.spellchecking.language": "Spell checking language",
+  "import.headline": "Import your Franz 4 services",
+  "import.notSupportedHeadline": "Services not yet supported in Franz 5",
+  "import.skip.label": "I want to add services manually",
+  "import.submit.label": "Import services",
+  "infobar.buttonChangelog": "What is new?",
+  "infobar.buttonInstallUpdate": "Restart & install update",
+  "infobar.buttonReloadServices": "Reload services",
+  "infobar.requiredRequestsFailed": "Could not load services and user information",
+  "infobar.servicesUpdated": "Your services have been updated.",
+  "infobar.updateAvailable": "A new update for Franz is available.",
+  "invite.email.label": "Email address",
+  "invite.headline.friends": "Invite 3 of your friends or colleagues",
+  "invite.name.label": "Name",
+  "invite.skip.label": "I want to do this later",
+  "invite.submit.label": "Send invites",
+  "invite.successInfo": "Invitations sent successfully",
   "login.email.label": "Email address",
+  "login.headline": "Sign in",
+  "login.invalidCredentials": "Email or password not valid",
+  "login.link.password": "Reset password",
+  "login.link.signup": "Create a free account",
   "login.password.label": "Password",
+  "login.serverLogout": "Your session expired, please login again.",
   "login.submit.label": "Sign in",
-  "login.invalidCredentials": "Email or password not valid",
   "login.tokenExpired": "Your session expired, please login again.",
-  "login.serverLogout": "Your session expired, please login again.",
-  "login.link.signup": "Create a free account",
-  "login.link.password": "Reset password",
-  "password.headline": "Reset password",
+  "menu.app.about": "About Franz",
+  "menu.app.announcement": "What's new?",
+  "menu.app.hide": "Hide",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.quit": "Quit",
+  "menu.app.settings": "Settings",
+  "menu.app.unhide": "Unhide",
+  "menu.edit": "Edit",
+  "menu.edit.copy": "Copy",
+  "menu.edit.cut": "Cut",
+  "menu.edit.delete": "Delete",
+  "menu.edit.emojiSymbols": "Emoji & Symbols",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.redo": "Redo",
+  "menu.edit.selectAll": "Select All",
+  "menu.edit.speech": "Speech",
+  "menu.edit.startDictation": "Start Dictation",
+  "menu.edit.startSpeaking": "Start Speaking",
+  "menu.edit.stopSpeaking": "Stop Speaking",
+  "menu.edit.undo": "Undo",
+  "menu.file": "File",
+  "menu.help": "Help",
+  "menu.help.changelog": "Changelog",
+  "menu.help.learnMore": "Learn More",
+  "menu.help.privacy": "Privacy Statement",
+  "menu.help.support": "Support",
+  "menu.help.tos": "Terms of Service",
+  "menu.services": "Services",
+  "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.addNewService": "Add New Service...",
+  "menu.services.setNextServiceActive": "Activate next service",
+  "menu.view": "View",
+  "menu.view.enterFullScreen": "Enter Full Screen",
+  "menu.view.exitFullScreen": "Exit Full Screen",
+  "menu.view.reloadFranz": "Reload Franz",
+  "menu.view.reloadService": "Reload Service",
+  "menu.view.resetZoom": "Actual Size",
+  "menu.view.toggleDevTools": "Toggle Developer Tools",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
+  "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.window": "Window",
+  "menu.window.close": "Close",
+  "menu.window.minimize": "Minimize",
+  "menu.workspaces": "Workspaces",
+  "menu.workspaces.addNewWorkspace": "Add New Workspace...",
+  "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
+  "menu.workspaces.defaultWorkspace": "All services",
+  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
   "password.email.label": "Email address",
-  "password.submit.label": "Submit",
+  "password.headline": "Reset password",
+  "password.link.login": "Sign in to your account",
+  "password.link.signup": "Create a free account",
   "password.noUser": "No user with that email address was found",
+  "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
-  "password.link.signup": "Create a free account",
-  "password.link.login": "Sign in to your account",
-  "signup.headline": "Sign up",
-  "signup.firstname.label": "First Name",
-  "signup.lastname.label": "Last Name",
-  "signup.email.label": "Email address",
-  "signup.company.label": "Company",
-  "signup.password.label": "Password",
-  "signup.submit.label": "Create account",
-  "signup.link.login": "Already have an account, sign in?",
-  "signup.emailDuplicate": "A user with that email address already exists",
-  "signup.legal.info": "By creating a Franz account you accept the",
-  "signup.legal.terms": "Terms of service",
-  "signup.legal.privacy": "Privacy Statement",
+  "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.headline": "Support Franz",
-  "pricing.support.label": "Select your support plan",
-  "pricing.submit.label": "I want to support the development of Franz",
   "pricing.link.skipPayment": "I don't want to support the development of Franz.",
-  "import.headline": "Import your Franz 4 services",
-  "import.notSupportedHeadline": "Services not yet supported in Franz 5",
-  "import.submit.label": "Import services",
-  "import.skip.label": "I want to add services manually",
-  "invite.submit.label": "Send invites",
-  "invite.headline.friends": "Invite 3 of your friends or colleagues",
-  "invite.name.label": "Name",
-  "invite.email.label": "Email address",
-  "invite.skip.label": "I want to do this later",
-  "invite.successInfo": "Invitations sent successfully",
-  "subscription.submit.label": "I want to support the development of Franz",
-  "subscription.paymentSessionError": "Could not initialize payment form",
-  "subscription.includedFeatures": "Paid Franz Premium Supporter Account includes",
-  "subscription.features.onpremise": "Add on-premise/hosted services like HipChat",
-  "subscription.features.onpremise.mattermost": "Add on-premise/hosted services like Mattermost",
-  "subscription.features.encryptedSync": "Encrypted session synchronization",
-  "subscription.features.proxy": "Proxy support for services",
-  "subscription.features.ads": "No ads, ever!",
-  "subscription.features.spellchecker": "Support for spellchecker",
-  "subscription.features.noInterruptions": "No app delays & nagging to upgrade license",
-  "subscription.features.comingSoon": "coming soon",
-  "infobar.servicesUpdated": "Your services have been updated.",
-  "infobar.updateAvailable": "A new update for Franz is available.",
-  "infobar.buttonReloadServices": "Reload services",
-  "infobar.buttonInstallUpdate": "Restart & install update",
-  "infobar.buttonChangelog": "What is new?",
-  "infobar.requiredRequestsFailed": "Could not load services and user information",
-  "sidebar.settings": "Settings",
-  "sidebar.addNewService": "Add new service",
-  "sidebar.muteApp": "Disable notifications & audio",
-  "sidebar.unmuteApp": "Enable notifications & audio",
-  "services.welcome": "Welcome to Franz",
+  "pricing.submit.label": "I want to support the development of Franz",
+  "pricing.support.label": "Select your support plan",
+  "service.crashHandler.action": "Reload {name}",
+  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
+  "service.crashHandler.headline": "Oh no!",
+  "service.crashHandler.text": "{name} has caused an error.",
+  "service.disabledHandler.action": "Enable {name}",
+  "service.disabledHandler.headline": "{name} is disabled",
+  "service.errorHandler.action": "Reload {name}",
+  "service.errorHandler.editAction": "Edit {name}",
+  "service.errorHandler.headline": "Oh no!",
+  "service.errorHandler.message": "Error",
+  "service.errorHandler.text": "{name} has failed to load.",
+  "service.webviewLoader.loading": "Loading",
   "services.getStarted": "Get started",
-  "settings.searchService": "Search service",
-  "settings.account.headline": "Account",
-  "settings.account.headlineSubscription": "Your subscription",
-  "settings.account.headlineUpgrade": "Upgrade your account & support Franz",
-  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.manageSubscription.label": "Manage your subscription",
+  "services.welcome": "Welcome to Franz",
+  "settings.account.account.editButton": "Edit account",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
-  "settings.account.account.editButton": "Edit account",
-  "settings.account.invoiceDownload": "Download",
-  "settings.account.userInfoRequestFailed": "Could not load user information",
-  "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.headlineProfile": "Update profile",
-  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlinePassword": "Change password",
-  "settings.account.successInfo": "Your changes have been saved",
   "settings.account.buttonSave": "Update profile",
   "settings.account.deleteAccount": "Delete account",
-  "settings.account.deleteInfo": "If you don't need your Franz account any longer, you can delete your account and all related data here.",
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
+  "settings.account.deleteInfo": "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+  "settings.account.headline": "Account",
+  "settings.account.headlineAccount": "Account information",
+  "settings.account.headlineDangerZone": "Danger Zone",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlinePassword": "Change password",
+  "settings.account.headlineProfile": "Update profile",
+  "settings.account.headlineSubscription": "Your subscription",
+  "settings.account.headlineUpgrade": "Upgrade your account & support Franz",
+  "settings.account.invoiceDownload": "Download",
+  "settings.account.manageSubscription.label": "Manage your subscription",
+  "settings.account.successInfo": "Your changes have been saved",
+  "settings.account.tryReloadServices": "Try again",
+  "settings.account.tryReloadUserInfoRequest": "Try again",
+  "settings.account.userInfoRequestFailed": "Could not load user information",
+  "settings.app.buttonClearAllCache": "Clear cache",
+  "settings.app.buttonInstallUpdate": "Restart & install update",
+  "settings.app.buttonSearchForUpdate": "Check for updates",
+  "settings.app.cacheInfo": "Franz cache is currently using {size} of disk space.",
+  "settings.app.currentVersion": "Current version:",
+  "settings.app.form.autoLaunchInBackground": "Open in background",
+  "settings.app.form.autoLaunchOnStart": "Launch Franz on start",
+  "settings.app.form.beta": "Include beta versions",
+  "settings.app.form.darkMode": "Join the Dark Side",
+  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
+  "settings.app.form.enableSpellchecking": "Enable spell checking",
+  "settings.app.form.enableSystemTray": "Show Franz in system tray",
+  "settings.app.form.language": "Language",
+  "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray",
+  "settings.app.form.runInBackground": "Keep Franz in background when closing the window",
+  "settings.app.form.showDisabledServices": "Display disabled services tabs",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.headline": "Settings",
+  "settings.app.headlineAdvanced": "Advanced",
+  "settings.app.headlineAppearance": "Appearance",
+  "settings.app.headlineGeneral": "General",
+  "settings.app.headlineLanguage": "Language",
+  "settings.app.headlineUpdates": "Updates",
+  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
+  "settings.app.restartRequired": "Changes require restart",
+  "settings.app.subheadlineCache": "Cache",
+  "settings.app.translationHelp": "Help us to translate Franz into your language.",
+  "settings.app.updateStatusAvailable": "Update available, downloading...",
+  "settings.app.updateStatusSearching": "Is searching for update",
+  "settings.app.updateStatusUpToDate": "You are using the latest version of Franz",
   "settings.invite.headline": "Invite Friends",
-  "settings.navigation.availableServices": "Available services",
-  "settings.navigation.yourServices": "Your services",
   "settings.navigation.account": "Account",
-  "settings.navigation.settings": "Settings",
+  "settings.navigation.availableServices": "Available services",
   "settings.navigation.inviteFriends": "Invite Friends",
   "settings.navigation.logout": "Logout",
-  "settings.recipes.headline": "Available services",
-  "settings.recipes.mostPopular": "Most popular",
+  "settings.navigation.settings": "Settings",
+  "settings.navigation.team": "Manage Team",
+  "settings.navigation.yourServices": "Your services",
+  "settings.navigation.yourWorkspaces": "Your workspaces",
   "settings.recipes.all": "All services",
   "settings.recipes.dev": "Development",
+  "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.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
-  "settings.recipes.missingService": "Missing a service?",
-  "settings.service.form.saveButton": "Save service",
-  "settings.service.form.deleteButton": "Delete service",
-  "settings.service.form.availableServices": "Available services",
-  "settings.service.form.yourServices": "Your services",
+  "settings.searchService": "Search service",
+  "settings.service.error.goBack": "Back to services",
+  "settings.service.error.headline": "Error",
+  "settings.service.error.message": "Could not load service recipe.",
   "settings.service.form.addServiceHeadline": "Add {name}",
-  "settings.service.form.editServiceHeadline": "Edit {name}",
-  "settings.service.form.tabHosted": "Hosted",
-  "settings.service.form.tabOnPremise": "Self hosted ��",
-  "settings.service.form.useHostedService": "Use the hosted {name} service.",
-  "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.availableServices": "Available services",
+  "settings.service.form.customUrl": "Custom server",
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Franz Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
-  "settings.service.form.indirectMessageInfo": "You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
-  "settings.service.form.name": "Name",
-  "settings.service.form.enableService": "Enable service",
-  "settings.service.form.enableNotification": "Enable notifications",
-  "settings.service.form.enableBadge": "Show unread message badges",
-  "settings.service.form.team": "Team",
-  "settings.service.form.customUrl": "Custom server",
-  "settings.service.form.indirectMessages": "Show message badge for all new messages",
+  "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Enable audio",
-  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
-  "settings.service.form.headlineNotifications": "Notifications",
+  "settings.service.form.enableBadge": "Show unread message badges",
+  "settings.service.form.enableDarkMode": "Enable Dark Mode",
+  "settings.service.form.enableNotification": "Enable notifications",
+  "settings.service.form.enableService": "Enable service",
   "settings.service.form.headlineBadges": "Unread message badges",
   "settings.service.form.headlineGeneral": "General",
+  "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Custom icon",
   "settings.service.form.iconDelete": "Delete",
   "settings.service.form.iconUpload": "Drop your image, or click here",
-  "settings.service.form.enableDarkMode": "Enable Dark Mode",
+  "settings.service.form.indirectMessageInfo": "You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
+  "settings.service.form.indirectMessages": "Show message badge for all new messages",
+  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
+  "settings.service.form.name": "Name",
   "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
-  "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.port": "Port",
-  "settings.service.form.proxy.user": "User (optional)",
-  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.info": "Proxy settings will not synced with the Franz servers.",
+  "settings.service.form.proxy.isEnabled": "Use Proxy",
+  "settings.service.form.proxy.password": "Password (optional)",
+  "settings.service.form.proxy.port": "Port",
   "settings.service.form.proxy.restartInfo": "Please restart Franz after changing proxy Settings.",
-  "settings.service.form.spellcheckerLanguage": "Spell checking Language",
-  "settings.service.form.spellcheckerLanguage.default": "Use System Default ({default})",
-  "settings.service.error.headline": "Error",
-  "settings.service.error.goBack": "Back to services",
-  "settings.service.error.message": "Could not load service recipe.",
-  "settings.services.tooltip.isDisabled": "Service is disabled",
-  "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
-  "settings.services.tooltip.isMuted": "All sounds are muted",
+  "settings.service.form.proxy.user": "User (optional)",
+  "settings.service.form.saveButton": "Save service",
+  "settings.service.form.tabHosted": "Hosted",
+  "settings.service.form.tabOnPremise": "Self hosted ��",
+  "settings.service.form.team": "Team",
+  "settings.service.form.useHostedService": "Use the hosted {name} service.",
+  "settings.service.form.yourServices": "Your services",
+  "settings.services.deletedInfo": "Service has been deleted",
+  "settings.services.discoverServices": "Discover services",
   "settings.services.headline": "Your services",
   "settings.services.noServicesAdded": "You haven't added any services yet.",
-  "settings.services.discoverServices": "Discover services",
+  "settings.services.servicesRequestFailed": "Could not load your services",
+  "settings.services.tooltip.isDisabled": "Service is disabled",
+  "settings.services.tooltip.isMuted": "All sounds are muted",
+  "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
   "settings.services.updatedInfo": "Your changes have been saved",
-  "settings.services.deletedInfo": "Service has been deleted",
-  "settings.app.headline": "Settings",
-  "settings.app.headlineGeneral": "General",
-  "settings.app.headlineLanguage": "Language",
-  "settings.app.headlineUpdates": "Updates",
-  "settings.app.headlineAppearance": "Appearance",
-  "settings.app.headlineAdvanced": "Advanced",
-  "settings.app.buttonSearchForUpdate": "Check for updates",
-  "settings.app.buttonInstallUpdate": "Restart & install update",
-  "settings.app.updateStatusSearching": "Is searching for update",
-  "settings.app.updateStatusAvailable": "Update available, downloading...",
-  "settings.app.updateStatusUpToDate": "You are using the latest version of Franz",
-  "settings.app.subheadlineCache": "Cache",
-  "settings.app.cacheInfo": "Franz cache is currently using {size} of disk space.",
-  "settings.app.buttonClearAllCache": "Clear cache",
-  "settings.app.form.autoLaunchOnStart": "Launch Franz on start",
-  "settings.app.form.autoLaunchInBackground": "Open in background",
-  "settings.app.form.enableSystemTray": "Show Franz in system tray",
-  "settings.app.form.darkMode": "Join the Dark Side",
-  "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray",
-  "settings.app.form.enableMenuBar": "Show Franz in Menu Bar",
-  "settings.app.form.hideDockIcon": "Hide Franz icon in Dock",
-  "settings.app.form.runInBackground": "Keep Franz in background when closing the window",
-  "settings.app.form.language": "Language",
-  "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.spellcheckerLanguage": "Spell checking language",
-  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.beta": "Include beta versions",
-  "settings.app.translationHelp": "Help us to translate Franz into your language.",
-  "settings.app.currentVersion": "Current version:",
-  "settings.app.restartRequired": "Changes require restart",
+  "settings.team.contentHeadline": "Franz for Teams",
+  "settings.team.copy": "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.headline": "Team",
+  "settings.team.intro": "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
+  "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",
+  "settings.user.form.accountType.non-profit": "Non-Profit",
+  "settings.user.form.currentPassword": "Current password",
+  "settings.user.form.email": "Email",
   "settings.user.form.firstname": "First Name",
   "settings.user.form.lastname": "Last Name",
-  "settings.user.form.email": "Email",
-  "settings.user.form.currentPassword": "Current password",
   "settings.user.form.newPassword": "New password",
-  "settings.user.form.accountType.label": "Account type",
-  "settings.user.form.accountType.individual": "Individual",
-  "settings.user.form.accountType.non-profit": "Non-Profit",
-  "settings.user.form.accountType.company": "Company",
+  "settings.workspace.add.form.name": "Name",
+  "settings.workspace.add.form.submitButton": "Create workspace",
+  "settings.workspace.form.buttonDelete": "Delete workspace",
+  "settings.workspace.form.buttonSave": "Save workspace",
+  "settings.workspace.form.name": "Name",
+  "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace",
+  "settings.workspace.form.yourWorkspaces": "Your workspaces",
+  "settings.workspaces.deletedInfo": "Workspace has been deleted",
+  "settings.workspaces.headline": "Your workspaces",
+  "settings.workspaces.noWorkspacesAdded": "You haven't added any workspaces yet.",
+  "settings.workspaces.tryReloadWorkspaces": "Try again",
+  "settings.workspaces.updatedInfo": "Your changes have been saved",
+  "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Franz Workspaces",
+  "settings.workspaces.workspaceFeatureInfo": "Franz 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": "Could not load your workspaces",
+  "sidebar.addNewService": "Add new service",
+  "sidebar.closeWorkspaceDrawer": "Close workspace drawer",
+  "sidebar.muteApp": "Disable notifications & audio",
+  "sidebar.openWorkspaceDrawer": "Open workspace drawer",
+  "sidebar.settings": "Settings",
+  "sidebar.unmuteApp": "Enable notifications & audio",
+  "signup.company.label": "Company",
+  "signup.email.label": "Email address",
+  "signup.emailDuplicate": "A user with that email address already exists",
+  "signup.firstname.label": "First Name",
+  "signup.headline": "Sign up",
+  "signup.lastname.label": "Last Name",
+  "signup.legal.info": "By creating a Franz account you accept the",
+  "signup.legal.privacy": "Privacy Statement",
+  "signup.legal.terms": "Terms of service",
+  "signup.link.login": "Already have an account, sign in?",
+  "signup.password.label": "Password",
+  "signup.submit.label": "Create account",
+  "subscription.euTaxInfo": "EU residents: local sales tax may apply",
+  "subscription.features.ads": "No ads, ever!",
+  "subscription.features.comingSoon": "coming soon",
+  "subscription.features.noInterruptions": "No app delays & nagging to upgrade license",
+  "subscription.features.onpremise.mattermost": "Add on-premise/hosted services like Mattermost",
+  "subscription.features.proxy": "Proxy support for services",
+  "subscription.features.spellchecker": "Support for spellchecker",
+  "subscription.features.workspaces": "Organize your services in workspaces",
+  "subscription.includedFeatures": "Paid Franz Premium Supporter Account includes",
+  "subscription.paymentSessionError": "Could not initialize payment form",
+  "subscription.submit.label": "I want to support the development of Franz",
   "subscription.type.free": "free",
   "subscription.type.month": "month",
   "subscription.type.year": "year",
-  "subscription.euTaxInfo": "EU residents: local sales tax may apply",
   "subscriptionPopup.buttonCancel": "Cancel",
   "subscriptionPopup.buttonDone": "Done",
-  "tabs.item.reload": "Reload",
-  "tabs.item.edit": "Edit",
-  "tabs.item.disableNotifications": "Disable notifications",
-  "tabs.item.enableNotification": "Enable notifications",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Disable audio",
-  "tabs.item.enableAudio": "Enable audio",
+  "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
+  "tabs.item.edit": "Edit",
+  "tabs.item.enableAudio": "Enable audio",
+  "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
-  "tabs.item.deleteService": "Delete service",
-  "service.crashHandler.headline": "Oh no!",
-  "service.crashHandler.text": "{name} has caused an error.",
-  "service.crashHandler.action": "Reload {name}",
-  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
-  "service.errorHandler.headline": "Oh no!",
-  "service.errorHandler.text": "{name} has failed to load.",
-  "service.errorHandler.message": "Error",
-  "service.errorHandler.action": "Reload {name}",
-  "service.errorHandler.editAction": "Edit {name}",
-  "service.disabledHandler.headline": "{name} is disabled",
-  "service.disabledHandler.action": "Enable {name}",
-  "menu.edit": "Edit",
-  "menu.edit.undo": "Undo",
-  "menu.edit.redo": "Redo",
-  "menu.edit.cut": "Cut",
-  "menu.edit.copy": "Copy",
-  "menu.edit.paste": "Paste",
-  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
-  "menu.edit.delete": "Delete",
-  "menu.edit.selectAll": "Select All",
-  "menu.edit.speech": "Speech",
-  "menu.edit.startSpeaking": "Start Speaking",
-  "menu.edit.stopSpeaking": "Stop Speaking",
-  "menu.edit.startDictation": "Start Dictation",
-  "menu.edit.emojiSymbols": "Emoji & Symbols",
-  "menu.view.resetZoom": "Actual Size",
-  "menu.view.zoomIn": "Zoom In",
-  "menu.view.zoomOut": "Zoom Out",
-  "menu.view.enterFullScreen": "Enter Full Screen",
-  "menu.view.exitFullScreen": "Exit Full Screen",
-  "menu.view.toggleFullScreen": "Toggle Full Screen",
-  "menu.view.toggleDevTools": "Toggle Developer Tools",
-  "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
-  "menu.view.reloadService": "Reload Service",
-  "menu.view.reloadFranz": "Reload Franz",
-  "menu.window.minimize": "Minimize",
-  "menu.window.close": "Close",
-  "menu.help.learnMore": "Learn More",
-  "menu.help.changelog": "Changelog",
-  "menu.help.support": "Support",
-  "menu.help.tos": "Terms of Service",
-  "menu.help.privacy": "Privacy Statement",
-  "menu.file": "File",
-  "menu.view": "View",
-  "menu.services": "Services",
-  "menu.window": "Window",
-  "menu.help": "Help",
-  "menu.app.about": "About Franz",
-  "menu.app.settings": "Settings",
-  "menu.app.hide": "Hide",
-  "menu.app.hideOthers": "Hide Others",
-  "menu.app.unhide": "Unhide",
-  "menu.app.quit": "Quit",
-  "menu.services.addNewService": "Add New Service...",
-  "validation.required": "{field} is required",
+  "tabs.item.reload": "Reload",
   "validation.email": "{field} is not valid",
-  "validation.url": "{field} is not a valid URL",
   "validation.minLength": "{field} should be at least {length} characters long",
-  "feature.delayApp.headline": "Please purchase a Franz Supporter License to skip waiting",
-  "feature.delayApp.action": "Get a Franz Supporter License",
-  "feature.delayApp.text": "Franz will continue in {seconds} seconds.",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
-  "app.errorHandler.headline": "Something went wrong",
-  "app.errorHandler.action": "Reload"
-}
+  "validation.oneRequired": "At least one is required",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
+  "welcome.loginButton": "Login to your account",
+  "welcome.signupButton": "Create a free account",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
+  "workspaceDrawer.allServices": "All services",
+  "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>Franz 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"
+}
\ No newline at end of file
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 669b4d2dd..4167a5c7d 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1,11 +1,23 @@
 {
    "app.errorHandler.action" : "Recargar",
-   "app.errorHandler.headline" : "Something went wrong",
+   "app.errorHandler.headline" : "Ha surgido un error",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
    "feature.delayApp.action" : "Consigue una Licencia de Soporte de Franz",
    "feature.delayApp.headline" : "Por favor, compra una Licencia de Soporte de Franz para saltar la espera",
-   "feature.delayApp.text" : "Franz continuará en {seconds}  segundos.",
+   "feature.delayApp.text" : "Franz continuará en {seconds} segundos.",
+   "feature.shareFranz.action.email" : "Envía como correo",
+   "feature.shareFranz.action.facebook" : "Compartir en Facebook",
+   "feature.shareFranz.action.twitter" : "Compartir en Twitter",
+   "feature.shareFranz.headline" : "¡Juntos mejoramos Franz!",
+   "feature.shareFranz.shareText.email" : "¡He añadido {count} servicios a Franz! Obtén la aplicación gratuita para WhatsApp, Messenger, Slack, Skype en www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Dile a tus amigos y colegas lo asombroso que es Franz y ayúdanos a correr la voz.",
    "global.api.unhealthy" : "No es posible conectarse a los servicios en línea de Franz.",
    "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",
    "import.headline" : "Importa tus servicios de Franz 4",
    "import.notSupportedHeadline" : "Servicios no admitidos aún en Franz 5",
    "import.skip.label" : "Quiero agregar servicios manualmente",
@@ -32,6 +44,7 @@
    "login.submit.label" : "Iniciar sesión",
    "login.tokenExpired" : "Tu sesión ha expirado, por favor inicia sesión de nuevo.",
    "menu.app.about" : "Sobre Franz",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Ocultar",
    "menu.app.hideOthers" : "Ocultar otros",
    "menu.app.quit" : "Salir",
@@ -59,7 +72,9 @@
    "menu.help.support" : "Ayuda técnica",
    "menu.help.tos" : "Términos del Servicio",
    "menu.services" : "Servicios",
+   "menu.services.activatePreviousService" : "Activa el servicio previo",
    "menu.services.addNewService" : "Añadir Nuevo Servicio...",
+   "menu.services.setNextServiceActive" : "Activa el siguiente servicio",
    "menu.view" : "Mostrar",
    "menu.view.enterFullScreen" : "Pasar a pantalla completa",
    "menu.view.exitFullScreen" : "Salir de Pantalla Completa",
@@ -74,6 +89,11 @@
    "menu.window" : "Ventana",
    "menu.window.close" : "Cerrar",
    "menu.window.minimize" : "Minimizar",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Todos los servicios",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "Dirección de correo electrónico",
    "password.headline" : "Restablecer contraseña",
    "password.link.login" : "Inicia sesión en tu cuenta",
@@ -96,7 +116,8 @@
    "service.errorHandler.editAction" : "Editar {name}",
    "service.errorHandler.headline" : "¡Oh, no!",
    "service.errorHandler.message" : "Error",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} ha fallado la carga",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "Primeros pasos",
    "services.welcome" : "Bienvenido a Franz",
    "settings.account.account.editButton" : "Editar cuenta",
@@ -117,7 +138,8 @@
    "settings.account.invoiceDownload" : "Descargar",
    "settings.account.manageSubscription.label" : "Administra tu suscripción",
    "settings.account.successInfo" : "Tus cambios han sido guardados",
-   "settings.account.tryReloadUserInfoRequest" : "Intentar de nuevo",
+   "settings.account.tryReloadServices" : "Intentar de nuevo",
+   "settings.account.tryReloadUserInfoRequest" : "Intenta de nuevo",
    "settings.account.userInfoRequestFailed" : "No se pudo cargar la información de usuario",
    "settings.app.buttonClearAllCache" : "Limpiar caché",
    "settings.app.buttonInstallUpdate" : "Reiniciar e instalar actualizaciones",
@@ -129,22 +151,20 @@
    "settings.app.form.beta" : "Incluir versiones beta",
    "settings.app.form.darkMode" : "Únete al Lado Oscuro",
    "settings.app.form.enableGPUAcceleration" : "Habilitar aceleración de GPU",
-   "settings.app.form.enableMenuBar" : "Mostrar a Franz en la barra de menús",
    "settings.app.form.enableSpellchecking" : "Activar corrección ortográfica",
    "settings.app.form.enableSystemTray" : "Mostrar Franz en la bandeja del sistema",
-   "settings.app.form.hideDockIcon" : "Ocultar Icono de Franz en barra de herramientas",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimizar Franz a la bandeja del sistema",
    "settings.app.form.runInBackground" : "Mantener Franz en segundo plano al cerrar la ventana",
    "settings.app.form.showDisabledServices" : "Mostrar pestañas de servicios desactivados",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Mostrar la insignia de mensajes sin leer cuando las notificaciones están desactivadas",
-   "settings.app.form.spellcheckerLanguage" : "Corrector de ortografía",
    "settings.app.headline" : "Configuración",
    "settings.app.headlineAdvanced" : "Avanzado",
    "settings.app.headlineAppearance" : "Apariencia",
    "settings.app.headlineGeneral" : "General",
    "settings.app.headlineLanguage" : "Idioma",
    "settings.app.headlineUpdates" : "Actualizaciones",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "Los cambios requieren reiniciar",
    "settings.app.subheadlineCache" : "Caché",
    "settings.app.translationHelp" : "Ayúdanos a traducir Franz a tu idioma.",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "Invita a tus amigos",
    "settings.navigation.logout" : "Cerrar sesión",
    "settings.navigation.settings" : "Configuración",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "Tus servicios",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "Todos los servicios",
    "settings.recipes.dev" : "Desarrollo",
    "settings.recipes.headline" : "Servicios disponibles",
@@ -192,17 +214,15 @@
    "settings.service.form.indirectMessages" : "Mostrar señal de notificación para todos los mensajes nuevos",
    "settings.service.form.isMutedInfo" : "Cuando estén desactivados, todos los sonidos de notificación y la reproducción de audio serán silenciados",
    "settings.service.form.name" : "Nombre",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "Ajustes Proxy HTTP\/HTTPS",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Las configuraciones de Proxy no se sincronizarán con los servidores de Franz.",
    "settings.service.form.proxy.isEnabled" : "Use Proxy",
    "settings.service.form.proxy.password" : "Contraseña (opcional)",
-   "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.port" : "Puerto",
+   "settings.service.form.proxy.restartInfo" : "Por favor reinicie Franz despues de modificar los ajustes proxy.",
    "settings.service.form.proxy.user" : "Usuario (opcional)",
    "settings.service.form.saveButton" : "Guardar servicio",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Alojado",
    "settings.service.form.tabOnPremise" : "Auto alojado ��",
    "settings.service.form.team" : "Equipo",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "Descubrir servicios",
    "settings.services.headline" : "Tus servicios",
    "settings.services.noServicesAdded" : "No has añadido ningún servicio aún.",
+   "settings.services.servicesRequestFailed" : "No pudo cargar tus servicios",
    "settings.services.tooltip.isDisabled" : "El servicio está desactivado",
    "settings.services.tooltip.isMuted" : "Todos los sonidos están silenciados",
    "settings.services.tooltip.notificationsDisabled" : "Las notificaciones están desactivadas",
    "settings.services.updatedInfo" : "Tus cambios han sido guardados",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Equipo",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
    "settings.user.form.accountType.company" : "Empresa",
    "settings.user.form.accountType.individual" : "Individual",
    "settings.user.form.accountType.label" : "Tipo de cuenta",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "Nombre",
    "settings.user.form.lastname" : "Apellido",
    "settings.user.form.newPassword" : "Nueva contraseña",
+   "settings.workspace.add.form.name" : "Nombre",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Nombre",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Try again",
+   "settings.workspaces.updatedInfo" : "Tus cambios han sido guardados",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "Añadir nuevo servicio",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "Desactivar notificaciones y sonido",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Configuración",
    "sidebar.unmuteApp" : "Activar notificaciones y sonido",
    "signup.company.label" : "Compañía",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "Residentes de la UE: pueden aplicarse impuestos locales",
    "subscription.features.ads" : "¡Sin publicidad, para siempre!",
    "subscription.features.comingSoon" : "próximamente",
-   "subscription.features.encryptedSync" : "Sincronización de sesión encriptada",
    "subscription.features.noInterruptions" : "Sin retrasos en la app ni molestas actualizaciones de licencias",
-   "subscription.features.onpremise" : "Añade servicios locales\/autoalojados como HipChat",
    "subscription.features.onpremise.mattermost" : "Agregar servicios de almacenamiento como Mattermost",
    "subscription.features.proxy" : "Soporte Proxy para servicios",
    "subscription.features.spellchecker" : "Soporte para corrector de ortografía",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "La Cuenta pagada de Colaborador Premium de Franz incluye",
    "subscription.paymentSessionError" : "No se pudo inicializar el formulario de pago",
    "subscription.submit.label" : "Quiero apoyar el desarrollo de Franz",
@@ -269,9 +312,20 @@
    "tabs.item.reload" : "Recargar",
    "validation.email" : "{field} no es válido",
    "validation.minLength" : "{field} debería tener al menos {length} caracteres",
+   "validation.oneRequired" : "Al menos uno es requerido",
    "validation.required" : "{field} es obligatorio",
    "validation.url" : "{field} no es una URL válida",
    "welcome.loginButton" : "Accede a tu cuenta",
    "welcome.signupButton" : "Crear una cuenta gratuita",
-   "welcome.slogan" : "Mensajería que funciona para ti"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Todos los servicios",
+   "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>Franz 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/fr.json b/src/i18n/locales/fr.json
index a83767f1e..2bd5326c0 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -1,11 +1,23 @@
 {
    "app.errorHandler.action" : "Recharger",
-   "app.errorHandler.headline" : "Une erreur s'est produite.",
+   "app.errorHandler.headline" : "Une erreur s'est produite",
+   "feature.announcements.changelog.headline" : "Changements dans Franz {version}",
    "feature.delayApp.action" : "Obtenez une licence de Supporter Franz",
    "feature.delayApp.headline" : "Veuillez acheter une licence de Supporter Franz pour sauter le temps d'attente",
-   "feature.delayApp.text" : "Franz continuera dans {seconds} secondes.",
+   "feature.delayApp.text" : "Franz reprendra dans {seconds} secondes.",
+   "feature.shareFranz.action.email" : "Envoyer par mail",
+   "feature.shareFranz.action.facebook" : "Partager sur Facebook",
+   "feature.shareFranz.action.twitter" : "Partager sur Twitter",
+   "feature.shareFranz.headline" : "Franz est meilleur quand on est tous ensemble !",
+   "feature.shareFranz.shareText.email" : "J'ai ajouté {count} services à Franz ! Télécharger l'appli gratuite pour WhatsApp, Messenger, Skype et cie sur www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "J'ai ajouté {count} services à Franz! Télécharge l'application gratuite pour WhatsApp, Messenger, Slack, Skype et compagnie sur www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Dites à vos amis et collègues combien Franz est super et aidez nous à faire passer le mot.",
    "global.api.unhealthy" : "Impossible de se connecter aux services en ligne de Franz",
    "global.notConnectedToTheInternet" : "Vous n'êtes pas connecté à Internet.",
+   "global.spellchecker.useDefault" : "Par défaut ({default})",
+   "global.spellchecking.autodetect" : "Detecter automatiquement la langue",
+   "global.spellchecking.autodetect.short" : "Automatiquement",
+   "global.spellchecking.language" : "Langue de la vérification orthographique",
    "import.headline" : "Importez vos services depuis la version 4 de Franz.",
    "import.notSupportedHeadline" : "Ces services ne sont pas encore supportés par Franz 5",
    "import.skip.label" : "Je veux ajouter des services manuellement",
@@ -32,6 +44,7 @@
    "login.submit.label" : "Se connecter",
    "login.tokenExpired" : "Votre session a expiré, veuillez vous reconnecter.",
    "menu.app.about" : "À propos de Franz",
+   "menu.app.announcement" : "Quoi de neuf? ",
    "menu.app.hide" : "Masquer",
    "menu.app.hideOthers" : "Masquer les autres",
    "menu.app.quit" : "Quitter",
@@ -59,7 +72,9 @@
    "menu.help.support" : "Support",
    "menu.help.tos" : "Conditions d'utilisation",
    "menu.services" : "Services",
+   "menu.services.activatePreviousService" : "Activer le service précédent",
    "menu.services.addNewService" : "Ajouter un nouveau service...",
+   "menu.services.setNextServiceActive" : "Activer le service suivant",
    "menu.view" : "Aperçu",
    "menu.view.enterFullScreen" : "Entrer en mode plein écran",
    "menu.view.exitFullScreen" : "Sortir du mode plein écran",
@@ -74,13 +89,18 @@
    "menu.window" : "Fenêtre",
    "menu.window.close" : "Fermer",
    "menu.window.minimize" : "Réduire",
-   "password.email.label" : "Adresse e-mail",
+   "menu.workspaces" : "Espace de travail",
+   "menu.workspaces.addNewWorkspace" : "Ajouter un nouvel espace de travail",
+   "menu.workspaces.closeWorkspaceDrawer" : "Ouvrir l'espace de travail",
+   "menu.workspaces.defaultWorkspace" : "Tous les services",
+   "menu.workspaces.openWorkspaceDrawer" : "Fermer l'espace de travail",
+   "password.email.label" : "Adresse email",
    "password.headline" : "Réinitialiser le mot de passe",
    "password.link.login" : "Connectez-vous à votre compte",
    "password.link.signup" : "Créer un compte gratuit.",
-   "password.noUser" : "Aucun utilisateur n'a été trouvé avec cette adresse e-mail",
+   "password.noUser" : "Aucun utilisateur n'a été trouvé avec cette adresse email",
    "password.submit.label" : "Soumettre",
-   "password.successInfo" : "Merci de consulter vos e-mails",
+   "password.successInfo" : "Merci de consulter vos emails",
    "premiumFeature.button.upgradeAccount" : "Mettre à niveau mon compte",
    "pricing.headline" : "Soutenez Franz",
    "pricing.link.skipPayment" : "Je ne veux pas soutenir le développement de Franz.",
@@ -97,6 +117,7 @@
    "service.errorHandler.headline" : "Oh non !",
    "service.errorHandler.message" : "Erreur",
    "service.errorHandler.text" : "Le chargement de {name} a échoué.",
+   "service.webviewLoader.loading" : "Chargement (c'est l'heure du café...)",
    "services.getStarted" : "Commencer",
    "services.welcome" : "Bienvenue dans Franz",
    "settings.account.account.editButton" : "Modifier le compte",
@@ -108,7 +129,7 @@
    "settings.account.deleteInfo" : "Si vous n'avez plus besoin de votre compte Franz, vous pouvez le supprimer avec toutes ses données associées.",
    "settings.account.headline" : "Compte",
    "settings.account.headlineAccount" : "Informations sur le compte",
-   "settings.account.headlineDangerZone" : "Zone Dangereuse !",
+   "settings.account.headlineDangerZone" : "Zone dangereuse !",
    "settings.account.headlineInvoices" : "Factures",
    "settings.account.headlinePassword" : "Changer le mot de passe",
    "settings.account.headlineProfile" : "Mettre à jour le profil",
@@ -117,6 +138,7 @@
    "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.tryReloadServices" : "Réessayer",
    "settings.account.tryReloadUserInfoRequest" : "Réessayer",
    "settings.account.userInfoRequestFailed" : "Impossible de charger les informations de l'utilisateur",
    "settings.app.buttonClearAllCache" : "Vider le cache",
@@ -129,22 +151,20 @@
    "settings.app.form.beta" : "Accepter les versions bêta",
    "settings.app.form.darkMode" : "Rejoins le côté obscur",
    "settings.app.form.enableGPUAcceleration" : "Activer l'accélération GPU",
-   "settings.app.form.enableMenuBar" : "Afficher Franz dans la barre des menus",
    "settings.app.form.enableSpellchecking" : "Activer la vérification orthographique",
    "settings.app.form.enableSystemTray" : "Afficher Franz dans la barre d'état système",
-   "settings.app.form.hideDockIcon" : "Masquer Franz dans le Dock",
    "settings.app.form.language" : "Langue",
    "settings.app.form.minimizeToSystemTray" : "Minimiser Franz dans la zone de notification",
    "settings.app.form.runInBackground" : "Garder Franz ouvert en arrière-plan à la fermeture de la fenêtre",
    "settings.app.form.showDisabledServices" : "Afficher les onglets des services désactivés",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Afficher les badges de messages non lus quand les notifications sont désactivées.",
-   "settings.app.form.spellcheckerLanguage" : "Langue de la vérification orthographique",
    "settings.app.headline" : "Paramètres",
    "settings.app.headlineAdvanced" : "Paramètres avancés",
    "settings.app.headlineAppearance" : "Apparence",
    "settings.app.headlineGeneral" : "Général",
    "settings.app.headlineLanguage" : "Langue",
    "settings.app.headlineUpdates" : "Mises à jour",
+   "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.restartRequired" : "Les modifications nécessitent un redémarrage",
    "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Aidez-nous à traduire Franz dans votre langue.",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "Inviter des amis",
    "settings.navigation.logout" : "Se déconnecter",
    "settings.navigation.settings" : "Paramètres",
+   "settings.navigation.team" : "Gérer l'équipe",
    "settings.navigation.yourServices" : "Vos services",
+   "settings.navigation.yourWorkspaces" : "Tes espaces de travail",
    "settings.recipes.all" : "Tous les services",
    "settings.recipes.dev" : "Développement",
    "settings.recipes.headline" : "Services disponibles",
@@ -192,19 +214,17 @@
    "settings.service.form.indirectMessages" : "Afficher le badge des messages pour tous les nouveaux messages",
    "settings.service.form.isMutedInfo" : "Lorsque désactivé, tous les sons de notifications ainsi que l'audio sont coupés",
    "settings.service.form.name" : "Nom",
-   "settings.service.form.proxy.headline" : "Paramètres Proxy HTTP\/HTTPS",
+   "settings.service.form.proxy.headline" : "Paramètres proxy HTTP\/HTTPS",
    "settings.service.form.proxy.host" : "Hôte\/IP du proxy",
    "settings.service.form.proxy.info" : "Les paramètres de proxy ne seront pas synchronisés avec les serveurs de Franz.",
    "settings.service.form.proxy.isEnabled" : "Utiliser un proxy",
    "settings.service.form.proxy.password" : "Mot de passe (facultatif)",
    "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Veuillez redémarrer Franz après avoir modifier les paramètres proxy.",
+   "settings.service.form.proxy.restartInfo" : "Veuillez redémarrer Franz après avoir modifié les paramètres proxy.",
    "settings.service.form.proxy.user" : "Utilisateur (facultatif)",
    "settings.service.form.saveButton" : "Enregistrer le service",
-   "settings.service.form.spellcheckerLanguage" : "Veuillez vérifier l'épellation Langage",
-   "settings.service.form.spellcheckerLanguage.default" : "Par défaut ({default})",
    "settings.service.form.tabHosted" : "Hébergé",
-   "settings.service.form.tabOnPremise" : "Auto-hébergé ��",
+   "settings.service.form.tabOnPremise" : "hébergé par soi-même ��",
    "settings.service.form.team" : "Équipe",
    "settings.service.form.useHostedService" : "Utilisez le service hébergé {name}.",
    "settings.service.form.yourServices" : "Vos services",
@@ -212,26 +232,50 @@
    "settings.services.discoverServices" : "Découvrir les services",
    "settings.services.headline" : "Vos services",
    "settings.services.noServicesAdded" : "Vous n'avez pas encore ajouté de services.",
+   "settings.services.servicesRequestFailed" : "Impossible de charger vos services",
    "settings.services.tooltip.isDisabled" : "Ce service est désactivé",
    "settings.services.tooltip.isMuted" : "Tous les sons sont coupés",
    "settings.services.tooltip.notificationsDisabled" : "Notifications désactivées.",
    "settings.services.updatedInfo" : "Vos modifications ont été enregistrées",
+   "settings.team.contentHeadline" : "Franz pour les équipes",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Équipe de travail",
+   "settings.team.intro" : "Tu peux désormais gérer les abonnements Premium pour autant de collègues, amis ou membres de famille que tu souhaites, à partir d'un seul et même compte.",
+   "settings.team.manageAction" : "Gère ton équipe sur meetfranz.com",
+   "settings.team.upgradeAction" : "Mise à niveau du compte",
    "settings.user.form.accountType.company" : "Entreprise",
    "settings.user.form.accountType.individual" : "Individuel",
    "settings.user.form.accountType.label" : "Type de compte",
    "settings.user.form.accountType.non-profit" : "Non-lucratif",
    "settings.user.form.currentPassword" : "Mot de passe actuel",
-   "settings.user.form.email" : "E-mail",
+   "settings.user.form.email" : "Email",
    "settings.user.form.firstname" : "Prénom",
    "settings.user.form.lastname" : "Nom",
    "settings.user.form.newPassword" : "Nouveau mot de passe",
+   "settings.workspace.add.form.name" : "Nom",
+   "settings.workspace.add.form.submitButton" : "Créer un espace de travail",
+   "settings.workspace.form.buttonDelete" : "Effacer l'espace de travail",
+   "settings.workspace.form.buttonSave" : "Sauvegarder l'espace de travail",
+   "settings.workspace.form.name" : "Nom",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Tes espaces de travail",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Vos espaces de travails",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Réessayer",
+   "settings.workspaces.updatedInfo" : "Vos modifications ont été enregistrées",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "Ajouter un nouveau service",
+   "sidebar.closeWorkspaceDrawer" : "Ouvrir l'espace de travail",
    "sidebar.muteApp" : "Désactiver les notifications et les sons",
+   "sidebar.openWorkspaceDrawer" : "Fermer l'espace de travail",
    "sidebar.settings" : "Paramètres",
    "sidebar.unmuteApp" : "Activer les notifications et les sons",
    "signup.company.label" : "Entreprise",
-   "signup.email.label" : "Adresse e-mail",
-   "signup.emailDuplicate" : "Cette adresse e-mail est déjà utilisée",
+   "signup.email.label" : "Adresse email",
+   "signup.emailDuplicate" : "Cette adresse email est déjà utilisée",
    "signup.firstname.label" : "Prénom",
    "signup.headline" : "S'inscrire",
    "signup.lastname.label" : "Nom",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "Résidents de l'UE : une taxe locale peut s'appliquer",
    "subscription.features.ads" : "Plus de pubs !",
    "subscription.features.comingSoon" : "Bientôt disponible",
-   "subscription.features.encryptedSync" : "Synchronisation de session cryptée",
    "subscription.features.noInterruptions" : "Aucun délai dans l'application ni de harcèlement pour mettre à niveau la licence",
-   "subscription.features.onpremise" : "Ajouter des services locaux\/hébergés comme HipChat",
    "subscription.features.onpremise.mattermost" : "Ajouter des services auto-hébergés comme Mattermost",
    "subscription.features.proxy" : "Support proxy pour les services",
    "subscription.features.spellchecker" : "Prise en charge du correcteur orthographique",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "Le compte payant Supporter Premium Franz inclut",
    "subscription.paymentSessionError" : "Initialisation du paiement impossible",
    "subscription.submit.label" : "Je souhaite aider au développement de Franz",
@@ -269,9 +312,20 @@
    "tabs.item.reload" : "Recharger",
    "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",
    "validation.required" : "{field} est requis",
    "validation.url" : "{field} n'est pas une URL valide",
    "welcome.loginButton" : "Se connecter sur son compte",
    "welcome.signupButton" : "Créer un compte gratuit",
-   "welcome.slogan" : "Une messagerie qui fonctionne pour vous"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Tous les services",
+   "workspaceDrawer.headline" : "Espace de travail",
+   "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>Franz 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/ga.json b/src/i18n/locales/ga.json
index 0d3d8623e..3f1e827fb 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -1,11 +1,23 @@
 {
    "app.errorHandler.action" : "Athlódáil",
    "app.errorHandler.headline" : "Something went wrong",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Ní féidir nascadh le seirbhísí Franz ar líne",
    "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",
    "import.headline" : "Iompórtáil do sheirbhísí Franz 4",
    "import.notSupportedHeadline" : "Níl na seirbhísí seo taca ag Franz 5 go fóill",
    "import.skip.label" : "Ba mhaith liom seirbhísí a chur de láimh",
@@ -32,6 +44,7 @@
    "login.submit.label" : "Logáil isteach",
    "login.tokenExpired" : "D'éag do sheisiún, logáil isteach arís le do thoil.",
    "menu.app.about" : "Faoi Franz",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Cuir Franz i bhfolach",
    "menu.app.hideOthers" : "Folaigh feidhmchláir eile",
    "menu.app.quit" : "Scoir",
@@ -59,7 +72,9 @@
    "menu.help.support" : "Tacaíocht",
    "menu.help.tos" : "Téarmaí tagartha",
    "menu.services" : "Seirbhísí",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Cuir seirbhís nua leis",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Amharc",
    "menu.view.enterFullScreen" : "Cuir isteach mód lánscáileáin",
    "menu.view.exitFullScreen" : "Scoir mód lánscáileáin",
@@ -74,6 +89,11 @@
    "menu.window" : "Fuinneog",
    "menu.window.close" : "Dún",
    "menu.window.minimize" : "�oslaghdaigh",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Gach seirbhís",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "Seoladh ríomhphoist",
    "password.headline" : "Athshocraigh pasfhocal",
    "password.link.login" : "Logáil isteach i do chuntas",
@@ -97,6 +117,7 @@
    "service.errorHandler.headline" : "Oró, ní hea!",
    "service.errorHandler.message" : "Earráid",
    "service.errorHandler.text" : "{name} has failed to load.",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "Cuir tús",
    "services.welcome" : "Fáilte go Franz",
    "settings.account.account.editButton" : "Cuir cuntas in eagar",
@@ -117,6 +138,7 @@
    "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.tryReloadServices" : "Atriail",
    "settings.account.tryReloadUserInfoRequest" : "Atriail",
    "settings.account.userInfoRequestFailed" : "Ní féidir eolas úsáideora a lódáil",
    "settings.app.buttonClearAllCache" : "Glan taisce",
@@ -129,22 +151,20 @@
    "settings.app.form.beta" : "Cuir leagain béite san áireamh",
    "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Cumasaigh luasghéarú APG",
-   "settings.app.form.enableMenuBar" : "Taispeáin Franz sa bharra roghchláir",
    "settings.app.form.enableSpellchecking" : "Cumasaigh seiceáil litrithe",
    "settings.app.form.enableSystemTray" : "Taispeáin Franz i dtráidire an chórais",
-   "settings.app.form.hideDockIcon" : "Cuir íocóin Franz i bhfolach ón leaba nasctha",
    "settings.app.form.language" : "Teanga",
    "settings.app.form.minimizeToSystemTray" : "�oslaghdaigh Franz chuig tráidire an chórais",
    "settings.app.form.runInBackground" : "Coimeád Franz sa chúlra nuair a dhúntar an fhuinneog",
    "settings.app.form.showDisabledServices" : "Taispeáin tabanna do sheirbhísí dhíchumasaithe",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Taispeáin teachtaireachtaí neamhléite, nuair a dhíchumasaítear fógraí",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Socruithe",
    "settings.app.headlineAdvanced" : "Casta",
    "settings.app.headlineAppearance" : "Dealramh",
    "settings.app.headlineGeneral" : "Ginearálta",
    "settings.app.headlineLanguage" : "Teanga",
    "settings.app.headlineUpdates" : "Nuashonruithe",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "Ní gá atosú chun athruithe a chur i bhfeidhm.",
    "settings.app.subheadlineCache" : "Taisce",
    "settings.app.translationHelp" : "Cabhraigh linn Franz a aistriú i do theanga.",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "Tabhair cuireadh do chairde",
    "settings.navigation.logout" : "Logáil amach",
    "settings.navigation.settings" : "Socruithe",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "Do sheirbhísí",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "Gach seirbhís",
    "settings.recipes.dev" : "Forbairt",
    "settings.recipes.headline" : "Seirbhísí le fáil",
@@ -201,8 +223,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Sábháil seirbhís",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Óstáilte",
    "settings.service.form.tabOnPremise" : "Féinóstáilte ��",
    "settings.service.form.team" : "Foireann",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "Aimsigh seirbhísí",
    "settings.services.headline" : "Do sheirbhísí",
    "settings.services.noServicesAdded" : "Níl aon seirbhís curtha agat go fóill.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Seirbhís díchumasaithe",
    "settings.services.tooltip.isMuted" : "Tachtar gach fuaim",
    "settings.services.tooltip.notificationsDisabled" : "Fógraí dhíchumasaithe",
    "settings.services.updatedInfo" : "Sábháiltear do chuid athruithe",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Foireann",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "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",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "Céadainm",
    "settings.user.form.lastname" : "Sloinne",
    "settings.user.form.newPassword" : "Pasfhocal nua",
+   "settings.workspace.add.form.name" : "Ainm",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Ainm",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Atriail",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "Cuir seirbhís nua leis",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "Díchumasaigh fógraí � fuaim",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Socruithe",
    "sidebar.unmuteApp" : "Cumasaigh fógraí � fuaim",
    "signup.company.label" : "Comhlacht",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "�ithritheoirí an tAÉ: is féidir cáin díolacháin áitiúla a chur i bhfeidhm",
    "subscription.features.ads" : "Fógraí ar bith, choíche!",
    "subscription.features.comingSoon" : "ag teacht go luath",
-   "subscription.features.encryptedSync" : "Sionchronú seisiúin chriptithe",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Cuir seirbhísí óstáilte ar nós HipChat leis",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "Cuireann Cuntas Phŕeimhthacadóra Franz san áireamh",
    "subscription.paymentSessionError" : "Ní féidir an bhfoirm íocaíochta a lódáil",
    "subscription.submit.label" : "Ba mhaith liom tacaíocht a thabhairt d'fhorbairt Franz",
@@ -269,9 +312,20 @@
    "tabs.item.reload" : "Athlódáil",
    "validation.email" : "Níl {field} neamhbhailí",
    "validation.minLength" : "Ba cheart go mbeadh {field} ar a laghad {length} charactar fada",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "Tá {field} de dhíth",
    "validation.url" : "Ní AAA bhailí é {field}",
    "welcome.loginButton" : "Logáil isteach i do chuntas",
    "welcome.signupButton" : "Cruthaigh cuntas nua",
-   "welcome.slogan" : "Teachtaireachtaí a oibríonn duitse"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Gach seirbhís",
+   "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>Franz 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/hr.json b/src/i18n/locales/hr.json
index 2ff69755d..468238166 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -1,11 +1,23 @@
 {
    "app.errorHandler.action" : "Ponovno u�itavanje",
    "app.errorHandler.headline" : "Something went wrong",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Nije se moguće povezati na Francove on-line servise. ",
    "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",
    "import.headline" : "Uvezite svoje Franc 4 servise. ",
    "import.notSupportedHeadline" : "Franc 5 trenutno ne podržava taj servis",
    "import.skip.label" : "Želim ru�no dodati ove usluge",
@@ -32,6 +44,7 @@
    "login.submit.label" : "Prijavite se",
    "login.tokenExpired" : "Vaša sesija je istekla, prijavite se ponovo.",
    "menu.app.about" : "O aplikaciji",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Hide",
    "menu.app.hideOthers" : "Hide Others",
    "menu.app.quit" : "Quit",
@@ -59,7 +72,9 @@
    "menu.help.support" : "Support",
    "menu.help.tos" : "Terms of Service",
    "menu.services" : "Services",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Add New Service...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "View",
    "menu.view.enterFullScreen" : "Enter Full Screen",
    "menu.view.exitFullScreen" : "Exit Full Screen",
@@ -74,6 +89,11 @@
    "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",
+   "menu.workspaces.defaultWorkspace" : "Sve usluge",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "Vaša e-adresa",
    "password.headline" : "Stvorite novu zaporku",
    "password.link.login" : "Prijavite se na Vaš ra�un",
@@ -97,6 +117,7 @@
    "service.errorHandler.headline" : "O, ne! ",
    "service.errorHandler.message" : "Greška",
    "service.errorHandler.text" : "{name} has failed to load.",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "Zapo�nimo!",
    "services.welcome" : "Dobrodošli u Franz",
    "settings.account.account.editButton" : "Uredi ra�un",
@@ -117,6 +138,7 @@
    "settings.account.invoiceDownload" : "Preuzmite",
    "settings.account.manageSubscription.label" : "Upravljajte pretplatama",
    "settings.account.successInfo" : "Vaše promjene su spremljene",
+   "settings.account.tryReloadServices" : "Pokušajte ponovno",
    "settings.account.tryReloadUserInfoRequest" : "Pokušajte ponovno",
    "settings.account.userInfoRequestFailed" : "Nije moguće u�itati informacije o korisniku",
    "settings.app.buttonClearAllCache" : "O�isti memoriju",
@@ -129,22 +151,20 @@
    "settings.app.form.beta" : "Obuhvati i beta verzije",
    "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
-   "settings.app.form.enableMenuBar" : "Prikaži Franz u traci izbornika",
    "settings.app.form.enableSpellchecking" : "Omogući provjeru pravopisa",
    "settings.app.form.enableSystemTray" : "Prikaži aplikaciju u sustavskoj traci",
-   "settings.app.form.hideDockIcon" : "Sakrij ikonu Franz u prostoru za obavijesti",
    "settings.app.form.language" : "Jezik",
    "settings.app.form.minimizeToSystemTray" : "Smanji Franca u sustavsku traku",
    "settings.app.form.runInBackground" : "Neka se Franc održava u pozadini i ako je prozor zatvoren",
    "settings.app.form.showDisabledServices" : "Prikaži plo�e s onemogućenim servisima",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Pokaži nepro�itane zna�ke poruka kad se obavještenja onemoguće",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Postavke",
    "settings.app.headlineAdvanced" : "Napredne alatke",
    "settings.app.headlineAppearance" : "Izgled",
    "settings.app.headlineGeneral" : "Općenito",
    "settings.app.headlineLanguage" : "Jezik",
    "settings.app.headlineUpdates" : "Nadogradnje",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "Promjene postavki zahtijevaju ponovni zagon",
    "settings.app.subheadlineCache" : "Predmemorija",
    "settings.app.translationHelp" : "Pomozite nam prevesti aplikaciju na Vaš jezik. ",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "Pozovi prijatelje",
    "settings.navigation.logout" : "Odjava",
    "settings.navigation.settings" : "Postavke",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "Vaše usluge",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "Sve usluge",
    "settings.recipes.dev" : "Razvoj",
    "settings.recipes.headline" : "Dostupne usluge",
@@ -201,8 +223,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Sa�uvaj uslugu\/e",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hostovano",
    "settings.service.form.tabOnPremise" : "Samo-hostovano ��",
    "settings.service.form.team" : "Tim",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "Pronađite usluge",
    "settings.services.headline" : "Vaše usluge",
    "settings.services.noServicesAdded" : "Još uvijek niste unijeli niti jednu uslugu.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Usluga je onemogućena. ",
    "settings.services.tooltip.isMuted" : "Svi zvukovi su onemogućeni. ",
    "settings.services.tooltip.notificationsDisabled" : "Obavijesti su onemogućene.",
    "settings.services.updatedInfo" : "Vaše promjene su pohranjene. ",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Tim",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "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",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "Ime",
    "settings.user.form.lastname" : "Prezime",
    "settings.user.form.newPassword" : "Nova lozinka",
+   "settings.workspace.add.form.name" : "Ime",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Ime",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Pokušajte ponovno",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "Dodajte novu uslugu",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "Ugasi obavijesti i zvuk",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Postavke",
    "sidebar.unmuteApp" : "Omogući obavijesti i zvuk",
    "signup.company.label" : "Tvrtka",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "EU državljani, upozerenje: Moguće taksiranje ",
    "subscription.features.ads" : "Bez reklama, doživotno!",
    "subscription.features.comingSoon" : "Dolazi uskoro",
-   "subscription.features.encryptedSync" : "Kodirano usklađivanje sesija.",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Dodajte pretpostavljeni\/hostirani servis kao Å¡to ima usluga HipChat ",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "Plaćeni\/Premium ra�un uklju�uje sljedeće: ",
    "subscription.paymentSessionError" : "Nemoguće inicijalizirati obrazac za uplatu",
    "subscription.submit.label" : "Želim da podržim razvoj Franca. ",
@@ -269,9 +312,20 @@
    "tabs.item.reload" : "Ponovno u�itavanje",
    "validation.email" : "{field} is not valid",
    "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} is required",
    "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Prijavite se na ra�un",
    "welcome.signupButton" : "Stvorite novi korisni�ki ra�un",
-   "welcome.slogan" : "Poruke koje su stvorene za tebe"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Sve usluge",
+   "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>Franz 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 0b396cf3b..b28dcb17a 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -1,11 +1,23 @@
 {
    "app.errorHandler.action" : "Újratöltés",
-   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.headline" : "Valami nem jött össze",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "feature.delayApp.action" : "Szerezz egy Franz Támogatói Liszencet",
+   "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 Franz továbblép {seconds} másodperc múlva.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Nem lehet csatlakozni a Franz online szolgáltatáshoz",
    "global.notConnectedToTheInternet" : "Nincs hálózati kapcsolat.",
+   "global.spellchecker.useDefault" : "Rendszer alapbeállítás használata ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Helyesírás-ellenőrző nyelve",
    "import.headline" : "Importáld szolgáltatásaidat a Franz 4-ből",
    "import.notSupportedHeadline" : "Még nem támogatott szolgáltatások a Franz 5-ben",
    "import.skip.label" : "Manuálisan szeretném hozzáadni a szolgáltatásokat",
@@ -32,6 +44,7 @@
    "login.submit.label" : "Bejelentkezés",
    "login.tokenExpired" : "A munkamenet lejárt, kérlek lépj be újra.",
    "menu.app.about" : "Névjegy",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Elrejt",
    "menu.app.hideOthers" : "Többi elrejtése",
    "menu.app.quit" : "Kilépés",
@@ -51,7 +64,7 @@
    "menu.edit.startSpeaking" : "Beszélgetés kezdeményezése",
    "menu.edit.stopSpeaking" : "Beszéd vége",
    "menu.edit.undo" : "Visszavonás",
-   "menu.file" : "fájl",
+   "menu.file" : "Fájl",
    "menu.help" : "Súgó",
    "menu.help.changelog" : "Változások listája",
    "menu.help.learnMore" : "Tudjon meg többet",
@@ -59,21 +72,28 @@
    "menu.help.support" : "Támogatás",
    "menu.help.tos" : "Felhasználói feltételek",
    "menu.services" : "Szolgáltatások",
-   "menu.services.addNewService" : "Új kiszolgáló hozzáadása",
+   "menu.services.activatePreviousService" : "Activate previous service",
+   "menu.services.addNewService" : "Új szolgáltatás hozzáadása...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Nézet",
    "menu.view.enterFullScreen" : "Kilépés a teljes képernyős módból",
    "menu.view.exitFullScreen" : "Kilépés a teljes képernyős módból",
    "menu.view.reloadFranz" : "Franz újrainditása",
-   "menu.view.reloadService" : "Kiszolgáló újraindítása",
+   "menu.view.reloadService" : "Szolgáltatás újraindítása",
    "menu.view.resetZoom" : "Tényleges méret",
-   "menu.view.toggleDevTools" : "fejlesztői eszközök bekapcsolása",
-   "menu.view.toggleFullScreen" : "Váltás Teljes képernyős módra",
-   "menu.view.toggleServiceDevTools" : "Kiszolgáló Fejlesztői Eszközök Bekapcsolása",
+   "menu.view.toggleDevTools" : "Fejlesztői eszközök ki\/bekapcsolása",
+   "menu.view.toggleFullScreen" : "Teljes képernyős mód ki\/bekapcsolása",
+   "menu.view.toggleServiceDevTools" : "Szolgáltatás Fejlesztői Eszközök ki\/bekapcsolása",
    "menu.view.zoomIn" : "Nagyítás",
    "menu.view.zoomOut" : "Kicsinyítés",
    "menu.window" : "Ablak",
    "menu.window.close" : "Bezárás",
    "menu.window.minimize" : "Tálcára",
+   "menu.workspaces" : "Munkaterületek",
+   "menu.workspaces.addNewWorkspace" : "Új munkaterület...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Munkaterület panel bezárása",
+   "menu.workspaces.defaultWorkspace" : "Összes szolgáltatás",
+   "menu.workspaces.openWorkspaceDrawer" : "Munkaterület panel kinyitása",
    "password.email.label" : "Email cím",
    "password.headline" : "Jelszó visszaállítása",
    "password.link.login" : "Jelentkezz be a fiókodba",
@@ -81,13 +101,13 @@
    "password.noUser" : "Nem található felhasználó a megadott email címmel",
    "password.submit.label" : "Küldés",
    "password.successInfo" : "Ellenőrizd az email fiókodat",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Fiók frissítése",
    "pricing.headline" : "Támogasd a Franz-ot",
    "pricing.link.skipPayment" : "Nem szeretném támogatni a Franz fejlesztését.",
-   "pricing.submit.label" : "Támogatni szeretném a Franz fejlesztését.",
+   "pricing.submit.label" : "Támogatni szeretném a Franz fejlesztését",
    "pricing.support.label" : "Válaszd ki a támogatás módját",
    "service.crashHandler.action" : "{name} újratöltése",
-   "service.crashHandler.autoReload" : "Megpróbáljuk automatikusan helyreállítani {name}-t {seconds} mp-en belül",
+   "service.crashHandler.autoReload" : "{name} automatikusan helyreállítása {seconds} másodpercen belül",
    "service.crashHandler.headline" : "Jajj ne!",
    "service.crashHandler.text" : "{name} hibát okozott.",
    "service.disabledHandler.action" : "{name} engedélyezése",
@@ -96,7 +116,8 @@
    "service.errorHandler.editAction" : "{name} szerkesztése",
    "service.errorHandler.headline" : "Jajj ne!",
    "service.errorHandler.message" : "Hiba",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} nem tudott betöltődni.",
+   "service.webviewLoader.loading" : "Betöltés",
    "services.getStarted" : "Kezdj hozzá",
    "services.welcome" : "Üdvözöl a Franz",
    "settings.account.account.editButton" : "Fiók szerkesztése",
@@ -108,7 +129,7 @@
    "settings.account.deleteInfo" : "Ha még nem szeretnéd fenntartani a Franz-fiókodat, akkor itt törölheted minden hozzá kapcsolódó adattal együtt.",
    "settings.account.headline" : "Fiók",
    "settings.account.headlineAccount" : "Fiókinformációk",
-   "settings.account.headlineDangerZone" : "Veszélyes terület, óvatosan!",
+   "settings.account.headlineDangerZone" : "Veszélyes terület",
    "settings.account.headlineInvoices" : "Számlák",
    "settings.account.headlinePassword" : "Jelszócsere",
    "settings.account.headlineProfile" : "Profil frissítése",
@@ -117,54 +138,55 @@
    "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.tryReloadServices" : "Próbáld újra",
    "settings.account.tryReloadUserInfoRequest" : "Próbáld újra",
    "settings.account.userInfoRequestFailed" : "A felhasználói adatok betöltése sikertelen",
    "settings.app.buttonClearAllCache" : "Gyorsítótár törlése",
    "settings.app.buttonInstallUpdate" : "Újraindítás és frissítések telepítése",
    "settings.app.buttonSearchForUpdate" : "Frissítések keresése",
-   "settings.app.cacheInfo" : "A Franz gyorsítótár jelenleg {space} lemezterületet használ.",
+   "settings.app.cacheInfo" : "A Franz gyorsítótár jelenleg {size} lemezterületet használ.",
    "settings.app.currentVersion" : "Aktuális verzió:",
    "settings.app.form.autoLaunchInBackground" : "Megnyitás háttérben",
    "settings.app.form.autoLaunchOnStart" : "Franz betöltése indításkor",
    "settings.app.form.beta" : "Béta verziók keresése",
-   "settings.app.form.darkMode" : "Join the Dark Side",
-   "settings.app.form.enableGPUAcceleration" : "hardveres gyorsítás engedélyezése",
-   "settings.app.form.enableMenuBar" : "Franz megjelenítése a menüsorban",
+   "settings.app.form.darkMode" : "Csatlakozz a Sötét Oldalhoz",
+   "settings.app.form.enableGPUAcceleration" : "Hardveres gyorsítás engedélyezése",
    "settings.app.form.enableSpellchecking" : "Helyesírás-ellenőrzés engedélyezése",
    "settings.app.form.enableSystemTray" : "Franz mutatása a tálcán",
-   "settings.app.form.hideDockIcon" : "Franz ikon elrejtése a Dock mögött",
    "settings.app.form.language" : "Nyelv",
    "settings.app.form.minimizeToSystemTray" : "Franz kicsinyítése a tálcára",
    "settings.app.form.runInBackground" : "Franz fusson a háttérben az ablak bezárásakor",
    "settings.app.form.showDisabledServices" : "Letiltott szolgáltatások megjelenítése",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Mutass az 'olvasatlan üzenet' jelzést amikor az értesítések le vannak tiltva.",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Mutassa az 'olvasatlan üzenet' jelzést, amikor az értesítések le vannak tiltva",
    "settings.app.headline" : "Beállítások",
    "settings.app.headlineAdvanced" : "Haladó",
    "settings.app.headlineAppearance" : "Megjelenés",
    "settings.app.headlineGeneral" : "�ltalános",
    "settings.app.headlineLanguage" : "Nyelv",
    "settings.app.headlineUpdates" : "Frissítések",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "Újraindítást igénylő módosítás",
    "settings.app.subheadlineCache" : "Gyorsítótár",
    "settings.app.translationHelp" : "Segíts nekünk a Franz-ot lefordítani a nyelvedre.",
    "settings.app.updateStatusAvailable" : "Frissítés elérhető, letöltés folyamatban...",
    "settings.app.updateStatusSearching" : "Frissítéseket keres",
    "settings.app.updateStatusUpToDate" : "A Franz legfrissebb verzióját használod",
-   "settings.invite.headline" : "Barát meghívása",
+   "settings.invite.headline" : "Barátok meghívása",
    "settings.navigation.account" : "Fiók",
    "settings.navigation.availableServices" : "Elérhető szolgáltatások",
    "settings.navigation.inviteFriends" : "Barát meghívása",
    "settings.navigation.logout" : "Kijelentkezés",
    "settings.navigation.settings" : "Beállítások",
+   "settings.navigation.team" : "Csapat kezelése",
    "settings.navigation.yourServices" : "Szolgáltatásaid",
+   "settings.navigation.yourWorkspaces" : "Munkaterületeid",
    "settings.recipes.all" : "Összes szolgáltatás",
    "settings.recipes.dev" : "Fejlesztés",
    "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" : "Sajnáljuk, nincs egyezés a szolgáltatások között a keresett kifejezésre.",
-   "settings.recipes.servicesSuccessfulAddedInfo" : "Szolgáltatás sikeresen hozzáadva.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Szolgáltatás sikeresen hozzáadva",
    "settings.searchService" : "Szolgáltatások keresése",
    "settings.service.error.goBack" : "Vissza a szolgáltatásokhoz",
    "settings.service.error.headline" : "Hiba",
@@ -174,12 +196,12 @@
    "settings.service.form.customUrl" : "Egyéni szerver",
    "settings.service.form.customUrlPremiumInfo" : "Egyénileg üzemeltetett szolgáltatások hozzáadásához Franz Prémium Támogató Fiók szükséges.",
    "settings.service.form.customUrlUpgradeAccount" : "Frissítsd fiókodat",
-   "settings.service.form.customUrlValidationError" : "Nem sikerült hitelesíteni az egyéni {name} szervert.",
+   "settings.service.form.customUrlValidationError" : "Nem sikerült érvényesíteni az egyéni {name} kiszolgálót.",
    "settings.service.form.deleteButton" : "Szolgáltatás törlése",
    "settings.service.form.editServiceHeadline" : "{name} szerkesztése",
    "settings.service.form.enableAudio" : "Hang engedélyezése",
    "settings.service.form.enableBadge" : "Mutasd az olvasatlan jelzéseket",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Sötét mód engedélyezése",
    "settings.service.form.enableNotification" : "Értesítések engedélyezése",
    "settings.service.form.enableService" : "Szolgáltatás engedélyezése",
    "settings.service.form.headlineBadges" : "Olvasatlan üzenet jelzések",
@@ -188,34 +210,39 @@
    "settings.service.form.icon" : "Egyedi ikon",
    "settings.service.form.iconDelete" : "Törlés",
    "settings.service.form.iconUpload" : "Húzd ide a képet, vagy kattints ide",
-   "settings.service.form.indirectMessageInfo" : "Értesítést kapsz minden üzenetről a csatornában, nem csak @felhasználónév, @csatorna @here és egyéb említések esetén",
+   "settings.service.form.indirectMessageInfo" : "Értesítést kapsz minden üzenetről a csatornában, nem csak @felhasználónév, @csatorna, @here és egyéb említések esetén",
    "settings.service.form.indirectMessages" : "Üzenet kitűző megjelenítése minden üzenethez",
-   "settings.service.form.isMutedInfo" : "Ha kikapcsolod, minden értesítési és lejátszott hang némításra kerül.",
+   "settings.service.form.isMutedInfo" : "Ha kikapcsolod, minden értesítési és lejátszott hang némításra kerül",
    "settings.service.form.name" : "Név",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy beállítások",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.info" : "Proxy beállítások nem szinkronizálódnak a Franz kiszolgálókkal.",
+   "settings.service.form.proxy.isEnabled" : "Proxy használata",
+   "settings.service.form.proxy.password" : "Jelszó (opcionális)",
    "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.restartInfo" : "Kérjük indítsd újra a Franz-ot a proxy beállítások megváltoztatása után.",
+   "settings.service.form.proxy.user" : "Felhasználó (opcionális)",
    "settings.service.form.saveButton" : "Szolgáltatás mentése",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Ãœzemeltetett",
    "settings.service.form.tabOnPremise" : "Egyénileg üzemeltetett",
    "settings.service.form.team" : "Csapat",
-   "settings.service.form.useHostedService" : "A távoli {name} szolgáltatás használata",
+   "settings.service.form.useHostedService" : "A távoli {name} szolgáltatás használata.",
    "settings.service.form.yourServices" : "Szolgáltatásaid",
    "settings.services.deletedInfo" : "A szolgáltatás törlésre került",
    "settings.services.discoverServices" : "Szolgáltatások felfedezése",
    "settings.services.headline" : "Szolgáltatásaid",
    "settings.services.noServicesAdded" : "Még nem adtál hozzá egyetlen szolgáltatást sem eddig.",
-   "settings.services.tooltip.isDisabled" : "Ez a szolgáltatás le van tiltva.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
+   "settings.services.tooltip.isDisabled" : "A szolgáltatás le van tiltva",
    "settings.services.tooltip.isMuted" : "Minden hang lenémítva",
    "settings.services.tooltip.notificationsDisabled" : "Értesítések letiltva",
    "settings.services.updatedInfo" : "A módosításokat elmentettük",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Csapat",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
    "settings.user.form.accountType.company" : "Cég",
    "settings.user.form.accountType.individual" : "Egyén",
    "settings.user.form.accountType.label" : "Fiók típusa",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "Keresztnév",
    "settings.user.form.lastname" : "Vezetéknév",
    "settings.user.form.newPassword" : "Új jelszó",
+   "settings.workspace.add.form.name" : "Név",
+   "settings.workspace.add.form.submitButton" : "Új munkaterület",
+   "settings.workspace.form.buttonDelete" : "Munkaterület törlése",
+   "settings.workspace.form.buttonSave" : "Munkaterület mentése",
+   "settings.workspace.form.name" : "Név",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Szolgáltatások ezen a Munkaterületen",
+   "settings.workspace.form.yourWorkspaces" : "Munkaterületeid",
+   "settings.workspaces.deletedInfo" : "Munkaterület törölve",
+   "settings.workspaces.headline" : "Munkaterületeid",
+   "settings.workspaces.noWorkspacesAdded" : "Még nem hoztál létre munkaterületeket.",
+   "settings.workspaces.tryReloadWorkspaces" : "Próbáld újra",
+   "settings.workspaces.updatedInfo" : "A módosításokat elmentettük",
+   "settings.workspaces.workspaceFeatureHeadline" : "A kevesebb több: Bemutatjuk a Franz Munkaterületeket",
+   "settings.workspaces.workspaceFeatureInfo" : "A Franz 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. 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.",
+   "settings.workspaces.workspacesRequestFailed" : "Nem sikerült betölteni a munkaterületeket",
    "sidebar.addNewService" : "Szolgáltatás hozzáadása",
+   "sidebar.closeWorkspaceDrawer" : "Munkaterület panel bezárása",
    "sidebar.muteApp" : "Értesítések és hangok letiltása",
+   "sidebar.openWorkspaceDrawer" : "Munkaterület panel megnyitása",
    "sidebar.settings" : "Beállítások",
    "sidebar.unmuteApp" : "Értesítések és hangok engedélyezése",
    "signup.company.label" : "Cég",
@@ -243,13 +287,12 @@
    "signup.submit.label" : "Fiók létrehozása",
    "subscription.euTaxInfo" : "EU állampolgárok: helyi vásárlás esetén adók kerülhetnek felszámolásra",
    "subscription.features.ads" : "Hirdetésmentes, mindig!",
-   "subscription.features.comingSoon" : "Hamarosan!",
-   "subscription.features.encryptedSync" : "Titkosított munkamenet szinkronizálás",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Helyi\/üzemeltetett szolgáltatások használata, pl. HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.comingSoon" : "hamarosan",
+   "subscription.features.noInterruptions" : "Nincs több app késlekedés és liszencfrissítési piszkálás",
+   "subscription.features.onpremise.mattermost" : "Saját kiszolgálós szolgáltatások hozzáadása, pl.: Mattermost",
+   "subscription.features.proxy" : "Proxy támogatás a szolgáltatásokhoz",
+   "subscription.features.spellchecker" : "Támogatás a Helyesírás-ellenőrzőhöz",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "Az előfizetett Franz Prémium Támogató Fiók tartalmazza",
    "subscription.paymentSessionError" : "Nem sikerült a fizetési felületet betölteni",
    "subscription.submit.label" : "Szeretném támogatni a Franz fejlesztését",
@@ -268,10 +311,21 @@
    "tabs.item.enableService" : "Szolgáltatás engedélyezése",
    "tabs.item.reload" : "Újratöltés",
    "validation.email" : "{field} nem érvényes",
-   "validation.minLength" : "{field} legalább {length} karakter hosszúnak kell lennie",
-   "validation.required" : "{field} Kitöltése kötelező",
+   "validation.minLength" : "{field} mezőnek legalább {length} karakter hosszúnak kell lennie",
+   "validation.oneRequired" : "At least one is required",
+   "validation.required" : "{field} kitöltése kötelező",
    "validation.url" : "{field} nem érvényes URL",
    "welcome.loginButton" : "Jelentkezz be a fiókodba",
    "welcome.signupButton" : "Új fiók létrehozása",
-   "welcome.slogan" : "Üzenetküldés okosan"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Összes szolgáltatás",
+   "workspaceDrawer.headline" : "Munkaterületek",
+   "workspaceDrawer.item.contextMenuEdit" : "szerkeszt",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "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>Franz 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" : "Munkaterület beállítások szerkesztése",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 11596d142..e7a46e5e9 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -1,16 +1,28 @@
 {
    "app.errorHandler.action" : "Muat Ulang",
-   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.action" : "Dapatkan Franz Supporter License",
-   "feature.delayApp.headline" : "Beli Franz Supporter License agar tidak perlu menunggu",
+   "app.errorHandler.headline" : "Terjadi kesalahan",
+   "feature.announcements.changelog.headline" : "Perubahan dalam Franz {version}",
+   "feature.delayApp.action" : "Dapatkan Lisensi Pendukung Franz",
+   "feature.delayApp.headline" : "Beli Lisensi Pendukung Franz agar tidak perlu menunggu",
    "feature.delayApp.text" : "Franz akan melanjutkan dalam {seconds} detik.",
+   "feature.shareFranz.action.email" : "Kirim sebagai email",
+   "feature.shareFranz.action.facebook" : "Bagikan di Facebook",
+   "feature.shareFranz.action.twitter" : "Bagikan di Twitter",
+   "feature.shareFranz.headline" : "Franz lebih baik bersama!",
+   "feature.shareFranz.shareText.email" : "Saya telah menambahkan layanan {count} ke Franz! Dapatkan aplikasi gratis untuk WhatsApp, Messenger, Slack, Skype dan co di www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Beri tahu teman dan kolega Anda betapa hebatnya Franz dan bantu kami menyebarkan berita.",
    "global.api.unhealthy" : "Tidak dapat tersambung ke layanan Franz",
    "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",
    "import.headline" : "Impor layanan Franz 4 Anda",
    "import.notSupportedHeadline" : "Layanan belum didukung di Franz 5",
    "import.skip.label" : "Saya ingin menambahkan layanan secara manual",
    "import.submit.label" : "Impor layanan",
-   "infobar.buttonChangelog" : "Apa yang baru?",
+   "infobar.buttonChangelog" : "Yang baru",
    "infobar.buttonInstallUpdate" : "Mulai ulang & instal pembaruan",
    "infobar.buttonReloadServices" : "Muat ulang layanan",
    "infobar.requiredRequestsFailed" : "Gagal memuat layanan dan informasi pengguna",
@@ -19,12 +31,12 @@
    "invite.email.label" : "Alamat email",
    "invite.headline.friends" : "Undang 3 teman atau kolega Anda",
    "invite.name.label" : "Nama",
-   "invite.skip.label" : "Nanti saja",
+   "invite.skip.label" : "Saya ingin melakukan ini nanti",
    "invite.submit.label" : "Kirim undangan",
    "invite.successInfo" : "Undangan berhasil dikirim",
    "login.email.label" : "Alamat email",
    "login.headline" : "Masuk",
-   "login.invalidCredentials" : "Email atau sandi salah",
+   "login.invalidCredentials" : "Email atau kata sandi tidak valid",
    "login.link.password" : "Setel ulang sandi",
    "login.link.signup" : "Buat akun gratis",
    "login.password.label" : "Sandi",
@@ -32,6 +44,7 @@
    "login.submit.label" : "Masuk",
    "login.tokenExpired" : "Sesi Anda telah kedaluwarsa, silakan masuk kembali.",
    "menu.app.about" : "Tentang Franz",
+   "menu.app.announcement" : "Yang baru",
    "menu.app.hide" : "Sembunyikan",
    "menu.app.hideOthers" : "Sembunyikan Lainnya",
    "menu.app.quit" : "Keluar",
@@ -59,7 +72,9 @@
    "menu.help.support" : "Dukungan",
    "menu.help.tos" : "Ketentuan Layanan",
    "menu.services" : "Layanan",
+   "menu.services.activatePreviousService" : "Aktifkan layanan sebelumnya",
    "menu.services.addNewService" : "Tambahkan Layanan Baru...",
+   "menu.services.setNextServiceActive" : "Aktifkan layanan berikutnya",
    "menu.view" : "Tampilan",
    "menu.view.enterFullScreen" : "Masuk ke Mode Layar Penuh",
    "menu.view.exitFullScreen" : "Keluar dari Layar Penuh",
@@ -74,6 +89,11 @@
    "menu.window" : "Jendela",
    "menu.window.close" : "Tutup",
    "menu.window.minimize" : "Minimalkan",
+   "menu.workspaces" : "Ruang kerja",
+   "menu.workspaces.addNewWorkspace" : "Tambah Ruang Kerja Baru...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Tutup laci ruang kerja",
+   "menu.workspaces.defaultWorkspace" : "Semua layanan",
+   "menu.workspaces.openWorkspaceDrawer" : "Buka laci ruang kerja",
    "password.email.label" : "Alamat email",
    "password.headline" : "Setel ulang sandi",
    "password.link.login" : "Masuk ke akun Anda",
@@ -92,19 +112,20 @@
    "service.crashHandler.text" : "{name} menyebabkan kesalahan.",
    "service.disabledHandler.action" : "Aktifkan {name}",
    "service.disabledHandler.headline" : "{name} dinonaktifkan",
-   "service.errorHandler.action" : "Muat Ulang {name}",
+   "service.errorHandler.action" : "Muat ulang {name}",
    "service.errorHandler.editAction" : "Edit {nama}",
-   "service.errorHandler.headline" : "Ya Ampun!",
+   "service.errorHandler.headline" : "Oh tidak!",
    "service.errorHandler.message" : "Kesalahan",
-   "service.errorHandler.text" : "{name} has failed to load.",
-   "services.getStarted" : "Ayo mulai!",
+   "service.errorHandler.text" : "{name} gagal dimuat",
+   "service.webviewLoader.loading" : "Memuat",
+   "services.getStarted" : "Memulai",
    "services.welcome" : "Selamat datang di Franz",
    "settings.account.account.editButton" : "Edit akun",
    "settings.account.accountType.basic" : "Akun Dasar",
    "settings.account.accountType.premium" : "Akun Pendukung Premium",
    "settings.account.buttonSave" : "Perbarui profil",
    "settings.account.deleteAccount" : "Hapus akun",
-   "settings.account.deleteEmailSent" : "Anda akan menerima email yang berisi tautan untuk melakukan konfirmasi penghapusan akun. Akun dan data Anda tidak bisa dipulihkan!",
+   "settings.account.deleteEmailSent" : "Anda menerima email dengan tautan untuk mengonfirmasi penghapusan akun. Akun dan data Anda tidak bisa dipulihkan!",
    "settings.account.deleteInfo" : "Jika Anda tidak membutuhkan akun Franz lagi, Anda bisa menghapus akun dan semua data terkait di sini.",
    "settings.account.headline" : "Akun",
    "settings.account.headlineAccount" : "Informasi akun",
@@ -117,6 +138,7 @@
    "settings.account.invoiceDownload" : "Unduh",
    "settings.account.manageSubscription.label" : "Kelola langganan Anda",
    "settings.account.successInfo" : "Perubahan Anda telah disimpan",
+   "settings.account.tryReloadServices" : "Coba lagi",
    "settings.account.tryReloadUserInfoRequest" : "Coba lagi",
    "settings.account.userInfoRequestFailed" : "Gagal memuat informasi pengguna",
    "settings.app.buttonClearAllCache" : "Bersihkan singgahan",
@@ -129,22 +151,20 @@
    "settings.app.form.beta" : "Sertakan versi beta",
    "settings.app.form.darkMode" : "Sisi Kelam menunggu Anda (Mode Gelap)",
    "settings.app.form.enableGPUAcceleration" : "Aktifkan Akselerasi GPU",
-   "settings.app.form.enableMenuBar" : "Tampilkan Franz di Bilah Menu",
    "settings.app.form.enableSpellchecking" : "Aktifkan pemeriksaan ejaan",
    "settings.app.form.enableSystemTray" : "Tampilkan Franz di baki sistem",
-   "settings.app.form.hideDockIcon" : "Sembunyikan ikon Franz di Dock",
    "settings.app.form.language" : "Bahasa",
    "settings.app.form.minimizeToSystemTray" : "Perkecil Franz ke baki sistem",
    "settings.app.form.runInBackground" : "Tetap jalankan Franz di latar belakang saat menutup jendela",
    "settings.app.form.showDisabledServices" : "Tampilkan tab layanan yang dinonaktifkan",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Tampilkan lencana pesan belum dibaca saat pemberitahuan dinonaktifkan",
-   "settings.app.form.spellcheckerLanguage" : "Periksa ejaan",
    "settings.app.headline" : "Pengaturan",
    "settings.app.headlineAdvanced" : "Tingkat Lanjut",
    "settings.app.headlineAppearance" : "Tampilan",
    "settings.app.headlineGeneral" : "Umum",
    "settings.app.headlineLanguage" : "Bahasa",
    "settings.app.headlineUpdates" : "Versi Baru",
+   "settings.app.languageDisclaimer" : "Penerjemahan resmi dilakukan untuk Bahasa Inggris dan Jerman. Bahasa lainnya merupakan penerjemahan oleh komunitas.",
    "settings.app.restartRequired" : "Perubahan membutuhkan mulai ulang",
    "settings.app.subheadlineCache" : "Singgahan",
    "settings.app.translationHelp" : "Bantu kami menerjemahkan Franz ke bahasa Anda.",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "Undang Teman",
    "settings.navigation.logout" : "Keluar",
    "settings.navigation.settings" : "Pengaturan",
+   "settings.navigation.team" : "Kelola Tim",
    "settings.navigation.yourServices" : "Layanan Anda",
+   "settings.navigation.yourWorkspaces" : "Ruang kerja Anda",
    "settings.recipes.all" : "Semua layanan",
    "settings.recipes.dev" : "Pengembangan",
    "settings.recipes.headline" : "Layanan tersedia",
@@ -167,7 +189,7 @@
    "settings.recipes.servicesSuccessfulAddedInfo" : "Layanan berhasil ditambahkan",
    "settings.searchService" : "Cari layanan",
    "settings.service.error.goBack" : "Kembali ke layanan",
-   "settings.service.error.headline" : "Kesalahan",
+   "settings.service.error.headline" : "Terjadi kesalahan",
    "settings.service.error.message" : "Tidak dapat memuat konfigurasi layanan.",
    "settings.service.form.addServiceHeadline" : "Tambahkan {name}",
    "settings.service.form.availableServices" : "Layanan tersedia",
@@ -176,7 +198,7 @@
    "settings.service.form.customUrlUpgradeAccount" : "Tingkatkan akun Anda",
    "settings.service.form.customUrlValidationError" : "Gagal memvalidasi server {nama} khusus.",
    "settings.service.form.deleteButton" : "Hapus layanan",
-   "settings.service.form.editServiceHeadline" : "Edit {nama}",
+   "settings.service.form.editServiceHeadline" : "Edit {name}",
    "settings.service.form.enableAudio" : "Aktifkan audio",
    "settings.service.form.enableBadge" : "Tampilkan lencana pesan belum dibaca",
    "settings.service.form.enableDarkMode" : "Aktifkan Mode Gelap",
@@ -192,17 +214,15 @@
    "settings.service.form.indirectMessages" : "Tampilkan lencana pesan untuk semua pesan baru",
    "settings.service.form.isMutedInfo" : "Saat dinonaktifkan, semua suara pemberitahuan dan pemutaran audio akan dibisukan",
    "settings.service.form.name" : "Nama",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "Pengaturan Proxy HTTP\/HTTPS",
    "settings.service.form.proxy.host" : "Host\/IP Proksi",
    "settings.service.form.proxy.info" : "Pengaturan proksi tidak akan disinkronkan dengan server Franz.",
    "settings.service.form.proxy.isEnabled" : "Gunakan Proksi",
    "settings.service.form.proxy.password" : "Sandi (opsional)",
    "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.restartInfo" : "Silahkan mulai ulang Franz setelah mengubah Setelan proxy",
    "settings.service.form.proxy.user" : "Pengguna (opsional)",
    "settings.service.form.saveButton" : "Simpan layanan",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hosted",
    "settings.service.form.tabOnPremise" : "Hosted mandiri",
    "settings.service.form.team" : "Tim",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "Temukan layanan",
    "settings.services.headline" : "Layanan Anda",
    "settings.services.noServicesAdded" : "Anda belum menambahkan layanan apa pun.",
+   "settings.services.servicesRequestFailed" : "Tidak dapat memuat layanan Anda",
    "settings.services.tooltip.isDisabled" : "Layanan dinonaktifkan",
    "settings.services.tooltip.isMuted" : "Semua suara dibisukan",
    "settings.services.tooltip.notificationsDisabled" : "Pemberitahuan dinonaktifkan",
    "settings.services.updatedInfo" : "Perubahan telah disimpan",
+   "settings.team.contentHeadline" : "Franz untuk Tim",
+   "settings.team.copy" : "Franz untuk Tim menyediakan opsi untuk mengundang rekan kerja ke tim Anda dengan mengirimkan undangan email dan mengelola langganan mereka pada preferensi akun Anda. Jangan habiskan waktu Anda menyiapkan langganan bagi masing-masing anggota tim, lupakan berbagai faktur dan periode penagihan - satu tim untuk semua!",
+   "settings.team.headline" : "Tim",
+   "settings.team.intro" : "Anda dan tim Anda menggunakan Franz? Kini Anda bisa mengelola langganan Premium untuk semua rekan kerja, teman, atau anggota keluar sebanyak yang Anda inginkan, semuanya cukup dari satu akun.",
+   "settings.team.manageAction" : "Kelola Tim Anda di meetfranz.com",
+   "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",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "Nama Depan",
    "settings.user.form.lastname" : "Nama Belakang",
    "settings.user.form.newPassword" : "Sandi baru",
+   "settings.workspace.add.form.name" : "Nama",
+   "settings.workspace.add.form.submitButton" : "Buat ruang kerja",
+   "settings.workspace.form.buttonDelete" : "Hapus ruang kerja",
+   "settings.workspace.form.buttonSave" : "Simpan ruang kerja",
+   "settings.workspace.form.name" : "Nama",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Layanan dalam Ruang Kerja ini",
+   "settings.workspace.form.yourWorkspaces" : "Ruang kerja Anda",
+   "settings.workspaces.deletedInfo" : "Ruang kerja telah dihapus",
+   "settings.workspaces.headline" : "Ruang kerja Anda",
+   "settings.workspaces.noWorkspacesAdded" : "Anda belum menambahkan ruang kerja.",
+   "settings.workspaces.tryReloadWorkspaces" : "Coba lagi",
+   "settings.workspaces.updatedInfo" : "Perubahan Anda telah disimpan",
+   "settings.workspaces.workspaceFeatureHeadline" : "Sedikit Namun Banyak: Memperkenalkan Ruang Kerja Franz",
+   "settings.workspaces.workspaceFeatureInfo" : "Ruang Kerja Franz dapat digunakan untuk tetap fokus pada hal penting saat ini. Siapkan sekelompok layanan yang berbeda dan dengan mudah beralih ke yang lain. 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.",
+   "settings.workspaces.workspacesRequestFailed" : "Tidak dapat memuat ruang kerja Anda",
    "sidebar.addNewService" : "Tambahkan layanan baru",
+   "sidebar.closeWorkspaceDrawer" : "Tutup laci ruang kerja",
    "sidebar.muteApp" : "Nonaktifkan pemberitahuan & audio",
+   "sidebar.openWorkspaceDrawer" : "Buka laci ruang kerja",
    "sidebar.settings" : "Pengaturan",
    "sidebar.unmuteApp" : "Aktifkan pemberitahuan",
    "signup.company.label" : "Perusahaan",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "Warga UE: pajak penjualan lokal mungkin berlaku",
    "subscription.features.ads" : "Tanpa iklan, selamanya!",
    "subscription.features.comingSoon" : "segera hadir",
-   "subscription.features.encryptedSync" : "Sinkronisasi sesi terenkripsi",
    "subscription.features.noInterruptions" : "Tanpa menunggu dan ditanya untuk meningkatkan lisensi",
-   "subscription.features.onpremise" : "Integrasi layanan hosted, misalnya HipChat",
    "subscription.features.onpremise.mattermost" : "Integrasi layanan hosted, misalnya Mattermost",
    "subscription.features.proxy" : "Dukungan proksi untuk layanan",
    "subscription.features.spellchecker" : "Dukungan pengecek ejaan",
+   "subscription.features.workspaces" : "Kelola layanan Anda dalam ruang kerja",
    "subscription.includedFeatures" : "Franz Premium Supporter Account berbayar menyertakan",
    "subscription.paymentSessionError" : "Tidak bisa menginisialisasi formulir pembayaran",
    "subscription.submit.label" : "Saya ingin mendukung pengembangan Franz",
@@ -269,9 +312,20 @@
    "tabs.item.reload" : "Muat Ulang",
    "validation.email" : "{field} tidak benar",
    "validation.minLength" : "{field} setidaknya harus {length} karakter",
+   "validation.oneRequired" : "Setidaknya diperlukan satu",
    "validation.required" : "{field} wajib diisi",
    "validation.url" : "{field} bukan URL yang benar",
    "welcome.loginButton" : "Masuk ke akun Anda",
    "welcome.signupButton" : "Buat akun gratis",
-   "welcome.slogan" : "Perpesanan yang bekerja untuk Anda"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Tambah ruang kerja baru",
+   "workspaceDrawer.allServices" : "Semua layanan",
+   "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 Franz 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 47cbd8f1e..c12641e36 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -1,11 +1,23 @@
 {
    "app.errorHandler.action" : "Ricarica",
-   "app.errorHandler.headline" : "Something went wrong",
+   "app.errorHandler.headline" : "Qualcosa è andato storto",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
    "feature.delayApp.action" : "Ricevi una Licenza Supporter di Franz",
    "feature.delayApp.headline" : "Per favore, compra una Licenza Supporter di Franz per saltare l'attesa",
    "feature.delayApp.text" : "Franz continuerà a funzionare tra {seconds} secondi.",
+   "feature.shareFranz.action.email" : "Manda come email",
+   "feature.shareFranz.action.facebook" : "Condividi su Facebook",
+   "feature.shareFranz.action.twitter" : "Condividi su Twitter",
+   "feature.shareFranz.headline" : "Franze è migliore insieme!",
+   "feature.shareFranz.shareText.email" : "Ho aggiunto {count} nuovi servizi a Franz! Scarica ora l'app gratuita per WhatsApp, Messenger, Slack, Skype e altri all'indirizzo www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Condividi con i tuoi amici e colleghi quanto Franz è fantastico e aiutaci a diffondere la parola.",
    "global.api.unhealthy" : "Impossibile connettersi ai servizi online di Franz",
    "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",
    "import.headline" : "Importa i servizi di Franz 4",
    "import.notSupportedHeadline" : "Servizi non ancora supportati in Franz 5",
    "import.skip.label" : "Voglio aggiungere i servizi manualmente",
@@ -32,8 +44,9 @@
    "login.submit.label" : "Accedi",
    "login.tokenExpired" : "La tua sessione è scaduta, per favore accedi di nuovo.",
    "menu.app.about" : "Info su Franz",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Nascondi",
-   "menu.app.hideOthers" : "Nascondi Altri",
+   "menu.app.hideOthers" : "Nascondi altri",
    "menu.app.quit" : "Esci",
    "menu.app.settings" : "Settings",
    "menu.app.unhide" : "Mostra",
@@ -41,7 +54,7 @@
    "menu.edit.copy" : "Copia",
    "menu.edit.cut" : "Taglia",
    "menu.edit.delete" : "Elimina",
-   "menu.edit.emojiSymbols" : "Emoji e Simboli",
+   "menu.edit.emojiSymbols" : "Emoji e simboli",
    "menu.edit.paste" : "Incolla",
    "menu.edit.pasteAndMatchStyle" : "Incolla e Mantieni Stile",
    "menu.edit.redo" : "Ripeti",
@@ -59,7 +72,9 @@
    "menu.help.support" : "Supporto",
    "menu.help.tos" : "Termini di Servizio",
    "menu.services" : "Servizi",
+   "menu.services.activatePreviousService" : "Attiva servizio precedente",
    "menu.services.addNewService" : "Aggiungi Nuovo Servizio...",
+   "menu.services.setNextServiceActive" : "Attiva servizio seguente",
    "menu.view" : "Visualizza",
    "menu.view.enterFullScreen" : "Visualizza a Schermo Intero",
    "menu.view.exitFullScreen" : "Esci da Schermo Intero",
@@ -74,6 +89,11 @@
    "menu.window" : "Finestra",
    "menu.window.close" : "Chiudi",
    "menu.window.minimize" : "Minimizza",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Tutti i servizi",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "Indirizzo email",
    "password.headline" : "Reimposta password",
    "password.link.login" : "Accedi al tuo account",
@@ -81,7 +101,7 @@
    "password.noUser" : "Non è stato trovato nessun utente con questo indirizzo e-mail",
    "password.submit.label" : "Invia",
    "password.successInfo" : "Per favore controlla la tua email",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Effettua l'upgrade del tuo account",
    "pricing.headline" : "Supporta Franz",
    "pricing.link.skipPayment" : "Non voglio supportare lo sviluppo di Franz",
    "pricing.submit.label" : "Voglio supportare lo sviluppo di Franz",
@@ -96,7 +116,8 @@
    "service.errorHandler.editAction" : "Modifica {name}",
    "service.errorHandler.headline" : "Oh no!",
    "service.errorHandler.message" : "Errore",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} non si è caricato correttamente.",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "Iniziamo",
    "services.welcome" : "Benvenuto su Franz",
    "settings.account.account.editButton" : "Modifica account",
@@ -117,7 +138,8 @@
    "settings.account.invoiceDownload" : "Scarica",
    "settings.account.manageSubscription.label" : "Gestisci il tuo abbonamento",
    "settings.account.successInfo" : "Le tue modifiche sono state salvate",
-   "settings.account.tryReloadUserInfoRequest" : "Prova di nuovo",
+   "settings.account.tryReloadServices" : "Prova di nuovo",
+   "settings.account.tryReloadUserInfoRequest" : "Riprova",
    "settings.account.userInfoRequestFailed" : "Impossibile caricare le informazioni dell'utente.",
    "settings.app.buttonClearAllCache" : "Svuota la cache",
    "settings.app.buttonInstallUpdate" : "Riavvia e installa l'aggiornamento",
@@ -129,22 +151,20 @@
    "settings.app.form.beta" : "Includi versioni beta",
    "settings.app.form.darkMode" : "Unisciti al Lato Oscuro.",
    "settings.app.form.enableGPUAcceleration" : "Attiva Accelerazione GPU",
-   "settings.app.form.enableMenuBar" : "Mostra Franz nella Barra del Menu",
    "settings.app.form.enableSpellchecking" : "Attiva controllo ortografico",
    "settings.app.form.enableSystemTray" : "Mostra Franz nell'area di notifica",
-   "settings.app.form.hideDockIcon" : "Nascondi l'icona Franz nel Dock",
    "settings.app.form.language" : "Lingua",
    "settings.app.form.minimizeToSystemTray" : "Minimizza Franz nell'area di notifica",
    "settings.app.form.runInBackground" : "Mantieni Franz in esecuzione quando chiudi la finestra",
    "settings.app.form.showDisabledServices" : "Mostra schede servizi disattivati",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Mostra l'etichetta dei messaggi non letti quando le notifiche sono disattivate",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Impostazioni",
    "settings.app.headlineAdvanced" : "Avanzate",
    "settings.app.headlineAppearance" : "Aspetto",
    "settings.app.headlineGeneral" : "Generale",
    "settings.app.headlineLanguage" : "Lingua",
    "settings.app.headlineUpdates" : "Aggiornamenti",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "Le modifiche richiedono un riavvio",
    "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Aiutaci a tradurre Franz nella tua lingua.",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "Invita Amici",
    "settings.navigation.logout" : "Esci",
    "settings.navigation.settings" : "Impostazioni",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "I tuoi servizi",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "Tutti i servizi",
    "settings.recipes.dev" : "Sviluppo",
    "settings.recipes.headline" : "Servizi disponibili",
@@ -192,17 +214,15 @@
    "settings.service.form.indirectMessages" : "Mostra l'etichetta per tutti i nuovi messaggi",
    "settings.service.form.isMutedInfo" : "Se disattivato, tutte le notifiche sonore e le riproduzioni audio saranno mutate",
    "settings.service.form.name" : "Nome",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "Impostazioni Proxy HTTP\/HTTPS",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
-   "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.info" : "Le impostazioni proxy non verranno sincronizzate con i server Franz",
+   "settings.service.form.proxy.isEnabled" : "Usa un Proxy",
+   "settings.service.form.proxy.password" : "Password (opzionale)",
+   "settings.service.form.proxy.port" : "Porta",
+   "settings.service.form.proxy.restartInfo" : "Riavvia Franz dopo aver cambiato le impostazioni del proxy.",
+   "settings.service.form.proxy.user" : "Utente (opzionale)",
    "settings.service.form.saveButton" : "Salva servizio",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hosted",
    "settings.service.form.tabOnPremise" : "Self hosted ��",
    "settings.service.form.team" : "Gruppo",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "Scopri servizi",
    "settings.services.headline" : "I tuoi servizi",
    "settings.services.noServicesAdded" : "Non hai aggiunto ancora nessun servizio.",
+   "settings.services.servicesRequestFailed" : "Impossibile caricare il servizio",
    "settings.services.tooltip.isDisabled" : "Il servizio è disattivato",
    "settings.services.tooltip.isMuted" : "Tutti i suoni sono disattivati",
    "settings.services.tooltip.notificationsDisabled" : "Le notifiche sono disattivate",
    "settings.services.updatedInfo" : "Le tue modifiche sono state salvate",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Gruppo",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
    "settings.user.form.accountType.company" : "Società",
    "settings.user.form.accountType.individual" : "Individuale",
    "settings.user.form.accountType.label" : "Tipo di account",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "Nome",
    "settings.user.form.lastname" : "Cognome",
    "settings.user.form.newPassword" : "Nuova password",
+   "settings.workspace.add.form.name" : "Nome",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Nome",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Try again",
+   "settings.workspaces.updatedInfo" : "Le tue modifiche sono state salvate",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "Aggiungi un nuovo servizio",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "Disattiva notifiche e audio",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Impostazioni",
    "sidebar.unmuteApp" : "Attiva notifiche e audio",
    "signup.company.label" : "Società",
@@ -235,7 +279,7 @@
    "signup.firstname.label" : "Nome",
    "signup.headline" : "Iscriviti",
    "signup.lastname.label" : "Cognome",
-   "signup.legal.info" : "Creando un account di Franz accetti l' ",
+   "signup.legal.info" : "Creando un account di Franz stai accettando il ",
    "signup.legal.privacy" : "Informativa sulla Privacy",
    "signup.legal.terms" : "Termini di Servizio",
    "signup.link.login" : "Hai già un account, vuoi accedere?",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "Per i residenti UE: possono essere applicate tasse locali",
    "subscription.features.ads" : "Nessuna pubblicità, mai!",
    "subscription.features.comingSoon" : "in arrivo",
-   "subscription.features.encryptedSync" : "Sincronizzazione sessione crittografata",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Aggiungi servizi on-premise\/hosted come HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.noInterruptions" : "L'upgrade della licenza avrà impatti sull'utilizzo dell'App",
+   "subscription.features.onpremise.mattermost" : "Aggiungi servizi on-premise\/hosted come \"Mattermost\"",
+   "subscription.features.proxy" : "Supporto proxy per i servizi",
+   "subscription.features.spellchecker" : "Supporto per il correttore ortografico",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "L'account a pagamento Franz Premium Supporter include",
    "subscription.paymentSessionError" : "Impossibile inizializzare il modulo per il pagamento",
    "subscription.submit.label" : "Voglio supportare lo sviluppo di Franz",
@@ -269,9 +312,20 @@
    "tabs.item.reload" : "Ricarica",
    "validation.email" : "{field} non valido",
    "validation.minLength" : "{field} dovrebbe contenere almeno {length} caratteri",
+   "validation.oneRequired" : "Almeno un campo è richiesto",
    "validation.required" : "{field} è necessario",
    "validation.url" : "{field} non è un URL valido",
    "welcome.loginButton" : "Accedi al tuo account",
    "welcome.signupButton" : "Crea un account gratuito",
-   "welcome.slogan" : "Un sistema di messaggistica che va bene per te"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Tutti i servizi",
+   "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>Franz 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/ja.json b/src/i18n/locales/ja.json
index 6eea64c3a..cf7e9ab78 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -1,16 +1,28 @@
 {
    "app.errorHandler.action" : "�読�込�",
-   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.action" : "Franz サ�ーターライセンスを購入�る",
-   "feature.delayApp.headline" : "Franz を���起動�る���Franz サ�ーターライセンスを購入������。",
-   "feature.delayApp.text" : "Franz ���{seconds}秒後�起動���。",
+   "app.errorHandler.headline" : "間����る部分��り��",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "feature.delayApp.action" : "Franzサ�ーターライセンスを購入�る",
+   "feature.delayApp.headline" : "Franzを���起動�る���Franz サ�ーターライセンスを購入������。",
+   "feature.delayApp.text" : "Franz���{seconds}秒後�起動���。",
+   "feature.shareFranz.action.email" : "メール��信",
+   "feature.shareFranz.action.facebook" : "Facebook�シェア",
+   "feature.shareFranz.action.twitter" : "Twitter�シェア",
+   "feature.shareFranz.headline" : "Franz������も�",
+   "feature.shareFranz.shareText.email" : "Franz�{count}個�サービスを使���������もGmail, Messenger, Slack, Skype���サービスをFranz�一元管����ょ�� www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "��������Franzを教������ょ�。",
    "global.api.unhealthy" : "Franz�オンラインサービス�接続����ん。",
    "global.notConnectedToTheInternet" : "インター�ット�接続�れ����ん。",
+   "global.spellchecker.useDefault" : " {default}を�期設定�使用������",
+   "global.spellchecking.autodetect" : "言語を自動的�検出�る",
+   "global.spellchecking.autodetect.short" : "自動",
+   "global.spellchecking.language" : "スペル�ェック�る言語",
    "import.headline" : "Franz 4�サービスをイン�ート��下��",
    "import.notSupportedHeadline" : "Franz 5����サービス���対応�����ん",
    "import.skip.label" : "手動�サービスを追加�る",
    "import.submit.label" : "サービスをイン�ート��下��",
-   "infobar.buttonChangelog" : "最新�情報",
+   "infobar.buttonChangelog" : "更新履歴を見る",
    "infobar.buttonInstallUpdate" : "�起動��更新をインストール�る",
    "infobar.buttonReloadServices" : "サービス��読�込�",
    "infobar.requiredRequestsFailed" : "サービス�ユーザー情報を読�込���ん���",
@@ -32,6 +44,7 @@
    "login.submit.label" : "サインイン",
    "login.tokenExpired" : "セッション�期��切れ���。ログイン�直��下��。",
    "menu.app.about" : "�ージョン情報",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "隠�",
    "menu.app.hideOthers" : "他を隠�",
    "menu.app.quit" : "終了",
@@ -59,7 +72,9 @@
    "menu.help.support" : "サ�ート",
    "menu.help.tos" : "サービス利用�約",
    "menu.services" : "サービス",
+   "menu.services.activatePreviousService" : "��サービスを有効��る",
    "menu.services.addNewService" : "サービスを追加",
+   "menu.services.setNextServiceActive" : "次�サービスを有効��る",
    "menu.view" : "表示",
    "menu.view.enterFullScreen" : "全画�表示",
    "menu.view.exitFullScreen" : "全画�表示を終了�る",
@@ -74,6 +89,11 @@
    "menu.window" : "ウィンドウ",
    "menu.window.close" : "閉�る",
    "menu.window.minimize" : "最�化",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "����サービス",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "メールアドレス",
    "password.headline" : "パスワード�リセット",
    "password.link.login" : "サインイン",
@@ -96,7 +116,8 @@
    "service.errorHandler.editAction" : "{name}を編集",
    "service.errorHandler.headline" : "�����",
    "service.errorHandler.message" : "エラー",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} �ロード�失敗����",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "���る",
    "services.welcome" : "Franz�よ���",
    "settings.account.account.editButton" : "アカウント�編集",
@@ -117,6 +138,7 @@
    "settings.account.invoiceDownload" : "ダウンロード",
    "settings.account.manageSubscription.label" : "サブスクリプション�管�",
    "settings.account.successInfo" : "変更内容��存�れ���",
+   "settings.account.tryReloadServices" : "も�一度試�",
    "settings.account.tryReloadUserInfoRequest" : "も�一度試�",
    "settings.account.userInfoRequestFailed" : "ユーザ情報を読�込���ん���",
    "settings.app.buttonClearAllCache" : "キャッシュを消去�る",
@@ -129,22 +151,20 @@
    "settings.app.form.beta" : "Beta�ージョンを��る",
    "settings.app.form.darkMode" : "ダークモードを有効��る",
    "settings.app.form.enableGPUAcceleration" : "GPUアクセラレーションを有効��る",
-   "settings.app.form.enableMenuBar" : "メニュー�ー�Franzを表示�る",
    "settings.app.form.enableSpellchecking" : "スペル�ェックを有効��る",
    "settings.app.form.enableSystemTray" : "Franzをシステムトレイ�表示�る",
-   "settings.app.form.hideDockIcon" : "Dock�らFranzを隠�",
    "settings.app.form.language" : "言語",
    "settings.app.form.minimizeToSystemTray" : "Franzをシステムトレイ�最�化�る",
    "settings.app.form.runInBackground" : "ウインドウを閉��際�Franzを�ックグラウンド�実行�����",
    "settings.app.form.showDisabledServices" : "無効化�れ�サービス�タブを表示�る",
    "settings.app.form.showMessagesBadgesWhenMuted" : "通知�無効時�未読メッセージ件数を表示�る",
-   "settings.app.form.spellcheckerLanguage" : "スペル�ェック�る言語",
    "settings.app.headline" : "設定",
    "settings.app.headlineAdvanced" : "詳細",
    "settings.app.headlineAppearance" : "表示スタイル",
    "settings.app.headlineGeneral" : "一般",
    "settings.app.headlineLanguage" : "言語",
    "settings.app.headlineUpdates" : "æ›´æ–°",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "変更���起動�必���",
    "settings.app.subheadlineCache" : "キャッシュ",
    "settings.app.translationHelp" : "Franz�翻訳作業���力を�願����。",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "知り��を招待�る",
    "settings.navigation.logout" : "ログアウト",
    "settings.navigation.settings" : "設定",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "利用中�サービス",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "����サービス",
    "settings.recipes.dev" : "開発版",
    "settings.recipes.headline" : "利用�能�サービス",
@@ -192,17 +214,15 @@
    "settings.service.form.indirectMessages" : "����新�メッセージ�����ッジを表示�る",
    "settings.service.form.isMutedInfo" : "無効化�れ��る場��全��通知音やオーディオ�生�無音��り��",
    "settings.service.form.name" : "サービス�",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS�プロキシ設定",
    "settings.service.form.proxy.host" : "プロキシサー�ー\/IP",
    "settings.service.form.proxy.info" : "プロキシ設定�Franz アカウント��期�れ��ん。",
    "settings.service.form.proxy.isEnabled" : "プロキシ設定を有効��る",
    "settings.service.form.proxy.password" : "パスワード（任�）",
-   "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.port" : "�ート",
+   "settings.service.form.proxy.restartInfo" : "プロキシ設定を変更���ら�Franzを�起動������",
    "settings.service.form.proxy.user" : "ユーザー�（任�）",
    "settings.service.form.saveButton" : "サービス��存",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "ホスト",
    "settings.service.form.tabOnPremise" : "セルフホスト ��",
    "settings.service.form.team" : "�ーム",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "サービスを探�",
    "settings.services.headline" : "利用中�サービス",
    "settings.services.noServicesAdded" : "�����サービスも追加�れ����ん。",
+   "settings.services.servicesRequestFailed" : "サービスを読�込む�������ん���",
    "settings.services.tooltip.isDisabled" : "サービス�無効��",
    "settings.services.tooltip.isMuted" : "無音�������",
    "settings.services.tooltip.notificationsDisabled" : "通知�無効��",
    "settings.services.updatedInfo" : "変更内容��存�れ���",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "�ーム",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
    "settings.user.form.accountType.company" : "法人",
    "settings.user.form.accountType.individual" : "個人",
    "settings.user.form.accountType.label" : "アカウント�種類",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "�",
    "settings.user.form.lastname" : "姓",
    "settings.user.form.newPassword" : "新��パスワード",
+   "settings.workspace.add.form.name" : "Name",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Name",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "も�一度試�",
+   "settings.workspaces.updatedInfo" : "変更内容��存�れ���",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "サービスを追加",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "通知�オーディオを無効化",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "設定",
    "sidebar.unmuteApp" : "通知�オーディオを有効化",
    "signup.company.label" : "法人",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "EU在�者 : 地域�消費税��用�れる�能性��り��",
    "subscription.features.ads" : "広告�一切�り��ん!",
    "subscription.features.comingSoon" : "�も��登場",
-   "subscription.features.encryptedSync" : "暗�化�れ�セッション��期",
    "subscription.features.noInterruptions" : "待�時間���Franz を�使�������",
-   "subscription.features.onpremise" : "HipChat�よ��オンプレミス\/ホスト型サービス�追加",
    "subscription.features.onpremise.mattermost" : "Mattermost �よ��オンプレミス（自社�用）型�サービスを追加��るよ���り��",
    "subscription.features.proxy" : "プロキシ設定�利用�能",
    "subscription.features.spellchecker" : "スペル�ェック機能を�使�������",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "Franz Premium Supporter有料アカウント��以下���れ��",
    "subscription.paymentSessionError" : "支払�フォームを�期化出���ん",
    "subscription.submit.label" : "Franz�開発を支����",
@@ -269,9 +312,20 @@
    "tabs.item.reload" : "�読�込�",
    "validation.email" : "{field}�正���り��ん",
    "validation.minLength" : "{field}�少���も{length}文字以上���れ��り��ん",
+   "validation.oneRequired" : "少���も1��必���",
    "validation.required" : "{field}�必須��",
    "validation.url" : "{field}�正��URL���り��ん",
    "welcome.loginButton" : "アカウント�ログイン",
    "welcome.signupButton" : "無料アカウントを作�",
-   "welcome.slogan" : "Messaging that works for you"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "����サービス",
+   "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>Franz 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/ka.json b/src/i18n/locales/ka.json
index 632ca618e..af224c115 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -1,11 +1,23 @@
 {
    "app.errorHandler.action" : "ჩ�ტვირთვ�",
    "app.errorHandler.headline" : "Something went wrong",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Franz-ის �ნლ�ინ სერვისთ�ნ დ�კ�ვშირებ� ვერ მ�ხერხდ�",
    "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",
    "import.headline" : "შემ�იტ�ნე Franz 4-ის სერვისები",
    "import.notSupportedHeadline" : "სერვისები ჯერ �რ �რის მხ�რდ�ჭერილი Franz 5-ში",
    "import.skip.label" : "I want to add services manually",
@@ -32,6 +44,7 @@
    "login.submit.label" : "შესვლ�",
    "login.tokenExpired" : "თქვენს სესი�ს ვ�დ� გ�უვიდ�, შედით �ნგ�რიშში ხელ�ხლ�.",
    "menu.app.about" : "Franz-ის შეს�ხებ",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Hide",
    "menu.app.hideOthers" : "სხვების დ�მ�ლვ�",
    "menu.app.quit" : "გ�მ�სვლ�",
@@ -59,7 +72,9 @@
    "menu.help.support" : "Support",
    "menu.help.tos" : "Terms of Service",
    "menu.services" : "Services",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Add New Service...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "View",
    "menu.view.enterFullScreen" : "Enter Full Screen",
    "menu.view.exitFullScreen" : "Exit Full Screen",
@@ -74,6 +89,11 @@
    "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",
+   "menu.workspaces.defaultWorkspace" : "ყველ� სერვისი",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "მეილი",
    "password.headline" : "პ�რ�ლის �ღდგენ�",
    "password.link.login" : "შედით თქვენს �ნგ�რიშში",
@@ -97,6 +117,7 @@
    "service.errorHandler.headline" : "Oh no!",
    "service.errorHandler.message" : "შეცდ�მ�",
    "service.errorHandler.text" : "{name} has failed to load.",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "დ�წყებ�",
    "services.welcome" : "მ�გეს�ლმებით Franz-ზე",
    "settings.account.account.editButton" : "�ნგ�რიშის მ�რთვ�",
@@ -117,6 +138,7 @@
    "settings.account.invoiceDownload" : "გ�დმ�წერ�",
    "settings.account.manageSubscription.label" : "თქვენი გ�მ�წერის მ�რთვ�",
    "settings.account.successInfo" : "თქვენი ცვლილებები შენ�ხული�",
+   "settings.account.tryReloadServices" : "სც�დეთ ხელ�ხლ�",
    "settings.account.tryReloadUserInfoRequest" : "სც�დეთ ხელ�ხლ�",
    "settings.account.userInfoRequestFailed" : "მ�მხმ�რებლის ინფ�რმ�ციის ჩ�ტვირთვ� ვერ მ�ხერხდ�",
    "settings.app.buttonClearAllCache" : "Clear cache",
@@ -129,22 +151,20 @@
    "settings.app.form.beta" : "ჩ�რთეთ ბეტ� ვერსიები",
    "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
-   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
    "settings.app.form.enableSpellchecking" : "Enable spell checking",
    "settings.app.form.enableSystemTray" : "�ჩვენეთ Franz სისტემის უჯრ�ში",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
    "settings.app.form.language" : "ენ�",
    "settings.app.form.minimizeToSystemTray" : "ჩ�კეცეთ Franz სისტემის უჯრ�ში",
    "settings.app.form.runInBackground" : "დ�ტ�ვეთ Franz გ�შვებული რ�დეს�ც ფ�ნჯ�რ� დ�იხურებ�",
    "settings.app.form.showDisabledServices" : "Display disabled services tabs",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "პ�რ�მეტრები",
    "settings.app.headlineAdvanced" : "Advanced",
    "settings.app.headlineAppearance" : "Appearance",
    "settings.app.headlineGeneral" : "მთ�ვ�რი",
    "settings.app.headlineLanguage" : "ენ�",
    "settings.app.headlineUpdates" : "გ�ნ�ხლებები",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "Changes require restart",
    "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Help us to translate Franz into your language.",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "Invite Friends",
    "settings.navigation.logout" : "გ�სვლ�",
    "settings.navigation.settings" : "პ�რ�მეტრები",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "თქვენი სერვისები",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "ყველ� სერვისი",
    "settings.recipes.dev" : "გ�ნვით�რებ�",
    "settings.recipes.headline" : "ხელმის�წვდ�მი სერვისები",
@@ -201,8 +223,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "სერვისის შენ�ხვ�",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "დ�ჰ�სტილი",
    "settings.service.form.tabOnPremise" : "თვით დ�ჰ�სტილი ��",
    "settings.service.form.team" : "გუნდი",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "�ღმ��ჩინეთ სერვისები",
    "settings.services.headline" : "თქვენი სერვისები",
    "settings.services.noServicesAdded" : "თქვენ ჯერ �რ გ�ქვთ სერვისები დ�მ�ტებული.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "სერვისი გ�თიშული�",
    "settings.services.tooltip.isMuted" : "All sounds are muted",
    "settings.services.tooltip.notificationsDisabled" : "შეტყ�ბინებები გ�თიშული�",
    "settings.services.updatedInfo" : "ცვლილებები შენ�ხული�",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "გუნდი",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
    "settings.user.form.accountType.company" : "კ�მპ�ნი�",
    "settings.user.form.accountType.individual" : "ინდივიდუ�ლური",
    "settings.user.form.accountType.label" : "�ნგ�რიშის ტიპი",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "First Name",
    "settings.user.form.lastname" : "Last Name",
    "settings.user.form.newPassword" : "�ხ�ლი პ�რ�ლი",
+   "settings.workspace.add.form.name" : "Name",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Name",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "სც�დეთ ხელ�ხლ�",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "Add new service",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "პ�რ�მეტრები",
    "sidebar.unmuteApp" : "Enable notifications & audio",
    "signup.company.label" : "კ�მპ�ნი�",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
    "subscription.features.ads" : "�რ�ნ�ირი რეკლ�მები, �რ�სდრ�ს!",
    "subscription.features.comingSoon" : "მ�ლე",
-   "subscription.features.encryptedSync" : "დ�შიფრული სესიის სინქრ�ნიზ�ცი�",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "on-premise\/hosted სერვისების დ�მ�ტებ�, რ�გ�რიც�� HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "ფ�სი�ნი Franz-ის პრემიუმ მხ�რმდ�მჭერი �ნგ�რიში",
    "subscription.paymentSessionError" : "გ�დ�ხდის ფ�რმ�ტის ინიცი�ლიზ�ცი� ვერ მ�ხერხდ�",
    "subscription.submit.label" : "მინდ� ხელი შევუწყ� Franz-ის გ�ნვით�რებ�ს",
@@ -269,9 +312,20 @@
    "tabs.item.reload" : "ჩ�ტვირთვ�",
    "validation.email" : "{field} is not valid",
    "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} is required",
    "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "შედით თქვენს �ნგ�რიშში",
    "welcome.signupButton" : "შექმენი �ნგ�რიში, ეს უფ�ს��",
-   "welcome.slogan" : "შეტყ�ბინების �პლიკ�ცი�, რ�მელიც მუშ��ბს შენთვის"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "ყველ� სერვისი",
+   "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>Franz 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/nl-BE.json b/src/i18n/locales/nl-BE.json
index c38a7f024..2854fcb09 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -1,124 +1,146 @@
 {
    "app.errorHandler.action" : "Herladen",
-   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.headline" : "Er ging iets mis",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "feature.delayApp.action" : "Neem een Franz Supporter Licentie ",
+   "feature.delayApp.headline" : "Neem een Franz Supporter Licentie om niet meer te hoeven wachten",
+   "feature.delayApp.text" : "Franz gaat over {seconds} seconden verder.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Kan geen verbinding maken met de Franz services",
    "global.notConnectedToTheInternet" : "Je hebt geen internet verbinding.",
+   "global.spellchecker.useDefault" : "Gebruik Systeemstandaard ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Taal spellingscontrole",
    "import.headline" : "Importeer je Franz 4 services",
    "import.notSupportedHeadline" : "De volgende services worden nog niet ondersteund in Franz 5",
-   "import.skip.label" : "Ik wens services manueel toe te voegen",
+   "import.skip.label" : "Ik wil services handmatig toevoegen",
    "import.submit.label" : "Importeer services",
    "infobar.buttonChangelog" : "Wat is er nieuw?",
-   "infobar.buttonInstallUpdate" : "Start opnieuw op & installeer de update",
-   "infobar.buttonReloadServices" : "Herlaad de services",
-   "infobar.requiredRequestsFailed" : "Kan de services en gebruikers informatie niet laden",
-   "infobar.servicesUpdated" : "Je services zijn geüpdatet.",
-   "infobar.updateAvailable" : "Een nieuwe update voor Franz is beschikbaar.",
+   "infobar.buttonInstallUpdate" : "Opnieuw opstarten & update installeren",
+   "infobar.buttonReloadServices" : "Services opnieuw laden",
+   "infobar.requiredRequestsFailed" : "Kan de services en gebruikersinformatie niet laden",
+   "infobar.servicesUpdated" : "Je services zijn bijgewerkt.",
+   "infobar.updateAvailable" : "Er is een nieuwe update voor Franz beschikbaar.",
    "invite.email.label" : "E-mailadres",
    "invite.headline.friends" : "Nodig 3 van je vrienden of collega's uit",
    "invite.name.label" : "Naam",
    "invite.skip.label" : "Ik wil dit later doen",
-   "invite.submit.label" : "Verzend uitnodigingen",
+   "invite.submit.label" : "Uitnodigingen verzenden",
    "invite.successInfo" : "Uitnodiging met succes verzonden",
    "login.email.label" : "E-mailadres",
    "login.headline" : "Inloggen",
    "login.invalidCredentials" : "E-mailadres of wachtwoord ongeldig",
    "login.link.password" : "Wachtwoord resetten",
-   "login.link.signup" : "Maak een gratis account",
+   "login.link.signup" : "Maak een gratis account aan",
    "login.password.label" : "Wachtwoord",
    "login.serverLogout" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
-   "login.submit.label" : "Log in",
+   "login.submit.label" : "Inloggen",
    "login.tokenExpired" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
    "menu.app.about" : "Over Franz",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Verbergen",
-   "menu.app.hideOthers" : "Andere verbergen",
+   "menu.app.hideOthers" : "Andere Verbergen",
    "menu.app.quit" : "Afsluiten",
    "menu.app.settings" : "Instellingen",
-   "menu.app.unhide" : "Zichtbaar maken",
-   "menu.edit" : "Aanpassen",
+   "menu.app.unhide" : "Tonen",
+   "menu.edit" : "Bewerken",
    "menu.edit.copy" : "Kopiëren",
    "menu.edit.cut" : "Knippen",
    "menu.edit.delete" : "Verwijderen",
    "menu.edit.emojiSymbols" : "Emoji & Symbolen",
    "menu.edit.paste" : "Plakken",
    "menu.edit.pasteAndMatchStyle" : "Plakken en stijl overeen laten komen",
-   "menu.edit.redo" : "Opnieuw uitvoeren",
-   "menu.edit.selectAll" : "Selecteer alles",
+   "menu.edit.redo" : "Opnieuw doen",
+   "menu.edit.selectAll" : "Selecteer Alles",
    "menu.edit.speech" : "Spraakuitvoer",
    "menu.edit.startDictation" : "Beginnen met dicteren",
-   "menu.edit.startSpeaking" : "Begin met spreken",
-   "menu.edit.stopSpeaking" : "Stoppen met spreken",
+   "menu.edit.startSpeaking" : "Begin met Spreken",
+   "menu.edit.stopSpeaking" : "Stoppen met Spreken",
    "menu.edit.undo" : "Ongedaan maken",
    "menu.file" : "Bestand",
    "menu.help" : "Help",
    "menu.help.changelog" : "Logboek",
-   "menu.help.learnMore" : "Meer weten",
+   "menu.help.learnMore" : "Meer Weten",
    "menu.help.privacy" : "Privacyverklaring",
    "menu.help.support" : "Ondersteuning",
    "menu.help.tos" : "Servicevoorwaarden",
-   "menu.services" : "Diensten",
+   "menu.services" : "Services",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Nieuwe service toevoegen...",
-   "menu.view" : "Beeld",
+   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.view" : "Weergave",
    "menu.view.enterFullScreen" : "Volledig scherm openen",
    "menu.view.exitFullScreen" : "Volledig scherm verlaten",
    "menu.view.reloadFranz" : "Franz Herladen",
-   "menu.view.reloadService" : "Service herladen",
-   "menu.view.resetZoom" : "Werkelijke grootte",
-   "menu.view.toggleDevTools" : "Toggle Developer Tools",
-   "menu.view.toggleFullScreen" : "Volledig scherm aan\/uit",
-   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.reloadService" : "Service Herladen",
+   "menu.view.resetZoom" : "Werkelijke Grootte",
+   "menu.view.toggleDevTools" : "Ontwikkelaarstools Aan\/Uit",
+   "menu.view.toggleFullScreen" : "Volledig Scherm Aan\/Uit",
+   "menu.view.toggleServiceDevTools" : "Service Ontwikkelaarstools Aan\/Uit",
    "menu.view.zoomIn" : "Inzoomen",
    "menu.view.zoomOut" : "Uitzoomen",
    "menu.window" : "Venster",
    "menu.window.close" : "Sluiten",
    "menu.window.minimize" : "Minimaliseren",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Alle services",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "E-mailadres",
    "password.headline" : "Wachtwoord resetten",
    "password.link.login" : "Log in op je account",
    "password.link.signup" : "Maak een gratis account",
-   "password.noUser" : "Geen gebruiker bekend met dat e-mailadres",
-   "password.submit.label" : "Doorgaan",
+   "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.headline" : "Ondersteun Franz",
+   "pricing.headline" : "Steun Franz",
    "pricing.link.skipPayment" : "Ik wil de ontwikkeling van Franz niet ondersteunen.",
    "pricing.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
    "pricing.support.label" : "Selecteer je ondersteuningsplan",
    "service.crashHandler.action" : "{naam} herladen",
-   "service.crashHandler.autoReload" : "Automatisch herstellen {name} proberen in {seconds} seconden",
+   "service.crashHandler.autoReload" : "Ga proberen om {name} te herstellen over {seconds} seconden",
    "service.crashHandler.headline" : "Oh nee!",
    "service.crashHandler.text" : "{name} heeft een probleem veroorzaakt.",
    "service.disabledHandler.action" : "Activeer {name}",
    "service.disabledHandler.headline" : "{name} is uitgeschakeld",
    "service.errorHandler.action" : "{naam} herladen",
-   "service.errorHandler.editAction" : "{name} aanpassen",
+   "service.errorHandler.editAction" : "Bewerk {name}",
    "service.errorHandler.headline" : "Oh nee!",
    "service.errorHandler.message" : "Fout",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} kon niet geladen worden.",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "Beginnen",
    "services.welcome" : "Welkom bij Franz",
-   "settings.account.account.editButton" : "Bewerk account",
+   "settings.account.account.editButton" : "Account bewerken",
    "settings.account.accountType.basic" : "Basis Account",
    "settings.account.accountType.premium" : "Premium Supporter Account",
-   "settings.account.buttonSave" : "Profiel aanpassen",
+   "settings.account.buttonSave" : "Profiel bijwerken",
    "settings.account.deleteAccount" : "Account verwijderen",
    "settings.account.deleteEmailSent" : "U heeft een email ontvangen met een bevestiginslink om uw account te verwijderen. Uw account en de bijhorende gegevens kunnen niet meer worden herstel na deze actie!",
-   "settings.account.deleteInfo" : "Indien u uw Franz account nietmeer nodig heeft, kan u hier uw account en de gerelateerde gegegevens verwijderen.",
+   "settings.account.deleteInfo" : "Indien u uw Franz account niet meer nodig heeft, kan u hier uw account en alle gerelateerde gegevens verwijderen.",
    "settings.account.headline" : "Account",
    "settings.account.headlineAccount" : "Account informatie",
-   "settings.account.headlineDangerZone" : "Gevaren Zone",
+   "settings.account.headlineDangerZone" : "Gevarenzone",
    "settings.account.headlineInvoices" : "Facturen",
    "settings.account.headlinePassword" : "Wijzig wachtwoord",
-   "settings.account.headlineProfile" : "Profiel aanpassen",
+   "settings.account.headlineProfile" : "Profiel bijwerken",
    "settings.account.headlineSubscription" : "Je abonnement",
    "settings.account.headlineUpgrade" : "Upgrade je account & ondersteun Franz",
    "settings.account.invoiceDownload" : "Download",
    "settings.account.manageSubscription.label" : "Beheer je abonnement",
    "settings.account.successInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.account.tryReloadServices" : "Probeer opnieuw",
    "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
-   "settings.account.userInfoRequestFailed" : "Kon gebruikerinformatie niet laden",
+   "settings.account.userInfoRequestFailed" : "Kon gebruikersinformatie niet laden",
    "settings.app.buttonClearAllCache" : "Cache wissen",
    "settings.app.buttonInstallUpdate" : "Herstart & installeer update",
    "settings.app.buttonSearchForUpdate" : "Controleer op updates",
@@ -126,47 +148,47 @@
    "settings.app.currentVersion" : "Huidige versie:",
    "settings.app.form.autoLaunchInBackground" : "Open op de achtergrond",
    "settings.app.form.autoLaunchOnStart" : "Lanceer Franz bij opstarten",
-   "settings.app.form.beta" : "Inclusief bèta versies",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.beta" : "Inclusief beta versies",
+   "settings.app.form.darkMode" : "Word lid van de Dark Side",
    "settings.app.form.enableGPUAcceleration" : "GPU Acceleratie Activeren",
-   "settings.app.form.enableMenuBar" : "Toon Franz in Menu Bar",
    "settings.app.form.enableSpellchecking" : "Spellingcontrole inschakelen",
    "settings.app.form.enableSystemTray" : "Toon Franz in de systeembalk",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
    "settings.app.form.language" : "Taal",
    "settings.app.form.minimizeToSystemTray" : "Minimaliseer Franz naar de systeembalk",
    "settings.app.form.runInBackground" : "Houd Franz op de achtergrond wanneer het venster gesloten wordt",
-   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
-   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.showDisabledServices" : "Toon uitgeschakelde services",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
    "settings.app.headline" : "Instellingen",
-   "settings.app.headlineAdvanced" : "Advanced",
-   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineAdvanced" : "Geavanceerd",
+   "settings.app.headlineAppearance" : "Weergave",
    "settings.app.headlineGeneral" : "Algemeen",
    "settings.app.headlineLanguage" : "Taal",
    "settings.app.headlineUpdates" : "Updates",
-   "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
+   "settings.app.restartRequired" : "Deze wijziging heeft een herstart nodig",
    "settings.app.subheadlineCache" : "Cache",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.translationHelp" : "Help ons om Franz te vertalen naar uw taal.",
    "settings.app.updateStatusAvailable" : "Update beschikbaar, downloaden...",
    "settings.app.updateStatusSearching" : "Zoekt naar updates",
    "settings.app.updateStatusUpToDate" : "Je gebruikt de laatste versie van Franz",
-   "settings.invite.headline" : "Invite Friends",
+   "settings.invite.headline" : "Nodig vrienden uit",
    "settings.navigation.account" : "Account",
    "settings.navigation.availableServices" : "Beschikbare services",
-   "settings.navigation.inviteFriends" : "Invite Friends",
+   "settings.navigation.inviteFriends" : "Nodig vrienden uit",
    "settings.navigation.logout" : "Uitloggen",
    "settings.navigation.settings" : "Instellingen",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "Jouw services",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "Alle services",
    "settings.recipes.dev" : "Ontwikkeling",
    "settings.recipes.headline" : "Beschikbare services",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "Mist er een service?",
    "settings.recipes.mostPopular" : "Meest populair",
    "settings.recipes.nothingFound" : "Sorry, maar geen enkele service kwam overeen met je zoekterm.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Service succesvol toegevoegd",
-   "settings.searchService" : "Search service",
-   "settings.service.error.goBack" : "Terug naar de services",
+   "settings.searchService" : "Service zoeken",
+   "settings.service.error.goBack" : "Terug naar services",
    "settings.service.error.headline" : "Fout",
    "settings.service.error.message" : "Kon het service-recept niet laden.",
    "settings.service.form.addServiceHeadline" : "{name} toevoegen",
@@ -177,62 +199,84 @@
    "settings.service.form.customUrlValidationError" : "Kon de custom {name} server niet valideren.",
    "settings.service.form.deleteButton" : "Service verwijderen",
    "settings.service.form.editServiceHeadline" : "{name} aanpassen",
-   "settings.service.form.enableAudio" : "Enable audio",
-   "settings.service.form.enableBadge" : "Show unread message badges",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableAudio" : "Audio inschakelen",
+   "settings.service.form.enableBadge" : "Toon badges met ongelezen berichten",
+   "settings.service.form.enableDarkMode" : "Dark Mode aanzetten",
    "settings.service.form.enableNotification" : "Notificaties aanzetten",
    "settings.service.form.enableService" : "Service aanzetten",
-   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineBadges" : "Ongelezen berichten badges",
    "settings.service.form.headlineGeneral" : "Algemeen",
-   "settings.service.form.headlineNotifications" : "Notifications",
-   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.headlineNotifications" : "Meldingen",
+   "settings.service.form.icon" : "Aangepast icoon",
    "settings.service.form.iconDelete" : "Verwijderen",
-   "settings.service.form.iconUpload" : "Drop your image, or click here",
+   "settings.service.form.iconUpload" : "Sleep en drop je afbeelding, of klik hier",
    "settings.service.form.indirectMessageInfo" : "Je wordt verwittigd over alle nieuwe berichten in een kanaal, niet alleen @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Toon berichten-badge voor alle nieuwe berichten",
-   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.isMutedInfo" : "Indien uitgeschakeld zullen alle meldingsgeluiden en afgespeelde audio uitgeschakeld zijn",
    "settings.service.form.name" : "Naam",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Instellingen",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
-   "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
-   "settings.service.form.proxy.user" : "User (optional)",
-   "settings.service.form.saveButton" : "Service bewaren",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
+   "settings.service.form.proxy.info" : "Proxy instellingen worden niet gesynchroniseerd met de Franz servers.",
+   "settings.service.form.proxy.isEnabled" : "Proxy gebruiken",
+   "settings.service.form.proxy.password" : "Wachtwoord (optioneel)",
+   "settings.service.form.proxy.port" : "Poort",
+   "settings.service.form.proxy.restartInfo" : "Start Franz opnieuw op na het aanpassen van proxy Instellingen.",
+   "settings.service.form.proxy.user" : "Gebruiker (optioneel)",
+   "settings.service.form.saveButton" : "Service opslaan",
    "settings.service.form.tabHosted" : "Gehost",
    "settings.service.form.tabOnPremise" : "Intern gehost ��",
    "settings.service.form.team" : "Team",
-   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
+   "settings.service.form.useHostedService" : "Gebruik de gehoste {name} service.",
    "settings.service.form.yourServices" : "Jouw services",
    "settings.services.deletedInfo" : "Service werd verwijderd",
    "settings.services.discoverServices" : "Services ontdekken",
    "settings.services.headline" : "Jouw services",
    "settings.services.noServicesAdded" : "Je hebt nog geen services toegevoegd.",
-   "settings.services.tooltip.isDisabled" : "Service staat uit",
-   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
+   "settings.services.tooltip.isDisabled" : "Service is uitgeschakeld",
+   "settings.services.tooltip.isMuted" : "Alle geluiden zijn uitgeschakeld",
    "settings.services.tooltip.notificationsDisabled" : "Notificaties staan uit",
-   "settings.services.updatedInfo" : "Je wijzigingen werden bewaard",
+   "settings.services.updatedInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Team",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
    "settings.user.form.accountType.company" : "Bedrijf",
    "settings.user.form.accountType.individual" : "Particulier",
    "settings.user.form.accountType.label" : "Account type",
    "settings.user.form.accountType.non-profit" : "Non-Profit",
    "settings.user.form.currentPassword" : "Huidig wachtwoord",
    "settings.user.form.email" : "Email",
-   "settings.user.form.firstname" : "Naam",
+   "settings.user.form.firstname" : "Voornaam",
    "settings.user.form.lastname" : "Achternaam",
    "settings.user.form.newPassword" : "Nieuw wachtwoord",
-   "sidebar.addNewService" : "!!!Add new service",
-   "sidebar.muteApp" : "Disable notifications & audio",
+   "settings.workspace.add.form.name" : "Naam",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Naam",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Probeer opnieuw",
+   "settings.workspaces.updatedInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
+   "sidebar.addNewService" : "Nieuw service toevoegen",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
+   "sidebar.muteApp" : "Berichten & geluid uitschakelen",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Instellingen",
-   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "sidebar.unmuteApp" : "Berichten & geluid inschakelen",
    "signup.company.label" : "Bedrijf",
    "signup.email.label" : "E-mailadres",
-   "signup.emailDuplicate" : "Er bestaat reeds een gebruiker met dat e-mailadres",
-   "signup.firstname.label" : "Naam",
+   "signup.emailDuplicate" : "Er bestaat al een gebruiker met dat e-mailadres",
+   "signup.firstname.label" : "Voornaam",
    "signup.headline" : "Registreren",
    "signup.lastname.label" : "Achternaam",
    "signup.legal.info" : "Door een account aan te maken aanvaard je de",
@@ -241,15 +285,14 @@
    "signup.link.login" : "Al een account, inloggen?",
    "signup.password.label" : "Wachtwoord",
    "signup.submit.label" : "Account aanmaken",
-   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.euTaxInfo" : "Bewoners binnen EU: lokale belasting kan van toepassing zijn",
    "subscription.features.ads" : "Geen reclame, nooit!",
    "subscription.features.comingSoon" : "komt binnenkort",
-   "subscription.features.encryptedSync" : "Synchronisatie van geëncrypteerde sessies",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Intern gehoste services zoals HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.noInterruptions" : "Geen haperingen & pop ups over upgrades",
+   "subscription.features.onpremise.mattermost" : "Voeg op-locatie\/gehoste diensten zoals Mattermost toe",
+   "subscription.features.proxy" : "Proxy ondersteuning voor services",
+   "subscription.features.spellchecker" : "Ondersteuning voor spellingscheck",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "Een betalend account voor Franz omvat",
    "subscription.paymentSessionError" : "Betalingsformulier kon niet geladen worden",
    "subscription.submit.label" : "Ik wil de ontwikkeling van Franz steunen",
@@ -259,19 +302,30 @@
    "subscriptionPopup.buttonCancel" : "Annuleren",
    "subscriptionPopup.buttonDone" : "Klaar",
    "tabs.item.deleteService" : "Service verwijderen",
-   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableAudio" : "Audio uitschakelen",
    "tabs.item.disableNotifications" : "Notificaties uitschakelen",
    "tabs.item.disableService" : "Service uitschakelen",
    "tabs.item.edit" : "Aanpassen",
-   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableAudio" : "Audio inschakelen",
    "tabs.item.enableNotification" : "Notificaties inschakelen",
-   "tabs.item.enableService" : "Service aanzetten",
+   "tabs.item.enableService" : "Service inschakelen",
    "tabs.item.reload" : "Herladen",
-   "validation.email" : "{field} is not valid",
-   "validation.minLength" : "{field} should be at least {length} characters long",
-   "validation.required" : "{field} is required",
-   "validation.url" : "{field} is not a valid URL",
+   "validation.email" : "{field} is niet geldig",
+   "validation.minLength" : "{field} moet minimaal {length} karakters lang zijn",
+   "validation.oneRequired" : "At least one is required",
+   "validation.required" : "{field} is vereist",
+   "validation.url" : "{field} is niet een geldige URL",
    "welcome.loginButton" : "Inloggen op je account",
    "welcome.signupButton" : "Maak een gratis account aan",
-   "welcome.slogan" : "Messaging that works for you"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Alle services",
+   "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>Franz 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/nl.json b/src/i18n/locales/nl.json
index 940f24b0b..03d4474c1 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -1,11 +1,23 @@
 {
-   "app.errorHandler.action" : "Laad opnieuw",
-   "app.errorHandler.headline" : "Something went wrong",
+   "app.errorHandler.action" : "Herladen",
+   "app.errorHandler.headline" : "Er ging iets mis",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
    "feature.delayApp.action" : "Sponsor Franz",
    "feature.delayApp.headline" : "Sponsor Franz om wachten over te slaan",
    "feature.delayApp.text" : "Franz gaat over {seconds} seconden verder.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Kan geen verbinding maken met de Franz-services",
    "global.notConnectedToTheInternet" : "U bent niet verbonden met het internet.",
+   "global.spellchecker.useDefault" : "Gebruik systeemstandaard ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Spelling checken",
    "import.headline" : "Importeer uw Franz 4-services",
    "import.notSupportedHeadline" : "Services die nog niet ondersteund worden in Franz 5",
    "import.skip.label" : "Ik wil services handmatig toevoegen",
@@ -32,6 +44,7 @@
    "login.submit.label" : "Inloggen",
    "login.tokenExpired" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
    "menu.app.about" : "Over Franz",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Verbergen",
    "menu.app.hideOthers" : "Andere verbergen",
    "menu.app.quit" : "Afsluiten",
@@ -59,7 +72,9 @@
    "menu.help.support" : "Ondersteuning",
    "menu.help.tos" : "Servicevoorwaarden",
    "menu.services" : "Diensten",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Nieuwe dienst toevoegen",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Weergave",
    "menu.view.enterFullScreen" : "Gebruik volledig scherm",
    "menu.view.exitFullScreen" : "Volledig scherm verlaten",
@@ -74,6 +89,11 @@
    "menu.window" : "Venster",
    "menu.window.close" : "Sluiten",
    "menu.window.minimize" : "Minimaliseren",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Alle services",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "E-mailadres",
    "password.headline" : "Wachtwoord vergeten",
    "password.link.login" : "Log in op je account",
@@ -92,11 +112,12 @@
    "service.crashHandler.text" : "{name} heeft een fout veroorzaakt.",
    "service.disabledHandler.action" : "Activeer {name}",
    "service.disabledHandler.headline" : "{name} is uitgeschakeld",
-   "service.errorHandler.action" : "Laad {name} opnieuw",
+   "service.errorHandler.action" : "{name} herladen",
    "service.errorHandler.editAction" : "Bewerk {name}",
    "service.errorHandler.headline" : "Oh nee!",
    "service.errorHandler.message" : "Fout",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} kon niet geladen worden.",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "Begin",
    "services.welcome" : "Welkom bij Franz",
    "settings.account.account.editButton" : "Bewerk account",
@@ -117,6 +138,7 @@
    "settings.account.invoiceDownload" : "Download",
    "settings.account.manageSubscription.label" : "Beheer je abonnement",
    "settings.account.successInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.account.tryReloadServices" : "Probeer opnieuw",
    "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
    "settings.account.userInfoRequestFailed" : "Kon gebruikersinformatie niet laden",
    "settings.app.buttonClearAllCache" : "Cache legen",
@@ -129,22 +151,20 @@
    "settings.app.form.beta" : "Inclusief bètaversies",
    "settings.app.form.darkMode" : "Stap over naar de donkere kant",
    "settings.app.form.enableGPUAcceleration" : "Schakel videokaart acceleratie in ",
-   "settings.app.form.enableMenuBar" : "Toon Franz in menubalk",
    "settings.app.form.enableSpellchecking" : "Zet spellingcontrole aan",
    "settings.app.form.enableSystemTray" : "Toon Franz in de systeembalk",
-   "settings.app.form.hideDockIcon" : "Verberg Franz in Dock",
    "settings.app.form.language" : "Taal",
    "settings.app.form.minimizeToSystemTray" : "Minimaliseer Franz naar de systeembalk",
    "settings.app.form.runInBackground" : "Houd Franz op de achtergrond wanneer het venster gesloten wordt",
    "settings.app.form.showDisabledServices" : "Toon uitgeschakelde services",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
-   "settings.app.form.spellcheckerLanguage" : "Spelling checken",
    "settings.app.headline" : "Instellingen",
    "settings.app.headlineAdvanced" : "Geavanceerd",
    "settings.app.headlineAppearance" : "Weergave",
    "settings.app.headlineGeneral" : "Algemeen",
    "settings.app.headlineLanguage" : "Taal",
    "settings.app.headlineUpdates" : "Updates",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "Deze wijziging heeft een herstart nodig",
    "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Help ons om Franz te vertalen naar uw taal.",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "Nodig vrienden uit",
    "settings.navigation.logout" : "Uitloggen",
    "settings.navigation.settings" : "Instellingen",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "Jouw services",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "Alle services",
    "settings.recipes.dev" : "Ontwikkeling",
    "settings.recipes.headline" : "Beschikbare services",
@@ -192,17 +214,15 @@
    "settings.service.form.indirectMessages" : "Toon berichtenbadge voor alle nieuwe berichten",
    "settings.service.form.isMutedInfo" : "Indien uitgeschakeld zullen alle meldinggeluiden en afgespeelde audio uitgeschakeld zijn",
    "settings.service.form.name" : "Naam",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy instellingen",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "Proxy instellingen worden niet gesynchroniseerd met de Franz servers",
    "settings.service.form.proxy.isEnabled" : "Proxy gebruiken",
    "settings.service.form.proxy.password" : "Wachtwoord (optioneel)",
-   "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.port" : "Poort",
+   "settings.service.form.proxy.restartInfo" : "Start Franz opnieuw na het aanpassen van proxy instellingen.",
    "settings.service.form.proxy.user" : "Gebruiker (optioneel)",
    "settings.service.form.saveButton" : "Service opslaan",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Gehost",
    "settings.service.form.tabOnPremise" : "Zelf-gehost ��",
    "settings.service.form.team" : "Team",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "Ontdek services",
    "settings.services.headline" : "Jouw services",
    "settings.services.noServicesAdded" : "Je hebt nog geen services toegevoegd.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Service is uitgeschakeld",
    "settings.services.tooltip.isMuted" : "Alle geluiden zijn uitgeschakeld",
    "settings.services.tooltip.notificationsDisabled" : "Meldingen zijn uitgeschakeld",
    "settings.services.updatedInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Team",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
    "settings.user.form.accountType.company" : "Bedrijf",
    "settings.user.form.accountType.individual" : "Individueel",
    "settings.user.form.accountType.label" : "Accounttype",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "Voornaam",
    "settings.user.form.lastname" : "Achternaam",
    "settings.user.form.newPassword" : "Nieuw wachtwoord",
+   "settings.workspace.add.form.name" : "Naam",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Naam",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Probeer opnieuw",
+   "settings.workspaces.updatedInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "Voeg service toe",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "Schakel berichten & geluid uit",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Instellingen",
    "sidebar.unmuteApp" : "Berichten & geluid inschakelen",
    "signup.company.label" : "Bedrijf",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "Bewoners binnen EU: lokale belasting kan van toepassing zijn",
    "subscription.features.ads" : "Geen advertenties, nooit!",
    "subscription.features.comingSoon" : "komt binnenkort",
-   "subscription.features.encryptedSync" : "Beveiligde sessie synchronisatie",
    "subscription.features.noInterruptions" : "Geen haperingen & pop ups over upgrades",
-   "subscription.features.onpremise" : "Add on-geschikt\/gehoste services zoals HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.onpremise.mattermost" : "Voeg op-locatie\/gehoste diensten zoals Mattermost toe",
    "subscription.features.proxy" : "Proxy understeuning voor diensten",
    "subscription.features.spellchecker" : "Ondersteuning voor spellingscheck",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "Betaald Franz Premium Supporter Account bevat",
    "subscription.paymentSessionError" : "Kan betaalformulier niet initialiseren",
    "subscription.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
@@ -266,12 +309,23 @@
    "tabs.item.enableAudio" : "Audio inschakelen",
    "tabs.item.enableNotification" : "Meldingen inschakelen",
    "tabs.item.enableService" : "Service inschakelen",
-   "tabs.item.reload" : "Laad opnieuw",
+   "tabs.item.reload" : "Herladen",
    "validation.email" : "{field} is niet geldig",
    "validation.minLength" : "{field} moet minimaal {length} karakters lang zijn",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} is vereist",
    "validation.url" : "{field} is niet een geldige URL",
    "welcome.loginButton" : "Log in op je account",
    "welcome.signupButton" : "Maak een gratis account",
-   "welcome.slogan" : "Messaging die voor jou werkt"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Alle services",
+   "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>Franz 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/pl.json b/src/i18n/locales/pl.json
index d45e5ce24..591b13145 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -1,11 +1,23 @@
 {
    "app.errorHandler.action" : "Przeładuj",
-   "app.errorHandler.headline" : "Something went wrong",
+   "app.errorHandler.headline" : "Coś poszło nie tak",
+   "feature.announcements.changelog.headline" : "Zmiany we Franzie {version}",
    "feature.delayApp.action" : "Uzyskaj licencjÄ™ Franz Supporter",
-   "feature.delayApp.headline" : "Kup licencję Franz Supporter , aby nie czekać",
+   "feature.delayApp.headline" : "Aby nie czekać kup licencję Franz Supporter",
    "feature.delayApp.text" : "Franz będzie kontynuował za {seconds} sekund.",
+   "feature.shareFranz.action.email" : "Wyślij nam maila",
+   "feature.shareFranz.action.facebook" : "Udostępnij na Facebooku",
+   "feature.shareFranz.action.twitter" : "Udostępnij na Twitterze",
+   "feature.shareFranz.headline" : "Franz jest lepszy, gdy tworzymy go razem!",
+   "feature.shareFranz.shareText.email" : "Dodałem {count} serwisów do Franza! Pobierz darmową aplikacją WhatsApp, Messenger, Slack, Skype i inne na www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "Dodałem {count} serwisów do Franza! Pobierz darmową aplikacją WhatsApp, Messenger, Slack, Skype i inne na www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Powiedz znajomym i kolegom o tym, jak odlotowy jest Franz i pomóż nam go spopularyzować.",
    "global.api.unhealthy" : "Nie można połączyć się z usługami Franz online",
    "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 słownika",
    "import.headline" : "Importuj usługi Franz 4",
    "import.notSupportedHeadline" : "Usługi, które nie są jeszcze obsługiwane w Franz 5",
    "import.skip.label" : "Chcę dodać usługi samodzielnie",
@@ -25,18 +37,19 @@
    "login.email.label" : "Adres email",
    "login.headline" : "Zaloguj siÄ™",
    "login.invalidCredentials" : "Adres email lub hasło są błędne",
-   "login.link.password" : "Wyzeruj hasło",
+   "login.link.password" : "Przypomnij hasło",
    "login.link.signup" : "Załóż darmowe konto",
    "login.password.label" : "Hasło",
    "login.serverLogout" : "Twoja sesja wygasła, zaloguj się ponownie.",
    "login.submit.label" : "Zaloguj siÄ™",
    "login.tokenExpired" : "Twoja sesja wygasła, zaloguj się ponownie.",
    "menu.app.about" : "O Franz",
+   "menu.app.announcement" : "Co słychać?",
    "menu.app.hide" : "Ukryj",
    "menu.app.hideOthers" : "Ukryj pozostałe",
    "menu.app.quit" : "Zakończ",
    "menu.app.settings" : "Ustawienia",
-   "menu.app.unhide" : "Pokaż",
+   "menu.app.unhide" : "Pokaż więcej",
    "menu.edit" : "Edytuj",
    "menu.edit.copy" : "Skopiuj",
    "menu.edit.cut" : "Wytnij",
@@ -59,7 +72,9 @@
    "menu.help.support" : "Wsparcie",
    "menu.help.tos" : "Warunki świadczenia usług",
    "menu.services" : "Usługi",
+   "menu.services.activatePreviousService" : "WÅ‚Ä…cz poprzedni serwis",
    "menu.services.addNewService" : "Dodaj nową usługę...",
+   "menu.services.setNextServiceActive" : "WÅ‚Ä…cz kolejny serwis",
    "menu.view" : "Widok",
    "menu.view.enterFullScreen" : "Włącz tryb pełnoekranowy",
    "menu.view.exitFullScreen" : "Zakończ tryb pełnoekranowy",
@@ -68,20 +83,25 @@
    "menu.view.resetZoom" : "Domyślny rozmiar",
    "menu.view.toggleDevTools" : "Pokaż narzędzia developerskie",
    "menu.view.toggleFullScreen" : "Przełącz tryb pełnoekranowy",
-   "menu.view.toggleServiceDevTools" : "Włącz narzędzia developerskie serwisu",
+   "menu.view.toggleServiceDevTools" : "Włącz narzędzia developerskie usługi",
    "menu.view.zoomIn" : "Powiększ",
    "menu.view.zoomOut" : "Pomniejsz",
    "menu.window" : "Okno",
    "menu.window.close" : "Zamknij",
    "menu.window.minimize" : "Zminimalizuj",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Wszystkie usługi",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "Adres email",
-   "password.headline" : "Wyzeruj hasło",
+   "password.headline" : "Przypomnij hasło",
    "password.link.login" : "Zaloguj siÄ™ na swoje konto",
    "password.link.signup" : "Stwórz darmowe konto",
    "password.noUser" : "Nie znaleziono użytkownika z takim adresem email",
    "password.submit.label" : "Wyślij",
    "password.successInfo" : "Proszę sprawdzić swój email",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Ulepsz swoje konto",
    "pricing.headline" : "Wspieraj Franz",
    "pricing.link.skipPayment" : "Nie chcę wspierać rozwoju aplikacji Franz.",
    "pricing.submit.label" : "Chcę wspierać rozwój aplikacji Franz",
@@ -96,7 +116,8 @@
    "service.errorHandler.editAction" : "Edytuj {name}",
    "service.errorHandler.headline" : "O nie!",
    "service.errorHandler.message" : "BÅ‚Ä…d",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "Nie udało się załadować {name}.",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "Zacznij",
    "services.welcome" : "Witaj w programie Franz",
    "settings.account.account.editButton" : "Modyfikuj konta",
@@ -117,6 +138,7 @@
    "settings.account.invoiceDownload" : "Pobierz",
    "settings.account.manageSubscription.label" : "ZarzÄ…dzaj swoimi subskrypcjami",
    "settings.account.successInfo" : "Twoje zmiany zostały zapisane",
+   "settings.account.tryReloadServices" : "Spróbuj ponownie",
    "settings.account.tryReloadUserInfoRequest" : "Spróbuj ponownie",
    "settings.account.userInfoRequestFailed" : "Nie można wczytać informacji o użytkowniku",
    "settings.app.buttonClearAllCache" : "Wyczyść pamięć podręczną (cache)",
@@ -129,22 +151,20 @@
    "settings.app.form.beta" : "Uwzględnij wersje beta",
    "settings.app.form.darkMode" : "Przejdź na Ciemną Stronę",
    "settings.app.form.enableGPUAcceleration" : "WÅ‚Ä…cz akceleracjÄ™ GPU",
-   "settings.app.form.enableMenuBar" : "Pokaż Franz na pasku menu",
    "settings.app.form.enableSpellchecking" : "WÅ‚Ä…cz sprawdzanie pisowni",
    "settings.app.form.enableSystemTray" : "Pokaż Franza w obszarze powiadomień",
-   "settings.app.form.hideDockIcon" : "Ukrywaj ikonÄ™ Franz w zasobniku systemowym",
    "settings.app.form.language" : "Język",
    "settings.app.form.minimizeToSystemTray" : "Zminimalizuj aplikacjÄ™ Franz",
    "settings.app.form.runInBackground" : "Zachowaj aplikację Franz w tle po zamknięciu okna",
    "settings.app.form.showDisabledServices" : "Wyłącz wyświetlanie zakładek z usługami",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Pokaż licznik nieprzeczytanych wiadomości gdy powiadomienia są wyłączone",
-   "settings.app.form.spellcheckerLanguage" : "Język słownika",
    "settings.app.headline" : "Ustawienia",
    "settings.app.headlineAdvanced" : "Zaawansowane",
    "settings.app.headlineAppearance" : "WyglÄ…d",
    "settings.app.headlineGeneral" : "Ogólne",
    "settings.app.headlineLanguage" : "Język",
    "settings.app.headlineUpdates" : "Aktualizacje",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "Zmiany. wymagajÄ… ponownego uruchomienia",
    "settings.app.subheadlineCache" : "Pamięć podręczna",
    "settings.app.translationHelp" : "Pomóż nam tłumaczyć Franz na Twój język.",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "ZaproÅ› znajomych",
    "settings.navigation.logout" : "Wyloguj",
    "settings.navigation.settings" : "Ustawienia",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "Twoje usługi",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "Wszystkie usługi",
    "settings.recipes.dev" : "Rozwojowe",
    "settings.recipes.headline" : "Dostępne usługi",
@@ -192,17 +214,15 @@
    "settings.service.form.indirectMessages" : "Pokaż ikonę wiadomości dla wszystkich nowych wiadomości",
    "settings.service.form.isMutedInfo" : "Kiedy nieaktywne, wszystkie dźwięki powiadomień są wyciszone",
    "settings.service.form.name" : "Nazwa",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "Ustawienia Proxy HTTP\/HTTPS",
    "settings.service.form.proxy.host" : "Host Proxy\/IP",
    "settings.service.form.proxy.info" : "Ustawienia proxy nie będą zsynchronizowane z serwerami Franza.",
    "settings.service.form.proxy.isEnabled" : "Użyj Proxy",
    "settings.service.form.proxy.password" : "Hasło (opcjonalnie)",
    "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.restartInfo" : "Uruchom ponownie Franz po zmianie ustawień proxy.",
    "settings.service.form.proxy.user" : "Użytkownik (opcjonalnie)",
    "settings.service.form.saveButton" : "Zapisz usługę",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hostowane",
    "settings.service.form.tabOnPremise" : "Hostowane lokalnie ��",
    "settings.service.form.team" : "Zespół",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "Przeglądaj usługi",
    "settings.services.headline" : "Twoje usługi",
    "settings.services.noServicesAdded" : "Nie dodałeś jeszcze żadnych usług.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Usługa jest nieaktywna",
    "settings.services.tooltip.isMuted" : "Wszystkie dźwięki są wyciszone",
    "settings.services.tooltip.notificationsDisabled" : "Powiadomienia sÄ… nieaktywne",
    "settings.services.updatedInfo" : "Zmiany zostały zapisane",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Zespół",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
    "settings.user.form.accountType.company" : "Firma",
    "settings.user.form.accountType.individual" : "Prywatne",
    "settings.user.form.accountType.label" : "Typ konta",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "ImiÄ™",
    "settings.user.form.lastname" : "Nazwisko",
    "settings.user.form.newPassword" : "Nowe hasło",
+   "settings.workspace.add.form.name" : "Name",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Name",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Spróbuj ponownie",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "Dodaj kolejną usługę",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "Wyłącz powiadomienia i dźwięki",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Ustawienia",
    "sidebar.unmuteApp" : "Włącz powiadomienia i dźwięki",
    "signup.company.label" : "Firma",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "Rezydenci UE: lokalne stawki VAT mogą zostać zaaplikowane",
    "subscription.features.ads" : "Brak reklam, na zawsze!",
    "subscription.features.comingSoon" : "wkrótce dostępne",
-   "subscription.features.encryptedSync" : "Szyfrowana synchronizacja sesji",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Dodawanie lokalnych\/hostowanych usług takich jak HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.noInterruptions" : "Bez opóźnień i przypominania o ulepszeniu licencji",
+   "subscription.features.onpremise.mattermost" : "Dodaj prywatnie hostowane usługi takie jak Mattermost",
    "subscription.features.proxy" : "Obsługa proxy dla usług",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.spellchecker" : "Wsparcie dla sprawdzania pisowni",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "PÅ‚atne konto Franz Premium obejmuje",
    "subscription.paymentSessionError" : "Nie można wczytać formularza płatności\"",
    "subscription.submit.label" : "Chcę wspierać rozwój aplikacji Franz",
@@ -269,9 +312,20 @@
    "tabs.item.reload" : "Przeładuj",
    "validation.email" : "Pole {field} nie jest poprawne",
    "validation.minLength" : "Pole {field} powinno składać się z co najmniej {length} znaków",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "Pole {field} jest wymagane",
    "validation.url" : "Pole {field} nie jest poprawnym ciÄ…giem URL.",
    "welcome.loginButton" : "Zaloguj siÄ™ na swoje konto",
    "welcome.signupButton" : "Stwórz darmowe konto",
-   "welcome.slogan" : "Komunikator który działa"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Wszystkie usługi",
+   "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>Franz 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/pt-BR.json b/src/i18n/locales/pt-BR.json
index c0cf0039f..4ad2fac08 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -1,11 +1,23 @@
 {
    "app.errorHandler.action" : "Recarregar",
-   "app.errorHandler.headline" : "Something went wrong",
+   "app.errorHandler.headline" : "Alguma coisa deu errado",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
    "feature.delayApp.action" : "Adquira uma licença Franz Supporter",
    "feature.delayApp.headline" : "Por favor, adquira uma licença Franz Supporter para pular o tempo de espera",
    "feature.delayApp.text" : "Franz continuará em {seconds} segundos.",
+   "feature.shareFranz.action.email" : "Enviar como e-mail",
+   "feature.shareFranz.action.facebook" : "Compartilhar no Facebook",
+   "feature.shareFranz.action.twitter" : "Compartilhar no Twitter",
+   "feature.shareFranz.headline" : "Franz é melhor em grupo!",
+   "feature.shareFranz.shareText.email" : "Eu adicionei {count} serviços ao Franz! Adquira o aplicativo gratuito para WhatsApp, Messenger, Slack, Skype e mais em www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Conte aos seus amigos e colegas o quão incrível Franz é e nos ajude a espalhar a mensagem.  ",
    "global.api.unhealthy" : "Não foi possível conectar-se aos serviços on-line do Franz.",
    "global.notConnectedToTheInternet" : "Você não está conectado à internet",
+   "global.spellchecker.useDefault" : "Use o padrão do sistema ({default})",
+   "global.spellchecking.autodetect" : "Detectar linguagem automaticamente.",
+   "global.spellchecking.autodetect.short" : "Automático",
+   "global.spellchecking.language" : "Idioma de verificação ortográfica",
    "import.headline" : "Importe seus serviços do Franz 4 ",
    "import.notSupportedHeadline" : "Serviços ainda não suportados pelo Franz 5 ",
    "import.skip.label" : "Quero adicionar serviços manualmente",
@@ -32,6 +44,7 @@
    "login.submit.label" : "Entrar",
    "login.tokenExpired" : "Sua sessão expirou, faça o login novamente.",
    "menu.app.about" : "Sobre Franz",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Ocultar",
    "menu.app.hideOthers" : "Ocultar Outros",
    "menu.app.quit" : "Sair",
@@ -59,7 +72,9 @@
    "menu.help.support" : "Suporte",
    "menu.help.tos" : "Termos de Serviço",
    "menu.services" : "Serviços",
+   "menu.services.activatePreviousService" : "Pular para serviço anterior",
    "menu.services.addNewService" : "Adicionar Novo Serviço",
+   "menu.services.setNextServiceActive" : "Pular para próximo serviço",
    "menu.view" : "Visualizar ",
    "menu.view.enterFullScreen" : "Modo Tela Cheia",
    "menu.view.exitFullScreen" : "Sair da Tela Cheia",
@@ -74,6 +89,11 @@
    "menu.window" : "Modo Janela",
    "menu.window.close" : "Fechar",
    "menu.window.minimize" : "Minimizar",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Todos os serviços",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "E-mail",
    "password.headline" : "Trocar senha",
    "password.link.login" : "Fazer login na sua conta",
@@ -96,7 +116,8 @@
    "service.errorHandler.editAction" : "Editar {name}",
    "service.errorHandler.headline" : "Ah, não!",
    "service.errorHandler.message" : "Erro",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} não pôde ser carregado.",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "Iniciar",
    "services.welcome" : "Bem-vindo ao Franz!",
    "settings.account.account.editButton" : "Editar conta",
@@ -117,7 +138,8 @@
    "settings.account.invoiceDownload" : "Baixar",
    "settings.account.manageSubscription.label" : "Gerencie a sua assinatura",
    "settings.account.successInfo" : "Suas alterações foram gravadas",
-   "settings.account.tryReloadUserInfoRequest" : "Tente novamente",
+   "settings.account.tryReloadServices" : "Tente novamente",
+   "settings.account.tryReloadUserInfoRequest" : "Tentar novamente",
    "settings.account.userInfoRequestFailed" : "Não foi possível carregar as informações do usuário",
    "settings.app.buttonClearAllCache" : "Limpar cache",
    "settings.app.buttonInstallUpdate" : "Reiniciar e instalar atualização",
@@ -129,24 +151,22 @@
    "settings.app.form.beta" : "Incluir versões beta",
    "settings.app.form.darkMode" : "Venha para o Lado Negro da força",
    "settings.app.form.enableGPUAcceleration" : "Ativar Aceleração de GPU",
-   "settings.app.form.enableMenuBar" : "Mostrar Franz na Barra de Menu",
    "settings.app.form.enableSpellchecking" : "Ativar correção ortográfica",
    "settings.app.form.enableSystemTray" : "Exibir o Franz na barra de sistema",
-   "settings.app.form.hideDockIcon" : "Ocultar ícone do Franz no Dock",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a área de sistema",
    "settings.app.form.runInBackground" : "Manter o Franz no fundo quando fechar a janela",
    "settings.app.form.showDisabledServices" : "Mostrar abas de serviços desativados",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Mostrar ícone de mensagem não lida quando as notificações estiverem desativadas",
-   "settings.app.form.spellcheckerLanguage" : "Idioma de verificação ortográfica",
    "settings.app.headline" : "Configurações",
    "settings.app.headlineAdvanced" : "Avançado",
    "settings.app.headlineAppearance" : "Aparência",
    "settings.app.headlineGeneral" : "Geral",
    "settings.app.headlineLanguage" : "Idioma",
    "settings.app.headlineUpdates" : "Atualizações",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "As atualizações exigem reiniciar o sistema",
-   "settings.app.subheadlineCache" : "Cachê",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Ajude-nos a traduzir o Franz para seu idioma.",
    "settings.app.updateStatusAvailable" : "Atualização disponível, baixando...",
    "settings.app.updateStatusSearching" : "Buscando atualizações",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "Convidar Amigos",
    "settings.navigation.logout" : "Sair",
    "settings.navigation.settings" : "Ajustes",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "Seus serviços",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "Todos os serviços",
    "settings.recipes.dev" : "Desenvolvimento",
    "settings.recipes.headline" : "Serviços disponíveis",
@@ -192,17 +214,15 @@
    "settings.service.form.indirectMessages" : "Mostrar avisos para todas as mensagens",
    "settings.service.form.isMutedInfo" : "Quando desativado, as notificações sonoras e áudios ficarão em silêncio",
    "settings.service.form.name" : "Nome",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
+   "settings.service.form.proxy.headline" : "Configurações de HTTP\/HTTPS Proxy",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
    "settings.service.form.proxy.info" : "As configurações de proxy não serão sincronizadas com os servidores do Franz.",
    "settings.service.form.proxy.isEnabled" : "Usar o Proxy",
    "settings.service.form.proxy.password" : "Senha (opcional)",
-   "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.port" : "Porta",
+   "settings.service.form.proxy.restartInfo" : "Por favor, reinicie o Franz após alterar as configurações de proxy.",
    "settings.service.form.proxy.user" : "Usuário (opcional)",
    "settings.service.form.saveButton" : "Salvar serviço",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hospedado",
    "settings.service.form.tabOnPremise" : "Auto-hospedado ��",
    "settings.service.form.team" : "Equipe",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "Descobrir serviços",
    "settings.services.headline" : "Seus serviços",
    "settings.services.noServicesAdded" : "Você ainda não adicionou nenhum serviço.",
+   "settings.services.servicesRequestFailed" : "Não foi possível carregar os seus serviços",
    "settings.services.tooltip.isDisabled" : "O serviço está desativado",
    "settings.services.tooltip.isMuted" : "Sem som",
    "settings.services.tooltip.notificationsDisabled" : "Notificações desativadas",
    "settings.services.updatedInfo" : "Suas mudanças foram gravadas",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Equipe",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
    "settings.user.form.accountType.company" : "Empresa",
    "settings.user.form.accountType.individual" : "Pessoal",
    "settings.user.form.accountType.label" : "Tipo de conta",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "Nome",
    "settings.user.form.lastname" : "Sobrenome",
    "settings.user.form.newPassword" : "Nova senha",
+   "settings.workspace.add.form.name" : "Nome",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Nome",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Try again",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "Adicionar novo serviço",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "Desativar notificações e áudio",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Ajustes",
    "sidebar.unmuteApp" : "Ativar notificações e áudio",
    "signup.company.label" : "Empresa",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "Residentes na União Europeia: taxas locais serão aplicadas",
    "subscription.features.ads" : "Sem anúncios, pra sempre!",
    "subscription.features.comingSoon" : "em breve",
-   "subscription.features.encryptedSync" : "Sincronização encriptada das sessões",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Adicionar serviços locais\/hospedados como o HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.noInterruptions" : "Sem demora e sem chateação para comprar uma licença. ",
+   "subscription.features.onpremise.mattermost" : "Adicionar serviços locais\/hospedados como o Mattermost",
    "subscription.features.proxy" : "Suporte de proxy para serviços",
    "subscription.features.spellchecker" : "Suporte para corretor ortográfico",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "A conta Apoiador Franz Premium inclui",
    "subscription.paymentSessionError" : "Não foi possível abrir o formulário de pagamento",
    "subscription.submit.label" : "Eu quero apoiar o desenvolvimento do Franz",
@@ -269,9 +312,20 @@
    "tabs.item.reload" : "Recarregar",
    "validation.email" : "inválido",
    "validation.minLength" : "{campo} deve ter pelo menos {comprimento} mais caracteres ",
+   "validation.oneRequired" : "Necessário pelo menos um",
    "validation.required" : "{campo} obrigatório",
    "validation.url" : "{campo} essa URL não é válida",
    "welcome.loginButton" : "Entrar na sua conta",
    "welcome.signupButton" : "Criar uma conta grátis",
-   "welcome.slogan" : "Mensagens que funcionam para você"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Todos os serviços",
+   "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>Franz 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/pt.json b/src/i18n/locales/pt.json
index 80e8094f5..302284ab8 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -1,14 +1,26 @@
 {
    "app.errorHandler.action" : "Recarregar",
-   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.headline" : "Alguma coisa correu mal",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "feature.delayApp.action" : "Faz parte do grupo de apoio do Franz",
+   "feature.delayApp.headline" : "Por favor compre uma licença Franz Supporter para saltar a fila de espera",
+   "feature.delayApp.text" : "Franz irá continuar em {seconds} segundos.",
+   "feature.shareFranz.action.email" : "Enviar por e-mail",
+   "feature.shareFranz.action.facebook" : "Compartilahr no Facebook",
+   "feature.shareFranz.action.twitter" : "Compartilhar no Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Não foi possível estabelecer ligação aos serviços do Franz",
-   "global.notConnectedToTheInternet" : "Não existe ligação à Internet",
-   "import.headline" : "Importe os seus serviços do Franz 4",
-   "import.notSupportedHeadline" : "Serviços ainda não suportados pelo Franz 5",
-   "import.skip.label" : "Pretendo adicionar serviços manualmente",
+   "global.notConnectedToTheInternet" : "Não estás ligado à Internet",
+   "global.spellchecker.useDefault" : "Utilizar o Sistema por Omissão ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Linguagem para correção ortográfica",
+   "import.headline" : "Importa os teus serviços do Franz",
+   "import.notSupportedHeadline" : "Estes serviços ainda não são suportados pelo Franz 5",
+   "import.skip.label" : "Eu quero adicionar serviços manualmente",
    "import.submit.label" : "Importar serviços",
    "infobar.buttonChangelog" : "O que há de novo?",
    "infobar.buttonInstallUpdate" : "Reiniciar e instalar atualizações",
@@ -32,6 +44,7 @@
    "login.submit.label" : "Iniciar sessão",
    "login.tokenExpired" : "A sua sessão expirou, inicie sessão novamente.",
    "menu.app.about" : "Sobre o Franz",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Ocultar",
    "menu.app.hideOthers" : "Ocultar Outros",
    "menu.app.quit" : "Sair",
@@ -59,14 +72,16 @@
    "menu.help.support" : "Suporte",
    "menu.help.tos" : "Termos do Serviço",
    "menu.services" : "Serviços",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Adicionar Novo Serviço...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Ver",
    "menu.view.enterFullScreen" : "Ativar Modo de Ecrã Completo",
    "menu.view.exitFullScreen" : "Sair do Modo de Ecrã Completo",
    "menu.view.reloadFranz" : "Recarregar Franz",
    "menu.view.reloadService" : "Recarregar serviço",
    "menu.view.resetZoom" : "Tamanho Real",
-   "menu.view.toggleDevTools" : "Activar\/Desativar Ferramentas de Desenvolvimento",
+   "menu.view.toggleDevTools" : "Ativar\/Desativar Ferramentas de Desenvolvimento",
    "menu.view.toggleFullScreen" : "Ativar\/Desativar Ecrã Completo",
    "menu.view.toggleServiceDevTools" : "Ativar\/Desativar Ferramentas de Desenvolvimento de Serviços",
    "menu.view.zoomIn" : "Aumentar",
@@ -74,6 +89,11 @@
    "menu.window" : "Janela",
    "menu.window.close" : "Fechar",
    "menu.window.minimize" : "Minimizar",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Todos os serviços",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "Endereço de e-mail",
    "password.headline" : "Repor a minha palavra-passe",
    "password.link.login" : "Iniciar sessão",
@@ -81,7 +101,7 @@
    "password.noUser" : "Não existe nenhuma conta associada a esse endereço de e-mail",
    "password.submit.label" : "Submeter",
    "password.successInfo" : "Por favor verifique o seu endereço de e-mail",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Atualiza a tua conta",
    "pricing.headline" : "Apoie o Franz",
    "pricing.link.skipPayment" : "Não pretendo patrocinar o desenvolvimento do Franz",
    "pricing.submit.label" : "Pretendo patrocinar o desenvolvimento do Franz",
@@ -96,11 +116,12 @@
    "service.errorHandler.editAction" : "Editar {name}",
    "service.errorHandler.headline" : "Oh não!",
    "service.errorHandler.message" : "Erro",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} falhou o carregamento",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "Vamos começar",
    "services.welcome" : "Bem-vindo ao Franz",
    "settings.account.account.editButton" : "Editar conta",
-   "settings.account.accountType.basic" : "Conta básica",
+   "settings.account.accountType.basic" : "Conta Básica",
    "settings.account.accountType.premium" : "Conta Premium",
    "settings.account.buttonSave" : "Atualizar o perfil",
    "settings.account.deleteAccount" : "Apagar conta",
@@ -117,6 +138,7 @@
    "settings.account.invoiceDownload" : "Transferir",
    "settings.account.manageSubscription.label" : "Gerir as minhas subscrições",
    "settings.account.successInfo" : "As suas alterações foram efetuadas com sucesso",
+   "settings.account.tryReloadServices" : "Tentar novamente",
    "settings.account.tryReloadUserInfoRequest" : "Tentar novamente",
    "settings.account.userInfoRequestFailed" : "Não é possível carregar a informação do utilizador",
    "settings.app.buttonClearAllCache" : "Limpar cache",
@@ -127,45 +149,45 @@
    "settings.app.form.autoLaunchInBackground" : "Abrir em segundo plano",
    "settings.app.form.autoLaunchOnStart" : "Iniciar o Franz após iniciar o computador",
    "settings.app.form.beta" : "Incluir versões instáveis (beta)",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Junta-te ao Lado Negro",
    "settings.app.form.enableGPUAcceleration" : "Activar Aceleração de GPU",
-   "settings.app.form.enableMenuBar" : "Mostrar Franz na Barra de Menu",
    "settings.app.form.enableSpellchecking" : "Ativar verificação ortográfica",
    "settings.app.form.enableSystemTray" : "Mostrar o Franz na barra do sistema",
-   "settings.app.form.hideDockIcon" : "Esconder ícone na Dock",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a barra do sistema",
    "settings.app.form.runInBackground" : "Manter o Franz em segundo plano ao fechar a janela",
    "settings.app.form.showDisabledServices" : "Apresentar separadores de serviços desativados",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Apresentar emblema com o número de mensagens não lidas quando as notificações estão desativadas",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Definições",
    "settings.app.headlineAdvanced" : "Avançado",
    "settings.app.headlineAppearance" : "Aparência",
    "settings.app.headlineGeneral" : "Geral",
    "settings.app.headlineLanguage" : "Idioma",
    "settings.app.headlineUpdates" : "Atualizações",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "Alterações requerem reinício",
    "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Ajude-nos a traduzir a Franz para a sua língua.",
    "settings.app.updateStatusAvailable" : "Atualização disponivel, a transferir...",
    "settings.app.updateStatusSearching" : "A procurar atualizações",
    "settings.app.updateStatusUpToDate" : "Está a usar a versão mais recente do Franz",
-   "settings.invite.headline" : "Convide amigos",
+   "settings.invite.headline" : "Convide Amigos",
    "settings.navigation.account" : "Conta",
    "settings.navigation.availableServices" : "Serviços disponíveis",
-   "settings.navigation.inviteFriends" : "Convide amigos",
+   "settings.navigation.inviteFriends" : "Convide Amigos",
    "settings.navigation.logout" : "Terminar sessão",
    "settings.navigation.settings" : "Definições",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "Os seus serviços",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "Todos os serviços",
    "settings.recipes.dev" : "Desenvolvimento",
    "settings.recipes.headline" : "Serviços disponíveis",
    "settings.recipes.missingService" : "Falta um serviço?",
    "settings.recipes.mostPopular" : "Os mais populares",
-   "settings.recipes.nothingFound" : "Lamentamos, nenhum serviço corresponde ao pesquisado.",
-   "settings.recipes.servicesSuccessfulAddedInfo" : "Serviço adicionado",
-   "settings.searchService" : "Pesquisa de serviço",
+   "settings.recipes.nothingFound" : "Lamentamos, nenhum serviço corresponde ao termo pesquisado.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Serviço adicionado com sucesso",
+   "settings.searchService" : "Pesquisar erviço",
    "settings.service.error.goBack" : "Voltar aos serviços",
    "settings.service.error.headline" : "Erro",
    "settings.service.error.message" : "Não foi possível carregar a receita do serviço.",
@@ -179,30 +201,28 @@
    "settings.service.form.editServiceHeadline" : "Editar {name}",
    "settings.service.form.enableAudio" : "Ativar áudio",
    "settings.service.form.enableBadge" : "Mostrar emblemas de mensagens não lidas",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Ativar o Tema Escuro",
    "settings.service.form.enableNotification" : "Ativar notificações",
    "settings.service.form.enableService" : "Ativar serviço",
    "settings.service.form.headlineBadges" : "Emblema de mensagem não lida",
    "settings.service.form.headlineGeneral" : "Geral",
    "settings.service.form.headlineNotifications" : "Notificações",
-   "settings.service.form.icon" : "Personalizar ícone",
+   "settings.service.form.icon" : "�cone personalizado",
    "settings.service.form.iconDelete" : "Apagar",
    "settings.service.form.iconUpload" : "Arraste a sua imagem, ou clique aqui",
    "settings.service.form.indirectMessageInfo" : "Será notificado sobre todas as novas mensagens num canal, não apenas @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Mostrar o emblema da mensagem para todas as novas mensagens",
    "settings.service.form.isMutedInfo" : "Quando desativado, todos sons e reproduções de áudio serão silenciados",
    "settings.service.form.name" : "Nome",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
-   "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
-   "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.headline" : "Definições HTTP\/HTTPS Proxy",
+   "settings.service.form.proxy.host" : "Host\/IP proxy",
+   "settings.service.form.proxy.info" : "As definições do proxy não serão guardadas nos servidores do Franz.",
+   "settings.service.form.proxy.isEnabled" : "Usar Proxy",
+   "settings.service.form.proxy.password" : "Palavra-chave (opcional)",
+   "settings.service.form.proxy.port" : "Porta",
+   "settings.service.form.proxy.restartInfo" : "Reinicie, por favor, após atualizar as definições do Franz",
+   "settings.service.form.proxy.user" : "Utilizador (opcional)",
    "settings.service.form.saveButton" : "Guardar serviço",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Com domínio",
    "settings.service.form.tabOnPremise" : "Com domínio próprio ��",
    "settings.service.form.team" : "Equipa",
@@ -211,11 +231,18 @@
    "settings.services.deletedInfo" : "O serviço foi apagado",
    "settings.services.discoverServices" : "Descobrir serviços",
    "settings.services.headline" : "Os seus serviços",
-   "settings.services.noServicesAdded" : "Ainda não adicionou um serviço.",
+   "settings.services.noServicesAdded" : "Ainda não adicionou nenhum serviço.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "O serviço está desativado",
    "settings.services.tooltip.isMuted" : "Todos os sons estão silenciados",
    "settings.services.tooltip.notificationsDisabled" : "As notificações estão desativadas",
    "settings.services.updatedInfo" : "As alterações foram guardadas",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Equipa",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
    "settings.user.form.accountType.company" : "Empresa",
    "settings.user.form.accountType.individual" : "Indivíduo",
    "settings.user.form.accountType.label" : "Tipo de conta",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "Primeiro Nome",
    "settings.user.form.lastname" : "Último Nome",
    "settings.user.form.newPassword" : "Nova palavra-passe",
+   "settings.workspace.add.form.name" : "Nome",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Nome",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Tentar novamente",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "Adicionar um novo serviço",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "Desativar notificações e áudio",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Definições",
    "sidebar.unmuteApp" : "Ativar notificações e áudio",
    "signup.company.label" : "Empresa",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "Residentes EU: Taxas locais podem ser aplicadas",
    "subscription.features.ads" : "Sem anúncios, para sempre!",
    "subscription.features.comingSoon" : "em breve",
-   "subscription.features.encryptedSync" : "Sincronização encriptada de sessão",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Adicionar serviços 'on-premise'\/hosted como o HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.noInterruptions" : "Sem atrasos na aplicação nem mensagens para comprar uma licença",
+   "subscription.features.onpremise.mattermost" : "Adicione serviços como Mattermost no local ou online",
+   "subscription.features.proxy" : "Suporte Proxy para os serviços",
+   "subscription.features.spellchecker" : "Suporte para correção ortográfica",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "Ao subscrever uma Conta Premium, tem acesso a",
    "subscription.paymentSessionError" : "Erro no serviço de pagamento",
    "subscription.submit.label" : "Pretendo ajudar o desenvolvimento do Franz",
@@ -268,10 +311,21 @@
    "tabs.item.enableService" : "Ativar serviço",
    "tabs.item.reload" : "Recarregar",
    "validation.email" : "{field} não é válido",
-   "validation.minLength" : "{field} deveria ter pelo menos {comprimento} caracteres",
+   "validation.minLength" : "{field} deveria ter pelo menos {length} caracteres",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} é obrigatório",
    "validation.url" : "{field} não é uma hiperligação válida",
    "welcome.loginButton" : "Iniciar sessão",
    "welcome.signupButton" : "Criar uma conta gratuita",
-   "welcome.slogan" : "Sistema de mensagens feito para si"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Todos os serviços",
+   "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>Franz 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 b605afc4d..97ad98361 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -1,11 +1,23 @@
 {
    "app.errorHandler.action" : "Перезагрузить",
-   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "app.errorHandler.headline" : "Что-то пошло не так",
+   "feature.announcements.changelog.headline" : "Изменени� в вер�ии Franz {version}",
+   "feature.delayApp.action" : "Получите лицензию Franz Supporter",
+   "feature.delayApp.headline" : "Пожалуй�та приобретите лицензию Franz Supporter чтобы убрать ожидание",
+   "feature.delayApp.text" : "Franz продолжит работу через {seconds} �екунд.",
+   "feature.shareFranz.action.email" : "Отправить email",
+   "feature.shareFranz.action.facebook" : "Поделить�� на Facebook",
+   "feature.shareFranz.action.twitter" : "Поделить�� в Twitter",
+   "feature.shareFranz.headline" : "Сделаем Franz лучше вме�те!",
+   "feature.shareFranz.shareText.email" : "Я добавил {count} �ерви�ов во Franz! Теперь до�тупны такие ме��енджеры как WhatsApp, Messenger, Slack, Skype и другие. Полый �пи�ок вы найдете на www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "Я добавил {count} �ерви�(ов) в Franz! Скачай бе�платную аппку дл� WhatsApp, Messenger, Slack, Skype и иже на www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Ра��кажи �воим друзь�м и коллегам на�колько преле�тен Franz и помоги нам развить��",
    "global.api.unhealthy" : "�евозможно подключить�� к онлайн-�ерви�ам Franz",
    "global.notConnectedToTheInternet" : "Вы не подключены к �ети Интернет",
+   "global.spellchecker.useDefault" : "И�пользовать �и�темные параметры по умолчанию ({default})",
+   "global.spellchecking.autodetect" : "�айти �зык автоматиче�ки",
+   "global.spellchecking.autodetect.short" : "�вто",
+   "global.spellchecking.language" : "Проверка правопи�ани�",
    "import.headline" : "Импортировать ваши �ерви�ы из Franz 4",
    "import.notSupportedHeadline" : "Серви�ы пока ещё не поддерживают�� в Franz 5",
    "import.skip.label" : "Я хочу добавить �ерви�ы вручную",
@@ -32,6 +44,7 @@
    "login.submit.label" : "Вход",
    "login.tokenExpired" : "Се��и� у�тарела, пожалуй�та, войдите �нова.",
    "menu.app.about" : "О Franz",
+   "menu.app.announcement" : "Что нового?",
    "menu.app.hide" : "Скрыть",
    "menu.app.hideOthers" : "Скрыть о�тальные",
    "menu.app.quit" : "Выйти",
@@ -58,8 +71,10 @@
    "menu.help.privacy" : "Политика конфиденциально�ти",
    "menu.help.support" : "Поддержка",
    "menu.help.tos" : "У�лови� и�пользовани�",
-   "menu.services" : "Службы",
+   "menu.services" : "Серви�",
+   "menu.services.activatePreviousService" : "�ктивировать предыдущий �ервич",
    "menu.services.addNewService" : "Добавить новый �ерви�...",
+   "menu.services.setNextServiceActive" : "�ктивировать �ледующий �ерви�",
    "menu.view" : "Вид",
    "menu.view.enterFullScreen" : "�а ве�ь �кран",
    "menu.view.exitFullScreen" : "В окне",
@@ -74,6 +89,11 @@
    "menu.window" : "Окно",
    "menu.window.close" : "Закрыть",
    "menu.window.minimize" : "Свернуть",
+   "menu.workspaces" : "Окружение",
+   "menu.workspaces.addNewWorkspace" : "Добавить �овое Окружение...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Закрыть меню окружений",
+   "menu.workspaces.defaultWorkspace" : "В�е �ерви�ы",
+   "menu.workspaces.openWorkspaceDrawer" : "Открыть меню окружений",
    "password.email.label" : "�дре� �лектронной почты",
    "password.headline" : "Сбро�ить пароль",
    "password.link.login" : "Вход",
@@ -81,7 +101,7 @@
    "password.noUser" : "�е найдено пользовател� � таким адре�ом �лектронной почты",
    "password.submit.label" : "Прин�ть",
    "password.successInfo" : "Проверьте вашу �лектронную почту",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Перейти на платную подпи�ку",
    "pricing.headline" : "Поддержать Franz",
    "pricing.link.skipPayment" : "Я не хочу поддерживать разработку Franz.",
    "pricing.submit.label" : "Я хочу поддержать разработку Franz",
@@ -96,7 +116,8 @@
    "service.errorHandler.editAction" : "Редактирование {name}",
    "service.errorHandler.headline" : "О, нет!",
    "service.errorHandler.message" : "Ошибка",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} не �мог загрузить��.",
+   "service.webviewLoader.loading" : "Загрузка",
    "services.getStarted" : "�ачать работу",
    "services.welcome" : "Добро пожаловать во Franz",
    "settings.account.account.editButton" : "Редактировать аккаунт",
@@ -108,7 +129,7 @@
    "settings.account.deleteInfo" : "Е�ли вам больше не нужна ваша учетна� запи�ь в Franz, вы можете удалить аккаунт и в�ю �в�занную � ней информацию.",
    "settings.account.headline" : "�ккаунт",
    "settings.account.headlineAccount" : "Информаци� аккаунта",
-   "settings.account.headlineDangerZone" : "Опа�на� Зона",
+   "settings.account.headlineDangerZone" : "Запретна� Зона",
    "settings.account.headlineInvoices" : "Счета",
    "settings.account.headlinePassword" : "Сменить пароль",
    "settings.account.headlineProfile" : "Обновить профиль",
@@ -117,6 +138,7 @@
    "settings.account.invoiceDownload" : "Скачать",
    "settings.account.manageSubscription.label" : "Управление вашей подпи�кой",
    "settings.account.successInfo" : "Ваши изменени� были �охранены",
+   "settings.account.tryReloadServices" : "Попробовать �нова",
    "settings.account.tryReloadUserInfoRequest" : "Попробовать �нова",
    "settings.account.userInfoRequestFailed" : "�евозможно загрузить информацию пользовател�",
    "settings.app.buttonClearAllCache" : "Очи�тить к�ш",
@@ -127,24 +149,22 @@
    "settings.app.form.autoLaunchInBackground" : "Открывать в фоне",
    "settings.app.form.autoLaunchOnStart" : "Запу�кать Franz при �тарте",
    "settings.app.form.beta" : "Включа� бета вер�ии",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Перейти на Тёмную �торону",
    "settings.app.form.enableGPUAcceleration" : "Включить у�корение GPU",
-   "settings.app.form.enableMenuBar" : "Показывать Franz на панели меню",
    "settings.app.form.enableSpellchecking" : "Включить проверку правопи�ани�",
    "settings.app.form.enableSystemTray" : "Показывать Franz в �и�темном трее",
-   "settings.app.form.hideDockIcon" : "Спр�тать иконку Franz на панели",
    "settings.app.form.language" : "Язык",
    "settings.app.form.minimizeToSystemTray" : "Сворачивать Franz в �и�темный трей",
    "settings.app.form.runInBackground" : "О�тавл�ть Franz в фоне при закрытии окна",
    "settings.app.form.showDisabledServices" : "Показывать вкладки отключённых �лужб",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Показывать значок непрочитанного �ообщени� при отключённых уведомлени�х",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "�а�тройки",
    "settings.app.headlineAdvanced" : "Дополнительно",
    "settings.app.headlineAppearance" : "Внешний вид",
    "settings.app.headlineGeneral" : "Общие",
    "settings.app.headlineLanguage" : "Язык",
    "settings.app.headlineUpdates" : "Обновлени�",
+   "settings.app.languageDisclaimer" : "Официальна� поддержка только дл� англий�кого и немецкого �зыков. О�тальные �зыки переведены �ообще�твом.",
    "settings.app.restartRequired" : "Изменени� требуют перезагрузки приложени�",
    "settings.app.subheadlineCache" : "К�ш",
    "settings.app.translationHelp" : "Помогите нам переве�ти Franz на ваш �зык.",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "Пригла�ить друзей",
    "settings.navigation.logout" : "Выход",
    "settings.navigation.settings" : "�а�тройки",
+   "settings.navigation.team" : "Управление Командой",
    "settings.navigation.yourServices" : "Ваши �ерви�ы",
+   "settings.navigation.yourWorkspaces" : "Ваши окружени�",
    "settings.recipes.all" : "В�е �ерви�ы",
    "settings.recipes.dev" : "Разработка",
    "settings.recipes.headline" : "До�тупные �ерви�ы",
@@ -176,10 +198,10 @@
    "settings.service.form.customUrlUpgradeAccount" : "Улучшить ваш аккаунт",
    "settings.service.form.customUrlValidationError" : "�евозможно проверить �ервер {name}.",
    "settings.service.form.deleteButton" : "Удалить �ерви�",
-   "settings.service.form.editServiceHeadline" : "Редактирование {name}",
+   "settings.service.form.editServiceHeadline" : "Редактировать {name}",
    "settings.service.form.enableAudio" : "Включить звук",
    "settings.service.form.enableBadge" : "Показывать иконку непрочитанных �ообщений",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Включить Тёмный режим",
    "settings.service.form.enableNotification" : "Включить уведомлени�",
    "settings.service.form.enableService" : "Включить �ерви�",
    "settings.service.form.headlineBadges" : "Значки непрочитанных �ообщений",
@@ -192,17 +214,15 @@
    "settings.service.form.indirectMessages" : "Показывать значок уведомлений дл� в�ех новых �ообщений",
    "settings.service.form.isMutedInfo" : "Когда выключено, в�е звуковые уведомлени� будут отключены",
    "settings.service.form.name" : "�азвание",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
-   "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
-   "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.headline" : "�а�тройки Прок�и HTTP\/HTTPS",
+   "settings.service.form.proxy.host" : "Прок�и Host\/IP",
+   "settings.service.form.proxy.info" : "�а�тройки прок�и не будут �инхронизированны � �ерверами Franz",
+   "settings.service.form.proxy.isEnabled" : "И�пользовать прок�и",
+   "settings.service.form.proxy.password" : "Пароль (опционально)",
+   "settings.service.form.proxy.port" : "Порт",
+   "settings.service.form.proxy.restartInfo" : "Пожалуй�та перезапу�тите Franz по�ле изменени� на�троек прок�и.",
+   "settings.service.form.proxy.user" : "Пользователь (опционально)",
    "settings.service.form.saveButton" : "Сохранить �ерви�",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Размещено",
    "settings.service.form.tabOnPremise" : "Свой хо�тинг ��",
    "settings.service.form.team" : "Команда",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "�айти �ерви�ы",
    "settings.services.headline" : "Ваши �ерви�ы",
    "settings.services.noServicesAdded" : "Вы пока не добавили никаких �ерви�ов.",
+   "settings.services.servicesRequestFailed" : "Ошибка загрузки �ерви�ов",
    "settings.services.tooltip.isDisabled" : "Серви� отключен",
    "settings.services.tooltip.isMuted" : "В�е звуки отключены",
    "settings.services.tooltip.notificationsDisabled" : "Уведомлени� отключены",
    "settings.services.updatedInfo" : "Изменени� �охранены",
+   "settings.team.contentHeadline" : "Franz дл� Команд",
+   "settings.team.copy" : "Franz дл� Команд позвол�ет пригла�ить коллег в вашу команду, отправив им емайл � приглашением, а также управл�ть их подпи�ками в на�тройках вашего аккаунта. �е тратьте врем� на на�тройку подпи�ок дл� каждого члена команды индивидуально, забудьте о многочи�ленных платежках и разных циклах оплаты - одна команда дл� управлени� в�еми!",
+   "settings.team.headline" : "Команда",
+   "settings.team.intro" : "Вы и ваша команда и�пльзуете Franz? Вы теперь можете управл�ть Премиум подпи�ками любого количе�тва коллег, друзей и членов �емьи, из одного и того же аккаунта.",
+   "settings.team.manageAction" : "Управл�йте вашей Командой на meetfranz.com",
+   "settings.team.upgradeAction" : "Улучшить ваш аккаунт",
    "settings.user.form.accountType.company" : "Компани�",
    "settings.user.form.accountType.individual" : "Индивидуальный",
    "settings.user.form.accountType.label" : "Тип аккаунта",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "Им�",
    "settings.user.form.lastname" : "Фамили�",
    "settings.user.form.newPassword" : "�овый пароль",
+   "settings.workspace.add.form.name" : "Им�",
+   "settings.workspace.add.form.submitButton" : "Создать окружение",
+   "settings.workspace.form.buttonDelete" : "Удалить окружение",
+   "settings.workspace.form.buttonSave" : "Сохранить окружение",
+   "settings.workspace.form.name" : "Им�",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Ваши окружени�",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Ваши окружени�",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Попробовать �нова",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "Добавить новый �ерви�",
+   "sidebar.closeWorkspaceDrawer" : "Закрыть меню окружений",
    "sidebar.muteApp" : "Отключить уведомлени� и звук",
+   "sidebar.openWorkspaceDrawer" : "Открыть меню окружений",
    "sidebar.settings" : "�а�тройки",
    "sidebar.unmuteApp" : "Включить уведомлени� и звук",
    "signup.company.label" : "Организаци�",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "Резидентам ЕвроСоюза: могут примен�ть�� ме�тные налоги",
    "subscription.features.ads" : "Без рекламы, нав�егда!",
    "subscription.features.comingSoon" : "�коро",
-   "subscription.features.encryptedSync" : "Зашифрованные �е��ии �инхронизации",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Добавление облачных �лужб или �лужб на �воём хо�тинге типа HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.noInterruptions" : "�икаких задержек и предложений перейти на платную вер�ию",
+   "subscription.features.onpremise.mattermost" : "Локальные\/размещенные на хо�тинге �ерви�ы, такие как Mattermost",
+   "subscription.features.proxy" : "Подержка прок�и дл� �ерви�ов",
+   "subscription.features.spellchecker" : "Поддержка проверки правопи�ани�",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "Платный премиум аккаунт Franz включает",
    "subscription.paymentSessionError" : "�евозможно загрузить форму оплаты",
    "subscription.submit.label" : "Я хочу поддержать разработку Franz",
@@ -269,9 +312,20 @@
    "tabs.item.reload" : "Перезагрузить",
    "validation.email" : "{field} недей�твительно",
    "validation.minLength" : "{field} должно быть не менее {length} �имволов",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} об�зательно",
    "validation.url" : "{field} �вл�ет�� недей�твительной ��ылкой",
    "welcome.loginButton" : "Вход",
    "welcome.signupButton" : "Создать бе�платный аккаунт",
-   "welcome.slogan" : "Общение, которое работает дл� ва�"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "В�е �ерви�ы",
+   "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>Franz 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/sk.json b/src/i18n/locales/sk.json
index ca7335fe9..7af29ef1c 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -1,11 +1,23 @@
 {
    "app.errorHandler.action" : "Obnoviť",
    "app.errorHandler.headline" : "Something went wrong",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Nedá sa pripojiť k online službám Franz",
    "global.notConnectedToTheInternet" : "Nie ste pripojení k internetu.",
+   "global.spellchecker.useDefault" : "Use System Default ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Spell checking language",
    "import.headline" : "Importovať vaše služby z Franz 4",
    "import.notSupportedHeadline" : "Služby zatiaľ nie sú podporované vo verzii Franz 5",
    "import.skip.label" : "Chcem pridať služby ru�ne",
@@ -32,6 +44,7 @@
    "login.submit.label" : "Prihlásiť sa",
    "login.tokenExpired" : "Vaša relácia vypršala, prihláste sa prosím znovu.",
    "menu.app.about" : "O aplikácii",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Skryť",
    "menu.app.hideOthers" : "Skryť ostatné",
    "menu.app.quit" : "Ukon�iť",
@@ -59,7 +72,9 @@
    "menu.help.support" : "Podpora",
    "menu.help.tos" : "Podmienky použitia",
    "menu.services" : "Služby",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Pridať novú službu...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Zobraziť",
    "menu.view.enterFullScreen" : "Na celú obrazovku",
    "menu.view.exitFullScreen" : "Ukon�iť režim na celú obrazovku",
@@ -74,6 +89,11 @@
    "menu.window" : "Okno",
    "menu.window.close" : "Zatvoriť",
    "menu.window.minimize" : "Minimalizovať",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Všetky služby",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "E-mailová adresa",
    "password.headline" : "Obnoviť heslo",
    "password.link.login" : "Prihlásiť sa do vášho ú�tu",
@@ -97,6 +117,7 @@
    "service.errorHandler.headline" : "Ale nie!",
    "service.errorHandler.message" : "Chyba",
    "service.errorHandler.text" : "{name} has failed to load.",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "Za�íname",
    "services.welcome" : "Vítajte v aplikácii Franz",
    "settings.account.account.editButton" : "Upraviť ú�et",
@@ -117,6 +138,7 @@
    "settings.account.invoiceDownload" : "Prevziať",
    "settings.account.manageSubscription.label" : "Spravovať vaše odoberanie",
    "settings.account.successInfo" : "Vaše zmeny boli uložené",
+   "settings.account.tryReloadServices" : "Skúsiť znova",
    "settings.account.tryReloadUserInfoRequest" : "Skúsiť znova",
    "settings.account.userInfoRequestFailed" : "Nebolo možné na�ítať informácie o používateľovi",
    "settings.app.buttonClearAllCache" : "Vy�istiť vyrovnávaciu pamäť",
@@ -129,22 +151,20 @@
    "settings.app.form.beta" : "Vrátane beta verzií",
    "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Zapnúť GPU zrýchlenie",
-   "settings.app.form.enableMenuBar" : "Zobraziť Franz v ponuke menu",
    "settings.app.form.enableSpellchecking" : "Zapnúť kontrolu pravopisu",
    "settings.app.form.enableSystemTray" : "Zobrazovať Franz v systémovej lište",
-   "settings.app.form.hideDockIcon" : "Skryť ikonu Franz v doku",
    "settings.app.form.language" : "Jazyk",
    "settings.app.form.minimizeToSystemTray" : "Minimalizovať Franz do systémovej lišty",
    "settings.app.form.runInBackground" : "Po zatvorení okna ponechať Franz spustený na pozadí",
    "settings.app.form.showDisabledServices" : "Zobraziť záložky vypnutých služieb",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Zobraziť symbol pre nepre�ítané správy, ke� sú vypnuté upozornenia",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Nastavenia",
    "settings.app.headlineAdvanced" : "Pokro�ilé",
    "settings.app.headlineAppearance" : "Vzhľad",
    "settings.app.headlineGeneral" : "Všeobecné",
    "settings.app.headlineLanguage" : "Jazyk",
    "settings.app.headlineUpdates" : "Aktualizácie",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "Zmeny vyžadujú reštart",
    "settings.app.subheadlineCache" : "Vyrovnávacia pamäť",
    "settings.app.translationHelp" : "Pomôžte nám preložiť Franz do svojho jazyka.",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "Pozvať priateľov",
    "settings.navigation.logout" : "Odhlásiť sa",
    "settings.navigation.settings" : "Nastavenia",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "Vaše služby",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "Všetky služby",
    "settings.recipes.dev" : "Vývoj",
    "settings.recipes.headline" : "Dostupné služby",
@@ -201,8 +223,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Uložiť službu",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hostované",
    "settings.service.form.tabOnPremise" : "Vlastné hostovanie ��",
    "settings.service.form.team" : "Tím",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "Preskúmať služby",
    "settings.services.headline" : "Vaše služby",
    "settings.services.noServicesAdded" : "Doposiaľ ste nepridali žiadne služby.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Služba je vypnutá",
    "settings.services.tooltip.isMuted" : "Všetky zvuky sú stíšené",
    "settings.services.tooltip.notificationsDisabled" : "Oznámenia sú vypnuté",
    "settings.services.updatedInfo" : "Vaše zmeny boli uložené",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Tím",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
    "settings.user.form.accountType.company" : "Spolo�nosť",
    "settings.user.form.accountType.individual" : "Osoba",
    "settings.user.form.accountType.label" : "Typ ú�tu",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "Krstné meno",
    "settings.user.form.lastname" : "Priezvisko",
    "settings.user.form.newPassword" : "Nové heslo",
+   "settings.workspace.add.form.name" : "Meno",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Meno",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Skúsiť znova",
+   "settings.workspaces.updatedInfo" : "Vaše zmeny boli uložené",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "Pridať novú službu",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "Vypnúť upozornenia a zvuky",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Nastavenia",
    "sidebar.unmuteApp" : "Povoliť oznámenia a zvuky",
    "signup.company.label" : "Spolo�nosť",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "Pre obyvateľov EÚ: môže byť aplikovaná miestna daň",
    "subscription.features.ads" : "Žiadne reklamy, nikdy!",
    "subscription.features.comingSoon" : "už �oskoro",
-   "subscription.features.encryptedSync" : "Šifrovaná synchronizácia relácie",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Pridať lokálne hostované služby, ako napr. HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "Platený ú�et Premium Supporter Franz zahŕňa",
    "subscription.paymentSessionError" : "Nepodarilo sa inicializovať platbu od",
    "subscription.submit.label" : "Chcem podporiť vývoj aplikácie Franz",
@@ -269,9 +312,20 @@
    "tabs.item.reload" : "Obnoviť",
    "validation.email" : "{field} je neplatný",
    "validation.minLength" : "{field} by malo byť dlhé aspoň {length} znakov",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} je povinné",
    "validation.url" : "{field} nie je platné URL",
    "welcome.loginButton" : "Prihlásiť sa do vášho ú�tu",
    "welcome.signupButton" : "Vytvoriť ú�et zdarma",
-   "welcome.slogan" : "Správy, ktoré pracujú pre vás"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Všetky služby",
+   "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>Franz 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/sr.json b/src/i18n/locales/sr.json
index df0b849c4..e5962566b 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -1,11 +1,23 @@
 {
    "app.errorHandler.action" : "Ponovno u�itavanje",
    "app.errorHandler.headline" : "Something went wrong",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Nije moguće pristupiti Franz-ovim on-line servisima. ",
    "global.notConnectedToTheInternet" : "Niste povezani sa serverom.",
+   "global.spellchecker.useDefault" : "Use System Default ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Spell checking language",
    "import.headline" : "Uvezite svoje Franz 4 servise",
    "import.notSupportedHeadline" : "Servis trenutno nije podržan u Franz 5",
    "import.skip.label" : "Желим да додам у�луге ручно",
@@ -32,6 +44,7 @@
    "login.submit.label" : "Prijavite se",
    "login.tokenExpired" : "Vaša sesija je istekla, prijavite se ponovo.",
    "menu.app.about" : "O Francu",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Sakrij",
    "menu.app.hideOthers" : "Sakrij ostale",
    "menu.app.quit" : "Izađi",
@@ -59,7 +72,9 @@
    "menu.help.support" : "Подршка",
    "menu.help.tos" : "У�лови коришћења у�луге",
    "menu.services" : "Usluge",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Додај нову у�лугу",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Преглед",
    "menu.view.enterFullScreen" : "Отвори у целом екрану",
    "menu.view.exitFullScreen" : "�апу�ти цео екран",
@@ -74,6 +89,11 @@
    "menu.window" : "У прозору",
    "menu.window.close" : "Затвори",
    "menu.window.minimize" : "Умањи",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Sve usluge",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "Vaša e-adresa",
    "password.headline" : "Stvorite novu zaporku",
    "password.link.login" : "Prijavite se na Vaš ra�un",
@@ -97,6 +117,7 @@
    "service.errorHandler.headline" : "O, ne! ",
    "service.errorHandler.message" : "Greška ",
    "service.errorHandler.text" : "{name} has failed to load.",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "Zapo�nimo! ",
    "services.welcome" : "Dobrodošli u Franz",
    "settings.account.account.editButton" : "Uredi ra�un",
@@ -117,6 +138,7 @@
    "settings.account.invoiceDownload" : "Preuzmite",
    "settings.account.manageSubscription.label" : "Upravljajte pretplatama",
    "settings.account.successInfo" : "Vaše promjene su spremljene",
+   "settings.account.tryReloadServices" : "Pokušajte ponovno",
    "settings.account.tryReloadUserInfoRequest" : "Pokušajte ponovno",
    "settings.account.userInfoRequestFailed" : "Nije moguće u�itati informacije o korisniku",
    "settings.app.buttonClearAllCache" : "Очи�ти кеш",
@@ -129,22 +151,20 @@
    "settings.app.form.beta" : "Obuhvati i beta verzije",
    "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Омогући убрзање графичке јединице",
-   "settings.app.form.enableMenuBar" : "Покажи Франз у менију",
    "settings.app.form.enableSpellchecking" : "Omogući provjeru pravopisa",
    "settings.app.form.enableSystemTray" : "Prikaži aplikaciju u sustavskoj traci",
-   "settings.app.form.hideDockIcon" : "Сакриј Франз иконицу у доку",
    "settings.app.form.language" : "Jezik",
    "settings.app.form.minimizeToSystemTray" : "Smanji Franca u sustavsku traku",
    "settings.app.form.runInBackground" : "Neka se Franc održava u pozadini i ako je prozor zatvoren",
    "settings.app.form.showDisabledServices" : "Prikaži plo�e s onemogućenim servisima",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Покажи беџ за непрочитане поруке када �у обавештења онемогућена",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Подешавања",
    "settings.app.headlineAdvanced" : "Napredne alatke",
    "settings.app.headlineAppearance" : "Izgled",
    "settings.app.headlineGeneral" : "Općenito",
    "settings.app.headlineLanguage" : "Jezik",
    "settings.app.headlineUpdates" : "Nadogradnje",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "Promjene postavki zahtijevaju ponovni pogon",
    "settings.app.subheadlineCache" : "Кеш",
    "settings.app.translationHelp" : "Pomozite nam prevesti aplikaciju na Vaš jezik. ",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "Позови пријатеље",
    "settings.navigation.logout" : "Odjava",
    "settings.navigation.settings" : "Postavke",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "Vaše usluge",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "Sve usluge",
    "settings.recipes.dev" : "Razvoj",
    "settings.recipes.headline" : "Dostupne usluge",
@@ -201,8 +223,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Sa�uvaj uslugu\/e",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hostovano",
    "settings.service.form.tabOnPremise" : "Samo-hostovano ��",
    "settings.service.form.team" : "Tim",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "Pronađite usluge",
    "settings.services.headline" : "Vaše usluge",
    "settings.services.noServicesAdded" : "Još uvijek niste unijeli niti jednu uslugu.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Usluga je onemogućena.",
    "settings.services.tooltip.isMuted" : "Svi zvukovi su onemogućeni.",
    "settings.services.tooltip.notificationsDisabled" : "Obavijesti su onemogućene.",
    "settings.services.updatedInfo" : "Vaše promjene su pohranjene.",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Tim",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "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",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "Ime",
    "settings.user.form.lastname" : "Prezime",
    "settings.user.form.newPassword" : "Nova lozinka",
+   "settings.workspace.add.form.name" : "Ime",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Ime",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Pokušajte ponovno",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "Dodajte novu uslugu",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "Онемогући обавештења и звукове",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Postavke",
    "sidebar.unmuteApp" : "И�кључи обавештења и звукове",
    "signup.company.label" : "Tvrtka",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "EU državljani, upozerenje: Moguće taksiranje",
    "subscription.features.ads" : "Bez reklama, doživotno!",
    "subscription.features.comingSoon" : "Dolazi uskoro",
-   "subscription.features.encryptedSync" : "Kodirano usklađivanje sesija.",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Dodajte pretpostavljeni\/hostirani servis kao Å¡to ima usluga HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "Plaćeni\/Premium ra�un uklju�uje sljedeće:",
    "subscription.paymentSessionError" : "Nemoguće inicijalizirati obrazac za uplatu",
    "subscription.submit.label" : "Želim da podržim razvoj Franca.",
@@ -269,9 +312,20 @@
    "tabs.item.reload" : "Ponovno u�itavanje",
    "validation.email" : "{поље} није валидно",
    "validation.minLength" : "{поље} треба да буде најмање {дужина} карактера дугачко",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{поље} је неопходно",
    "validation.url" : "{field} није валидан УРЛ",
    "welcome.loginButton" : "Prijavite se na ra�un",
    "welcome.signupButton" : "Stvorite novi korisni�ki ra�un",
-   "welcome.slogan" : "Poruke koje su stvorene za tebe"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Sve usluge",
+   "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>Franz 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/tr.json b/src/i18n/locales/tr.json
index 9e7619454..69c5ede37 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -1,13 +1,25 @@
 {
-   "app.errorHandler.action" : "Yeniden Yükle",
-   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.action" : "Franz Destek Lisansı'nı alın.",
-   "feature.delayApp.headline" : "Beklememek için Franz Destek Lisansı'nı satın alın.",
+   "app.errorHandler.action" : "Tekrar Yükle",
+   "app.errorHandler.headline" : "Bir terslik çıktı",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "feature.delayApp.action" : "Franz Destek Lisansı'nı alın",
+   "feature.delayApp.headline" : "Beklememek için Franz Destek Lisansı'nı satın alın",
    "feature.delayApp.text" : "Franz {seconds} saniye sonra devam edecek.",
-   "global.api.unhealthy" : "Franz hizmetlerine ÅŸu anda eriÅŸilemiyor.",
+   "feature.shareFranz.action.email" : "Mail olarak gönder",
+   "feature.shareFranz.action.facebook" : "Facebook'ta PaylaÅŸ",
+   "feature.shareFranz.action.twitter" : "Twitter'da PaylaÅŸ",
+   "feature.shareFranz.headline" : "Franz birlikte daha iyi!",
+   "feature.shareFranz.shareText.email" : "Franz'a {count} tane servis ekledim! WhatsApp, Messenger, Slack ve fazlasını içeren ücretsiz uygulamayı www.meetfranz.com adresinden edinin.",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Arkadaşlarına ve meslektaşlarına Franz'ın ne kadar harika olduğunu söyle ve bize bu kelimeyi yaymamızda yardım et.",
+   "global.api.unhealthy" : "Franz hizmetlerine ÅŸu anda eriÅŸilemiyor",
    "global.notConnectedToTheInternet" : "İnternete bağlı değilsiniz.",
-   "import.headline" : "Franz 4 servislerinizi ekleyin.",
-   "import.notSupportedHeadline" : "Servisler henüz Franz 5'te desteklenmiyor.",
+   "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",
+   "import.headline" : "Franz 4 servislerinizi içeri aktarın",
+   "import.notSupportedHeadline" : "Henüz Franz 5'te desteklenmeyen servisler",
    "import.skip.label" : "Servisleri kendim eklemek istiyorum",
    "import.submit.label" : "Servisleri içe aktar",
    "infobar.buttonChangelog" : "Yeni ne var?",
@@ -15,7 +27,7 @@
    "infobar.buttonReloadServices" : "Hizmetleri yeniden yükle",
    "infobar.requiredRequestsFailed" : "Hizmetler ve kullanıcı bilgileri yüklenemedi",
    "infobar.servicesUpdated" : "Hizmetleriniz güncellendi.",
-   "infobar.updateAvailable" : "Yeni Franz güncellemesi mevcut",
+   "infobar.updateAvailable" : "Yeni Franz güncellemesi mevcut.",
    "invite.email.label" : "E-posta adresi",
    "invite.headline.friends" : "3 arkadaşını ya da çalışma arkadaşını davet et",
    "invite.name.label" : "Ad",
@@ -32,6 +44,7 @@
    "login.submit.label" : "Oturum Aç",
    "login.tokenExpired" : "Oturum zaman aşımına uğradı, lütfen tekrar giriş yapın.",
    "menu.app.about" : "Franz Hakkında",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Gizle",
    "menu.app.hideOthers" : "DiÄŸerlerini Gizle",
    "menu.app.quit" : "Çıkış",
@@ -59,7 +72,9 @@
    "menu.help.support" : "Destek",
    "menu.help.tos" : "Kullanım Şartları",
    "menu.services" : "Hizmetler",
-   "menu.services.addNewService" : "Yeni Servis Ekle",
+   "menu.services.activatePreviousService" : "Activate previous service",
+   "menu.services.addNewService" : "Yeni servis ekle...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Görünüm",
    "menu.view.enterFullScreen" : "Tam Ekrana Geç",
    "menu.view.exitFullScreen" : "Tam Ekrandan Çık",
@@ -74,6 +89,11 @@
    "menu.window" : "Pencere",
    "menu.window.close" : "Kapat",
    "menu.window.minimize" : "Simge Durumuna Küçült",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Tüm servisler",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "E-posta adresi",
    "password.headline" : "Parola sıfırla",
    "password.link.login" : "Hesabına giriş yap",
@@ -81,7 +101,7 @@
    "password.noUser" : "Bu e-posta adresinde bir kullanıcı bulunamadı",
    "password.submit.label" : "Gönder",
    "password.successInfo" : "E-postanızı kontrol ediniz",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Hesabı Yükselt",
    "pricing.headline" : "Franz'ı Destekle",
    "pricing.link.skipPayment" : "Franz'ın gelişimini desteklemek istemiyorum.",
    "pricing.submit.label" : "Franz'ın gelişimini desteklemek istiyorum",
@@ -92,11 +112,12 @@
    "service.crashHandler.text" : "{name} bir hataya neden oldu.",
    "service.disabledHandler.action" : "{name} aktif",
    "service.disabledHandler.headline" : "{name} devredışı",
-   "service.errorHandler.action" : "{name} yeniden yükle",
+   "service.errorHandler.action" : "{İsim} Yeniden Yükle",
    "service.errorHandler.editAction" : "{name} düzenle",
-   "service.errorHandler.headline" : "Aman Tanrım hayır!",
+   "service.errorHandler.headline" : "Hayııırrr!",
    "service.errorHandler.message" : "Hata",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} yüklenemedi.",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "Haydi başlayalım",
    "services.welcome" : "Franz'a HoÅŸgeldiniz",
    "settings.account.account.editButton" : "Hesabı düzenle",
@@ -117,8 +138,9 @@
    "settings.account.invoiceDownload" : "Ä°ndir",
    "settings.account.manageSubscription.label" : "Aboneliğini yönet",
    "settings.account.successInfo" : "DeÄŸiÅŸikliklerin kaydedildi",
+   "settings.account.tryReloadServices" : "Tekrar deneyin",
    "settings.account.tryReloadUserInfoRequest" : "Tekrar deneyin",
-   "settings.account.userInfoRequestFailed" : "Kullanıcı bilgisi yüklenemedi.",
+   "settings.account.userInfoRequestFailed" : "Kullanıcı bilgisi yüklenemedi",
    "settings.app.buttonClearAllCache" : "Önbelleği temizle",
    "settings.app.buttonInstallUpdate" : "Yeniden Başlat ve Güncelleştirmeleri Kur",
    "settings.app.buttonSearchForUpdate" : "Güncellemeleri kontrol et",
@@ -127,24 +149,22 @@
    "settings.app.form.autoLaunchInBackground" : "Arka planda aç",
    "settings.app.form.autoLaunchOnStart" : "Franz'ı başlangıçta aç",
    "settings.app.form.beta" : "Beta versiyonları dahil et",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Karanlık tarafa katıl",
    "settings.app.form.enableGPUAcceleration" : "Grafik İşlemci Ünitesi (GPU) Hızlandırıcısını Aktif et",
-   "settings.app.form.enableMenuBar" : "Menü çubuğunda Franz'ı göster",
    "settings.app.form.enableSpellchecking" : "Yazım denetimini etkinleştir",
    "settings.app.form.enableSystemTray" : "Franz'ı sistem tepsisinde göster",
-   "settings.app.form.hideDockIcon" : "Franz Simgesini Gösterme",
    "settings.app.form.language" : "Dil",
    "settings.app.form.minimizeToSystemTray" : "Franz'ı sistem tepsisine küçült",
    "settings.app.form.runInBackground" : "Pencereyi kapatırken Franz'ı arka planda tut",
    "settings.app.form.showDisabledServices" : "Devre dışı bırakılan servis sekmelerini göster",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Bildirimler kapalı iken okunmamış mesaj sayısını göster",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Ayarlar",
    "settings.app.headlineAdvanced" : "GeliÅŸmiÅŸ",
    "settings.app.headlineAppearance" : "Görünüm",
    "settings.app.headlineGeneral" : "Genel",
    "settings.app.headlineLanguage" : "Dil",
    "settings.app.headlineUpdates" : "Güncellemeler",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "Değişiklikler yeniden başlatmayı gerektiriyor",
    "settings.app.subheadlineCache" : "Önbellek",
    "settings.app.translationHelp" : "Franz'ı senin diline tercüme etmemiz için yardım et.",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "Arkadaşlarını Davet Et",
    "settings.navigation.logout" : "Çıkış",
    "settings.navigation.settings" : "Ayarlar",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "Servislerin",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "Tüm servisler",
    "settings.recipes.dev" : "GeliÅŸtirme",
    "settings.recipes.headline" : "Mevcut servisler",
@@ -168,7 +190,7 @@
    "settings.searchService" : "Hizmeti ara",
    "settings.service.error.goBack" : "Servislere geri dön",
    "settings.service.error.headline" : "Hata",
-   "settings.service.error.message" : "Servis tarifi yüklenemedi",
+   "settings.service.error.message" : "Servis tarifi yüklenemedi.",
    "settings.service.form.addServiceHeadline" : "{name} Ekle",
    "settings.service.form.availableServices" : "Mevcut servisler",
    "settings.service.form.customUrl" : "Özel sunucu",
@@ -176,10 +198,10 @@
    "settings.service.form.customUrlUpgradeAccount" : "Hesabını yükselt",
    "settings.service.form.customUrlValidationError" : "{name} özel sunucu doğrulanamadı.",
    "settings.service.form.deleteButton" : "Servisi sil",
-   "settings.service.form.editServiceHeadline" : "{name} düzenle",
+   "settings.service.form.editServiceHeadline" : "{İsim} Düzenle",
    "settings.service.form.enableAudio" : "Sesi etkinleÅŸtirin",
    "settings.service.form.enableBadge" : "Okunmamış mesajları göster",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Karanlık modu aç",
    "settings.service.form.enableNotification" : "Bildirimleri etkinleÅŸtir",
    "settings.service.form.enableService" : "Servisi etkinleÅŸtir",
    "settings.service.form.headlineBadges" : "Okunmamış mesajlar",
@@ -192,17 +214,15 @@
    "settings.service.form.indirectMessages" : "Mesaj rozetini tüm yeni mesajlar için göster",
    "settings.service.form.isMutedInfo" : "Devre dışı bırakıldığında, tüm bildirim sesleri sessize alınır",
    "settings.service.form.name" : "Ä°sim",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
-   "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Ayarları",
+   "settings.service.form.proxy.host" : "Proxy Sunucusu\/IP",
+   "settings.service.form.proxy.info" : "Proxy ayarları Franz serverlarına yüklenmeyecektir.",
+   "settings.service.form.proxy.isEnabled" : "Proxy Kullan",
+   "settings.service.form.proxy.password" : "Parola (opsiyonel)",
    "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.restartInfo" : "Proxy ayarlarını değiştirdikten sonra Franz'ı yeniden başlatınız.",
+   "settings.service.form.proxy.user" : "Kullanıcı (opsiyonel)",
    "settings.service.form.saveButton" : "Servisi kaydet",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Barındırılan",
    "settings.service.form.tabOnPremise" : "Kendi barındırılan",
    "settings.service.form.team" : "Takım",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "Servisleri keÅŸfet",
    "settings.services.headline" : "Servislerin",
    "settings.services.noServicesAdded" : "Henüz hiç servis eklemedin.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Servis devre dışı",
    "settings.services.tooltip.isMuted" : "Tüm sesler kapalı",
    "settings.services.tooltip.notificationsDisabled" : "Bildirimler devre dışı",
    "settings.services.updatedInfo" : "DeÄŸiÅŸikliklerin kaydedildi",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Takım",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "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",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "Ad",
    "settings.user.form.lastname" : "Soyad",
    "settings.user.form.newPassword" : "Yeni ÅŸifre",
+   "settings.workspace.add.form.name" : "Name",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Name",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Tekrar deneyin",
+   "settings.workspaces.updatedInfo" : "DeÄŸiÅŸikliklerin kaydedildi",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "Yeni servis ekle",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "Bildirimleri ve sesli uyarıları kapat",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Ayarlar",
    "sidebar.unmuteApp" : "Bildirimleri ve sesli uyarıları etkinleştir",
    "signup.company.label" : "Kurum",
@@ -238,18 +282,17 @@
    "signup.legal.info" : "Franz'ı hesabı oluşturark kabul ediyorsun",
    "signup.legal.privacy" : "Gizlilik Sözleşmesi",
    "signup.legal.terms" : "Kullanım Koşulları",
-   "signup.link.login" : "Mevcut hesabınla giriş yap.",
+   "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.euTaxInfo" : "AB vatandaşları: yerel satış vergileri uygulanabilir",
    "subscription.features.ads" : "Reklam yok, asla!",
    "subscription.features.comingSoon" : "yakında geliyor",
-   "subscription.features.encryptedSync" : "Åžifreli oturum senkronizasyonu",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "HipChat gibi kurum içi\/barındırılan hizmetler ekle",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.noInterruptions" : "Uygulama gecikmeleri & yükseltme lisanları için dırdır yok",
+   "subscription.features.onpremise.mattermost" : "Mattermost gibi şirket-içi\/barındırılan servisler ekleyin",
+   "subscription.features.proxy" : "Servisler için proxy desteği",
+   "subscription.features.spellchecker" : "Yazım denetleyicisi desteği",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "Ücretli Franz Premium Destekçi Hesabına dahil",
    "subscription.paymentSessionError" : "Ödeme formu başlatılamadı",
    "subscription.submit.label" : "Franz'ın gelişimini desteklemek istiyorum",
@@ -266,12 +309,23 @@
    "tabs.item.enableAudio" : "Sesi etkinleÅŸtir",
    "tabs.item.enableNotification" : "Bildirimleri etkinleÅŸtir",
    "tabs.item.enableService" : "Servisi etkinleÅŸtir",
-   "tabs.item.reload" : "Yeniden Yükle",
+   "tabs.item.reload" : "Tekrar yükle",
    "validation.email" : "{alan} geçerli değil",
    "validation.minLength" : "{field} en az {length} karakter uzunluğunda olmalı",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} gereklidir",
    "validation.url" : "{field} geçerli bir URL değil",
    "welcome.loginButton" : "Hesabına giriş yap",
    "welcome.signupButton" : "Ãœcretsiz hesap oluÅŸtur",
-   "welcome.slogan" : "Sizin için çalışan mesajlaşma"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Tüm servisler",
+   "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>Franz 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 7d51b380e..113665f5f 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -1,13 +1,25 @@
 {
    "app.errorHandler.action" : "Перезавантажити",
-   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
-   "global.api.unhealthy" : "�е можна підключити�ь до онлайн �ерві�ів Franz",
+   "app.errorHandler.headline" : "Що�ь пішло не так",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "feature.delayApp.action" : "Отримати ліцензію Franz Supporter ",
+   "feature.delayApp.headline" : "Будь ла�ка, придбайте ліцензію Franz Supporter аби пропу�тити очікуванн�",
+   "feature.delayApp.text" : "Franz відновить роботу за {seconds} �екунд",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "global.api.unhealthy" : "�е можливо підключити�ь до онлайн �ерві�ів Franz",
    "global.notConnectedToTheInternet" : "Ви не підключені до Інтернету.",
+   "global.spellchecker.useDefault" : "Викори�товувати �и�темні параметри за змовчуванн�м ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "Мова перевірки правопи�у",
    "import.headline" : "Імпортувати ваші �ерві�и з Franz 4",
-   "import.notSupportedHeadline" : "Серві�и ще не підтримують�� в Franz 5",
+   "import.notSupportedHeadline" : "�аразі �ерві�и не підтримують�� у Franz 5",
    "import.skip.label" : "Я бажаю додати �ерві� вручну",
    "import.submit.label" : "Імпортувати �ерві�и",
    "infobar.buttonChangelog" : "Що нового?",
@@ -17,21 +29,22 @@
    "infobar.servicesUpdated" : "Ваші �ерві�и було оновлено.",
    "infobar.updateAvailable" : "�ове оновленн� дл� Franz до�тупне.",
    "invite.email.label" : "Email адре�а",
-   "invite.headline.friends" : "Запро�іть 3 ваших друзів або колег",
+   "invite.headline.friends" : "Запро�іть 3-х ваших друзів або колег",
    "invite.name.label" : "Ім'�",
    "invite.skip.label" : "Я хочу зробити це пізніше",
    "invite.submit.label" : "Відправити запрошенн�",
-   "invite.successInfo" : "Запрошенн� у�пішно відо�лані",
+   "invite.successInfo" : "Запрошенн� у�пішно наді�лані",
    "login.email.label" : "Email адре�а",
    "login.headline" : "Увійти",
    "login.invalidCredentials" : "Email або пароль некоректні",
    "login.link.password" : "Скинути пароль",
    "login.link.signup" : "Створити безплатний акаунт",
    "login.password.label" : "Пароль",
-   "login.serverLogout" : "Ваша �е�і� закінчила�ь, будь ла�ка, зайдіть знову.",
+   "login.serverLogout" : "Ваша �е�і� закінчила�ь, будь ла�ка, увійдіть знову.",
    "login.submit.label" : "Увійти",
-   "login.tokenExpired" : "Ваша �е�і� закінчила�ь, будь ла�ка, зайдіть знову.",
+   "login.tokenExpired" : "Ваша �е�і� закінчила�ь, будь ла�ка, увійдіть знову.",
    "menu.app.about" : "Про Franz",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Приховати",
    "menu.app.hideOthers" : "Приховати інші",
    "menu.app.quit" : "Вийти",
@@ -59,7 +72,9 @@
    "menu.help.support" : "Підтримка",
    "menu.help.tos" : "Умови викори�танн�",
    "menu.services" : "Служби",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Додати �ерві�",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Вигл�д",
    "menu.view.enterFullScreen" : "Вікно на повний екран",
    "menu.view.exitFullScreen" : "Вийти з повного екрану",
@@ -74,6 +89,11 @@
    "menu.window" : "Вікно",
    "menu.window.close" : "Закрити",
    "menu.window.minimize" : "Згорнути",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "В�і �ерві�и",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "Email адре�а",
    "password.headline" : "Скинути пароль",
    "password.link.login" : "Увійти до вашого акаунту",
@@ -81,7 +101,7 @@
    "password.noUser" : "�е знайдено жодного кори�тувача з цією email адре�ою",
    "password.submit.label" : "Подати",
    "password.successInfo" : "Будь ла�ка, перевірте ваш email",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Преміум акаунт",
    "pricing.headline" : "Підтримайте Franz",
    "pricing.link.skipPayment" : "Я не хочу підтримувати розробку Franz.",
    "pricing.submit.label" : "Я хочу підтримати розробку Franz",
@@ -96,7 +116,8 @@
    "service.errorHandler.editAction" : "Редагувати {name}",
    "service.errorHandler.headline" : "О, ні!",
    "service.errorHandler.message" : "Помилка",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} не завантажено",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "Почати",
    "services.welcome" : "Ла�каво про�имо в Franz",
    "settings.account.account.editButton" : "Редагувати акаунт",
@@ -117,6 +138,7 @@
    "settings.account.invoiceDownload" : "Завантажити",
    "settings.account.manageSubscription.label" : "Керуванн� вашою підпи�кою",
    "settings.account.successInfo" : "Ваші зміни були збережені",
+   "settings.account.tryReloadServices" : "Спробуйте ще раз",
    "settings.account.tryReloadUserInfoRequest" : "Спробуйте ще раз",
    "settings.account.userInfoRequestFailed" : "�е вдало�� завантажити інформацію кори�тувача",
    "settings.app.buttonClearAllCache" : "Очи�тити кеш",
@@ -127,24 +149,22 @@
    "settings.app.form.autoLaunchInBackground" : "Відкрити у фоновому режимі",
    "settings.app.form.autoLaunchOnStart" : "Запу�кати Franz на початку",
    "settings.app.form.beta" : "Включити бета-вер�ії",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Переходь на Темну Сторону",
    "settings.app.form.enableGPUAcceleration" : "Ввімкнути при�коренн� GPU",
-   "settings.app.form.enableMenuBar" : "Відображати Franz в панелі головного меню",
    "settings.app.form.enableSpellchecking" : "Увімкнути перевірку орфографії",
    "settings.app.form.enableSystemTray" : "Показувати Franz у �и�темному лотку",
-   "settings.app.form.hideDockIcon" : "Сховати значок Franz в Dock",
    "settings.app.form.language" : "Мова",
    "settings.app.form.minimizeToSystemTray" : "Мінімізувати Franz до �и�темного лотка",
    "settings.app.form.runInBackground" : "Тримати Franz в фоні при закритті вікна",
    "settings.app.form.showDisabledServices" : "Показати вкладку вимкнених �ерві�ів",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Показувати значок непрочитаних повідомлень коли �повіщенн� вимкнені",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "�алаштуванн�",
    "settings.app.headlineAdvanced" : "Додаткові налаштуванн�",
    "settings.app.headlineAppearance" : "Вигл�д",
    "settings.app.headlineGeneral" : "Загальні",
    "settings.app.headlineLanguage" : "Мова",
    "settings.app.headlineUpdates" : "Оновленн�",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "Зміни потребують перезапу�ку",
    "settings.app.subheadlineCache" : "Кеш",
    "settings.app.translationHelp" : "Допоможіть перекла�ти Franz на Вашу мову.",
@@ -157,7 +177,9 @@
    "settings.navigation.inviteFriends" : "Запро�ити друзів",
    "settings.navigation.logout" : "Вийти",
    "settings.navigation.settings" : "�алаштуванн�",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "Ваші �ерві�и",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "В�і �ерві�и",
    "settings.recipes.dev" : "Розробка",
    "settings.recipes.headline" : "До�тупні �ерві�и",
@@ -179,7 +201,7 @@
    "settings.service.form.editServiceHeadline" : "Редагувати {name}",
    "settings.service.form.enableAudio" : "Увімкнути звук",
    "settings.service.form.enableBadge" : "Показувати непрочитані повідомленн�",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Переходь на Темну Сторону",
    "settings.service.form.enableNotification" : "Увімкнути �повіщенн�",
    "settings.service.form.enableService" : "Увімкнути �ерві�",
    "settings.service.form.headlineBadges" : "Значки непрочитаних повідомлень",
@@ -192,17 +214,15 @@
    "settings.service.form.indirectMessages" : "Показувати значок повідомленн� дл� в�іх нових повідомлень",
    "settings.service.form.isMutedInfo" : "Коли вимкнено, в�і �повищенн� та відтворенн� ігнорують��",
    "settings.service.form.name" : "Ім'�",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
-   "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
-   "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.headline" : "�алаштуванн� HTTP\/HTTPS прок�і ",
+   "settings.service.form.proxy.host" : "Прок�і Host\/IP",
+   "settings.service.form.proxy.info" : "�алаштуванн� прок�і не будуть �инхронізовані із �ерверами Franz",
+   "settings.service.form.proxy.isEnabled" : "Викори�товувати прок�і",
+   "settings.service.form.proxy.password" : "Пароль (опційно)",
+   "settings.service.form.proxy.port" : "Порт",
+   "settings.service.form.proxy.restartInfo" : "Будь ла�ка, перезапу�тіть Franz пі�л� зміни налуштувань прок�і",
+   "settings.service.form.proxy.user" : "Кори�тувач (опційно)",
    "settings.service.form.saveButton" : "Зберегти �ерві�",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Розміщений",
    "settings.service.form.tabOnPremise" : "Само�тійно розміщений ��",
    "settings.service.form.team" : "Команда",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "Відкрийте дл� �ебе �ерві�и",
    "settings.services.headline" : "Ваші �ерві�и",
    "settings.services.noServicesAdded" : "Ви ще не додавали жодних �ерві�ів.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Серві� відключений",
    "settings.services.tooltip.isMuted" : "В�і звуки вимкнено",
    "settings.services.tooltip.notificationsDisabled" : "Сповіщенн� відключені",
    "settings.services.updatedInfo" : "Ваші зміни були збережені",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Команда",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
    "settings.user.form.accountType.company" : "Компані�",
    "settings.user.form.accountType.individual" : "Індивідуальний",
    "settings.user.form.accountType.label" : "Тип акаунту",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "Ім`�",
    "settings.user.form.lastname" : "Прізвище",
    "settings.user.form.newPassword" : "�овий пароль",
+   "settings.workspace.add.form.name" : "Ім'�",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Ім'�",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Спробуйте ще раз",
+   "settings.workspaces.updatedInfo" : "Ваші зміни були збережені",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "Додати новий �ерві�",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "Вимкнути �повіщенн� та звуки",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "�алаштуванн�",
    "sidebar.unmuteApp" : "Увімкнути �повіщенн� та звуки",
    "signup.company.label" : "Компані�",
@@ -244,12 +288,11 @@
    "subscription.euTaxInfo" : "Дл� жителів ЄС: можуть за�то�овувати�� податки",
    "subscription.features.ads" : "Жодної реклами!",
    "subscription.features.comingSoon" : "очікуйте незабаром",
-   "subscription.features.encryptedSync" : "Шифрована �инхронізаці� �еан�у",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Додайте on-premise \/ hosted �ерві�и, такі �к Hipchat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.noInterruptions" : "�і�ких затримок та набридливих пропозицій з платних підпи�ок",
+   "subscription.features.onpremise.mattermost" : "Серві�и, що виконують�� локально\/вимагають хо�тингу, приміром Mattermost",
+   "subscription.features.proxy" : "Підтримка прок�і ",
+   "subscription.features.spellchecker" : "Підтримка перевірки правопи�у",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "Платний Преміальний �каунт Прихильника Franz включає",
    "subscription.paymentSessionError" : "�е вдало�� ініціалізувати форму платежу",
    "subscription.submit.label" : "Я хочу підтримати розробку Franz",
@@ -269,9 +312,20 @@
    "tabs.item.reload" : "Перезавантажити",
    "validation.email" : "{field} не валідне",
    "validation.minLength" : "Кількі�ть �имволів в {field} повина бути не меньше {length} ",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} обов'�звоке",
    "validation.url" : "{field} не валідний URL",
    "welcome.loginButton" : "Увійдіть до �вого акаунту",
    "welcome.signupButton" : "Створити безплатний акаунт",
-   "welcome.slogan" : "Обмін повідомленн�ми, �кий працює дл� ва�"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "В�і �ерві�и",
+   "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>Franz 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/whitelist_en-US.json b/src/i18n/locales/whitelist_en-US.json
new file mode 100644
index 000000000..32960f8ce
--- /dev/null
+++ b/src/i18n/locales/whitelist_en-US.json
@@ -0,0 +1,2 @@
+[
+]
\ No newline at end of file
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index cfb1d3dce..34bd2158c 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -1,11 +1,23 @@
 {
    "app.errorHandler.action" : "�新載入",
    "app.errorHandler.headline" : "有些�西出錯了",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
-   "global.api.unhealthy" : "無法連線至Franz的伺�器。",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "feature.delayApp.action" : "�得 Franz 支�授權",
+   "feature.delayApp.headline" : "請購買 Franz 支�授權以跳�等候",
+   "feature.delayApp.text" : "Franz 會在 {seconds} 秒後繼續。",
+   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "global.api.unhealthy" : "無法連線至 Franz 的伺�器",
    "global.notConnectedToTheInternet" : "你沒有連上網路。",
+   "global.spellchecker.useDefault" : "使用系統�設 ({default})",
+   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.language" : "拼字檢查語言",
    "import.headline" : "匯入 Franz 4 的�務",
    "import.notSupportedHeadline" : "Franz 5 尚未支�此�務",
    "import.skip.label" : "手動添加�務",
@@ -14,10 +26,10 @@
    "infobar.buttonInstallUpdate" : "�新啟動並安�更新",
    "infobar.buttonReloadServices" : "�新載入�務",
    "infobar.requiredRequestsFailed" : "無法載入�務和使用者資訊",
-   "infobar.servicesUpdated" : "你的�務已經被更新",
-   "infobar.updateAvailable" : "Franz有�用的更新",
+   "infobar.servicesUpdated" : "已經更新你的�務",
+   "infobar.updateAvailable" : "Franz 有�用的更新",
    "invite.email.label" : "電�郵件地�",
-   "invite.headline.friends" : "邀請3�你的朋�或�事",
+   "invite.headline.friends" : "邀請 3 �朋�或�事",
    "invite.name.label" : "�稱",
    "invite.skip.label" : "我想�後��",
    "invite.submit.label" : "�出邀請",
@@ -31,7 +43,8 @@
    "login.serverLogout" : "您的登入期間已�期，請�新登錄",
    "login.submit.label" : "登入",
    "login.tokenExpired" : "您的登入已�期，請�新登入。",
-   "menu.app.about" : "關於Franz",
+   "menu.app.about" : "關於 Franz",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "隱�",
    "menu.app.hideOthers" : "隱�其他",
    "menu.app.quit" : "��",
@@ -59,11 +72,13 @@
    "menu.help.support" : "支�",
    "menu.help.tos" : "�務�款",
    "menu.services" : "�務",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "新增�務",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "檢視",
    "menu.view.enterFullScreen" : "進入全螢幕模�",
    "menu.view.exitFullScreen" : "離開全螢幕模�",
-   "menu.view.reloadFranz" : "�新載入Franz",
+   "menu.view.reloadFranz" : "�新載入 Franz",
    "menu.view.reloadService" : "�新載入�務",
    "menu.view.resetZoom" : "實際大�",
    "menu.view.toggleDevTools" : "切�開發者工具",
@@ -74,6 +89,11 @@
    "menu.window" : "視窗",
    "menu.window.close" : "關閉",
    "menu.window.minimize" : "最�化",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "所有�務",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "電�郵件地�",
    "password.headline" : "�設密碼",
    "password.link.login" : "登入您的帳號",
@@ -82,9 +102,9 @@
    "password.submit.label" : "�出",
    "password.successInfo" : "請檢查您的電�郵件",
    "premiumFeature.button.upgradeAccount" : "�級帳號",
-   "pricing.headline" : "支�Franz",
-   "pricing.link.skipPayment" : "我�想支�Franz的開發。",
-   "pricing.submit.label" : "我想支�Franz的開發。",
+   "pricing.headline" : "支� Franz",
+   "pricing.link.skipPayment" : "我�想支� Franz 的開發。",
+   "pricing.submit.label" : "我想支� Franz 的開發。",
    "pricing.support.label" : "�擇您支�的計畫",
    "service.crashHandler.action" : "�新載入{name}",
    "service.crashHandler.autoReload" : "嘗試在{seconds}秒內自動�復{name}",
@@ -92,20 +112,21 @@
    "service.crashHandler.text" : "{name}導致了一個錯誤。",
    "service.disabledHandler.action" : "啟用{name}",
    "service.disabledHandler.headline" : "{name}已�用",
-   "service.errorHandler.action" : "�新載入{name}",
+   "service.errorHandler.action" : "�新載入 {name}",
    "service.errorHandler.editAction" : "編輯{�稱}",
-   "service.errorHandler.headline" : "噢�!",
+   "service.errorHandler.headline" : "噢��",
    "service.errorHandler.message" : "錯誤",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.errorHandler.text" : "{name} 載入失敗。",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "開始",
-   "services.welcome" : "歡迎使用Franz",
+   "services.welcome" : "歡迎使用 Franz",
    "settings.account.account.editButton" : "編輯帳號",
    "settings.account.accountType.basic" : "基礎帳號",
-   "settings.account.accountType.premium" : "高級支�者帳戶",
+   "settings.account.accountType.premium" : "高級支�帳戶",
    "settings.account.buttonSave" : "更新簡介",
    "settings.account.deleteAccount" : "移除帳號",
    "settings.account.deleteEmailSent" : "移除帳號之確�電郵已�出。你的帳號�相關資料將無法�復�",
-   "settings.account.deleteInfo" : "如果��需�你的帳號了，你�以在這裡刪除帳號和相關資料",
+   "settings.account.deleteInfo" : "如果��需�你的帳號，你�以在這裡刪除帳號和所有相關資料。",
    "settings.account.headline" : "帳號",
    "settings.account.headlineAccount" : "帳戶資訊",
    "settings.account.headlineDangerZone" : "�險地帶",
@@ -113,51 +134,52 @@
    "settings.account.headlinePassword" : "變更密碼",
    "settings.account.headlineProfile" : "更新簡介",
    "settings.account.headlineSubscription" : "您的訂閱",
-   "settings.account.headlineUpgrade" : "�級您的帳戶&支�Franz",
+   "settings.account.headlineUpgrade" : "�級您的帳戶並支� Franz",
    "settings.account.invoiceDownload" : "下載",
    "settings.account.manageSubscription.label" : "管�您的訂閱",
    "settings.account.successInfo" : "您的更變已經被儲存",
+   "settings.account.tryReloadServices" : "�試一次",
    "settings.account.tryReloadUserInfoRequest" : "�試一次",
    "settings.account.userInfoRequestFailed" : "無法載入使用者資訊。",
    "settings.app.buttonClearAllCache" : "清除快�",
    "settings.app.buttonInstallUpdate" : "�新啟動並安�更新",
    "settings.app.buttonSearchForUpdate" : "檢查更新",
-   "settings.app.cacheInfo" : "Franz快�目��用�碟空間{大�}。",
+   "settings.app.cacheInfo" : "Franz 快�目��用 {size} 的�碟空間。",
    "settings.app.currentVersion" : "目�的版本",
    "settings.app.form.autoLaunchInBackground" : "在背景開啟",
-   "settings.app.form.autoLaunchOnStart" : "開機時啟動Franz",
+   "settings.app.form.autoLaunchOnStart" : "開機時啟動 Franz",
    "settings.app.form.beta" : "包�測試版",
-   "settings.app.form.darkMode" : "Join the Dark Side",
-   "settings.app.form.enableGPUAcceleration" : "啟用GPU加速",
-   "settings.app.form.enableMenuBar" : "顯示Franz在�單列",
+   "settings.app.form.darkMode" : "加入黑暗�",
+   "settings.app.form.enableGPUAcceleration" : "啟用 GPU 加速",
    "settings.app.form.enableSpellchecking" : "啟用拼字檢查",
-   "settings.app.form.enableSystemTray" : "顯示Franz在系統列",
-   "settings.app.form.hideDockIcon" : "在工作列中隱�Franz圖示",
+   "settings.app.form.enableSystemTray" : "在系統列顯示 Franz",
    "settings.app.form.language" : "語言",
-   "settings.app.form.minimizeToSystemTray" : "最�化Franz到系統列",
-   "settings.app.form.runInBackground" : "當關閉視窗時��Franz在背景�作",
+   "settings.app.form.minimizeToSystemTray" : "最�化 Franz 到系統列",
+   "settings.app.form.runInBackground" : "當關閉視窗時，�� Franz 在背景�作",
    "settings.app.form.showDisabledServices" : "顯示�用的�務標籤",
    "settings.app.form.showMessagesBadgesWhenMuted" : "當通知關閉時，標記未讀的訊�",
-   "settings.app.form.spellcheckerLanguage" : "拼字檢查語言",
    "settings.app.headline" : "設定",
    "settings.app.headlineAdvanced" : "進階",
    "settings.app.headlineAppearance" : "外觀",
    "settings.app.headlineGeneral" : "一般",
    "settings.app.headlineLanguage" : "語言",
    "settings.app.headlineUpdates" : "æ›´æ–°",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "需��啟以更變",
    "settings.app.subheadlineCache" : "快�",
-   "settings.app.translationHelp" : "幫助我們將Franz翻譯�您的語言。",
+   "settings.app.translationHelp" : "幫助我們將 Franz 翻譯�您的語言。",
    "settings.app.updateStatusAvailable" : "有�用更新，下載中...",
    "settings.app.updateStatusSearching" : "正在�尋更新",
-   "settings.app.updateStatusUpToDate" : "您正在使用最新版本的Franz",
+   "settings.app.updateStatusUpToDate" : "您正在使用最新版本的 Franz",
    "settings.invite.headline" : "邀請朋�",
    "settings.navigation.account" : "帳號",
    "settings.navigation.availableServices" : "�使用的�務",
    "settings.navigation.inviteFriends" : "邀請朋�",
    "settings.navigation.logout" : "登出",
    "settings.navigation.settings" : "設定",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "您的�務",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "所有�務",
    "settings.recipes.dev" : "開發",
    "settings.recipes.headline" : "�使用的�務",
@@ -172,11 +194,11 @@
    "settings.service.form.addServiceHeadline" : "新增{name}",
    "settings.service.form.availableServices" : "�使用的�務",
    "settings.service.form.customUrl" : "自訂伺�器",
-   "settings.service.form.customUrlPremiumInfo" : "�添加自己託管的�務，您需�一個Franz �外支�者帳戶。",
+   "settings.service.form.customUrlPremiumInfo" : "�添加自行託管的�務，您需��有 Franz 高級支�帳戶。",
    "settings.service.form.customUrlUpgradeAccount" : "�級您的帳戶",
    "settings.service.form.customUrlValidationError" : "無法驗證自定義{name}�務器。",
    "settings.service.form.deleteButton" : "刪除�務",
-   "settings.service.form.editServiceHeadline" : "編輯{�稱}",
+   "settings.service.form.editServiceHeadline" : "編輯 {�稱}",
    "settings.service.form.enableAudio" : "啟用音訊",
    "settings.service.form.enableBadge" : "顯示未讀訊�圖示",
    "settings.service.form.enableDarkMode" : "開啟深色模�",
@@ -192,17 +214,15 @@
    "settings.service.form.indirectMessages" : "顯示所有新消�的消�標誌",
    "settings.service.form.isMutedInfo" : "�用時，所有通知�和�音播放都將�音",
    "settings.service.form.name" : "�稱",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
-   "settings.service.form.proxy.host" : "Proxy Host\/IP",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS 代�伺�器設定",
+   "settings.service.form.proxy.host" : "代�伺�器網域 \/ IP",
    "settings.service.form.proxy.info" : "Proxy 設定�會與 Franz 伺�器�步",
    "settings.service.form.proxy.isEnabled" : "使用 Proxy",
    "settings.service.form.proxy.password" : "密碼 (�填)",
-   "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.port" : "通訊阜",
+   "settings.service.form.proxy.restartInfo" : "在變更 Proxy 設定後，請�新啟動 Franz",
    "settings.service.form.proxy.user" : "使用者 (�填)",
    "settings.service.form.saveButton" : "�存�務",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "託管",
    "settings.service.form.tabOnPremise" : "自我託管��",
    "settings.service.form.team" : "團隊",
@@ -212,10 +232,17 @@
    "settings.services.discoverServices" : "發��務",
    "settings.services.headline" : "您的�務",
    "settings.services.noServicesAdded" : "你尚未新增任何�務",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "�務已�用",
    "settings.services.tooltip.isMuted" : "所有的�音都是�音",
    "settings.services.tooltip.notificationsDisabled" : "通知已�用",
-   "settings.services.updatedInfo" : "你的更變已經儲存",
+   "settings.services.updatedInfo" : "已儲存你的變更",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "團隊",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
    "settings.user.form.accountType.company" : "公�",
    "settings.user.form.accountType.individual" : "個人",
    "settings.user.form.accountType.label" : "帳戶類型",
@@ -225,8 +252,25 @@
    "settings.user.form.firstname" : "�",
    "settings.user.form.lastname" : "姓",
    "settings.user.form.newPassword" : "新密碼",
+   "settings.workspace.add.form.name" : "�稱",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "�稱",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "�試一次",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz 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" : "Could not load your workspaces",
    "sidebar.addNewService" : "新增新的�務",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "關閉通知和通知音效",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "設定",
    "sidebar.unmuteApp" : "開啟通知和通知音效",
    "signup.company.label" : "公�",
@@ -235,7 +279,7 @@
    "signup.firstname.label" : "�",
    "signup.headline" : "註冊",
    "signup.lastname.label" : "姓",
-   "signup.legal.info" : "你接���創建一個Franz帳戶",
+   "signup.legal.info" : "��創建一個 Franz 帳戶，你��",
    "signup.legal.privacy" : "隱��明",
    "signup.legal.terms" : "�務�款",
    "signup.link.login" : "已經有一個帳戶，登入？",
@@ -244,15 +288,14 @@
    "subscription.euTaxInfo" : "�盟居民：�能採用當地銷售稅",
    "subscription.features.ads" : "無廣告，永�!",
    "subscription.features.comingSoon" : "�將推出",
-   "subscription.features.encryptedSync" : "加密的會話�步",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "添加本地\/託管�務如HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.features.noInterruptions" : "�級授權沒有延�與打盹",
+   "subscription.features.onpremise.mattermost" : "加入如 Mattermost 等已�定 \/ 託管的�務",
+   "subscription.features.proxy" : "�務的代�伺�器支�",
    "subscription.features.spellchecker" : "支�拼字檢查",
-   "subscription.includedFeatures" : "包�高級Franz付費帳戶",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
+   "subscription.includedFeatures" : "Franz 高級支�帳戶包�",
    "subscription.paymentSessionError" : "無法�始化付款表單",
-   "subscription.submit.label" : "我想支�Franz的開發",
+   "subscription.submit.label" : "我想支� Franz 開發",
    "subscription.type.free" : "自由",
    "subscription.type.month" : "月",
    "subscription.type.year" : "å¹´",
@@ -269,9 +312,20 @@
    "tabs.item.reload" : "�新載入",
    "validation.email" : "{field}無效",
    "validation.minLength" : "{field}長度至少應為{length}個字",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field}為必填",
    "validation.url" : "{field}�是個有效的網�",
    "welcome.loginButton" : "登入您的帳戶",
    "welcome.signupButton" : "建立�費帳號",
-   "welcome.slogan" : "為你通信"
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "所有�務",
+   "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>Franz 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/manage-translations.js b/src/i18n/manage-translations.js
new file mode 100644
index 000000000..ee64c9c09
--- /dev/null
+++ b/src/i18n/manage-translations.js
@@ -0,0 +1,9 @@
+require('@babel/register');
+const manageTranslations = require('react-intl-translations-manager').default;
+
+manageTranslations({
+  messagesDirectory: 'src/i18n/messages',
+  translationsDirectory: 'src/i18n/locales',
+  singleMessagesFile: true,
+  languages: ['en-US'],
+});
diff --git a/src/i18n/messages/src/components/auth/Import.json b/src/i18n/messages/src/components/auth/Import.json
new file mode 100644
index 000000000..264fc729b
--- /dev/null
+++ b/src/i18n/messages/src/components/auth/Import.json
@@ -0,0 +1,54 @@
+[
+  {
+    "id": "import.headline",
+    "defaultMessage": "!!!Import your Franz 4 services",
+    "file": "src/components/auth/Import.js",
+    "start": {
+      "line": 13,
+      "column": 12
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "import.notSupportedHeadline",
+    "defaultMessage": "!!!Services not yet supported in Franz 5",
+    "file": "src/components/auth/Import.js",
+    "start": {
+      "line": 17,
+      "column": 24
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "import.submit.label",
+    "defaultMessage": "!!!Import {count} services",
+    "file": "src/components/auth/Import.js",
+    "start": {
+      "line": 21,
+      "column": 21
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "import.skip.label",
+    "defaultMessage": "!!!I want to add services manually",
+    "file": "src/components/auth/Import.js",
+    "start": {
+      "line": 25,
+      "column": 19
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Invite.json b/src/i18n/messages/src/components/auth/Invite.json
new file mode 100644
index 000000000..57c9bddcf
--- /dev/null
+++ b/src/i18n/messages/src/components/auth/Invite.json
@@ -0,0 +1,93 @@
+[
+  {
+    "id": "settings.invite.headline",
+    "defaultMessage": "!!!Invite Friends",
+    "file": "src/components/auth/Invite.js",
+    "start": {
+      "line": 16,
+      "column": 20
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  },
+  {
+    "id": "invite.headline.friends",
+    "defaultMessage": "!!!Invite 3 of your friends or colleagues",
+    "file": "src/components/auth/Invite.js",
+    "start": {
+      "line": 20,
+      "column": 12
+    },
+    "end": {
+      "line": 23,
+      "column": 3
+    }
+  },
+  {
+    "id": "invite.name.label",
+    "defaultMessage": "!!!Name",
+    "file": "src/components/auth/Invite.js",
+    "start": {
+      "line": 24,
+      "column": 13
+    },
+    "end": {
+      "line": 27,
+      "column": 3
+    }
+  },
+  {
+    "id": "invite.email.label",
+    "defaultMessage": "!!!Email address",
+    "file": "src/components/auth/Invite.js",
+    "start": {
+      "line": 28,
+      "column": 14
+    },
+    "end": {
+      "line": 31,
+      "column": 3
+    }
+  },
+  {
+    "id": "invite.submit.label",
+    "defaultMessage": "!!!Send invites",
+    "file": "src/components/auth/Invite.js",
+    "start": {
+      "line": 32,
+      "column": 21
+    },
+    "end": {
+      "line": 35,
+      "column": 3
+    }
+  },
+  {
+    "id": "invite.skip.label",
+    "defaultMessage": "!!!I want to do this later",
+    "file": "src/components/auth/Invite.js",
+    "start": {
+      "line": 36,
+      "column": 19
+    },
+    "end": {
+      "line": 39,
+      "column": 3
+    }
+  },
+  {
+    "id": "invite.successInfo",
+    "defaultMessage": "!!!Invitations sent successfully",
+    "file": "src/components/auth/Invite.js",
+    "start": {
+      "line": 40,
+      "column": 21
+    },
+    "end": {
+      "line": 43,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Login.json b/src/i18n/messages/src/components/auth/Login.json
new file mode 100644
index 000000000..177f6000b
--- /dev/null
+++ b/src/i18n/messages/src/components/auth/Login.json
@@ -0,0 +1,119 @@
+[
+  {
+    "id": "login.headline",
+    "defaultMessage": "!!!Sign in",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 17,
+      "column": 12
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.email.label",
+    "defaultMessage": "!!!Email address",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 21,
+      "column": 14
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.password.label",
+    "defaultMessage": "!!!Password",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 25,
+      "column": 17
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.submit.label",
+    "defaultMessage": "!!!Sign in",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 29,
+      "column": 21
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.invalidCredentials",
+    "defaultMessage": "!!!Email or password not valid",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 33,
+      "column": 22
+    },
+    "end": {
+      "line": 36,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.tokenExpired",
+    "defaultMessage": "!!!Your session expired, please login again.",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 37,
+      "column": 16
+    },
+    "end": {
+      "line": 40,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.serverLogout",
+    "defaultMessage": "!!!Your session expired, please login again.",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 41,
+      "column": 16
+    },
+    "end": {
+      "line": 44,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.link.signup",
+    "defaultMessage": "!!!Create a free account",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 45,
+      "column": 14
+    },
+    "end": {
+      "line": 48,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.link.password",
+    "defaultMessage": "!!!Forgot password",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 49,
+      "column": 16
+    },
+    "end": {
+      "line": 52,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Password.json b/src/i18n/messages/src/components/auth/Password.json
new file mode 100644
index 000000000..f335b3acb
--- /dev/null
+++ b/src/i18n/messages/src/components/auth/Password.json
@@ -0,0 +1,93 @@
+[
+  {
+    "id": "password.headline",
+    "defaultMessage": "!!!Forgot password",
+    "file": "src/components/auth/Password.js",
+    "start": {
+      "line": 14,
+      "column": 12
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "password.email.label",
+    "defaultMessage": "!!!Email address",
+    "file": "src/components/auth/Password.js",
+    "start": {
+      "line": 18,
+      "column": 14
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "password.submit.label",
+    "defaultMessage": "!!!Submit",
+    "file": "src/components/auth/Password.js",
+    "start": {
+      "line": 22,
+      "column": 21
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "password.successInfo",
+    "defaultMessage": "!!!Your new password was sent to your email address",
+    "file": "src/components/auth/Password.js",
+    "start": {
+      "line": 26,
+      "column": 15
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "password.noUser",
+    "defaultMessage": "!!!No user affiliated with that email address",
+    "file": "src/components/auth/Password.js",
+    "start": {
+      "line": 30,
+      "column": 10
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "password.link.signup",
+    "defaultMessage": "!!!Create a free account",
+    "file": "src/components/auth/Password.js",
+    "start": {
+      "line": 34,
+      "column": 14
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "password.link.login",
+    "defaultMessage": "!!!Sign in to your account",
+    "file": "src/components/auth/Password.js",
+    "start": {
+      "line": 38,
+      "column": 13
+    },
+    "end": {
+      "line": 41,
+      "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
new file mode 100644
index 000000000..f711a55b4
--- /dev/null
+++ b/src/i18n/messages/src/components/auth/Pricing.json
@@ -0,0 +1,54 @@
+[
+  {
+    "id": "pricing.headline",
+    "defaultMessage": "!!!Support Franz",
+    "file": "src/components/auth/Pricing.js",
+    "start": {
+      "line": 13,
+      "column": 12
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.support.label",
+    "defaultMessage": "!!!Select your support plan",
+    "file": "src/components/auth/Pricing.js",
+    "start": {
+      "line": 17,
+      "column": 23
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.submit.label",
+    "defaultMessage": "!!!Support the development of Franz",
+    "file": "src/components/auth/Pricing.js",
+    "start": {
+      "line": 21,
+      "column": 21
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.link.skipPayment",
+    "defaultMessage": "!!!I don't want to support the development of Franz.",
+    "file": "src/components/auth/Pricing.js",
+    "start": {
+      "line": 25,
+      "column": 15
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Signup.json b/src/i18n/messages/src/components/auth/Signup.json
new file mode 100644
index 000000000..a09745048
--- /dev/null
+++ b/src/i18n/messages/src/components/auth/Signup.json
@@ -0,0 +1,158 @@
+[
+  {
+    "id": "signup.headline",
+    "defaultMessage": "!!!Sign up",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 18,
+      "column": 12
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.firstname.label",
+    "defaultMessage": "!!!Firstname",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 22,
+      "column": 18
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.lastname.label",
+    "defaultMessage": "!!!Lastname",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 26,
+      "column": 17
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.email.label",
+    "defaultMessage": "!!!Email address",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 30,
+      "column": 14
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.company.label",
+    "defaultMessage": "!!!Company",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 34,
+      "column": 16
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.password.label",
+    "defaultMessage": "!!!Password",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 38,
+      "column": 17
+    },
+    "end": {
+      "line": 41,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.legal.info",
+    "defaultMessage": "!!!By creating a Franz account you accept the",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 42,
+      "column": 13
+    },
+    "end": {
+      "line": 45,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.legal.terms",
+    "defaultMessage": "!!!Terms of service",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 46,
+      "column": 9
+    },
+    "end": {
+      "line": 49,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.legal.privacy",
+    "defaultMessage": "!!!Privacy Statement",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 50,
+      "column": 11
+    },
+    "end": {
+      "line": 53,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.submit.label",
+    "defaultMessage": "!!!Create account",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 54,
+      "column": 21
+    },
+    "end": {
+      "line": 57,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.link.login",
+    "defaultMessage": "!!!Already have an account, sign in?",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 58,
+      "column": 13
+    },
+    "end": {
+      "line": 61,
+      "column": 3
+    }
+  },
+  {
+    "id": "signup.emailDuplicate",
+    "defaultMessage": "!!!A user with that email address already exists",
+    "file": "src/components/auth/Signup.js",
+    "start": {
+      "line": 62,
+      "column": 18
+    },
+    "end": {
+      "line": 65,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Welcome.json b/src/i18n/messages/src/components/auth/Welcome.json
new file mode 100644
index 000000000..b4d2ce689
--- /dev/null
+++ b/src/i18n/messages/src/components/auth/Welcome.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "welcome.signupButton",
+    "defaultMessage": "!!!Create a free account",
+    "file": "src/components/auth/Welcome.js",
+    "start": {
+      "line": 9,
+      "column": 16
+    },
+    "end": {
+      "line": 12,
+      "column": 3
+    }
+  },
+  {
+    "id": "welcome.loginButton",
+    "defaultMessage": "!!!Login to your account",
+    "file": "src/components/auth/Welcome.js",
+    "start": {
+      "line": 13,
+      "column": 15
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/layout/AppLayout.json b/src/i18n/messages/src/components/layout/AppLayout.json
new file mode 100644
index 000000000..26b8ce040
--- /dev/null
+++ b/src/i18n/messages/src/components/layout/AppLayout.json
@@ -0,0 +1,80 @@
+[
+  {
+    "id": "infobar.servicesUpdated",
+    "defaultMessage": "!!!Your services have been updated.",
+    "file": "src/components/layout/AppLayout.js",
+    "start": {
+      "line": 27,
+      "column": 19
+    },
+    "end": {
+      "line": 30,
+      "column": 3
+    }
+  },
+  {
+    "id": "infobar.updateAvailable",
+    "defaultMessage": "!!!A new update for Franz is available.",
+    "file": "src/components/layout/AppLayout.js",
+    "start": {
+      "line": 31,
+      "column": 19
+    },
+    "end": {
+      "line": 34,
+      "column": 3
+    }
+  },
+  {
+    "id": "infobar.buttonReloadServices",
+    "defaultMessage": "!!!Reload services",
+    "file": "src/components/layout/AppLayout.js",
+    "start": {
+      "line": 35,
+      "column": 24
+    },
+    "end": {
+      "line": 38,
+      "column": 3
+    }
+  },
+  {
+    "id": "infobar.buttonChangelog",
+    "defaultMessage": "!!!Changelog",
+    "file": "src/components/layout/AppLayout.js",
+    "start": {
+      "line": 39,
+      "column": 13
+    },
+    "end": {
+      "line": 42,
+      "column": 3
+    }
+  },
+  {
+    "id": "infobar.buttonInstallUpdate",
+    "defaultMessage": "!!!Restart & install update",
+    "file": "src/components/layout/AppLayout.js",
+    "start": {
+      "line": 43,
+      "column": 23
+    },
+    "end": {
+      "line": 46,
+      "column": 3
+    }
+  },
+  {
+    "id": "infobar.requiredRequestsFailed",
+    "defaultMessage": "!!!Could not load services and user information",
+    "file": "src/components/layout/AppLayout.js",
+    "start": {
+      "line": 47,
+      "column": 26
+    },
+    "end": {
+      "line": 50,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/layout/Sidebar.json b/src/i18n/messages/src/components/layout/Sidebar.json
new file mode 100644
index 000000000..d67adc96e
--- /dev/null
+++ b/src/i18n/messages/src/components/layout/Sidebar.json
@@ -0,0 +1,80 @@
+[
+  {
+    "id": "sidebar.settings",
+    "defaultMessage": "!!!Settings",
+    "file": "src/components/layout/Sidebar.js",
+    "start": {
+      "line": 13,
+      "column": 12
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "sidebar.addNewService",
+    "defaultMessage": "!!!Add new service",
+    "file": "src/components/layout/Sidebar.js",
+    "start": {
+      "line": 17,
+      "column": 17
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "sidebar.muteApp",
+    "defaultMessage": "!!!Disable notifications & audio",
+    "file": "src/components/layout/Sidebar.js",
+    "start": {
+      "line": 21,
+      "column": 8
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "sidebar.unmuteApp",
+    "defaultMessage": "!!!Enable notifications & audio",
+    "file": "src/components/layout/Sidebar.js",
+    "start": {
+      "line": 25,
+      "column": 10
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "sidebar.openWorkspaceDrawer",
+    "defaultMessage": "!!!Open workspace drawer",
+    "file": "src/components/layout/Sidebar.js",
+    "start": {
+      "line": 29,
+      "column": 23
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  },
+  {
+    "id": "sidebar.closeWorkspaceDrawer",
+    "defaultMessage": "!!!Close workspace drawer",
+    "file": "src/components/layout/Sidebar.js",
+    "start": {
+      "line": 33,
+      "column": 24
+    },
+    "end": {
+      "line": 36,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json b/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json
new file mode 100644
index 000000000..c8fe802df
--- /dev/null
+++ b/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json
@@ -0,0 +1,67 @@
+[
+  {
+    "id": "service.errorHandler.headline",
+    "defaultMessage": "!!!Oh no!",
+    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+    "start": {
+      "line": 12,
+      "column": 12
+    },
+    "end": {
+      "line": 15,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.errorHandler.text",
+    "defaultMessage": "!!!{name} has failed to load.",
+    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+    "start": {
+      "line": 16,
+      "column": 8
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.errorHandler.action",
+    "defaultMessage": "!!!Reload {name}",
+    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+    "start": {
+      "line": 20,
+      "column": 10
+    },
+    "end": {
+      "line": 23,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.errorHandler.editAction",
+    "defaultMessage": "!!!Edit {name}",
+    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+    "start": {
+      "line": 24,
+      "column": 14
+    },
+    "end": {
+      "line": 27,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.errorHandler.message",
+    "defaultMessage": "!!!Error:",
+    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
+    "start": {
+      "line": 28,
+      "column": 16
+    },
+    "end": {
+      "line": 31,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ServiceDisabled.json b/src/i18n/messages/src/components/services/content/ServiceDisabled.json
new file mode 100644
index 000000000..8bfad28c7
--- /dev/null
+++ b/src/i18n/messages/src/components/services/content/ServiceDisabled.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "service.disabledHandler.headline",
+    "defaultMessage": "!!!{name} is disabled",
+    "file": "src/components/services/content/ServiceDisabled.js",
+    "start": {
+      "line": 9,
+      "column": 12
+    },
+    "end": {
+      "line": 12,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.disabledHandler.action",
+    "defaultMessage": "!!!Enable {name}",
+    "file": "src/components/services/content/ServiceDisabled.js",
+    "start": {
+      "line": 13,
+      "column": 10
+    },
+    "end": {
+      "line": 16,
+      "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
new file mode 100644
index 000000000..884ab0c90
--- /dev/null
+++ b/src/i18n/messages/src/components/services/content/Services.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "services.welcome",
+    "defaultMessage": "!!!Welcome to Franz",
+    "file": "src/components/services/content/Services.js",
+    "start": {
+      "line": 11,
+      "column": 11
+    },
+    "end": {
+      "line": 14,
+      "column": 3
+    }
+  },
+  {
+    "id": "services.getStarted",
+    "defaultMessage": "!!!Get started",
+    "file": "src/components/services/content/Services.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/services/content/WebviewCrashHandler.json b/src/i18n/messages/src/components/services/content/WebviewCrashHandler.json
new file mode 100644
index 000000000..c3d6c41a5
--- /dev/null
+++ b/src/i18n/messages/src/components/services/content/WebviewCrashHandler.json
@@ -0,0 +1,54 @@
+[
+  {
+    "id": "service.crashHandler.headline",
+    "defaultMessage": "!!!Oh no!",
+    "file": "src/components/services/content/WebviewCrashHandler.js",
+    "start": {
+      "line": 10,
+      "column": 12
+    },
+    "end": {
+      "line": 13,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.crashHandler.text",
+    "defaultMessage": "!!!{name} has caused an error.",
+    "file": "src/components/services/content/WebviewCrashHandler.js",
+    "start": {
+      "line": 14,
+      "column": 8
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.crashHandler.action",
+    "defaultMessage": "!!!Reload {name}",
+    "file": "src/components/services/content/WebviewCrashHandler.js",
+    "start": {
+      "line": 18,
+      "column": 10
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.crashHandler.autoReload",
+    "defaultMessage": "!!!Trying to automatically restore {name} in {seconds} seconds",
+    "file": "src/components/services/content/WebviewCrashHandler.js",
+    "start": {
+      "line": 22,
+      "column": 14
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/tabs/TabItem.json b/src/i18n/messages/src/components/services/tabs/TabItem.json
new file mode 100644
index 000000000..08a07845c
--- /dev/null
+++ b/src/i18n/messages/src/components/services/tabs/TabItem.json
@@ -0,0 +1,119 @@
+[
+  {
+    "id": "tabs.item.reload",
+    "defaultMessage": "!!!Reload",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 15,
+      "column": 10
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.edit",
+    "defaultMessage": "!!!Edit",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 19,
+      "column": 8
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.disableNotifications",
+    "defaultMessage": "!!!Disable notifications",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 23,
+      "column": 24
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.enableNotification",
+    "defaultMessage": "!!!Enable notifications",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 27,
+      "column": 23
+    },
+    "end": {
+      "line": 30,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.disableAudio",
+    "defaultMessage": "!!!Disable audio",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 31,
+      "column": 16
+    },
+    "end": {
+      "line": 34,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.enableAudio",
+    "defaultMessage": "!!!Enable audio",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 35,
+      "column": 15
+    },
+    "end": {
+      "line": 38,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.disableService",
+    "defaultMessage": "!!!Disable Service",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 39,
+      "column": 18
+    },
+    "end": {
+      "line": 42,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.enableService",
+    "defaultMessage": "!!!Enable Service",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 43,
+      "column": 17
+    },
+    "end": {
+      "line": 46,
+      "column": 3
+    }
+  },
+  {
+    "id": "tabs.item.deleteService",
+    "defaultMessage": "!!!Delete Service",
+    "file": "src/components/services/tabs/TabItem.js",
+    "start": {
+      "line": 47,
+      "column": 17
+    },
+    "end": {
+      "line": 50,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/account/AccountDashboard.json b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
new file mode 100644
index 000000000..4969db910
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
@@ -0,0 +1,197 @@
+[
+  {
+    "id": "settings.account.headline",
+    "defaultMessage": "!!!Account",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 14,
+      "column": 12
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.headlineSubscription",
+    "defaultMessage": "!!!Your Subscription",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 18,
+      "column": 24
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.headlineUpgrade",
+    "defaultMessage": "!!!Upgrade your Account",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 22,
+      "column": 19
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.headlineDangerZone",
+    "defaultMessage": "!!Danger Zone",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 26,
+      "column": 22
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.manageSubscription.label",
+    "defaultMessage": "!!!Manage your subscription",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 30,
+      "column": 33
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.accountType.basic",
+    "defaultMessage": "!!!Basic Account",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 34,
+      "column": 20
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.accountType.premium",
+    "defaultMessage": "!!!Premium Supporter Account",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 38,
+      "column": 22
+    },
+    "end": {
+      "line": 41,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.account.editButton",
+    "defaultMessage": "!!!Edit Account",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 42,
+      "column": 21
+    },
+    "end": {
+      "line": 45,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.headlineInvoices",
+    "defaultMessage": "!!Invoices",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 46,
+      "column": 18
+    },
+    "end": {
+      "line": 49,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.invoiceDownload",
+    "defaultMessage": "!!!Download",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 50,
+      "column": 19
+    },
+    "end": {
+      "line": 53,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.userInfoRequestFailed",
+    "defaultMessage": "!!!Could not load user information",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 54,
+      "column": 25
+    },
+    "end": {
+      "line": 57,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.tryReloadUserInfoRequest",
+    "defaultMessage": "!!!Try again",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 58,
+      "column": 28
+    },
+    "end": {
+      "line": 61,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.deleteAccount",
+    "defaultMessage": "!!!Delete account",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 62,
+      "column": 17
+    },
+    "end": {
+      "line": 65,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.deleteInfo",
+    "defaultMessage": "!!!If you don't need your Franz account any longer, you can delete your account and all related data here.",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 66,
+      "column": 14
+    },
+    "end": {
+      "line": 69,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.deleteEmailSent",
+    "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": 70,
+      "column": 19
+    },
+    "end": {
+      "line": 73,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
new file mode 100644
index 000000000..70a989211
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
@@ -0,0 +1,106 @@
+[
+  {
+    "id": "settings.navigation.availableServices",
+    "defaultMessage": "!!!Available services",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 13,
+      "column": 21
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.navigation.yourServices",
+    "defaultMessage": "!!!Your services",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 17,
+      "column": 16
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.navigation.yourWorkspaces",
+    "defaultMessage": "!!!Your workspaces",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 21,
+      "column": 18
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.navigation.account",
+    "defaultMessage": "!!!Account",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 25,
+      "column": 11
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.navigation.team",
+    "defaultMessage": "!!!Manage Team",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 29,
+      "column": 8
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.navigation.settings",
+    "defaultMessage": "!!!Settings",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 33,
+      "column": 12
+    },
+    "end": {
+      "line": 36,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.navigation.inviteFriends",
+    "defaultMessage": "!!!Invite Friends",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 37,
+      "column": 17
+    },
+    "end": {
+      "line": 40,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.navigation.logout",
+    "defaultMessage": "!!!Logout",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 41,
+      "column": 10
+    },
+    "end": {
+      "line": 44,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json b/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
new file mode 100644
index 000000000..7d9ed3283
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
@@ -0,0 +1,106 @@
+[
+  {
+    "id": "settings.recipes.headline",
+    "defaultMessage": "!!!Available Services",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 15,
+      "column": 12
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.searchService",
+    "defaultMessage": "!!!Search service",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 19,
+      "column": 17
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.mostPopular",
+    "defaultMessage": "!!!Most popular",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 23,
+      "column": 22
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.all",
+    "defaultMessage": "!!!All services",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 27,
+      "column": 14
+    },
+    "end": {
+      "line": 30,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.dev",
+    "defaultMessage": "!!!Development",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 31,
+      "column": 14
+    },
+    "end": {
+      "line": 34,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.nothingFound",
+    "defaultMessage": "!!!Sorry, but no service matched your search term.",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 35,
+      "column": 16
+    },
+    "end": {
+      "line": 38,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.servicesSuccessfulAddedInfo",
+    "defaultMessage": "!!!Service successfully added",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 39,
+      "column": 31
+    },
+    "end": {
+      "line": 42,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.missingService",
+    "defaultMessage": "!!!Missing a service?",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 43,
+      "column": 18
+    },
+    "end": {
+      "line": 46,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/EditServiceForm.json b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
new file mode 100644
index 000000000..42b741b7a
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
@@ -0,0 +1,288 @@
+[
+  {
+    "id": "settings.service.form.saveButton",
+    "defaultMessage": "!!!Save service",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 22,
+      "column": 15
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.deleteButton",
+    "defaultMessage": "!!!Delete Service",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 26,
+      "column": 17
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.availableServices",
+    "defaultMessage": "!!!Available services",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 30,
+      "column": 21
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.yourServices",
+    "defaultMessage": "!!!Your services",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 34,
+      "column": 16
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.addServiceHeadline",
+    "defaultMessage": "!!!Add {name}",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 38,
+      "column": 22
+    },
+    "end": {
+      "line": 41,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.editServiceHeadline",
+    "defaultMessage": "!!!Edit {name}",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 42,
+      "column": 23
+    },
+    "end": {
+      "line": 45,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.tabHosted",
+    "defaultMessage": "!!!Hosted",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 46,
+      "column": 13
+    },
+    "end": {
+      "line": 49,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.tabOnPremise",
+    "defaultMessage": "!!!Self hosted ��",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 50,
+      "column": 16
+    },
+    "end": {
+      "line": 53,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.useHostedService",
+    "defaultMessage": "!!!Use the hosted {name} service.",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 54,
+      "column": 20
+    },
+    "end": {
+      "line": 57,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.customUrlValidationError",
+    "defaultMessage": "!!!Could not validate custom {name} server.",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 58,
+      "column": 28
+    },
+    "end": {
+      "line": 61,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.customUrlPremiumInfo",
+    "defaultMessage": "!!!To add self hosted services, you need a Franz Premium Supporter Account.",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 62,
+      "column": 24
+    },
+    "end": {
+      "line": 65,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.customUrlUpgradeAccount",
+    "defaultMessage": "!!!Upgrade your account",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 66,
+      "column": 27
+    },
+    "end": {
+      "line": 69,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.indirectMessageInfo",
+    "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": 70,
+      "column": 23
+    },
+    "end": {
+      "line": 73,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.isMutedInfo",
+    "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 74,
+      "column": 15
+    },
+    "end": {
+      "line": 77,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.headlineNotifications",
+    "defaultMessage": "!!!Notifications",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 78,
+      "column": 25
+    },
+    "end": {
+      "line": 81,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.headlineBadges",
+    "defaultMessage": "!!!Unread message badges",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 82,
+      "column": 18
+    },
+    "end": {
+      "line": 85,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.headlineGeneral",
+    "defaultMessage": "!!!General",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 86,
+      "column": 19
+    },
+    "end": {
+      "line": 89,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.iconDelete",
+    "defaultMessage": "!!!Delete",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 90,
+      "column": 14
+    },
+    "end": {
+      "line": 93,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.iconUpload",
+    "defaultMessage": "!!!Drop your image, or click here",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 94,
+      "column": 14
+    },
+    "end": {
+      "line": 97,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.proxy.headline",
+    "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 98,
+      "column": 17
+    },
+    "end": {
+      "line": 101,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.proxy.restartInfo",
+    "defaultMessage": "!!!Please restart Franz after changing proxy Settings.",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 102,
+      "column": 20
+    },
+    "end": {
+      "line": 105,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.proxy.info",
+    "defaultMessage": "!!!Proxy settings will not be synchronized with the Franz servers.",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 106,
+      "column": 13
+    },
+    "end": {
+      "line": 109,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/ServiceError.json b/src/i18n/messages/src/components/settings/services/ServiceError.json
new file mode 100644
index 000000000..648fc5b3e
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/services/ServiceError.json
@@ -0,0 +1,54 @@
+[
+  {
+    "id": "settings.service.error.headline",
+    "defaultMessage": "!!!Error",
+    "file": "src/components/settings/services/ServiceError.js",
+    "start": {
+      "line": 10,
+      "column": 12
+    },
+    "end": {
+      "line": 13,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.error.goBack",
+    "defaultMessage": "!!!Back to services",
+    "file": "src/components/settings/services/ServiceError.js",
+    "start": {
+      "line": 14,
+      "column": 10
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.availableServices",
+    "defaultMessage": "!!!Available services",
+    "file": "src/components/settings/services/ServiceError.js",
+    "start": {
+      "line": 18,
+      "column": 21
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.error.message",
+    "defaultMessage": "!!!Could not load service recipe.",
+    "file": "src/components/settings/services/ServiceError.js",
+    "start": {
+      "line": 22,
+      "column": 16
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/ServiceItem.json b/src/i18n/messages/src/components/settings/services/ServiceItem.json
new file mode 100644
index 000000000..ffea8b9e1
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/services/ServiceItem.json
@@ -0,0 +1,41 @@
+[
+  {
+    "id": "settings.services.tooltip.isDisabled",
+    "defaultMessage": "!!!Service is disabled",
+    "file": "src/components/settings/services/ServiceItem.js",
+    "start": {
+      "line": 11,
+      "column": 21
+    },
+    "end": {
+      "line": 14,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.services.tooltip.notificationsDisabled",
+    "defaultMessage": "!!!Notifications are disabled",
+    "file": "src/components/settings/services/ServiceItem.js",
+    "start": {
+      "line": 15,
+      "column": 32
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.services.tooltip.isMuted",
+    "defaultMessage": "!!!All sounds are muted",
+    "file": "src/components/settings/services/ServiceItem.js",
+    "start": {
+      "line": 19,
+      "column": 18
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/ServicesDashboard.json b/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
new file mode 100644
index 000000000..3803c6512
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
@@ -0,0 +1,119 @@
+[
+  {
+    "id": "settings.services.headline",
+    "defaultMessage": "!!!Your services",
+    "file": "src/components/settings/services/ServicesDashboard.js",
+    "start": {
+      "line": 14,
+      "column": 12
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.searchService",
+    "defaultMessage": "!!!Search service",
+    "file": "src/components/settings/services/ServicesDashboard.js",
+    "start": {
+      "line": 18,
+      "column": 17
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.services.noServicesAdded",
+    "defaultMessage": "!!!You haven't added any services yet.",
+    "file": "src/components/settings/services/ServicesDashboard.js",
+    "start": {
+      "line": 22,
+      "column": 19
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.nothingFound",
+    "defaultMessage": "!!!Sorry, but no service matched your search term.",
+    "file": "src/components/settings/services/ServicesDashboard.js",
+    "start": {
+      "line": 26,
+      "column": 18
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.services.discoverServices",
+    "defaultMessage": "!!!Discover services",
+    "file": "src/components/settings/services/ServicesDashboard.js",
+    "start": {
+      "line": 30,
+      "column": 20
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.services.servicesRequestFailed",
+    "defaultMessage": "!!!Could not load your services",
+    "file": "src/components/settings/services/ServicesDashboard.js",
+    "start": {
+      "line": 34,
+      "column": 25
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.tryReloadServices",
+    "defaultMessage": "!!!Try again",
+    "file": "src/components/settings/services/ServicesDashboard.js",
+    "start": {
+      "line": 38,
+      "column": 21
+    },
+    "end": {
+      "line": 41,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.services.updatedInfo",
+    "defaultMessage": "!!!Your changes have been saved",
+    "file": "src/components/settings/services/ServicesDashboard.js",
+    "start": {
+      "line": 42,
+      "column": 15
+    },
+    "end": {
+      "line": 45,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.services.deletedInfo",
+    "defaultMessage": "!!!Service has been deleted",
+    "file": "src/components/settings/services/ServicesDashboard.js",
+    "start": {
+      "line": 46,
+      "column": 15
+    },
+    "end": {
+      "line": 49,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
new file mode 100644
index 000000000..fa21db10a
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -0,0 +1,236 @@
+[
+  {
+    "id": "settings.app.headline",
+    "defaultMessage": "!!!Settings",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 16,
+      "column": 12
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.headlineGeneral",
+    "defaultMessage": "!!!General",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 20,
+      "column": 19
+    },
+    "end": {
+      "line": 23,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.headlineLanguage",
+    "defaultMessage": "!!!Language",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 24,
+      "column": 20
+    },
+    "end": {
+      "line": 27,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.headlineUpdates",
+    "defaultMessage": "!!!Updates",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 28,
+      "column": 19
+    },
+    "end": {
+      "line": 31,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.headlineAppearance",
+    "defaultMessage": "!!!Appearance",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 32,
+      "column": 22
+    },
+    "end": {
+      "line": 35,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.headlineAdvanced",
+    "defaultMessage": "!!!Advanced",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 36,
+      "column": 20
+    },
+    "end": {
+      "line": 39,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.translationHelp",
+    "defaultMessage": "!!!Help us to translate Franz into your language.",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 40,
+      "column": 19
+    },
+    "end": {
+      "line": 43,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.subheadlineCache",
+    "defaultMessage": "!!!Cache",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 44,
+      "column": 20
+    },
+    "end": {
+      "line": 47,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.cacheInfo",
+    "defaultMessage": "!!!Franz cache is currently using {size} of disk space.",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 48,
+      "column": 13
+    },
+    "end": {
+      "line": 51,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.buttonClearAllCache",
+    "defaultMessage": "!!!Clear cache",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 52,
+      "column": 23
+    },
+    "end": {
+      "line": 55,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.buttonSearchForUpdate",
+    "defaultMessage": "!!!Check for updates",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 56,
+      "column": 25
+    },
+    "end": {
+      "line": 59,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.buttonInstallUpdate",
+    "defaultMessage": "!!!Restart & install update",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 60,
+      "column": 23
+    },
+    "end": {
+      "line": 63,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.updateStatusSearching",
+    "defaultMessage": "!!!Is searching for update",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 64,
+      "column": 25
+    },
+    "end": {
+      "line": 67,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.updateStatusAvailable",
+    "defaultMessage": "!!!Update available, downloading...",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 68,
+      "column": 25
+    },
+    "end": {
+      "line": 71,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.updateStatusUpToDate",
+    "defaultMessage": "!!!You are using the latest version of Franz",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 72,
+      "column": 24
+    },
+    "end": {
+      "line": 75,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.currentVersion",
+    "defaultMessage": "!!!Current version:",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 76,
+      "column": 18
+    },
+    "end": {
+      "line": 79,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.restartRequired",
+    "defaultMessage": "!!!Changes require restart",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 80,
+      "column": 29
+    },
+    "end": {
+      "line": 83,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.languageDisclaimer",
+    "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 84,
+      "column": 22
+    },
+    "end": {
+      "line": 87,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/team/TeamDashboard.json b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
new file mode 100644
index 000000000..6bccc25ff
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
@@ -0,0 +1,80 @@
+[
+  {
+    "id": "settings.team.headline",
+    "defaultMessage": "!!!Team",
+    "file": "src/components/settings/team/TeamDashboard.js",
+    "start": {
+      "line": 14,
+      "column": 12
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.team.contentHeadline",
+    "defaultMessage": "!!!Franz for Teams",
+    "file": "src/components/settings/team/TeamDashboard.js",
+    "start": {
+      "line": 18,
+      "column": 19
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.team.intro",
+    "defaultMessage": "!!!You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+    "file": "src/components/settings/team/TeamDashboard.js",
+    "start": {
+      "line": 22,
+      "column": 9
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.team.copy",
+    "defaultMessage": "!!!Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+    "file": "src/components/settings/team/TeamDashboard.js",
+    "start": {
+      "line": 26,
+      "column": 8
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.team.manageAction",
+    "defaultMessage": "!!!Manage your Team on meetfranz.com",
+    "file": "src/components/settings/team/TeamDashboard.js",
+    "start": {
+      "line": 30,
+      "column": 16
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.team.upgradeAction",
+    "defaultMessage": "!!!Upgrade your Account",
+    "file": "src/components/settings/team/TeamDashboard.js",
+    "start": {
+      "line": 34,
+      "column": 17
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/user/EditUserForm.json b/src/i18n/messages/src/components/settings/user/EditUserForm.json
new file mode 100644
index 000000000..3a59f8681
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/user/EditUserForm.json
@@ -0,0 +1,80 @@
+[
+  {
+    "id": "settings.account.headline",
+    "defaultMessage": "!!!Account",
+    "file": "src/components/settings/user/EditUserForm.js",
+    "start": {
+      "line": 15,
+      "column": 12
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.headlineProfile",
+    "defaultMessage": "!!!Update Profile",
+    "file": "src/components/settings/user/EditUserForm.js",
+    "start": {
+      "line": 19,
+      "column": 19
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.headlineAccount",
+    "defaultMessage": "!!!Account Information",
+    "file": "src/components/settings/user/EditUserForm.js",
+    "start": {
+      "line": 23,
+      "column": 19
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.headlinePassword",
+    "defaultMessage": "!!!Change Password",
+    "file": "src/components/settings/user/EditUserForm.js",
+    "start": {
+      "line": 27,
+      "column": 20
+    },
+    "end": {
+      "line": 30,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.successInfo",
+    "defaultMessage": "!!!Your changes have been saved",
+    "file": "src/components/settings/user/EditUserForm.js",
+    "start": {
+      "line": 31,
+      "column": 15
+    },
+    "end": {
+      "line": 34,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.buttonSave",
+    "defaultMessage": "!!!Update profile",
+    "file": "src/components/settings/user/EditUserForm.js",
+    "start": {
+      "line": 35,
+      "column": 14
+    },
+    "end": {
+      "line": 38,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/subscription/SubscriptionForm.json b/src/i18n/messages/src/components/subscription/SubscriptionForm.json
new file mode 100644
index 000000000..f98eb986f
--- /dev/null
+++ b/src/i18n/messages/src/components/subscription/SubscriptionForm.json
@@ -0,0 +1,184 @@
+[
+  {
+    "id": "subscription.submit.label",
+    "defaultMessage": "!!!Support the development of Franz",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 14,
+      "column": 21
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.paymentSessionError",
+    "defaultMessage": "!!!Could not initialize payment form",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 18,
+      "column": 23
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.type.free",
+    "defaultMessage": "!!!free",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 22,
+      "column": 12
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.type.month",
+    "defaultMessage": "!!!month",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 26,
+      "column": 15
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.type.year",
+    "defaultMessage": "!!!year",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 30,
+      "column": 14
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.includedFeatures",
+    "defaultMessage": "!!!The Franz Premium Supporter Account includes",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 34,
+      "column": 20
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.features.onpremise.mattermost",
+    "defaultMessage": "!!!Add on-premise/hosted services like Mattermost",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 38,
+      "column": 13
+    },
+    "end": {
+      "line": 41,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.features.noInterruptions",
+    "defaultMessage": "!!!No app delays & nagging to upgrade license",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 42,
+      "column": 19
+    },
+    "end": {
+      "line": 45,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.features.proxy",
+    "defaultMessage": "!!!Proxy support for services",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 46,
+      "column": 9
+    },
+    "end": {
+      "line": 49,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.features.spellchecker",
+    "defaultMessage": "!!!Support for Spellchecker",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 50,
+      "column": 16
+    },
+    "end": {
+      "line": 53,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.features.workspaces",
+    "defaultMessage": "!!!Organize your services in workspaces",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 54,
+      "column": 14
+    },
+    "end": {
+      "line": 57,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.features.ads",
+    "defaultMessage": "!!!No ads, ever!",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 58,
+      "column": 7
+    },
+    "end": {
+      "line": 61,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.features.comingSoon",
+    "defaultMessage": "!!!coming soon",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 62,
+      "column": 14
+    },
+    "end": {
+      "line": 65,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.euTaxInfo",
+    "defaultMessage": "!!!EU residents: local sales tax may apply",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 66,
+      "column": 13
+    },
+    "end": {
+      "line": 69,
+      "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
new file mode 100644
index 000000000..c06da7531
--- /dev/null
+++ b/src/i18n/messages/src/components/subscription/SubscriptionPopup.json
@@ -0,0 +1,28 @@
+[
+  {
+    "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/ui/PremiumFeatureContainer/index.json b/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
new file mode 100644
index 000000000..320d3ca3e
--- /dev/null
+++ b/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": "premiumFeature.button.upgradeAccount",
+    "defaultMessage": "!!!Upgrade account",
+    "file": "src/components/ui/PremiumFeatureContainer/index.js",
+    "start": {
+      "line": 15,
+      "column": 10
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/WebviewLoader/index.json b/src/i18n/messages/src/components/ui/WebviewLoader/index.json
new file mode 100644
index 000000000..ef3e4b593
--- /dev/null
+++ b/src/i18n/messages/src/components/ui/WebviewLoader/index.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": "service.webviewLoader.loading",
+    "defaultMessage": "!!!Loading",
+    "file": "src/components/ui/WebviewLoader/index.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/util/ErrorBoundary/index.json b/src/i18n/messages/src/components/util/ErrorBoundary/index.json
new file mode 100644
index 000000000..43c323031
--- /dev/null
+++ b/src/i18n/messages/src/components/util/ErrorBoundary/index.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "app.errorHandler.headline",
+    "defaultMessage": "!!!Something went wrong.",
+    "file": "src/components/util/ErrorBoundary/index.js",
+    "start": {
+      "line": 11,
+      "column": 12
+    },
+    "end": {
+      "line": 14,
+      "column": 3
+    }
+  },
+  {
+    "id": "app.errorHandler.action",
+    "defaultMessage": "!!!Reload",
+    "file": "src/components/util/ErrorBoundary/index.js",
+    "start": {
+      "line": 15,
+      "column": 10
+    },
+    "end": {
+      "line": 18,
+      "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
new file mode 100644
index 000000000..42ca42125
--- /dev/null
+++ b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
@@ -0,0 +1,197 @@
+[
+  {
+    "id": "settings.service.form.name",
+    "defaultMessage": "!!!Name",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 28,
+      "column": 8
+    },
+    "end": {
+      "line": 31,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.enableService",
+    "defaultMessage": "!!!Enable service",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 32,
+      "column": 17
+    },
+    "end": {
+      "line": 35,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.enableNotification",
+    "defaultMessage": "!!!Enable Notifications",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 36,
+      "column": 22
+    },
+    "end": {
+      "line": 39,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.enableBadge",
+    "defaultMessage": "!!!Show unread message badges",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 40,
+      "column": 15
+    },
+    "end": {
+      "line": 43,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.enableAudio",
+    "defaultMessage": "!!!Enable audio",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 44,
+      "column": 15
+    },
+    "end": {
+      "line": 47,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.team",
+    "defaultMessage": "!!!Team",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 48,
+      "column": 8
+    },
+    "end": {
+      "line": 51,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.customUrl",
+    "defaultMessage": "!!!Custom server",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 52,
+      "column": 13
+    },
+    "end": {
+      "line": 55,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.indirectMessages",
+    "defaultMessage": "!!!Show message badge for all new messages",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 56,
+      "column": 20
+    },
+    "end": {
+      "line": 59,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.icon",
+    "defaultMessage": "!!!Custom icon",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 60,
+      "column": 8
+    },
+    "end": {
+      "line": 63,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.enableDarkMode",
+    "defaultMessage": "!!!Enable Dark Mode",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 64,
+      "column": 18
+    },
+    "end": {
+      "line": 67,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.proxy.isEnabled",
+    "defaultMessage": "!!!Use Proxy",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 68,
+      "column": 15
+    },
+    "end": {
+      "line": 71,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.proxy.host",
+    "defaultMessage": "!!!Proxy Host/IP",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 72,
+      "column": 13
+    },
+    "end": {
+      "line": 75,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.proxy.port",
+    "defaultMessage": "!!!Port",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 76,
+      "column": 13
+    },
+    "end": {
+      "line": 79,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.proxy.user",
+    "defaultMessage": "!!!User",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 80,
+      "column": 13
+    },
+    "end": {
+      "line": 83,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.service.form.proxy.password",
+    "defaultMessage": "!!!Password",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 84,
+      "column": 17
+    },
+    "end": {
+      "line": 87,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
new file mode 100644
index 000000000..d3b413540
--- /dev/null
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -0,0 +1,158 @@
+[
+  {
+    "id": "settings.app.form.autoLaunchOnStart",
+    "defaultMessage": "!!!Launch Franz on start",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 22,
+      "column": 21
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.autoLaunchInBackground",
+    "defaultMessage": "!!!Open in background",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 26,
+      "column": 26
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.runInBackground",
+    "defaultMessage": "!!!Keep Franz in background when closing the window",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 30,
+      "column": 19
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.enableSystemTray",
+    "defaultMessage": "!!!Show Franz in system tray",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 34,
+      "column": 20
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.minimizeToSystemTray",
+    "defaultMessage": "!!!Minimize Franz to system tray",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 38,
+      "column": 24
+    },
+    "end": {
+      "line": 41,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.language",
+    "defaultMessage": "!!!Language",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 42,
+      "column": 12
+    },
+    "end": {
+      "line": 45,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.darkMode",
+    "defaultMessage": "!!!Dark Mode",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 46,
+      "column": 12
+    },
+    "end": {
+      "line": 49,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.showDisabledServices",
+    "defaultMessage": "!!!Display disabled services tabs",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 50,
+      "column": 24
+    },
+    "end": {
+      "line": 53,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.showMessagesBadgesWhenMuted",
+    "defaultMessage": "!!!Show unread message badge when notifications are disabled",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 54,
+      "column": 29
+    },
+    "end": {
+      "line": 57,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.enableSpellchecking",
+    "defaultMessage": "!!!Enable spell checking",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 58,
+      "column": 23
+    },
+    "end": {
+      "line": 61,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.enableGPUAcceleration",
+    "defaultMessage": "!!!Enable GPU Acceleration",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 62,
+      "column": 25
+    },
+    "end": {
+      "line": 65,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.beta",
+    "defaultMessage": "!!!Include beta versions",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 66,
+      "column": 8
+    },
+    "end": {
+      "line": 69,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditUserScreen.json b/src/i18n/messages/src/containers/settings/EditUserScreen.json
new file mode 100644
index 000000000..70ff29945
--- /dev/null
+++ b/src/i18n/messages/src/containers/settings/EditUserScreen.json
@@ -0,0 +1,119 @@
+[
+  {
+    "id": "settings.user.form.firstname",
+    "defaultMessage": "!!!Firstname",
+    "file": "src/containers/settings/EditUserScreen.js",
+    "start": {
+      "line": 14,
+      "column": 13
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.user.form.lastname",
+    "defaultMessage": "!!!Lastname",
+    "file": "src/containers/settings/EditUserScreen.js",
+    "start": {
+      "line": 18,
+      "column": 12
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.user.form.email",
+    "defaultMessage": "!!!Email",
+    "file": "src/containers/settings/EditUserScreen.js",
+    "start": {
+      "line": 22,
+      "column": 9
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.user.form.accountType.label",
+    "defaultMessage": "!!!Account type",
+    "file": "src/containers/settings/EditUserScreen.js",
+    "start": {
+      "line": 26,
+      "column": 20
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.user.form.accountType.individual",
+    "defaultMessage": "!!!Individual",
+    "file": "src/containers/settings/EditUserScreen.js",
+    "start": {
+      "line": 30,
+      "column": 25
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.user.form.accountType.non-profit",
+    "defaultMessage": "!!!Non-Profit",
+    "file": "src/containers/settings/EditUserScreen.js",
+    "start": {
+      "line": 34,
+      "column": 24
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.user.form.accountType.company",
+    "defaultMessage": "!!!Company",
+    "file": "src/containers/settings/EditUserScreen.js",
+    "start": {
+      "line": 38,
+      "column": 22
+    },
+    "end": {
+      "line": 41,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.user.form.currentPassword",
+    "defaultMessage": "!!!Current password",
+    "file": "src/containers/settings/EditUserScreen.js",
+    "start": {
+      "line": 42,
+      "column": 19
+    },
+    "end": {
+      "line": 45,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.user.form.newPassword",
+    "defaultMessage": "!!!New password",
+    "file": "src/containers/settings/EditUserScreen.js",
+    "start": {
+      "line": 46,
+      "column": 15
+    },
+    "end": {
+      "line": 49,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json b/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json
new file mode 100644
index 000000000..eb1b66916
--- /dev/null
+++ b/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": "feature.announcements.changelog.headline",
+    "defaultMessage": "!!!Changes in Franz {version}",
+    "file": "src/features/announcements/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/delayApp/Component.json b/src/i18n/messages/src/features/delayApp/Component.json
new file mode 100644
index 000000000..bacd9444a
--- /dev/null
+++ b/src/i18n/messages/src/features/delayApp/Component.json
@@ -0,0 +1,41 @@
+[
+  {
+    "id": "feature.delayApp.headline",
+    "defaultMessage": "!!!Please purchase license to skip waiting",
+    "file": "src/features/delayApp/Component.js",
+    "start": {
+      "line": 15,
+      "column": 12
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.delayApp.action",
+    "defaultMessage": "!!!Get a Franz Supporter License",
+    "file": "src/features/delayApp/Component.js",
+    "start": {
+      "line": 19,
+      "column": 10
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.delayApp.text",
+    "defaultMessage": "!!!Franz will continue in {seconds} seconds.",
+    "file": "src/features/delayApp/Component.js",
+    "start": {
+      "line": 23,
+      "column": 8
+    },
+    "end": {
+      "line": 26,
+      "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
new file mode 100644
index 000000000..34a43d5a0
--- /dev/null
+++ b/src/i18n/messages/src/features/shareFranz/Component.json
@@ -0,0 +1,93 @@
+[
+  {
+    "id": "feature.shareFranz.headline",
+    "defaultMessage": "!!!Franz is better together!",
+    "file": "src/features/shareFranz/Component.js",
+    "start": {
+      "line": 15,
+      "column": 12
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.shareFranz.text",
+    "defaultMessage": "!!!Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+    "file": "src/features/shareFranz/Component.js",
+    "start": {
+      "line": 19,
+      "column": 8
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.shareFranz.action.email",
+    "defaultMessage": "!!!Share as email",
+    "file": "src/features/shareFranz/Component.js",
+    "start": {
+      "line": 23,
+      "column": 16
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.shareFranz.action.facebook",
+    "defaultMessage": "!!!Share on Facebook",
+    "file": "src/features/shareFranz/Component.js",
+    "start": {
+      "line": 27,
+      "column": 19
+    },
+    "end": {
+      "line": 30,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.shareFranz.action.twitter",
+    "defaultMessage": "!!!Share on Twitter",
+    "file": "src/features/shareFranz/Component.js",
+    "start": {
+      "line": 31,
+      "column": 18
+    },
+    "end": {
+      "line": 34,
+      "column": 3
+    }
+  },
+  {
+    "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",
+    "file": "src/features/shareFranz/Component.js",
+    "start": {
+      "line": 35,
+      "column": 18
+    },
+    "end": {
+      "line": 38,
+      "column": 3
+    }
+  },
+  {
+    "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",
+    "file": "src/features/shareFranz/Component.js",
+    "start": {
+      "line": 39,
+      "column": 20
+    },
+    "end": {
+      "line": 42,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json
new file mode 100644
index 000000000..f62bac42c
--- /dev/null
+++ b/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "settings.workspace.add.form.submitButton",
+    "defaultMessage": "!!!Create workspace",
+    "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
+    "start": {
+      "line": 13,
+      "column": 16
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.add.form.name",
+    "defaultMessage": "!!!Name",
+    "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
+    "start": {
+      "line": 17,
+      "column": 8
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
new file mode 100644
index 000000000..20ed99f8d
--- /dev/null
+++ b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
@@ -0,0 +1,93 @@
+[
+  {
+    "id": "settings.workspace.form.buttonDelete",
+    "defaultMessage": "!!!Delete workspace",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 19,
+      "column": 16
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.form.buttonSave",
+    "defaultMessage": "!!!Save workspace",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 23,
+      "column": 14
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.form.name",
+    "defaultMessage": "!!!Name",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 27,
+      "column": 8
+    },
+    "end": {
+      "line": 30,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.form.yourWorkspaces",
+    "defaultMessage": "!!!Your workspaces",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 31,
+      "column": 18
+    },
+    "end": {
+      "line": 34,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.form.servicesInWorkspaceHeadline",
+    "defaultMessage": "!!!Services in this Workspace",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 35,
+      "column": 31
+    },
+    "end": {
+      "line": 38,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.services.noServicesAdded",
+    "defaultMessage": "!!!You haven't added any services yet.",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 39,
+      "column": 19
+    },
+    "end": {
+      "line": 42,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.services.discoverServices",
+    "defaultMessage": "!!!Discover services",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 43,
+      "column": 20
+    },
+    "end": {
+      "line": 46,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
new file mode 100644
index 000000000..9f0935620
--- /dev/null
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
@@ -0,0 +1,106 @@
+[
+  {
+    "id": "workspaceDrawer.headline",
+    "defaultMessage": "!!!Workspaces",
+    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+    "start": {
+      "line": 16,
+      "column": 12
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  },
+  {
+    "id": "workspaceDrawer.allServices",
+    "defaultMessage": "!!!All services",
+    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+    "start": {
+      "line": 20,
+      "column": 15
+    },
+    "end": {
+      "line": 23,
+      "column": 3
+    }
+  },
+  {
+    "id": "workspaceDrawer.workspacesSettingsTooltip",
+    "defaultMessage": "!!!Workspaces settings",
+    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+    "start": {
+      "line": 24,
+      "column": 29
+    },
+    "end": {
+      "line": 27,
+      "column": 3
+    }
+  },
+  {
+    "id": "workspaceDrawer.workspaceFeatureInfo",
+    "defaultMessage": "!!!Info about workspace feature",
+    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+    "start": {
+      "line": 28,
+      "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,
+      "column": 3
+    }
+  },
+  {
+    "id": "workspaceDrawer.addNewWorkspaceLabel",
+    "defaultMessage": "!!!add new workspace",
+    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+    "start": {
+      "line": 40,
+      "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,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawerItem.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawerItem.json
new file mode 100644
index 000000000..4ff190606
--- /dev/null
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawerItem.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "workspaceDrawer.item.noServicesAddedYet",
+    "defaultMessage": "!!!No services added yet",
+    "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
+    "start": {
+      "line": 12,
+      "column": 22
+    },
+    "end": {
+      "line": 15,
+      "column": 3
+    }
+  },
+  {
+    "id": "workspaceDrawer.item.contextMenuEdit",
+    "defaultMessage": "!!!edit",
+    "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
+    "start": {
+      "line": 16,
+      "column": 19
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceSwitchingIndicator.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceSwitchingIndicator.json
new file mode 100644
index 000000000..4f3e6d55c
--- /dev/null
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspaceSwitchingIndicator.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": "workspaces.switchingIndicator.switchingTo",
+    "defaultMessage": "!!!Switching to",
+    "file": "src/features/workspaces/components/WorkspaceSwitchingIndicator.js",
+    "start": {
+      "line": 12,
+      "column": 15
+    },
+    "end": {
+      "line": 15,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
new file mode 100644
index 000000000..ef8f1bebc
--- /dev/null
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
@@ -0,0 +1,106 @@
+[
+  {
+    "id": "settings.workspaces.headline",
+    "defaultMessage": "!!!Your workspaces",
+    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+    "start": {
+      "line": 17,
+      "column": 12
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspaces.noWorkspacesAdded",
+    "defaultMessage": "!!!You haven't added any workspaces yet.",
+    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+    "start": {
+      "line": 21,
+      "column": 19
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspaces.workspacesRequestFailed",
+    "defaultMessage": "!!!Could not load your workspaces",
+    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+    "start": {
+      "line": 25,
+      "column": 27
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspaces.tryReloadWorkspaces",
+    "defaultMessage": "!!!Try again",
+    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+    "start": {
+      "line": 29,
+      "column": 23
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspaces.updatedInfo",
+    "defaultMessage": "!!!Your changes have been saved",
+    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+    "start": {
+      "line": 33,
+      "column": 15
+    },
+    "end": {
+      "line": 36,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspaces.deletedInfo",
+    "defaultMessage": "!!!Workspace has been deleted",
+    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+    "start": {
+      "line": 37,
+      "column": 15
+    },
+    "end": {
+      "line": 40,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspaces.workspaceFeatureInfo",
+    "defaultMessage": "!!!Info about workspace feature",
+    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+    "start": {
+      "line": 41,
+      "column": 24
+    },
+    "end": {
+      "line": 44,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspaces.workspaceFeatureHeadline",
+    "defaultMessage": "!!!Less is More: Introducing Franz Workspaces",
+    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+    "start": {
+      "line": 45,
+      "column": 28
+    },
+    "end": {
+      "line": 48,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/helpers/validation-helpers.json b/src/i18n/messages/src/helpers/validation-helpers.json
new file mode 100644
index 000000000..86bfe1500
--- /dev/null
+++ b/src/i18n/messages/src/helpers/validation-helpers.json
@@ -0,0 +1,67 @@
+[
+  {
+    "id": "validation.required",
+    "defaultMessage": "!!!Field is required",
+    "file": "src/helpers/validation-helpers.js",
+    "start": {
+      "line": 4,
+      "column": 12
+    },
+    "end": {
+      "line": 7,
+      "column": 3
+    }
+  },
+  {
+    "id": "validation.email",
+    "defaultMessage": "!!!Email not valid",
+    "file": "src/helpers/validation-helpers.js",
+    "start": {
+      "line": 8,
+      "column": 9
+    },
+    "end": {
+      "line": 11,
+      "column": 3
+    }
+  },
+  {
+    "id": "validation.url",
+    "defaultMessage": "!!!Not a valid URL",
+    "file": "src/helpers/validation-helpers.js",
+    "start": {
+      "line": 12,
+      "column": 7
+    },
+    "end": {
+      "line": 15,
+      "column": 3
+    }
+  },
+  {
+    "id": "validation.minLength",
+    "defaultMessage": "!!!Too few characters",
+    "file": "src/helpers/validation-helpers.js",
+    "start": {
+      "line": 16,
+      "column": 13
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  },
+  {
+    "id": "validation.oneRequired",
+    "defaultMessage": "!!!At least one is required",
+    "file": "src/helpers/validation-helpers.js",
+    "start": {
+      "line": 20,
+      "column": 15
+    },
+    "end": {
+      "line": 23,
+      "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
new file mode 100644
index 000000000..28001614f
--- /dev/null
+++ b/src/i18n/messages/src/i18n/globalMessages.json
@@ -0,0 +1,80 @@
+[
+  {
+    "id": "global.api.unhealthy",
+    "defaultMessage": "!!!Can't connect to Franz Online Services",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 4,
+      "column": 16
+    },
+    "end": {
+      "line": 7,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.notConnectedToTheInternet",
+    "defaultMessage": "!!!You are not connected to the internet.",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 8,
+      "column": 29
+    },
+    "end": {
+      "line": 11,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.spellchecking.language",
+    "defaultMessage": "!!!Spell checking language",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 12,
+      "column": 24
+    },
+    "end": {
+      "line": 15,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.spellchecker.useDefault",
+    "defaultMessage": "!!!Use System Default ({default})",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 16,
+      "column": 29
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.spellchecking.autodetect",
+    "defaultMessage": "!!!Detect language automatically",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 20,
+      "column": 34
+    },
+    "end": {
+      "line": 23,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.spellchecking.autodetect.short",
+    "defaultMessage": "!!!Automatic",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 24,
+      "column": 39
+    },
+    "end": {
+      "line": 27,
+      "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
new file mode 100644
index 000000000..2adf5b787
--- /dev/null
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -0,0 +1,691 @@
+[
+  {
+    "id": "menu.edit",
+    "defaultMessage": "!!!Edit",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 15,
+      "column": 8
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.undo",
+    "defaultMessage": "!!!Undo",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 19,
+      "column": 8
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.redo",
+    "defaultMessage": "!!!Redo",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 23,
+      "column": 8
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.cut",
+    "defaultMessage": "!!!Cut",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 27,
+      "column": 7
+    },
+    "end": {
+      "line": 30,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.copy",
+    "defaultMessage": "!!!Copy",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 31,
+      "column": 8
+    },
+    "end": {
+      "line": 34,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.paste",
+    "defaultMessage": "!!!Paste",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 35,
+      "column": 9
+    },
+    "end": {
+      "line": 38,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.pasteAndMatchStyle",
+    "defaultMessage": "!!!Paste And Match Style",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 39,
+      "column": 22
+    },
+    "end": {
+      "line": 42,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.delete",
+    "defaultMessage": "!!!Delete",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 43,
+      "column": 10
+    },
+    "end": {
+      "line": 46,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.selectAll",
+    "defaultMessage": "!!!Select All",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 47,
+      "column": 13
+    },
+    "end": {
+      "line": 50,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.speech",
+    "defaultMessage": "!!!Speech",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 51,
+      "column": 10
+    },
+    "end": {
+      "line": 54,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.startSpeaking",
+    "defaultMessage": "!!!Start Speaking",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 55,
+      "column": 17
+    },
+    "end": {
+      "line": 58,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.stopSpeaking",
+    "defaultMessage": "!!!Stop Speaking",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 59,
+      "column": 16
+    },
+    "end": {
+      "line": 62,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.startDictation",
+    "defaultMessage": "!!!Start Dictation",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 63,
+      "column": 18
+    },
+    "end": {
+      "line": 66,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.edit.emojiSymbols",
+    "defaultMessage": "!!!Emoji & Symbols",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 67,
+      "column": 16
+    },
+    "end": {
+      "line": 70,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.resetZoom",
+    "defaultMessage": "!!!Actual Size",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 71,
+      "column": 13
+    },
+    "end": {
+      "line": 74,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.zoomIn",
+    "defaultMessage": "!!!Zoom In",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 75,
+      "column": 10
+    },
+    "end": {
+      "line": 78,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.zoomOut",
+    "defaultMessage": "!!!Zoom Out",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 79,
+      "column": 11
+    },
+    "end": {
+      "line": 82,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.enterFullScreen",
+    "defaultMessage": "!!!Enter Full Screen",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 83,
+      "column": 19
+    },
+    "end": {
+      "line": 86,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.exitFullScreen",
+    "defaultMessage": "!!!Exit Full Screen",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 87,
+      "column": 18
+    },
+    "end": {
+      "line": 90,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.toggleFullScreen",
+    "defaultMessage": "!!!Toggle Full Screen",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 91,
+      "column": 20
+    },
+    "end": {
+      "line": 94,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.toggleDevTools",
+    "defaultMessage": "!!!Toggle Developer Tools",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 95,
+      "column": 18
+    },
+    "end": {
+      "line": 98,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.toggleServiceDevTools",
+    "defaultMessage": "!!!Toggle Service Developer Tools",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 99,
+      "column": 25
+    },
+    "end": {
+      "line": 102,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.reloadService",
+    "defaultMessage": "!!!Reload Service",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 103,
+      "column": 17
+    },
+    "end": {
+      "line": 106,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.reloadFranz",
+    "defaultMessage": "!!!Reload Franz",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 107,
+      "column": 15
+    },
+    "end": {
+      "line": 110,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.window.minimize",
+    "defaultMessage": "!!!Minimize",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 111,
+      "column": 12
+    },
+    "end": {
+      "line": 114,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.window.close",
+    "defaultMessage": "!!!Close",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 115,
+      "column": 9
+    },
+    "end": {
+      "line": 118,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help.learnMore",
+    "defaultMessage": "!!!Learn More",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 119,
+      "column": 13
+    },
+    "end": {
+      "line": 122,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help.changelog",
+    "defaultMessage": "!!!Changelog",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 123,
+      "column": 13
+    },
+    "end": {
+      "line": 126,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help.support",
+    "defaultMessage": "!!!Support",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 127,
+      "column": 11
+    },
+    "end": {
+      "line": 130,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help.tos",
+    "defaultMessage": "!!!Terms of Service",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 131,
+      "column": 7
+    },
+    "end": {
+      "line": 134,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help.privacy",
+    "defaultMessage": "!!!Privacy Statement",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 135,
+      "column": 11
+    },
+    "end": {
+      "line": 138,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.file",
+    "defaultMessage": "!!!File",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 139,
+      "column": 8
+    },
+    "end": {
+      "line": 142,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view",
+    "defaultMessage": "!!!View",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 143,
+      "column": 8
+    },
+    "end": {
+      "line": 146,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.services",
+    "defaultMessage": "!!!Services",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 147,
+      "column": 12
+    },
+    "end": {
+      "line": 150,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.window",
+    "defaultMessage": "!!!Window",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 151,
+      "column": 10
+    },
+    "end": {
+      "line": 154,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.help",
+    "defaultMessage": "!!!Help",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 155,
+      "column": 8
+    },
+    "end": {
+      "line": 158,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.about",
+    "defaultMessage": "!!!About Franz",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 159,
+      "column": 9
+    },
+    "end": {
+      "line": 162,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.announcement",
+    "defaultMessage": "!!!What's new?",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 163,
+      "column": 16
+    },
+    "end": {
+      "line": 166,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.settings",
+    "defaultMessage": "!!!Settings",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 167,
+      "column": 12
+    },
+    "end": {
+      "line": 170,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.hide",
+    "defaultMessage": "!!!Hide",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 171,
+      "column": 8
+    },
+    "end": {
+      "line": 174,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.hideOthers",
+    "defaultMessage": "!!!Hide Others",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 175,
+      "column": 14
+    },
+    "end": {
+      "line": 178,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.unhide",
+    "defaultMessage": "!!!Unhide",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 179,
+      "column": 10
+    },
+    "end": {
+      "line": 182,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.quit",
+    "defaultMessage": "!!!Quit",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 183,
+      "column": 8
+    },
+    "end": {
+      "line": 186,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.services.addNewService",
+    "defaultMessage": "!!!Add New Service...",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 187,
+      "column": 17
+    },
+    "end": {
+      "line": 190,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.workspaces.addNewWorkspace",
+    "defaultMessage": "!!!Add New Workspace...",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 191,
+      "column": 19
+    },
+    "end": {
+      "line": 194,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.workspaces.openWorkspaceDrawer",
+    "defaultMessage": "!!!Open workspace drawer",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 195,
+      "column": 23
+    },
+    "end": {
+      "line": 198,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.workspaces.closeWorkspaceDrawer",
+    "defaultMessage": "!!!Close workspace drawer",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 199,
+      "column": 24
+    },
+    "end": {
+      "line": 202,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.services.setNextServiceActive",
+    "defaultMessage": "!!!Activate next service...",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 203,
+      "column": 23
+    },
+    "end": {
+      "line": 206,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.services.activatePreviousService",
+    "defaultMessage": "!!!Activate previous service...",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 207,
+      "column": 27
+    },
+    "end": {
+      "line": 210,
+      "column": 3
+    }
+  },
+  {
+    "id": "sidebar.muteApp",
+    "defaultMessage": "!!!Disable notifications & audio",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 211,
+      "column": 11
+    },
+    "end": {
+      "line": 214,
+      "column": 3
+    }
+  },
+  {
+    "id": "sidebar.unmuteApp",
+    "defaultMessage": "!!!Enable notifications & audio",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 215,
+      "column": 13
+    },
+    "end": {
+      "line": 218,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.workspaces",
+    "defaultMessage": "!!!Workspaces",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 219,
+      "column": 14
+    },
+    "end": {
+      "line": 222,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.workspaces.defaultWorkspace",
+    "defaultMessage": "!!!Default",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 223,
+      "column": 20
+    },
+    "end": {
+      "line": 226,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index f34df8c17..3fe996aa7 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,25 +4,23 @@ import {
   shell,
   ipcMain,
 } from 'electron';
-
+import isDevMode from 'electron-is-dev';
 import fs from 'fs-extra';
 import path from 'path';
 import windowStateKeeper from 'electron-window-state';
 
+// Set app directory before loading user modules
+if (isDevMode) {
+  app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev'));
+}
+
+/* eslint-disable import/first */
 import {
-  isDevMode,
   isMac,
   isWindows,
   isLinux,
 } from './environment';
-
 import { mainIpcHandler as basicAuthHandler } from './features/basicAuth';
-
-// DEV MODE: Save user data into FranzDev
-if (isDevMode) {
-  app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev'));
-}
-/* eslint-disable import/first */
 import ipcApi from './electron/ipc-api';
 import Tray from './lib/Tray';
 import Settings from './electron/Settings';
@@ -35,6 +33,8 @@ import {
   DEFAULT_APP_SETTINGS,
   DEFAULT_WINDOW_OPTIONS,
 } from './config';
+import { asarPath } from './helpers/asar-helpers';
+import { isValidExternalURL } from './helpers/url-helpers';
 /* eslint-enable import/first */
 
 const debug = require('debug')('Franz:App');
@@ -44,6 +44,17 @@ const debug = require('debug')('Franz:App');
 let mainWindow;
 let willQuitApp = false;
 
+// Register methods to be called once the window has been loaded.
+let onDidLoadFns = [];
+
+function onDidLoad(fn) {
+  if (onDidLoadFns) {
+    onDidLoadFns.push(fn);
+  } else if (mainWindow) {
+    fn(mainWindow);
+  }
+}
+
 // 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'));
@@ -61,32 +72,38 @@ if (!gotTheLock) {
   app.on('second-instance', (event, argv) => {
     // Someone tried to run a second instance, we should focus our window.
     if (mainWindow) {
-      if (mainWindow.isMinimized()) mainWindow.restore();
+      mainWindow.show();
+      if (mainWindow.isMinimized()) {
+        mainWindow.restore();
+      }
       mainWindow.focus();
 
       if (isWindows) {
-        // Keep only command line / deep linked arguments
-        const url = argv.slice(1);
-
-        if (url) {
-          handleDeepLink(mainWindow, url.toString());
-        }
-      }
-
-      if (argv.includes('--reset-window')) {
-        // Needs to be delayed to not interfere with mainWindow.restore();
-        setTimeout(() => {
-          debug('Resetting windows via Task');
-          mainWindow.setPosition(DEFAULT_WINDOW_OPTIONS.x + 100, DEFAULT_WINDOW_OPTIONS.y + 100);
-          mainWindow.setSize(DEFAULT_WINDOW_OPTIONS.width, DEFAULT_WINDOW_OPTIONS.height);
-        }, 1);
+        onDidLoad((window) => {
+          // Keep only command line / deep linked arguments
+          const url = argv.slice(1);
+          if (url) {
+            handleDeepLink(window, url.toString());
+          }
+
+          if (argv.includes('--reset-window')) {
+            // 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);
+            }, 1);
+          } else if (argv.includes('--quit')) {
+            // Needs to be delayed to not interfere with mainWindow.restore();
+            setTimeout(() => {
+              debug('Quitting Franz via Task');
+              app.quit();
+            }, 1);
+          }
+        });
       }
     }
   });
-
-  // Create myWindow, load the rest of the app, etc...
-  app.on('ready', () => {
-  });
 }
 // const isSecondInstance = app.makeSingleInstance((argv) => {
 //   if (mainWindow) {
@@ -166,6 +183,14 @@ const createWindow = () => {
     },
   });
 
+  mainWindow.webContents.on('did-finish-load', () => {
+    const fns = onDidLoadFns;
+    onDidLoadFns = null;
+    for (const fn of fns) {
+      fn(mainWindow);
+    }
+  });
+
   // Initialize System Tray
   const trayIcon = new Tray();
 
@@ -190,22 +215,36 @@ const createWindow = () => {
     mainWindow.webContents.openDevTools();
   }
 
+  // Windows deep linking handling on app launch
+  if (isWindows) {
+    onDidLoad((window) => {
+      const url = process.argv.slice(1);
+      if (url) {
+        handleDeepLink(window, url.toString());
+      }
+    });
+  }
+
   // Emitted when the window is closed.
   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'))) {
       e.preventDefault();
       if (isWindows) {
+        debug('Window: minimize');
         mainWindow.minimize();
+
+        if (settings.get('minimizeToSystemTray')) {
+          debug('Skip taskbar: true');
+          mainWindow.setSkipTaskbar(true);
+        }
       } else {
+        debug('Window: hide');
         mainWindow.hide();
       }
-
-      if (isWindows) {
-        mainWindow.setSkipTaskbar(true);
-      }
     } else {
       app.quit();
     }
@@ -217,32 +256,39 @@ const createWindow = () => {
     app.wasMaximized = app.isMaximized;
 
     if (settings.get('minimizeToSystemTray')) {
+      debug('Skip taskbar: true');
       mainWindow.setSkipTaskbar(true);
       trayIcon.show();
     }
   });
 
   mainWindow.on('maximize', () => {
+    debug('Window: maximize');
     app.isMaximized = true;
   });
 
   mainWindow.on('unmaximize', () => {
+    debug('Window: unmaximize');
     app.isMaximized = false;
   });
 
   mainWindow.on('restore', () => {
+    debug('Window: restore');
     mainWindow.setSkipTaskbar(false);
 
     if (app.wasMaximized) {
+      debug('Window: was maximized before, maximize window');
       mainWindow.maximize();
     }
 
     if (!settings.get('enableSystemTray')) {
+      debug('Tray: hiding tray icon');
       trayIcon.hide();
     }
   });
 
   mainWindow.on('show', () => {
+    debug('Skip taskbar: false');
     mainWindow.setSkipTaskbar(false);
   });
 
@@ -250,23 +296,53 @@ const createWindow = () => {
   app.isMaximized = mainWindow.isMaximized();
 
   mainWindow.webContents.on('new-window', (e, url) => {
+    debug('Open url', url);
     e.preventDefault();
-    shell.openExternal(url);
+
+    if (isValidExternalURL(url)) {
+      shell.openExternal(url);
+    }
   });
 };
 
+// Allow passing command line parameters/switches to electron
+// https://electronjs.org/docs/api/chrome-command-line-switches
+// used for Kerberos support
+// Usage e.g. MACOS
+// $ Franz.app/Contents/MacOS/Franz --auth-server-whitelist *.mydomain.com --auth-negotiate-delegate-whitelist *.mydomain.com
+const argv = require('minimist')(process.argv.slice(1));
+
+if (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']);
+}
+
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
 app.on('ready', () => {
+  // Register App URL
+  app.setAsDefaultProtocolClient('franz');
+
+  if (isDevMode) {
+    app.setAsDefaultProtocolClient('franz-dev');
+  }
+
   if (process.platform === 'win32') {
     app.setUserTasks([{
       program: process.execPath,
       arguments: `${isDevMode ? `${__dirname} ` : ''}--reset-window`,
-      iconPath: path.join(`${__dirname}`, '../src/assets/images/taskbar/win32/display.ico'),
+      iconPath: asarPath(path.join(isDevMode ? `${__dirname}../src/` : __dirname, 'assets/images/taskbar/win32/display.ico')),
       iconIndex: 0,
       title: 'Move Franz to Current Display',
       description: 'Restore the position and size of Franz',
+    }, {
+      program: process.execPath,
+      arguments: `${isDevMode ? `${__dirname} ` : ''}--quit`,
+      iconIndex: 0,
+      title: 'Quit Franz',
     }]);
   }
 
@@ -317,7 +393,10 @@ app.on('window-all-closed', () => {
   // to stay active until the user quits explicitly with Cmd + Q
   if (settings.get('runInBackground') === undefined
     || settings.get('runInBackground')) {
+    debug('Window: all windows closed, quit app');
     app.quit();
+  } else {
+    debug('Window: don\'t quit app');
   }
 });
 
@@ -336,13 +415,13 @@ app.on('activate', () => {
 });
 
 app.on('will-finish-launching', () => {
-  // Protocol handler for osx
+  // Protocol handler for macOS
   app.on('open-url', (event, url) => {
     event.preventDefault();
-    console.log(`open-url event: ${url}`);
-    handleDeepLink(mainWindow, url);
+
+    onDidLoad((window) => {
+      debug('open-url event', url);
+      handleDeepLink(window, url);
+    });
   });
 });
-
-// Register App URL
-app.setAsDefaultProtocolClient('franz');
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index c378619ad..da2540274 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1,8 +1,13 @@
 import { remote, shell } from 'electron';
-import { observable, autorun, computed } from 'mobx';
+import { observable, autorun } from 'mobx';
 import { defineMessages } from 'react-intl';
 
 import { isMac, ctrlKey, cmdKey } from '../environment';
+import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../features/workspaces/index';
+import { workspaceActions } from '../features/workspaces/actions';
+import { gaEvent } from './analytics';
+import { announcementActions } from '../features/announcements/actions';
+import { announcementsStore } from '../features/announcements';
 
 const { app, Menu, dialog } = remote;
 
@@ -155,6 +160,10 @@ const menuItems = defineMessages({
     id: 'menu.app.about',
     defaultMessage: '!!!About Franz',
   },
+  announcement: {
+    id: 'menu.app.announcement',
+    defaultMessage: '!!!What\'s new?',
+  },
   settings: {
     id: 'menu.app.settings',
     defaultMessage: '!!!Settings',
@@ -179,6 +188,42 @@ const menuItems = defineMessages({
     id: 'menu.services.addNewService',
     defaultMessage: '!!!Add New Service...',
   },
+  addNewWorkspace: {
+    id: 'menu.workspaces.addNewWorkspace',
+    defaultMessage: '!!!Add New Workspace...',
+  },
+  openWorkspaceDrawer: {
+    id: 'menu.workspaces.openWorkspaceDrawer',
+    defaultMessage: '!!!Open workspace drawer',
+  },
+  closeWorkspaceDrawer: {
+    id: 'menu.workspaces.closeWorkspaceDrawer',
+    defaultMessage: '!!!Close workspace drawer',
+  },
+  activateNextService: {
+    id: 'menu.services.setNextServiceActive',
+    defaultMessage: '!!!Activate next service...',
+  },
+  activatePreviousService: {
+    id: 'menu.services.activatePreviousService',
+    defaultMessage: '!!!Activate previous service...',
+  },
+  muteApp: {
+    id: 'sidebar.muteApp',
+    defaultMessage: '!!!Disable notifications & audio',
+  },
+  unmuteApp: {
+    id: 'sidebar.unmuteApp',
+    defaultMessage: '!!!Enable notifications & audio',
+  },
+  workspaces: {
+    id: 'menu.workspaces',
+    defaultMessage: '!!!Workspaces',
+  },
+  defaultWorkspace: {
+    id: 'menu.workspaces.defaultWorkspace',
+    defaultMessage: '!!!Default',
+  },
 });
 
 function getActiveWebview() {
@@ -239,16 +284,32 @@ const _templateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.resetZoom),
-        role: 'resetzoom',
+        accelerator: 'Cmd+0',
+        click() {
+          getActiveWebview().setZoomLevel(0);
+        },
       },
       {
         label: intl.formatMessage(menuItems.zoomIn),
-        // accelerator: 'Cmd+=',
-        role: 'zoomin',
+        accelerator: 'Cmd+plus',
+        click() {
+          const activeService = getActiveWebview();
+          activeService.getZoomLevel((level) => {
+            // level 9 =~ +300% and setZoomLevel wouldnt zoom in further
+            if (level < 9) activeService.setZoomLevel(level + 1);
+          });
+        },
       },
       {
         label: intl.formatMessage(menuItems.zoomOut),
-        role: 'zoomout',
+        accelerator: 'Cmd+-',
+        click() {
+          const activeService = getActiveWebview();
+          activeService.getZoomLevel((level) => {
+            // level -9 =~ -50% and setZoomLevel wouldnt zoom out further
+            if (level > -9) activeService.setZoomLevel(level - 1);
+          });
+        },
       },
       {
         type: 'separator',
@@ -266,6 +327,11 @@ const _templateFactory = intl => [
     submenu: [],
   },
   {
+    label: intl.formatMessage(menuItems.workspaces),
+    submenu: [],
+    visible: workspaceStore.isFeatureEnabled,
+  },
+  {
     label: intl.formatMessage(menuItems.window),
     role: 'window',
     submenu: [
@@ -288,8 +354,11 @@ const _templateFactory = intl => [
         click() { shell.openExternal('https://meetfranz.com'); },
       },
       {
-        label: intl.formatMessage(menuItems.changelog),
-        click() { shell.openExternal('https://github.com/meetfranz/franz/blob/master/CHANGELOG.md'); },
+        label: intl.formatMessage(menuItems.announcement),
+        click: () => {
+          announcementActions.show();
+        },
+        visible: window.franz.stores.user.isLoggedIn && announcementsStore.areNewsAvailable,
       },
       {
         type: 'separator',
@@ -392,10 +461,12 @@ const _titleBarTemplateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.zoomIn),
-        accelerator: `${ctrlKey}+Plus`,
+        accelerator: `${ctrlKey}+=`,
         click() {
-          getActiveWebview().getZoomLevel((zoomLevel) => {
-            getActiveWebview().setZoomLevel(zoomLevel === 5 ? zoomLevel : zoomLevel + 1);
+          const activeService = getActiveWebview();
+          activeService.getZoomLevel((level) => {
+            // level 9 =~ +300% and setZoomLevel wouldnt zoom in further
+            if (level < 9) activeService.setZoomLevel(level + 1);
           });
         },
       },
@@ -403,8 +474,10 @@ const _titleBarTemplateFactory = intl => [
         label: intl.formatMessage(menuItems.zoomOut),
         accelerator: `${ctrlKey}+-`,
         click() {
-          getActiveWebview().getZoomLevel((zoomLevel) => {
-            getActiveWebview().setZoomLevel(zoomLevel === -5 ? zoomLevel : zoomLevel - 1);
+          const activeService = getActiveWebview();
+          activeService.getZoomLevel((level) => {
+            // level -9 =~ -50% and setZoomLevel wouldnt zoom out further
+            if (level > -9) activeService.setZoomLevel(level - 1);
           });
         },
       },
@@ -499,13 +572,14 @@ export default class FranzMenu {
   }
 
   _build() {
-    const serviceTpl = Object.assign([], this.serviceTpl); // need to clone object so we don't modify computed (cached) object
+    // need to clone object so we don't modify computed (cached) object
+    const serviceTpl = Object.assign([], this.serviceTpl());
 
     if (window.franz === undefined) {
       return;
     }
 
-    const intl = window.franz.intl;
+    const { intl } = window.franz;
     const tpl = isMac ? _templateFactory(intl) : _titleBarTemplateFactory(intl);
 
     tpl[1].submenu.push({
@@ -632,7 +706,7 @@ export default class FranzMenu {
         },
       );
 
-      tpl[4].submenu.unshift(about, {
+      tpl[5].submenu.unshift(about, {
         type: 'separator',
       });
     } else {
@@ -663,42 +737,122 @@ export default class FranzMenu {
       }, about);
     }
 
-    serviceTpl.unshift({
+    if (serviceTpl.length > 0) {
+      tpl[3].submenu = serviceTpl;
+    }
+
+    if (workspaceStore.isFeatureEnabled) {
+      tpl[4].submenu = this.workspacesMenu();
+    }
+
+    this.currentTemplate = tpl;
+    const menu = Menu.buildFromTemplate(tpl);
+    Menu.setApplicationMenu(menu);
+  }
+
+  serviceTpl() {
+    const { intl } = window.franz;
+    const { user, services, settings } = this.stores;
+    if (!user.isLoggedIn) return [];
+    const menu = [];
+
+    menu.push({
       label: intl.formatMessage(menuItems.addNewService),
       accelerator: `${cmdKey}+N`,
       click: () => {
         this.actions.ui.openSettings({ path: 'recipes' });
       },
-      enabled: this.stores.user.isLoggedIn,
+    }, {
+      type: 'separator',
+    }, {
+      label: intl.formatMessage(menuItems.activateNextService),
+      accelerator: `${cmdKey}+alt+right`,
+      click: () => this.actions.service.setActiveNext(),
+    }, {
+      label: intl.formatMessage(menuItems.activatePreviousService),
+      accelerator: `${cmdKey}+alt+left`,
+      click: () => this.actions.service.setActivePrev(),
+    }, {
+      label: intl.formatMessage(
+        settings.all.app.isAppMuted ? menuItems.unmuteApp : menuItems.muteApp,
+      ).replace('&', '&&'),
+      accelerator: `${cmdKey}+shift+m`,
+      click: () => this.actions.app.toggleMuteApp(),
     }, {
       type: 'separator',
     });
 
-    if (serviceTpl.length > 0) {
-      tpl[3].submenu = serviceTpl;
-    }
+    services.allDisplayed.forEach((service, i) => (menu.push({
+      label: this._getServiceName(service),
+      accelerator: i < 9 ? `${cmdKey}+${i + 1}` : null,
+      type: 'radio',
+      checked: service.isActive,
+      click: () => {
+        this.actions.service.setActive({ serviceId: service.id });
+      },
+    })));
 
-    this.currentTemplate = tpl;
-    const menu = Menu.buildFromTemplate(tpl);
-    Menu.setApplicationMenu(menu);
+    return menu;
   }
 
-  @computed get serviceTpl() {
-    const services = this.stores.services.allDisplayed;
+  workspacesMenu() {
+    const { workspaces, activeWorkspace, isWorkspaceDrawerOpen } = workspaceStore;
+    const { intl } = window.franz;
+    const menu = [];
+
+    // Add new workspace item:
+    menu.push({
+      label: intl.formatMessage(menuItems.addNewWorkspace),
+      accelerator: `${cmdKey}+Shift+N`,
+      click: () => {
+        workspaceActions.openWorkspaceSettings();
+      },
+      enabled: this.stores.user.isLoggedIn,
+    });
+
+    // Open workspace drawer:
+    const drawerLabel = (
+      isWorkspaceDrawerOpen ? menuItems.closeWorkspaceDrawer : menuItems.openWorkspaceDrawer
+    );
+    menu.push({
+      label: intl.formatMessage(drawerLabel),
+      accelerator: `${cmdKey}+D`,
+      click: () => {
+        workspaceActions.toggleWorkspaceDrawer();
+        gaEvent(GA_CATEGORY_WORKSPACES, 'toggleDrawer', 'menu');
+      },
+      enabled: this.stores.user.isLoggedIn,
+    }, {
+      type: 'separator',
+    });
+
+    // Default workspace
+    menu.push({
+      label: intl.formatMessage(menuItems.defaultWorkspace),
+      accelerator: `${cmdKey}+Alt+0`,
+      type: 'radio',
+      checked: !activeWorkspace,
+      click: () => {
+        workspaceActions.deactivate();
+        gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'menu');
+      },
+    });
 
-    if (this.stores.user.isLoggedIn) {
-      return services.map((service, i) => ({
-        label: this._getServiceName(service),
-        accelerator: i < 9 ? `${cmdKey}+${i + 1}` : null,
+    // 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: service.isActive,
+        checked: activeWorkspace ? workspace.id === activeWorkspace.id : false,
         click: () => {
-          this.actions.service.setActive({ serviceId: service.id });
+          workspaceActions.activate({ workspace });
+          gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'menu');
         },
       }));
     }
 
-    return [];
+    return menu;
   }
 
   _getServiceName(service) {
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index 669b02709..192e24796 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -22,7 +22,11 @@ export default class TrayIcon {
       {
         label: 'Show Franz',
         click() {
+          if (app.mainWindow.isMinimized()) {
+            app.mainWindow.restore();
+          }
           app.mainWindow.show();
+          app.mainWindow.focus();
         },
       }, {
         label: 'Quit Franz',
@@ -36,7 +40,11 @@ export default class TrayIcon {
     this.trayIcon.setContextMenu(trayMenu);
 
     this.trayIcon.on('click', () => {
+      if (app.mainWindow.isMinimized()) {
+        app.mainWindow.restore();
+      }
       app.mainWindow.show();
+      app.mainWindow.focus();
     });
 
     if (process.platform === 'darwin') {
diff --git a/src/lib/analytics.js b/src/lib/analytics.js
index 7044e5bb7..c305fdb00 100644
--- a/src/lib/analytics.js
+++ b/src/lib/analytics.js
@@ -1,5 +1,8 @@
 import { remote } from 'electron';
-import { GA_ID } from '../config';
+import querystring from 'querystring';
+
+import { GA_ID, STATS_API } from '../config';
+import { isDevMode } from '../environment';
 
 const debug = require('debug')('Franz:Analytics');
 
@@ -28,16 +31,25 @@ ga('send', 'App');
 
 export function gaPage(page) {
   ga('send', 'pageview', page);
-
   debug('GA track page', page);
 }
 
 export function gaEvent(category, action, label) {
   ga('send', 'event', category, action, label);
-
-  debug('GA track event', category, action);
+  debug('GA track event', category, action, label);
 }
 
-setTimeout(() => {
-  ga('send', 'Ping');
-}, 1000 * 60 * 10); // Ping GA every 10 Minutes
+export function statsEvent(key, value) {
+  const params = {
+    key,
+    value: value || key,
+    platform: process.platform,
+    version: remote.app.getVersion(),
+  };
+
+  debug('Send Franz stats event', params);
+
+  if (!isDevMode) {
+    window.fetch(`${STATS_API}/event/?${querystring.stringify(params)}`);
+  }
+}
diff --git a/src/models/Service.js b/src/models/Service.js
index eee8df8ca..8a2a8d3d8 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -202,7 +202,7 @@ export default class Service {
 
     this.webview.addEventListener('did-fail-load', (event) => {
       debug('Service failed to load', this.name, event);
-      if (event.isMainFrame && event.errorCode !== -27 && event.errorCode !== -3) {
+      if (event.isMainFrame && event.errorCode !== -21 && event.errorCode !== -3) {
         this.isError = true;
         this.errorMessage = event.errorDescription;
         this.isLoading = false;
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index dd4642d70..72c4b4d0b 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -1,21 +1,25 @@
 import { remote, ipcRenderer, shell } from 'electron';
-import { action, computed, observable } from 'mobx';
+import {
+  action, computed, observable, reaction,
+} from 'mobx';
 import moment from 'moment';
-import key from 'keymaster';
 import { getDoNotDisturb } from '@meetfranz/electron-notification-state';
 import AutoLaunch from 'auto-launch';
 import prettyBytes from 'pretty-bytes';
+import ms from 'ms';
+import { URL } from 'url';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
 import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
-import { isMac, isLinux, isWindows } from '../environment';
+import { isMac } from '../environment';
 import locales from '../i18n/translations';
-import { gaEvent } from '../lib/analytics';
+import { gaEvent, gaPage, statsEvent } from '../lib/analytics';
 import { onVisibilityChange } from '../helpers/visibility-helper';
 import { getLocale } from '../helpers/i18n-helpers';
 
 import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '../helpers/service-helpers.js';
+import { isValidExternalURL } from '../helpers/url-helpers';
 
 const debug = require('debug')('Franz:AppStore');
 
@@ -63,6 +67,8 @@ export default class AppStore extends Store {
 
   @observable isFocused = true;
 
+  @observable nextAppReleaseVersion = null;
+
   dictionaries = [];
 
   constructor(...args) {
@@ -110,16 +116,16 @@ export default class AppStore extends Store {
     // Check if system is muted
     // There are no events to subscribe so we need to poll everey 5s
     this._systemDND();
-    setInterval(() => this._systemDND(), 5000);
+    setInterval(() => this._systemDND(), ms('5s'));
 
     // Check for updates once every 4 hours
     setInterval(() => this._checkForUpdates(), CHECK_INTERVAL);
     // Check for an update in 30s (need a delay to prevent Squirrel Installer lock file issues)
-    setTimeout(() => this._checkForUpdates(), 30000);
+    setTimeout(() => this._checkForUpdates(), ms('30s'));
     ipcRenderer.on('autoUpdate', (event, data) => {
       if (data.available) {
         this.updateStatus = this.updateStatusTypes.AVAILABLE;
-
+        this.nextAppReleaseVersion = data.version;
         if (isMac) {
           app.dock.bounce();
         }
@@ -143,32 +149,14 @@ export default class AppStore extends Store {
 
     // Handle deep linking (franz://)
     ipcRenderer.on('navigateFromDeepLink', (event, data) => {
-      const { url } = data;
+      debug('Navigate from deep link', data);
+      let { url } = data;
       if (!url) return;
 
-      this.stores.router.push(data.url);
-    });
-
-    // Set active the next service
-    key(
-      '⌘+pagedown, ctrl+pagedown, ⌘+alt+right, ctrl+tab', () => {
-        this.actions.service.setActiveNext();
-      },
-    );
+      url = url.replace(/\/$/, '');
 
-    // Set active the prev service
-    key(
-      '⌘+pageup, ctrl+pageup, ⌘+alt+left, ctrl+shift+tab', () => {
-        this.actions.service.setActivePrev();
-      },
-    );
-
-    // Global Mute
-    key(
-      '⌘+shift+m ctrl+shift+m', () => {
-        this.actions.app.toggleMuteApp();
-      },
-    );
+      this.stores.router.push(url);
+    });
 
     this.locale = this._getDefaultLocale();
 
@@ -181,6 +169,13 @@ export default class AppStore extends Store {
 
       debug('Window is visible/focused', isVisible);
     });
+
+    // analytics autorun
+    reaction(() => this.stores.router.location.pathname, (pathname) => {
+      gaPage(pathname);
+    });
+
+    statsEvent('app-start');
   }
 
   @computed get cacheSize() {
@@ -193,7 +188,15 @@ export default class AppStore extends Store {
   }) {
     if (this.stores.settings.all.app.isAppMuted) return;
 
+    // TODO: is there a simple way to use blobs for notifications without storing them on disk?
+    if (options.icon.startsWith('blob:')) {
+      delete options.icon;
+    }
+
     const notification = new window.Notification(title, options);
+
+    debug('New notification', title, options);
+
     notification.onclick = (e) => {
       if (serviceId) {
         this.actions.service.sendIPCMessage({
@@ -203,12 +206,13 @@ export default class AppStore extends Store {
         });
 
         this.actions.service.setActive({ serviceId });
-
-        if (isWindows) {
+        mainWindow.show();
+        if (app.mainWindow.isMinimized()) {
           mainWindow.restore();
-        } else if (isLinux) {
-          mainWindow.show();
         }
+        mainWindow.focus();
+
+        debug('Notification click handler');
       }
     };
   }
@@ -244,7 +248,14 @@ export default class AppStore extends Store {
   }
 
   @action _openExternalUrl({ url }) {
-    shell.openExternal(url);
+    const parsedUrl = new URL(url);
+    debug('open external url', parsedUrl);
+
+    if (isValidExternalURL(url)) {
+      shell.openExternal(url);
+    }
+
+    gaEvent('External URL', 'open', parsedUrl.host);
   }
 
   @action _checkForUpdates() {
@@ -268,7 +279,6 @@ export default class AppStore extends Store {
 
   @action _muteApp({ isMuted, overrideSystemMute = true }) {
     this.isSystemMuteOverridden = overrideSystemMute;
-
     this.actions.settings.update({
       type: 'app',
       data: {
@@ -305,7 +315,7 @@ export default class AppStore extends Store {
     } else {
       const deltaTime = moment().diff(this.timeOfflineStart);
 
-      if (deltaTime > 30 * 60 * 1000) {
+      if (deltaTime > ms('30m')) {
         this.actions.service.reloadAll();
       }
     }
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 0adee6adf..e7832088b 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -1,4 +1,9 @@
-import { computed, observable, reaction } from 'mobx';
+import {
+  computed,
+  observable,
+  reaction,
+  runInAction,
+} from 'mobx';
 
 import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
@@ -7,6 +12,10 @@ 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';
+import shareFranz from '../features/shareFranz';
+import announcements from '../features/announcements';
+import settingsWS from '../features/settingsWS';
 
 import { DEFAULT_FEATURES_CONFIG } from '../config';
 
@@ -15,13 +24,16 @@ export default class FeaturesStore extends Store {
 
   @observable featuresRequest = new CachedRequest(this.api.features, 'features');
 
+  @observable features = Object.assign({}, DEFAULT_FEATURES_CONFIG);
+
   async setup() {
     this.registerReactions([
+      this._updateFeatures,
       this._monitorLoginStatus.bind(this),
     ]);
 
     await this.featuresRequest._promise;
-    setTimeout(this._enableFeatures.bind(this), 1);
+    setTimeout(this._setupFeatures.bind(this), 1);
 
     // single key reaction
     reaction(() => this.stores.user.data.isPremium, () => {
@@ -35,13 +47,16 @@ export default class FeaturesStore extends Store {
     return this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG;
   }
 
-  @computed get features() {
+  _updateFeatures = () => {
+    const features = Object.assign({}, DEFAULT_FEATURES_CONFIG);
     if (this.stores.user.isLoggedIn) {
-      return this.featuresRequest.execute().result || DEFAULT_FEATURES_CONFIG;
+      const requestResult = this.featuresRequest.execute().result;
+      Object.assign(features, requestResult);
     }
-
-    return DEFAULT_FEATURES_CONFIG;
-  }
+    runInAction('FeaturesStore::_updateFeatures', () => {
+      this.features = features;
+    });
+  };
 
   _monitorLoginStatus() {
     if (this.stores.user.isLoggedIn) {
@@ -51,10 +66,14 @@ export default class FeaturesStore extends Store {
     }
   }
 
-  _enableFeatures() {
+  _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);
+    shareFranz(this.stores, this.actions);
+    announcements(this.stores, this.actions);
+    settingsWS(this.stores, this.actions);
   }
 }
diff --git a/src/stores/PaymentStore.js b/src/stores/PaymentStore.js
index 4cabee194..d4de476c8 100644
--- a/src/stores/PaymentStore.js
+++ b/src/stores/PaymentStore.js
@@ -10,15 +10,10 @@ export default class PaymentStore extends Store {
 
   @observable createHostedPageRequest = new Request(this.api.payment, 'getHostedPage');
 
-  @observable createDashboardUrlRequest = new Request(this.api.payment, 'getDashboardUrl');
-
-  @observable ordersDataRequest = new CachedRequest(this.api.payment, 'getOrders');
-
   constructor(...args) {
     super(...args);
 
     this.actions.payment.createHostedPage.listen(this._createHostedPage.bind(this));
-    this.actions.payment.createDashboardUrl.listen(this._createDashboardUrl.bind(this));
   }
 
   @computed get plan() {
@@ -28,10 +23,6 @@ export default class PaymentStore extends Store {
     return this.plansRequest.execute().result || {};
   }
 
-  @computed get orders() {
-    return this.ordersDataRequest.execute().result || [];
-  }
-
   @action _createHostedPage({ planId }) {
     const request = this.createHostedPageRequest.execute(planId);
 
@@ -39,12 +30,4 @@ export default class PaymentStore extends Store {
 
     return request;
   }
-
-  @action _createDashboardUrl() {
-    const request = this.createDashboardUrlRequest.execute();
-
-    gaEvent('Payment', 'createDashboardUrl');
-
-    return request;
-  }
 }
diff --git a/src/stores/RecipePreviewsStore.js b/src/stores/RecipePreviewsStore.js
index 10b2928e3..382820d58 100644
--- a/src/stores/RecipePreviewsStore.js
+++ b/src/stores/RecipePreviewsStore.js
@@ -1,5 +1,6 @@
 import { action, computed, observable } from 'mobx';
 import { debounce } from 'lodash';
+import ms from 'ms';
 
 import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
@@ -48,5 +49,5 @@ export default class RecipePreviewsStore extends Store {
   // Helper
   _analyticsSearch = debounce((needle) => {
     gaEvent('Recipe', 'search', needle);
-  }, 3000);
+  }, ms('3s'));
 }
diff --git a/src/stores/RequestStore.js b/src/stores/RequestStore.js
index 2629e0a38..9254e3223 100644
--- a/src/stores/RequestStore.js
+++ b/src/stores/RequestStore.js
@@ -1,4 +1,5 @@
 import { action, computed, observable } from 'mobx';
+import ms from 'ms';
 
 import Store from './lib/Store';
 
@@ -13,7 +14,7 @@ export default class RequestStore extends Store {
 
   retries = 0;
 
-  retryDelay = 2000;
+  retryDelay = ms('2s');
 
   constructor(...args) {
     super(...args);
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index efd57a09d..13f929c2f 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -5,12 +5,14 @@ import {
   observable,
 } from 'mobx';
 import { debounce, remove } from 'lodash';
+import ms from 'ms';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { matchRoute } from '../helpers/routing-helpers';
-import { gaEvent } from '../lib/analytics';
+import { gaEvent, statsEvent } from '../lib/analytics';
+import { workspaceStore } from '../features/workspaces';
 
 const debug = require('debug')('Franz:ServiceStore');
 
@@ -34,6 +36,7 @@ export default class ServicesStore extends Store {
 
     // Register action handlers
     this.actions.service.setActive.listen(this._setActive.bind(this));
+    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));
@@ -43,6 +46,7 @@ export default class ServicesStore extends Store {
     this.actions.service.deleteService.listen(this._deleteService.bind(this));
     this.actions.service.clearCache.listen(this._clearCache.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.toggleService.listen(this._toggleService.bind(this));
@@ -97,7 +101,6 @@ export default class ServicesStore extends Store {
         return observable(services.slice().slice().sort((a, b) => a.order - b.order));
       }
     }
-
     return [];
   }
 
@@ -106,13 +109,16 @@ export default class ServicesStore extends Store {
   }
 
   @computed get allDisplayed() {
-    return 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);
   }
 
   // This is just used to avoid unnecessary rerendering of resource-heavy webviews
   @computed get allDisplayedUnordered() {
+    const { showDisabledServices } = this.stores.settings.all.app;
     const services = this.allServicesRequest.execute().result || [];
-    return this.stores.settings.all.app.showDisabledServices ? services : services.filter(service => service.isEnabled);
+    const filteredServices = showDisabledServices ? services : services.filter(service => service.isEnabled);
+    return workspaceStore.filterServicesByActiveWorkspace(filteredServices);
   }
 
   @computed get filtered() {
@@ -293,9 +299,16 @@ export default class ServicesStore extends Store {
     });
     service.isActive = true;
 
+    statsEvent('activate-service', service.recipe.id);
+
     this._focusActiveService();
   }
 
+  @action _blurActive() {
+    if (!this.active) return;
+    this.active.isActive = false;
+  }
+
   @action _setActiveNext() {
     const nextIndex = this._wrapIndex(this.allDisplayed.findIndex(service => service.isActive), 1, this.allDisplayed.length);
 
@@ -340,6 +353,11 @@ export default class ServicesStore extends Store {
     service.isAttached = true;
   }
 
+  @action _detachService({ service }) {
+    service.webview = null;
+    service.isAttached = false;
+  }
+
   @action _focusService({ serviceId }) {
     const service = this.one(serviceId);
 
@@ -679,7 +697,7 @@ export default class ServicesStore extends Store {
   _initRecipePolling(serviceId) {
     const service = this.one(serviceId);
 
-    const delay = 2000;
+    const delay = ms('2s');
 
     if (service) {
       if (service.timer !== null) {
@@ -700,7 +718,7 @@ export default class ServicesStore extends Store {
 
   _reorderAnalytics = debounce(() => {
     gaEvent('Service', 'order');
-  }, 5000);
+  }, ms('5s'));
 
   _wrapIndex(index, delta, size) {
     return (((index + delta) % size) + size) % size;
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index d37ebe4c7..a95a8e1e0 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -1,8 +1,7 @@
 import { action, observable, computed } from 'mobx';
+import { theme } from '@meetfranz/theme';
 
 import Store from './lib/Store';
-import * as themeDefault from '../theme/default';
-import * as themeDark from '../theme/dark';
 
 export default class UIStore extends Store {
   @observable showServicesUpdatedInfoBar = false;
@@ -22,12 +21,13 @@ export default class UIStore extends Store {
     return (settings.app.isAppMuted && settings.app.showMessageBadgeWhenMuted) || !settings.isAppMuted;
   }
 
-  @computed get theme() {
-    if (this.stores.settings.all.app.darkMode) {
-      return Object.assign({}, themeDefault, themeDark);
-    }
+  @computed get isDarkThemeActive() {
+    return this.stores.settings.all.app.darkMode;
+  }
 
-    return themeDefault;
+  @computed get theme() {
+    if (this.isDarkThemeActive) return theme('dark');
+    return theme('default');
   }
 
   // Actions
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 7addb5760..31555dd5c 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -129,10 +129,6 @@ export default class UserStore extends Store {
     return Boolean(localStorage.getItem('authToken'));
   }
 
-  // @computed get isTokenValid() {
-  //   return this.authToken !== null && moment(this.tokenExpiry).isAfter(moment());
-  // }
-
   @computed get isTokenExpired() {
     if (!this.authToken) return false;
 
@@ -146,6 +142,10 @@ export default class UserStore extends Store {
     return this.getUserInfoRequest.execute().result || {};
   }
 
+  @computed get isPremium() {
+    return !!this.data.isPremium;
+  }
+
   @computed get legacyServices() {
     return this.getLegacyServicesRequest.execute() || {};
   }
@@ -160,6 +160,14 @@ export default class UserStore extends Store {
     gaEvent('User', 'login');
   }
 
+  @action _tokenLogin(authToken) {
+    this._setUserData(authToken);
+
+    this.stores.router.push('/');
+
+    gaEvent('User', 'tokenLogin');
+  }
+
   @action async _signup({
     firstname, lastname, email, password, accountType, company,
   }) {
@@ -170,6 +178,7 @@ export default class UserStore extends Store {
       password,
       accountType,
       company,
+      locale: this.stores.app.locale,
     });
 
     this.hasCompletedSignup = false;
@@ -206,6 +215,8 @@ export default class UserStore extends Store {
   }
 
   @action async _update({ userData }) {
+    if (!this.isLoggedIn) return;
+
     const response = await this.updateUserInfoRequest.execute(userData)._promise;
 
     this.getUserInfoRequest.patch(() => response.data);
@@ -222,6 +233,7 @@ export default class UserStore extends Store {
     // workaround mobx issue
     localStorage.removeItem('authToken');
     window.localStorage.removeItem('authToken');
+
     this.getUserInfoRequest.invalidate().reset();
     this.authToken = null;
   }
@@ -262,6 +274,18 @@ export default class UserStore extends Store {
     const { router } = this.stores;
     const currentRoute = router.location.pathname;
     if (!this.isLoggedIn
+      && currentRoute.includes('token=')) {
+      router.push(this.WELCOME_ROUTE);
+      const token = currentRoute.split('=')[1];
+
+      const data = this._parseToken(token);
+      if (data) {
+        // Give this some time to sink
+        setTimeout(() => {
+          this._tokenLogin(token);
+        }, 1000);
+      }
+    } else if (!this.isLoggedIn
       && !currentRoute.includes(this.BASE_ROUTE)) {
       router.push(this.WELCOME_ROUTE);
     } else if (this.isLoggedIn
diff --git a/src/stores/index.js b/src/stores/index.js
index 96b844c95..1912418a2 100644
--- a/src/stores/index.js
+++ b/src/stores/index.js
@@ -10,6 +10,8 @@ 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';
 
 export default (api, actions, router) => {
   const stores = {};
@@ -27,6 +29,8 @@ export default (api, actions, router) => {
     news: new NewsStore(stores, api, actions),
     requests: new RequestStore(stores, api, actions),
     globalError: new GlobalErrorStore(stores, api, actions),
+    workspaces: workspaceStore,
+    announcements: announcementsStore,
   });
   // Initialize all stores
   Object.keys(stores).forEach((name) => {
diff --git a/src/stores/lib/Reaction.js b/src/stores/lib/Reaction.js
index 46aa4dae6..f2642908f 100644
--- a/src/stores/lib/Reaction.js
+++ b/src/stores/lib/Reaction.js
@@ -1,24 +1,31 @@
-// @flow
 import { autorun } from 'mobx';
 
 export default class Reaction {
   reaction;
 
-  hasBeenStarted;
+  isRunning = false;
 
   dispose;
 
   constructor(reaction) {
     this.reaction = reaction;
-    this.hasBeenStarted = false;
   }
 
   start() {
-    this.dispose = autorun(() => this.reaction());
-    this.hasBeenStarted = true;
+    if (!this.isRunning) {
+      this.dispose = autorun(() => this.reaction());
+      this.isActive = true;
+    }
   }
 
   stop() {
-    if (this.hasBeenStarted) this.dispose();
+    if (this.isRunning) {
+      this.dispose();
+      this.isActive = false;
+    }
   }
 }
+
+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 04f528156..486de8a49 100644
--- a/src/stores/lib/Request.js
+++ b/src/stores/lib/Request.js
@@ -85,6 +85,8 @@ export default class Request {
     return this.execute(...this._currentApiCall.args);
   }
 
+  retry = () => this.reload();
+
   isExecutingWithArgs(...args) {
     return this.isExecuting && this._currentApiCall && isEqual(this._currentApiCall.args, args);
   }
@@ -107,7 +109,7 @@ export default class Request {
     Request._hooks.forEach(hook => hook(this));
   }
 
-  reset() {
+  reset = () => {
     this.result = null;
     this.isExecuting = false;
     this.isError = false;
@@ -116,5 +118,5 @@ export default class Request {
     this._promise = Promise;
 
     return this;
-  }
+  };
 }
diff --git a/src/styles/auth.scss b/src/styles/auth.scss
index 817801982..0a075036a 100644
--- a/src/styles/auth.scss
+++ b/src/styles/auth.scss
@@ -107,7 +107,7 @@
   &__scroll-container {
     max-height: 100vh;
     padding: 80px 0;
-    overflow: scroll;
+    overflow: auto;
     width: 100%;
   }
 
diff --git a/src/styles/badge.scss b/src/styles/badge.scss
index f9fac039a..69879de31 100644
--- a/src/styles/badge.scss
+++ b/src/styles/badge.scss
@@ -8,7 +8,7 @@
   &.badge--primary,
   &.badge--premium {
     background: $theme-brand-primary;
-    color: $dark-theme-gray-smoke;
+    color: $dark-theme-gray-lightest;
   }
 }
 
@@ -19,6 +19,7 @@
   display: inline-block;
   font-size: 14px;
   padding: 5px 10px;
+  letter-spacing: 0;
 
   &.badge--primary,
   &.badge--premium {
diff --git a/src/styles/info-bar.scss b/src/styles/info-bar.scss
index fb4917358..d3010942f 100644
--- a/src/styles/info-bar.scss
+++ b/src/styles/info-bar.scss
@@ -43,6 +43,10 @@
     }
   }
 
+  .info-bar__inline-button {
+    color: white;
+  }
+
   &.info-bar--bottom { order: 10; }
 
   &.info-bar--primary {
diff --git a/src/styles/layout.scss b/src/styles/layout.scss
index 8b7cc512a..e858b7904 100644
--- a/src/styles/layout.scss
+++ b/src/styles/layout.scss
@@ -18,8 +18,14 @@ html { overflow: hidden; }
       font-size: 22px;
 
       &:hover,
-      &:active { color: $dark-theme-gray-smoke; }
-      &.is-muted { color: $theme-brand-primary; }
+      &:active {
+        color: $dark-theme-gray-smoke;
+      }
+
+      &.is-muted,
+      &.is-active {
+        color: $theme-brand-primary;
+      }
     }
   }
 
@@ -33,6 +39,7 @@ html { overflow: hidden; }
   .app__content { display: flex; }
 
   .app__service {
+    position: relative;
     display: flex;
     flex: 1;
     flex-direction: column;
@@ -84,7 +91,7 @@ html { overflow: hidden; }
 
     &:hover,
     &:active { color: lighten($theme-gray-light, 10%); }
-    &.is-muted { color: $theme-brand-primary; }
+    &.is-muted, &.is-active { color: $theme-brand-primary; }
     &--new-service { padding-bottom: 6px; }
   }
 
@@ -124,15 +131,14 @@ html { overflow: hidden; }
   background: $theme-brand-warning;
   color: #FFF;
   display: block;
-  font-size: 10px;
+  font-size: 8px;
   height: auto;
   padding: 4px;
   position: fixed;
-  right: 5px;
-  top: 5px;
+  left: 9px;
+  bottom: 0px;
   transition: opacity .5s ease;
   width: auto;
   z-index: 999999999;
-
-  &:hover { opacity: 0; }
+  pointer-events: none;
 }
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index 750b6bedd..1baff8b54 100644
--- a/src/styles/settings.scss
+++ b/src/styles/settings.scss
@@ -61,14 +61,9 @@
 
     .account {
       .account__box { background: $dark-theme-gray-darker; }
-
-      .invoices {
-        td { border-bottom: 1px solid $dark-theme-gray-darker; }
-        .invoices__action button { color: $theme-brand-primary; }
-      }
     }
 
-    .premium-info { 
+    .premium-info {
       background: $dark-theme-gray-darker;
       border: 2px solid $theme-brand-primary;
     }
@@ -329,15 +324,6 @@
     .account__avatar {
       margin-right: 20px;
       position: relative;
-
-      .emoji img { width: 30px; }
-    }
-
-    .account__avatar-premium {
-      font-size: 26px;
-      position: absolute;
-      right: 2px;
-      top: 2px;
     }
 
     .account__info {
@@ -345,6 +331,7 @@
 
       h2 { margin-bottom: 5px; }
       .badge { margin-top: 5px; }
+      .username { margin-right: 10 }
     }
 
     .account__subscription {
@@ -354,6 +341,22 @@
       .badge { margin-left: 10px; }
     }
 
+    .badge--premium {
+      margin-left: 1px;
+      position: relative;
+      top: -3px;
+      padding-top: 4px;
+      color: #FFF;
+      border-radius: 3px;
+    }
+
+
+    .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; }
@@ -414,6 +417,7 @@
 
   .settings-navigation__link {
     align-items: center;
+    justify-content: space-between;
     color: $theme-text-color;
     display: flex;
     flex-shrink: 0;
@@ -425,7 +429,9 @@
     &:hover {
       background: darken($theme-gray-lightest, 5%);
 
-      .badge { background: #FFF; }
+      .badge {
+        background: #FFF;
+      }
     }
 
     &.is-active {
@@ -442,8 +448,8 @@
   .settings-navigation__expander { flex: 1; }
 
   .badge {
+
     display: initial;
-    margin-left: 5px;
     transition: background $theme-transition-time, color $theme-transition-time;
   }
 
diff --git a/src/styles/toggle.scss b/src/styles/toggle.scss
index 0ce0c3379..52675ceed 100644
--- a/src/styles/toggle.scss
+++ b/src/styles/toggle.scss
@@ -41,7 +41,7 @@ $toggle-button-size: 22px;
 
     &.is-active .franz-form__toggle-button {
       background: $theme-brand-primary;
-      left: $toggle-width - $toggle-size - 3;;
+      left: $toggle-width - $toggle-size - 3;
     }
 
     input { display: none; }
diff --git a/src/theme/dark/index.js b/src/theme/dark/index.js
deleted file mode 100644
index 8fdb321f3..000000000
--- a/src/theme/dark/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import hexToRgba from 'hex-to-rgba';
-
-import * as legacyStyles from '../default/legacy';
-
-export const colorBackground = legacyStyles.darkThemeGrayDarkest;
-export const colorBackgroundSubscriptionContainer = legacyStyles.themeBrandInfo;
-
-export const colorHeadline = legacyStyles.darkThemeTextColor;
-export const colorText = legacyStyles.darkThemeTextColor;
-
-// Error Handler
-export const colorWebviewErrorHandlerBackground = legacyStyles.darkThemeGrayDarkest;
-
-// Loader
-export const colorFullscreenLoaderSpinner = '#FFF';
-export const colorWebviewLoaderBackground = hexToRgba(legacyStyles.darkThemeGrayDarkest, 0.5);
-
-// Modal
-export const colorModalOverlayBackground = hexToRgba(legacyStyles.darkThemeGrayDarkest, 0.8);
diff --git a/src/theme/default/index.js b/src/theme/default/index.js
deleted file mode 100644
index 61410073d..000000000
--- a/src/theme/default/index.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import hexToRgba from 'hex-to-rgba';
-
-import * as legacyStyles from './legacy';
-
-export const brandPrimary = '#3498db';
-export const brandSuccess = '#5cb85c';
-export const brandInfo = '#5bc0de';
-export const brandWarning = '#FF9F00';
-export const brandDanger = '#d9534f';
-
-export const borderRadius = legacyStyles.themeBorderRadius;
-export const borderRadiusSmall = legacyStyles.themeBorderRadiusSmall;
-
-export const colorBackground = legacyStyles.themeGrayLighter;
-export const colorHeadline = legacyStyles.themeGrayDark;
-
-export const colorText = legacyStyles.themeTextColor;
-
-// Subscription Container Component
-export const colorSubscriptionContainerBackground = 'none';
-export const colorSubscriptionContainerBorder = [1, 'solid', brandPrimary];
-export const colorSubscriptionContainerTitle = brandPrimary;
-export const colorSubscriptionContainerActionButtonBackground = brandPrimary;
-export const colorSubscriptionContainerActionButtonColor = '#FFF';
-
-// Error Handler
-export const colorWebviewErrorHandlerBackground = legacyStyles.themeGrayLighter;
-
-// Loader
-export const colorAppLoaderSpinner = '#FFF';
-export const colorFullscreenLoaderSpinner = legacyStyles.themeGrayDark;
-export const colorWebviewLoaderBackground = hexToRgba(legacyStyles.themeGrayLighter, 0.8);
-
-// Modal
-export const colorModalOverlayBackground = hexToRgba(legacyStyles.themeGrayLighter, 0.8);
diff --git a/src/webview/contextMenu.js b/src/webview/contextMenu.js
index a76c03e5a..a4a6ab899 100644
--- a/src/webview/contextMenu.js
+++ b/src/webview/contextMenu.js
@@ -33,6 +33,8 @@ const buildMenuTpl = (props, suggestions, isSpellcheckEnabled, defaultSpellcheck
   const canGoBack = webContents.canGoBack();
   const canGoForward = webContents.canGoForward();
 
+  // @adlk: we can't use roles here due to a bug with electron where electron.remote.webContents.getFocusedWebContents() returns the first webview in DOM instead of the focused one
+  // Github issue creation is pending
   let menuTpl = [
     {
       type: 'separator',
@@ -48,19 +50,32 @@ const buildMenuTpl = (props, suggestions, isSpellcheckEnabled, defaultSpellcheck
       type: 'separator',
     }, {
       id: 'cut',
-      role: can('Cut') ? 'cut' : '',
+      label: 'Cut',
+      click() {
+        if (can('Cut')) {
+          webContents.cut();
+        }
+      },
       enabled: can('Cut'),
       visible: hasText && props.isEditable,
     }, {
       id: 'copy',
       label: 'Copy',
-      role: can('Copy') ? 'copy' : '',
+      click() {
+        if (can('Copy')) {
+          webContents.copy();
+        }
+      },
       enabled: can('Copy'),
       visible: props.isEditable || hasText,
     }, {
       id: 'paste',
       label: 'Paste',
-      role: editFlags.canPaste ? 'paste' : '',
+      click() {
+        if (editFlags.canPaste) {
+          webContents.paste();
+        }
+      },
       enabled: editFlags.canPaste,
       visible: props.isEditable,
     }, {
@@ -207,8 +222,6 @@ const buildMenuTpl = (props, suggestions, isSpellcheckEnabled, defaultSpellcheck
     });
   });
 
-  console.log('isSpellcheckEnabled', isSpellcheckEnabled);
-
   menuTpl.push({
     type: 'separator',
   }, {
@@ -234,6 +247,16 @@ const buildMenuTpl = (props, suggestions, isSpellcheckEnabled, defaultSpellcheck
         },
       },
       {
+        id: 'automaticDetection',
+        label: 'Automatic language detection',
+        type: 'radio',
+        checked: spellcheckerLanguage === 'automatic',
+        click() {
+          debug('Detect language automatically');
+          ipcRenderer.sendToHost('set-service-spellchecker-language', 'automatic');
+        },
+      },
+      {
         type: 'separator',
         visible: defaultSpellcheckerLanguage !== spellcheckerLanguage,
       },
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index c718b348e..1e5d74b1f 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -1,10 +1,12 @@
 import { ipcRenderer } from 'electron';
 import path from 'path';
 import { autorun, computed, observable } from 'mobx';
+import { loadModule } from 'cld3-asm';
+import { debounce } from 'lodash';
 
 import RecipeWebview from './lib/RecipeWebview';
 
-import spellchecker, { switchDict, disable as disableSpellchecker } from './spellchecker';
+import spellchecker, { switchDict, disable as disableSpellchecker, getSpellcheckerLocaleByFuzzyIdentifier } from './spellchecker';
 import { injectDarkModeStyle, isDarkModeStyleInjected, removeDarkModeStyle } from './darkmode';
 import contextMenu from './contextMenu';
 import './notifications';
@@ -40,6 +42,8 @@ class RecipeController {
     return this.settings.service.spellcheckerLanguage || this.settings.app.spellcheckerLanguage;
   }
 
+  cldIdentifier = null;
+
   async initialize() {
     Object.keys(this.ipcEvents).forEach((channel) => {
       ipcRenderer.on(channel, (...args) => {
@@ -87,10 +91,22 @@ class RecipeController {
 
     if (this.settings.app.enableSpellchecking) {
       debug('Setting spellchecker language to', this.spellcheckerLanguage);
-      switchDict(this.spellcheckerLanguage);
+      let { spellcheckerLanguage } = this;
+      if (spellcheckerLanguage === 'automatic') {
+        this.automaticLanguageDetection();
+        debug('Found `automatic` locale, falling back to user locale until detected', this.settings.app.locale);
+        spellcheckerLanguage = this.settings.app.locale;
+      } else if (this.cldIdentifier) {
+        this.cldIdentifier.destroy();
+      }
+      switchDict(spellcheckerLanguage);
     } else {
       debug('Disable spellchecker');
       disableSpellchecker();
+
+      if (this.cldIdentifier) {
+        this.cldIdentifier.destroy();
+      }
     }
 
     if (this.settings.service.isDarkModeEnabled) {
@@ -113,6 +129,42 @@ class RecipeController {
   serviceIdEcho(event) {
     event.sender.send('service-id', this.settings.service.id);
   }
+
+  async automaticLanguageDetection() {
+    const cldFactory = await loadModule();
+    this.cldIdentifier = cldFactory.create(0, 1000);
+
+    window.addEventListener('keyup', debounce((e) => {
+      const element = e.target;
+
+      console.log(element);
+
+      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 < 30) return;
+
+      debug('Detecting language for', value);
+      const findResult = this.cldIdentifier.findLanguage(value);
+
+      debug('Language detection result', findResult);
+
+      if (findResult.is_reliable) {
+        const spellcheckerLocale = getSpellcheckerLocaleByFuzzyIdentifier(findResult.language);
+        debug('Language detected reliably, setting spellchecker language to', spellcheckerLocale);
+        if (spellcheckerLocale) {
+          switchDict(spellcheckerLocale);
+        }
+      }
+    }, 225));
+  }
 }
 
 /* eslint-disable no-new */
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index becaed449..9158b3b94 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -3,6 +3,7 @@ import { SpellCheckerProvider } from 'electron-hunspell';
 import path from 'path';
 
 import { DICTIONARY_PATH } from '../config';
+import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 
 const debug = require('debug')('Franz:spellchecker');
 
@@ -82,3 +83,13 @@ export function disable() {
     currentDict = null;
   }
 }
+
+export function getSpellcheckerLocaleByFuzzyIdentifier(identifier) {
+  const locales = Object.keys(SPELLCHECKER_LOCALES).filter(key => key === identifier.toLowerCase() || key.split('-')[0] === identifier.toLowerCase());
+
+  if (locales.length >= 1) {
+    return locales[0];
+  }
+
+  return null;
+}