34 files changed, 572 insertions, 119 deletions

diff --git a/.all-contributorsrc b/.all-contributorsrc
index b897eabe2..6013e64ad 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -159,6 +159,18 @@
         "bug",
         "code"
       ]
+    },
+    {
+      "login": "xthursdayx",
+      "name": "xthursdayx",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/18044308?v=4",
+      "profile": "https://github.com/xthursdayx",
+      "contributions": [
+        "code",
+        "doc",
+        "infra",
+        "platform"
+      ]
     }
   ],
   "contributorsPerLine": 6
diff --git a/.travis.yml b/.travis.yml
index 199938fba..124a6fc8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,17 @@
 matrix:
   include:
-    - os: linux
-      dist: xenial
-      addons:
-        apt:
-          packages:
-            - libx11-dev
-            - libxext-dev
-            - libxss-dev
-            - libxkbfile-dev
-    - os: osx
-      osx_image: xcode10.3
+  - os: linux
+    dist: xenial
+    addons:
+      apt:
+        packages:
+        - libx11-dev
+        - libxext-dev
+        - libxss-dev
+        - libxkbfile-dev
+  - os: osx
+    osx_image: xcode11
+
 language: node_js
 install:
   - echo do nothing
@@ -25,3 +26,4 @@ cache: npm
 branches:
   except:
     - i18n
