37 files changed, 546 insertions, 130 deletions

diff --git a/src/features/accentColor/index.js b/src/features/accentColor/index.js
new file mode 100644
index 000000000..a0f57a2fa
--- /dev/null
+++ b/src/features/accentColor/index.js
@@ -0,0 +1,55 @@
+import { reaction } from 'mobx';
+import themeInfo from '../../assets/themeInfo.json';
+import { DEFAULT_APP_SETTINGS } from '../../config';
+
+const STYLE_ELEMENT_ID = 'accent-color';
+
+function createAccentStyleElement() {
+  const styles = document.createElement('style');
+  styles.id = STYLE_ELEMENT_ID;
+
+  document.querySelector('head').appendChild(styles);
+}
+
+function setAccentStyle(style) {
+  const styleElement = document.getElementById(STYLE_ELEMENT_ID);
+  styleElement.innerHTML = style;
+}
+
+function generateAccentStyle(color) {
+  let style = '';
+
+  Object.keys(themeInfo).forEach((property) => {
+    style += `
+      ${themeInfo[property]} {
+        ${property}: ${color};
+      }
+    `;
+  });
+
+  return style;
+}
+
+export default function initAccentColor(stores) {
+  const { settings } = stores;
+  createAccentStyleElement();
+
+  // Update accent color
+  reaction(
+    () => (
+      settings.all.app.accentColor
+    ),
+    (color) => {
+      if (color === DEFAULT_APP_SETTINGS.accentColor) {
+        // Reset accent style to return to default color scheme
+        setAccentStyle('');
+      } else {
+        const style = generateAccentStyle(color);
+        setAccentStyle(style);
+      }
+    },
+    {
+      fireImmediately: true,
+    },
+  );
+}
diff --git a/src/features/announcements/api.js b/src/features/announcements/api.js
index a581bd8de..e5c5a7d6f 100644
--- a/src/features/announcements/api.js
+++ b/src/features/announcements/api.js
@@ -1,8 +1,7 @@
 import { remote } from 'electron';
 import Request from '../../stores/lib/Request';
-import { API, API_VERSION } from '../../environment';
 
