15 files changed, 887 insertions, 646 deletions

diff --git a/.eslintrc b/.eslintrc
index 640e29aa6..c74b43cf5 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -89,7 +89,8 @@
     "localStorage": true,
     "navigator": true,
     "Element": true,
-    "use": true
+    "use": true,
+    "FileReader": true
   },
   "env": {
     "jest/globals": true
@@ -97,18 +98,23 @@
   "rules": {
     // eslint
     "arrow-parens": 0,
-    "class-methods-use-this": 1,
+    "class-methods-use-this": 0,
     "consistent-return": 1,
+    "implicit-arrow-linebreak": 0,
+    "function-paren-newline": 0,
     "max-len": 0,
+    "no-await-in-loop": 1,
+    "no-console": [1, { "allow": ["warn", "error"] }],
     "no-param-reassign": 1,
     "no-restricted-syntax": 0,
     "no-underscore-dangle": 0,
     "operator-linebreak": 0,
     "prefer-destructuring": 1,
+    "object-curly-newline": 0,
     // eslint-plugin-import
     "import/extensions": 1,
     "import/prefer-default-export": 0,
-    "import/no-extraneous-dependencies": 1,
+    "import/no-extraneous-dependencies": 0, // various false positives, re-enable at some point
     "import/no-unresolved": 1,
     // eslint-plugin-react
     "react/forbid-prop-types": 1,
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index ed5245ee1..08cc34b63 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -18,7 +18,7 @@ import hexRgb from 'hex-rgb';
 import * as buildInfo from 'preval-build-info';
 import config from './package.json';
 
-import * as rawStyleConfig from './src/theme/default/legacy.js';
+import * as rawStyleConfig from './src/theme/default/legacy';
 
 dotenv.config();
 
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index c60d64197..f91aeb23a 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -167,10 +167,10 @@ export default class ServerApi {
     }
     const data = await request.json();
 
-    let services = await this._mapServiceModels(data);
-    services = services.filter((service) => service !== null);
-    debug('ServerApi::getServices resolves', services);
-    return services;
+    const services = await this._mapServiceModels(data);
+    const filteredServices = services.filter(service => !!service);
+    debug('ServerApi::getServices resolves', filteredServices);
+    return filteredServices;
   }
 
   async createService(recipeId, data) {
@@ -314,18 +314,19 @@ export default class ServerApi {
     const paths = fs
       .readdirSync(recipesDirectory)
       .filter(
-        (file) => fs.statSync(path.join(recipesDirectory, file)).isDirectory()
-          && file !== 'temp'
-          && file !== 'dev',
+        file =>
+          fs.statSync(path.join(recipesDirectory, file)).isDirectory() &&
+          file !== 'temp' &&
+          file !== 'dev',
       );
 
     this.recipes = paths
-      .map((id) => {
+      .map(id => {
         // eslint-disable-next-line
         const Recipe = require(id)(RecipeModel);
         return new Recipe(loadRecipeConfig(id));
       })
-      .filter((recipe) => recipe.id);
+      .filter(recipe => recipe.id);
 
     this.recipes = this.recipes.concat(this._getDevRecipes());
 
@@ -390,13 +391,11 @@ export default class ServerApi {
 
       let archivePath;
 
-      if (await fs.exists(internalRecipeFile)) {
-        console.log('[ServerApi::getRecipePackage] Using internal recipe file');
+      if (fs.existsSync(internalRecipeFile)) {
+        debug('[ServerApi::getRecipePackage] Using internal recipe file');
         archivePath = internalRecipeFile;
       } else {
-        console.log(
-          '[ServerApi::getRecipePackage] Downloading recipe from server',
-        );
+        debug('[ServerApi::getRecipePackage] Downloading recipe from server');
         archivePath = tempArchivePath;
 
         const packageUrl = `${apiBase()}/recipes/download/${recipeId}`;
@@ -406,7 +405,7 @@ export default class ServerApi {
         const buffer = await res.buffer();
         fs.writeFileSync(archivePath, buffer);
       }
-      console.log(archivePath);
+      debug(archivePath);
 
       await sleep(10);
 
@@ -416,7 +415,7 @@ export default class ServerApi {
         preservePaths: true,
         unlink: true,
         preserveOwner: false,
-        onwarn: (x) => console.log('warn', recipeId, x),
+        onwarn: x => debug('warn', recipeId, x),
       });
 
       await sleep(10);
@@ -487,7 +486,7 @@ export default class ServerApi {
 
       if (Object.prototype.hasOwnProperty.call(config, 'services')) {
         const services = await Promise.all(
-          config.services.map(async (s) => {
+          config.services.map(async s => {
             const service = s;
             const request = await sendAuthRequest(
               `${apiBase()}/recipes/${s.service}`,
@@ -514,11 +513,11 @@ export default class ServerApi {
 
   // Helper
   async _mapServiceModels(services) {
-    const recipes = services.map((s) => s.recipeId);
+    const recipes = services.map(s => s.recipeId);
     await this._bulkRecipeCheck(recipes);
     /* eslint-disable no-return-await */
     return Promise.all(
-      services.map(async (service) => await this._prepareServiceModel(service)),
+      services.map(async service => await this._prepareServiceModel(service)),
     );
     /* eslint-enable no-return-await */
   }
@@ -526,7 +525,7 @@ export default class ServerApi {
   async _prepareServiceModel(service) {
     let recipe;
     try {
-      recipe = this.recipes.find((r) => r.id === service.recipeId);
+      recipe = this.recipes.find(r => r.id === service.recipeId);
 
       if (!recipe) {
         console.warn(`Recipe ${service.recipeId} not loaded`);
@@ -547,8 +546,8 @@ export default class ServerApi {
     );
 
     return Promise.all(
-      recipes.map(async (recipeId) => {
-        let recipe = this.recipes.find((r) => r.id === recipeId);
+      recipes.map(async recipeId => {
+        let recipe = this.recipes.find(r => r.id === recipeId);
 
         if (!recipe) {
           console.warn(
@@ -560,7 +559,7 @@ export default class ServerApi {
           debug('Rerun ServerAPI::getInstalledRecipes');
           await this.getInstalledRecipes();
 
-          recipe = this.recipes.find((r) => r.id === recipeId);
+          recipe = this.recipes.find(r => r.id === recipeId);
 
           if (!recipe) {
             console.warn(`Could not load recipe ${recipeId}`);
@@ -570,12 +569,12 @@ export default class ServerApi {
 
         return recipe;
       }),
-    ).catch((err) => console.error("Can't load recipe", err));
+    ).catch(err => console.error("Can't load recipe", err));
   }
 
   _mapRecipePreviewModel(recipes) {
     return recipes
-      .map((recipe) => {
+      .map(recipe => {
         try {
           return new RecipePreviewModel(recipe);
         } catch (e) {
@@ -583,12 +582,12 @@ export default class ServerApi {
           return null;
         }
       })
-      .filter((recipe) => recipe !== null);
+      .filter(recipe => recipe !== null);
   }
 
   _mapNewsModels(news) {
     return news
-      .map((newsItem) => {
+      .map(newsItem => {
         try {
           return new NewsModel(newsItem);
         } catch (e) {
@@ -596,12 +595,12 @@ export default class ServerApi {
           return null;
         }
       })
-      .filter((newsItem) => newsItem !== null);
+      .filter(newsItem => newsItem !== null);
   }
 
   _mapOrderModels(orders) {
     return orders
-      .map((orderItem) => {
+      .map(orderItem => {
         try {
           return new OrderModel(orderItem);
         } catch (e) {
@@ -609,7 +608,7 @@ export default class ServerApi {
           return null;
         }
       })
-      .filter((orderItem) => orderItem !== null);
+      .filter(orderItem => orderItem !== null);
   }
 
   _getDevRecipes() {
@@ -618,12 +617,13 @@ export default class ServerApi {
       const paths = fs
         .readdirSync(recipesDirectory)
         .filter(
-          (file) => fs.statSync(path.join(recipesDirectory, file)).isDirectory()
-            && file !== 'temp',
+          file =>
+            fs.statSync(path.join(recipesDirectory, file)).isDirectory() &&
+            file !== 'temp',
         );
 
       const recipes = paths
-        .map((id) => {
+        .map(id => {
           let Recipe;
           try {
             // eslint-disable-next-line
@@ -635,8 +635,8 @@ export default class ServerApi {
 
           return false;
         })
-        .filter((recipe) => recipe.id)
-        .map((data) => {
+        .filter(recipe => recipe.id)
+        .map(data => {
           const recipe = data;
 
           recipe.icons = {
diff --git a/src/containers/auth/SetupAssistantScreen.js b/src/containers/auth/SetupAssistantScreen.js
index d14085f63..d7036969a 100644
--- a/src/containers/auth/SetupAssistantScreen.js
+++ b/src/containers/auth/SetupAssistantScreen.js
@@ -4,14 +4,27 @@ import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 
 import { RouterStore } from 'mobx-react-router';
-import { DEFAULT_TODO_RECIPE_ID, DEFAULT_TODO_SERVICE_NAME } from '../../config';
+import {
+  DEFAULT_TODO_RECIPE_ID,
+  DEFAULT_TODO_SERVICE_NAME,
+} from '../../config';
 import { sleep } from '../../helpers/async-helpers';
 import SetupAssistant from '../../components/auth/SetupAssistant';
 import ServicesStore from '../../stores/ServicesStore';
 import RecipesStore from '../../stores/RecipesStore';
 import UserStore from '../../stores/UserStore';
 
-export default @inject('stores', 'actions') @observer class SetupAssistantScreen extends Component {
+export default
+@inject('stores', 'actions')
+@observer
+class SetupAssistantScreen extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      isSettingUpServices: false,
+    };
+  }
+
   // TODO: Why are these hardcoded here? Do they need to conform to specific services in the packaged recipes? If so, its more important to fix this
   services = {
     whatsapp: {
@@ -50,15 +63,12 @@ export default @inject('stores', 'actions') @observer class SetupAssistantScreen
       name: 'LinkedIn',
       hasTeamId: false,
     },
-  }
-
-  state = {
-    isSettingUpServices: false,
-  }
+  };
 
   async setupServices(serviceConfig) {
-    const { stores: { services } } = this.props;
-    console.log(serviceConfig);
+    const {
+      stores: { services },
+    } = this.props;
 
     this.setState({
       isSettingUpServices: true,
@@ -102,7 +112,7 @@ export default @inject('stores', 'actions') @observer class SetupAssistantScreen
   render() {
     return (
       <SetupAssistant
-        onSubmit={(config) => this.setupServices(config)}
+        onSubmit={config => this.setupServices(config)}
         services={this.services}
         embed={false}
         isSettingUpServices={this.state.isSettingUpServices}
diff --git a/src/electron/macOSPermissions.js b/src/electron/macOSPermissions.js
index 940b16c6e..c114f4843 100644
--- a/src/electron/macOSPermissions.js
+++ b/src/electron/macOSPermissions.js
@@ -2,18 +2,15 @@ import { app, systemPreferences, dialog } from 'electron';
 import fs from 'fs';
 import macosVersion from 'macos-version';
 import path from 'path';
-import { isMac } from '../environment';
-
-let askForScreenCaptureAccess;
-if (isMac) {
-  // eslint-disable-next-line global-require
-  askForScreenCaptureAccess = require('node-mac-permissions').askForScreenCaptureAccess;
-}
+import { askForScreenCaptureAccess } from 'node-mac-permissions';
 
 const debug = require('debug')('Ferdi:macOSPermissions');
 
 const permissionExists = macosVersion.isGreaterThanOrEqualTo('10.15');
-const filePath = path.join(app.getPath('userData'), '.has-app-requested-screen-capture-permissions');
+const filePath = path.join(
+  app.getPath('userData'),
+  '.has-app-requested-screen-capture-permissions',
+);
 
 function hasPromptedForPermission() {
   if (!permissionExists) {
@@ -49,7 +46,7 @@ function createStatusFile() {
   }
 }
 
-export default async function (mainWindow) {
+export const askFormacOSPermissions = async mainWindow => {
   debug('Checking camera & microphone permissions');
   systemPreferences.askForMediaAccess('camera');
   systemPreferences.askForMediaAccess('microphone');
@@ -60,24 +57,20 @@ export default async function (mainWindow) {
     const { response } = await dialog.showMessageBox(mainWindow, {
       type: 'info',
       message: 'Enable Screen Sharing',
-      detail: 'To enable screen sharing for some services, Ferdi needs the permission to record your screen.',
-      buttons: [
-        'Allow screen sharing',
-        'No',
-        'Ask me later',
-      ],
+      detail:
+        'To enable screen sharing for some services, Ferdi needs the permission to record your screen.',
+      buttons: ['Allow screen sharing', 'No', 'Ask me later'],
       defaultId: 0,
       cancelId: 2,
     });
 
-    console.log('result', response);
     if (response === 0) {
       debug('Asking for access');
       askForScreenCaptureAccess();
       createStatusFile();
     } else if (response === 1) {
-      debug('Don\'t ask again');
+      debug("Don't ask again");
       createStatusFile();
     }
   }
-}
+};
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index d8050906b..f18a09940 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -817,169 +817,169 @@
         "defaultMessage": "!!!Sign up",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 23
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.headline",
         "start": {
           "column": 12,
-          "line": 19
+          "line": 20
         }
       },
       {
         "defaultMessage": "!!!Firstname",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 27
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.firstname.label",
         "start": {
           "column": 18,
-          "line": 23
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Lastname",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 31
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.lastname.label",
         "start": {
           "column": 17,
-          "line": 27
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Email address",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 35
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.email.label",
         "start": {
           "column": 14,
-          "line": 31
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 43
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.password.label",
         "start": {
           "column": 17,
-          "line": 39
+          "line": 40
         }
       },
       {
         "defaultMessage": "!!!By creating a Ferdi account you accept the",
         "end": {
           "column": 3,
-          "line": 46
+          "line": 47
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.legal.info",
         "start": {
           "column": 13,
-          "line": 43
+          "line": 44
         }
       },
       {
         "defaultMessage": "!!!Terms of service",
         "end": {
           "column": 3,
-          "line": 50
+          "line": 51
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.legal.terms",
         "start": {
           "column": 9,
-          "line": 47
+          "line": 48
         }
       },
       {
         "defaultMessage": "!!!Privacy Statement",
         "end": {
           "column": 3,
-          "line": 54
+          "line": 55
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.legal.privacy",
         "start": {
           "column": 11,
-          "line": 51
+          "line": 52
         }
       },
       {
         "defaultMessage": "!!!Create account",
         "end": {
           "column": 3,
-          "line": 58
+          "line": 59
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.submit.label",
         "start": {
           "column": 21,
-          "line": 55
+          "line": 56
         }
       },
       {
         "defaultMessage": "!!!Already have an account, sign in?",
         "end": {
           "column": 3,
-          "line": 62
+          "line": 63
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.link.login",
         "start": {
           "column": 13,
-          "line": 59
+          "line": 60
         }
       },
       {
         "defaultMessage": "!!!Change server",
         "end": {
           "column": 3,
-          "line": 66
+          "line": 67
         },
         "file": "src/components/auth/Signup.js",
         "id": "login.changeServer",
         "start": {
           "column": 16,
-          "line": 63
+          "line": 64
         }
       },
       {
         "defaultMessage": "!!!Use Ferdi without an Account",
         "end": {
           "column": 3,
-          "line": 70
+          "line": 71
         },
         "file": "src/components/auth/Signup.js",
         "id": "services.serverless",
         "start": {
           "column": 14,
-          "line": 67
+          "line": 68
         }
       },
       {
         "defaultMessage": "!!!A user with that email address already exists",
         "end": {
           "column": 3,
-          "line": 74
+          "line": 75
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.emailDuplicate",
         "start": {
           "column": 18,
-          "line": 71
+          "line": 72
         }
       }
     ],
@@ -5929,663 +5929,663 @@
         "defaultMessage": "!!!Edit",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 23
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit",
         "start": {
           "column": 8,
-          "line": 19
+          "line": 20
         }
       },
       {
         "defaultMessage": "!!!View",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 27
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view",
         "start": {
           "column": 8,
-          "line": 23
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Find in Page",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 31
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.findInPage",
         "start": {
           "column": 14,
-          "line": 27
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Speech",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 35
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.speech",
         "start": {
           "column": 10,
-          "line": 31
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!Start Speaking",
         "end": {
           "column": 3,
-          "line": 38
+          "line": 39
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startSpeaking",
         "start": {
           "column": 17,
-          "line": 35
+          "line": 36
         }
       },
       {
         "defaultMessage": "!!!Stop Speaking",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 43
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.stopSpeaking",
         "start": {
           "column": 16,
-          "line": 39
+          "line": 40
         }
       },
       {
         "defaultMessage": "!!!Start Dictation",
         "end": {
           "column": 3,
-          "line": 46
+          "line": 47
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startDictation",
         "start": {
           "column": 18,
-          "line": 43
+          "line": 44
         }
       },
       {
         "defaultMessage": "!!!Emoji & Symbols",
         "end": {
           "column": 3,
-          "line": 50
+          "line": 51
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.emojiSymbols",
         "start": {
           "column": 16,
-          "line": 47
+          "line": 48
         }
       },
       {
         "defaultMessage": "!!!Open Quick Switch",
         "end": {
           "column": 3,
-          "line": 54
+          "line": 55
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.openQuickSwitch",
         "start": {
           "column": 19,
-          "line": 51
+          "line": 52
         }
       },
       {
         "defaultMessage": "!!!Back",
         "end": {
           "column": 3,
-          "line": 58
+          "line": 59
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.back",
         "start": {
           "column": 8,
-          "line": 55
+          "line": 56
         }
       },
       {
         "defaultMessage": "!!!Forward",
         "end": {
           "column": 3,
-          "line": 62
+          "line": 63
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.forward",
         "start": {
           "column": 11,
-          "line": 59
+          "line": 60
         }
       },
       {
         "defaultMessage": "!!!Toggle Dark Mode",
         "end": {
           "column": 3,
-          "line": 66
+          "line": 67
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleDarkMode",
         "start": {
           "column": 18,
-          "line": 63
+          "line": 64
         }
       },
       {
         "defaultMessage": "!!!Toggle Developer Tools",
         "end": {
           "column": 3,
-          "line": 70
+          "line": 71
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleDevTools",
         "start": {
           "column": 18,
-          "line": 67
+          "line": 68
         }
       },
       {
         "defaultMessage": "!!!Toggle Todos Developer Tools",
         "end": {
           "column": 3,
-          "line": 74
+          "line": 75
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleTodosDevTools",
         "start": {
           "column": 23,
-          "line": 71
+          "line": 72
         }
       },
       {
         "defaultMessage": "!!!Toggle Service Developer Tools",
         "end": {
           "column": 3,
-          "line": 78
+          "line": 79
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleServiceDevTools",
         "start": {
           "column": 25,
-          "line": 75
+          "line": 76
         }
       },
       {
         "defaultMessage": "!!!Reload Service",
         "end": {
           "column": 3,
-          "line": 82
+          "line": 83
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadService",
         "start": {
           "column": 17,
-          "line": 79
+          "line": 80
         }
       },
       {
         "defaultMessage": "!!!Reload Ferdi",
         "end": {
           "column": 3,
-          "line": 86
+          "line": 87
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadFerdi",
         "start": {
           "column": 15,
-          "line": 83
+          "line": 84
         }
       },
       {
         "defaultMessage": "!!!Lock Ferdi",
         "end": {
           "column": 3,
-          "line": 90
+          "line": 91
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.lockFerdi",
         "start": {
           "column": 13,
-          "line": 87
+          "line": 88
         }
       },
       {
         "defaultMessage": "!!!Reload ToDos",
         "end": {
           "column": 3,
-          "line": 94
+          "line": 95
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadTodos",
         "start": {
           "column": 15,
-          "line": 91
+          "line": 92
         }
       },
       {
         "defaultMessage": "!!!Learn More",
         "end": {
           "column": 3,
-          "line": 98
+          "line": 99
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.learnMore",
         "start": {
           "column": 13,
-          "line": 95
+          "line": 96
         }
       },
       {
         "defaultMessage": "!!!Changelog",
         "end": {
           "column": 3,
-          "line": 102
+          "line": 103
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.changelog",
         "start": {
           "column": 13,
-          "line": 99
+          "line": 100
         }
       },
       {
         "defaultMessage": "!!!Support",
         "end": {
           "column": 3,
-          "line": 106
+          "line": 107
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.support",
         "start": {
           "column": 11,
-          "line": 103
+          "line": 104
         }
       },
       {
         "defaultMessage": "!!!Copy Debug Information",
         "end": {
           "column": 3,
-          "line": 110
+          "line": 111
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfo",
         "start": {
           "column": 13,
-          "line": 107
+          "line": 108
         }
       },
       {
         "defaultMessage": "!!!Publish Debug Information",
         "end": {
           "column": 3,
-          "line": 114
+          "line": 115
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.publishDebugInfo",
         "start": {
           "column": 20,
-          "line": 111
+          "line": 112
         }
       },
       {
         "defaultMessage": "!!!Ferdi Debug Information",
         "end": {
           "column": 3,
-          "line": 118
+          "line": 119
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfoCopiedHeadline",
         "start": {
           "column": 27,
-          "line": 115
+          "line": 116
         }
       },
       {
         "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
         "end": {
           "column": 3,
-          "line": 122
+          "line": 123
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfoCopiedBody",
         "start": {
           "column": 23,
-          "line": 119
+          "line": 120
         }
       },
       {
         "defaultMessage": "!!!Unlock with Touch ID",
         "end": {
           "column": 3,
-          "line": 126
+          "line": 127
         },
         "file": "src/lib/Menu.js",
         "id": "locked.touchId",
         "start": {
           "column": 11,
-          "line": 123
+          "line": 124
         }
       },
       {
         "defaultMessage": "!!!unlock via Touch ID",
         "end": {
           "column": 3,
-          "line": 130
+          "line": 131
         },
         "file": "src/lib/Menu.js",
         "id": "locked.touchIdPrompt",
         "start": {
           "column": 17,
-          "line": 127
+          "line": 128
         }
       },
       {
         "defaultMessage": "!!!Terms of Service",
         "end": {
           "column": 3,
-          "line": 134
+          "line": 135
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.tos",
         "start": {
           "column": 7,
-          "line": 131
+          "line": 132
         }
       },
       {
         "defaultMessage": "!!!Privacy Statement",
         "end": {
           "column": 3,
-          "line": 138
+          "line": 139
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.privacy",
         "start": {
           "column": 11,
-          "line": 135
+          "line": 136
         }
       },
       {
         "defaultMessage": "!!!File",
         "end": {
           "column": 3,
-          "line": 142
+          "line": 143
         },
         "file": "src/lib/Menu.js",
         "id": "menu.file",
         "start": {
           "column": 8,
-          "line": 139
+          "line": 140
         }
       },
       {
         "defaultMessage": "!!!Services",
         "end": {
           "column": 3,
-          "line": 146
+          "line": 147
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services",
         "start": {
           "column": 12,
-          "line": 143
+          "line": 144
         }
       },
       {
         "defaultMessage": "!!!What's new?",
         "end": {
           "column": 3,
-          "line": 150
+          "line": 151
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.announcement",
         "start": {
           "column": 16,
-          "line": 147
+          "line": 148
         }
       },
       {
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 154
+          "line": 155
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.settings",
         "start": {
           "column": 12,
-          "line": 151
+          "line": 152
         }
       },
       {
         "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
-          "line": 158
+          "line": 159
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.checkForUpdates",
         "start": {
           "column": 19,
-          "line": 155
+          "line": 156
         }
       },
       {
         "defaultMessage": "!!!Auto-hide menu bar",
         "end": {
           "column": 3,
-          "line": 162
+          "line": 163
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.autohideMenuBar",
         "start": {
           "column": 19,
-          "line": 159
+          "line": 160
         }
       },
       {
         "defaultMessage": "!!!Add New Service...",
         "end": {
           "column": 3,
-          "line": 166
+          "line": 167
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.addNewService",
         "start": {
           "column": 17,
-          "line": 163
+          "line": 164
         }
       },
       {
         "defaultMessage": "!!!Add New Workspace...",
         "end": {
           "column": 3,
-          "line": 170
+          "line": 171
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.addNewWorkspace",
         "start": {
           "column": 19,
-          "line": 167
+          "line": 168
         }
       },
       {
         "defaultMessage": "!!!Open workspace drawer",
         "end": {
           "column": 3,
-          "line": 174
+          "line": 175
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.openWorkspaceDrawer",
         "start": {
           "column": 23,
-          "line": 171
+          "line": 172
         }
       },
       {
         "defaultMessage": "!!!Close workspace drawer",
         "end": {
           "column": 3,
-          "line": 178
+          "line": 179
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.closeWorkspaceDrawer",
         "start": {
           "column": 24,
-          "line": 175
+          "line": 176
         }
       },
       {
         "defaultMessage": "!!!Activate next service...",
         "end": {
           "column": 3,
-          "line": 182
+          "line": 183
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.setNextServiceActive",
         "start": {
           "column": 23,
-          "line": 179
+          "line": 180
         }
       },
       {
         "defaultMessage": "!!!Activate previous service...",
         "end": {
           "column": 3,
-          "line": 186
+          "line": 187
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.activatePreviousService",
         "start": {
           "column": 27,
-          "line": 183
+          "line": 184
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 190
+          "line": 191
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 11,
-          "line": 187
+          "line": 188
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 194
+          "line": 195
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 13,
-          "line": 191
+          "line": 192
         }
       },
       {
         "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 198
+          "line": 199
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces",
         "start": {
           "column": 14,
-          "line": 195
+          "line": 196
         }
       },
       {
         "defaultMessage": "!!!Default",
         "end": {
           "column": 3,
-          "line": 202
+          "line": 203
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.defaultWorkspace",
         "start": {
           "column": 20,
-          "line": 199
+          "line": 200
         }
       },
       {
         "defaultMessage": "!!!Todos",
         "end": {
           "column": 3,
-          "line": 206
+          "line": 207
         },
         "file": "src/lib/Menu.js",
         "id": "menu.todos",
         "start": {
           "column": 9,
-          "line": 203
+          "line": 204
         }
       },
       {
         "defaultMessage": "!!!Open Todos drawer",
         "end": {
           "column": 3,
-          "line": 210
+          "line": 211
         },
         "file": "src/lib/Menu.js",
         "id": "menu.Todoss.openTodosDrawer",
         "start": {
           "column": 19,
-          "line": 207
+          "line": 208
         }
       },
       {
         "defaultMessage": "!!!Close Todos drawer",
         "end": {
           "column": 3,
-          "line": 214
+          "line": 215
         },
         "file": "src/lib/Menu.js",
         "id": "menu.Todoss.closeTodosDrawer",
         "start": {
           "column": 20,
-          "line": 211
+          "line": 212
         }
       },
       {
         "defaultMessage": "!!!Enable Todos",
         "end": {
           "column": 3,
-          "line": 218
+          "line": 219
         },
         "file": "src/lib/Menu.js",
         "id": "menu.todos.enableTodos",
         "start": {
           "column": 15,
-          "line": 215
+          "line": 216
         }
       },
       {
         "defaultMessage": "!!!Home",
         "end": {
           "column": 3,
-          "line": 222
+          "line": 223
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.goHome",
         "start": {
           "column": 17,
-          "line": 219
+          "line": 220
         }
       }
     ],
diff --git a/src/i18n/messages/src/components/auth/Signup.json b/src/i18n/messages/src/components/auth/Signup.json
index 2628c9aa3..4a32628ef 100644
--- a/src/i18n/messages/src/components/auth/Signup.json
+++ b/src/i18n/messages/src/components/auth/Signup.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Sign up",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 19,
+      "line": 20,
       "column": 12
     },
     "end": {
-      "line": 22,
+      "line": 23,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Firstname",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 23,
+      "line": 24,
       "column": 18
     },
     "end": {
-      "line": 26,
+      "line": 27,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Lastname",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 27,
+      "line": 28,
       "column": 17
     },
     "end": {
-      "line": 30,
+      "line": 31,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Email address",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 31,
+      "line": 32,
       "column": 14
     },
     "end": {
-      "line": 34,
+      "line": 35,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 39,
+      "line": 40,
       "column": 17
     },
     "end": {
-      "line": 42,
+      "line": 43,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!By creating a Ferdi account you accept the",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 43,
+      "line": 44,
       "column": 13
     },
     "end": {
-      "line": 46,
+      "line": 47,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Terms of service",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 47,
+      "line": 48,
       "column": 9
     },
     "end": {
-      "line": 50,
+      "line": 51,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Privacy Statement",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 51,
+      "line": 52,
       "column": 11
     },
     "end": {
-      "line": 54,
+      "line": 55,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Create account",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 55,
+      "line": 56,
       "column": 21
     },
     "end": {
-      "line": 58,
+      "line": 59,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Already have an account, sign in?",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 59,
+      "line": 60,
       "column": 13
     },
     "end": {
-      "line": 62,
+      "line": 63,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Change server",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 63,
+      "line": 64,
       "column": 16
     },
     "end": {
-      "line": 66,
+      "line": 67,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Use Ferdi without an Account",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 67,
+      "line": 68,
       "column": 14
     },
     "end": {
-      "line": 70,
+      "line": 71,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!A user with that email address already exists",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 71,
+      "line": 72,
       "column": 18
     },
     "end": {
-      "line": 74,
+      "line": 75,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index 07d1b1b80..1ddd00c43 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Edit",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 19,
+      "line": 20,
       "column": 8
     },
     "end": {
-      "line": 22,
+      "line": 23,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!View",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 23,
+      "line": 24,
       "column": 8
     },
     "end": {
-      "line": 26,
+      "line": 27,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Find in Page",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 27,
+      "line": 28,
       "column": 14
     },
     "end": {
-      "line": 30,
+      "line": 31,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Speech",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 31,
+      "line": 32,
       "column": 10
     },
     "end": {
-      "line": 34,
+      "line": 35,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Start Speaking",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 35,
+      "line": 36,
       "column": 17
     },
     "end": {
-      "line": 38,
+      "line": 39,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Stop Speaking",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 39,
+      "line": 40,
       "column": 16
     },
     "end": {
-      "line": 42,
+      "line": 43,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Start Dictation",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 43,
+      "line": 44,
       "column": 18
     },
     "end": {
-      "line": 46,
+      "line": 47,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Emoji & Symbols",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 47,
+      "line": 48,
       "column": 16
     },
     "end": {
-      "line": 50,
+      "line": 51,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Open Quick Switch",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 51,
+      "line": 52,
       "column": 19
     },
     "end": {
-      "line": 54,
+      "line": 55,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Back",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 55,
+      "line": 56,
       "column": 8
     },
     "end": {
-      "line": 58,
+      "line": 59,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Forward",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 59,
+      "line": 60,
       "column": 11
     },
     "end": {
-      "line": 62,
+      "line": 63,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Toggle Dark Mode",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 63,
+      "line": 64,
       "column": 18
     },
     "end": {
-      "line": 66,
+      "line": 67,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Toggle Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 67,
+      "line": 68,
       "column": 18
     },
     "end": {
-      "line": 70,
+      "line": 71,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Toggle Todos Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 71,
+      "line": 72,
       "column": 23
     },
     "end": {
-      "line": 74,
+      "line": 75,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!Toggle Service Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 75,
+      "line": 76,
       "column": 25
     },
     "end": {
-      "line": 78,
+      "line": 79,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Reload Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 79,
+      "line": 80,
       "column": 17
     },
     "end": {
-      "line": 82,
+      "line": 83,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!Reload Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 83,
+      "line": 84,
       "column": 15
     },
     "end": {
-      "line": 86,
+      "line": 87,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!Lock Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 87,
+      "line": 88,
       "column": 13
     },
     "end": {
-      "line": 90,
+      "line": 91,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!Reload ToDos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 91,
+      "line": 92,
       "column": 15
     },
     "end": {
-      "line": 94,
+      "line": 95,
       "column": 3
     }
   },
@@ -251,11 +251,11 @@
     "defaultMessage": "!!!Learn More",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 95,
+      "line": 96,
       "column": 13
     },
     "end": {
-      "line": 98,
+      "line": 99,
       "column": 3
     }
   },
@@ -264,11 +264,11 @@
     "defaultMessage": "!!!Changelog",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 99,
+      "line": 100,
       "column": 13
     },
     "end": {
-      "line": 102,
+      "line": 103,
       "column": 3
     }
   },
@@ -277,11 +277,11 @@
     "defaultMessage": "!!!Support",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 103,
+      "line": 104,
       "column": 11
     },
     "end": {
-      "line": 106,
+      "line": 107,
       "column": 3
     }
   },
@@ -290,11 +290,11 @@
     "defaultMessage": "!!!Copy Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 107,
+      "line": 108,
       "column": 13
     },
     "end": {
-      "line": 110,
+      "line": 111,
       "column": 3
     }
   },
@@ -303,11 +303,11 @@
     "defaultMessage": "!!!Publish Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 111,
+      "line": 112,
       "column": 20
     },
     "end": {
-      "line": 114,
+      "line": 115,
       "column": 3
     }
   },
@@ -316,11 +316,11 @@
     "defaultMessage": "!!!Ferdi Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 115,
+      "line": 116,
       "column": 27
     },
     "end": {
-      "line": 118,
+      "line": 119,
       "column": 3
     }
   },
@@ -329,11 +329,11 @@
     "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 119,
+      "line": 120,
       "column": 23
     },
     "end": {
-      "line": 122,
+      "line": 123,
       "column": 3
     }
   },
@@ -342,11 +342,11 @@
     "defaultMessage": "!!!Unlock with Touch ID",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 123,
+      "line": 124,
       "column": 11
     },
     "end": {
-      "line": 126,
+      "line": 127,
       "column": 3
     }
   },
@@ -355,11 +355,11 @@
     "defaultMessage": "!!!unlock via Touch ID",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 127,
+      "line": 128,
       "column": 17
     },
     "end": {
-      "line": 130,
+      "line": 131,
       "column": 3
     }
   },
@@ -368,11 +368,11 @@
     "defaultMessage": "!!!Terms of Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 131,
+      "line": 132,
       "column": 7
     },
     "end": {
-      "line": 134,
+      "line": 135,
       "column": 3
     }
   },
@@ -381,11 +381,11 @@
     "defaultMessage": "!!!Privacy Statement",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 135,
+      "line": 136,
       "column": 11
     },
     "end": {
-      "line": 138,
+      "line": 139,
       "column": 3
     }
   },
@@ -394,11 +394,11 @@
     "defaultMessage": "!!!File",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 139,
+      "line": 140,
       "column": 8
     },
     "end": {
-      "line": 142,
+      "line": 143,
       "column": 3
     }
   },
@@ -407,11 +407,11 @@
     "defaultMessage": "!!!Services",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 143,
+      "line": 144,
       "column": 12
     },
     "end": {
-      "line": 146,
+      "line": 147,
       "column": 3
     }
   },
@@ -420,11 +420,11 @@
     "defaultMessage": "!!!What's new?",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 147,
+      "line": 148,
       "column": 16
     },
     "end": {
-      "line": 150,
+      "line": 151,
       "column": 3
     }
   },
@@ -433,11 +433,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 151,
+      "line": 152,
       "column": 12
     },
     "end": {
-      "line": 154,
+      "line": 155,
       "column": 3
     }
   },
@@ -446,11 +446,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 155,
+      "line": 156,
       "column": 19
     },
     "end": {
-      "line": 158,
+      "line": 159,
       "column": 3
     }
   },
@@ -459,11 +459,11 @@
     "defaultMessage": "!!!Auto-hide menu bar",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 159,
+      "line": 160,
       "column": 19
     },
     "end": {
-      "line": 162,
+      "line": 163,
       "column": 3
     }
   },
@@ -472,11 +472,11 @@
     "defaultMessage": "!!!Add New Service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 163,
+      "line": 164,
       "column": 17
     },
     "end": {
-      "line": 166,
+      "line": 167,
       "column": 3
     }
   },
@@ -485,11 +485,11 @@
     "defaultMessage": "!!!Add New Workspace...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 167,
+      "line": 168,
       "column": 19
     },
     "end": {
-      "line": 170,
+      "line": 171,
       "column": 3
     }
   },
@@ -498,11 +498,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 171,
+      "line": 172,
       "column": 23
     },
     "end": {
-      "line": 174,
+      "line": 175,
       "column": 3
     }
   },
@@ -511,11 +511,11 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 175,
+      "line": 176,
       "column": 24
     },
     "end": {
-      "line": 178,
+      "line": 179,
       "column": 3
     }
   },
@@ -524,11 +524,11 @@
     "defaultMessage": "!!!Activate next service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 179,
+      "line": 180,
       "column": 23
     },
     "end": {
-      "line": 182,
+      "line": 183,
       "column": 3
     }
   },
@@ -537,11 +537,11 @@
     "defaultMessage": "!!!Activate previous service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 183,
+      "line": 184,
       "column": 27
     },
     "end": {
-      "line": 186,
+      "line": 187,
       "column": 3
     }
   },
@@ -550,11 +550,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 187,
+      "line": 188,
       "column": 11
     },
     "end": {
-      "line": 190,
+      "line": 191,
       "column": 3
     }
   },
@@ -563,11 +563,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 191,
+      "line": 192,
       "column": 13
     },
     "end": {
-      "line": 194,
+      "line": 195,
       "column": 3
     }
   },
@@ -576,11 +576,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 195,
+      "line": 196,
       "column": 14
     },
     "end": {
-      "line": 198,
+      "line": 199,
       "column": 3
     }
   },
@@ -589,11 +589,11 @@
     "defaultMessage": "!!!Default",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 199,
+      "line": 200,
       "column": 20
     },
     "end": {
-      "line": 202,
+      "line": 203,
       "column": 3
     }
   },
@@ -602,11 +602,11 @@
     "defaultMessage": "!!!Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 203,
+      "line": 204,
       "column": 9
     },
     "end": {
-      "line": 206,
+      "line": 207,
       "column": 3
     }
   },
@@ -615,11 +615,11 @@
     "defaultMessage": "!!!Open Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 207,
+      "line": 208,
       "column": 19
     },
     "end": {
-      "line": 210,
+      "line": 211,
       "column": 3
     }
   },
@@ -628,11 +628,11 @@
     "defaultMessage": "!!!Close Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 211,
+      "line": 212,
       "column": 20
     },
     "end": {
-      "line": 214,
+      "line": 215,
       "column": 3
     }
   },
@@ -641,11 +641,11 @@
     "defaultMessage": "!!!Enable Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 215,
+      "line": 216,
       "column": 15
     },
     "end": {
-      "line": 218,
+      "line": 219,
       "column": 3
     }
   },
@@ -654,11 +654,11 @@
     "defaultMessage": "!!!Home",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 219,
+      "line": 220,
       "column": 17
     },
     "end": {
-      "line": 222,
+      "line": 223,
       "column": 3
     }
   }
diff --git a/src/index.js b/src/index.js
index 63e6e3d0f..7c52fa1b3 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,12 +1,6 @@
 /* eslint-disable import/first */
 
-import {
-  app,
-  BrowserWindow,
-  shell,
-  ipcMain,
-  session,
-} from 'electron';
+import { app, BrowserWindow, shell, ipcMain, session } from 'electron';
 
 import fs from 'fs-extra';
 import path from 'path';
@@ -34,7 +28,7 @@ import DBus from './lib/DBus';
 import Settings from './electron/Settings';
 import handleDeepLink from './electron/deepLinking';
 import { isPositionValid } from './electron/windowUtils';
-import { appId } from './package.json'; // eslint-disable-line import/no-unresolved
+import { appId } from '../package.json';
 import './electron/exception';
 
 import { asarPath } from './helpers/asar-helpers';
@@ -90,7 +84,9 @@ if (settings.get('sentry')) {
 const liftSingleInstanceLock = settings.get('liftSingleInstanceLock') || false;
 
 // Force single window
-const gotTheLock = liftSingleInstanceLock ? true : app.requestSingleInstanceLock();
+const gotTheLock = liftSingleInstanceLock
+  ? true
+  : app.requestSingleInstanceLock();
 if (!gotTheLock) {
   app.quit();
 } else {
@@ -106,7 +102,7 @@ if (!gotTheLock) {
       mainWindow.focus();
 
       if (isWindows) {
-        onDidLoad((window) => {
+        onDidLoad(window => {
           // Keep only command line / deep linked arguments
           const url = argv.slice(1);
           if (url) {
@@ -117,8 +113,14 @@ if (!gotTheLock) {
             // Needs to be delayed to not interfere with mainWindow.restore();
             setTimeout(() => {
               debug('Resetting windows via Task');
-              window.setPosition(DEFAULT_WINDOW_OPTIONS.x + 100, DEFAULT_WINDOW_OPTIONS.y + 100);
-              window.setSize(DEFAULT_WINDOW_OPTIONS.width, DEFAULT_WINDOW_OPTIONS.height);
+              window.setPosition(
+                DEFAULT_WINDOW_OPTIONS.x + 100,
+                DEFAULT_WINDOW_OPTIONS.y + 100,
+              );
+              window.setSize(
+                DEFAULT_WINDOW_OPTIONS.width,
+                DEFAULT_WINDOW_OPTIONS.height,
+              );
             }, 1);
           } else if (argv.includes('--quit')) {
             // Needs to be delayed to not interfere with mainWindow.restore();
@@ -135,7 +137,10 @@ if (!gotTheLock) {
 
 // Fix Unity indicator issue
 // https://github.com/electron/electron/issues/9046
-if (isLinux && ['Pantheon', 'Unity:Unity7'].indexOf(process.env.XDG_CURRENT_DESKTOP) !== -1) {
+if (
+  isLinux &&
+  ['Pantheon', 'Unity:Unity7'].indexOf(process.env.XDG_CURRENT_DESKTOP) !== -1
+) {
   process.env.XDG_CURRENT_DESKTOP = 'Unity';
 }
 
@@ -169,7 +174,9 @@ const createWindow = () => {
   }
 
   // Create the browser window.
-  const backgroundColor = settings.get('darkMode') ? '#1E1E1E' : settings.get('accentColor');
+  const backgroundColor = settings.get('darkMode')
+    ? '#1E1E1E'
+    : settings.get('accentColor');
 
   mainWindow = new BrowserWindow({
     x: posX,
@@ -193,7 +200,7 @@ const createWindow = () => {
 
   app.on('web-contents-created', (e, contents) => {
     if (contents.getType() === 'webview') {
-      contents.on('new-window', (event) => {
+      contents.on('new-window', event => {
         event.preventDefault();
       });
     }
@@ -242,7 +249,7 @@ const createWindow = () => {
 
   // Windows deep linking handling on app launch
   if (isWindows) {
-    onDidLoad((window) => {
+    onDidLoad(window => {
       const url = process.argv.slice(1);
       if (url) {
         handleDeepLink(window, url.toString());
@@ -251,12 +258,16 @@ const createWindow = () => {
   }
 
   // Emitted when the window is closed.
-  mainWindow.on('close', (e) => {
+  mainWindow.on('close', e => {
     debug('Window: close window');
     // Dereference the window object, usually you would store windows
     // in an array if your app supports multi windows, this is the time
     // when you should delete the corresponding element.
-    if (!willQuitApp && (settings.get('runInBackground') === undefined || settings.get('runInBackground'))) {
+    if (
+      !willQuitApp &&
+      (settings.get('runInBackground') === undefined ||
+        settings.get('runInBackground'))
+    ) {
       e.preventDefault();
       if (isWindows) {
         debug('Window: minimize');
@@ -315,7 +326,7 @@ const createWindow = () => {
 
   if (isMac) {
     // eslint-disable-next-line global-require
-    const { default: askFormacOSPermissions } = require('./electron/macOSPermissions');
+    const { askFormacOSPermissions } = require('./electron/macOSPermissions');
     setTimeout(() => askFormacOSPermissions(mainWindow), ms('30s'));
   }
 
@@ -351,15 +362,24 @@ const createWindow = () => {
 const argv = require('minimist')(process.argv.slice(1));
 
 if (argv['auth-server-whitelist']) {
-  app.commandLine.appendSwitch('auth-server-whitelist', argv['auth-server-whitelist']);
+  app.commandLine.appendSwitch(
+    'auth-server-whitelist',
+    argv['auth-server-whitelist'],
+  );
 }
 if (argv['auth-negotiate-delegate-whitelist']) {
-  app.commandLine.appendSwitch('auth-negotiate-delegate-whitelist', argv['auth-negotiate-delegate-whitelist']);
+  app.commandLine.appendSwitch(
+    'auth-negotiate-delegate-whitelist',
+    argv['auth-negotiate-delegate-whitelist'],
+  );
 }
 
 // Disable Chromium's poor MPRIS implementation
 // and apply workaround for https://github.com/electron/electron/pull/26432
-app.commandLine.appendSwitch('disable-features', 'HardwareMediaKeyHandling,MediaSessionService,CrossOriginOpenerPolicy');
+app.commandLine.appendSwitch(
+  'disable-features',
+  'HardwareMediaKeyHandling,MediaSessionService,CrossOriginOpenerPolicy',
+);
 
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
@@ -376,19 +396,29 @@ app.on('ready', () => {
   }
 
   if (isWindows) {
-    app.setUserTasks([{
-      program: process.execPath,
-      arguments: `${isDevMode ? `${__dirname} ` : ''}--reset-window`,
-      iconPath: asarPath(path.join(isDevMode ? `${__dirname}../src/` : __dirname, 'assets/images/taskbar/win32/display.ico')),
-      iconIndex: 0,
-      title: 'Move Ferdi to Current Display',
-      description: 'Restore the position and size of Ferdi',
-    }, {
-      program: process.execPath,
-      arguments: `${isDevMode ? `${__dirname} ` : ''}--quit`,
-      iconIndex: 0,
-      title: 'Quit Ferdi',
-    }]);
+    app.setUserTasks([
+      {
+        program: process.execPath,
+        arguments: `${isDevMode ? `${__dirname} ` : ''}--reset-window`,
+        iconPath: asarPath(
+          path.join(
+            isDevMode ? `${__dirname}../src/` : __dirname,
+            'assets/images/taskbar/win32/display.ico',
+          ),
+        ),
+        iconIndex: 0,
+        title: 'Move Ferdi to Current Display',
+        description: 'Restore the position and size of Ferdi',
+      },
+      {
+        program: process.execPath,
+        arguments: `${isDevMode ? `${__dirname} ` : ''}--quit`,
+        iconIndex: 0,
+        iconPath: null,
+        title: 'Quit Ferdi',
+        description: null,
+      },
+    ]);
   }
 
   createWindow();
@@ -420,27 +450,35 @@ ipcMain.on('feature-basic-auth-credentials', (e, { user, password }) => {
 
 ipcMain.on('open-browser-window', (e, { url, serviceId }) => {
   const serviceSession = session.fromPartition(`persist:service-${serviceId}`);
-  const child = new BrowserWindow({ parent: mainWindow, webPreferences: { session: serviceSession } });
+  const child = new BrowserWindow({
+    parent: mainWindow,
+    webPreferences: { session: serviceSession },
+  });
   child.show();
   child.loadURL(url);
   debug('Received open-browser-window', url);
 });
 
-ipcMain.on('modifyRequestHeaders', (e, { modifiedRequestHeaders, serviceId }) => {
-  debug('Received modifyRequestHeaders', modifiedRequestHeaders, serviceId);
-  modifiedRequestHeaders.forEach((headerFilterSet) => {
-    const { headers, requestFilters } = headerFilterSet;
-    session.fromPartition(`persist:service-${serviceId}`).webRequest.onBeforeSendHeaders(requestFilters, (details, callback) => {
-      for (const key in headers) {
-        if (Object.prototype.hasOwnProperty.call(headers, key)) {
-          const value = headers[key];
-          details.requestHeaders[key] = value;
-        }
-      }
-      callback({ requestHeaders: details.requestHeaders });
+ipcMain.on(
+  'modifyRequestHeaders',
+  (e, { modifiedRequestHeaders, serviceId }) => {
+    debug('Received modifyRequestHeaders', modifiedRequestHeaders, serviceId);
+    modifiedRequestHeaders.forEach(headerFilterSet => {
+      const { headers, requestFilters } = headerFilterSet;
+      session
+        .fromPartition(`persist:service-${serviceId}`)
+        .webRequest.onBeforeSendHeaders(requestFilters, (details, callback) => {
+          for (const key in headers) {
+            if (Object.prototype.hasOwnProperty.call(headers, key)) {
+              const value = headers[key];
+              details.requestHeaders[key] = value;
+            }
+          }
+          callback({ requestHeaders: details.requestHeaders });
+        });
     });
-  });
-});
+  },
+);
 
 ipcMain.on('feature-basic-auth-cancel', () => {
   debug('Cancel basic auth');
@@ -453,7 +491,7 @@ ipcMain.on('feature-basic-auth-cancel', () => {
 
 ipcMain.on('find-in-page', (e, text, options) => {
   const { sender: webContents } = e;
-  if (webContents !== mainWindow.webContents && typeof (text) === 'string') {
+  if (webContents !== mainWindow.webContents && typeof text === 'string') {
     const sanitizedOptions = {};
     for (const option of ['forward', 'findNext', 'matchCase']) {
       if (option in options) {
@@ -471,7 +509,11 @@ ipcMain.on('find-in-page', (e, text, options) => {
 ipcMain.on('stop-find-in-page', (e, action) => {
   const { sender: webContents } = e;
   if (webContents !== mainWindow.webContents) {
-    const validActions = ['clearSelection', 'keepSelection', 'activateSelection'];
+    const validActions = [
+      'clearSelection',
+      'keepSelection',
+      'activateSelection',
+    ];
     if (validActions.includes(action)) {
       webContents.stopFindInPage(action);
     }
@@ -483,12 +525,14 @@ ipcMain.on('stop-find-in-page', (e, action) => {
 app.on('window-all-closed', () => {
   // On OS X it is common for applications and their menu bar
   // to stay active until the user quits explicitly with Cmd + Q
-  if (settings.get('runInBackground') === undefined
-    || settings.get('runInBackground')) {
+  if (
+    settings.get('runInBackground') === undefined ||
+    settings.get('runInBackground')
+  ) {
     debug('Window: all windows closed, quit app');
     app.quit();
   } else {
-    debug('Window: don\'t quit app');
+    debug("Window: don't quit app");
   }
 });
 
@@ -517,7 +561,7 @@ app.on('will-finish-launching', () => {
   app.on('open-url', (event, url) => {
     event.preventDefault();
 
-    onDidLoad((window) => {
+    onDidLoad(window => {
       debug('open-url event', url);
       handleDeepLink(window, url);
     });
diff --git a/src/internal-server/app/Controllers/Http/ServiceController.js b/src/internal-server/app/Controllers/Http/ServiceController.js
index 36d20c70c..c30e9e040 100644
--- a/src/internal-server/app/Controllers/Http/ServiceController.js
+++ b/src/internal-server/app/Controllers/Http/ServiceController.js
@@ -1,7 +1,5 @@
 const Service = use('App/Models/Service');
-const {
-  validateAll,
-} = use('Validator');
+const { validateAll } = use('Validator');
 const Env = use('Env');
 
 const uuid = require('uuid/v4');
@@ -10,10 +8,7 @@ const fs = require('fs-extra');
 
 class ServiceController {
   // Create a new service for user
-  async create({
-    request,
-    response,
-  }) {
+  async create({ request, response }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       name: 'required|string',
@@ -33,7 +28,10 @@ class ServiceController {
     let serviceId;
     do {
       serviceId = uuid();
-    } while ((await Service.query().where('serviceId', serviceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
+    } while (
+      (await Service.query().where('serviceId', serviceId).fetch()).rows
+        .length > 0
+    ); // eslint-disable-line no-await-in-loop
 
     await Service.create({
       serviceId,
@@ -64,13 +62,14 @@ class ServiceController {
   }
 
   // List all services a user has created
-  async list({
-    response,
-  }) {
+  async list({ response }) {
     const services = (await Service.all()).rows;
     // Convert to array with all data Franz wants
-    const servicesArray = services.map((service) => {
-      const settings = typeof service.settings === 'string' ? JSON.parse(service.settings) : service.settings;
+    const servicesArray = services.map(service => {
+      const settings =
+        typeof service.settings === 'string'
+          ? JSON.parse(service.settings)
+          : service.settings;
 
       return {
         customRecipe: false,
@@ -84,7 +83,9 @@ class ServiceController {
         spellcheckerLanguage: '',
         workspaces: [],
         ...JSON.parse(service.settings),
-        iconUrl: settings.iconId ? `http://127.0.0.1:${Env.get('PORT')}/v1/icon/${settings.iconId}` : null,
+        iconUrl: settings.iconId
+          ? `http://127.0.0.1:${Env.get('PORT')}/v1/icon/${settings.iconId}`
+          : null,
         id: service.serviceId,
         name: service.name,
         recipeId: service.recipeId,
@@ -95,11 +96,7 @@ class ServiceController {
     return response.send(servicesArray);
   }
 
-  async edit({
-    request,
-    response,
-    params,
-  }) {
+  async edit({ request, response, params }) {
     if (request.file('icon')) {
       // Upload custom service icon
       await fs.ensureDir(path.join(Env.get('USER_PATH'), 'icons'));
@@ -108,19 +105,19 @@ class ServiceController {
         types: ['image'],
         size: '2mb',
       });
-      const {
-        id,
-      } = params;
-      const service = (await Service.query()
-        .where('serviceId', id).fetch()).rows[0];
-      const settings = typeof service.settings === 'string' ? JSON.parse(service.settings) : service.settings;
+      const { id } = params;
+      const service = (await Service.query().where('serviceId', id).fetch())
+        .rows[0];
+      const settings =
+        typeof service.settings === 'string'
+          ? JSON.parse(service.settings)
+          : service.settings;
 
       // Generate new icon ID
       let iconId;
       do {
         iconId = uuid() + uuid();
-      // eslint-disable-next-line no-await-in-loop
-      } while (await fs.exists(path.join(Env.get('USER_PATH'), 'icons', iconId)));
+      } while (fs.existsSync(path.join(Env.get('USER_PATH'), 'icons', iconId)));
 
       await icon.move(path.join(Env.get('USER_PATH'), 'icons'), {
         name: iconId,
@@ -135,23 +132,29 @@ class ServiceController {
         ...settings,
         ...{
           iconId,
-          customIconVersion: settings && settings.customIconVersion ? settings.customIconVersion + 1 : 1,
+          customIconVersion:
+            settings && settings.customIconVersion
+              ? settings.customIconVersion + 1
+              : 1,
         },
       };
 
       // Update data in database
-      await (Service.query()
-        .where('serviceId', id)).update({
-        name: service.name,
-        settings: JSON.stringify(newSettings),
-      });
+      await Service.query()
+        .where('serviceId', id)
+        .update({
+          name: service.name,
+          settings: JSON.stringify(newSettings),
+        });
 
       return response.send({
         data: {
           id,
           name: service.name,
           ...newSettings,
-          iconUrl: `http://127.0.0.1:${Env.get('PORT')}/v1/icon/${newSettings.iconId}`,
+          iconUrl: `http://127.0.0.1:${Env.get('PORT')}/v1/icon/${
+            newSettings.iconId
+          }`,
           userId: 1,
         },
         status: ['updated'],
@@ -159,29 +162,30 @@ class ServiceController {
     }
     // Update service info
     const data = request.all();
-    const {
-      id,
-    } = params;
+    const { id } = params;
 
     // Get current settings from db
-    const serviceData = (await Service.query()
-      .where('serviceId', id).fetch()).rows[0];
+    const serviceData = (await Service.query().where('serviceId', id).fetch())
+      .rows[0];
 
     const settings = {
-      ...typeof serviceData.settings === 'string' ? JSON.parse(serviceData.settings) : serviceData.settings,
+      ...(typeof serviceData.settings === 'string'
+        ? JSON.parse(serviceData.settings)
+        : serviceData.settings),
       ...data,
     };
 
     // Update data in database
-    await (Service.query()
-      .where('serviceId', id)).update({
-      name: data.name,
-      settings: JSON.stringify(settings),
-    });
+    await Service.query()
+      .where('serviceId', id)
+      .update({
+        name: data.name,
+        settings: JSON.stringify(settings),
+      });
 
     // Get updated row
-    const service = (await Service.query()
-      .where('serviceId', id).fetch()).rows[0];
+    const service = (await Service.query().where('serviceId', id).fetch())
+      .rows[0];
 
     return response.send({
       data: {
@@ -195,34 +199,29 @@ class ServiceController {
     });
   }
 
-  async icon({
-    params,
-    response,
-  }) {
-    const {
-      id,
-    } = params;
+  async icon({ params, response }) {
+    const { id } = params;
 
     const iconPath = path.join(Env.get('USER_PATH'), 'icons', id);
-    if (!await fs.exists(iconPath)) {
+    if (!fs.existsSync(iconPath)) {
       return response.status(404).send({
-        status: 'Icon doesn\'t exist',
+        status: "Icon doesn't exist",
       });
     }
 
     return response.download(iconPath);
   }
 
-  async reorder({
-    request,
-    response,
-  }) {
+  async reorder({ request, response }) {
     const data = request.all();
 
     for (const service of Object.keys(data)) {
       // Get current settings from db
-      const serviceData = (await Service.query() // eslint-disable-line no-await-in-loop
-        .where('serviceId', service).fetch()).rows[0];
+      const serviceData = (
+        await Service.query() // eslint-disable-line no-await-in-loop
+          .where('serviceId', service)
+          .fetch()
+      ).rows[0];
 
       const settings = {
         ...JSON.parse(serviceData.settings),
@@ -230,8 +229,8 @@ class ServiceController {
       };
 
       // Update data in database
-      await (Service.query() // eslint-disable-line no-await-in-loop
-        .where('serviceId', service))
+      await Service.query() // eslint-disable-line no-await-in-loop
+        .where('serviceId', service)
         .update({
           settings: JSON.stringify(settings),
         });
@@ -240,8 +239,11 @@ class ServiceController {
     // Get new services
     const services = (await Service.all()).rows;
     // Convert to array with all data Franz wants
-    const servicesArray = services.map((service) => {
-      const settings = typeof service.settings === 'string' ? JSON.parse(service.settings) : service.settings;
+    const servicesArray = services.map(service => {
+      const settings =
+        typeof service.settings === 'string'
+          ? JSON.parse(service.settings)
+          : service.settings;
 
       return {
         customRecipe: false,
@@ -255,7 +257,9 @@ class ServiceController {
         spellcheckerLanguage: '',
         workspaces: [],
         ...JSON.parse(service.settings),
-        iconUrl: settings.iconId ? `http://127.0.0.1:${Env.get('PORT')}/v1/icon/${settings.iconId}` : null,
+        iconUrl: settings.iconId
+          ? `http://127.0.0.1:${Env.get('PORT')}/v1/icon/${settings.iconId}`
+          : null,
         id: service.serviceId,
         name: service.name,
         recipeId: service.recipeId,
@@ -266,19 +270,13 @@ class ServiceController {
     return response.send(servicesArray);
   }
 
-  update({
-    response,
-  }) {
+  update({ response }) {
     return response.send([]);
   }
 
-  async delete({
-    params,
-    response,
-  }) {
+  async delete({ params, response }) {
     // Update data in database
-    await (Service.query()
-      .where('serviceId', params.id)).delete();
+    await Service.query().where('serviceId', params.id).delete();
 
     return response.send({
       message: 'Sucessfully deleted service',
diff --git a/src/internal-server/app/Exceptions/Handler.js b/src/internal-server/app/Exceptions/Handler.js
index 111ef4e0e..ab323fd38 100644
--- a/src/internal-server/app/Exceptions/Handler.js
+++ b/src/internal-server/app/Exceptions/Handler.js
@@ -13,10 +13,9 @@ class ExceptionHandler extends BaseExceptionHandler {
    * @method handle
    *
    * @param  {Object} error
-   * @param  {Object} options.request
-   * @param  {Object} options.response
+   * @param  {object} options.response
    *
-   * @return {void}
+   * @return {Promise<void>}
    */
   async handle(error, { response }) {
     if (error.name === 'ValidationException') {
@@ -31,10 +30,7 @@ class ExceptionHandler extends BaseExceptionHandler {
    *
    * @method report
    *
-   * @param  {Object} error
-   * @param  {Object} options.request
-   *
-   * @return {void}
+   * @return {Promise<boolean>}
    */
   async report() {
     return true;
diff --git a/src/internal-server/public/js/transfer.js b/src/internal-server/public/js/transfer.js
index c04a6d3b1..8382bba02 100644
--- a/src/internal-server/public/js/transfer.js
+++ b/src/internal-server/public/js/transfer.js
@@ -1,11 +1,10 @@
-/* eslint-env browser */
 const submitBtn = document.getElementById('submit');
 const fileInput = document.getElementById('file');
 const fileOutput = document.getElementById('fileoutput');
 
 fileInput.addEventListener('change', () => {
   const reader = new FileReader();
-  reader.onload = function () {
+  reader.onload = () => {
     const text = reader.result;
     fileOutput.value = text;
     submitBtn.disabled = false;
diff --git a/src/internal-server/start.js b/src/internal-server/start.js
index adcac0bec..683f24651 100644
--- a/src/internal-server/start.js
+++ b/src/internal-server/start.js
@@ -14,22 +14,22 @@
 |     Also you can preload files by calling `preLoad('path/to/file')` method.
 |     Make sure to pass a relative path from the project root.
 */
-process.env.FERDI_VERSION = '5.4.0-beta.5';
 
-const path = require('path');
+const fold = require('@adonisjs/fold');
+const { Ignitor } = require('@adonisjs/ignitor');
 const fs = require('fs-extra');
 const os = require('os');
+const path = require('path');
+const packageJSON = require('../../package.json');
 
+process.env.FERDI_VERSION = packageJSON.version;
 process.env.ENV_PATH = path.join(__dirname, 'env.ini');
 
-const { Ignitor } = require('@adonisjs/ignitor');
-const fold = require('@adonisjs/fold');
-
 module.exports = async (userPath, port) => {
   const dbPath = path.join(userPath, 'server.sqlite');
   const dbTemplatePath = path.join(__dirname, 'database', 'template.sqlite');
 
-  if (!await fs.exists(dbPath)) {
+  if (!fs.existsSync(dbPath)) {
     // Manually copy file
     // We can't use copyFile here as it will cause the file to be readonly on Windows
     const dbTemplate = await fs.readFile(dbTemplatePath);
@@ -46,8 +46,5 @@ module.exports = async (userPath, port) => {
   process.env.USER_PATH = userPath;
   process.env.PORT = port;
 
-  new Ignitor(fold)
-    .appRoot(__dirname)
-    .fireHttpServer()
-    .catch(console.error); // eslint-disable-line no-console
+  new Ignitor(fold).appRoot(__dirname).fireHttpServer().catch(console.error); // eslint-disable-line no-console
 };
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index fefcb5080..829797930 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -1,10 +1,5 @@
 import { shell } from 'electron';
-import {
-  action,
-  reaction,
-  computed,
-  observable,
-} from 'mobx';
+import { action, reaction, computed, observable } from 'mobx';
 import { debounce, remove } from 'lodash';
 import ms from 'ms';
 import { app } from '@electron/remote';
@@ -16,7 +11,10 @@ import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { matchRoute } from '../helpers/routing-helpers';
 import { isInTimeframe } from '../helpers/schedule-helpers';
-import { getRecipeDirectory, getDevRecipeDirectory } from '../helpers/recipe-helpers';
+import {
+  getRecipeDirectory,
+  getDevRecipeDirectory,
+} from '../helpers/recipe-helpers';
 import { workspaceStore } from '../features/workspaces';
 import { KEEP_WS_LOADED_USID } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
@@ -30,7 +28,10 @@ export default class ServicesStore extends Store {
 
   @observable updateServiceRequest = new Request(this.api.services, 'update');
 
-  @observable reorderServicesRequest = new Request(this.api.services, 'reorder');
+  @observable reorderServicesRequest = new Request(
+    this.api.services,
+    'reorder',
+  );
 
   @observable deleteServiceRequest = new Request(this.api.services, 'delete');
 
@@ -51,22 +52,36 @@ export default class ServicesStore extends Store {
     this.actions.service.blurActive.listen(this._blurActive.bind(this));
     this.actions.service.setActiveNext.listen(this._setActiveNext.bind(this));
     this.actions.service.setActivePrev.listen(this._setActivePrev.bind(this));
-    this.actions.service.showAddServiceInterface.listen(this._showAddServiceInterface.bind(this));
+    this.actions.service.showAddServiceInterface.listen(
+      this._showAddServiceInterface.bind(this),
+    );
     this.actions.service.createService.listen(this._createService.bind(this));
-    this.actions.service.createFromLegacyService.listen(this._createFromLegacyService.bind(this));
+    this.actions.service.createFromLegacyService.listen(
+      this._createFromLegacyService.bind(this),
+    );
     this.actions.service.updateService.listen(this._updateService.bind(this));
     this.actions.service.deleteService.listen(this._deleteService.bind(this));
     this.actions.service.openRecipeFile.listen(this._openRecipeFile.bind(this));
     this.actions.service.clearCache.listen(this._clearCache.bind(this));
-    this.actions.service.setWebviewReference.listen(this._setWebviewReference.bind(this));
+    this.actions.service.setWebviewReference.listen(
+      this._setWebviewReference.bind(this),
+    );
     this.actions.service.detachService.listen(this._detachService.bind(this));
     this.actions.service.focusService.listen(this._focusService.bind(this));
-    this.actions.service.focusActiveService.listen(this._focusActiveService.bind(this));
+    this.actions.service.focusActiveService.listen(
+      this._focusActiveService.bind(this),
+    );
     this.actions.service.toggleService.listen(this._toggleService.bind(this));
-    this.actions.service.handleIPCMessage.listen(this._handleIPCMessage.bind(this));
+    this.actions.service.handleIPCMessage.listen(
+      this._handleIPCMessage.bind(this),
+    );
     this.actions.service.sendIPCMessage.listen(this._sendIPCMessage.bind(this));
-    this.actions.service.sendIPCMessageToAllServices.listen(this._sendIPCMessageToAllServices.bind(this));
-    this.actions.service.setUnreadMessageCount.listen(this._setUnreadMessageCount.bind(this));
+    this.actions.service.sendIPCMessageToAllServices.listen(
+      this._sendIPCMessageToAllServices.bind(this),
+    );
+    this.actions.service.setUnreadMessageCount.listen(
+      this._setUnreadMessageCount.bind(this),
+    );
     this.actions.service.openWindow.listen(this._openWindow.bind(this));
     this.actions.service.filter.listen(this._filter.bind(this));
     this.actions.service.resetFilter.listen(this._resetFilter.bind(this));
@@ -74,16 +89,26 @@ export default class ServicesStore extends Store {
     this.actions.service.reload.listen(this._reload.bind(this));
     this.actions.service.reloadActive.listen(this._reloadActive.bind(this));
     this.actions.service.reloadAll.listen(this._reloadAll.bind(this));
-    this.actions.service.reloadUpdatedServices.listen(this._reloadUpdatedServices.bind(this));
+    this.actions.service.reloadUpdatedServices.listen(
+      this._reloadUpdatedServices.bind(this),
+    );
     this.actions.service.reorder.listen(this._reorder.bind(this));
-    this.actions.service.toggleNotifications.listen(this._toggleNotifications.bind(this));
+    this.actions.service.toggleNotifications.listen(
+      this._toggleNotifications.bind(this),
+    );
     this.actions.service.toggleAudio.listen(this._toggleAudio.bind(this));
     this.actions.service.openDevTools.listen(this._openDevTools.bind(this));
-    this.actions.service.openDevToolsForActiveService.listen(this._openDevToolsForActiveService.bind(this));
+    this.actions.service.openDevToolsForActiveService.listen(
+      this._openDevToolsForActiveService.bind(this),
+    );
     this.actions.service.hibernate.listen(this._hibernate.bind(this));
     this.actions.service.awake.listen(this._awake.bind(this));
-    this.actions.service.resetLastPollTimer.listen(this._resetLastPollTimer.bind(this));
-    this.actions.service.shareSettingsWithServiceProcess.listen(this._shareSettingsWithServiceProcess.bind(this));
+    this.actions.service.resetLastPollTimer.listen(
+      this._resetLastPollTimer.bind(this),
+    );
+    this.actions.service.shareSettingsWithServiceProcess.listen(
+      this._shareSettingsWithServiceProcess.bind(this),
+    );
 
     this.registerReactions([
       this._focusServiceReaction.bind(this),
@@ -164,27 +189,42 @@ export default class ServicesStore extends Store {
    * Run various maintenance tasks on services
    */
   _serviceMaintenance() {
-    this.all.forEach((service) => {
+    this.all.forEach(service => {
       // Defines which services should be hibernated or woken up
       if (!service.isActive) {
-        if (!service.lastHibernated && (Date.now() - service.lastUsed > ms(`${this.stores.settings.all.app.hibernationStrategy}s`))) {
+        if (
+          !service.lastHibernated &&
+          Date.now() - service.lastUsed >
+            ms(`${this.stores.settings.all.app.hibernationStrategy}s`)
+        ) {
           // If service is stale, hibernate it.
           this._hibernate({ serviceId: service.id });
         }
 
-        if (service.lastHibernated && Number(this.stores.settings.all.app.wakeUpStrategy) > 0) {
+        if (
+          service.lastHibernated &&
+          Number(this.stores.settings.all.app.wakeUpStrategy) > 0
+        ) {
           // If service is in hibernation and the wakeup time has elapsed, wake it.
-          if ((Date.now() - service.lastHibernated > ms(`${this.stores.settings.all.app.wakeUpStrategy}s`))) {
+          if (
+            Date.now() - service.lastHibernated >
+            ms(`${this.stores.settings.all.app.wakeUpStrategy}s`)
+          ) {
             this._awake({ serviceId: service.id });
           }
         }
       }
 
-      if (service.lastPoll && (service.lastPoll - service.lastPollAnswer > ms('1m'))) {
+      if (
+        service.lastPoll &&
+        service.lastPoll - service.lastPollAnswer > ms('1m')
+      ) {
         // If service did not reply for more than 1m try to reload.
         if (!service.isActive) {
           if (this.stores.app.isOnline && service.lostRecipeReloadAttempt < 3) {
-            debug(`Reloading service: ${service.name} (${service.id}). Attempt: ${service.lostRecipeReloadAttempt}`);
+            debug(
+              `Reloading service: ${service.name} (${service.id}). Attempt: ${service.lostRecipeReloadAttempt}`,
+            );
             // service.webview.reload();
             service.lostRecipeReloadAttempt += 1;
 
@@ -206,21 +246,29 @@ export default class ServicesStore extends Store {
     if (this.stores.user.isLoggedIn) {
       const services = this.allServicesRequest.execute().result;
       if (services) {
-        return observable(services.slice().slice().sort((a, b) => a.order - b.order).map((s, index) => {
-          s.index = index;
-          return s;
-        }));
+        return observable(
+          services
+            .slice()
+            .slice()
+            .sort((a, b) => a.order - b.order)
+            .map((s, index) => {
+              s.index = index;
+              return s;
+            }),
+        );
       }
     }
     return [];
   }
 
   @computed get enabled() {
-    return this.all.filter((service) => service.isEnabled);
+    return this.all.filter(service => service.isEnabled);
   }
 
   @computed get allDisplayed() {
-    const services = this.stores.settings.all.app.showDisabledServices ? this.all : this.enabled;
+    const services = this.stores.settings.all.app.showDisabledServices
+      ? this.all
+      : this.enabled;
     return workspaceStore.filterServicesByActiveWorkspace(services);
   }
 
@@ -229,7 +277,9 @@ export default class ServicesStore extends Store {
     const { showDisabledServices } = this.stores.settings.all.app;
     const { keepAllWorkspacesLoaded } = this.stores.workspaces.settings;
     const services = this.allServicesRequest.execute().result || [];
-    const filteredServices = showDisabledServices ? services : services.filter((service) => service.isEnabled);
+    const filteredServices = showDisabledServices
+      ? services
+      : services.filter(service => service.isEnabled);
 
     let displayedServices;
     if (keepAllWorkspacesLoaded) {
@@ -237,40 +287,49 @@ export default class ServicesStore extends Store {
       displayedServices = filteredServices;
     } else {
       // Keep all services in current workspace loaded
-      displayedServices = workspaceStore.filterServicesByActiveWorkspace(filteredServices);
+      displayedServices =
+        workspaceStore.filterServicesByActiveWorkspace(filteredServices);
 
       // Keep all services active in workspaces that should be kept loaded
       for (const workspace of this.stores.workspaces.workspaces) {
         // Check if workspace needs to be kept loaded
         if (workspace.services.includes(KEEP_WS_LOADED_USID)) {
           // Get services for workspace
-          const serviceIDs = workspace.services.filter((i) => i !== KEEP_WS_LOADED_USID);
-          const wsServices = filteredServices.filter((service) => serviceIDs.includes(service.id));
-
-          displayedServices = [
-            ...displayedServices,
-            ...wsServices,
-          ];
+          const serviceIDs = workspace.services.filter(
+            i => i !== KEEP_WS_LOADED_USID,
+          );
+          const wsServices = filteredServices.filter(service =>
+            serviceIDs.includes(service.id),
+          );
+
+          displayedServices = [...displayedServices, ...wsServices];
         }
       }
 
       // Make sure every service is in the list only once
-      displayedServices = displayedServices.filter((v, i, a) => a.indexOf(v) === i);
+      displayedServices = displayedServices.filter(
+        (v, i, a) => a.indexOf(v) === i,
+      );
     }
 
     return displayedServices;
   }
 
   @computed get filtered() {
-    return this.all.filter((service) => service.name.toLowerCase().includes(this.filterNeedle.toLowerCase()));
+    return this.all.filter(service =>
+      service.name.toLowerCase().includes(this.filterNeedle.toLowerCase()),
+    );
   }
 
   @computed get active() {
-    return this.all.find((service) => service.isActive);
+    return this.all.find(service => service.isActive);
   }
 
   @computed get activeSettings() {
-    const match = matchRoute('/settings/services/edit/:id', this.stores.router.location.pathname);
+    const match = matchRoute(
+      '/settings/services/edit/:id',
+      this.stores.router.location.pathname,
+    );
     if (match) {
       const activeService = this.one(match.id);
       if (activeService) {
@@ -284,7 +343,11 @@ export default class ServicesStore extends Store {
   }
 
   @computed get isTodosServiceAdded() {
-    return this.allDisplayed.find((service) => service.isTodosService && service.isEnabled) || false;
+    return (
+      this.allDisplayed.find(
+        service => service.isTodosService && service.isEnabled,
+      ) || false
+    );
   }
 
   @computed get isTodosServiceActive() {
@@ -292,7 +355,7 @@ export default class ServicesStore extends Store {
   }
 
   one(id) {
-    return this.all.find((service) => service.id === id);
+    return this.all.find(service => service.id === id);
   }
 
   async _showAddServiceInterface({ recipeId }) {
@@ -301,7 +364,10 @@ export default class ServicesStore extends Store {
 
   // Actions
   async _createService({
-    recipeId, serviceData, redirect = true, skipCleanup = false,
+    recipeId,
+    serviceData,
+    redirect = true,
+    skipCleanup = false,
   }) {
     if (!this.stores.recipes.isInstalled(recipeId)) {
       debug(`Recipe "${recipeId}" is not installed, installing recipe`);
@@ -311,17 +377,21 @@ export default class ServicesStore extends Store {
 
     // set default values for serviceData
     // eslint-disable-next-line prefer-object-spread
-    Object.assign({
-      isEnabled: true,
-      isHibernationEnabled: false,
-      isNotificationEnabled: true,
-      isBadgeEnabled: true,
-      isMuted: false,
-      customIcon: false,
-      isDarkModeEnabled: false,
-      spellcheckerLanguage: SPELLCHECKER_LOCALES[this.stores.settings.app.spellcheckerLanguage],
-      userAgentPref: '',
-    }, serviceData);
+    Object.assign(
+      {
+        isEnabled: true,
+        isHibernationEnabled: false,
+        isNotificationEnabled: true,
+        isBadgeEnabled: true,
+        isMuted: false,
+        customIcon: false,
+        isDarkModeEnabled: false,
+        spellcheckerLanguage:
+          SPELLCHECKER_LOCALES[this.stores.settings.app.spellcheckerLanguage],
+        userAgentPref: '',
+      },
+      serviceData,
+    );
 
     let data = serviceData;
 
@@ -329,9 +399,10 @@ export default class ServicesStore extends Store {
       data = this._cleanUpTeamIdAndCustomUrl(recipeId, serviceData);
     }
 
-    const response = await this.createServiceRequest.execute(recipeId, data)._promise;
+    const response = await this.createServiceRequest.execute(recipeId, data)
+      ._promise;
 
-    this.allServicesRequest.patch((result) => {
+    this.allServicesRequest.patch(result => {
       if (!result) return;
       result.push(response.data);
     });
@@ -375,7 +446,10 @@ export default class ServicesStore extends Store {
 
   @action async _updateService({ serviceId, serviceData, redirect = true }) {
     const service = this.one(serviceId);
-    const data = this._cleanUpTeamIdAndCustomUrl(service.recipe.id, serviceData);
+    const data = this._cleanUpTeamIdAndCustomUrl(
+      service.recipe.id,
+      serviceData,
+    );
     const request = this.updateServiceRequest.execute(serviceId, data);
 
     const newData = serviceData;
@@ -386,7 +460,7 @@ export default class ServicesStore extends Store {
       newData.hasCustomUploadedIcon = true;
     }
 
-    this.allServicesRequest.patch((result) => {
+    this.allServicesRequest.patch(result => {
       if (!result) return;
 
       // patch custom icon deletion
@@ -400,7 +474,10 @@ export default class ServicesStore extends Store {
         newData.iconUrl = data.customIconUrl;
       }
 
-      Object.assign(result.find((c) => c.id === serviceId), newData);
+      Object.assign(
+        result.find(c => c.id === serviceId),
+        newData,
+      );
     });
 
     await request._promise;
@@ -433,8 +510,8 @@ export default class ServicesStore extends Store {
       this.stores.router.push(redirect);
     }
 
-    this.allServicesRequest.patch((result) => {
-      remove(result, (c) => c.id === serviceId);
+    this.allServicesRequest.patch(result => {
+      remove(result, c => c.id === serviceId);
     });
 
     await request._promise;
@@ -459,12 +536,15 @@ export default class ServicesStore extends Store {
     // Create and open file
     const filePath = path.join(directory, file);
     if (file === 'user.js') {
-      if (!await fs.exists(filePath)) {
-        await fs.writeFile(filePath, `module.exports = (config, Ferdi) => {
+      if (!fs.existsSync(filePath)) {
+        await fs.writeFile(
+          filePath,
+          `module.exports = (config, Ferdi) => {
   // Write your scripts here
   console.log("Hello, World!", config);
 }
-`);
+`,
+        );
       }
     } else {
       await fs.ensureFile(filePath);
@@ -478,22 +558,27 @@ export default class ServicesStore extends Store {
     await request._promise;
   }
 
-  @action _setActive({ serviceId, keepActiveRoute }) {
+  @action _setActive({ serviceId, keepActiveRoute = null }) {
     if (!keepActiveRoute) this.stores.router.push('/');
     const service = this.one(serviceId);
 
-    this.all.forEach((s) => {
+    this.all.forEach(s => {
       s.isActive = false;
     });
     service.isActive = true;
     this._awake({ serviceId: service.id });
 
-    if (this.isTodosServiceActive && !this.stores.todos.settings.isFeatureEnabledByUser) {
+    if (
+      this.isTodosServiceActive &&
+      !this.stores.todos.settings.isFeatureEnabledByUser
+    ) {
       this.actions.todos.toggleTodosFeatureVisibility();
     }
 
     // Update list of last used services
-    this.lastUsedServices = this.lastUsedServices.filter((id) => id !== serviceId);
+    this.lastUsedServices = this.lastUsedServices.filter(
+      id => id !== serviceId,
+    );
     this.lastUsedServices.unshift(serviceId);
 
     this._focusActiveService();
@@ -505,7 +590,11 @@ export default class ServicesStore extends Store {
   }
 
   @action _setActiveNext() {
-    const nextIndex = this._wrapIndex(this.allDisplayed.findIndex((service) => service.isActive), 1, this.allDisplayed.length);
+    const nextIndex = this._wrapIndex(
+      this.allDisplayed.findIndex(service => service.isActive),
+      1,
+      this.allDisplayed.length,
+    );
 
     // TODO: simplify this;
     this.all.forEach((s, index) => {
@@ -515,7 +604,11 @@ export default class ServicesStore extends Store {
   }
 
   @action _setActivePrev() {
-    const prevIndex = this._wrapIndex(this.allDisplayed.findIndex((service) => service.isActive), -1, this.allDisplayed.length);
+    const prevIndex = this._wrapIndex(
+      this.allDisplayed.findIndex(service => service.isActive),
+      -1,
+      this.allDisplayed.length,
+    );
 
     // TODO: simplify this;
     this.all.forEach((s, index) => {
@@ -606,17 +699,21 @@ export default class ServicesStore extends Store {
       const { options } = args[0];
 
       // Check if we are in scheduled Do-not-Disturb time
-      const {
-        scheduledDNDEnabled,
-        scheduledDNDStart,
-        scheduledDNDEnd,
-      } = this.stores.settings.all.app;
+      const { scheduledDNDEnabled, scheduledDNDStart, scheduledDNDEnd } =
+        this.stores.settings.all.app;
 
-      if (scheduledDNDEnabled && isInTimeframe(scheduledDNDStart, scheduledDNDEnd)) {
+      if (
+        scheduledDNDEnabled &&
+        isInTimeframe(scheduledDNDStart, scheduledDNDEnd)
+      ) {
         return;
       }
 
-      if (service.recipe.hasNotificationSound || service.isMuted || this.stores.settings.all.app.isAppMuted) {
+      if (
+        service.recipe.hasNotificationSound ||
+        service.isMuted ||
+        this.stores.settings.all.app.isAppMuted
+      ) {
         Object.assign(options, {
           silent: true,
         });
@@ -626,7 +723,8 @@ export default class ServicesStore extends Store {
         let title = `Notification from ${service.name}`;
         if (!this.stores.settings.all.app.privateNotifications) {
           options.body = typeof options.body === 'string' ? options.body : '';
-          title = typeof args[0].title === 'string' ? args[0].title : service.name;
+          title =
+            typeof args[0].title === 'string' ? args[0].title : service.name;
         } else {
           // Remove message data from notification in private mode
           options.body = '';
@@ -689,11 +787,13 @@ export default class ServicesStore extends Store {
   }
 
   @action _sendIPCMessageToAllServices({ channel, args }) {
-    this.all.forEach((s) => this.actions.service.sendIPCMessage({
-      serviceId: s.id,
-      channel,
-      args,
-    }));
+    this.all.forEach(s =>
+      this.actions.service.sendIPCMessage({
+        serviceId: s.id,
+        channel,
+        args,
+      }),
+    );
   }
 
   @action _openWindow({ event }) {
@@ -740,9 +840,11 @@ export default class ServicesStore extends Store {
   }
 
   @action _reloadAll() {
-    this.enabled.forEach((s) => this._reload({
-      serviceId: s.id,
-    }));
+    this.enabled.forEach(s =>
+      this._reload({
+        serviceId: s.id,
+      }),
+    );
   }
 
   @action _reloadUpdatedServices() {
@@ -761,10 +863,18 @@ export default class ServicesStore extends Store {
 
   @action _reorderService({ oldIndex, newIndex }) {
     const { showDisabledServices } = this.stores.settings.all.app;
-    const oldEnabledSortIndex = showDisabledServices ? oldIndex : this.all.indexOf(this.enabled[oldIndex]);
-    const newEnabledSortIndex = showDisabledServices ? newIndex : this.all.indexOf(this.enabled[newIndex]);
-
-    this.all.splice(newEnabledSortIndex, 0, this.all.splice(oldEnabledSortIndex, 1)[0]);
+    const oldEnabledSortIndex = showDisabledServices
+      ? oldIndex
+      : this.all.indexOf(this.enabled[oldIndex]);
+    const newEnabledSortIndex = showDisabledServices
+      ? newIndex
+      : this.all.indexOf(this.enabled[newIndex]);
+
+    this.all.splice(
+      newEnabledSortIndex,
+      0,
+      this.all.splice(oldEnabledSortIndex, 1)[0],
+    );
 
     const services = {};
     this.all.forEach((s, index) => {
@@ -772,8 +882,8 @@ export default class ServicesStore extends Store {
     });
 
     this.reorderServicesRequest.execute(services);
-    this.allServicesRequest.patch((data) => {
-      data.forEach((s) => {
+    this.allServicesRequest.patch(data => {
+      data.forEach(s => {
         const service = s;
 
         service.order = services[s.id];
@@ -851,15 +961,19 @@ export default class ServicesStore extends Store {
   }
 
   @action _resetLastPollTimer({ serviceId = null }) {
-    debug(`Reset last poll timer for ${serviceId ? `service: "${serviceId}"` : 'all services'}`);
+    debug(
+      `Reset last poll timer for ${
+        serviceId ? `service: "${serviceId}"` : 'all services'
+      }`,
+    );
 
-    const resetTimer = (service) => {
+    const resetTimer = service => {
       service.lastPollAnswer = Date.now();
       service.lastPoll = Date.now();
     };
 
     if (!serviceId) {
-      this.allDisplayed.forEach((service) => resetTimer(service));
+      this.allDisplayed.forEach(service => resetTimer(service));
     } else {
       const service = this.one(serviceId);
       if (service) {
@@ -893,9 +1007,13 @@ export default class ServicesStore extends Store {
   _mapActiveServiceToServiceModelReaction() {
     const { activeService } = this.stores.settings.all.service;
     if (this.allDisplayed.length) {
-      this.allDisplayed.map((service) => Object.assign(service, {
-        isActive: activeService ? activeService === service.id : this.allDisplayed[0].id === service.id,
-      }));
+      this.allDisplayed.map(service =>
+        Object.assign(service, {
+          isActive: activeService
+            ? activeService === service.id
+            : this.allDisplayed[0].id === service.id,
+        }),
+      );
     }
   }
 
@@ -904,13 +1022,24 @@ export default class ServicesStore extends Store {
     const { showMessageBadgesEvenWhenMuted } = this.stores.ui;
 
     const unreadDirectMessageCount = this.allDisplayed
-      .filter((s) => (showMessageBadgeWhenMuted || s.isNotificationEnabled) && showMessageBadgesEvenWhenMuted && s.isBadgeEnabled)
-      .map((s) => s.unreadDirectMessageCount)
+      .filter(
+        s =>
+          (showMessageBadgeWhenMuted || s.isNotificationEnabled) &&
+          showMessageBadgesEvenWhenMuted &&
+          s.isBadgeEnabled,
+      )
+      .map(s => s.unreadDirectMessageCount)
       .reduce((a, b) => a + b, 0);
 
     const unreadIndirectMessageCount = this.allDisplayed
-      .filter((s) => (showMessageBadgeWhenMuted && showMessageBadgesEvenWhenMuted) && (s.isBadgeEnabled && s.isIndirectMessageBadgeEnabled))
-      .map((s) => s.unreadIndirectMessageCount)
+      .filter(
+        s =>
+          showMessageBadgeWhenMuted &&
+          showMessageBadgesEvenWhenMuted &&
+          s.isBadgeEnabled &&
+          s.isIndirectMessageBadgeEnabled,
+      )
+      .map(s => s.unreadIndirectMessageCount)
       .reduce((a, b) => a + b, 0);
 
     // We can't just block this earlier, otherwise the mobx reaction won't be aware of the vars to watch in some cases
@@ -936,7 +1065,7 @@ export default class ServicesStore extends Store {
     const { enabled } = this;
     const { isAppMuted } = this.stores.settings.app;
 
-    enabled.forEach((service) => {
+    enabled.forEach(service => {
       const { isAttached } = service;
       const isMuted = isAppMuted || service.isMuted;
 
@@ -963,7 +1092,12 @@ export default class ServicesStore extends Store {
 
     if (!recipe) return;
 
-    if (recipe.hasTeamId && recipe.hasCustomUrl && data.team && data.customUrl) {
+    if (
+      recipe.hasTeamId &&
+      recipe.hasCustomUrl &&
+      data.team &&
+      data.customUrl
+    ) {
       delete serviceData.team;
     }
 
@@ -971,11 +1105,17 @@ export default class ServicesStore extends Store {
   }
 
   _checkForActiveService() {
-    if (!this.stores.router.location || this.stores.router.location.pathname.includes('auth/signup')) {
+    if (
+      !this.stores.router.location ||
+      this.stores.router.location.pathname.includes('auth/signup')
+    ) {
       return;
     }
 
-    if (this.allDisplayed.findIndex((service) => service.isActive) === -1 && this.allDisplayed.length !== 0) {
+    if (
+      this.allDisplayed.findIndex(service => service.isActive) === -1 &&
+      this.allDisplayed.length !== 0
+    ) {
       debug('No active service found, setting active service to index 0');
 
       this._setActive({ serviceId: this.allDisplayed[0].id });
@@ -988,13 +1128,19 @@ export default class ServicesStore extends Store {
 
     if (service.webview) {
       // We need to completely clone the object, otherwise Electron won't be able to send the object via IPC
-      const shareWithWebview = JSON.parse(JSON.stringify(service.shareWithWebview));
+      const shareWithWebview = JSON.parse(
+        JSON.stringify(service.shareWithWebview),
+      );
 
       debug('Initialize recipe', service.recipe.id, service.name);
-      service.webview.send('initialize-recipe', {
-        ...shareWithWebview,
-        franzVersion: app.getVersion(),
-      }, service.recipe);
+      service.webview.send(
+        'initialize-recipe',
+        {
+          ...shareWithWebview,
+          franzVersion: app.getVersion(),
+        },
+        service.recipe,
+      );
     }
   }
 
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index d143675dc..598c3eb9a 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -23,11 +23,25 @@ import Userscript from './lib/Userscript';
 
 import { BadgeHandler } from './badge';
 import contextMenu from './contextMenu';
-import { injectDarkModeStyle, isDarkModeStyleInjected, removeDarkModeStyle } from './darkmode';
+import {
+  injectDarkModeStyle,
+  isDarkModeStyleInjected,
+  removeDarkModeStyle,
+} from './darkmode';
 import FindInPage from './find';
-import { NotificationsHandler, notificationsClassDefinition } from './notifications';
-import { getDisplayMediaSelector, screenShareCss, screenShareJs } from './screenshare';
-import { switchDict, getSpellcheckerLocaleByFuzzyIdentifier } from './spellchecker';
+import {
+  NotificationsHandler,
+  notificationsClassDefinition,
+} from './notifications';
+import {
+  getDisplayMediaSelector,
+  screenShareCss,
+  screenShareJs,
+} from './screenshare';
+import {
+  switchDict,
+  getSpellcheckerLocaleByFuzzyIdentifier,
+} from './spellchecker';
 
 import { DEFAULT_APP_SETTINGS } from '../environment';
 
@@ -86,15 +100,19 @@ window.open = (url, frameName, features) => {
 // then overwrite the corresponding field of the window object by injected JS.
 contextBridge.exposeInMainWorld('ferdi', {
   open: window.open,
-  setBadge: (direct, indirect) => badgeHandler.setBadge(direct || 0, indirect || 0),
-  displayNotification: (title, options) => notificationsHandler.displayNotification(title, options),
+  setBadge: (direct, indirect) =>
+    badgeHandler.setBadge(direct || 0, indirect || 0),
+  displayNotification: (title, options) =>
+    notificationsHandler.displayNotification(title, options),
   getDisplayMediaSelector,
 });
 
-ipcRenderer.sendToHost('inject-js-unsafe',
+ipcRenderer.sendToHost(
+  'inject-js-unsafe',
   'window.open = window.ferdi.open;',
   notificationsClassDefinition,
-  screenShareJs);
+  screenShareJs,
+);
 
 class RecipeController {
   @observable settings = {
@@ -129,7 +147,9 @@ class RecipeController {
   }
 
   @computed get spellcheckerLanguage() {
-    const selected = this.settings.service.spellcheckerLanguage || this.settings.app.spellcheckerLanguage;
+    const selected =
+      this.settings.service.spellcheckerLanguage ||
+      this.settings.app.spellcheckerLanguage;
     return selected;
   }
 
@@ -138,7 +158,7 @@ class RecipeController {
   findInPage = null;
 
   async initialize() {
-    Object.keys(this.ipcEvents).forEach((channel) => {
+    Object.keys(this.ipcEvents).forEach(channel => {
       ipcRenderer.on(channel, (...args) => {
         debug('Received IPC event for channel', channel, 'with', ...args);
         this[this.ipcEvents[channel]](...args);
@@ -176,7 +196,7 @@ class RecipeController {
     try {
       this.recipe = new RecipeWebview(badgeHandler, notificationsHandler);
       // eslint-disable-next-line
-      require(modulePath)(this.recipe, {...config, recipe,});
+      require(modulePath)(this.recipe, { ...config, recipe });
       debug('Initialize Recipe', config, recipe);
 
       this.settings.service = Object.assign(config, { recipe });
@@ -195,14 +215,14 @@ class RecipeController {
     styles.innerHTML = screenShareCss;
 
     const userCss = path.join(recipe.path, 'user.css');
-    if (await fs.exists(userCss)) {
+    if (fs.existsSync(userCss)) {
       const data = await fs.readFile(userCss);
       styles.innerHTML += data.toString();
     }
     document.querySelector('head').appendChild(styles);
 
     const userJs = path.join(recipe.path, 'user.js');
-    if (await fs.exists(userJs)) {
+    if (fs.existsSync(userJs)) {
       const loadUserJs = () => {
         // eslint-disable-next-line
         const userJsModule = require(userJs);
@@ -230,8 +250,14 @@ class RecipeController {
   update() {
     debug('enableSpellchecking', this.settings.app.enableSpellchecking);
     debug('isDarkModeEnabled', this.settings.service.isDarkModeEnabled);
-    debug('System spellcheckerLanguage', this.settings.app.spellcheckerLanguage);
-    debug('Service spellcheckerLanguage', this.settings.service.spellcheckerLanguage);
+    debug(
+      'System spellcheckerLanguage',
+      this.settings.app.spellcheckerLanguage,
+    );
+    debug(
+      'Service spellcheckerLanguage',
+      this.settings.service.spellcheckerLanguage,
+    );
     debug('darkReaderSettigs', this.settings.service.darkReaderSettings);
     debug('searchEngine', this.settings.app.searchEngine);
 
@@ -244,7 +270,10 @@ class RecipeController {
       let { spellcheckerLanguage } = this;
       if (spellcheckerLanguage.includes('automatic')) {
         this.automaticLanguageDetection();
-        debug('Found `automatic` locale, falling back to user locale until detected', this.settings.app.locale);
+        debug(
+          'Found `automatic` locale, falling back to user locale until detected',
+          this.settings.app.locale,
+        );
         spellcheckerLanguage = this.settings.app.locale;
       }
       switchDict(spellcheckerLanguage);
@@ -256,7 +285,7 @@ class RecipeController {
       this.hasUpdatedBeforeRecipeLoaded = true;
     }
 
-    console.log(
+    debug(
       'Darkmode enabled?',
       this.settings.service.isDarkModeEnabled,
       'Dark theme active?',
@@ -267,22 +296,29 @@ class RecipeController {
       removeDarkModeStyle,
       disableDarkMode,
       enableDarkMode,
-      injectDarkModeStyle: () => injectDarkModeStyle(this.settings.service.recipe.path),
+      injectDarkModeStyle: () =>
+        injectDarkModeStyle(this.settings.service.recipe.path),
       isDarkModeStyleInjected,
     };
 
-    if (this.settings.service.isDarkModeEnabled && this.settings.app.isDarkThemeActive !== false) {
+    if (
+      this.settings.service.isDarkModeEnabled &&
+      this.settings.app.isDarkThemeActive !== false
+    ) {
       debug('Enable dark mode');
 
       // Check if recipe has a darkmode.css
-      const darkModeStyle = path.join(this.settings.service.recipe.path, 'darkmode.css');
+      const darkModeStyle = path.join(
+        this.settings.service.recipe.path,
+        'darkmode.css',
+      );
       const darkModeExists = fs.pathExistsSync(darkModeStyle);
 
-      console.log('darkmode.css exists? ', darkModeExists ? 'Yes' : 'No');
+      debug('darkmode.css exists? ', darkModeExists ? 'Yes' : 'No');
 
       // Check if recipe has a custom dark mode handler
       if (this.recipe && this.recipe.darkModeHandler) {
-        console.log('Using custom dark mode handler');
+        debug('Using custom dark mode handler');
 
         // Remove other dark mode styles if they were already loaded
         if (this.hasUpdatedBeforeRecipeLoaded) {
@@ -293,25 +329,32 @@ class RecipeController {
 
         this.recipe.darkModeHandler(true, handlerConfig);
       } else if (darkModeExists) {
-        console.log('Injecting darkmode.css');
+        debug('Injecting darkmode.css');
         injectDarkModeStyle(this.settings.service.recipe.path);
 
         // Make sure universal dark mode is disabled
         disableDarkMode();
         this.universalDarkModeInjected = false;
-      } else if (this.settings.app.universalDarkMode && !ignoreList.includes(window.location.host)) {
-        console.log('Injecting Dark Reader');
+      } else if (
+        this.settings.app.universalDarkMode &&
+        !ignoreList.includes(window.location.host)
+      ) {
+        debug('Injecting Dark Reader');
 
         // Use Dark Reader instead
-        const { brightness, contrast, sepia } = this.settings.service.darkReaderSettings;
-        enableDarkMode({ brightness, contrast, sepia }, {
-          css: customDarkModeCss[window.location.host] || '',
-        });
+        const { brightness, contrast, sepia } =
+          this.settings.service.darkReaderSettings;
+        enableDarkMode(
+          { brightness, contrast, sepia },
+          {
+            css: customDarkModeCss[window.location.host] || '',
+          },
+        );
         this.universalDarkModeInjected = true;
       }
     } else {
       debug('Remove dark mode');
-      console.log('DarkMode disabled - removing remaining styles');
+      debug('DarkMode disabled - removing remaining styles');
 
       if (this.recipe && this.recipe.darkModeHandler) {
         // Remove other dark mode styles if they were already loaded
@@ -323,10 +366,10 @@ class RecipeController {
 
         this.recipe.darkModeHandler(false, handlerConfig);
       } else if (isDarkModeStyleInjected()) {
-        console.log('Removing injected darkmode.css');
+        debug('Removing injected darkmode.css');
         removeDarkModeStyle();
       } else {
-        console.log('Removing Dark Reader');
+        debug('Removing Dark Reader');
 
         disableDarkMode();
         this.universalDarkModeInjected = false;
@@ -336,9 +379,9 @@ class RecipeController {
     // Remove dark reader if (universal) dark mode was just disabled
     if (this.universalDarkModeInjected) {
       if (
-        !this.settings.app.darkMode
-        || !this.settings.service.isDarkModeEnabled
-        || !this.settings.app.universalDarkMode
+        !this.settings.app.darkMode ||
+        !this.settings.service.isDarkModeEnabled ||
+        !this.settings.app.universalDarkMode
       ) {
         disableDarkMode();
         this.universalDarkModeInjected = false;
@@ -360,30 +403,39 @@ class RecipeController {
   }
 
   async automaticLanguageDetection() {
-    window.addEventListener('keyup', debounce(async (e) => {
-      const element = e.target;
-
-      if (!element) return;
-
-      let value = '';
-      if (element.isContentEditable) {
-        value = element.textContent;
-      } else if (element.value) {
-        value = element.value;
-      }
+    window.addEventListener(
+      'keyup',
+      debounce(async e => {
+        const element = e.target;
+
+        if (!element) return;
+
+        let value = '';
+        if (element.isContentEditable) {
+          value = element.textContent;
+        } else if (element.value) {
+          value = element.value;
+        }
 
-      // Force a minimum length to get better detection results
-      if (value.length < 25) return;
+        // Force a minimum length to get better detection results
+        if (value.length < 25) return;
 
-      debug('Detecting language for', value);
-      const locale = await ipcRenderer.invoke('detect-language', { sample: value });
+        debug('Detecting language for', value);
+        const locale = await ipcRenderer.invoke('detect-language', {
+          sample: value,
+        });
 
-      const spellcheckerLocale = getSpellcheckerLocaleByFuzzyIdentifier(locale);
-      debug('Language detected reliably, setting spellchecker language to', spellcheckerLocale);
-      if (spellcheckerLocale) {
-        switchDict(spellcheckerLocale);
-      }
-    }, 225));
+        const spellcheckerLocale =
+          getSpellcheckerLocaleByFuzzyIdentifier(locale);
+        debug(
+          'Language detected reliably, setting spellchecker language to',
+          spellcheckerLocale,
+        );
+        if (spellcheckerLocale) {
+          switchDict(spellcheckerLocale);
+        }
+      }, 225),
+    );
   }
 }