+    - l10n_master
diff --git a/README.md b/README.md
index eb69de370..d007155a1 100644
--- a/README.md
+++ b/README.md
@@ -103,7 +103,7 @@ $ git tag v5.3.4-beta.4
 $ git push --tags
 ```
 
-When pushing a new tag, the CI build will create a draft GitHub release and upload the deliverables in the release assets.
+When pushing a new tag, the CI build will create a draft GitHub release and upload the deliverables in the draft release assets. Wait for all the assets to be uploaded before publishing the draft release.
 
 ## Contributors ✨
 
@@ -131,6 +131,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/Makazzz"><img src="https://avatars2.githubusercontent.com/u/49844464?v=4" width="40px;" alt="Makazzz"/><br /><sub><b>Makazzz</b></sub></a><br /><a href="https://github.com/kytwb/ferdi/issues?q=author%3AMakazzz" title="Bug reports">🐛</a> <a href="https://github.com/kytwb/ferdi/commits?author=Makazzz" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/xthursdayx"><img src="https://avatars0.githubusercontent.com/u/18044308?v=4" width="40px;" alt="xthursdayx"/><br /><sub><b>xthursdayx</b></sub></a><br /><a href="https://github.com/kytwb/ferdi/commits?author=xthursdayx" title="Code">💻</a> <a href="https://github.com/kytwb/ferdi/commits?author=xthursdayx" title="Documentation">📖</a> <a href="#infra-xthursdayx" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#platform-xthursdayx" title="Packaging/porting to new platform">📦</a></td>
   </tr>
 </table>
 
diff --git a/appveyor.yml b/appveyor.yml
index 157e35df3..39d7f793a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,3 +25,4 @@ artifacts:
 branches:
   except:
     - i18n
+    - l10n_master
diff --git a/branding/social-preview.psd b/branding/social-preview.psd
new file mode 100644
index 000000000..891ccdc39
--- /dev/null
+++ b/branding/social-preview.psd
diff --git a/electron-builder.yml b/electron-builder.yml
index e95eb47b7..b2c243e49 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -27,10 +27,10 @@ dmg:
 win:
   icon: ./build-helpers/images/icon.ico
   target:
-    target: nsis
-    arch:
-      - x64
-      - ia32
+    - target: nsis
+      arch: [x64, ia32]
+    - target: portable
+      arch: [x64, ia32]
 
 linux:
   icon: ./build-helpers/images/icons
diff --git a/package-lock.json b/package-lock.json
index 70c791007..b2622361b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ferdi",
-  "version": "5.3.4-beta.3",
+  "version": "5.3.4-beta.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -7382,21 +7382,11 @@
       }
     },
     "electron-hunspell": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/electron-hunspell/-/electron-hunspell-0.1.1.tgz",
-      "integrity": "sha512-B3nOQqHexIX+8bz72FZkNk+iFBrdqS9DpV2SaH+t7T9SLbONBVBRLJ2Jj2ytXFUzvw81q7vz2dfxPCddh/E3ww==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/electron-hunspell/-/electron-hunspell-1.0.0.tgz",
+      "integrity": "sha512-egyioCtGkkNMOYdKBrZsva63JxbPmNjmQVFCZCcmr+uIUs6et6OUvqd6ac9/ujuchiEPDrTfF9gdR9+lPbVyPA==",
       "requires": {
-        "hunspell-asm": "1.0.2",
-        "lodash": "^4.17.11",
-        "tslib": "1.9.3",
-        "unixify": "1.0.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-          "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
-        }
+        "hunspell-asm": "^4.0.0"
       }
     },
     "electron-is-dev": {
@@ -12653,14 +12643,24 @@
       }
     },
     "hunspell-asm": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hunspell-asm/-/hunspell-asm-1.0.2.tgz",
-      "integrity": "sha512-UTLBvc0yZiIcHl9qrgxnFTZbX3zF4CprzEY+u+N0iXlUKZnUJRIgvgppTdgiQTsucm5b0aN/rHsgXz2q/0kBRA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/hunspell-asm/-/hunspell-asm-4.0.0.tgz",
+      "integrity": "sha512-EcNwMx0Byq1JHMZiuATmqpMk41bOo+NH4yD5xJ3H0X403MoDBory3zri2lJzYSGj+z/6Bqr3EZn24syCjZoY1w==",
       "requires": {
-        "emscripten-wasm-loader": "^1.0.0",
-        "nanoid": "^1.0.2",
-        "tslib": "^1.9.0",
-        "unixify": "^1.0.0"
+        "emscripten-wasm-loader": "^3.0.3",
+        "nanoid": "^2.1.1"
+      },
+      "dependencies": {
+        "emscripten-wasm-loader": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/emscripten-wasm-loader/-/emscripten-wasm-loader-3.0.3.tgz",
+          "integrity": "sha512-fyq2maBt5LOou27LEBlL5H6G04BxgSamXkvmMsAuIT6rd8ioH4BxNQhuyl6jVPeODh6U8Wk1BoFZxzHpg3o8wA==",
+          "requires": {
+            "getroot": "^1.0.0",
+            "nanoid": "^2.0.3",
+            "unixify": "^1.0.0"
+          }
+        }
       }
     },
     "husky": {
@@ -15850,9 +15850,9 @@
       "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
     },
     "nanoid": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-1.3.4.tgz",
-      "integrity": "sha512-4ug4BsuHxiVHoRUe1ud6rUFT3WUMmjXt1W0quL0CviZQANdan7D8kqN5/maw53hmAApY/jfzMRkC57BNNs60ZQ=="
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.1.2.tgz",
+      "integrity": "sha512-q0iKJHcLc9rZg/qtJ/ioG5s6/5357bqvkYCpqXJxpcyfK7L5us8+uJllZosqPWou7l6E1lY2Qqoq5ce+AMbFuQ=="
     },
     "nanomatch": {
       "version": "1.2.13",
diff --git a/package.json b/package.json
index 1a24c54fb..5b0a0bcdb 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "ferdi",
   "productName": "Ferdi",
   "appId": "com.kytwb.ferdi",
-  "version": "5.3.4-beta.5",
+  "version": "5.3.4-beta.7",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "kytwb",
   "main": "index.js",
@@ -51,7 +51,7 @@
     "du": "^0.1.0",
     "electron-dl": "1.14.0",
     "electron-fetch": "1.3.0",
-    "electron-hunspell": "0.1.1",
+    "electron-hunspell": "1.0.0",
     "electron-is-dev": "1.1.0",
     "electron-react-titlebar": "0.8.1",
     "electron-updater": "4.1.2",
diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js
index c4abc00e9..2d9af416f 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.js
@@ -45,13 +45,13 @@ export default class LocalApi {
     const s = session.fromPartition(`persist:service-${serviceId}`);
 
     debug('LocalApi::clearCache resolves', serviceId);
-    return new Promise(resolve => s.clearCache(resolve));
+    return s.clearCache();
   }
 
   async clearAppCache() {
     const s = session.defaultSession;
 
     debug('LocalApi::clearCache clearAppCache');
-    return new Promise(resolve => s.clearCache(resolve));
+    return s.clearCache();
   }
 }
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 1d6bfee33..d0cae3443 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -118,12 +118,21 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
                 type="button"
                 className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
                 onClick={() => {
+                  // Disable lock first - otherwise the application might not update correctly
                   actions.settings.update({
                     type: 'app',
                     data: {
-                      locked: true,
+                      locked: false,
                     },
                   });
+                  setTimeout(() => {
+                    actions.settings.update({
+                      type: 'app',
+                      data: {
+                        locked: true,
+                      },
+                    });
+                  }, 0);
                 }}
                 data-tip={`${intl.formatMessage(messages.lockFerdi)} (${ctrlKey}+Shift+L)`}
               >
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index c45acc961..0cfefc92b 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -13,6 +13,7 @@ import WebviewErrorHandler from './ErrorHandlers/WebviewErrorHandler';
 import ServiceDisabled from './ServiceDisabled';
 import ServiceWebview from './ServiceWebview';
 import SettingsStore from '../../../stores/SettingsStore';
+import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen';
 
 export default @observer @inject('stores') class ServiceView extends Component {
   static propTypes = {
@@ -177,6 +178,9 @@ export default @observer @inject('stores') class ServiceView extends Component {
           </Fragment>
         ) : (
           <>
+            {service.recipe.id === 'franz-custom-website' && (
+              <WebControlsScreen service={service} />
+            )}
             {!this.state.hibernate ? (
               <ServiceWebview
                 service={service}
@@ -187,7 +191,7 @@ export default @observer @inject('stores') class ServiceView extends Component {
               <div>
                 <span role="img" aria-label="Sleeping Emoji">😴</span>
                 {' '}
-This service is currently hibernating. If this page doesn&#x27;t close soon, please try reloading Ferdi.
+                This service is currently hibernating. If this page doesn&#x27;t close soon, please try reloading Ferdi.
               </div>
             )}
           </>
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 75b3d2cf0..03d6d5bcc 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -24,7 +24,7 @@ class ServiceWebview extends Component {
     reaction(
       () => this.webview,
       () => {
-        if (this.webview.view) {
+        if (this.webview && this.webview.view) {
           this.webview.view.addEventListener('console-message', (e) => {
             debug('Service logged a message:', e.message);
           });
@@ -59,6 +59,7 @@ class ServiceWebview extends Component {
         }}
         onUpdateTargetUrl={this.updateTargetUrl}
         useragent={service.userAgent}
+        disablewebsecurity={service.recipe.disablewebsecurity}
         allowpopups
       />
     );
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 1d2383125..75f0d9d23 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -146,6 +146,7 @@ export default @observer class EditSettingsForm extends Component {
     isTodosEnabled: PropTypes.bool.isRequired,
     isWorkspaceEnabled: PropTypes.bool.isRequired,
     server: PropTypes.string.isRequired,
+    noUpdates: PropTypes.bool.isRequired,
   };
 
   static contextTypes = {
@@ -179,6 +180,7 @@ export default @observer class EditSettingsForm extends Component {
       isTodosEnabled,
       isWorkspaceEnabled,
       server,
+      noUpdates,
     } = this.props;
     const { intl } = this.context;
 
@@ -412,7 +414,7 @@ export default @observer class EditSettingsForm extends Component {
                 buttonType="secondary"
                 label={intl.formatMessage(updateButtonLabelMessage)}
                 onClick={checkForUpdates}
-                disabled={isCheckingForUpdates || isUpdateAvailable}
+                disabled={noUpdates || isCheckingForUpdates || isUpdateAvailable}
                 loaded={!isCheckingForUpdates || !isUpdateAvailable}
               />
             )}
@@ -421,6 +423,7 @@ export default @observer class EditSettingsForm extends Component {
             )}
             <br />
             <Toggle field={form.$('beta')} />
+            <Toggle field={form.$('noUpdates')} />
             {intl.formatMessage(messages.currentVersion)}
             {' '}
             {remote.app.getVersion()}
diff --git a/src/components/ui/AppLoader/index.js b/src/components/ui/AppLoader/index.js
index a9a87707b..1fd247d17 100644
--- a/src/components/ui/AppLoader/index.js
+++ b/src/components/ui/AppLoader/index.js
@@ -9,14 +9,13 @@ import { shuffleArray } from '../../../helpers/array-helpers';
 import styles from './styles';
 
 const textList = shuffleArray([
-  'Looking for Sisi',
-  'Contacting the herald',
-  'Saddling the unicorn',
-  'Learning the Waltz',
-  'Visiting Horst & Grete',
-  'Twisting my moustache',
-  'Playing the trumpet',
-  'Traveling through space & time',
+  'Adding free features',
+  'Making application usable',
+  'Removing unproductive paywalls',
+  'Creating custom server software',
+  'Increasing productivity',
+  'Listening to our userbase',
+  'Fixing bugs',
 ]);
 
 export default @injectSheet(styles) @withTheme class AppLoader extends Component {
diff --git a/src/config.js b/src/config.js
index ea36be1f9..c6c31ce23 100644
--- a/src/config.js
+++ b/src/config.js
@@ -63,6 +63,7 @@ export const DEFAULT_APP_SETTINGS = {
   scheduledDNDStart: '17:00',
   scheduledDNDEnd: '09:00',
   hibernate: false,
+  noUpdates: false,
 };
 
 export const DEFAULT_FEATURES_CONFIG = {
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 962dc1b65..463a290d2 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -109,6 +109,10 @@ const messages = defineMessages({
     id: 'settings.app.form.beta',
     defaultMessage: '!!!Include beta versions',
   },
+  noUpdates: {
+    id: 'settings.app.form.noUpdates',
+    defaultMessage: '!!!Disable updates',
+  },
   enableTodos: {
     id: 'settings.app.form.enableTodos',
     defaultMessage: '!!!Enable Franz Todos',
@@ -161,12 +165,14 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         enableSpellchecking: settingsData.enableSpellchecking,
         spellcheckerLanguage: settingsData.spellcheckerLanguage,
         beta: settingsData.beta, // we need this info in the main process as well
+        noUpdates: settingsData.noUpdates, // we need this info in the main process as well
         locale: settingsData.locale, // we need this info in the main process as well
       },
     });
 
     user.update({
       userData: {
+        noUpdates: settingsData.noUpdates,
         beta: settingsData.beta,
         locale: settingsData.locale,
       },
@@ -319,6 +325,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: user.data.beta,
           default: DEFAULT_APP_SETTINGS.beta,
         },
+        noUpdates: {
+          label: intl.formatMessage(messages.noUpdates),
+          value: settings.app.noUpdates,
+          default: DEFAULT_APP_SETTINGS.noUpdates,
+        },
       },
     };
 
@@ -381,6 +392,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           isWorkspaceEnabled={workspaces.isFeatureActive}
           server={server || 'https://api.franzinfra.com'}
           lockingFeatureEnabled={lockingFeatureEnabled}
+          noUpdates={this.props.stores.settings.app.noUpdates}
         />
       </ErrorBoundary>
     );
diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.js
index 6a3314b2b..506aecdf7 100644
--- a/src/electron/ipc-api/autoUpdate.js
+++ b/src/electron/ipc-api/autoUpdate.js
@@ -4,24 +4,33 @@ import { autoUpdater } from 'electron-updater';
 const debug = require('debug')('Ferdi:ipcApi:autoUpdate');
 
 export default (params) => {
-  if (process.platform === 'darwin' || process.platform === 'win32' || process.env.APPIMAGE) {
+  const disableUpdates = Boolean(params.settings.app.get('noUpdates'));
+
+  if (disableUpdates) {
+    autoUpdater.autoInstallOnAppQuit = false;
+    autoUpdater.autoDownload = false;
+  } else if (process.platform === 'darwin' || process.platform === 'win32' || process.env.APPIMAGE) {
     ipcMain.on('autoUpdate', (event, args) => {
-      try {
-        autoUpdater.autoInstallOnAppQuit = false;
-        autoUpdater.allowPrerelease = Boolean(params.settings.app.get('beta'));
-        if (args.action === 'check') {
-          autoUpdater.checkForUpdates();
-        } else if (args.action === 'install') {
-          debug('install update');
-          autoUpdater.quitAndInstall();
-          // we need to send a quit event
-          setTimeout(() => {
-            app.quit();
-          }, 20);
+      const enableUpdate = !params.settings.app.get('noUpdates');
+
+      if (enableUpdate) {
+        try {
+          autoUpdater.autoInstallOnAppQuit = false;
+          autoUpdater.allowPrerelease = Boolean(params.settings.app.get('beta'));
+          if (args.action === 'check') {
+            autoUpdater.checkForUpdates();
+          } else if (args.action === 'install') {
+            debug('install update');
+            autoUpdater.quitAndInstall();
+            // we need to send a quit event
+            setTimeout(() => {
+              app.quit();
+            }, 20);
+          }
+        } catch (e) {
+          console.error(e);
+          event.sender.send('autoUpdate', { error: true });
         }
-      } catch (e) {
-        console.error(e);
-        event.sender.send('autoUpdate', { error: true });
       }
     });
 
@@ -32,10 +41,14 @@ export default (params) => {
 
     autoUpdater.on('update-available', (event) => {
       debug('update-available');
-      params.mainWindow.webContents.send('autoUpdate', {
-        version: event.version,
-        available: true,
-      });
+
+      const enableUpdate = !params.settings.app.get('noUpdates');
+      if (enableUpdate) {
+        params.mainWindow.webContents.send('autoUpdate', {
+          version: event.version,
+          available: true,
+        });
+      }
     });
 
     autoUpdater.on('download-progress', (progressObj) => {
diff --git a/src/features/todos/components/TodosWebview.js b/src/features/todos/components/TodosWebview.js
index c252aff90..35c102220 100644
--- a/src/features/todos/components/TodosWebview.js
+++ b/src/features/todos/components/TodosWebview.js
@@ -37,9 +37,6 @@ const styles = theme => ({
 
     transform: ({ isVisible, width }) => `translateX(${isVisible ? 0 : width}px)`,
 
-    '&:hover $closeTodosButton': {
-      opacity: 1,
-    },
     '& webview': {
       height: '100%',
     },
diff --git a/src/features/todos/store.js b/src/features/todos/store.js
index d507237d1..a05203a04 100644
--- a/src/features/todos/store.js
+++ b/src/features/todos/store.js
@@ -162,6 +162,10 @@ export default class TodoStore extends FeatureStore {
         theme: isDarkThemeActive ? ThemeType.dark : ThemeType.default,
       },
     });
+
+    this.webview.addEventListener('new-window', ({ url }) => {
+      this.actions.app.openExternalUrl({ url });
+    });
   };
 
   _goToService = ({ url, serviceId }) => {
diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js
new file mode 100644
index 000000000..03f601a17
--- /dev/null
+++ b/src/features/webControls/components/WebControls.js
@@ -0,0 +1,190 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import injectSheet from 'react-jss';
+import { Icon } from '@meetfranz/ui';
+
+import {
+  mdiReload, mdiArrowRight, mdiArrowLeft, mdiHomeOutline,
+} from '@mdi/js';
+
+const styles = theme => ({
+  root: {
+    background: theme.colorBackground,
+    position: 'relative',
+    borderLeft: [1, 'solid', theme.todos.todosLayer.borderLeftColor],
+    zIndex: 300,
+    height: 50,
+    display: 'flex',
+    flexDirection: 'row',
+    alignItems: 'center',
+    padding: [0, 20],
+
+    '& + div': {
+      height: 'calc(100% - 50px)',
+    },
+  },
+  button: {
+    width: 30,
+    height: 50,
+    transition: 'opacity 0.25s',
+
+    '&:hover': {
+      opacity: 0.8,
+    },
+
+    '&:disabled': {
+      opacity: 0.5,
+    },
+  },
+  icon: {
+    width: '20px !important',
+    height: 20,
+    marginTop: 5,
+  },
+  input: {
+    marginBottom: 0,
+    height: 'auto',
+    marginLeft: 10,
+    flex: 1,
+    border: 0,
+    padding: [4, 10],
+    borderRadius: theme.borderRadius,
+    background: theme.inputBackground,
+    color: theme.inputColor,
+  },
+  inputButton: {
+    color: theme.colorText,
+  },
+});
+
+@injectSheet(styles) @observer
+class WebControls extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    goHome: PropTypes.func.isRequired,
+    canGoBack: PropTypes.bool.isRequired,
+    goBack: PropTypes.func.isRequired,
+    canGoForward: PropTypes.bool.isRequired,
+    goForward: PropTypes.func.isRequired,
+    reload: PropTypes.func.isRequired,
+    url: PropTypes.string.isRequired,
+    navigate: PropTypes.func.isRequired,
+  }
+
+  static getDerivedStateFromProps(props, state) {
+    const { url } = props;
+    const { editUrl } = state;
+
+    if (!editUrl) {
+      return {
+        inputUrl: url,
+        editUrl: state.editUrl,
+      };
+    }
+  }
+
+  inputRef = React.createRef();
+
+  state = {
+    inputUrl: '',
+    editUrl: false,
+  }
+
+  render() {
+    const {
+      classes,
+      goHome,
+      canGoBack,
+      goBack,
+      canGoForward,
+      goForward,
+      reload,
+      url,
+      navigate,
+    } = this.props;
+
+    const {
+      inputUrl,
+      editUrl,
+    } = this.state;
+
+    return (
+      <div className={classes.root}>
+        <button
+          onClick={goHome}
+          type="button"
+          className={classes.button}
+        >
+          <Icon
+            icon={mdiHomeOutline}
+            className={classes.icon}
+          />
+        </button>
+        <button
+          onClick={goBack}
+          type="button"
+          className={classes.button}
+          disabled={!canGoBack}
+        >
+          <Icon
+            icon={mdiArrowLeft}
+            className={classes.icon}
+          />
+        </button>
+        <button
+          onClick={goForward}
+          type="button"
+          className={classes.button}
+          disabled={!canGoForward}
+        >
+          <Icon
+            icon={mdiArrowRight}
+            className={classes.icon}
+          />
+        </button>
+        <button
+          onClick={reload}
+          type="button"
+          className={classes.button}
+        >
+          <Icon
+            icon={mdiReload}
+            className={classes.icon}
+          />
+        </button>
+        <input
+          value={editUrl ? inputUrl : url}
+          className={classes.input}
+          onChange={event => this.setState({
+            inputUrl: event.target.value,
+          })}
+          onFocus={(event) => {
+            event.target.select();
+            this.setState({
+              editUrl: true,
+            });
+          }}
+          onKeyDown={(event) => {
+            if (event.key === 'Enter') {
+              this.setState({
+                editUrl: false,
+              });
+              navigate(inputUrl);
+              this.inputRef.current.blur();
+            } else if (event.key === 'Escape') {
+              this.setState({
+                editUrl: false,
+                inputUrl: url,
+              });
+              event.target.blur();
+            }
+          }}
+          ref={this.inputRef}
+        />
+      </div>
+    );
+  }
+}
+
+export default WebControls;
diff --git a/src/features/webControls/containers/WebControlsScreen.js b/src/features/webControls/containers/WebControlsScreen.js
new file mode 100644
index 000000000..1452d5a3d
--- /dev/null
+++ b/src/features/webControls/containers/WebControlsScreen.js
@@ -0,0 +1,128 @@
+import React, { Component } from 'react';
+import { observer, inject } from 'mobx-react';
+import PropTypes from 'prop-types';
+
+import { autorun, observable } from 'mobx';
+import WebControls from '../components/WebControls';
+import ServicesStore from '../../../stores/ServicesStore';
+import Service from '../../../models/Service';
+
+const URL_EVENTS = [
+  'load-commit',
+  // 'dom-ready',
+  'will-navigate',
+  'did-navigate',
+  'did-navigate-in-page',
+];
+
+@inject('stores', 'actions') @observer
+class WebControlsScreen extends Component {
+  @observable url = '';
+
+  @observable canGoBack = false;
+
+  @observable canGoForward = false;
+
+  webview = null;
+
+  autorunDisposer = null;
+
+  componentDidMount() {
+    const { service } = this.props;
+
+    this.autorunDisposer = autorun(() => {
+      if (service.isAttached) {
+        this.webview = service.webview;
+
+        URL_EVENTS.forEach((event) => {
+          this.webview.addEventListener(event, (e) => {
+            if (!e.isMainFrame) return;
+
+            this.url = e.url;
+            this.canGoBack = this.webview.canGoBack();
+            this.canGoForward = this.webview.canGoForward();
+          });
+        });
+      }
+    });
+  }
+
+  componentWillUnmount() {
+    this.autorunDisposer();
+  }
+
+  goHome() {
+    const { reloadActive } = this.props.actions.service;
+
+    if (!this.webview) return;
+
+    reloadActive();
+  }
+
+  reload() {
+    if (!this.webview) return;
+
+    this.webview.reload();
+  }
+
+  goBack() {
+    if (!this.webview) return;
+
+    this.webview.goBack();
+  }
+
+  goForward() {
+    if (!this.webview) return;
+
+    this.webview.goForward();
+  }
+
+  navigate(newUrl) {
+    if (!this.webview) return;
+
+    let url = newUrl;
+
+    try {
+      url = new URL(url).toString();
+    } catch (err) {
+      // eslint-disable-next-line no-useless-escape
+      if (url.match(/^((?!-))(xn--)?[a-z0-9][a-z0-9-_]{0,61}[a-z0-9]{0,1}\.(xn--)?([a-z0-9\-]{1,61}|[a-z0-9-]{1,30}\.[a-z]{2,})$/)) {
+        url = `http://${url}`;
+      } else {
+        url = `https://www.google.com/search?query=${url}`;
+      }
+    }
+
+    this.webview.loadURL(url);
+    this.url = url;
+  }
+
+  render() {
+    return (
+      <WebControls
+        goHome={() => this.goHome()}
+        reload={() => this.reload()}
+        canGoBack={this.canGoBack}
+        goBack={() => this.goBack()}
+        canGoForward={this.canGoForward}
+        goForward={() => this.goForward()}
+        navigate={url => this.navigate(url)}
+        url={this.url}
+      />
+    );
+  }
+}
+
+export default WebControlsScreen;
+
+WebControlsScreen.wrappedComponent.propTypes = {
+  service: PropTypes.instanceOf(Service).isRequired,
+  stores: PropTypes.shape({
+    services: PropTypes.instanceOf(ServicesStore).isRequired,
+  }).isRequired,
+  actions: PropTypes.shape({
+    service: PropTypes.shape({
+      reloadActive: PropTypes.func.isRequired,
+    }).isRequired,
+  }).isRequired,
+};
diff --git a/src/i18n/apply-branding.js b/src/i18n/apply-branding.js
index 662799ab0..8e496c69d 100644
--- a/src/i18n/apply-branding.js
+++ b/src/i18n/apply-branding.js
@@ -10,6 +10,7 @@ console.log('Applying Ferdi branding to translations...');
 const ignore = [
   'login.customServerSuggestion',
   'settings.app.todoServerInfo',
+  'settings.app.serverMoneyInfo',
 ];
 
 // Files to ignore when applying branding
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 4033407e3..2cb42d134 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -4032,29 +4032,42 @@
         }
       },
       {
-        "defaultMessage": "!!!Enable Franz Todos",
+        "defaultMessage": "!!!Disable updates",
         "end": {
           "column": 3,
           "line": 115
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.noUpdates",
+        "start": {
+          "column": 13,
+          "line": 112
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable Franz Todos",
+        "end": {
+          "column": 3,
+          "line": 119
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableTodos",
         "start": {
           "column": 15,
-          "line": 112
+          "line": 116
         }
       },
       {
         "defaultMessage": "!!!Keep all workspaces loaded",
         "end": {
           "column": 3,
-          "line": 119
+          "line": 123
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.keepAllWorkspacesLoaded",
         "start": {
           "column": 27,
-          "line": 116
+          "line": 120
         }
       }
     ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index ad64bec14..c8cf09366 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -231,6 +231,7 @@
   "settings.app.form.language": "Language",
   "settings.app.form.lockPassword": "Ferdi Lock password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
+  "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
   "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index dccf8b992..110b7787b 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -273,15 +273,28 @@
     }
   },
   {
+    "id": "settings.app.form.noUpdates",
+    "defaultMessage": "!!!Disable updates",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 112,
+      "column": 13
+    },
+    "end": {
+      "line": 115,
+      "column": 3
+    }
+  },
+  {
     "id": "settings.app.form.enableTodos",
     "defaultMessage": "!!!Enable Franz Todos",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 112,
+      "line": 116,
       "column": 15
     },
     "end": {
-      "line": 115,
+      "line": 119,
       "column": 3
     }
   },