-const debug = require('debug')('Franz:feature:announcements:api');
+const debug = require('debug')('Ferdi:feature:announcements:api');
 
 export const announcementsApi = {
   async getCurrentVersion() {
@@ -12,7 +11,7 @@ export const announcementsApi = {
 
   async getChangelog(version) {
     debug('fetching release changelog from Github');
-    const url = `https://api.github.com/repos/meetfranz/franz/releases/tags/v${version}`;
+    const url = `https://api.github.com/repos/getferdi/ferdi/releases/tags/v${version}`;
     const request = await window.fetch(url, { method: 'GET' });
     if (!request.ok) return null;
     const data = await request.json();
@@ -21,7 +20,7 @@ export const announcementsApi = {
 
   async getAnnouncement(version) {
     debug('fetching release announcement from api');
-    const url = `${API}/${API_VERSION}/announcements/${version}`;
+    const url = `https://api.getferdi.com/v1/announcements/${version}`;
     const response = await window.fetch(url, { method: 'GET' });
     if (!response.ok) return null;
     return response.json();
diff --git a/src/features/announcements/components/AnnouncementScreen.js b/src/features/announcements/components/AnnouncementScreen.js
index 03bd5ba41..38de2dbc8 100644
--- a/src/features/announcements/components/AnnouncementScreen.js
+++ b/src/features/announcements/components/AnnouncementScreen.js
@@ -8,7 +8,6 @@ import { Button } from '@meetfranz/forms';
 
 import { announcementsStore } from '../index';
 import UIStore from '../../../stores/UIStore';
-import { gaEvent } from '../../../lib/analytics';
 
 const renderer = new marked.Renderer();
 
@@ -19,7 +18,7 @@ const markedOptions = { sanitize: true, renderer };
 const messages = defineMessages({
   headline: {
     id: 'feature.announcements.changelog.headline',
-    defaultMessage: '!!!Changes in Franz {version}',
+    defaultMessage: '!!!Changes in Ferdi {version}',
   },
 });
 
@@ -228,9 +227,7 @@ class AnnouncementScreen extends Component {
                     <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>
@@ -253,9 +250,7 @@ class AnnouncementScreen extends Component {
                     <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>
diff --git a/src/features/announcements/index.js b/src/features/announcements/index.js
index f14e7c9a5..10f081bb1 100644
--- a/src/features/announcements/index.js
+++ b/src/features/announcements/index.js
@@ -1,7 +1,7 @@
 import { reaction } from 'mobx';
 import { AnnouncementsStore } from './store';
 
-const debug = require('debug')('Franz:feature:announcements');
+const debug = require('debug')('Ferdi:feature:announcements');
 
 export const GA_CATEGORY_ANNOUNCEMENTS = 'Announcements';
 
@@ -12,13 +12,12 @@ export const ANNOUNCEMENTS_ROUTES = {
 };
 
 export default function initAnnouncements(stores, actions) {
-  // const { features } = stores;
+  const { features } = stores;
 
-  // Toggle workspace feature
+  // Toggle announcement feature
   reaction(
     () => (
-      true
-      // features.features.isAnnouncementsEnabled
+      features.features.isAnnouncementsEnabled
     ),
     (isEnabled) => {
       if (isEnabled) {
diff --git a/src/features/announcements/store.js b/src/features/announcements/store.js
index d58afbc8e..9ec5f67d2 100644
--- a/src/features/announcements/store.js
+++ b/src/features/announcements/store.js
@@ -7,18 +7,17 @@ import semver from 'semver';
 import localStorage from 'mobx-localstorage';
 
 import { FeatureStore } from '../utils/FeatureStore';
-import { ANNOUNCEMENTS_ROUTES, GA_CATEGORY_ANNOUNCEMENTS } from '.';
+import { ANNOUNCEMENTS_ROUTES } 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';
 import { matchRoute } from '../../helpers/routing-helpers';
 import { DEFAULT_APP_SETTINGS } from '../../config';
 
 const LOCAL_STORAGE_KEY = 'announcements';
 
-const debug = require('debug')('Franz:feature:announcements:store');
+const debug = require('debug')('Ferdi:feature:announcements:store');
 
 export class AnnouncementsStore extends FeatureStore {
   @observable targetVersion = null;
@@ -114,7 +113,6 @@ export class AnnouncementsStore extends FeatureStore {
     if (router.location.pathname !== targetRoute) {
       this.stores.router.push(targetRoute);
     }
-    gaEvent(GA_CATEGORY_ANNOUNCEMENTS, 'show');
   };
 
   // ======= REACTIONS ========
diff --git a/src/features/basicAuth/index.js b/src/features/basicAuth/index.js
index 89607824b..51625ea55 100644
--- a/src/features/basicAuth/index.js
+++ b/src/features/basicAuth/index.js
@@ -3,7 +3,7 @@ import { observable } from 'mobx';
 
 import BasicAuthComponent from './Component';
 
-const debug = require('debug')('Franz:feature:basicAuth');
+const debug = require('debug')('Ferdi:feature:basicAuth');
 
 const defaultState = {
   isModalVisible: true,
@@ -20,7 +20,7 @@ export function resetState() {
 export default function initialize() {
   debug('Initialize basicAuth feature');
 
-  window.franz.features.basicAuth = {
+  window.ferdi.features.basicAuth = {
     state,
   };
 
diff --git a/src/features/basicAuth/mainIpcHandler.js b/src/features/basicAuth/mainIpcHandler.js
index 87ac0b6df..ae4e7cf93 100644
--- a/src/features/basicAuth/mainIpcHandler.js
+++ b/src/features/basicAuth/mainIpcHandler.js
@@ -1,4 +1,4 @@
-const debug = require('debug')('Franz:feature:basicAuth:main');
+const debug = require('debug')('Ferdi:feature:basicAuth:main');
 
 export default function mainIpcHandler(mainWindow, authInfo) {
   debug('Sending basic auth call', authInfo);
diff --git a/src/features/communityRecipes/index.js b/src/features/communityRecipes/index.js
index 4d050f90e..553b423f3 100644
--- a/src/features/communityRecipes/index.js
+++ b/src/features/communityRecipes/index.js
@@ -1,7 +1,7 @@
 import { reaction } from 'mobx';
 import { CommunityRecipesStore } from './store';
 
-const debug = require('debug')('Franz:feature:communityRecipes');
+const debug = require('debug')('Ferdi:feature:communityRecipes');
 
 export const DEFAULT_SERVICE_LIMIT = 3;
 
@@ -19,7 +19,7 @@ export default function initCommunityRecipes(stores, actions) {
     ),
     (isPremiumFeature) => {
       debug('Community recipes is premium feature: ', isPremiumFeature);
-      communityRecipesStore.isCommunityRecipesIncludedInCurrentPlan = isPremiumFeature;
+      communityRecipesStore.isCommunityRecipesIncludedInCurrentPlan = true;
     },
     {
       fireImmediately: true,
diff --git a/src/features/communityRecipes/store.js b/src/features/communityRecipes/store.js
index 4d45c3b33..3a60e5449 100644
--- a/src/features/communityRecipes/store.js
+++ b/src/features/communityRecipes/store.js
@@ -1,10 +1,10 @@
 import { computed, observable } from 'mobx';
 import { FeatureStore } from '../utils/FeatureStore';
 
-const debug = require('debug')('Franz:feature:communityRecipes:store');
+const debug = require('debug')('Ferdi:feature:communityRecipes:store');
 
 export class CommunityRecipesStore extends FeatureStore {
-  @observable isCommunityRecipesIncludedInCurrentPlan = false;
+  @observable isCommunityRecipesIncludedInCurrentPlan = true;
 
   start(stores, actions) {
     debug('start');
diff --git a/src/features/delayApp/Component.js b/src/features/delayApp/Component.js
index fcc27c75c..81f89bc52 100644
--- a/src/features/delayApp/Component.js
+++ b/src/features/delayApp/Component.js
@@ -5,9 +5,6 @@ import { defineMessages, intlShape } from 'react-intl';
 import injectSheet from 'react-jss';
 
 import { Button } from '@meetfranz/forms';
-import { gaEvent } from '../../lib/analytics';
-
-// import Button from '../../components/ui/Button';
 
 import { config } from '.';
 import styles from './styles';
@@ -32,7 +29,7 @@ const messages = defineMessages({
   },
   text: {
     id: 'feature.delayApp.text',
-    defaultMessage: '!!!Franz will continue in {seconds} seconds.',
+    defaultMessage: '!!!Ferdi will continue in {seconds} seconds.',
   },
 });
 
@@ -78,12 +75,8 @@ export default @inject('stores', 'actions') @injectSheet(styles) @observer class
 
     if (!hadSubscription) {
       actions.user.activateTrial({ planId: defaultTrialPlan });
-
-      gaEvent('DelayApp', 'subscribe_click', 'Delay App Feature');
     } else {
       actions.ui.openSettings({ path: 'user' });
-
-      gaEvent('DelayApp', 'subscribe_click', 'Delay App Feature');
     }
   }
 
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
index 5b28fb7c8..51bd887a2 100644
--- a/src/features/delayApp/index.js
+++ b/src/features/delayApp/index.js
@@ -3,10 +3,9 @@ import moment from 'moment';
 import DelayAppComponent from './Component';
 
 import { DEFAULT_FEATURES_CONFIG } from '../../config';
-import { gaEvent, gaPage } from '../../lib/analytics';
 import { getUserWorkspacesRequest } from '../workspaces/api';
 
-const debug = require('debug')('Franz:feature:delayApp');
+const debug = require('debug')('Ferdi:feature:delayApp');
 
 export const config = {
   delayOffset: DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.delayOffset,
@@ -29,7 +28,7 @@ export default function init(stores) {
   let shownAfterLaunch = false;
   let timeLastDelay = moment();
 
-  window.franz.features.delayApp = {
+  window.ferdi.features.delayApp = {
     state,
   };
 
@@ -64,8 +63,6 @@ export default function init(stores) {
             debug(`App will be delayed for ${config.delayDuration / 1000}s`);
 
             setVisibility(true);
-            gaPage('/delayApp');
-            gaEvent('DelayApp', 'show', 'Delay App Feature');
 
 
             setTimeout(() => {
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js
new file mode 100644
index 000000000..797589e9b
--- /dev/null
+++ b/src/features/quickSwitch/Component.js
@@ -0,0 +1,337 @@
+import React, { Component, createRef } from 'react';
+import { remote } from 'electron';
+import PropTypes from 'prop-types';
+import { observer, inject } from 'mobx-react';
+import { reaction } from 'mobx';
+import injectSheet from 'react-jss';
+import { defineMessages, intlShape } from 'react-intl';
+import { Input } from '@meetfranz/forms';
+import { H1 } from '@meetfranz/ui';
+
+import Modal from '../../components/ui/Modal';
+import { state as ModalState } from '.';
+import ServicesStore from '../../stores/ServicesStore';
+
+const messages = defineMessages({
+  title: {
+    id: 'feature.quickSwitch.title',
+    defaultMessage: '!!!QuickSwitch',
+  },
+  search: {
+    id: 'feature.quickSwitch.search',
+    defaultMessage: '!!!Search...',
+  },
+  info: {
+    id: 'feature.quickSwitch.info',
+    defaultMessage: '!!!Select a service with TAB, ↑ and ↓. Open a service with ENTER.',
+  },
+});
+
+const styles = theme => ({
+  modal: {
+    width: '80%',
+    maxWidth: 600,
+    background: theme.styleTypes.primary.contrast,
+    color: theme.styleTypes.primary.accent,
+    paddingTop: 30,
+  },
+  headline: {
+    fontSize: 20,
+    marginBottom: 20,
+    marginTop: -27,
+  },
+  services: {
+    width: '100%',
+    maxHeight: '50vh',
+    overflow: 'scroll',
+  },
+  service: {
+    background: theme.styleTypes.primary.contrast,
+    color: theme.colorText,
+    borderColor: theme.styleTypes.primary.accent,
+    borderStyle: 'solid',
+    borderWidth: 1,
+    borderRadius: 6,
+    padding: '3px 25px',
+    marginBottom: 10,
+    display: 'flex',
+    alignItems: 'center',
+    '&:hover': {
+      background: theme.styleTypes.primary.accent,
+      color: theme.styleTypes.primary.contrast,
+      cursor: 'pointer',
+    },
+  },
+  activeService: {
+    background: theme.styleTypes.primary.accent,
+    color: theme.styleTypes.primary.contrast,
+    cursor: 'pointer',
+  },
+  serviceIcon: {
+    width: 50,
+    height: 50,
+    paddingRight: 20,
+    objectFit: 'contain',
+  },
+});
+
+export default @injectSheet(styles) @inject('stores', 'actions') @observer class QuickSwitchModal extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  state = {
+    selected: 0,
+    search: '',
+    wasPrevVisible: false,
+  }
+
+  ARROW_DOWN = 40;
+
+  ARROW_UP = 38;
+
+  ENTER = 13;
+
+  TAB = 9;
+
+  inputRef = createRef();
+
+  serviceElements = {};
+
+  constructor(props) {
+    super(props);
+
+    this._handleKeyDown = this._handleKeyDown.bind(this);
+    this._handleSearchUpdate = this._handleSearchUpdate.bind(this);
+    this._handleVisibilityChange = this._handleVisibilityChange.bind(this);
+    this.openService = this.openService.bind(this);
+
+    reaction(
+      () => ModalState.isModalVisible,
+      this._handleVisibilityChange,
+    );
+  }
+
+  // Add global keydown listener when component mounts
+  componentDidMount() {
+    document.addEventListener('keydown', this._handleKeyDown);
+  }
+
+  // Remove global keydown listener when component unmounts
+  componentWillUnmount() {
+    document.removeEventListener('keydown', this._handleKeyDown);
+  }
+
+  // Get currently shown services
+  services() {
+    let services = [];
+    if (this.state.search) {
+      // Apply simple search algorythm to list of all services
+      services = this.props.stores.services.allDisplayed;
+      services = services.filter(service => service.name.toLowerCase().includes(this.state.search.toLowerCase()));
+    } else {
+      // Add last used services to services array
+      for (const service of this.props.stores.services.lastUsedServices) {
+        if (this.props.stores.services.one(service)) {
+          services.push(
+            this.props.stores.services.one(service),
+          );
+        }
+      }
+
+      // Add all other services in the default order
+      for (const service of this.props.stores.services.allDisplayed) {
+        if (!services.includes(service)) {
+          services.push(service);
+        }
+      }
+    }
+
+    return services;
+  }
+
+  openService(index) {
+    // Open service
+    const service = this.services()[index];
+    this.props.actions.service.setActive({ serviceId: service.id });
+
+    // Reset and close modal
+    this.setState({
+      search: '',
+    });
+    this.close();
+  }
+
+  // Change the selected service
+  // factor should be -1 or 1
+  changeSelected(factor) {
+    this.setState((state) => {
+      let newSelected = state.selected + factor;
+      const services = this.services().length;
+
+      // Roll around when on edge of list
+      if (state.selected < 1 && factor === -1) {
+        newSelected = services - 1;
+      } else if ((state.selected >= (services - 1)) && factor === 1) {
+        newSelected = 0;
+      }
+
+      // Make sure new selection is visible
+      const serviceElement = this.serviceElements[newSelected];
+      if (serviceElement) {
+        serviceElement.scrollIntoViewIfNeeded(false);
+      }
+
+
+      return {
+        selected: newSelected,
+      };
+    });
+  }
+
+  // Handle global key presses to change the selection
+  _handleKeyDown(event) {
+    if (ModalState.isModalVisible) {
+      switch (event.keyCode) {
+        case this.ARROW_DOWN:
+          this.changeSelected(1);
+          break;
+        case this.TAB:
+          this.changeSelected(1);
+          break;
+        case this.ARROW_UP:
+          this.changeSelected(-1);
+          break;
+        case this.ENTER:
+          this.openService(this.state.selected);
+          break;
+        default:
+          break;
+      }
+    }
+  }
+
+  // Handle update of the search query
+  _handleSearchUpdate(evt) {
+    this.setState({
+      search: evt.target.value,
+    });
+  }
+
+  _handleVisibilityChange() {
+    const { isModalVisible } = ModalState;
+
+    if (isModalVisible && !this.state.wasPrevVisible) {
+      // Set focus back on current window if its in a service
+      // TODO: Find a way to gain back focus
+      remote.getCurrentWindow().blurWebView();
+      remote.getCurrentWindow().webContents.focus();
+
+      // The input "focus" attribute will only work on first modal open
+      // Manually add focus to the input element
+      // Wrapped inside timeout to let the modal render first
+      setTimeout(() => {
+        if (this.inputRef.current) {
+          this.inputRef.current.getElementsByTagName('input')[0].focus();
+        }
+      }, 10);
+
+      this.setState({
+        wasPrevVisible: true,
+      });
+    } else if (!isModalVisible && this.state.wasPrevVisible) {
+      // Manually blur focus from the input element to prevent
+      // search query change when modal not visible
+      setTimeout(() => {
+        if (this.inputRef.current) {
+          this.inputRef.current.getElementsByTagName('input')[0].blur();
+        }
+      }, 100);
+
+      this.setState({
+        wasPrevVisible: false,
+      });
+    }
+  }
+
+  // Close this modal
+  close() {
+    ModalState.isModalVisible = false;
+  }
+
+  render() {
+    const { isModalVisible } = ModalState;
+
+    const {
+      openService,
+    } = this;
+
+    const {
+      classes,
+    } = this.props;
+
+    const services = this.services();
+
+    const { intl } = this.context;
+
+    return (
+      <Modal
+        isOpen={isModalVisible}
+        className={`${classes.modal} quick-switch`}
+        shouldCloseOnOverlayClick
+        close={this.close.bind(this)}
+      >
+        <H1 className={classes.headline}>
+          {intl.formatMessage(messages.title)}
+        </H1>
+        <div ref={this.inputRef}>
+          <Input
+            placeholder={intl.formatMessage(messages.search)}
+            focus
+            value={this.state.search}
+            onChange={this._handleSearchUpdate}
+          />
+        </div>
+
+        <div className={classes.services}>
+          { services.map((service, index) => (
+            <div
+              className={`${classes.service} ${this.state.selected === index ? `${classes.activeService} active` : ''} service`}
+              onClick={() => openService(index)}
+              key={service.id}
+              ref={(el) => {
+                this.serviceElements[index] = el;
+              }}
+            >
+              <img
+                src={service.icon}
+                className={classes.serviceIcon}
+                alt={service.recipe.name}
+              />
+              <div>
+                { service.name }
+              </div>
+            </div>
+          ))}
+        </div>
+
+        <p>{intl.formatMessage(messages.info)}</p>
+      </Modal>
+    );
+  }
+}
+
+QuickSwitchModal.wrappedComponent.propTypes = {
+  stores: PropTypes.shape({
+    services: PropTypes.instanceOf(ServicesStore).isRequired,
+  }).isRequired,
+  actions: PropTypes.shape({
+    service: PropTypes.shape({
+      setActive: PropTypes.func.isRequired,
+    }).isRequired,
+  }).isRequired,
+};
diff --git a/src/features/quickSwitch/index.js b/src/features/quickSwitch/index.js
new file mode 100644
index 000000000..c57fad366
--- /dev/null
+++ b/src/features/quickSwitch/index.js
@@ -0,0 +1,24 @@
+import { observable } from 'mobx';
+
+export { default as Component } from './Component';
+
+const debug = require('debug')('Ferdi:feature:quickSwitch');
+
+const defaultState = {
+  isModalVisible: false,
+};
+
+export const state = observable(defaultState);
+
+export default function initialize() {
+  debug('Initialize quickSwitch feature');
+
+  function showModal() {
+    state.isModalVisible = true;
+  }
+
+  window.ferdi.features.quickSwitch = {
+    state,
+    showModal,
+  };
+}
diff --git a/src/features/serviceLimit/components/LimitReachedInfobox.js b/src/features/serviceLimit/components/LimitReachedInfobox.js
index 19285a4eb..83aec4c40 100644
--- a/src/features/serviceLimit/components/LimitReachedInfobox.js
+++ b/src/features/serviceLimit/components/LimitReachedInfobox.js
@@ -5,8 +5,6 @@ import { defineMessages, intlShape } from 'react-intl';
 import injectSheet from 'react-jss';
 import { Infobox } from '@meetfranz/ui';
 
-import { gaEvent } from '../../../lib/analytics';
-
 const messages = defineMessages({
   limitReached: {
     id: 'feature.serviceLimit.limitReached',
@@ -67,7 +65,6 @@ class LimitReachedInfobox extends Component {
         ctaLabel={intl.formatMessage(messages.action)}
         ctaOnClick={() => {
           actions.ui.openSettings({ path: 'user' });
-          gaEvent('Service Limit', 'upgrade', 'Upgrade account');
         }}
       >
         {intl.formatMessage(messages.limitReached, { amount: serviceLimit.serviceCount, limit: serviceLimit.serviceLimit })}
diff --git a/src/features/serviceLimit/index.js b/src/features/serviceLimit/index.js
index 92ad8bb98..fa93bb615 100644
--- a/src/features/serviceLimit/index.js
+++ b/src/features/serviceLimit/index.js
@@ -1,7 +1,7 @@
 import { reaction } from 'mobx';
 import { ServiceLimitStore } from './store';
 
-const debug = require('debug')('Franz:feature:serviceLimit');
+const debug = require('debug')('Ferdi:feature:serviceLimit');
 
 export const DEFAULT_SERVICE_LIMIT = 3;
 
diff --git a/src/features/serviceLimit/store.js b/src/features/serviceLimit/store.js
index 9836c5f51..6510e2872 100644
--- a/src/features/serviceLimit/store.js
+++ b/src/features/serviceLimit/store.js
@@ -2,7 +2,7 @@ import { computed, observable } from 'mobx';
 import { FeatureStore } from '../utils/FeatureStore';
 import { DEFAULT_SERVICE_LIMIT } from '.';
 
-const debug = require('debug')('Franz:feature:serviceLimit:store');
+const debug = require('debug')('Ferdi:feature:serviceLimit:store');
 
 export class ServiceLimitStore extends FeatureStore {
   @observable isServiceLimitEnabled = false;
@@ -12,7 +12,7 @@ export class ServiceLimitStore extends FeatureStore {
     this.stores = stores;
     this.actions = actions;
 
-    this.isServiceLimitEnabled = true;
+    this.isServiceLimitEnabled = false;
   }
 
   stop() {
@@ -22,9 +22,10 @@ export class ServiceLimitStore extends FeatureStore {
   }
 
   @computed get userHasReachedServiceLimit() {
-    if (!this.isServiceLimitEnabled) return false;
+    return false;
+    // if (!this.isServiceLimitEnabled) return false;
 
-    return this.serviceLimit !== 0 && this.serviceCount >= this.serviceLimit;
+    // return this.serviceLimit !== 0 && this.serviceCount >= this.serviceLimit;
   }
 
   @computed get serviceLimit() {
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
index 55c600de4..e9a01b156 100644
--- a/src/features/serviceProxy/index.js
+++ b/src/features/serviceProxy/index.js
@@ -1,25 +1,25 @@
 import { autorun, observable } from 'mobx';
 import { remote } from 'electron';
 
-import { DEFAULT_FEATURES_CONFIG } from '../../config';
+// import { DEFAULT_FEATURES_CONFIG } from '../../config';
 
 const { session } = remote;
 
-const debug = require('debug')('Franz:feature:serviceProxy');
+const debug = require('debug')('Ferdi:feature:serviceProxy');
 
 export const config = observable({
-  isEnabled: DEFAULT_FEATURES_CONFIG.isServiceProxyEnabled,
-  isPremium: DEFAULT_FEATURES_CONFIG.isServiceProxyIncludedInCurrentPlan,
+  isEnabled: true,
+  isPremium: true,
 });
 
 export default function init(stores) {
   debug('Initializing `serviceProxy` feature');
 
   autorun(() => {
-    const { isServiceProxyEnabled, isServiceProxyIncludedInCurrentPlan } = stores.features.features;
+    // const { isServiceProxyEnabled, isServiceProxyIncludedInCurrentPlan } = stores.features.features;
 
-    config.isEnabled = isServiceProxyEnabled !== undefined ? isServiceProxyEnabled : DEFAULT_FEATURES_CONFIG.isServiceProxyEnabled;
-    config.isIncludedInCurrentPlan = isServiceProxyIncludedInCurrentPlan !== undefined ? isServiceProxyIncludedInCurrentPlan : DEFAULT_FEATURES_CONFIG.isServiceProxyIncludedInCurrentPlan;
+    config.isEnabled = true;
+    config.isIncludedInCurrentPlan = true;
 
     const services = stores.services.enabled;
     const isPremiumUser = stores.user.data.isPremium;
diff --git a/src/features/settingsWS/index.js b/src/features/settingsWS/index.js
index 2064d2973..6711296da 100755
--- a/src/features/settingsWS/index.js
+++ b/src/features/settingsWS/index.js
@@ -1,7 +1,7 @@
 import { reaction } from 'mobx';
 import { SettingsWSStore } from './store';
 
-const debug = require('debug')('Franz:feature:settingsWS');
+const debug = require('debug')('Ferdi:feature:settingsWS');
 
 export const settingsStore = new SettingsWSStore();
 
diff --git a/src/features/settingsWS/store.js b/src/features/settingsWS/store.js
index 167a70d10..9100f33d1 100755
--- a/src/features/settingsWS/store.js
+++ b/src/features/settingsWS/store.js
@@ -6,7 +6,7 @@ import { FeatureStore } from '../utils/FeatureStore';
 import { createReactions } from '../../stores/lib/Reaction';
 import { WS_API } from '../../environment';
 
-const debug = require('debug')('Franz:feature:settingsWS:store');
+const debug = require('debug')('Ferdi:feature:settingsWS:store');
 
 export class SettingsWSStore extends FeatureStore {
   stores = null;
diff --git a/src/features/shareFranz/Component.js b/src/features/shareFranz/Component.js
index a33315e17..405fb0ab5 100644
--- a/src/features/shareFranz/Component.js
+++ b/src/features/shareFranz/Component.js
@@ -11,17 +11,16 @@ import {
 } from '@mdi/js';
 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!',
+    defaultMessage: '!!!Ferdi 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.',
+    defaultMessage: '!!!Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.',
   },
   actionsEmail: {
     id: 'feature.shareFranz.action.email',
@@ -132,9 +131,6 @@ export default @injectSheet(styles) @inject('stores') @observer class ShareFranz
             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)}
@@ -142,9 +138,6 @@ export default @injectSheet(styles) @inject('stores') @observer class ShareFranz
             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)}
@@ -152,9 +145,6 @@ export default @injectSheet(styles) @inject('stores') @observer class ShareFranz
             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>
diff --git a/src/features/shareFranz/index.js b/src/features/shareFranz/index.js
index a39d7a6e6..04e3684ae 100644
--- a/src/features/shareFranz/index.js
+++ b/src/features/shareFranz/index.js
@@ -2,12 +2,11 @@ import { observable, reaction } from 'mobx';
 import ms from 'ms';
 
 import { state as delayAppState } from '../delayApp';
-import { gaEvent, gaPage } from '../../lib/analytics';
 import { planSelectionStore } from '../planSelection';
 
 export { default as Component } from './Component';
 
-const debug = require('debug')('Franz:feature:shareFranz');
+const debug = require('debug')('Ferdi:feature:shareFranz');
 
 const defaultState = {
   isModalVisible: false,
@@ -17,19 +16,16 @@ const defaultState = {
 export const state = observable(defaultState);
 
 export default function initialize(stores) {
-  debug('Initialize shareFranz feature');
+  debug('Initialize shareFerdi feature');
 
-  window.franz.features.shareFranz = {
+  window.ferdi.features.shareFerdi = {
     state,
   };
 
   function showModal() {
-    debug('Showing share window');
+    debug('Would have showed share window');
 
-    state.isModalVisible = true;
-
-    gaEvent('Share Franz', 'show');
-    gaPage('/share-modal');
+    // state.isModalVisible = true;
   }
 
   reaction(
diff --git a/src/features/spellchecker/index.js b/src/features/spellchecker/index.js
index fd8bc738a..6a393e250 100644
--- a/src/features/spellchecker/index.js
+++ b/src/features/spellchecker/index.js
@@ -2,26 +2,26 @@ import { autorun, observable } from 'mobx';
 
 import { DEFAULT_FEATURES_CONFIG } from '../../config';
 
-const debug = require('debug')('Franz:feature:spellchecker');
+const debug = require('debug')('Ferdi:feature:spellchecker');
 
 export const config = observable({
   isIncludedInCurrentPlan: DEFAULT_FEATURES_CONFIG.isSpellcheckerIncludedInCurrentPlan,
 });
 
-export default function init(stores) {
+export default function init() {
   debug('Initializing `spellchecker` feature');
 
   autorun(() => {
-    const { isSpellcheckerIncludedInCurrentPlan } = stores.features.features;
+    // const { isSpellcheckerIncludedInCurrentPlan } = stores.features.features;
 
-    config.isIncludedInCurrentPlan = isSpellcheckerIncludedInCurrentPlan !== undefined ? isSpellcheckerIncludedInCurrentPlan : DEFAULT_FEATURES_CONFIG.isSpellcheckerIncludedInCurrentPlan;
+    // config.isIncludedInCurrentPlan = isSpellcheckerIncludedInCurrentPlan !== undefined ? isSpellcheckerIncludedInCurrentPlan : DEFAULT_FEATURES_CONFIG.isSpellcheckerIncludedInCurrentPlan;
 
-    if (!stores.user.data.isPremium && !config.isIncludedInCurrentPlan && stores.settings.app.enableSpellchecking) {
-      debug('Override settings.spellcheckerEnabled flag to false');
+    // if (!stores.user.data.isPremium && config.isIncludedInCurrentPlan && stores.settings.app.enableSpellchecking) {
+    //   debug('Override settings.spellcheckerEnabled flag to false');
 
-      Object.assign(stores.settings.app, {
-        enableSpellchecking: false,
-      });
-    }
+    //   Object.assign(stores.settings.app, {
+    //     enableSpellchecking: false,
+    //   });
+    // }
   });
 }
diff --git a/src/features/todos/components/TodosWebview.js b/src/features/todos/components/TodosWebview.js
index f24c0b044..e9b1963f7 100644
--- a/src/features/todos/components/TodosWebview.js
+++ b/src/features/todos/components/TodosWebview.js
@@ -1,12 +1,14 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { observer } from 'mobx-react';
+import { observer, inject } from 'mobx-react';
 import injectSheet from 'react-jss';
 import Webview from 'react-electron-web-view';
 import { Icon } from '@meetfranz/ui';
 import { defineMessages, intlShape } from 'react-intl';
 
 import { mdiCheckAll } from '@mdi/js';
+import SettingsStore from '../../../stores/SettingsStore';
+
 import * as environment from '../../../environment';
 import Appear from '../../../components/ui/effects/Appear';
 import UpgradeButton from '../../../components/ui/UpgradeButton';
@@ -77,7 +79,7 @@ const styles = theme => ({
   },
 });
 
-@injectSheet(styles) @observer
+@injectSheet(styles) @inject('stores') @observer
 class TodosWebview extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
@@ -88,6 +90,9 @@ class TodosWebview extends Component {
     width: PropTypes.number.isRequired,
     minWidth: PropTypes.number.isRequired,
     isTodosIncludedInCurrentPlan: PropTypes.bool.isRequired,
+    stores: PropTypes.shape({
+      settings: PropTypes.instanceOf(SettingsStore).isRequired,
+    }).isRequired,
   };
 
   state = {
@@ -178,6 +183,7 @@ class TodosWebview extends Component {
       classes,
       isVisible,
       isTodosIncludedInCurrentPlan,
+      stores,
     } = this.props;
 
     const {
@@ -217,7 +223,7 @@ class TodosWebview extends Component {
             partition="persist:todos"
             preload="./features/todos/preload.js"
             ref={(webview) => { this.webview = webview ? webview.view : null; }}
-            src={environment.TODOS_FRONTEND}
+            src={stores.settings.all.app.todoServer || environment.TODOS_FRONTEND}
           />
         ) : (
           <Appear>
diff --git a/src/features/todos/containers/TodosScreen.js b/src/features/todos/containers/TodosScreen.js
index a5da0b014..bc05a587d 100644
--- a/src/features/todos/containers/TodosScreen.js
+++ b/src/features/todos/containers/TodosScreen.js
@@ -25,7 +25,7 @@ class TodosScreen extends Component {
           width={todosStore.width}
           minWidth={TODOS_MIN_WIDTH}
           resize={width => todoActions.resize({ width })}
-          isTodosIncludedInCurrentPlan={this.props.stores.features.features.isTodosIncludedInCurrentPlan || false}
+          isTodosIncludedInCurrentPlan
         />
       </ErrorBoundary>
     );
diff --git a/src/features/todos/index.js b/src/features/todos/index.js
index 7388aebaf..9f355e9ba 100644
--- a/src/features/todos/index.js
+++ b/src/features/todos/index.js
@@ -1,7 +1,7 @@
 import { reaction } from 'mobx';
 import TodoStore from './store';
 
-const debug = require('debug')('Franz:feature:todos');
+const debug = require('debug')('Ferdi:feature:todos');
 
 export const GA_CATEGORY_TODOS = 'Todos';
 
diff --git a/src/features/todos/preload.js b/src/features/todos/preload.js
index 6e38a2ef3..d1838e0d6 100644
--- a/src/features/todos/preload.js
+++ b/src/features/todos/preload.js
@@ -1,13 +1,13 @@
 import { ipcRenderer } from 'electron';
 import { IPC } from './constants';
 
-const debug = require('debug')('Franz:feature:todos:preload');
+const debug = require('debug')('Ferdi:feature:todos:preload');
 
 debug('Preloading Todos Webview');
 
 let hostMessageListener = () => {};
 
-window.franz = {
+window.ferdi = {
   onInitialize(ipcHostMessageListener) {
     hostMessageListener = ipcHostMessageListener;
     ipcRenderer.sendToHost(IPC.TODOS_CLIENT_CHANNEL, { action: 'todos:initialized' });
diff --git a/src/features/todos/store.js b/src/features/todos/store.js
index 4480b2545..a05203a04 100644
--- a/src/features/todos/store.js
+++ b/src/features/todos/store.js
@@ -16,7 +16,7 @@ import {
 import { IPC } from './constants';
 import { state as delayAppState } from '../delayApp';
 
-const debug = require('debug')('Franz:feature:todos:store');
+const debug = require('debug')('Ferdi:feature:todos:store');
 
 export default class TodoStore extends FeatureStore {
   @observable isFeatureEnabled = false;
diff --git a/src/features/webControls/containers/WebControlsScreen.js b/src/features/webControls/containers/WebControlsScreen.js
index cada01a6f..31168a397 100644
--- a/src/features/webControls/containers/WebControlsScreen.js
+++ b/src/features/webControls/containers/WebControlsScreen.js
@@ -32,6 +32,7 @@ class WebControlsScreen extends Component {
     this.autorunDisposer = autorun(() => {
       if (service.isAttached) {
         this.webview = service.webview;
+        this.url = this.webview.getURL();
 
         URL_EVENTS.forEach((event) => {
           this.webview.addEventListener(event, (e) => {
diff --git a/src/features/workspaces/api.js b/src/features/workspaces/api.js
index 0ec20c9ea..30fbd84be 100644
--- a/src/features/workspaces/api.js
+++ b/src/features/workspaces/api.js
@@ -1,14 +1,14 @@
 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';
+import apiBase from '../../api/apiBase';
 
-const debug = require('debug')('Franz:feature:workspaces:api');
+const debug = require('debug')('Ferdi:feature:workspaces:api');
 
 export const workspaceApi = {
   getUserWorkspaces: async () => {
-    const url = `${API}/${API_VERSION}/workspace`;
+    const url = `${apiBase()}/workspace`;
     debug('getUserWorkspaces GET', url);
     const result = await sendAuthRequest(url, { method: 'GET' });
     debug('getUserWorkspaces RESULT', result);
@@ -18,7 +18,7 @@ export const workspaceApi = {
   },
 
   createWorkspace: async (name) => {
-    const url = `${API}/${API_VERSION}/workspace`;
+    const url = `${apiBase()}/workspace`;
     const options = {
       method: 'POST',
       body: JSON.stringify({ name }),
@@ -31,7 +31,7 @@ export const workspaceApi = {
   },
 
   deleteWorkspace: async (workspace) => {
-    const url = `${API}/${API_VERSION}/workspace/${workspace.id}`;
+    const url = `${apiBase()}/workspace/${workspace.id}`;
     debug('deleteWorkspace DELETE', url);
     const result = await sendAuthRequest(url, { method: 'DELETE' });
     debug('deleteWorkspace RESULT', result);
@@ -40,7 +40,7 @@ export const workspaceApi = {
   },
 
   updateWorkspace: async (workspace) => {
-    const url = `${API}/${API_VERSION}/workspace/${workspace.id}`;
+    const url = `${apiBase()}/workspace/${workspace.id}`;
     const options = {
       method: 'PUT',
       body: JSON.stringify(pick(workspace, ['name', 'services'])),
diff --git a/src/features/workspaces/components/CreateWorkspaceForm.js b/src/features/workspaces/components/CreateWorkspaceForm.js
index cddbb2b04..15b97121d 100644
--- a/src/features/workspaces/components/CreateWorkspaceForm.js
+++ b/src/features/workspaces/components/CreateWorkspaceForm.js
@@ -6,8 +6,7 @@ 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';
+import { workspaceStore } from '../index';
 
 const messages = defineMessages({
   submitButton: {
@@ -66,7 +65,6 @@ class CreateWorkspaceForm extends Component {
         const { onSubmit } = this.props;
         const values = f.values();
         onSubmit(values);
-        gaEvent(GA_CATEGORY_WORKSPACES, 'create', values.name);
       },
     });
   }
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js
index e602ebd5a..b3551a7b9 100644
--- a/src/features/workspaces/components/EditWorkspaceForm.js
+++ b/src/features/workspaces/components/EditWorkspaceForm.js
@@ -12,8 +12,10 @@ 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';
+
+import { KEEP_WS_LOADED_USID } from '../../../config';
+
+import Toggle from '../../../components/ui/Toggle';
 
 const messages = defineMessages({
   buttonDelete: {
@@ -32,6 +34,14 @@ const messages = defineMessages({
     id: 'settings.workspace.form.yourWorkspaces',
     defaultMessage: '!!!Your workspaces',
   },
+  keepLoaded: {
+    id: 'settings.workspace.form.keepLoaded',
+    defaultMessage: '!!!Keep this workspace loaded*',
+  },
+  keepLoadedInfo: {
+    id: 'settings.workspace.form.keepLoadedInfo',
+    defaultMessage: '!!!*This option will be overwritten by the global "Keep all workspaces loaded" option.',
+  },
   servicesInWorkspaceHeadline: {
     id: 'settings.workspace.form.servicesInWorkspaceHeadline',
     defaultMessage: '!!!Services in this Workspace',
@@ -53,6 +63,9 @@ const styles = () => ({
   serviceList: {
     height: 'auto',
   },
+  keepLoadedInfo: {
+    marginBottom: '2rem !important',
+  },
 });
 
 @injectSheet(styles) @observer
@@ -90,6 +103,11 @@ class EditWorkspaceForm extends Component {
           value: workspace.name,
           validators: [required],
         },
+        keepLoaded: {
+          label: intl.formatMessage(messages.keepLoaded),
+          value: workspace.services.includes(KEEP_WS_LOADED_USID),
+          default: false,
+        },
         services: {
           value: workspace.services.slice(),
         },
@@ -103,7 +121,6 @@ class EditWorkspaceForm extends Component {
         const { onSave } = this.props;
         const values = f.values();
         onSave(values);
-        gaEvent(GA_CATEGORY_WORKSPACES, 'save');
       },
       onError: async () => {},
     });
@@ -112,7 +129,6 @@ class EditWorkspaceForm extends Component {
   delete() {
     const { onDelete } = this.props;
     onDelete();
-    gaEvent(GA_CATEGORY_WORKSPACES, 'delete');
   }
 
   toggleService(service) {
@@ -155,6 +171,10 @@ class EditWorkspaceForm extends Component {
         <div className="settings__body">
           <div className={classes.nameInput}>
             <Input {...form.$('name').bind()} />
+            <Toggle field={form.$('keepLoaded')} />
+            <p className={classes.keepLoadedInfo}>
+              { intl.formatMessage(messages.keepLoadedInfo) }
+            </p>
           </div>
           <h2>{intl.formatMessage(messages.servicesInWorkspaceHeadline)}</h2>
           <div className={classes.serviceList}>
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js
index 07100f5a1..baa94f6b3 100644
--- a/src/features/workspaces/components/WorkspaceDrawer.js
+++ b/src/features/workspaces/components/WorkspaceDrawer.js
@@ -10,8 +10,7 @@ import ReactTooltip from 'react-tooltip';
 import { mdiPlusBox, mdiSettings, mdiStar } from '@mdi/js';
 import WorkspaceDrawerItem from './WorkspaceDrawerItem';
 import { workspaceActions } from '../actions';
-import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../index';
-import { gaEvent } from '../../../lib/analytics';
+import { workspaceStore } from '../index';
 
 const messages = defineMessages({
   headline: {
@@ -158,7 +157,6 @@ class WorkspaceDrawer extends Component {
             className={classes.workspacesSettingsButton}
             onClick={() => {
               workspaceActions.openWorkspaceSettings();
-              gaEvent(GA_CATEGORY_WORKSPACES, 'settings', 'drawerHeadline');
             }}
             data-tip={`${intl.formatMessage(messages.workspacesSettingsTooltip)}`}
           >
@@ -180,7 +178,6 @@ class WorkspaceDrawer extends Component {
                 icon={mdiStar}
                 onClick={() => {
                   onUpgradeAccountClick();
-                  gaEvent('User', 'upgrade', 'workspaceDrawer');
                 }}
               />
             ) : (
@@ -191,7 +188,6 @@ class WorkspaceDrawer extends Component {
                 icon={mdiPlusBox}
                 onClick={() => {
                   workspaceActions.openWorkspaceSettings();
-                  gaEvent(GA_CATEGORY_WORKSPACES, 'add', 'drawerPremiumCta');
                 }}
               />
             )}
@@ -203,7 +199,6 @@ class WorkspaceDrawer extends Component {
               onClick={() => {
                 workspaceActions.deactivate();
                 workspaceActions.toggleWorkspaceDrawer();
-                gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'drawer');
               }}
               services={getServicesForWorkspace(null)}
               isActive={actualWorkspace == null}
@@ -218,7 +213,6 @@ class WorkspaceDrawer extends Component {
                   if (actualWorkspace === workspace) return;
                   workspaceActions.activate({ workspace });
                   workspaceActions.toggleWorkspaceDrawer();
-                  gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'drawer');
                 }}
                 onContextMenuEditClick={() => workspaceActions.edit({ workspace })}
                 services={getServicesForWorkspace(workspace)}
@@ -229,7 +223,6 @@ class WorkspaceDrawer extends Component {
               className={classes.addNewWorkspaceLabel}
               onClick={() => {
                 workspaceActions.openWorkspaceSettings();
-                gaEvent(GA_CATEGORY_WORKSPACES, 'add', 'drawerAddLabel');
               }}
             >
               <Icon
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
index 4fb302be2..b499e02a4 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.js
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -47,7 +47,7 @@ const messages = defineMessages({
   },
   workspaceFeatureHeadline: {
     id: 'settings.workspaces.workspaceFeatureHeadline',
-    defaultMessage: '!!!Less is More: Introducing Franz Workspaces',
+    defaultMessage: '!!!Less is More: Introducing Ferdi Workspaces',
   },
 });
 
diff --git a/src/features/workspaces/containers/EditWorkspaceScreen.js b/src/features/workspaces/containers/EditWorkspaceScreen.js
index 248b40131..7eaabc1ea 100644
--- a/src/features/workspaces/containers/EditWorkspaceScreen.js
+++ b/src/features/workspaces/containers/EditWorkspaceScreen.js
@@ -33,7 +33,9 @@ class EditWorkspaceScreen extends Component {
     const { workspaceBeingEdited } = workspaceStore;
     const { actions } = this.props;
     const workspace = new Workspace(
-      Object.assign({}, workspaceBeingEdited, values),
+      Object.assign({
+        saving: true,
+      }, workspaceBeingEdited, values),
     );
     actions.workspaces.update({ workspace });
   };
diff --git a/src/features/workspaces/index.js b/src/features/workspaces/index.js
index ed3e52096..560b732ab 100644
--- a/src/features/workspaces/index.js
+++ b/src/features/workspaces/index.js
@@ -2,7 +2,7 @@ import { reaction } from 'mobx';
 import WorkspacesStore from './store';
 import { resetApiRequests } from './api';
 
-const debug = require('debug')('Franz:feature:workspaces');
+const debug = require('debug')('Ferdi:feature:workspaces');
 
 export const GA_CATEGORY_WORKSPACES = 'Workspaces';
 export const DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED = false;
diff --git a/src/features/workspaces/models/Workspace.js b/src/features/workspaces/models/Workspace.js
index 6c73d7095..77c4e05f4 100644
--- a/src/features/workspaces/models/Workspace.js
+++ b/src/features/workspaces/models/Workspace.js
@@ -1,5 +1,7 @@
 import { observable } from 'mobx';
 
+import { KEEP_WS_LOADED_USID } from '../../../config';
+
 export default class Workspace {
   id = null;
 
@@ -19,7 +21,17 @@ export default class Workspace {
     this.id = data.id;
     this.name = data.name;
     this.order = data.order;
-    this.services.replace(data.services);
+
+    let services = data.services;
+    if (data.saving && data.keepLoaded) {
+      // Keep workspaces loaded
+      services.push(KEEP_WS_LOADED_USID);
+    } else if (data.saving && data.services.includes(KEEP_WS_LOADED_USID)) {
+      // Don't keep loaded
+      services = services.filter(e => e !== KEEP_WS_LOADED_USID);
+    }
+    this.services.replace(services);
+
     this.userId = data.userId;
   }
 }
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index 13227e033..5c90ff180 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -17,16 +17,18 @@ import { WORKSPACES_ROUTES } from './index';
 import { createReactions } from '../../stores/lib/Reaction';
 import { createActionBindings } from '../utils/ActionBinding';
 
-const debug = require('debug')('Franz:feature:workspaces:store');
+import { KEEP_WS_LOADED_USID } from '../../config';
+
+const debug = require('debug')('Ferdi:feature:workspaces:store');
 
 export default class WorkspacesStore extends FeatureStore {
-  @observable isFeatureEnabled = false;
+  @observable isFeatureEnabled = true;
 
   @observable isFeatureActive = false;
 
-  @observable isPremiumFeature = true;
+  @observable isPremiumFeature = false;
 
-  @observable isPremiumUpgradeRequired = true;
+  @observable isPremiumUpgradeRequired = false;
 
   @observable activeWorkspace = null;
 
@@ -59,7 +61,8 @@ export default class WorkspacesStore extends FeatureStore {
   }
 
   @computed get isUserAllowedToUseFeature() {
-    return !this.isPremiumUpgradeRequired;
+    return true;
+    // return !this.isPremiumUpgradeRequired;
   }
 
   @computed get isAnyWorkspaceActive() {
@@ -263,10 +266,10 @@ export default class WorkspacesStore extends FeatureStore {
   };
 
   _setIsPremiumFeatureReaction = () => {
-    const { features } = this.stores;
-    const { isWorkspaceIncludedInCurrentPlan } = features.features;
-    this.isPremiumFeature = !isWorkspaceIncludedInCurrentPlan;
-    this.isPremiumUpgradeRequired = !isWorkspaceIncludedInCurrentPlan;
+    // const { features } = this.stores;
+    // const { isWorkspaceIncludedInCurrentPlan } = features.features;
+    // this.isPremiumFeature = !isWorkspaceIncludedInCurrentPlan;
+    // this.isPremiumUpgradeRequired = !isWorkspaceIncludedInCurrentPlan;
   };
 
   _setWorkspaceBeingEditedReaction = () => {
@@ -331,7 +334,7 @@ export default class WorkspacesStore extends FeatureStore {
     // Loop through all workspaces and remove invalid service ids (locally)
     this.workspaces.forEach((workspace) => {
       workspace.services.forEach((serviceId) => {
-        if (servicesHaveBeenLoaded && !services.one(serviceId)) {
+        if (servicesHaveBeenLoaded && !services.one(serviceId) && serviceId !== KEEP_WS_LOADED_USID) {
           workspace.services.remove(serviceId);
         }
       });