@@ -290,11 +303,11 @@
     "defaultMessage": "!!!Keep all workspaces loaded",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 116,
+      "line": 120,
       "column": 27
     },
     "end": {
-      "line": 119,
+      "line": 123,
       "column": 3
     }
   }
diff --git a/src/index.js b/src/index.js
index 73fc6e299..96f840533 100644
--- a/src/index.js
+++ b/src/index.js
@@ -11,7 +11,11 @@ import windowStateKeeper from 'electron-window-state';
 
 // Set app directory before loading user modules
 if (isDevMode) {
-  app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev'));
+  app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}Dev`));
+} else if (process.env.FERDI_USERDATA_DIR != null) {
+  app.setPath('userData', process.env.FERDI_USERDATA_DIR);
+} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) {
+  app.setPath('userData', path.join(process.env.PORTABLE_EXECUTABLE_DIR, app.getName()));
 }
 
 /* eslint-disable import/first */
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 80fa0e463..7e336c994 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -325,6 +325,9 @@ const _templateFactory = intl => [
         label: intl.formatMessage(menuItems.pasteAndMatchStyle),
         accelerator: 'Cmd+Shift+V',
         selector: 'pasteAndMatchStyle:',
+        click() {
+          getActiveWebview().pasteAndMatchStyle();
+        },
       },
       {
         label: intl.formatMessage(menuItems.delete),
@@ -345,7 +348,7 @@ const _templateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.openQuickSwitch),
-        accelerator: 'CmdOrCtrl+P',
+        accelerator: 'CmdOrCtrl+S',
         click() {
           window.ferdi.features.quickSwitch.state.isModalVisible = true;
         },
@@ -549,7 +552,7 @@ const _titleBarTemplateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.openQuickSwitch),
-        accelerator: 'CmdOrCtrl+P',
+        accelerator: 'CmdOrCtrl+S',
         click() {
           window.ferdi.features.quickSwitch.state.isModalVisible = true;
         },
@@ -783,12 +786,21 @@ export default class FranzMenu {
       accelerator: 'CmdOrCtrl+Shift+L',
       enabled: this.stores.settings.app.lockingFeatureEnabled,
       click() {
+        // Disable lock first - otherwise the application might not update correctly
         actions.settings.update({
           type: 'app',
           data: {
-            locked: true,
+            locked: false,
           },
         });
+        setTimeout(() => {
+          actions.settings.update({
+            type: 'app',
+            data: {
+              locked: true,
+            },
+          });
+        }, 0);
       },
     });
 
@@ -976,6 +988,10 @@ export default class FranzMenu {
       checked: service.isActive,
       click: () => {
         this.actions.service.setActive({ serviceId: service.id });
+
+        if (isMac && i === 0) {
+          app.mainWindow.restore();
+        }
       },
     })));
 
diff --git a/src/lib/TouchBar.js b/src/lib/TouchBar.js
index 97c02d194..1de46d2a3 100644
--- a/src/lib/TouchBar.js
+++ b/src/lib/TouchBar.js
@@ -29,7 +29,7 @@ export default class FranzTouchBar {
       const { TouchBarButton, TouchBarSpacer } = TouchBar;
 
       const buttons = [];
-      this.stores.services.enabled.forEach(((service) => {
+      this.stores.services.allDisplayed.forEach(((service) => {
         buttons.push(new TouchBarButton({
           label: `${service.name}${service.unreadDirectMessageCount > 0
             ? ' 🔴' : ''} ${service.unreadDirectMessageCount === 0
@@ -42,7 +42,7 @@ export default class FranzTouchBar {
         }), new TouchBarSpacer({ size: 'small' }));
       }));
 
-      const touchBar = new TouchBar(buttons);
+      const touchBar = new TouchBar({ items: buttons });
       currentWindow.setTouchBar(touchBar);
     } else {
       currentWindow.setTouchBar(null);
diff --git a/src/models/Recipe.js b/src/models/Recipe.js
index 3f7299e34..6655f8310 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -36,6 +36,8 @@ export default class Recipe {
 
   message = '';
 
+  disablewebsecurity = false;
+
   constructor(data) {
     if (!data) {
       throw Error('Recipe config not valid');
@@ -74,6 +76,8 @@ export default class Recipe {
     this.urlInputPrefix = data.config.urlInputPrefix || this.urlInputPrefix;
     this.urlInputSuffix = data.config.urlInputSuffix || this.urlInputSuffix;
 
+    this.disablewebsecurity = data.config.disablewebsecurity || this.disablewebsecurity;
+
     this.message = data.config.message || this.message;
   }
 
diff --git a/src/models/Service.js b/src/models/Service.js
index b48233237..3ab6e2603 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -134,6 +134,9 @@ export default class Service {
       id: this.id,
       spellcheckerLanguage: this.spellcheckerLanguage,
       isDarkModeEnabled: this.isDarkModeEnabled,
+      team: this.team,
+      url: this.url,
+      hasCustomIcon: this.hasCustomIcon,
     };
   }
 
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 5bae6e8d4..40d98cf42 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -22,6 +22,7 @@ import { getLocale } from '../helpers/i18n-helpers';
 
 import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '../helpers/service-helpers.js';
 import { isValidExternalURL } from '../helpers/url-helpers';
+import { sleep } from '../helpers/async-helpers';
 
 const debug = require('debug')('Ferdi:AppStore');
 
@@ -317,6 +318,8 @@ export default class AppStore extends Store {
 
     await clearAppCache._promise;
 
+    await sleep(ms('1s'));
+
     this.getAppCacheSizeRequest.execute();
 
     this.isClearingAllCache = false;
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index c09f24af7..8c4cd47eb 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -71,12 +71,21 @@ export default class SettingsStore extends Store {
     // Make sure to lock app on launch if locking feature is enabled
     setTimeout(() => {
       if (this.all.app.lockingFeatureEnabled) {
+        // Disable lock first - otherwise the lock might not get activated corrently
         this.actions.settings.update({
           type: 'app',
           data: {
-            locked: true,
+            locked: false,
           },
         });
+        setTimeout(() => {
+          this.actions.settings.update({
+            type: 'app',
+            data: {
+              locked: true,
+            },
+          });
+        }, 0);
       }
     }, 1000);
   }
diff --git a/src/webview/contextMenu.js b/src/webview/contextMenu.js
index ec5833848..acd62d675 100644
--- a/src/webview/contextMenu.js
+++ b/src/webview/contextMenu.js
@@ -255,9 +255,9 @@ const buildMenuTpl = (props, suggestions, isSpellcheckEnabled, defaultSpellcheck
       },
       {
         id: 'resetToDefault',
-        label: `Reset to system default (${SPELLCHECKER_LOCALES[defaultSpellcheckerLanguage]})`,
+        label: `Reset to system default (${defaultSpellcheckerLanguage === 'automatic' ? 'Automatic' : SPELLCHECKER_LOCALES[defaultSpellcheckerLanguage]})`,
         type: 'radio',
-        visible: defaultSpellcheckerLanguage !== spellcheckerLanguage,
+        visible: defaultSpellcheckerLanguage !== spellcheckerLanguage || (defaultSpellcheckerLanguage !== 'automatic' && spellcheckerLanguage === 'automatic'),
         click() {
           debug('Resetting service spellchecker to system default');
           ipcRenderer.sendToHost('set-service-spellchecker-language', 'reset');
@@ -297,12 +297,13 @@ const buildMenuTpl = (props, suggestions, isSpellcheckEnabled, defaultSpellcheck
 };
 
 export default function contextMenu(spellcheckProvider, isSpellcheckEnabled, getDefaultSpellcheckerLanguage, getSpellcheckerLanguage) {
-  webContents.on('context-menu', (e, props) => {
+  webContents.on('context-menu', async (e, props) => {
     e.preventDefault();
 
     let suggestions = [];
     if (spellcheckProvider && props.misspelledWord) {
-      suggestions = spellcheckProvider.getSuggestion(props.misspelledWord);
+      debug('Mispelled word', props.misspelledWord);
+      suggestions = await spellcheckProvider.getSuggestion(props.misspelledWord);
 
       debug('Suggestions', suggestions);
     }
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index 1b2d60faf..27380676d 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -1,6 +1,7 @@
 import { webFrame } from 'electron';
-import { SpellCheckerProvider } from 'electron-hunspell';
+import { attachSpellCheckProvider, SpellCheckerProvider } from 'electron-hunspell';
 import path from 'path';
+import { readFileSync } from 'fs';
 
 import { DICTIONARY_PATH } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
@@ -10,18 +11,21 @@ const debug = require('debug')('Ferdi:spellchecker');
 let provider;
 let currentDict;
 let _isEnabled = false;
+let attached;
+
+const DEFAULT_LOCALE = 'en-us';
 
 async function loadDictionary(locale) {
   try {
     const fileLocation = path.join(DICTIONARY_PATH, `hunspell-dict-${locale}/${locale}`);
-    await provider.loadDictionary(locale, `${fileLocation}.dic`, `${fileLocation}.aff`);
     debug('Loaded dictionary', locale, 'from', fileLocation);
+    return provider.loadDictionary(locale, readFileSync(`${fileLocation}.dic`), readFileSync(`${fileLocation}.aff`));
   } catch (err) {
     console.error('Could not load dictionary', err);
   }
 }
 
-export async function switchDict(locale) {
+export async function switchDict(locale = DEFAULT_LOCALE) {
   try {
     debug('Trying to load dictionary', locale);
 
@@ -40,8 +44,8 @@ export async function switchDict(locale) {
     if (currentDict) {
       provider.unloadDictionary(locale);
     }
-    loadDictionary(locale);
-    provider.switchDictionary(locale);
+    await loadDictionary(locale);
+    await attached.switchLanguage(locale);
 
     debug('Switched dictionary to', locale);
 
@@ -52,18 +56,32 @@ export async function switchDict(locale) {
   }
 }
 
-export default async function initialize(languageCode = 'en-us') {
+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;
+}
+
+export default async function initialize(languageCode = DEFAULT_LOCALE) {
   try {
     provider = new SpellCheckerProvider();
-    const locale = languageCode.toLowerCase();
+    const locale = getSpellcheckerLocaleByFuzzyIdentifier(languageCode);
 
     debug('Init spellchecker');
     await provider.initialize();
-    // await loadDictionaries();
 
-    debug('Available spellchecker dictionaries', provider.availableDictionaries);
+    debug('Attaching spellcheck provider');
+    attached = await attachSpellCheckProvider(provider);
+
+    const availableDictionaries = await provider.getAvailableDictionaries();
 
-    switchDict(locale);
+    debug('Available spellchecker dictionaries', availableDictionaries);
+
+    await switchDict(locale);
 
     return provider;
   } catch (err) {
@@ -83,13 +101,3 @@ 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;
-}