Merge branch 'develop'v5.0.0-beta.21

author: Stefan Malzner <stefan@adlk.io> 2018-12-13 14:01:33 +0100
committer: Stefan Malzner <stefan@adlk.io> 2018-12-13 14:01:33 +0100
commit: b5937bd427e02d64b675c9c4719ec8148c68c224 (patch)
tree: 3e67ca01935eb36ab6d40a1e197d7c2c0f38b587
parent: Update CHANGELOG.md (diff)
parent: Ignore clicks on premium elements (diff)
download: ferdium-app-5.0.0-beta.21.tar.gz
ferdium-app-5.0.0-beta.21.tar.zst
ferdium-app-5.0.0-beta.21.zip
140 files changed, 2541 insertions, 1764 deletions
diff --git a/.eslintrc b/.eslintrc
index 948550306..1843e560e 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -14,6 +14,8 @@
      "extensions": [".js", ".jsx"]
    }],
    "react/forbid-prop-types": 1,
+    "react/destructuring-assignment": 1,
+    "prefer-destructuring": 1,
    "no-underscore-dangle": 0,
    "max-len": 0,
    "class-methods-use-this": 0,
@@ -21,7 +23,23 @@
    "react/jsx-no-bind": 0,
    "jsx-a11y/no-static-element-interactions": 0,
    "react/jsx-no-target-blank": 0,
-    "no-restricted-syntax": [0, "ForInStatement"]
+    "no-restricted-syntax": [0, "ForInStatement"],
+    "jsx-a11y/no-noninteractive-element-interactions": 1,
+    "jsx-a11y/label-has-for": [
+      2,
+      {
+        "components": [
+          "Label"
+        ],
+        "required": {
+          "every": [
+            "id"
+          ]
+        },
+        "allowChildren": false
+      }
+    ],
+    "jsx-a11y/click-events-have-key-events": 1
  },
  "globals": {
    "window": true,
diff --git a/.travis.yml b/.travis.yml
index dfea3a41e..2c2004b3a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,11 +16,10 @@ language: node_js
 before_script:
 - npm install node-sass -g
- npm ci
 script:
 - npm run lint
- travis_wait npm run build
+- travis_wait 30 npm run build
 cache: npm
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c489d4827..6ea5cbed4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,28 @@
+<a name="5.0.0-beta.21"></a>
+# [5.0.0-beta.21](https://github.com/meetfranz/franz/compare/5.0.0-beta.20...5.0.0-beta.21) (2018-12-11)
+### General
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+### Features
+* **Service:** Add option to change spellchecking language by service ([baf7d60](https://github.com/meetfranz/franz/commit/baf7d60))
+* **Context Menu:** Quickly change the spellchecker language for the active service
+* **Service:** Add error screen for services that failed to load ([a5e7171](https://github.com/meetfranz/franz/commit/a5e7171))
+* **Service:** Add port option for proxy configuration ([baf7d60](https://github.com/meetfranz/franz/commit/baf7d60))
+### Bug Fixes
+* **Spellchecker:** Fix issue with dictionary download ([0cdc165](https://github.com/meetfranz/franz/commit/0cdc165))
+### Improvements
+* **Dark Mode:** Dark Mode polishing
+* **App:** Updated a ton of dependencies
 <a name="5.0.0-beta.20"></a>
 # [5.0.0-beta.20](https://github.com/meetfranz/franz/compare/v5.0.0-beta.19...v5.0.0-beta.20) (2018-12-05)
diff --git a/electron-builder.yml b/electron-builder.yml
index 3e72da4ce..1d62669bf 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -42,3 +42,5 @@ nsis:
 protocols: 
  name: Franz
  schemes: [franz] 
+asarUnpack: "./dictionaries"
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index cea42d6c9..fc2820fed 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -25,6 +25,7 @@ const paths = {
  src: 'src',
  dest: 'build',
  tmp: '.tmp',
+  dictionaries: 'dictionaries',
  package: `out/${config.version}`,
  html: {
    src: 'src/**/*.html',
@@ -73,7 +74,8 @@ export function mvSrc() {
      `${paths.src}/*/**`,
      `!${paths.scripts.watch}`,
      `!${paths.src}/styles/**`,
-    ], { since: gulp.lastRun(mvSrc) })
+    ], { since: gulp.lastRun(mvSrc) },
+  )
    .pipe(gulp.dest(paths.dest));
 }
@@ -81,7 +83,8 @@ export function mvPackageJson() {
  return gulp.src(
    [
      './package.json',
-    ])
+    ],
+  )
    .pipe(gulp.dest(paths.dest));
 }
@@ -132,6 +135,21 @@ export function webserver() {
    }));
 }
+export function dictionaries(done) {
+  const { SPELLCHECKER_LOCALES } = require('./build/i18n/languages');
+  let packages = '';
+  Object.keys(SPELLCHECKER_LOCALES).forEach((key) => { packages = `${packages} hunspell-dict-${key}`; });
+  _shell(`
+    rm -rf ${paths.dictionaries}
+    npm install --prefix ${paths.dictionaries} ${packages}
+    mv ${paths.dictionaries}/node_modules/* ${paths.dictionaries}
+    rm -rf ${paths.dictionaries}/node_modules ${paths.dictionaries}/package-lock.json
+    pwd`,
+  done);
+}
 export function sign(done) {
  _shell(`codesign --verbose=4 --deep --strict --force --sign "${process.env.SIGNING_IDENTITY}" "${__dirname}/node_modules/electron/dist/Electron.app"`, done);
 }
@@ -140,6 +158,7 @@ const build = gulp.series(
  clean,
  gulp.parallel(mvSrc, mvPackageJson),
  gulp.parallel(html, scripts, styles),
+  dictionaries,
 );
 export { build };
diff --git a/package-lock.json b/package-lock.json
index fac5d7a7d..16fe71944 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "franz",
-  "version": "5.0.0-beta.18",
+  "version": "5.0.0-beta.21",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -56,6 +56,37 @@
        }
      }
    },
+    "@babel/cli": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.0.0.tgz",
+      "integrity": "sha512-SH/x7W1dz4FSSBeJZXIiYSbHIOU3ZxNgwQPLTG+I8KXyTS81pzmLouPa2st6hji7VbVrEF/D8EQzQbXAYj1TsA==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^2.0.3",
+        "commander": "^2.8.1",
+        "convert-source-map": "^1.1.0",
+        "fs-readdir-recursive": "^1.1.0",
+        "glob": "^7.0.0",
+        "lodash": "^4.17.10",
+        "mkdirp": "^0.5.1",
+        "output-file-sync": "^2.0.0",
+        "slash": "^2.0.0",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "output-file-sync": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-2.0.1.tgz",
+          "integrity": "sha512-mDho4qm7WgIXIGf4eYU1RHN2UU5tPfVYVSRwDJw0uTmj35DQUt/eNp19N7v6T3SrR0ESTEf2up2CGO73qI35zQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "is-plain-obj": "^1.1.0",
+            "mkdirp": "^0.5.1"
+          }
+        }
+      }
+    },
    "@babel/code-frame": {
      "version": "7.0.0",
      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
@@ -66,18 +97,18 @@
      }
    },
    "@babel/core": {
-      "version": "7.1.2",
+      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.0.0.tgz",
-      "integrity": "sha512-IFeSSnjXdhDaoysIlev//UzHZbdEmm7D0EIH2qtse9xK7mXEZQpYjs2P00XlP1qYsYvid79p+Zgg6tz1mp6iVw==",
+      "integrity": "sha512-nrvxS5u6QUN5gLl1GEakIcmOeoUHT1/gQtdMRq18WFURJ5osn4ppJLVSseMQo4zVWKJfBTF4muIYijXUnKlRLQ==",
      "dev": true,
      "requires": {
        "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.1.2",
+        "@babel/generator": "^7.0.0",
-        "@babel/helpers": "^7.1.2",
+        "@babel/helpers": "^7.0.0",
-        "@babel/parser": "^7.1.2",
+        "@babel/parser": "^7.0.0",
-        "@babel/template": "^7.1.2",
+        "@babel/template": "^7.0.0",
-        "@babel/traverse": "^7.1.0",
+        "@babel/traverse": "^7.0.0",
-        "@babel/types": "^7.1.2",
+        "@babel/types": "^7.0.0",
        "convert-source-map": "^1.1.0",
        "debug": "^3.1.0",
        "json5": "^0.5.0",
@@ -320,14 +351,90 @@
      }
    },
    "@babel/helpers": {
-      "version": "7.1.2",
+      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.2.0.tgz",
-      "integrity": "sha512-Myc3pUE8eswD73aWcartxB16K6CGmHDv9KxOmD2CeOs/FaEAQodr3VYGmlvOmog60vNQ2w8QbatuahepZwrHiA==",
+      "integrity": "sha512-Fr07N+ea0dMcMN8nFpuK6dUIT7/ivt9yKQdEEnjVS83tG2pHwPi03gYmk/tyuwONnZ+sY+GFFPlWGgCtW1hF9A==",
      "dev": true,
      "requires": {
        "@babel/template": "^7.1.2",
-        "@babel/traverse": "^7.1.0",
+        "@babel/traverse": "^7.1.5",
-        "@babel/types": "^7.1.2"
+        "@babel/types": "^7.2.0"
+      },
+      "dependencies": {
+        "@babel/generator": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.2.0.tgz",
+          "integrity": "sha512-BA75MVfRlFQG2EZgFYIwyT1r6xSkwfP2bdkY/kLZusEYWiJs4xCowab/alaEaT0wSvmVuXGqiefeBlP+7V1yKg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.2.0",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.10",
+            "source-map": "^0.5.0",
+            "trim-right": "^1.0.1"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.2.0.tgz",
+          "integrity": "sha512-M74+GvK4hn1eejD9lZ7967qAwvqTZayQa3g10ag4s9uewgR7TKjeaT0YMyoq+gVfKYABiWZ4MQD701/t5e1Jhg==",
+          "dev": true
+        },
+        "@babel/traverse": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.6.tgz",
+          "integrity": "sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "@babel/generator": "^7.1.6",
+            "@babel/helper-function-name": "^7.1.0",
+            "@babel/helper-split-export-declaration": "^7.0.0",
+            "@babel/parser": "^7.1.6",
+            "@babel/types": "^7.1.6",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.10"
+          }
+        },
+        "@babel/types": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.2.0.tgz",
+          "integrity": "sha512-b4v7dyfApuKDvmPb+O488UlGuR1WbwMXFsO/cyqMrnfvRAChZKJAYeeglWTjUO1b9UghKKgepAQM5tsvBJca6A==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.10",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "debug": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
+          "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "globals": {
+          "version": "11.9.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.9.0.tgz",
+          "integrity": "sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        },
+        "to-fast-properties": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+          "dev": true
+        }
      }
    },
    "@babel/highlight": {
@@ -989,12 +1096,6 @@
            "locate-path": "^2.0.0"
          }
        },
-        "home-or-tmp": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-3.0.0.tgz",
-          "integrity": "sha1-V6j+JM8zzdUkhgoVgh3cJchmcfs=",
-          "dev": true
-        },
        "pkg-dir": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
@@ -1107,15 +1208,6 @@
      "integrity": "sha512-EibsnbJerd0hBFaDjJStFrVbVBAtOy4dgL8zZFw0uOvPqzBAX59Ci8cgjg3+RgJIWhsB5A4c+pi+D4P9tQQh/A==",
      "dev": true
    },
-    "JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "requires": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      }
-    },
    "abbrev": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -1141,27 +1233,16 @@
      }
    },
    "acorn": {
-      "version": "5.7.3",
+      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.4.tgz",
-      "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+      "integrity": "sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==",
      "dev": true
    },
    "acorn-jsx": {
-      "version": "3.0.1",
+      "version": "5.0.1",
-      "resolved": "http://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz",
-      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
+      "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==",
-      "dev": true,
+      "dev": true
-      "requires": {
-        "acorn": "^3.0.4"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "3.3.0",
-          "resolved": "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-          "dev": true
-        }
-      }
    },
    "address-rfc2822": {
      "version": "2.0.4",
@@ -1177,22 +1258,6 @@
      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
      "dev": true
    },
-    "agent-base": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
-      "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
-      "requires": {
-        "es6-promisify": "^5.0.0"
-      }
-    },
-    "agentkeepalive": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
-      "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
-      "requires": {
-        "humanize-ms": "^1.2.1"
-      }
-    },
    "ajv": {
      "version": "5.5.2",
      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
@@ -1205,12 +1270,6 @@
        "json-schema-traverse": "^0.3.0"
      }
    },
-    "ajv-keywords": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
-      "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
-      "dev": true
-    },
    "amdefine": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
@@ -1379,7 +1438,8 @@
    "aproba": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
    },
    "archy": {
      "version": "1.0.0",
@@ -1404,6 +1464,16 @@
        "sprintf-js": "~1.0.2"
      }
    },
+    "aria-query": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
+      "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
+      "dev": true,
+      "requires": {
+        "ast-types-flow": "0.0.7",
+        "commander": "^2.11.0"
+      }
+    },
    "arr-diff": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -1454,6 +1524,16 @@
      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
      "dev": true
    },
+    "array-includes": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
+      "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.7.0"
+      }
+    },
    "array-initial": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
@@ -1513,15 +1593,6 @@
        }
      }
    },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "requires": {
-        "array-uniq": "^1.0.1"
-      }
-    },
    "array-uniq": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
@@ -1533,28 +1604,12 @@
      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
    },
-    "array.prototype.find": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.0.4.tgz",
-      "integrity": "sha1-VWpcU2LAhkgyPdrrnenRS8GGTJA=",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.7.0"
-      }
-    },
    "arraybuffer.slice": {
      "version": "0.0.6",
      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz",
      "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=",
      "dev": true
    },
-    "arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true
-    },
    "asap": {
      "version": "2.0.6",
      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
@@ -1580,6 +1635,18 @@
      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
    },
+    "ast-types-flow": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
+      "dev": true
+    },
+    "astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+      "dev": true
+    },
    "async": {
      "version": "0.1.22",
      "resolved": "http://registry.npmjs.org/async/-/async-0.1.22.tgz",
@@ -1666,23 +1733,13 @@
      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
      "dev": true
    },
-    "babel-code-frame": {
+    "axobject-query": {
-      "version": "6.26.0",
+      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
      "dev": true,
      "requires": {
-        "chalk": "^1.1.3",
+        "ast-types-flow": "0.0.7"
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
-      },
-      "dependencies": {
-        "js-tokens": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-          "dev": true
-        }
      }
    },
    "babel-eslint": {
@@ -2179,40 +2236,8 @@
    "builtin-modules": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-    },
+      "dev": true
-    "builtins": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
-      "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og="
-    },
-    "cacache": {
-      "version": "11.3.1",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.1.tgz",
-      "integrity": "sha512-2PEw4cRRDu+iQvBTTuttQifacYjLPhET+SYO/gEFMy8uhi+jlJREDAjSF5FWSdV/Aw5h18caHA7vMTw2c+wDzA==",
-      "requires": {
-        "bluebird": "^3.5.1",
-        "chownr": "^1.0.1",
-        "figgy-pudding": "^3.1.0",
-        "glob": "^7.1.2",
-        "graceful-fs": "^4.1.11",
-        "lru-cache": "^4.1.3",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.2",
-        "ssri": "^6.0.0",
-        "unique-filename": "^1.1.0",
-        "y18n": "^4.0.0"
-      },
-      "dependencies": {
-        "y18n": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
-        }
-      }
    },
    "cache-base": {
      "version": "1.0.1",
@@ -2328,9 +2353,9 @@
      }
    },
    "chardet": {
-      "version": "0.4.2",
+      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
      "dev": true
    },
    "chokidar": {
@@ -2587,6 +2612,7 @@
      "version": "1.6.2",
      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
      "requires": {
        "buffer-from": "^1.0.0",
        "inherits": "^2.0.3",
@@ -2972,19 +2998,6 @@
      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
      "dev": true
    },
-    "copy-concurrently": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-      "requires": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
-      }
-    },
    "copy-descriptor": {
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
@@ -3008,7 +3021,8 @@
    "core-util-is": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
    },
    "cosmiconfig": {
      "version": "5.0.7",
@@ -3099,11 +3113,6 @@
        "array-find-index": "^1.0.1"
      }
    },
-    "cyclist": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
-      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA="
-    },
    "cz-conventional-changelog": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/cz-conventional-changelog/-/cz-conventional-changelog-2.1.0.tgz",
@@ -3264,21 +3273,6 @@
        }
      }
    },
-    "del": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
-      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
-      "dev": true,
-      "requires": {
-        "globby": "^5.0.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "rimraf": "^2.2.8"
-      }
-    },
    "delayed-stream": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -3410,9 +3404,9 @@
      }
    },
    "domelementtype": {
-      "version": "1.3.0",
+      "version": "1.3.1",
-      "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI="
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
    },
    "domhandler": {
      "version": "2.4.2",
@@ -3505,6 +3499,7 @@
      "version": "3.6.1",
      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
      "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
+      "dev": true,
      "requires": {
        "end-of-stream": "^1.0.0",
        "inherits": "^2.0.1",
@@ -4057,6 +4052,12 @@
      "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-3.0.2.tgz",
      "integrity": "sha512-IMn9dnwLMsgZjdUHswB/UZ0S8LQ/u+2/qjnHJ9tCtp3QHZsIYwJCiJOo2FT0i3CwwK/dtSODYtxuvzV4D9MY5g=="
    },
+    "emoji-regex": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.5.1.tgz",
+      "integrity": "sha512-PAHp6TxrCy7MGMFidro8uikr+zlJJKJ/Q6mm2ExZ7HwkyR9lSVFfE3kt36qcwa24BQL7y0G9axycGjK1A/0uNQ==",
+      "dev": true
+    },
    "emojis-list": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
@@ -4084,6 +4085,7 @@
      "version": "1.4.1",
      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "dev": true,
      "requires": {
        "once": "^1.4.0"
      }
@@ -4191,11 +4193,6 @@
      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
    },
-    "err-code": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
-      "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA="
-    },
    "error-ex": {
      "version": "1.3.2",
      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -4252,15 +4249,8 @@
    "es6-promise": {
      "version": "4.2.5",
      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz",
-      "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg=="
+      "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==",
-    },
+      "dev": true
-    "es6-promisify": {
-      "version": "5.0.0",
-      "resolved": "http://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
-      "requires": {
-        "es6-promise": "^4.0.3"
-      }
    },
    "es6-symbol": {
      "version": "3.1.1",
@@ -4295,51 +4285,62 @@
      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
    },
    "eslint": {
-      "version": "4.19.1",
+      "version": "5.10.0",
-      "resolved": "http://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.10.0.tgz",
-      "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
+      "integrity": "sha512-HpqzC+BHULKlnPwWae9MaVZ5AXJKpkxCVXQHrFaRw3hbDj26V/9ArYM4Rr/SQ8pi6qUPLXSSXC4RBJlyq2Z2OQ==",
      "dev": true,
      "requires": {
-        "ajv": "^5.3.0",
+        "@babel/code-frame": "^7.0.0",
-        "babel-code-frame": "^6.22.0",
+        "ajv": "^6.5.3",
        "chalk": "^2.1.0",
-        "concat-stream": "^1.6.0",
+        "cross-spawn": "^6.0.5",
-        "cross-spawn": "^5.1.0",
+        "debug": "^4.0.1",
-        "debug": "^3.1.0",
        "doctrine": "^2.1.0",
-        "eslint-scope": "^3.7.1",
+        "eslint-scope": "^4.0.0",
+        "eslint-utils": "^1.3.1",
        "eslint-visitor-keys": "^1.0.0",
-        "espree": "^3.5.4",
+        "espree": "^5.0.0",
-        "esquery": "^1.0.0",
+        "esquery": "^1.0.1",
        "esutils": "^2.0.2",
        "file-entry-cache": "^2.0.0",
        "functional-red-black-tree": "^1.0.1",
        "glob": "^7.1.2",
-        "globals": "^11.0.1",
+        "globals": "^11.7.0",
-        "ignore": "^3.3.3",
+        "ignore": "^4.0.6",
        "imurmurhash": "^0.1.4",
-        "inquirer": "^3.0.6",
+        "inquirer": "^6.1.0",
-        "is-resolvable": "^1.0.0",
+        "js-yaml": "^3.12.0",
-        "js-yaml": "^3.9.1",
        "json-stable-stringify-without-jsonify": "^1.0.1",
        "levn": "^0.3.0",
-        "lodash": "^4.17.4",
+        "lodash": "^4.17.5",
-        "minimatch": "^3.0.2",
+        "minimatch": "^3.0.4",
        "mkdirp": "^0.5.1",
        "natural-compare": "^1.4.0",
        "optionator": "^0.8.2",
        "path-is-inside": "^1.0.2",
        "pluralize": "^7.0.0",
        "progress": "^2.0.0",
-        "regexpp": "^1.0.1",
+        "regexpp": "^2.0.1",
        "require-uncached": "^1.0.3",
-        "semver": "^5.3.0",
+        "semver": "^5.5.1",
        "strip-ansi": "^4.0.0",
-        "strip-json-comments": "~2.0.1",
+        "strip-json-comments": "^2.0.1",
-        "table": "4.0.2",
+        "table": "^5.0.2",
-        "text-table": "~0.2.0"
+        "text-table": "^0.2.0"
      },
      "dependencies": {
+        "ajv": {
+          "version": "6.6.1",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.1.tgz",
+          "integrity": "sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
        "ansi-regex": {
          "version": "3.0.0",
          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
@@ -4366,30 +4367,25 @@
            "supports-color": "^5.3.0"
          }
        },
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
        "debug": {
-          "version": "3.2.6",
+          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
          "dev": true,
          "requires": {
            "ms": "^2.1.1"
          }
        },
-        "globals": {
+        "fast-deep-equal": {
-          "version": "11.8.0",
+          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.8.0.tgz",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
          "dev": true
        },
        "ms": {
@@ -4419,21 +4415,25 @@
      }
    },
    "eslint-config-airbnb": {
-      "version": "14.1.0",
+      "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-14.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-17.1.0.tgz",
-      "integrity": "sha1-NV0pAEC7+OAL+LSxn0twy+fCMX8=",
+      "integrity": "sha512-R9jw28hFfEQnpPau01NO5K/JWMGLi6aymiF6RsnMURjTk+MqZKllCqGK/0tOvHkPi/NWSSOU2Ced/GX++YxLnw==",
      "dev": true,
      "requires": {
-        "eslint-config-airbnb-base": "^11.1.0"
+        "eslint-config-airbnb-base": "^13.1.0",
+        "object.assign": "^4.1.0",
+        "object.entries": "^1.0.4"
      }
    },
    "eslint-config-airbnb-base": {
-      "version": "11.3.2",
+      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-11.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.1.0.tgz",
-      "integrity": "sha512-/fhjt/VqzBA2SRsx7ErDtv6Ayf+XLw9LIOqmpBuHFCVwyJo2EtzGWMB9fYRFBoWWQLxmNmCpenNiH0RxyeS41w==",
+      "integrity": "sha512-XWwQtf3U3zIoKO1BbHh6aUhJZQweOwSt4c2JrPDg9FP3Ltv3+YfEv7jIDB8275tVnO/qOHbfuYg3kzw6Je7uWw==",
      "dev": true,
      "requires": {
-        "eslint-restricted-globals": "^0.1.1"
+        "eslint-restricted-globals": "^0.1.1",
+        "object.assign": "^4.1.0",
+        "object.entries": "^1.0.4"
      }
    },
    "eslint-import-resolver-node": {
@@ -4557,39 +4557,32 @@
      }
    },
    "eslint-plugin-jsx-a11y": {
-      "version": "3.0.2",
+      "version": "6.1.2",
-      "resolved": "http://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-3.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.1.2.tgz",
-      "integrity": "sha1-nw6ryv3j0qJgDZamatuQ0JnoQf4=",
+      "integrity": "sha512-7gSSmwb3A+fQwtw0arguwMdOdzmKUgnUcbSNlo+GjKLAQFuC2EZxWqG9XHRI8VscBJD5a8raz3RuxQNFW+XJbw==",
      "dev": true,
      "requires": {
-        "damerau-levenshtein": "^1.0.0",
+        "aria-query": "^3.0.0",
-        "jsx-ast-utils": "^1.0.0",
+        "array-includes": "^3.0.3",
-        "object-assign": "^4.0.1"
+        "ast-types-flow": "^0.0.7",
+        "axobject-query": "^2.0.1",
+        "damerau-levenshtein": "^1.0.4",
+        "emoji-regex": "^6.5.1",
+        "has": "^1.0.3",
+        "jsx-ast-utils": "^2.0.1"
      }
    },
    "eslint-plugin-react": {
-      "version": "6.10.3",
+      "version": "7.11.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.11.1.tgz",
-      "integrity": "sha1-xUNb6wZ3ThLH2y9qut3L+QDNP3g=",
+      "integrity": "sha512-cVVyMadRyW7qsIUh3FHp3u6QHNhOgVrLQYdQEB1bPWBsgbNCHdFAeNMquBMCcZJu59eNthX053L70l7gRt4SCw==",
      "dev": true,
      "requires": {
-        "array.prototype.find": "^2.0.1",
+        "array-includes": "^3.0.3",
-        "doctrine": "^1.2.2",
+        "doctrine": "^2.1.0",
-        "has": "^1.0.1",
+        "has": "^1.0.3",
-        "jsx-ast-utils": "^1.3.4",
+        "jsx-ast-utils": "^2.0.1",
-        "object.assign": "^4.0.4"
+        "prop-types": "^15.6.2"
-      },
-      "dependencies": {
-        "doctrine": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "isarray": "^1.0.0"
-          }
-        }
      }
    },
    "eslint-restricted-globals": {
@@ -4599,15 +4592,21 @@
      "dev": true
    },
    "eslint-scope": {
-      "version": "3.7.3",
+      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-      "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
+      "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
      "dev": true,
      "requires": {
        "esrecurse": "^4.1.0",
        "estraverse": "^4.1.1"
      }
    },
+    "eslint-utils": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
+      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
+      "dev": true
+    },
    "eslint-visitor-keys": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
@@ -4615,13 +4614,14 @@
      "dev": true
    },
    "espree": {
-      "version": "3.5.4",
+      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.0.tgz",
-      "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+      "integrity": "sha512-1MpUfwsdS9MMoN7ZXqAr9e9UKdVHDcvrJpyx7mm1WuQlx/ygErEQBzgi5Nh5qBHIoYweprhtMkTCb9GhcAIcsA==",
      "dev": true,
      "requires": {
-        "acorn": "^5.5.0",
+        "acorn": "^6.0.2",
-        "acorn-jsx": "^3.0.0"
+        "acorn-jsx": "^5.0.0",
+        "eslint-visitor-keys": "^1.0.0"
      }
    },
    "esprima": {
@@ -4815,25 +4815,14 @@
      }
    },
    "external-editor": {
-      "version": "2.2.0",
+      "version": "3.0.3",
-      "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
-      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+      "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
      "dev": true,
      "requires": {
-        "chardet": "^0.4.0",
+        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.17",
+        "iconv-lite": "^0.4.24",
        "tmp": "^0.0.33"
-      },
-      "dependencies": {
-        "tmp": {
-          "version": "0.0.33",
-          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-          "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-          "dev": true,
-          "requires": {
-            "os-tmpdir": "~1.0.2"
-          }
-        }
      }
    },
    "extglob": {
@@ -4971,11 +4960,6 @@
        "pend": "~1.2.0"
      }
    },
-    "figgy-pudding": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
-      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w=="
-    },
    "figures": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
@@ -5120,14 +5104,14 @@
      "integrity": "sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c="
    },
    "flat-cache": {
-      "version": "1.3.0",
+      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
-      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
+      "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
      "dev": true,
      "requires": {
        "circular-json": "^0.3.1",
-        "del": "^2.0.2",
        "graceful-fs": "^4.1.2",
+        "rimraf": "~2.6.2",
        "write": "^0.2.1"
      }
    },
@@ -5135,6 +5119,7 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
      "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
+      "dev": true,
      "requires": {
        "inherits": "^2.0.1",
        "readable-stream": "^2.0.4"
@@ -5184,15 +5169,6 @@
      "integrity": "sha1-lzHc9WeMf660T7kDxPct9VGH+nc=",
      "dev": true
    },
-    "from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-      "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
-      }
-    },
    "fs-extra": {
      "version": "7.0.1",
      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
@@ -5230,21 +5206,17 @@
        "through2": "^2.0.3"
      }
    },
-    "fs-write-stream-atomic": {
+    "fs-readdir-recursive": {
-      "version": "1.0.10",
+      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
-      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==",
-      "requires": {
+      "dev": true
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
-      }
    },
    "fs.realpath": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
    },
    "fsevents": {
      "version": "1.2.4",
@@ -5890,11 +5862,6 @@
        "globule": "^1.0.0"
      }
    },
-    "genfun": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
-      "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA=="
-    },
    "get-caller-file": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
@@ -5939,6 +5906,7 @@
      "version": "7.1.3",
      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "dev": true,
      "requires": {
        "fs.realpath": "^1.0.0",
        "inflight": "^1.0.4",
@@ -6020,13 +5988,15 @@
      }
    },
    "glob-watcher": {
-      "version": "5.0.1",
+      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz",
-      "integrity": "sha512-fK92r2COMC199WCyGUblrZKhjra3cyVMDiypDdqg1vsSDmexnbYivK1kNR4QItiNXLKmGlqan469ks67RtNa2g==",
+      "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==",
      "dev": true,
      "requires": {
+        "anymatch": "^2.0.0",
        "async-done": "^1.2.0",
        "chokidar": "^2.0.0",
+        "is-negated-glob": "^1.0.0",
        "just-debounce": "^1.0.0",
        "object.defaults": "^1.1.0"
      }
@@ -6078,19 +6048,11 @@
        }
      }
    },
-    "globby": {
+    "globals": {
-      "version": "5.0.0",
+      "version": "11.9.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.9.0.tgz",
-      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+      "integrity": "sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==",
-      "dev": true,
+      "dev": true
-      "requires": {
-        "array-union": "^1.0.1",
-        "arrify": "^1.0.0",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      }
    },
    "globule": {
      "version": "1.2.1",
@@ -6907,6 +6869,11 @@
      "integrity": "sha512-iWOUTZu7KQGhErV8JfTQDH5F/M2D0HVd0sexS4Grg4e4RYAiN3c4jfpPqKgfedqeebKcNZBl2z3zlgCtFjpFJQ==",
      "dev": true
    },
+    "hex-to-rgba": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/hex-to-rgba/-/hex-to-rgba-1.0.2.tgz",
+      "integrity": "sha512-fL+4NFccs86iOuDnFl1Mhyn471qTPAkpE7k39+JYGPMB3+S9LoUnauQI2nz6BUb3DpYQCx8RqENbaf8IFdKYOg=="
+    },
    "history": {
      "version": "3.3.0",
      "resolved": "https://registry.npmjs.org/history/-/history-3.3.0.tgz",
@@ -6928,6 +6895,12 @@
      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
      "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
    },
+    "home-or-tmp": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-3.0.0.tgz",
+      "integrity": "sha1-V6j+JM8zzdUkhgoVgh3cJchmcfs=",
+      "dev": true
+    },
    "home-path": {
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.6.tgz",
@@ -6945,7 +6918,8 @@
    "hosted-git-info": {
      "version": "2.7.1",
      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
-      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
+      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
+      "dev": true
    },
    "htmlparser2": {
      "version": "3.10.0",
@@ -6972,30 +6946,6 @@
        }
      }
    },
-    "http-cache-semantics": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
-      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="
-    },
-    "http-proxy-agent": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
-      "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
-      "requires": {
-        "agent-base": "4",
-        "debug": "3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
    "http-signature": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -7007,38 +6957,6 @@
        "sshpk": "^1.7.0"
      }
    },
-    "https-proxy-agent": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz",
-      "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==",
-      "requires": {
-        "agent-base": "^4.1.0",
-        "debug": "^3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-        }
-      }
-    },
-    "humanize-ms": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
-      "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
-      "requires": {
-        "ms": "^2.0.0"
-      }
-    },
    "hunspell-asm": {
      "version": "1.0.2",
      "resolved": "http://registry.npmjs.org/hunspell-asm/-/hunspell-asm-1.0.2.tgz",
@@ -7050,26 +6968,6 @@
        "unixify": "^1.0.0"
      }
    },
-    "hunspell-dict-downloader": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hunspell-dict-downloader/-/hunspell-dict-downloader-1.0.0.tgz",
-      "integrity": "sha512-HKVIcQPG8/S3lv+zAsD0dDqDCPM+ICFBUIUqcCTgE6WNDqMYc34pi1XuVjQGhMD901UxcTA+cns/PMoNLGPBJA==",
-      "requires": {
-        "fs-extra": "^7.0.0",
-        "lodash.includes": "^4.3.0",
-        "md5-file": "^4.0.0",
-        "pacote": "^9.1.0",
-        "pify": "^4.0.1",
-        "tslib": "^1.9.3"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-        }
-      }
-    },
    "husky": {
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/husky/-/husky-1.1.4.tgz",
@@ -7228,25 +7126,12 @@
        "safer-buffer": ">= 2.1.2 < 3"
      }
    },
-    "iferr": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE="
-    },
    "ignore": {
-      "version": "3.3.10",
+      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
      "dev": true
    },
-    "ignore-walk": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
-      "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
-      "requires": {
-        "minimatch": "^3.0.4"
-      }
-    },
    "import-fresh": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
@@ -7283,7 +7168,8 @@
    "imurmurhash": {
      "version": "0.1.4",
      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
    },
    "in-publish": {
      "version": "2.0.0",
@@ -7326,24 +7212,23 @@
      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
    },
    "inquirer": {
-      "version": "3.3.0",
+      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz",
-      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
+      "integrity": "sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==",
      "dev": true,
      "requires": {
        "ansi-escapes": "^3.0.0",
        "chalk": "^2.0.0",
        "cli-cursor": "^2.1.0",
        "cli-width": "^2.0.0",
-        "external-editor": "^2.0.4",
+        "external-editor": "^3.0.0",
        "figures": "^2.0.0",
-        "lodash": "^4.3.0",
+        "lodash": "^4.17.10",
        "mute-stream": "0.0.7",
        "run-async": "^2.2.0",
-        "rx-lite": "^4.0.8",
+        "rxjs": "^6.1.0",
-        "rx-lite-aggregates": "^4.0.8",
        "string-width": "^2.1.0",
-        "strip-ansi": "^4.0.0",
+        "strip-ansi": "^5.0.0",
        "through": "^2.3.6"
      },
      "dependencies": {
@@ -7379,6 +7264,15 @@
          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
          "dev": true
        },
+        "rxjs": {
+          "version": "6.3.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
        "string-width": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -7387,15 +7281,34 @@
          "requires": {
            "is-fullwidth-code-point": "^2.0.0",
            "strip-ansi": "^4.0.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
          }
        },
        "strip-ansi": {
-          "version": "4.0.0",
+          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
          "dev": true,
          "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "^4.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
+              "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
+              "dev": true
+            }
          }
        },
        "supports-color": {
@@ -7453,11 +7366,6 @@
      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
    },
-    "ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
-    },
    "is": {
      "version": "0.3.0",
      "resolved": "http://registry.npmjs.org/is/-/is-0.3.0.tgz",
@@ -7515,6 +7423,7 @@
      "version": "1.0.0",
      "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "dev": true,
      "requires": {
        "builtin-modules": "^1.0.0"
      }
@@ -7686,21 +7595,6 @@
      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
      "dev": true
    },
-    "is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-      "dev": true
-    },
-    "is-path-in-cwd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-      "dev": true,
-      "requires": {
-        "is-path-inside": "^1.0.0"
-      }
-    },
    "is-path-inside": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
@@ -7762,12 +7656,6 @@
        "is-unc-path": "^1.0.0"
      }
    },
-    "is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-      "dev": true
-    },
    "is-retry-allowed": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
@@ -7920,7 +7808,8 @@
    "json-parse-better-errors": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
    },
    "json-schema": {
      "version": "0.2.3",
@@ -7981,11 +7870,6 @@
      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
      "dev": true
    },
-    "jsonparse": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
-    },
    "jsonwebtoken": {
      "version": "7.4.3",
      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz",
@@ -8113,10 +7997,13 @@
      }
    },
    "jsx-ast-utils": {
-      "version": "1.4.1",
+      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz",
-      "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=",
+      "integrity": "sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.0.3"
+      }
    },
    "just-debounce": {
      "version": "1.0.0",
@@ -8386,11 +8273,6 @@
        "lodash._root": "^3.0.0"
      }
    },
-    "lodash.includes": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
-      "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
-    },
    "lodash.isarguments": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
@@ -8563,6 +8445,7 @@
      "version": "4.1.3",
      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
      "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
+      "dev": true,
      "requires": {
        "pseudomap": "^1.0.2",
        "yallist": "^2.1.2"
@@ -8594,24 +8477,6 @@
        }
      }
    },
-    "make-fetch-happen": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz",
-      "integrity": "sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==",
-      "requires": {
-        "agentkeepalive": "^3.4.1",
-        "cacache": "^11.0.1",
-        "http-cache-semantics": "^3.8.1",
-        "http-proxy-agent": "^2.1.0",
-        "https-proxy-agent": "^2.2.1",
-        "lru-cache": "^4.1.2",
-        "mississippi": "^3.0.0",
-        "node-fetch-npm": "^2.0.2",
-        "promise-retry": "^1.1.1",
-        "socks-proxy-agent": "^4.0.0",
-        "ssri": "^6.0.0"
-      }
-    },
    "make-iterator": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
@@ -8665,11 +8530,6 @@
      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
      "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w="
    },
-    "md5-file": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-4.0.0.tgz",
-      "integrity": "sha512-UC0qFwyAjn4YdPpKaDNw6gNxRf7Mcx7jC1UGCY4boCzgvU2Aoc1mOGzTtrjjLKhM5ivsnhoKpQVxKPp+1j1qwg=="
-    },
    "mdi": {
      "version": "1.9.33",
      "resolved": "https://registry.npmjs.org/mdi/-/mdi-1.9.33.tgz",
@@ -8831,34 +8691,6 @@
        "minipass": "^2.2.1"
      }
    },
-    "mississippi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-      "requires": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^3.0.0",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
-      },
-      "dependencies": {
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        }
-      }
-    },
    "mixin-deep": {
      "version": "1.3.1",
      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
@@ -8894,21 +8726,35 @@
      }
    },
    "mobx": {
-      "version": "3.6.2",
+      "version": "5.7.0",
-      "resolved": "http://registry.npmjs.org/mobx/-/mobx-3.6.2.tgz",
+      "resolved": "https://registry.npmjs.org/mobx/-/mobx-5.7.0.tgz",
-      "integrity": "sha512-Dq3boJFLpZEvuh5a/MbHLUIyN9XobKWIb0dBfkNOJffNkE3vtuY0C9kSDVpfH8BB0BPkVw8g22qCv7d05LEhKg=="
+      "integrity": "sha512-i+EwjPLq/QSvOFtAuhcd5FFWDxWK3gCJCFbW5dhgc4wsaHB/cL6DEVms3vZDgc2txWcfzjYWfknjggE/c0c4fw=="
    },
    "mobx-localstorage": {
-      "version": "0.1.7",
+      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mobx-localstorage/-/mobx-localstorage-0.1.7.tgz",
+      "resolved": "https://registry.npmjs.org/mobx-localstorage/-/mobx-localstorage-1.1.0.tgz",
-      "integrity": "sha1-wMZDZnafOQykozP0GRLq4AzUqd4="
+      "integrity": "sha512-R/7hN34XC6kCzXFIYM3E+GKJT+2lUIrqK+7tdqjUFoh5asOFd0trJt4TYxdLy+7UG2UlFzTKpYCyUgZNrsTl2g==",
+      "requires": {
+        "reactive-localstorage": "^0.0.2"
+      }
    },
    "mobx-react": {
-      "version": "4.4.3",
+      "version": "5.4.2",
-      "resolved": "http://registry.npmjs.org/mobx-react/-/mobx-react-4.4.3.tgz",
+      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-5.4.2.tgz",
-      "integrity": "sha1-uqnsQRZe41rnud8ZvKEBkPNvEX4=",
+      "integrity": "sha512-alSN0KDAAOb1OkYujfoJjjk0JWxWRKO4sLGB4hN2CuvaJMrlj7bhGQe7CBMJvEFNjtJRbhJcquYVjQ3rrH2zQQ==",
      "requires": {
-        "hoist-non-react-statics": "^2.3.1"
+        "hoist-non-react-statics": "^3.0.0",
+        "react-lifecycles-compat": "^3.0.2"
+      },
+      "dependencies": {
+        "hoist-non-react-statics": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz",
+          "integrity": "sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==",
+          "requires": {
+            "react-is": "^16.3.2"
+          }
+        }
      }
    },
    "mobx-react-form": {
@@ -8934,19 +8780,6 @@
      "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
      "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y="
    },
-    "move-concurrently": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-      "requires": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
-      }
-    },
    "ms": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -9047,16 +8880,6 @@
        "is-stream": "^1.0.1"
      }
    },
-    "node-fetch-npm": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz",
-      "integrity": "sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==",
-      "requires": {
-        "encoding": "^0.1.11",
-        "json-parse-better-errors": "^1.0.0",
-        "safe-buffer": "^5.1.1"
-      }
-    },
    "node-gyp": {
      "version": "3.8.0",
      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
@@ -9178,6 +9001,7 @@
      "version": "2.4.0",
      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "dev": true,
      "requires": {
        "hosted-git-info": "^2.1.4",
        "is-builtin-module": "^1.0.0",
@@ -9188,7 +9012,8 @@
        "semver": {
          "version": "5.6.0",
          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+          "dev": true
        }
      }
    },
@@ -9220,54 +9045,6 @@
        "once": "^1.3.2"
      }
    },
-    "npm-bundled": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
-      "integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g=="
-    },
-    "npm-package-arg": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz",
-      "integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
-      "requires": {
-        "hosted-git-info": "^2.6.0",
-        "osenv": "^0.1.5",
-        "semver": "^5.5.0",
-        "validate-npm-package-name": "^3.0.0"
-      }
-    },
-    "npm-packlist": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.12.tgz",
-      "integrity": "sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==",
-      "requires": {
-        "ignore-walk": "^3.0.1",
-        "npm-bundled": "^1.0.1"
-      }
-    },
-    "npm-pick-manifest": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz",
-      "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
-      "requires": {
-        "figgy-pudding": "^3.5.1",
-        "npm-package-arg": "^6.0.0",
-        "semver": "^5.4.1"
-      }
-    },
-    "npm-registry-fetch": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.8.0.tgz",
-      "integrity": "sha512-hrw8UMD+Nob3Kl3h8Z/YjmKamb1gf7D1ZZch2otrIXM3uFLB5vjEY6DhMlq80z/zZet6eETLbOXcuQudCB3Zpw==",
-      "requires": {
-        "JSONStream": "^1.3.4",
-        "bluebird": "^3.5.1",
-        "figgy-pudding": "^3.4.1",
-        "lru-cache": "^4.1.3",
-        "make-fetch-happen": "^4.0.1",
-        "npm-package-arg": "^6.1.0"
-      }
-    },
    "npm-run-path": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -9409,6 +9186,18 @@
        "isobject": "^3.0.0"
      }
    },
+    "object.entries": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.0.4.tgz",
+      "integrity": "sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.6.1",
+        "function-bind": "^1.1.0",
+        "has": "^1.0.1"
+      }
+    },
    "object.map": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
@@ -9575,12 +9364,14 @@
    "os-tmpdir": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
    },
    "osenv": {
      "version": "0.1.5",
      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "dev": true,
      "requires": {
        "os-homedir": "^1.0.0",
        "os-tmpdir": "^1.0.0"
@@ -9640,88 +9431,11 @@
        "semver": "^5.1.0"
      }
    },
-    "pacote": {
-      "version": "9.2.3",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.2.3.tgz",
-      "integrity": "sha512-Y3+yY3nBRAxMlZWvr62XLJxOwCmG9UmkGZkFurWHoCjqF0cZL72cTOCRJTvWw8T4OhJS2RTg13x4oYYriauvEw==",
-      "requires": {
-        "bluebird": "^3.5.2",
-        "cacache": "^11.2.0",
-        "figgy-pudding": "^3.5.1",
-        "get-stream": "^4.1.0",
-        "glob": "^7.1.3",
-        "lru-cache": "^4.1.3",
-        "make-fetch-happen": "^4.0.1",
-        "minimatch": "^3.0.4",
-        "minipass": "^2.3.5",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "normalize-package-data": "^2.4.0",
-        "npm-package-arg": "^6.1.0",
-        "npm-packlist": "^1.1.12",
-        "npm-pick-manifest": "^2.2.3",
-        "npm-registry-fetch": "^3.8.0",
-        "osenv": "^0.1.5",
-        "promise-inflight": "^1.0.1",
-        "promise-retry": "^1.1.1",
-        "protoduck": "^5.0.1",
-        "rimraf": "^2.6.2",
-        "safe-buffer": "^5.1.2",
-        "semver": "^5.6.0",
-        "ssri": "^6.0.1",
-        "tar": "^4.4.6",
-        "unique-filename": "^1.1.1",
-        "which": "^1.3.1"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "minipass": {
-          "version": "2.3.5",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
-          "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
-          "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
-          }
-        },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        },
-        "yallist": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
-        }
-      }
-    },
    "pako": {
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.7.tgz",
      "integrity": "sha512-3HNK5tW4x8o5mO8RuHZp3Ydw9icZXx0RANAOMzlMzx7LVXhMJ4mo3MOBpzyd7r/+RUu8BmndP47LXT+vzjtWcQ=="
    },
-    "parallel-transform": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
-      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
-      "requires": {
-        "cyclist": "~0.2.2",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
-      }
-    },
    "parse-color": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/parse-color/-/parse-color-1.0.0.tgz",
@@ -9733,7 +9447,7 @@
      "dependencies": {
        "color-convert": {
          "version": "0.5.3",
-          "resolved": "http://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
          "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=",
          "dev": true
        }
@@ -9894,11 +9608,6 @@
      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
      "dev": true
    },
-    "performance-now": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
-    },
    "pify": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -10026,9 +9735,9 @@
      "dev": true
    },
    "progress": {
-      "version": "2.0.1",
+      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
      "dev": true
    },
    "progress-stream": {
@@ -10100,20 +9809,6 @@
        "asap": "~2.0.3"
      }
    },
-    "promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
-    },
-    "promise-retry": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz",
-      "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=",
-      "requires": {
-        "err-code": "^1.0.0",
-        "retry": "^0.10.0"
-      }
-    },
    "prop-types": {
      "version": "15.6.2",
      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz",
@@ -10131,14 +9826,6 @@
        "invariant": "^2.2.0"
      }
    },
-    "protoduck": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz",
-      "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==",
-      "requires": {
-        "genfun": "^5.0.0"
-      }
-    },
    "proxy-middleware": {
      "version": "0.15.0",
      "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.15.0.tgz",
@@ -10148,7 +9835,8 @@
    "pseudomap": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
    },
    "psl": {
      "version": "1.1.29",
@@ -10160,6 +9848,7 @@
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+      "dev": true,
      "requires": {
        "end-of-stream": "^1.1.0",
        "once": "^1.3.1"
@@ -10169,6 +9858,7 @@
      "version": "1.5.1",
      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
      "requires": {
        "duplexify": "^3.6.0",
        "inherits": "^2.0.3",
@@ -10201,21 +9891,6 @@
        "strict-uri-encode": "^1.0.0"
      }
    },
-    "raf": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz",
-      "integrity": "sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==",
-      "requires": {
-        "performance-now": "^2.1.0"
-      },
-      "dependencies": {
-        "performance-now": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-        }
-      }
-    },
    "randomatic": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.0.tgz",
@@ -10252,15 +9927,14 @@
      }
    },
    "react": {
-      "version": "15.6.2",
+      "version": "16.6.3",
-      "resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.6.3.tgz",
-      "integrity": "sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=",
+      "integrity": "sha512-zCvmH2vbEolgKxtqXL2wmGCUxUyNheYn/C+PD1YAjfxHC54+MhdruyhO7QieQrYsYeTxrn93PM2y0jRH1zEExw==",
      "requires": {
-        "create-react-class": "^15.6.0",
-        "fbjs": "^0.8.9",
        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.0",
+        "object-assign": "^4.1.1",
-        "prop-types": "^15.5.10"
+        "prop-types": "^15.6.2",
+        "scheduler": "^0.11.2"
      }
    },
    "react-addons-css-transition-group": {
@@ -10272,23 +9946,23 @@
      }
    },
    "react-dom": {
-      "version": "15.6.2",
+      "version": "16.6.3",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.6.3.tgz",
-      "integrity": "sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=",
+      "integrity": "sha512-8ugJWRCWLGXy+7PmNh8WJz3g1TaTUt1XyoIcFN+x0Zbkoz+KKdUyx1AQLYJdbFXjuF41Nmjn5+j//rxvhFjgSQ==",
      "requires": {
-        "fbjs": "^0.8.9",
        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.0",
+        "object-assign": "^4.1.1",
-        "prop-types": "^15.5.10"
+        "prop-types": "^15.6.2",
+        "scheduler": "^0.11.2"
      }
    },
    "react-dropzone": {
-      "version": "4.3.0",
+      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-4.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-7.0.1.tgz",
-      "integrity": "sha512-ULfrLaTSsd8BDa9KVAGCueuq1AN3L14dtMsGGqtP0UwYyjG4Vhf158f/ITSHuSPYkZXbvfcIiOlZsH+e3QWm+Q==",
+      "integrity": "sha512-J4rbzhFZPVW7k7K9CVb0OcwSOJGLWa0y+0rvtB4rBLVkvq0agH/o3kPJ0DCkd6ZVzL2K1NFqIOvtQkwQKpmJBA==",
      "requires": {
        "attr-accept": "^1.1.3",
-        "prop-types": "^15.5.7"
+        "prop-types": "^15.6.2"
      }
    },
    "react-electron-web-view": {
@@ -10300,9 +9974,9 @@
      }
    },
    "react-intl": {
-      "version": "2.7.1",
+      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.7.2.tgz",
-      "integrity": "sha512-Ndk0i04dSplBivA0/fELd8lMvIPuRizKC+F6s1EZ6jELvRKNcx9shWa8A1UIlTQfYSbys5huWCRgmylbW0e57A==",
+      "integrity": "sha512-3dcNGLqEw2FKkX+1L2WYLgjP0MVJkvWuVd1uLcnwifIQe8JQvnd9Bss4hb4Gvg/YhBIRcs4LM6C2bAgyklucjw==",
      "requires": {
        "hoist-non-react-statics": "^2.5.5",
        "intl-format-cache": "^2.0.5",
@@ -10311,6 +9985,11 @@
        "invariant": "^2.1.1"
      }
    },
+    "react-is": {
+      "version": "16.6.3",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.6.3.tgz",
+      "integrity": "sha512-u7FDWtthB4rWibG/+mFbVd5FvdI20yde86qKGx4lVUTWmPlSWQ4QxbBIrrs+HnXGbxOUlUzTAP/VDmvCwaP2yA=="
+    },
    "react-jss": {
      "version": "8.6.1",
      "resolved": "https://registry.npmjs.org/react-jss/-/react-jss-8.6.1.tgz",
@@ -10338,17 +10017,6 @@
        "spin.js": "2.x"
      }
    },
-    "react-motion": {
-      "version": "0.4.8",
-      "resolved": "https://registry.npmjs.org/react-motion/-/react-motion-0.4.8.tgz",
-      "integrity": "sha1-I7st0nwtjgDSKeRVctEF789Ao14=",
-      "requires": {
-        "create-react-class": "^15.5.2",
-        "performance-now": "^0.2.0",
-        "prop-types": "^15.5.8",
-        "raf": "^3.1.0"
-      }
-    },
    "react-router": {
      "version": "3.2.1",
      "resolved": "http://registry.npmjs.org/react-router/-/react-router-3.2.1.tgz",
@@ -10363,23 +10031,13 @@
        "warning": "^3.0.0"
      }
    },
-    "react-router-transition": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/react-router-transition/-/react-router-transition-0.1.1.tgz",
-      "integrity": "sha1-bMLLdHyyfk1WMsgsp1C0MSzNO9Y=",
-      "requires": {
-        "prop-types": "^15.5.8",
-        "react-motion": "^0.4.8"
-      }
-    },
    "react-sortable-hoc": {
-      "version": "0.6.8",
+      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/react-sortable-hoc/-/react-sortable-hoc-0.6.8.tgz",
+      "resolved": "https://registry.npmjs.org/react-sortable-hoc/-/react-sortable-hoc-0.8.4.tgz",
-      "integrity": "sha512-sUUAtNdV84AKZ2o+F5lVOOFWcyWG6aGDkNFgHoieB1zFLeWLWENkix06asPS4/GhigfuRh06aZix1j3Qx8+NSQ==",
+      "integrity": "sha512-J9AFEQAJ7u2YWdVzkU5E3ewrG82xQ4xF1ZPrZYKliDwlVBDkmjri+iKFAEt6NCDIRiBZ4hiN5vzI8pwy/dGPHw==",
      "requires": {
        "babel-runtime": "^6.11.6",
        "invariant": "^2.2.1",
-        "lodash": "^4.12.0",
        "prop-types": "^15.5.7"
      }
    },
@@ -10418,6 +10076,11 @@
        "react-lifecycles-compat": "^3.0.4"
      }
    },
+    "reactive-localstorage": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/reactive-localstorage/-/reactive-localstorage-0.0.2.tgz",
+      "integrity": "sha512-+3oKBiiNxBbLH9mWw6eiBOAbwQSg3xpRIg7ys+E5Zc98DKQ1zyoUcQygWDDwZAn6mka2kWTaZD+ZUSgmV2VzLA=="
+    },
    "read-config-file": {
      "version": "3.2.0",
      "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.2.0.tgz",
@@ -10507,6 +10170,7 @@
      "version": "2.3.6",
      "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "dev": true,
      "requires": {
        "core-util-is": "~1.0.0",
        "inherits": "~2.0.3",
@@ -10520,7 +10184,8 @@
        "process-nextick-args": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+          "dev": true
        }
      }
    },
@@ -10605,9 +10270,9 @@
      "integrity": "sha1-Hg9GUMhi3L/tVP1CsUjpuxch/PI="
    },
    "regexpp": {
-      "version": "1.1.0",
+      "version": "2.0.1",
-      "resolved": "http://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
-      "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==",
+      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
      "dev": true
    },
    "regexpu-core": {
@@ -10838,11 +10503,6 @@
      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
    },
-    "retry": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
-      "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q="
-    },
    "right-pad": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/right-pad/-/right-pad-1.0.1.tgz",
@@ -10853,6 +10513,7 @@
      "version": "2.6.2",
      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "dev": true,
      "requires": {
        "glob": "^7.0.5"
      }
@@ -10877,29 +10538,6 @@
      "integrity": "sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==",
      "dev": true
    },
-    "run-queue": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
-      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
-      "requires": {
-        "aproba": "^1.1.1"
-      }
-    },
-    "rx-lite": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
-      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true
-    },
-    "rx-lite-aggregates": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
-      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
-      "dev": true,
-      "requires": {
-        "rx-lite": "*"
-      }
-    },
    "rxjs": {
      "version": "5.5.12",
      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
@@ -10963,6 +10601,15 @@
      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
    },
+    "scheduler": {
+      "version": "0.11.3",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.11.3.tgz",
+      "integrity": "sha512-i9X9VRRVZDd3xZw10NY5Z2cVMbdYg6gqFecfj79USv1CFN+YrJ3gIPRKf1qlY+Sxly4djoKdfx1T+m9dnRB8kQ==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
+      }
+    },
    "scss-tokenizer": {
      "version": "0.2.3",
      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
@@ -11150,14 +10797,25 @@
      "dev": true
    },
    "slice-ansi": {
-      "version": "1.0.0",
+      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.0.0.tgz",
-      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "integrity": "sha512-4j2WTWjp3GsZ+AOagyzVbzp4vWGtZ0hEZ/gDY/uTvm6MTxUfTUIsnMIFb1bn8o0RuXiqUw15H1bue8f22Vw2oQ==",
      "dev": true,
      "requires": {
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
        "is-fullwidth-code-point": "^2.0.0"
      },
      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
        "is-fullwidth-code-point": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
@@ -11166,11 +10824,6 @@
        }
      }
    },
-    "smart-buffer": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.1.tgz",
-      "integrity": "sha512-RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg=="
-    },
    "smoothscroll-polyfill": {
      "version": "0.3.6",
      "resolved": "https://registry.npmjs.org/smoothscroll-polyfill/-/smoothscroll-polyfill-0.3.6.tgz",
@@ -11415,24 +11068,6 @@
        }
      }
    },
-    "socks": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.2.2.tgz",
-      "integrity": "sha512-g6wjBnnMOZpE0ym6e0uHSddz9p3a+WsBaaYQaBaSCJYvrC4IXykQR9MNGjLQf38e9iIIhp3b1/Zk8YZI3KGJ0Q==",
-      "requires": {
-        "ip": "^1.1.5",
-        "smart-buffer": "^4.0.1"
-      }
-    },
-    "socks-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==",
-      "requires": {
-        "agent-base": "~4.2.0",
-        "socks": "~2.2.0"
-      }
-    },
    "sort-keys": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
@@ -11513,6 +11148,7 @@
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz",
      "integrity": "sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==",
+      "dev": true,
      "requires": {
        "spdx-expression-parse": "^3.0.0",
        "spdx-license-ids": "^3.0.0"
@@ -11521,12 +11157,14 @@
    "spdx-exceptions": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+      "dev": true
    },
    "spdx-expression-parse": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "dev": true,
      "requires": {
        "spdx-exceptions": "^2.1.0",
        "spdx-license-ids": "^3.0.0"
@@ -11535,7 +11173,8 @@
    "spdx-license-ids": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz",
-      "integrity": "sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w=="
+      "integrity": "sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==",
+      "dev": true
    },
    "speedometer": {
      "version": "0.1.4",
@@ -11578,14 +11217,6 @@
        "tweetnacl": "~0.14.0"
      }
    },
-    "ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-      "requires": {
-        "figgy-pudding": "^3.5.1"
-      }
-    },
    "stack-trace": {
      "version": "0.0.10",
      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
@@ -11626,15 +11257,6 @@
        "readable-stream": "^2.0.1"
      }
    },
-    "stream-each": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
    "stream-exhaust": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
@@ -11644,7 +11266,8 @@
    "stream-shift": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+      "dev": true
    },
    "strict-uri-encode": {
      "version": "1.1.0",
@@ -11728,44 +11351,40 @@
      "dev": true
    },
    "table": {
-      "version": "4.0.2",
+      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.1.1.tgz",
-      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+      "integrity": "sha512-NUjapYb/qd4PeFW03HnAuOJ7OMcBkJlqeClWxeNlQ0lXGSb52oZXGzkO0/I0ARegQ2eUT1g2VDJH0eUxDRcHmw==",
      "dev": true,
      "requires": {
-        "ajv": "^5.2.3",
+        "ajv": "^6.6.1",
-        "ajv-keywords": "^2.1.0",
+        "lodash": "^4.17.11",
-        "chalk": "^2.1.0",
+        "slice-ansi": "2.0.0",
-        "lodash": "^4.17.4",
-        "slice-ansi": "1.0.0",
        "string-width": "^2.1.1"
      },
      "dependencies": {
+        "ajv": {
+          "version": "6.6.1",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.1.tgz",
+          "integrity": "sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
        "ansi-regex": {
          "version": "3.0.0",
          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
          "dev": true
        },
-        "ansi-styles": {
+        "fast-deep-equal": {
-          "version": "3.2.1",
+          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true,
+          "dev": true
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
        },
        "is-fullwidth-code-point": {
          "version": "2.0.0",
@@ -11773,6 +11392,12 @@
          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
          "dev": true
        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
        "string-width": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -11791,15 +11416,6 @@
          "requires": {
            "ansi-regex": "^3.0.0"
          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
        }
      }
    },
@@ -11870,12 +11486,14 @@
    "through": {
      "version": "2.3.8",
      "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
    },
    "through2": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+      "dev": true,
      "requires": {
        "readable-stream": "^2.1.5",
        "xtend": "~4.0.1"
@@ -11910,6 +11528,15 @@
      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
      "dev": true
    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
    "to-absolute-glob": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
@@ -12059,7 +11686,8 @@
    "typedarray": {
      "version": "0.0.6",
      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
    },
    "ua-parser-js": {
      "version": "0.7.18",
@@ -12160,22 +11788,6 @@
        }
      }
    },
-    "unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "requires": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "unique-slug": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
-      "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
-      "requires": {
-        "imurmurhash": "^0.1.4"
-      }
-    },
    "unique-stream": {
      "version": "2.2.1",
      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz",
@@ -12402,19 +12014,12 @@
      "version": "3.0.4",
      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
      "requires": {
        "spdx-correct": "^3.0.0",
        "spdx-expression-parse": "^3.0.0"
      }
    },
-    "validate-npm-package-name": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-      "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
-      "requires": {
-        "builtins": "^1.0.3"
-      }
-    },
    "value-or-function": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
@@ -12777,7 +12382,8 @@
    "yallist": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true
    },
    "yargs": {
      "version": "7.1.0",
diff --git a/package.json b/package.json
index 6c6adee5d..551727ca9 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "franz",
  "productName": "Franz",
  "appId": "com.meetfranz.franz",
-  "version": "5.0.0-beta.20",
+  "version": "5.0.0-beta.21",
  "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
  "copyright": "adlk x franz - Stefan Malzner",
  "main": "index.js",
@@ -33,7 +33,7 @@
    "@meetfranz/electron-notification-state": "^1.0.0",
    "address-rfc2822": "^2.0.1",
    "auto-launch": "https://github.com/meetfranz/node-auto-launch.git",
-    "classnames": "^2.2.5",
+    "classnames": "2.2.6",
    "debug-electron": "^0.0.4",
    "du": "^0.1.0",
    "electron-dl": "1.12.0",
@@ -44,7 +44,7 @@
    "electron-window-state": "^4.1.0",
    "fs-extra": "7.0.1",
    "gulp-cli": "1.2.2",
-    "hunspell-dict-downloader": "1.0.0",
+    "hex-to-rgba": "1.0.2",
    "ini": "^1.3.4",
    "jshashes": "^1.0.6",
    "jsonwebtoken": "^7.4.1",
@@ -54,28 +54,27 @@
    "mime-types": "2.1.21",
    "minimist": "^1.2.0",
    "mkdirp": "^0.5.1",
-    "mobx": "^3.1.0",
+    "mobx": "5.7.0",
-    "mobx-localstorage": "^0.1.7",
+    "mobx-localstorage": "1.1.0",
-    "mobx-react": "^4.1.0",
+    "mobx-react": "5.4.2",
-    "mobx-react-form": "^1.32.2",
+    "mobx-react-form": "1.35.1",
-    "mobx-react-router": "^3.1.2",
+    "mobx-react-router": "3.1.2",
    "moment": "^2.17.1",
    "normalize-url": "^1.9.1",
    "pretty-bytes": "^4.0.2",
    "prop-types": "^15.5.10",
    "prop-types-extended": "^0.2.1",
-    "react": "^15.4.1",
+    "react": "16.6.3",
-    "react-addons-css-transition-group": "^15.4.2",
+    "react-addons-css-transition-group": "15.6.2",
-    "react-dom": "^15.4.1",
+    "react-dom": "16.6.3",
-    "react-dropzone": "^4.2.1",
+    "react-dropzone": "7.0.1",
    "react-electron-web-view": "^2.0.1",
-    "react-intl": "^2.3.0",
+    "react-intl": "2.7.2",
    "react-jss": "8.6.1",
-    "react-loader": "^2.4.0",
+    "react-loader": "2.4.5",
    "react-router": "^3.0.2",
-    "react-router-transition": "^0.1.1",
+    "react-sortable-hoc": "0.8.4",
-    "react-sortable-hoc": "^0.6.7",
+    "react-tooltip": "3.9.0",
-    "react-tooltip": "^3.2.7",
    "route-parser": "^0.0.5",
    "semver": "^5.4.1",
    "smoothscroll-polyfill": "^0.3.4",
@@ -84,7 +83,8 @@
  },
  "devDependencies": {
    "@adlk/misty": "^0.1.1",
-    "@babel/core": "^7.0.0",
+    "@babel/cli": "7.0.0",
+    "@babel/core": "7.0.0",
    "@babel/plugin-proposal-class-properties": "^7.0.0",
    "@babel/plugin-proposal-decorators": "^7.0.0",
    "@babel/plugin-proposal-export-default-from": "^7.0.0",
@@ -93,20 +93,20 @@
    "@babel/plugin-transform-regenerator": "^7.0.0",
    "@babel/preset-env": "^7.0.0",
    "@babel/preset-react": "^7.0.0",
-    "@babel/register": "^7.0.0",
+    "@babel/register": "7.0.0",
-    "babel-eslint": "^10.0.1",
+    "babel-eslint": "10.0.1",
    "cross-env": "^5.0.5",
-    "cz-conventional-changelog": "^2.0.0",
+    "cz-conventional-changelog": "2.1.0",
    "dotenv": "^4.0.0",
    "electron": "^2.0.13",
    "electron-builder": "20.34.0",
    "electron-rebuild": "^1.6.0",
-    "eslint": "^4.7.1",
+    "eslint": "5.10.0",
-    "eslint-config-airbnb": "^14.1.0",
+    "eslint-config-airbnb": "17.1.0",
    "eslint-loader": "^1.9.0",
-    "eslint-plugin-import": "^2.2.0",
+    "eslint-plugin-import": "2.14.0",
-    "eslint-plugin-jsx-a11y": "^3.0.0",
+    "eslint-plugin-jsx-a11y": "6.1.2",
-    "eslint-plugin-react": "^6.10.0",
+    "eslint-plugin-react": "7.11.1",
    "gulp": "^4.0.0",
    "gulp-babel": "^8.0.0",
    "gulp-sass": "^4.0.2",
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 164419951..2871769a9 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -42,6 +42,7 @@ const API_VERSION = 'v1';
 export default class ServerApi {
  recipePreviews = [];
  recipes = [];
  // User
@@ -522,8 +523,7 @@ export default class ServerApi {
          const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/recipes/${s.service}`,
            this._prepareAuthRequest({
              method: 'GET',
-            }),
+            }));
-          );
          if (request.status === 200) {
            const data = await request.json();
@@ -549,9 +549,9 @@ export default class ServerApi {
    await this._bulkRecipeCheck(recipes);
-    return Promise.all(services
+    /* eslint-disable no-return-await */
-      .map(async service => await this._prepareServiceModel(service)) // eslint-disable-line
+    return Promise.all(services.map(async service => await this._prepareServiceModel(service)));
-    );
+    /* eslint-enable no-return-await */
  }
  async _prepareServiceModel(service) {
@@ -596,8 +596,7 @@ 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) {
diff --git a/src/app.js b/src/app.js
index 43d0cf018..831dd93ce 100644
--- a/src/app.js
+++ b/src/app.js
@@ -4,7 +4,9 @@ import React from 'react';
 import { render } from 'react-dom';
 import { Provider } from 'mobx-react';
 import { syncHistoryWithStore, RouterStore } from 'mobx-react-router';
-import { Router, Route, hashHistory, IndexRedirect } from 'react-router';
+import {
+  Router, Route, hashHistory, IndexRedirect,
+} from 'react-router';
 import '@babel/polyfill';
 import smoothScroll from 'smoothscroll-polyfill';
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js
index 4fb0e6a59..ac8fdbe5b 100644
--- a/src/components/auth/AuthLayout.js
+++ b/src/components/auth/AuthLayout.js
@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { RouteTransition } from 'react-router-transition';
 import { intlShape } from 'react-intl';
 import { TitleBar } from 'electron-react-titlebar';
@@ -16,7 +15,6 @@ import { isWindows } from '../../environment';
 export default @observer class AuthLayout extends Component {
  static propTypes = {
    children: oneOrManyChildElements.isRequired,
-    pathname: PropTypes.string.isRequired,
    error: globalErrorPropType.isRequired,
    isOnline: PropTypes.bool.isRequired,
    isAPIHealthy: PropTypes.bool.isRequired,
@@ -33,7 +31,6 @@ export default @observer class AuthLayout extends Component {
  render() {
    const {
      children,
-      pathname,
      error,
      isOnline,
      isAPIHealthy,
@@ -46,8 +43,8 @@ export default @observer class AuthLayout extends Component {
    return (
      <div className={darkMode ? 'theme__dark' : ''}>
-        {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />}
+        {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon="assets/images/logo.svg" />}
-        <div className={'auth'}>
+        <div className="auth">
          {!isOnline && (
            <InfoBar
              type="warning"
@@ -69,22 +66,10 @@ export default @observer class AuthLayout extends Component {
            </InfoBar>
          )}
          <div className="auth__layout">
-            <RouteTransition
+            {/* Inject globalError into children  */}
-              pathname={pathname}
+            {React.cloneElement(children, {
-              atEnter={{ opacity: 0 }}
+              error,
-              atLeave={{ opacity: 0 }}
+            })}
-              atActive={{ opacity: 1 }}
-              mapStyles={styles => ({
-                transform: `translateX(${styles.translateX}%)`,
-                opacity: styles.opacity,
-              })}
-              component="span"
-            >
-              {/* Inject globalError into children  */}
-              {React.cloneElement(children, {
-                error,
-              })}
-            </RouteTransition>
          </div>
          {/* </div> */}
          <Link to="https://adlk.io" className="auth__adlk" target="_blank">
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index 96821a61a..fd957ee73 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
@@ -127,7 +127,7 @@ export default @observer class Invite extends Component {
    });
    const renderForm = (
-      <div>
+      <Fragment>
        {this.state.showSuccessInfo && isInviteSuccessful && (
          <Appear>
            <Infobox
@@ -141,11 +141,13 @@ export default @observer class Invite extends Component {
        )}
        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
-          {!embed && (<img
+          {!embed && (
-            src="./assets/images/logo.svg"
+            <img
-            className="auth__logo"
+              src="./assets/images/logo.svg"
-            alt=""
+              className="auth__logo"
-          />)}
+              alt=""
+            />
+          )}
          <h1 className={embed && 'invite__embed'}>
            {intl.formatMessage(messages.headline)}
          </h1>
@@ -164,14 +166,16 @@ export default @observer class Invite extends Component {
            label={intl.formatMessage(messages.submitButtonLabel)}
            loaded={!isLoadingInvite}
          />
-          {!embed && (<Link
+          {!embed && (
-            to="/"
+            <Link
-            className="franz-form__button franz-form__button--secondary auth__button auth__button--skip"
+              to="/"
-          >
+              className="franz-form__button franz-form__button--secondary auth__button auth__button--skip"
-            {intl.formatMessage(messages.skipButtonLabel)}
+            >
-          </Link>)}
+              {intl.formatMessage(messages.skipButtonLabel)}
+            </Link>
+          )}
        </form>
-      </div>
+      </Fragment>
    );
    return (
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index f465b35a5..5d21f8b60 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -11,11 +11,8 @@ import Button from '../ui/Button';
 import Link from '../ui/Link';
 import Infobox from '../ui/Infobox';
 import { globalError as globalErrorPropType } from '../../prop-types';
-// import Appear from '../ui/effects/Appear';
 const messages = defineMessages({
  headline: {
    id: 'login.headline',
@@ -86,18 +83,18 @@ export default @observer class Login extends Component {
    },
  }, this.context.intl);
+  emailField = null;
  submit(e) {
    e.preventDefault();
    this.form.submit({
      onSuccess: (form) => {
        this.props.onSubmit(form.values());
      },
-      onError: () => {},
+      onError: () => { },
    });
  }
-  emailField = null;
  render() {
    const { form } = this;
    const { intl } = this.context;
diff --git a/src/components/auth/Pricing.js b/src/components/auth/Pricing.js
index f08129568..7ab14f429 100644
--- a/src/components/auth/Pricing.js
+++ b/src/components/auth/Pricing.js
@@ -69,18 +69,29 @@ export default @observer class Signup extends Component {
                donor.amount ? (
                  <span>
                    <p>
-                      Thank you so much for your previous donation of <strong>$ {donor.amount}</strong>.
+                      Thank you so much for your previous donation of
+                      {' '}
+                      <strong>
+                        $
+                        {donor.amount}
+                      </strong>
+                      .
                      <br />
                      Your support allowed us to get where we are today.
                      <br />
                    </p>
                    <p>
-                      As an early supporter, you get <strong>a lifetime premium supporter license</strong> without any
+                      As an early supporter, you get
+                      {' '}
+                      <strong>a lifetime premium supporter license</strong>
+                      {' '}
+                      without any
                      additional charges.
                    </p>
                    <p>
                      However, If you want to keep supporting us, you are more than welcome to subscribe to a plan.
-                      <br /><br />
+                      <br />
+                      <br />
                    </p>
                  </span>
                ) : (
@@ -113,12 +124,6 @@ export default @observer class Signup extends Component {
                  hideInfo={Boolean(donor.amount)}
                  skipButtonLabel={intl.formatMessage(messages.skipPayment)}
                />
-                {/* <Link
-                  to={inviteRoute}
-                  className="franz-form__button franz-form__button--secondary auth__button auth__button--skip"
-                >
-                  {intl.formatMessage(messages.skipPayment)}
-                </Link> */}
              </Appear>
            </Loader>
          </form>
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index bbcad8b67..d9b83eeb8 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -199,7 +199,8 @@ export default @observer class Signup extends Component {
                className="link"
              >
                {intl.formatMessage(messages.privacy)}
-              </Link>.
+              </Link>
+              .
            </p>
          </form>
          <div className="auth__links">
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 3ababe54a..dbe0bb4b6 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -6,6 +6,8 @@ import { TitleBar } from 'electron-react-titlebar';
 import InfoBar from '../ui/InfoBar';
 import { Component as DelayApp } from '../../features/delayApp';
+import ErrorBoundary from '../util/ErrorBoundary';
 import globalMessages from '../../i18n/globalMessages';
 import { isWindows } from '../../environment';
@@ -94,74 +96,78 @@ export default @observer class AppLayout extends Component {
    const { intl } = this.context;
    return (
-      <div className={(darkMode ? 'theme__dark' : '')}>
+      <ErrorBoundary>
-        <div className="app">
+        <div className={(darkMode ? 'theme__dark' : '')}>
-          {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />}
+          <div className="app">
-          <div className="app__content">
+            {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon="assets/images/logo.svg" />}
-            {sidebar}
+            <div className="app__content">
-            <div className="app__service">
+              {sidebar}
-              {news.length > 0 && news.map(item => (
+              <div className="app__service">
-                <InfoBar
+                {news.length > 0 && news.map(item => (
-                  key={item.id}
+                  <InfoBar
-                  position="top"
+                    key={item.id}
-                  type={item.type}
+                    position="top"
-                  sticky={item.sticky}
+                    type={item.type}
-                  onHide={() => removeNewsItem({ newsId: item.id })}
+                    sticky={item.sticky}
-                >
+                    onHide={() => removeNewsItem({ newsId: item.id })}
-                  <span dangerouslySetInnerHTML={createMarkup(item.message)} />
+                  >
-                </InfoBar>
+                    <span dangerouslySetInnerHTML={createMarkup(item.message)} />
-              ))}
+                  </InfoBar>
-              {!isOnline && (
+                ))}
-                <InfoBar
+                {!isOnline && (
-                  type="danger"
+                  <InfoBar
-                >
+                    type="danger"
-                  <span className="mdi mdi-flash" />
+                  >
-                  {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
+                    <span className="mdi mdi-flash" />
-                </InfoBar>
+                    {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
-              )}
+                  </InfoBar>
-              {!areRequiredRequestsSuccessful && showRequiredRequestsError && (
+                )}
-                <InfoBar
+                {!areRequiredRequestsSuccessful && showRequiredRequestsError && (
-                  type="danger"
+                  <InfoBar
-                  ctaLabel="Try again"
+                    type="danger"
-                  ctaLoading={areRequiredRequestsLoading}
+                    ctaLabel="Try again"
-                  sticky
+                    ctaLoading={areRequiredRequestsLoading}
-                  onClick={retryRequiredRequests}
+                    sticky
-                >
+                    onClick={retryRequiredRequests}
-                  <span className="mdi mdi-flash" />
+                  >
-                  {intl.formatMessage(messages.requiredRequestsFailed)}
+                    <span className="mdi mdi-flash" />
-                </InfoBar>
+                    {intl.formatMessage(messages.requiredRequestsFailed)}
-              )}
+                  </InfoBar>
-              {showServicesUpdatedInfoBar && (
+                )}
-                <InfoBar
+                {showServicesUpdatedInfoBar && (
-                  type="primary"
+                  <InfoBar
-                  ctaLabel={intl.formatMessage(messages.buttonReloadServices)}
+                    type="primary"
-                  onClick={reloadServicesAfterUpdate}
+                    ctaLabel={intl.formatMessage(messages.buttonReloadServices)}
-                  sticky
+                    onClick={reloadServicesAfterUpdate}
-                >
+                    sticky
-                  <span className="mdi mdi-power-plug" />
+                  >
-                  {intl.formatMessage(messages.servicesUpdated)}
+                    <span className="mdi mdi-power-plug" />
-                </InfoBar>
+                    {intl.formatMessage(messages.servicesUpdated)}
-              )}
+                  </InfoBar>
-              {appUpdateIsDownloaded && (
+                )}
-                <InfoBar
+                {appUpdateIsDownloaded && (
-                  type="primary"
+                  <InfoBar
-                  ctaLabel={intl.formatMessage(messages.buttonInstallUpdate)}
+                    type="primary"
-                  onClick={installAppUpdate}
+                    ctaLabel={intl.formatMessage(messages.buttonInstallUpdate)}
-                  sticky
+                    onClick={installAppUpdate}
-                >
+                    sticky
-                  <span className="mdi mdi-information" />
+                  >
-                  {intl.formatMessage(messages.updateAvailable)} <a href="https://meetfranz.com/changelog" target="_blank">
+                    <span className="mdi mdi-information" />
-                    <u>{intl.formatMessage(messages.changelog)}</u>
+                    {intl.formatMessage(messages.updateAvailable)}
-                  </a>
+                    {' '}
-                </InfoBar>
+                    <a href="https://meetfranz.com/changelog" target="_blank">
-              )}
+                      <u>{intl.formatMessage(messages.changelog)}</u>
-              {isDelayAppScreenVisible && (<DelayApp />)}
+                    </a>
-              {services}
+                  </InfoBar>
+                )}
+                {isDelayAppScreenVisible && (<DelayApp />)}
+                {services}
+              </div>
            </div>
          </div>
+          {children}
        </div>
-        {children}
+      </ErrorBoundary>
-      </div>
    );
  }
 }
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 6ea95bf88..609a3b604 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -65,6 +65,7 @@ export default @observer class Sidebar extends Component {
          disableToolTip={() => this.disableToolTip()}
        />
        <button
+          type="button"
          onClick={toggleMuteApp}
          className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
          data-tip={`${intl.formatMessage(isAppMuted ? messages.unmute : messages.mute)} (${ctrlKey}+Shift+M)`}
@@ -72,6 +73,7 @@ export default @observer class Sidebar extends Component {
          <i className={`mdi mdi-bell${isAppMuted ? '-off' : ''}`} />
        </button>
        <button
+          type="button"
          onClick={() => openSettings({ path: 'recipes' })}
          className="sidebar__button sidebar__button--new-service"
          data-tip={`${intl.formatMessage(messages.addNewService)} (${ctrlKey}+N)`}
@@ -79,6 +81,7 @@ export default @observer class Sidebar extends Component {
          <i className="mdi mdi-plus-box" />
        </button>
        <button
+          type="button"
          onClick={() => openSettings({ path: 'app' })}
          className="sidebar__button sidebar__button--settings"
          data-tip={`${intl.formatMessage(messages.settings)} (${ctrlKey}+,)`}
diff --git a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
new file mode 100644
index 000000000..415a8d1b5
--- /dev/null
+++ b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
@@ -0,0 +1,84 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import injectSheet from 'react-jss';
+import Button from '../../../ui/Button';
+import styles from './styles';
+const messages = defineMessages({
+  headline: {
+    id: 'service.errorHandler.headline',
+    defaultMessage: '!!!Oh no!',
+  },
+  text: {
+    id: 'service.errorHandler.text',
+    defaultMessage: '!!!{name} has failed to load.',
+  },
+  action: {
+    id: 'service.errorHandler.action',
+    defaultMessage: '!!!Reload {name}',
+  },
+  editAction: {
+    id: 'service.errorHandler.editAction',
+    defaultMessage: '!!!Edit {name}',
+  },
+  errorMessage: {
+    id: 'service.errorHandler.message',
+    defaultMessage: '!!!Error:',
+  },
+});
+export default @injectSheet(styles) @observer class WebviewCrashHandler extends Component {
+  static propTypes = {
+    name: PropTypes.string.isRequired,
+    reload: PropTypes.func.isRequired,
+    edit: PropTypes.func.isRequired,
+    errorMessage: PropTypes.string.isRequired,
+    classes: PropTypes.object.isRequired,
+  };
+  static contextTypes = {
+    intl: intlShape,
+  };
+  render() {
+    const {
+      name,
+      reload,
+      edit,
+      errorMessage,
+      classes,
+    } = this.props;
+    const { intl } = this.context;
+    return (
+      <div className={classes.component}>
+        <h1>{intl.formatMessage(messages.headline)}</h1>
+        <p>{intl.formatMessage(messages.text, { name })}</p>
+        <p>
+          <strong>
+            {intl.formatMessage(messages.errorMessage)}
+:
+          </strong>
+          {' '}
+          {errorMessage}
+        </p>
+        <div className={classes.buttonContainer}>
+          <Button
+            label={intl.formatMessage(messages.editAction, { name })}
+            buttonType="inverted"
+            onClick={() => edit()}
+          />
+          <Button
+            label={intl.formatMessage(messages.action, { name })}
+            buttonType="inverted"
+            onClick={() => reload()}
+          />
+        </div>
+      </div>
+    );
+  }
+}
diff --git a/src/components/services/content/ErrorHandlers/styles.js b/src/components/services/content/ErrorHandlers/styles.js
new file mode 100644
index 000000000..f11386798
--- /dev/null
+++ b/src/components/services/content/ErrorHandlers/styles.js
@@ -0,0 +1,25 @@
+export default {
+  component: {
+    left: 0,
+    position: 'absolute',
+    top: 0,
+    width: '100%',
+    zIndex: 0,
+    alignItems: 'center',
+    // background: $theme-gray-lighter;
+    display: 'flex',
+    flexDirection: 'column',
+    justifyContent: 'center',
+    textAlign: 'center',
+  },
+  buttonContainer: {
+    display: 'flex',
+    flexDirection: 'row',
+    height: 'auto',
+    margin: [40, 0, 20],
+    '& button': {
+      margin: [0, 10, 0, 10],
+    },
+  },
+};
diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js
index 58fb38d8c..d0f12256e 100644
--- a/src/components/services/content/ServiceDisabled.js
+++ b/src/components/services/content/ServiceDisabled.js
@@ -27,6 +27,7 @@ export default @observer class ServiceDisabled extends Component {
  };
  countdownInterval = null;
  countdownIntervalTimeout = 1000;
  render() {
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 7163209ee..b1a2c0207 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { autorun } from 'mobx';
 import { observer } from 'mobx-react';
@@ -7,7 +7,9 @@ import classnames from 'classnames';
 import ServiceModel from '../../../models/Service';
 import StatusBarTargetUrl from '../../ui/StatusBarTargetUrl';
+import WebviewLoader from '../../ui/WebviewLoader';
 import WebviewCrashHandler from './WebviewCrashHandler';
+import WebviewErrorHandler from './ErrorHandlers/WebviewErrorHandler';
 import ServiceDisabled from './ServiceDisabled';
 export default @observer class ServiceWebview extends Component {
@@ -15,8 +17,10 @@ export default @observer class ServiceWebview extends Component {
    service: PropTypes.instanceOf(ServiceModel).isRequired,
    setWebviewReference: PropTypes.func.isRequired,
    reload: PropTypes.func.isRequired,
+    edit: PropTypes.func.isRequired,
    isAppMuted: PropTypes.bool.isRequired,
    enable: PropTypes.func.isRequired,
+    isActive: PropTypes.bool,
  };
  static defaultProps = {
@@ -29,8 +33,12 @@ export default @observer class ServiceWebview extends Component {
    statusBarVisible: false,
  };
+  autorunDisposer = null;
+  webview = null;
  componentDidMount() {
-    autorun(() => {
+    this.autorunDisposer = autorun(() => {
      if (this.props.service.isActive) {
        this.setState({ forceRepaint: true });
        setTimeout(() => {
@@ -40,6 +48,10 @@ export default @observer class ServiceWebview extends Component {
    });
  }
+  componentWillUnmount() {
+    this.autorunDisposer();
+  }
  updateTargetUrl = (event) => {
    let visible = true;
    if (event.url === '' || event.url === '#') {
@@ -51,13 +63,12 @@ export default @observer class ServiceWebview extends Component {
    });
  }
-  webview = null;
  render() {
    const {
      service,
      setWebviewReference,
      reload,
+      edit,
      isAppMuted,
      enable,
    } = this.props;
@@ -78,25 +89,47 @@ export default @observer class ServiceWebview extends Component {
    return (
      <div className={webviewClasses}>
-        {service.hasCrashed && (
+        {service.isActive && service.isEnabled && (
-          <WebviewCrashHandler
+          <Fragment>
-            name={service.recipe.name}
+            {service.hasCrashed && (
-            webview={service.webview}
+              <WebviewCrashHandler
-            reload={reload}
+                name={service.recipe.name}
-          />
+                webview={service.webview}
+                reload={reload}
+              />
+            )}
+            {service.isEnabled && service.isLoading && service.isFirstLoad && (
+              <WebviewLoader
+                loaded={false}
+                name={service.name}
+              />
+            )}
+            {service.isError && (
+              <WebviewErrorHandler
+                name={service.recipe.name}
+                errorMessage={service.errorMessage}
+                reload={reload}
+                edit={edit}
+              />
+            )}
+          </Fragment>
        )}
        {!service.isEnabled ? (
-          <ServiceDisabled
+          <Fragment>
-            name={service.recipe.name}
+            {service.isActive && (
-            webview={service.webview}
+              <ServiceDisabled
-            enable={enable}
+                name={service.recipe.name}
-          />
+                webview={service.webview}
+                enable={enable}
+              />
+            )}
+          </Fragment>
        ) : (
          <Webview
            ref={(element) => { this.webview = element; }}
            autosize
            src={service.url}
-            preload="./webview/plugin.js"
+            preload="./webview/recipe.js"
            partition={`persist:service-${service.id}`}
            onDidAttach={() => setWebviewReference({
              serviceId: service.id,
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index 4cbd51043..1aeb17e03 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -20,18 +20,18 @@ const messages = defineMessages({
 export default @observer class Services extends Component {
  static propTypes = {
-    services: MobxPropTypes.arrayOrObservableArray.isRequired,
+    services: MobxPropTypes.arrayOrObservableArray,
    setWebviewReference: PropTypes.func.isRequired,
    handleIPCMessage: PropTypes.func.isRequired,
    openWindow: PropTypes.func.isRequired,
    reload: PropTypes.func.isRequired,
+    openSettings: PropTypes.func.isRequired,
    isAppMuted: PropTypes.bool.isRequired,
    update: PropTypes.func.isRequired,
  };
  static defaultProps = {
    services: [],
-    activeService: '',
  };
  static contextTypes = {
@@ -45,6 +45,7 @@ export default @observer class Services extends Component {
      setWebviewReference,
      openWindow,
      reload,
+      openSettings,
      isAppMuted,
      update,
    } = this.props;
@@ -79,6 +80,7 @@ export default @observer class Services extends Component {
            setWebviewReference={setWebviewReference}
            openWindow={openWindow}
            reload={() => reload({ serviceId: service.id })}
+            edit={() => openSettings({ path: `services/edit/${service.id}` })}
            isAppMuted={isAppMuted}
            enable={() => update({
              serviceId: service.id,
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js
index 3be1fccf4..42bc3c877 100644
--- a/src/components/services/content/WebviewCrashHandler.js
+++ b/src/components/services/content/WebviewCrashHandler.js
@@ -38,13 +38,18 @@ export default @observer class WebviewCrashHandler extends Component {
    countdown: 10000,
  }
+  countdownInterval = null;
+  countdownIntervalTimeout = 1000;
  componentDidMount() {
    const { reload } = this.props;
    this.countdownInterval = setInterval(() => {
-      this.setState({
+      this.setState(prevState => ({
-        countdown: this.state.countdown - this.countdownIntervalTimeout,
+        countdown: prevState.countdown - this.countdownIntervalTimeout,
-      });
+      }));
      if (this.state.countdown <= 0) {
        reload();
@@ -53,9 +58,6 @@ export default @observer class WebviewCrashHandler extends Component {
    }, this.countdownIntervalTimeout);
  }
-  countdownInterval = null;
-  countdownIntervalTimeout = 1000;
  render() {
    const { name, reload } = this.props;
    const { intl } = this.context;
@@ -70,10 +72,12 @@ export default @observer class WebviewCrashHandler extends Component {
          buttonType="inverted"
          onClick={() => reload()}
        />
-        <p className="footnote">{intl.formatMessage(messages.autoReload, {
+        <p className="footnote">
-          name,
+          {intl.formatMessage(messages.autoReload, {
-          seconds: this.state.countdown / 1000,
+            name,
-        })}</p>
+            seconds: this.state.countdown / 1000,
+          })}
+        </p>
      </div>
    );
  }
diff --git a/src/components/settings/SettingsLayout.js b/src/components/settings/SettingsLayout.js
index 3cb08feb1..72ba7b2e3 100644
--- a/src/components/settings/SettingsLayout.js
+++ b/src/components/settings/SettingsLayout.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
+import ErrorBoundary from '../util/ErrorBoundary';
 import { oneOrManyChildElements } from '../../prop-types';
 import Appear from '../ui/effects/Appear';
@@ -36,18 +37,22 @@ export default @observer class SettingsLayout extends Component {
    return (
      <Appear transitionName="fadeIn-fast">
        <div className="settings-wrapper">
-          <button
+          <ErrorBoundary>
-            className="settings-wrapper__action"
-            onClick={closeSettings}
-          />
-          <div className="settings franz-form">
-            {navigation}
-            {children}
            <button
-              className="settings__close mdi mdi-close"
+              type="button"
+              className="settings-wrapper__action"
              onClick={closeSettings}
            />
-          </div>
+            <div className="settings franz-form">
+              {navigation}
+              {children}
+              <button
+                type="button"
+                className="settings__close mdi mdi-close"
+                onClick={closeSettings}
+              />
+            </div>
+          </ErrorBoundary>
        </div>
      </Appear>
    );
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 06c7074dd..9c9543749 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
@@ -132,21 +132,19 @@ export default @observer class AccountDashboard extends Component {
          )}
          {!isLoading && userInfoRequestFailed && (
-            <div>
+            <Infobox
-              <Infobox
+              icon="alert"
-                icon="alert"
+              type="danger"
-                type="danger"
+              ctaLabel={intl.formatMessage(messages.tryReloadUserInfoRequest)}
-                ctaLabel={intl.formatMessage(messages.tryReloadUserInfoRequest)}
+              ctaLoading={isLoading}
-                ctaLoading={isLoading}
+              ctaOnClick={retryUserInfoRequest}
-                ctaOnClick={retryUserInfoRequest}
+            >
-              >
+              {intl.formatMessage(messages.userInfoRequestFailed)}
-                {intl.formatMessage(messages.userInfoRequestFailed)}
+            </Infobox>
-              </Infobox>
-            </div>
          )}
          {!userInfoRequestFailed && (
-            <div>
+            <Fragment>
              {!isLoading && (
                <div className="account">
                  <div className="account__box account__box--flex">
@@ -169,7 +167,8 @@ export default @observer class AccountDashboard extends Component {
                        {`${user.firstname} ${user.lastname}`}
                      </h2>
                      {user.organization && `${user.organization}, `}
-                      {user.email}<br />
+                      {user.email}
+                      <br />
                      {!user.isEnterprise && !user.isPremium && (
                        <span className="badge badge">{intl.formatMessage(messages.accountTypeBasic)}</span>
                      )}
@@ -194,7 +193,7 @@ export default @observer class AccountDashboard extends Component {
                ) : (
                  <div className="account franz-form">
                    {orders.length > 0 && (
-                      <div>
+                      <Fragment>
                        <div className="account__box">
                          <h2>{intl.formatMessage(messages.headlineSubscription)}</h2>
                          <div className="account__subscription">
@@ -219,6 +218,7 @@ export default @observer class AccountDashboard extends Component {
                                  </td>
                                  <td className="invoices__action">
                                    <button
+                                      type="button"
                                      onClick={() => openExternalUrl(order.invoiceUrl)}
                                    >
                                      {intl.formatMessage(messages.invoiceDownload)}
@@ -229,7 +229,7 @@ export default @observer class AccountDashboard extends Component {
                            </tbody>
                          </table>
                        </div>
-                      </div>
+                      </Fragment>
                    )}
                  </div>
                )
@@ -262,20 +262,6 @@ export default @observer class AccountDashboard extends Component {
                </div>
              )}
-              {user.isMiner && (
-                <div className="account franz-form">
-                  <div className="account__box account__box">
-                    <h2>Miner Info</h2>
-                    <div className="account__subscription">
-                      <div>
-                        <p>To maintain a high security level for all our Franz users, we had to remove the miner. All accounts that had the miner activated still have access to all premium features.</p>
-                        <p>Every financial support is still much appreciated.</p>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              )}
              {!user.isEnterprise && !user.isPremium && (
                isLoadingPlans ? (
                  <Loader />
@@ -312,7 +298,7 @@ export default @observer class AccountDashboard extends Component {
                  </div>
                </div>
              )}
-            </div>
+            </Fragment>
          )}
        </div>
        <ReactTooltip place="right" type="dark" effect="solid" />
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index b86d94ac7..953f702f8 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -59,7 +59,9 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp
          className="settings-navigation__link"
          activeClassName="is-active"
        >
-          {intl.formatMessage(messages.yourServices)} <span className="badge">{serviceCount}</span>
+          {intl.formatMessage(messages.yourServices)}
+          {' '}
+          <span className="badge">{serviceCount}</span>
        </Link>
        <Link
          to="/settings/user"
@@ -93,4 +95,3 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp
    );
  }
 }
diff --git a/src/components/settings/recipes/RecipeItem.js b/src/components/settings/recipes/RecipeItem.js
index dae8891b3..3bb0852b2 100644
--- a/src/components/settings/recipes/RecipeItem.js
+++ b/src/components/settings/recipes/RecipeItem.js
@@ -15,6 +15,7 @@ export default @observer class RecipeItem extends Component {
    return (
      <button
+        type="button"
        className="recipe-teaser"
        onClick={onClick}
      >
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js
index cd783200f..00cd725cf 100644
--- a/src/components/settings/recipes/RecipesDashboard.js
+++ b/src/components/settings/recipes/RecipesDashboard.js
@@ -129,11 +129,17 @@ export default @observer class RecipesDashboard extends Component {
                activeClassName={`${!searchNeedle ? 'badge--primary' : ''}`}
                onClick={() => resetSearch()}
              >
-                {intl.formatMessage(messages.devRecipes)} ({devRecipesCount})
+                {intl.formatMessage(messages.devRecipes)}
+                {' '}
+(
+                {devRecipesCount}
+)
              </Link>
            )}
            <a href={FRANZ_SERVICE_REQUEST} target="_blank" className="link recipes__service-request">
-              {intl.formatMessage(messages.missingService)} <i className="mdi mdi-open-in-new" />
+              {intl.formatMessage(messages.missingService)}
+              {' '}
+              <i className="mdi mdi-open-in-new" />
            </a>
          </div>
          {/* )} */}
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index d16ec35b8..468d85c45 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { Link } from 'react-router';
@@ -14,6 +14,7 @@ import Input from '../../ui/Input';
 import Toggle from '../../ui/Toggle';
 import Button from '../../ui/Button';
 import ImageUpload from '../../ui/ImageUpload';
+import Select from '../../ui/Select';
 import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
@@ -96,7 +97,11 @@ const messages = defineMessages({
  },
  headlineProxy: {
    id: 'settings.service.form.proxy.headline',
-    defaultMessage: '!!!Proxy Settings',
+    defaultMessage: '!!!HTTP/HTTPS Proxy Settings',
+  },
+  proxyRestartInfo: {
+    id: 'settings.service.form.proxy.restartInfo',
+    defaultMessage: '!!!Please restart Franz after changing proxy Settings.',
  },
  proxyInfo: {
    id: 'settings.service.form.proxy.info',
@@ -129,6 +134,7 @@ export default @observer class EditServiceForm extends Component {
  static defaultProps = {
    service: {},
  };
  static contextTypes = {
    intl: intlShape,
  };
@@ -270,14 +276,14 @@ export default @observer class EditServiceForm extends Component {
                {recipe.hasCustomUrl && (
                  <TabItem title={intl.formatMessage(messages.tabOnPremise)}>
                    {user.isPremium || recipe.author.find(a => a.email === user.email) ? (
-                      <div>
+                      <Fragment>
                        <Input field={form.$('customUrl')} />
                        {form.error === 'url-validation-error' && (
                          <p className="franz-form__error">
                            {intl.formatMessage(messages.customUrlValidationError, { name: recipe.name })}
                          </p>
                        )}
-                      </div>
+                      </Fragment>
                    ) : (
                      <div className="center premium-info">
                        <p>{intl.formatMessage(messages.customUrlPremiumInfo)}</p>
@@ -307,12 +313,12 @@ export default @observer class EditServiceForm extends Component {
                  <h3>{intl.formatMessage(messages.headlineBadges)}</h3>
                  <Toggle field={form.$('isBadgeEnabled')} />
                  {recipe.hasIndirectMessages && form.$('isBadgeEnabled').value && (
-                    <div>
+                    <Fragment>
                      <Toggle field={form.$('isIndirectMessageBadgeEnabled')} />
                      <p className="settings__help">
                        {intl.formatMessage(messages.indirectMessageInfo)}
                      </p>
-                    </div>
+                    </Fragment>
                  )}
                </div>
@@ -333,6 +339,12 @@ export default @observer class EditServiceForm extends Component {
              </div>
            </div>
+            <PremiumFeatureContainer>
+              <div className="settings__settings-group">
+                <Select field={form.$('spellcheckerLanguage')} />
+              </div>
+            </PremiumFeatureContainer>
            {isProxyFeatureEnabled && (
              <PremiumFeatureContainer condition={isProxyFeaturePremiumFeature}>
                <div className="settings__settings-group">
@@ -342,18 +354,31 @@ export default @observer class EditServiceForm extends Component {
                  </h3>
                  <Toggle field={form.$('proxy.isEnabled')} />
                  {form.$('proxy.isEnabled').value && (
-                    <div>
+                    <Fragment>
-                      <Input field={form.$('proxy.host')} />
+                      <div className="grid">
-                      <Input field={form.$('proxy.user')} />
+                        <div className="grid__row">
-                      <Input
+                          <Input field={form.$('proxy.host')} className="proxyHost" />
-                        field={form.$('proxy.password')}
+                          <Input field={form.$('proxy.port')} />
-                        showPasswordToggle
+                        </div>
-                      />
+                      </div>
+                      <div className="grid">
+                        <div className="grid__row">
+                          <Input field={form.$('proxy.user')} />
+                          <Input
+                            field={form.$('proxy.password')}
+                            showPasswordToggle
+                          />
+                        </div>
+                      </div>
+                      <p>
+                        <span className="mdi mdi-information" />
+                        {intl.formatMessage(messages.proxyRestartInfo)}
+                      </p>
                      <p>
                        <span className="mdi mdi-information" />
                        {intl.formatMessage(messages.proxyInfo)}
                      </p>
-                    </div>
+                    </Fragment>
                  )}
                </div>
              </PremiumFeatureContainer>
diff --git a/src/components/settings/services/ServiceItem.js b/src/components/settings/services/ServiceItem.js
index 84080519b..ebc618a00 100644
--- a/src/components/settings/services/ServiceItem.js
+++ b/src/components/settings/services/ServiceItem.js
@@ -27,6 +27,7 @@ export default @observer class ServiceItem extends Component {
    service: PropTypes.instanceOf(ServiceModel).isRequired,
    goToServiceForm: PropTypes.func.isRequired,
  };
  static contextTypes = {
    intl: intlShape,
  };
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js
index e7dfaf106..a12df7372 100644
--- a/src/components/settings/services/ServicesDashboard.js
+++ b/src/components/settings/services/ServicesDashboard.js
@@ -101,17 +101,15 @@ export default @observer class ServicesDashboard extends Component {
            />
          )}
          {!isLoading && servicesRequestFailed && (
-            <div>
+            <Infobox
-              <Infobox
+              icon="alert"
-                icon="alert"
+              type="danger"
-                type="danger"
+              ctaLabel={intl.formatMessage(messages.tryReloadServices)}
-                ctaLabel={intl.formatMessage(messages.tryReloadServices)}
+              ctaLoading={isLoading}
-                ctaLoading={isLoading}
+              ctaOnClick={retryServicesRequest}
-                ctaOnClick={retryServicesRequest}
+            >
-              >
+              {intl.formatMessage(messages.servicesRequestFailed)}
-                {intl.formatMessage(messages.servicesRequestFailed)}
+            </Infobox>
-              </Infobox>
-            </div>
          )}
          {status.length > 0 && status.includes('updated') && (
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 1ec2ab614..a92e559f3 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -1,5 +1,5 @@
 import { remote } from 'electron';
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
@@ -171,21 +171,23 @@ export default @observer class EditSettingsForm extends Component {
            <PremiumFeatureContainer
              condition={isSpellcheckerPremiumFeature}
            >
-              <div>
+              <Fragment>
                <Toggle
                  field={form.$('enableSpellchecking')}
                />
                {form.$('enableSpellchecking').value && (
                  <Select field={form.$('spellcheckerLanguage')} />
                )}
-              </div>
+              </Fragment>
            </PremiumFeatureContainer>
            <a
              href={FRANZ_TRANSLATION}
              target="_blank"
              className="link"
            >
-              {intl.formatMessage(messages.translationHelp)} <i className="mdi mdi-open-in-new" />
+              {intl.formatMessage(messages.translationHelp)}
+              {' '}
+              <i className="mdi mdi-open-in-new" />
            </a>
            {/* Advanced */}
@@ -233,7 +235,9 @@ export default @observer class EditSettingsForm extends Component {
            )}
            <br />
            <Toggle field={form.$('beta')} />
-            {intl.formatMessage(messages.currentVersion)} {remote.app.getVersion()}
+            {intl.formatMessage(messages.currentVersion)}
+            {' '}
+            {remote.app.getVersion()}
          </form>
        </div>
      </div>
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js
index b825f844a..0e3ac6b10 100644
--- a/src/components/settings/user/EditUserForm.js
+++ b/src/components/settings/user/EditUserForm.js
@@ -48,10 +48,6 @@ export default @observer class EditServiceForm extends Component {
    isEnterprise: PropTypes.bool.isRequired,
  };
-  static defaultProps = {
-    service: {},
-  };
  static contextTypes = {
    intl: intlShape,
  };
diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js
index 12e8471ff..90da8ddc3 100644
--- a/src/components/subscription/SubscriptionForm.js
+++ b/src/components/subscription/SubscriptionForm.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
@@ -81,8 +81,7 @@ export default @observer class SubscriptionForm extends Component {
    hideInfo: PropTypes.bool.isRequired,
  };
-  static defaultProps ={
+  static defaultProps = {
-    content: '',
    showSkipOption: false,
    skipAction: () => null,
    skipButtonLabel: '',
@@ -158,35 +157,33 @@ export default @observer class SubscriptionForm extends Component {
        <Radio field={this.form.$('paymentTier')} showLabel={false} className="paymentTiers" />
        {!hideInfo && (
          <div className="subscription__premium-info">
-            <div>
+            <p>
-              <p>
+              <strong>{intl.formatMessage(messages.includedFeatures)}</strong>
-                <strong>{intl.formatMessage(messages.includedFeatures)}</strong>
+            </p>
-              </p>
+            <div className="subscription">
-              <div className="subscription">
+              <ul className="subscription__premium-features">
-                <ul className="subscription__premium-features">
+                <li>{intl.formatMessage(messages.features.onpremise)}</li>
-                  <li>{intl.formatMessage(messages.features.onpremise)}</li>
+                <li>
-                  <li>
+                  {intl.formatMessage(messages.features.noInterruptions)}
-                    {intl.formatMessage(messages.features.noInterruptions)}
+                </li>
-                  </li>
+                <li>
-                  <li>
+                  {intl.formatMessage(messages.features.spellchecker)}
-                    {intl.formatMessage(messages.features.spellchecker)}
+                </li>
-                  </li>
+                <li>
-                  <li>
+                  {intl.formatMessage(messages.features.proxy)}
-                    {intl.formatMessage(messages.features.proxy)}
+                </li>
-                  </li>
+                <li>
-                  <li>
+                  {intl.formatMessage(messages.features.ads)}
-                    {intl.formatMessage(messages.features.ads)}
+                </li>
-                  </li>
+              </ul>
-                </ul>
-              </div>
            </div>
          </div>
        )}
-        <div>
+        <Fragment>
          {error.code === 'no-payment-session' && (
            <p className="error-message center">{intl.formatMessage(messages.paymentSessionError)}</p>
          )}
-        </div>
+        </Fragment>
        {showSkipOption && this.form.$('paymentTier').value === 'skip' ? (
          <Button
            label={skipButtonLabel}
diff --git a/src/components/subscription/SubscriptionPopup.js b/src/components/subscription/SubscriptionPopup.js
index f3c63e7ee..b5d7c4b2d 100644
--- a/src/components/subscription/SubscriptionPopup.js
+++ b/src/components/subscription/SubscriptionPopup.js
@@ -46,7 +46,9 @@ export default @observer class SubscriptionPopup extends Component {
  }
  render() {
-    const { url, closeWindow, completeCheck, isCompleted } = this.props;
+    const {
+      url, closeWindow, completeCheck, isCompleted,
+    } = this.props;
    const { intl } = this.context;
    return (
diff --git a/src/components/ui/AppLoader.js b/src/components/ui/AppLoader.js
deleted file mode 100644
index ac3cdcb05..000000000
--- a/src/components/ui/AppLoader.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import Appear from '../../components/ui/effects/Appear';
-import Loader from '../../components/ui/Loader';
-export default function () {
-  return (
-    <div className="app-loader">
-      <Appear>
-        <h1 className="app-loader__title">Franz</h1>
-        <Loader color="#FFF" />
-      </Appear>
-    </div>
-  );
-}
diff --git a/src/components/ui/AppLoader/index.js b/src/components/ui/AppLoader/index.js
new file mode 100644
index 000000000..61053f6d1
--- /dev/null
+++ b/src/components/ui/AppLoader/index.js
@@ -0,0 +1,70 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import injectSheet, { withTheme } from 'react-jss';
+import classnames from 'classnames';
+import FullscreenLoader from '../FullscreenLoader';
+import { shuffleArray } from '../../../helpers/array-helpers';
+import styles from './styles';
+const textList = shuffleArray([
+  'Looking for Sisi',
+  'Contacting the herald',
+  'Saddling the unicorn',
+  'Learning the Waltz',
+  'Visiting Horst & Grete',
+  'Twisting my moustache',
+  'Playing the trumpet',
+  'Traveling through space & time',
+]);
+export default @injectSheet(styles) @withTheme class AppLoader extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    theme: PropTypes.object.isRequired,
+  }
+  state = {
+    step: 0,
+  }
+  interval = null;
+  componentDidMount() {
+    this.interval = setInterval(() => {
+      this.setState(prevState => ({
+        step: prevState.step === textList.length - 1 ? 0 : prevState.step + 1,
+      }));
+    }, 2500);
+  }
+  componentWillUnmount() {
+    clearInterval(this.interval);
+  }
+  render() {
+    const { classes, theme } = this.props;
+    const { step } = this.state;
+    return (
+      <FullscreenLoader
+        title="Franz"
+        className={classes.component}
+        spinnerColor={theme.colorAppLoaderSpinner}
+      >
+        {textList.map((text, i) => (
+          <span
+            key={text}
+            className={classnames({
+              [`${classes.slogan}`]: true,
+              [`${classes.visible}`]: step === i,
+            })}
+          >
+            {text}
+          </span>
+        ))}
+      </FullscreenLoader>
+    );
+  }
+}
diff --git a/src/components/ui/AppLoader/styles.js b/src/components/ui/AppLoader/styles.js
new file mode 100644
index 000000000..755a56b40
--- /dev/null
+++ b/src/components/ui/AppLoader/styles.js
@@ -0,0 +1,16 @@
+export default {
+  component: {
+    color: '#FFF',
+  },
+  slogan: {
+    display: 'block',
+    opacity: 0,
+    transition: 'opacity 1s ease',
+    position: 'absolute',
+    textAlign: 'center',
+    width: '100%',
+  },
+  visible: {
+    opacity: 1,
+  },
+};
diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js
index 309e05bb4..ffc7f7051 100644
--- a/src/components/ui/Button.js
+++ b/src/components/ui/Button.js
@@ -62,6 +62,8 @@ export default @observer class Button extends Component {
    }
    return (
+      // disabling rule as button has type defined in `buttonProps`
+      /* eslint-disable react/button-has-type */
      <button {...buttonProps}>
        <Loader
          loaded={loaded}
@@ -72,6 +74,7 @@ export default @observer class Button extends Component {
        />
        {label}
      </button>
+      /* eslint-enable react/button-has-type */
    );
  }
 }
diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js
new file mode 100644
index 000000000..6ecf4d395
--- /dev/null
+++ b/src/components/ui/FullscreenLoader/index.js
@@ -0,0 +1,56 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import injectSheet, { withTheme } from 'react-jss';
+import classnames from 'classnames';
+import Loader from '../Loader';
+import styles from './styles';
+export default @observer @withTheme @injectSheet(styles) class FullscreenLoader extends Component {
+  static propTypes = {
+    className: PropTypes.string,
+    title: PropTypes.string.isRequired,
+    classes: PropTypes.object.isRequired,
+    theme: PropTypes.object.isRequired,
+    spinnerColor: PropTypes.string,
+    children: PropTypes.node,
+  }
+  static defaultProps = {
+    className: null,
+    spinnerColor: null,
+    children: null,
+  }
+  render() {
+    const {
+      classes,
+      title,
+      children,
+      spinnerColor,
+      className,
+      theme,
+    } = this.props;
+    return (
+      <div className={classes.wrapper}>
+        <div
+          className={classnames({
+            [`${classes.component}`]: true,
+            [`${className}`]: className,
+          })}
+        >
+          <h1 className={classes.title}>{title}</h1>
+          <Loader color={spinnerColor || theme.colorFullscreenLoaderSpinner} />
+          {children && (
+            <div className={classes.content}>
+              {children}
+            </div>
+          )}
+        </div>
+      </div>
+    );
+  }
+}
diff --git a/src/components/ui/FullscreenLoader/styles.js b/src/components/ui/FullscreenLoader/styles.js
new file mode 100644
index 000000000..64d24e4ce
--- /dev/null
+++ b/src/components/ui/FullscreenLoader/styles.js
@@ -0,0 +1,23 @@
+export default {
+  wrapper: {
+    display: 'flex',
+    alignItems: 'center',
+    position: 'absolute',
+    width: '100%',
+  },
+  component: {
+    width: '100%',
+    display: 'flex',
+    flexDirection: 'column',
+    alignItems: 'center',
+    textAlign: 'center',
+    height: 'auto',
+  },
+  title: {
+    fontSize: 35,
+  },
+  content: {
+    marginTop: 20,
+    width: '100%',
+  },
+};
diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js
index 76f77d631..83a05554b 100644
--- a/src/components/ui/ImageUpload.js
+++ b/src/components/ui/ImageUpload.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { Field } from 'mobx-react-form';
@@ -23,6 +23,8 @@ export default @observer class ImageUpload extends Component {
    path: null,
  }
+  dropzoneRef = null;
  onDrop(acceptedFiles) {
    const { field } = this.props;
@@ -36,8 +38,6 @@ export default @observer class ImageUpload extends Component {
    field.set('');
  }
-  dropzoneRef = null;
  render() {
    const {
      field,
@@ -57,7 +57,7 @@ export default @observer class ImageUpload extends Component {
        <label className="franz-form__label" htmlFor="iconUpload">{field.label}</label>
        <div className="image-upload">
          {(field.value && field.value !== 'delete') || this.state.path ? (
-            <div>
+            <Fragment>
              <div
                className="image-upload__preview"
                style={({
@@ -84,7 +84,7 @@ export default @observer class ImageUpload extends Component {
                </button>
                <div className="image-upload__action-background" />
              </div>
-            </div>
+            </Fragment>
          ) : (
            <Dropzone
              ref={(node) => { this.dropzoneRef = node; }}
diff --git a/src/components/ui/InfoBar.js b/src/components/ui/InfoBar.js
index 94a1ddf76..612399e9f 100644
--- a/src/components/ui/InfoBar.js
+++ b/src/components/ui/InfoBar.js
@@ -5,7 +5,7 @@ import classnames from 'classnames';
 import Loader from 'react-loader';
 // import { oneOrManyChildElements } from '../../prop-types';
-import Appear from '../ui/effects/Appear';
+import Appear from './effects/Appear';
 export default @observer class InfoBar extends Component {
  static propTypes = {
@@ -64,6 +64,7 @@ export default @observer class InfoBar extends Component {
          {children}
          {ctaLabel && (
            <button
+              type="button"
              className="info-bar__cta"
              onClick={onClick}
            >
@@ -80,6 +81,7 @@ export default @observer class InfoBar extends Component {
        </div>
        {!sticky && (
          <button
+            type="button"
            className="info-bar__close mdi mdi-close"
            onClick={onHide}
          />
diff --git a/src/components/ui/Infobox.js b/src/components/ui/Infobox.js
index 77051f567..a33c6474a 100644
--- a/src/components/ui/Infobox.js
+++ b/src/components/ui/Infobox.js
@@ -61,6 +61,7 @@ export default @observer class Infobox extends Component {
          <button
            className="infobox__cta"
            onClick={ctaOnClick}
+            type="button"
          >
            <Loader
              loaded={!ctaLoading}
@@ -74,6 +75,7 @@ export default @observer class Infobox extends Component {
        )}
        {dismissable && (
          <button
+            type="button"
            onClick={() => this.setState({
              dismissed: true,
            })}
diff --git a/src/components/ui/Input.js b/src/components/ui/Input.js
index 7bf6e1b00..9b070c4df 100644
--- a/src/components/ui/Input.js
+++ b/src/components/ui/Input.js
@@ -33,6 +33,8 @@ export default @observer class Input extends Component {
    passwordScore: 0,
  }
+  inputElement = null;
  componentDidMount() {
    if (this.props.focus) {
      this.focus();
@@ -53,8 +55,6 @@ export default @observer class Input extends Component {
    this.inputElement.focus();
  }
-  inputElement = null;
  render() {
    const {
      field,
@@ -110,7 +110,7 @@ export default @observer class Input extends Component {
                'mdi-eye': !this.state.showPassword,
                'mdi-eye-off': this.state.showPassword,
              })}
-              onClick={() => this.setState({ showPassword: !this.state.showPassword })}
+              onClick={() => this.setState(prevState => ({ showPassword: !prevState.showPassword }))}
              tabIndex="-1"
            />
          )}
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js
index 0602290f1..b88686d5e 100644
--- a/src/components/ui/Link.js
+++ b/src/components/ui/Link.js
@@ -72,5 +72,4 @@ Link.wrappedComponent.defaultProps = {
  activeClassName: '',
  strictFilter: false,
  target: '',
-  openInBrowser: false,
 };
diff --git a/src/components/ui/PremiumFeatureContainer/index.js b/src/components/ui/PremiumFeatureContainer/index.js
index 73984be94..67cd6af0b 100644
--- a/src/components/ui/PremiumFeatureContainer/index.js
+++ b/src/components/ui/PremiumFeatureContainer/index.js
@@ -73,4 +73,3 @@ PremiumFeatureContainer.wrappedComponent.propTypes = {
    }).isRequired,
  }).isRequired,
 };
diff --git a/src/components/ui/PremiumFeatureContainer/styles.js b/src/components/ui/PremiumFeatureContainer/styles.js
index 16c40d0ec..81d6666c6 100644
--- a/src/components/ui/PremiumFeatureContainer/styles.js
+++ b/src/components/ui/PremiumFeatureContainer/styles.js
@@ -5,6 +5,7 @@ export default theme => ({
    margin: [0, 0, 20, -20],
    padding: 20,
    'border-radius': theme.borderRadius,
+    pointerEvents: 'none',
  },
  titleContainer: {
    display: 'flex',
@@ -20,6 +21,7 @@ export default theme => ({
    'border-radius': theme.borderRadiusSmall,
    padding: [2, 4],
    'font-size': 12,
+    pointerEvents: 'initial',
  },
  content: {
    opacity: 0.5,
diff --git a/src/components/ui/Radio.js b/src/components/ui/Radio.js
index 63ca6f9b8..ba13aca63 100644
--- a/src/components/ui/Radio.js
+++ b/src/components/ui/Radio.js
@@ -18,6 +18,8 @@ export default @observer class Radio extends Component {
    showLabel: true,
  };
+  inputElement = null;
  componentDidMount() {
    if (this.props.focus) {
      this.focus();
@@ -28,8 +30,6 @@ export default @observer class Radio extends Component {
    this.inputElement.focus();
  }
-  inputElement = null;
  render() {
    const {
      field,
diff --git a/src/components/ui/SearchInput.js b/src/components/ui/SearchInput.js
index 5a9571d27..78d6aae8b 100644
--- a/src/components/ui/SearchInput.js
+++ b/src/components/ui/SearchInput.js
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import classnames from 'classnames';
-import uuidv1 from 'uuid/v1';
 import { debounce } from 'lodash';
 export default @observer class SearchInput extends Component {
@@ -22,7 +21,7 @@ export default @observer class SearchInput extends Component {
    value: '',
    placeholder: '',
    className: '',
-    name: uuidv1(),
+    name: 'searchInput',
    throttle: false,
    throttleDelay: 250,
    onChange: () => null,
@@ -30,6 +29,8 @@ export default @observer class SearchInput extends Component {
    autoFocus: false,
  }
+  input = null;
  constructor(props) {
    super(props);
@@ -74,8 +75,6 @@ export default @observer class SearchInput extends Component {
    onReset();
  }
-  input = null;
  render() {
    const { className, name, placeholder } = this.props;
    const { value } = this.state;
@@ -90,15 +89,17 @@ export default @observer class SearchInput extends Component {
        <label
          htmlFor={name}
          className="mdi mdi-magnify"
-        />
+        >
-        <input
+          <input
-          name={name}
+            name={name}
-          type="text"
+            id={name}
-          placeholder={placeholder}
+            type="text"
-          value={value}
+            placeholder={placeholder}
-          onChange={e => this.onChange(e)}
+            value={value}
-          ref={(ref) => { this.input = ref; }}
+            onChange={e => this.onChange(e)}
-        />
+            ref={(ref) => { this.input = ref; }}
+          />
+        </label>
        {value.length > 0 && (
          <span
            className="mdi mdi-close-circle-outline"
diff --git a/src/components/ui/Select.js b/src/components/ui/Select.js
index abcad417e..da52243ca 100644
--- a/src/components/ui/Select.js
+++ b/src/components/ui/Select.js
@@ -9,12 +9,13 @@ export default @observer class Select extends Component {
    field: PropTypes.instanceOf(Field).isRequired,
    className: PropTypes.string,
    showLabel: PropTypes.bool,
+    disabled: PropTypes.bool,
  };
  static defaultProps = {
    className: null,
-    focus: false,
    showLabel: true,
+    disabled: false,
  };
  render() {
@@ -22,6 +23,7 @@ export default @observer class Select extends Component {
      field,
      className,
      showLabel,
+      disabled,
    } = this.props;
    return (
@@ -29,6 +31,7 @@ export default @observer class Select extends Component {
        className={classnames({
          'franz-form__field': true,
          'has-error': field.error,
+          'is-disabled': disabled,
          [`${className}`]: className,
        })}
      >
@@ -45,12 +48,13 @@ export default @observer class Select extends Component {
          id={field.id}
          defaultValue={field.value}
          className="franz-form__select"
+          disabled={field.disabled || disabled}
        >
          {field.options.map(type => (
            <option
              key={type.value}
              value={type.value}
-              // selected={field.value === }
+              disabled={type.disabled}
            >
              {type.label}
            </option>
diff --git a/src/components/ui/StatusBarTargetUrl.js b/src/components/ui/StatusBarTargetUrl.js
index 4285a343c..6fc50fe5c 100644
--- a/src/components/ui/StatusBarTargetUrl.js
+++ b/src/components/ui/StatusBarTargetUrl.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import classnames from 'classnames';
-import Appear from '../ui/effects/Appear';
+import Appear from './effects/Appear';
 export default @observer class StatusBarTargetUrl extends Component {
  static propTypes = {
@@ -13,7 +13,6 @@ export default @observer class StatusBarTargetUrl extends Component {
  static defaultProps = {
    className: '',
-    position: 'bottom',
    text: '',
  };
diff --git a/src/components/ui/Tabs/TabItem.js b/src/components/ui/Tabs/TabItem.js
index 9ff9f009e..16881a7f7 100644
--- a/src/components/ui/Tabs/TabItem.js
+++ b/src/components/ui/Tabs/TabItem.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import { oneOrManyChildElements } from '../../../prop-types';
@@ -11,7 +11,7 @@ export default class TabItem extends Component {
    const { children } = this.props;
    return (
-      <div>{children}</div>
+      <Fragment>{children}</Fragment>
    );
  }
 }
diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js
new file mode 100644
index 000000000..3a3dbbe49
--- /dev/null
+++ b/src/components/ui/WebviewLoader/index.js
@@ -0,0 +1,25 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import injectSheet from 'react-jss';
+import FullscreenLoader from '../FullscreenLoader';
+import styles from './styles';
+export default @observer @injectSheet(styles) class WebviewLoader extends Component {
+  static propTypes = {
+    name: PropTypes.string.isRequired,
+    classes: PropTypes.object.isRequired,
+  }
+  render() {
+    const { classes, name } = this.props;
+    return (
+      <FullscreenLoader
+        className={classes.component}
+        title={`Loading ${name}`}
+      />
+    );
+  }
+}
diff --git a/src/components/ui/WebviewLoader/styles.js b/src/components/ui/WebviewLoader/styles.js
new file mode 100644
index 000000000..dbd75db8a
--- /dev/null
+++ b/src/components/ui/WebviewLoader/styles.js
@@ -0,0 +1,9 @@
+export default theme => ({
+  component: {
+    background: theme.colorWebviewLoaderBackground,
+    padding: 20,
+    width: 'auto',
+    margin: [0, 'auto'],
+    borderRadius: 6,
+  },
+});
diff --git a/src/components/util/ErrorBoundary/index.js b/src/components/util/ErrorBoundary/index.js
new file mode 100644
index 000000000..5db0db226
--- /dev/null
+++ b/src/components/util/ErrorBoundary/index.js
@@ -0,0 +1,60 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import injectSheet from 'react-jss';
+import { defineMessages, intlShape } from 'react-intl';
+import Button from '../../ui/Button';
+import styles from './styles';
+const messages = defineMessages({
+  headline: {
+    id: 'app.errorHandler.headline',
+    defaultMessage: '!!!Something went wrong.',
+  },
+  action: {
+    id: 'app.errorHandler.action',
+    defaultMessage: '!!!Reload',
+  },
+});
+export default @injectSheet(styles) class ErrorBoundary extends Component {
+  state = {
+    hasError: false,
+  }
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    children: PropTypes.node.isRequired,
+  }
+  static contextTypes = {
+    intl: intlShape,
+  };
+  componentDidCatch() {
+    this.setState({ hasError: true });
+  }
+  render() {
+    const { classes } = this.props;
+    const { intl } = this.context;
+    if (this.state.hasError) {
+      return (
+        <div className={classes.component}>
+          <h1 className={classes.title}>
+            {intl.formatMessage(messages.headline)}
+          </h1>
+          <Button
+            label={intl.formatMessage(messages.action)}
+            buttonType="inverted"
+            onClick={() => window.location.reload()}
+          />
+        </div>
+      );
+    }
+    return this.props.children;
+  }
+}
diff --git a/src/components/util/ErrorBoundary/styles.js b/src/components/util/ErrorBoundary/styles.js
new file mode 100644
index 000000000..0960546ff
--- /dev/null
+++ b/src/components/util/ErrorBoundary/styles.js
@@ -0,0 +1,13 @@
+export default theme => ({
+  component: {
+    display: 'flex',
+    width: '100%',
+    alignItems: 'center',
+    justifyContent: 'center',
+    flexDirection: 'column',
+  },
+  title: {
+    fontSize: 20,
+    color: theme.colorText,
+  },
+});
diff --git a/src/config.js b/src/config.js
index d981f9c6a..789ddd1a0 100644
--- a/src/config.js
+++ b/src/config.js
@@ -56,4 +56,5 @@ export const FILE_SYSTEM_SETTINGS_TYPES = [
 export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config');
-export const DICTIONARY_PATH = path.join(app.getPath('userData'), 'dicts');
+// Replacing app.asar is not beautiful but unforunately necessary
+export const DICTIONARY_PATH = path.join(__dirname, 'dictionaries').replace('app.asar', 'app.asar.unpacked');
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js
index b73598f3d..762929dc6 100644
--- a/src/containers/auth/AuthLayoutContainer.js
+++ b/src/containers/auth/AuthLayoutContainer.js
@@ -18,7 +18,9 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer
  };
  render() {
-    const { stores, actions, children, location } = this.props;
+    const {
+      stores, actions, children, location,
+    } = this.props;
    const { app, features, globalError } = stores;
    const isLoadingBaseFeatures = features.defaultFeaturesRequest.isExecuting
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index e1423bdaa..430b49b55 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -75,7 +75,9 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
    if (isLoadingFeatures || isLoadingServices) {
      return (
-        <AppLoader />
+        <ThemeProvider theme={ui.theme}>
+          <AppLoader />
+        </ThemeProvider>
      );
    }
@@ -105,6 +107,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
        setWebviewReference={setWebviewReference}
        openWindow={openWindow}
        reload={reload}
+        openSettings={openSettings}
        isAppMuted={settings.all.app.isAppMuted}
        update={updateService}
      />
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index 5818af0b1..019b3d7d6 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -9,6 +9,7 @@ import AppStore from '../../stores/AppStore';
 import { gaPage } from '../../lib/analytics';
 import AccountDashboard from '../../components/settings/account/AccountDashboard';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
 const { BrowserWindow } = remote;
@@ -67,22 +68,24 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend
    const isLoadingPlans = payment.plansRequest.isExecuting;
    return (
-      <AccountDashboard
+      <ErrorBoundary>
-        user={user.data}
+        <AccountDashboard
-        orders={payment.orders}
+          user={user.data}
-        isLoading={isLoadingUserInfo}
+          orders={payment.orders}
-        isLoadingOrdersInfo={isLoadingOrdersInfo}
+          isLoading={isLoadingUserInfo}
-        isLoadingPlans={isLoadingPlans}
+          isLoadingOrdersInfo={isLoadingOrdersInfo}
-        userInfoRequestFailed={user.getUserInfoRequest.wasExecuted && user.getUserInfoRequest.isError}
+          isLoadingPlans={isLoadingPlans}
-        retryUserInfoRequest={() => this.reloadData()}
+          userInfoRequestFailed={user.getUserInfoRequest.wasExecuted && user.getUserInfoRequest.isError}
-        isCreatingPaymentDashboardUrl={payment.createDashboardUrlRequest.isExecuting}
+          retryUserInfoRequest={() => this.reloadData()}
-        openDashboard={price => this.handlePaymentDashboard(price)}
+          isCreatingPaymentDashboardUrl={payment.createDashboardUrlRequest.isExecuting}
-        openExternalUrl={url => openExternalUrl({ url })}
+          openDashboard={price => this.handlePaymentDashboard(price)}
-        onCloseSubscriptionWindow={() => this.onCloseWindow()}
+          openExternalUrl={url => openExternalUrl({ url })}
-        deleteAccount={userActions.delete}
+          onCloseSubscriptionWindow={() => this.onCloseWindow()}
-        isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting}
+          deleteAccount={userActions.delete}
-        isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError}
+          isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting}
-      />
+          isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError}
+        />
+      </ErrorBoundary>
    );
  }
 }
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 639e8b070..b46908344 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -13,10 +13,15 @@ import { gaPage } from '../../lib/analytics';
 import ServiceError from '../../components/settings/services/ServiceError';
 import EditServiceForm from '../../components/settings/services/EditServiceForm';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { required, url, oneRequired } from '../../helpers/validation-helpers';
+import { getSelectOptions } from '../../helpers/i18n-helpers';
 import { config as proxyFeature } from '../../features/serviceProxy';
+import { SPELLCHECKER_LOCALES } from '../../i18n/languages';
 const messages = defineMessages({
  name: {
    id: 'settings.service.form.name',
@@ -66,6 +71,10 @@ const messages = defineMessages({
    id: 'settings.service.form.proxy.host',
    defaultMessage: '!!!Proxy Host/IP',
  },
+  proxyPort: {
+    id: 'settings.service.form.proxy.port',
+    defaultMessage: '!!!Port',
+  },
  proxyUser: {
    id: 'settings.service.form.proxy.user',
    defaultMessage: '!!!User',
@@ -74,6 +83,14 @@ const messages = defineMessages({
    id: 'settings.service.form.proxy.password',
    defaultMessage: '!!!Password',
  },
+  spellcheckerLanguage: {
+    id: 'settings.service.form.spellcheckerLanguage',
+    defaultMessage: '!!!Spell checking Language',
+  },
+  spellcheckerSystemDefault: {
+    id: 'settings.service.form.spellcheckerLanguage.default',
+    defaultMessage: '!!!Use System Default ({default})',
+  },
 });
 export default @inject('stores', 'actions') @observer class EditServiceScreen extends Component {
@@ -101,6 +118,11 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
  }
  prepareForm(recipe, service, proxy) {
+    const spellcheckerLanguage = getSelectOptions({
+      locales: SPELLCHECKER_LOCALES,
+      resetToDefaultText: this.context.intl.formatMessage(messages.spellcheckerSystemDefault, { default: SPELLCHECKER_LOCALES[this.props.stores.settings.app.spellcheckerLanguage] }),
+    });
    const { intl } = this.context;
    const config = {
      fields: {
@@ -138,7 +160,13 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
        isDarkModeEnabled: {
          label: intl.formatMessage(messages.enableDarkMode),
          value: service.isDarkModeEnabled,
-          default: this.props.stores.settings.all.app.darkMode,
+          default: this.props.stores.settings.app.darkMode,
+        },
+        spellcheckerLanguage: {
+          label: intl.formatMessage(messages.spellcheckerLanguage),
+          value: service.spellcheckerLanguage,
+          options: spellcheckerLanguage,
+          disabled: !this.props.stores.settings.app.enableSpellchecking,
        },
      },
    };
@@ -209,6 +237,11 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
              value: serviceProxyConfig.host,
              default: '',
            },
+            port: {
+              label: intl.formatMessage(messages.proxyPort),
+              value: serviceProxyConfig.port,
+              default: '',
+            },
            user: {
              label: intl.formatMessage(messages.proxyUser),
              value: serviceProxyConfig.user,
@@ -280,20 +313,22 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
    const form = this.prepareForm(recipe, service, proxyFeature);
    return (
-      <EditServiceForm
+      <ErrorBoundary>
-        action={action}
+        <EditServiceForm
-        recipe={recipe}
+          action={action}
-        service={service}
+          recipe={recipe}
-        user={user.data}
+          service={service}
-        form={form}
+          user={user.data}
-        status={services.actionStatus}
+          form={form}
-        isSaving={services.updateServiceRequest.isExecuting || services.createServiceRequest.isExecuting}
+          status={services.actionStatus}
-        isDeleting={services.deleteServiceRequest.isExecuting}
+          isSaving={services.updateServiceRequest.isExecuting || services.createServiceRequest.isExecuting}
-        onSubmit={d => this.onSubmit(d)}
+          isDeleting={services.deleteServiceRequest.isExecuting}
-        onDelete={() => this.deleteService()}
+          onSubmit={d => this.onSubmit(d)}
-        isProxyFeatureEnabled={proxyFeature.isEnabled}
+          onDelete={() => this.deleteService()}
-        isProxyFeaturePremiumFeature={proxyFeature.isPremium}
+          isProxyFeatureEnabled={proxyFeature.isEnabled}
-      />
+          isProxyFeaturePremiumFeature={proxyFeature.isPremium}
+        />
+      </ErrorBoundary>
    );
  }
 }
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index ea1d319d9..f1706a721 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -12,8 +12,11 @@ import { gaPage } from '../../lib/analytics';
 import { DEFAULT_APP_SETTINGS } from '../../config';
 import { config as spellcheckerConfig } from '../../features/spellchecker';
+import { getSelectOptions } from '../../helpers/i18n-helpers';
 import EditSettingsForm from '../../components/settings/settings/EditSettingsForm';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
 const messages = defineMessages({
  autoLaunchOnStart: {
@@ -116,20 +119,12 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
    const { app, settings, user } = this.props.stores;
    const { intl } = this.context;
-    const locales = [];
+    const locales = getSelectOptions({
-    Object.keys(APP_LOCALES).sort(Intl.Collator().compare).forEach((key) => {
+      locales: APP_LOCALES,
-      locales.push({
-        value: key,
-        label: APP_LOCALES[key],
-      });
    });
-    const spellcheckingLanguages = [];
+    const spellcheckingLanguages = getSelectOptions({
-    Object.keys(SPELLCHECKER_LOCALES).sort(Intl.Collator().compare).forEach((key) => {
+      locales: SPELLCHECKER_LOCALES,
-      spellcheckingLanguages.push({
-        value: key,
-        label: SPELLCHECKER_LOCALES[key],
-      });
    });
    const config = {
@@ -222,20 +217,22 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
    const form = this.prepareForm();
    return (
-      <EditSettingsForm
+      <ErrorBoundary>
-        form={form}
+        <EditSettingsForm
-        checkForUpdates={checkForUpdates}
+          form={form}
-        installUpdate={installUpdate}
+          checkForUpdates={checkForUpdates}
-        isCheckingForUpdates={updateStatus === updateStatusTypes.CHECKING}
+          installUpdate={installUpdate}
-        isUpdateAvailable={updateStatus === updateStatusTypes.AVAILABLE}
+          isCheckingForUpdates={updateStatus === updateStatusTypes.CHECKING}
-        noUpdateAvailable={updateStatus === updateStatusTypes.NOT_AVAILABLE}
+          isUpdateAvailable={updateStatus === updateStatusTypes.AVAILABLE}
-        updateIsReadyToInstall={updateStatus === updateStatusTypes.DOWNLOADED}
+          noUpdateAvailable={updateStatus === updateStatusTypes.NOT_AVAILABLE}
-        onSubmit={d => this.onSubmit(d)}
+          updateIsReadyToInstall={updateStatus === updateStatusTypes.DOWNLOADED}
-        cacheSize={cacheSize}
+          onSubmit={d => this.onSubmit(d)}
-        isClearingAllCache={isClearingAllCache}
+          cacheSize={cacheSize}
-        onClearAllCache={clearAllCache}
+          isClearingAllCache={isClearingAllCache}
-        isSpellcheckerPremiumFeature={spellcheckerConfig.isPremiumFeature}
+          onClearAllCache={clearAllCache}
-      />
+          isSpellcheckerPremiumFeature={spellcheckerConfig.isPremiumFeature}
+        />
+      </ErrorBoundary>
    );
  }
 }
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index 3da3e8d2c..3d35effc5 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -6,6 +6,8 @@ import { defineMessages, intlShape } from 'react-intl';
 import UserStore from '../../stores/UserStore';
 import Form from '../../lib/Form';
 import EditUserForm from '../../components/settings/user/EditUserForm';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { required, email, minLength } from '../../helpers/validation-helpers';
 import { gaPage } from '../../lib/analytics';
@@ -140,14 +142,15 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
    const form = this.prepareForm(user.data);
    return (
-      <EditUserForm
+      <ErrorBoundary>
-        // user={user.data}
+        <EditUserForm
-        status={user.actionStatus}
+          // user={user.data}
-        form={form}
+          status={user.actionStatus}
-        isEnterprise={user.data.isEnterprise}
+          form={form}
-        isSaving={user.updateUserInfoRequest.isExecuting}
+          isSaving={user.updateUserInfoRequest.isExecuting}
-        onSubmit={d => this.onSubmit(d)}
+          onSubmit={d => this.onSubmit(d)}
-      />
+        />
+      </ErrorBoundary>
    );
  }
 }
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js
index 38ca6ec74..cd36610e4 100644
--- a/src/containers/settings/InviteScreen.js
+++ b/src/containers/settings/InviteScreen.js
@@ -3,6 +3,8 @@ import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import Invite from '../../components/auth/Invite';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { gaPage } from '../../lib/analytics';
 export default @inject('stores', 'actions') @observer class InviteScreen extends Component {
@@ -19,12 +21,14 @@ export default @inject('stores', 'actions') @observer class InviteScreen extends
    const { user } = this.props.stores;
    return (
-      <Invite
+      <ErrorBoundary>
-        onSubmit={actions.user.invite}
+        <Invite
-        isLoadingInvite={user.inviteRequest.isExecuting}
+          onSubmit={actions.user.invite}
-        isInviteSuccessful={user.inviteRequest.wasExecuted && !user.inviteRequest.isError}
+          isLoadingInvite={user.inviteRequest.isExecuting}
-        embed
+          isInviteSuccessful={user.inviteRequest.wasExecuted && !user.inviteRequest.isError}
-      />
+          embed
+        />
+      </ErrorBoundary>
    );
  }
 }
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index 4efe81505..b3d758c87 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -10,12 +10,13 @@ import UserStore from '../../stores/UserStore';
 import { gaPage } from '../../lib/analytics';
 import RecipesDashboard from '../../components/settings/recipes/RecipesDashboard';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
 export default @inject('stores', 'actions') @observer class RecipesScreen extends Component {
  static propTypes = {
    params: PropTypes.shape({
      filter: PropTypes.string,
-    }).isRequired,
+    }),
  };
  static defaultProps = {
@@ -29,10 +30,12 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
    currentFilter: 'featured',
  };
+  autorunDisposer = null;
  componentDidMount() {
    gaPage('Settings/Recipe Dashboard/Featured');
-    autorun(() => {
+    this.autorunDisposer = autorun(() => {
      const { filter } = this.props.params;
      const { currentFilter } = this.state;
@@ -51,6 +54,7 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
  componentWillUnmount() {
    this.props.stores.services.resetStatus();
+    this.autorunDisposer();
  }
  searchRecipes(needle) {
@@ -68,7 +72,9 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
  }
  render() {
-    const { recipePreviews, recipes, services, user } = this.props.stores;
+    const {
+      recipePreviews, recipes, services, user,
+    } = this.props.stores;
    const { showAddServiceInterface } = this.props.actions.service;
    const { filter } = this.props.params;
@@ -90,19 +96,21 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
      || recipePreviews.searchRecipePreviewsRequest.isExecuting;
    return (
-      <RecipesDashboard
+      <ErrorBoundary>
-        recipes={allRecipes}
+        <RecipesDashboard
-        isLoading={isLoading}
+          recipes={allRecipes}
-        addedServiceCount={services.all.length}
+          isLoading={isLoading}
-        isPremium={user.data.isPremium}
+          addedServiceCount={services.all.length}
-        hasLoadedRecipes={recipePreviews.featuredRecipePreviewsRequest.wasExecuted}
+          isPremium={user.data.isPremium}
-        showAddServiceInterface={showAddServiceInterface}
+          hasLoadedRecipes={recipePreviews.featuredRecipePreviewsRequest.wasExecuted}
-        searchRecipes={e => this.searchRecipes(e)}
+          showAddServiceInterface={showAddServiceInterface}
-        resetSearch={() => this.resetSearch()}
+          searchRecipes={e => this.searchRecipes(e)}
-        searchNeedle={this.state.needle}
+          resetSearch={() => this.resetSearch()}
-        serviceStatus={services.actionStatus}
+          searchNeedle={this.state.needle}
-        devRecipesCount={recipePreviews.dev.length}
+          serviceStatus={services.actionStatus}
-      />
+          devRecipesCount={recipePreviews.dev.length}
+        />
+      </ErrorBoundary>
    );
  }
 }
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js
index c1a133ef7..b70a5506e 100644
--- a/src/containers/settings/ServicesScreen.js
+++ b/src/containers/settings/ServicesScreen.js
@@ -9,6 +9,7 @@ import ServiceStore from '../../stores/ServicesStore';
 import { gaPage } from '../../lib/analytics';
 import ServicesDashboard from '../../components/settings/services/ServicesDashboard';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
 export default @inject('stores', 'actions') @observer class ServicesScreen extends Component {
  componentDidMount() {
@@ -40,20 +41,22 @@ export default @inject('stores', 'actions') @observer class ServicesScreen exten
    }
    return (
-      <ServicesDashboard
+      <ErrorBoundary>
-        user={user.data}
+        <ServicesDashboard
-        services={allServices}
+          user={user.data}
-        status={services.actionStatus}
+          services={allServices}
-        deleteService={() => this.deleteService()}
+          status={services.actionStatus}
-        toggleService={toggleService}
+          deleteService={() => this.deleteService()}
-        isLoading={isLoading}
+          toggleService={toggleService}
-        filterServices={filter}
+          isLoading={isLoading}
-        resetFilter={resetFilter}
+          filterServices={filter}
-        goTo={router.push}
+          resetFilter={resetFilter}
-        servicesRequestFailed={services.allServicesRequest.wasExecuted && services.allServicesRequest.isError}
+          goTo={router.push}
-        retryServicesRequest={() => services.allServicesRequest.reload()}
+          servicesRequestFailed={services.allServicesRequest.wasExecuted && services.allServicesRequest.isError}
-        searchNeedle={services.filterNeedle}
+          retryServicesRequest={() => services.allServicesRequest.reload()}
-      />
+          searchNeedle={services.filterNeedle}
+        />
+      </ErrorBoundary>
    );
  }
 }
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js
index 55589d0be..6d9e0ee77 100644
--- a/src/containers/settings/SettingsWindow.js
+++ b/src/containers/settings/SettingsWindow.js
@@ -6,6 +6,7 @@ import ServicesStore from '../../stores/ServicesStore';
 import Layout from '../../components/settings/SettingsLayout';
 import Navigation from '../../components/settings/navigation/SettingsNavigation';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
 export default @inject('stores', 'actions') @observer class SettingsContainer extends Component {
  render() {
@@ -19,12 +20,14 @@ export default @inject('stores', 'actions') @observer class SettingsContainer ex
    );
    return (
-      <Layout
+      <ErrorBoundary>
-        navigation={navigation}
+        <Layout
-        closeSettings={closeSettings}
+          navigation={navigation}
-      >
+          closeSettings={closeSettings}
-        {children}
+        >
-      </Layout>
+          {children}
+        </Layout>
+      </ErrorBoundary>
    );
  }
 }
diff --git a/src/containers/subscription/SubscriptionFormScreen.js b/src/containers/subscription/SubscriptionFormScreen.js
index 50ed19bef..3eb7b6255 100644
--- a/src/containers/subscription/SubscriptionFormScreen.js
+++ b/src/containers/subscription/SubscriptionFormScreen.js
@@ -12,7 +12,7 @@ const { BrowserWindow } = remote;
 export default @inject('stores', 'actions') @observer class SubscriptionFormScreen extends Component {
  static propTypes = {
    onCloseWindow: PropTypes.func,
-    content: PropTypes.oneOrManyChildElements,
+    content: PropTypes.node,
    showSkipOption: PropTypes.bool,
    skipAction: PropTypes.func,
    skipButtonLabel: PropTypes.string,
diff --git a/src/electron/Settings.js b/src/electron/Settings.js
index ed9733bfe..63f43b6b7 100644
--- a/src/electron/Settings.js
+++ b/src/electron/Settings.js
@@ -8,6 +8,7 @@ const debug = require('debug')('Franz:Settings');
 export default class Settings {
  type = '';
  @observable store = {};
  constructor(type, defaultState = {}) {
diff --git a/src/electron/ipc-api/download.js b/src/electron/ipc-api/download.js
index 9e504834d..e6703af2d 100644
--- a/src/electron/ipc-api/download.js
+++ b/src/electron/ipc-api/download.js
@@ -12,7 +12,7 @@ function decodeBase64Image(dataString) {
    return new Error('Invalid input string');
  }
-  return new Buffer(matches[2], 'base64');
+  return Buffer.from(matches[2], 'base64');
 }
 export default (params) => {
diff --git a/src/features/delayApp/Component.js b/src/features/delayApp/Component.js
index 403340c7b..6e0532c9a 100644
--- a/src/features/delayApp/Component.js
+++ b/src/features/delayApp/Component.js
@@ -6,7 +6,7 @@ import injectSheet from 'react-jss';
 import Button from '../../components/ui/Button';
-import { config } from './';
+import { config } from '.';
 import styles from './styles';
 const messages = defineMessages({
@@ -38,11 +38,15 @@ export default @inject('actions') @injectSheet(styles) @observer class DelayApp
    countdown: config.delayDuration,
  }
+  countdownInterval = null;
+  countdownIntervalTimeout = 1000;
  componentDidMount() {
    this.countdownInterval = setInterval(() => {
-      this.setState({
+      this.setState(prevState => ({
-        countdown: this.state.countdown - this.countdownIntervalTimeout,
+        countdown: prevState.countdown - this.countdownIntervalTimeout,
-      });
+      }));
      if (this.state.countdown <= 0) {
        // reload();
@@ -55,9 +59,6 @@ export default @inject('actions') @injectSheet(styles) @observer class DelayApp
    clearInterval(this.countdownInterval);
  }
-  countdownInterval = null;
-  countdownIntervalTimeout = 1000;
  render() {
    const { classes, actions } = this.props;
    const { intl } = this.context;
@@ -71,9 +72,11 @@ export default @inject('actions') @injectSheet(styles) @observer class DelayApp
          buttonType="inverted"
          onClick={() => actions.ui.openSettings({ path: 'user' })}
        />
-        <p className="footnote">{intl.formatMessage(messages.text, {
+        <p className="footnote">
-          seconds: this.state.countdown / 1000,
+          {intl.formatMessage(messages.text, {
-        })}</p>
+            seconds: this.state.countdown / 1000,
+          })}
+        </p>
      </div>
    );
  }
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
index 9ffa1d2fd..d5c544b78 100644
--- a/src/features/delayApp/index.js
+++ b/src/features/delayApp/index.js
@@ -67,4 +67,3 @@ export default function init(stores) {
 }
 export const Component = DelayAppComponent;
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
index ee0b4e79c..4bea327ad 100644
--- a/src/features/serviceProxy/index.js
+++ b/src/features/serviceProxy/index.js
@@ -23,15 +23,18 @@ export default function init(stores) {
    const services = stores.services.enabled;
    const isPremiumUser = stores.user.data.isPremium;
+    const proxySettings = stores.settings.proxy;
+    debug('Service Proxy autorun');
    services.forEach((service) => {
      const s = session.fromPartition(`persist:service-${service.id}`);
      if (config.isEnabled && (isPremiumUser || !config.isPremium)) {
-        const serviceProxyConfig = stores.settings.proxy[service.id];
+        const serviceProxyConfig = proxySettings[service.id];
        if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) {
-          const proxyHost = serviceProxyConfig.host;
+          const proxyHost = `${serviceProxyConfig.host}${serviceProxyConfig.port ? `:${serviceProxyConfig.port}` : ''}`;
          debug(`Setting proxy config from service settings for "${service.name}" (${service.id}) to`, proxyHost);
          s.setProxy({ proxyRules: proxyHost }, () => {
@@ -42,4 +45,3 @@ export default function init(stores) {
    });
  });
 }
diff --git a/src/helpers/array-helpers.js b/src/helpers/array-helpers.js
new file mode 100644
index 000000000..ffb3b63dc
--- /dev/null
+++ b/src/helpers/array-helpers.js
@@ -0,0 +1,4 @@
+export const shuffleArray = arr => arr
+  .map(a => [Math.random(), a])
+  .sort((a, b) => a[0] - b[0])
+  .map(a => a[1]);
diff --git a/src/helpers/i18n-helpers.js b/src/helpers/i18n-helpers.js
index 00a2061c1..091b86b06 100644
--- a/src/helpers/i18n-helpers.js
+++ b/src/helpers/i18n-helpers.js
@@ -1,4 +1,6 @@
-export function getLocale({ locale, locales, defaultLocale, fallbackLocale }) {
+export function getLocale({
+  locale, locales, defaultLocale, fallbackLocale,
+}) {
  let localeStr = locale;
  if (locales[locale] === undefined) {
    let localeFuzzy;
@@ -25,3 +27,29 @@ export function getLocale({ locale, locales, defaultLocale, fallbackLocale }) {
  return localeStr;
 }
+export function getSelectOptions({ locales, resetToDefaultText = '' }) {
+  let options = [];
+  if (resetToDefaultText) {
+    options = [
+      {
+        value: '',
+        label: resetToDefaultText,
+      }, {
+        value: '───',
+        label: '───',
+        disabled: true,
+      },
+    ];
+  }
+  Object.keys(locales).sort(Intl.Collator().compare).forEach((key) => {
+    options.push({
+      value: key,
+      label: locales[key],
+    });
+  });
+  return options;
+}
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 117e66d76..ed6f7bacd 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -1,7 +1,9 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
+   "app.errorHandler.action" : "Recarrega",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
+   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.delayApp.action" : "Aconsegueix una llicència de suport per a Franz",
+   "feature.delayApp.headline" : "Si us plau, compra una llicència de suport per a Franz per saltar l'espera",
+   "feature.delayApp.text" : "Franz continuarà en {seconds} segons",
   "global.api.unhealthy" : "No es pot connectar amb els serveis en línia de Franz",
   "global.notConnectedToTheInternet" : "No esteu connectat a Internet.",
   "import.headline" : "Importa els teus serveis Franz 4",
@@ -79,7 +81,7 @@
   "password.noUser" : "No s'ha trobat cap usuari amb aquesta adreça de correu electrònic",
   "password.submit.label" : "Enviar",
   "password.successInfo" : "Comproveu el vostre correu electrònic",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Millorar el teu compte",
   "pricing.headline" : "Donar suport a Franz",
   "pricing.link.skipPayment" : "No vull donar suport al desenvolupament de Franz.",
   "pricing.submit.label" : "Vull donar suport al desenvolupament de Franz",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} ha causat un error.",
   "service.disabledHandler.action" : "Activar {name}",
   "service.disabledHandler.headline" : "{name} està desactivat",
+   "service.errorHandler.action" : "Recarrega {name}",
+   "service.errorHandler.editAction" : "Edita {name}",
+   "service.errorHandler.headline" : "Oh no!",
+   "service.errorHandler.message" : "Error",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Introducció",
   "services.welcome" : "Benvingut a Franz",
   "settings.account.account.editButton" : "Editar Compte",
@@ -120,7 +127,7 @@
   "settings.app.form.autoLaunchInBackground" : "Obrir en segon plà",
   "settings.app.form.autoLaunchOnStart" : "Iniciar Franz a l'inici",
   "settings.app.form.beta" : "Inclou versions beta",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Uneix-te al Cantó Fosc",
   "settings.app.form.enableGPUAcceleration" : "Activar acceleració GPU",
   "settings.app.form.enableMenuBar" : "Mostra Franz a la barra de menú",
   "settings.app.form.enableSpellchecking" : "Habilita la comprobació ortogràfica",
@@ -131,7 +138,7 @@
   "settings.app.form.runInBackground" : "Mantén a Franz en segon pla en tancar la finestra",
   "settings.app.form.showDisabledServices" : "Mostra les pestanyes dels serveis desactivats",
   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostra la insígnia de missatges no llegits quan les notificacions estiguin desactivades",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Corrector ortogràfic",
   "settings.app.headline" : "Configuració",
   "settings.app.headlineAdvanced" : "Avançat",
   "settings.app.headlineAppearance" : "Aparença",
@@ -172,7 +179,7 @@
   "settings.service.form.editServiceHeadline" : "Edita {name}",
   "settings.service.form.enableAudio" : "Activa l'àudio",
   "settings.service.form.enableBadge" : "Mostra les insígnies als missatges no llegits.",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Activar el Mode Fosc",
   "settings.service.form.enableNotification" : "Activa les notificacions",
   "settings.service.form.enableService" : "Activa el servei",
   "settings.service.form.headlineBadges" : "Insígnies de missatges no llegits",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Mostra la insígnia de missatge per a tots els missatges nous",
   "settings.service.form.isMutedInfo" : "Quan es desactiva, tots els sons de notificació i reproducció d'àudio es silenciaran",
   "settings.service.form.name" : "Nom",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
-   "settings.service.form.proxy.host" : "Proxy Host\/IP",
+   "settings.service.form.proxy.host" : "Host Proxy \/ IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
+   "settings.service.form.proxy.info" : "Els ajustaments del Proxy no es sincronitzaran amb els servidors de Franz",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
+   "settings.service.form.proxy.isEnabled" : "Utilitzar Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.password" : "Contrasenya (opcional)",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.user" : "Usuari (opcional)",
   "settings.service.form.saveButton" : "Desa el servei",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Allotjat",
   "settings.service.form.tabOnPremise" : "Allotjat per si mateix ⭐️",
   "settings.service.form.team" : "Equip",
@@ -234,11 +245,11 @@
   "subscription.features.ads" : "Sense anuncis, mai!",
   "subscription.features.comingSoon" : "properament",
   "subscription.features.encryptedSync" : "Sincronització de sessió xifrada",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "Sense retards ni molestes actualitzacions de llicències ",
   "subscription.features.onpremise" : "Afegiu serveis en premissa\/allotjats com HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.onpremise.mattermost" : "Afegir serveis allotjats com Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.features.proxy" : "Suport de Proxy per a serveis",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.spellchecker" : "Suport per corrector ortogràfic",
   "subscription.includedFeatures" : "El compte de pagament Franz Premium Supporter inclou",
   "subscription.paymentSessionError" : "No s'ha pogut inicialitzar el formulari de pagament",
   "subscription.submit.label" : "Vull donar suport al desenvolupament de Franz",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index eb8088e28..b8bfd2526 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Obnovit",
+   "app.errorHandler.headline" : "Something went wrong",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} způsobil chybu.",
   "service.disabledHandler.action" : "Zapnout {name}",
   "service.disabledHandler.headline" : "{name} je vypnutý",
+   "service.errorHandler.action" : "Načíst znovu {name}",
+   "service.errorHandler.editAction" : "Upravit {name}",
+   "service.errorHandler.headline" : "Ale ne!",
+   "service.errorHandler.message" : "Chyba",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Začněme",
   "services.welcome" : "Vítejte v programu Franz",
   "settings.account.account.editButton" : "Upravit účet",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Zobrazovat znak zprávy pro všechny nové zprávy",
   "settings.service.form.isMutedInfo" : "Pokud je vypnuto, všechny zvuky notifikací a jiného audia budou ztišeny",
   "settings.service.form.name" : "Jméno",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
   "settings.service.form.proxy.isEnabled" : "Use Proxy",
   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
   "settings.service.form.proxy.user" : "User (optional)",
   "settings.service.form.saveButton" : "Uložit službu",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Hostováno",
   "settings.service.form.tabOnPremise" : "Samostatně hostované ⭐️",
   "settings.service.form.team" : "Tým",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 6aa909519..b5abb56d4 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Neuladen",
+   "app.errorHandler.headline" : "Es trat ein Fehler auf",
   "feature.delayApp.action" : "Upgrade deinen Account",
   "feature.delayApp.headline" : "Erspare dir das Warten mit einer Franz Supporter Lizenz",
   "feature.delayApp.text" : "Es geht in {seconds} Sekunden weiter.",
@@ -48,7 +50,7 @@
   "menu.edit.startDictation" : "Diktat starten",
   "menu.edit.startSpeaking" : "Sprachausgabe starten",
   "menu.edit.stopSpeaking" : "Sprachausgabe stoppen",
-   "menu.edit.undo" : "Widerrufen",
+   "menu.edit.undo" : "Rückgängig",
   "menu.file" : "Datei",
   "menu.help" : "Hilfe",
   "menu.help.changelog" : "Changelog",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} hat einen Fehler verursacht.",
   "service.disabledHandler.action" : "{name} aktivieren",
   "service.disabledHandler.headline" : "{name} ist deaktiviert",
+   "service.errorHandler.action" : "{name} neuladen",
+   "service.errorHandler.editAction" : "{name} bearbeiten",
+   "service.errorHandler.headline" : "Oh nein!",
+   "service.errorHandler.message" : "Fehler",
+   "service.errorHandler.text" : "{name} konnte nicht geladen werden.",
   "services.getStarted" : "Loslegen",
   "services.welcome" : "Willkommen bei Franz.",
   "settings.account.account.editButton" : "Konto bearbeiten",
@@ -124,10 +131,10 @@
   "settings.app.form.enableGPUAcceleration" : "Hardwarebeschleunigung aktivieren",
   "settings.app.form.enableMenuBar" : "Franz in Menüleiste anzeigen",
   "settings.app.form.enableSpellchecking" : "Rechtschreibprüfung aktivieren",
-   "settings.app.form.enableSystemTray" : "Franz in der Taskleiste anzeigen",
+   "settings.app.form.enableSystemTray" : "Franz im Infobereich anzeigen",
   "settings.app.form.hideDockIcon" : "Franz Icon im Dock ausblenden",
   "settings.app.form.language" : "Sprache",
-   "settings.app.form.minimizeToSystemTray" : "Franz in die Systemleiste minimieren",
+   "settings.app.form.minimizeToSystemTray" : "Franz in den Infobereich minimieren",
   "settings.app.form.runInBackground" : "Franz im Hintergrund behalten, wenn das Fenster geschlossen wird",
   "settings.app.form.showDisabledServices" : "Deaktivierte Services-Tabs anzeigen",
   "settings.app.form.showMessagesBadgesWhenMuted" : "Ungelesene Nachrichten zeigen, wenn die Benachrichtigungen deaktiviert sind",
@@ -154,11 +161,11 @@
   "settings.recipes.all" : "Alle Dienste",
   "settings.recipes.dev" : "Entwicklung",
   "settings.recipes.headline" : "Verfügbare Dienste",
-   "settings.recipes.missingService" : "Fehlt ein Service?",
+   "settings.recipes.missingService" : "Fehlt ein Dienst?",
   "settings.recipes.mostPopular" : "Am beliebtesten",
   "settings.recipes.nothingFound" : "Entschuldigung, aber der von Dir gesuchte Dienst konnte nicht gefunden werden.",
   "settings.recipes.servicesSuccessfulAddedInfo" : "Dienst erfolgreich hinzugefügt",
-   "settings.searchService" : "Service suchen",
+   "settings.searchService" : "Dienst suchen",
   "settings.service.error.goBack" : "Zurück zu den Diensten",
   "settings.service.error.headline" : "Fehler",
   "settings.service.error.message" : "Das Dienst-Rezept konnte nicht geladen werden.",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Nachrichten-Badge für alle neuen Nachrichten anzeigen",
   "settings.service.form.isMutedInfo" : "Sämtliche Wiedergabe von Tönen wird deaktiviert",
   "settings.service.form.name" : "Name",
-   "settings.service.form.proxy.headline" : "Proxy Einstellungen",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Einstellungen",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
   "settings.service.form.proxy.info" : "Proxy Einstellungen werden nicht mit den Franz Servern synchronisiert.",
   "settings.service.form.proxy.isEnabled" : "Proxy Server verwenden",
   "settings.service.form.proxy.password" : "Passwort (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Bitte starte Franz nach dem Ändern der Proxy Einstellungen neu.",
   "settings.service.form.proxy.user" : "Benutzer (optional)",
   "settings.service.form.saveButton" : "Dienst speichern",
+   "settings.service.form.spellcheckerLanguage" : "Sprache für Rechtschreibprüfung",
+   "settings.service.form.spellcheckerLanguage.default" : "Standard benutzen ({default})",
   "settings.service.form.tabHosted" : "Gehostet",
   "settings.service.form.tabOnPremise" : "Selbst gehostet ⭐️",
   "settings.service.form.team" : "Team",
@@ -238,7 +249,7 @@
   "subscription.features.onpremise" : "Integration von gehosteten Diensten, wie HipChat",
   "subscription.features.onpremise.mattermost" : "Integration von gehosteten Diensten, wie Mattermost",
   "subscription.features.proxy" : "Proxy Support für Dienste",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.spellchecker" : "Unterstützung für Rechtschreibprüfung",
   "subscription.includedFeatures" : "Bezahlte Franz Premium Support Konten beinhalten",
   "subscription.paymentSessionError" : "Das Zahlungs-Formular konnte nicht geladen werden.",
   "subscription.submit.label" : "Ich möchte die Entwicklung von Franz unterstützen",
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 31852d20c..671eecd41 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Επαναφόρτωση",
+   "app.errorHandler.headline" : "Something went wrong",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "Το {name} προκάλεσε ένα σφάλμα.",
   "service.disabledHandler.action" : "Ενεργοποίηση {name}",
   "service.disabledHandler.headline" : "{name} είναι απενεργοποιημένο",
+   "service.errorHandler.action" : "Επαναφόρτωση {name}",
+   "service.errorHandler.editAction" : "Επεξεργασία {name}",
+   "service.errorHandler.headline" : "Ω, όχι!",
+   "service.errorHandler.message" : "Σφάλμα",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Ξεκινήστε",
   "services.welcome" : "Καλώς ορίσατε στον Franz",
   "settings.account.account.editButton" : "Επεξεργασία λογαριασμού",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Εμφάνιση ειδοποίησης μηνύματος για όλα τα νέα μηνύματα",
   "settings.service.form.isMutedInfo" : "Όλοι οι ήχοι καθώς και η αναπαραγωγή ήχου θα απενεργοποιηθούν",
   "settings.service.form.name" : "Όνομα",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
   "settings.service.form.proxy.isEnabled" : "Use Proxy",
   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
   "settings.service.form.proxy.user" : "User (optional)",
   "settings.service.form.saveButton" : "Αποθήκευση υπηρεσίας",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Φιλοξενείται",
   "settings.service.form.tabOnPremise" : "Αυτο-φιλοξενείται ⭐️",
   "settings.service.form.team" : "Ομάδα",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index aa55f5dfe..99df6a0ca 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -133,12 +133,16 @@
  "settings.service.form.iconDelete": "Delete",
  "settings.service.form.iconUpload": "Drop your image, or click here",
  "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.proxy.headline": "Proxy Settings",
+  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.isEnabled": "Use Proxy",
  "settings.service.form.proxy.host": "Proxy Host/IP",
+  "settings.service.form.proxy.port": "Port",
  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.info": "Proxy settings will not synced with the Franz servers.",
+  "settings.service.form.proxy.restartInfo": "Please restart Franz after changing proxy Settings.",
+  "settings.service.form.spellcheckerLanguage": "Spell checking Language",
+  "settings.service.form.spellcheckerLanguage.default": "Use System Default ({default})",
  "settings.service.error.headline": "Error",
  "settings.service.error.goBack": "Back to services",
  "settings.service.error.message": "Could not load service recipe.",
@@ -210,6 +214,11 @@
  "service.crashHandler.text": "{name} has caused an error.",
  "service.crashHandler.action": "Reload {name}",
  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
+  "service.errorHandler.headline": "Oh no!",
+  "service.errorHandler.text": "{name} has failed to load.",
+  "service.errorHandler.message": "Error",
+  "service.errorHandler.action": "Reload {name}",
+  "service.errorHandler.editAction": "Edit {name}",
  "service.disabledHandler.headline": "{name} is disabled",
  "service.disabledHandler.action": "Enable {name}",
  "menu.edit": "Edit",
@@ -262,5 +271,7 @@
  "feature.delayApp.headline": "Please purchase a Franz Supporter License to skip waiting",
  "feature.delayApp.action": "Get a Franz Supporter License",
  "feature.delayApp.text": "Franz will continue in {seconds} seconds.",
-  "premiumFeature.button.upgradeAccount": "Upgrade account"
+  "premiumFeature.button.upgradeAccount": "Upgrade account",
+  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.action": "Reload"
 }
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index a5984dd1c..669b4d2dd 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1,7 +1,9 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
+   "app.errorHandler.action" : "Recargar",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
+   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.delayApp.action" : "Consigue una Licencia de Soporte de Franz",
+   "feature.delayApp.headline" : "Por favor, compra una Licencia de Soporte de Franz para saltar la espera",
+   "feature.delayApp.text" : "Franz continuará en {seconds}  segundos.",
   "global.api.unhealthy" : "No es posible conectarse a los servicios en línea de Franz.",
   "global.notConnectedToTheInternet" : "No estás conectado a Internet",
   "import.headline" : "Importa tus servicios de Franz 4",
@@ -79,7 +81,7 @@
   "password.noUser" : "No se encontró un usuario con esa dirección de correo electrónico",
   "password.submit.label" : "Enviar",
   "password.successInfo" : "Por favor revisa tu correo electrónico",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Mejora tu cuenta",
   "pricing.headline" : "Apoya a Franz",
   "pricing.link.skipPayment" : "No quiero apoyar el desarrollo de Franz.",
   "pricing.submit.label" : "Quiero apoyar el desarrollo de Franz",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} ha causado un error.",
   "service.disabledHandler.action" : "Activar {name}",
   "service.disabledHandler.headline" : "{name} está desactivado",
+   "service.errorHandler.action" : "Recargar {name}",
+   "service.errorHandler.editAction" : "Editar {name}",
+   "service.errorHandler.headline" : "¡Oh, no!",
+   "service.errorHandler.message" : "Error",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Primeros pasos",
   "services.welcome" : "Bienvenido a Franz",
   "settings.account.account.editButton" : "Editar cuenta",
@@ -120,7 +127,7 @@
   "settings.app.form.autoLaunchInBackground" : "Abrir en segundo plano",
   "settings.app.form.autoLaunchOnStart" : "Iniciar Franz al iniciar",
   "settings.app.form.beta" : "Incluir versiones beta",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Únete al Lado Oscuro",
   "settings.app.form.enableGPUAcceleration" : "Habilitar aceleración de GPU",
   "settings.app.form.enableMenuBar" : "Mostrar a Franz en la barra de menús",
   "settings.app.form.enableSpellchecking" : "Activar corrección ortográfica",
@@ -131,7 +138,7 @@
   "settings.app.form.runInBackground" : "Mantener Franz en segundo plano al cerrar la ventana",
   "settings.app.form.showDisabledServices" : "Mostrar pestañas de servicios desactivados",
   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostrar la insignia de mensajes sin leer cuando las notificaciones están desactivadas",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Corrector de ortografía",
   "settings.app.headline" : "Configuración",
   "settings.app.headlineAdvanced" : "Avanzado",
   "settings.app.headlineAppearance" : "Apariencia",
@@ -172,7 +179,7 @@
   "settings.service.form.editServiceHeadline" : "Editar {name}",
   "settings.service.form.enableAudio" : "Habilitar audio",
   "settings.service.form.enableBadge" : "Mostrar señal de mensajes no leídos",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Habilitar modo oscuro",
   "settings.service.form.enableNotification" : "Activar notificaciones",
   "settings.service.form.enableService" : "Activar servicio",
   "settings.service.form.headlineBadges" : "Insignias de mensaje no leídos",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Mostrar señal de notificación para todos los mensajes nuevos",
   "settings.service.form.isMutedInfo" : "Cuando estén desactivados, todos los sonidos de notificación y la reproducción de audio serán silenciados",
   "settings.service.form.name" : "Nombre",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
+   "settings.service.form.proxy.info" : "Las configuraciones de Proxy no se sincronizarán con los servidores de Franz.",
   "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.password" : "Contraseña (opcional)",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.user" : "Usuario (opcional)",
   "settings.service.form.saveButton" : "Guardar servicio",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Alojado",
   "settings.service.form.tabOnPremise" : "Auto alojado ⭐️",
   "settings.service.form.team" : "Equipo",
@@ -234,11 +245,11 @@
   "subscription.features.ads" : "¡Sin publicidad, para siempre!",
   "subscription.features.comingSoon" : "próximamente",
   "subscription.features.encryptedSync" : "Sincronización de sesión encriptada",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "Sin retrasos en la app ni molestas actualizaciones de licencias",
   "subscription.features.onpremise" : "Añade servicios locales\/autoalojados como HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.onpremise.mattermost" : "Agregar servicios de almacenamiento como Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.features.proxy" : "Soporte Proxy para servicios",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.spellchecker" : "Soporte para corrector de ortografía",
   "subscription.includedFeatures" : "La Cuenta pagada de Colaborador Premium de Franz incluye",
   "subscription.paymentSessionError" : "No se pudo inicializar el formulario de pago",
   "subscription.submit.label" : "Quiero apoyar el desarrollo de Franz",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 6964d27d2..a83767f1e 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -1,7 +1,9 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
+   "app.errorHandler.action" : "Recharger",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
+   "app.errorHandler.headline" : "Une erreur s'est produite.",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.delayApp.action" : "Obtenez une licence de Supporter Franz",
+   "feature.delayApp.headline" : "Veuillez acheter une licence de Supporter Franz pour sauter le temps d'attente",
+   "feature.delayApp.text" : "Franz continuera dans {seconds} secondes.",
   "global.api.unhealthy" : "Impossible de se connecter aux services en ligne de Franz",
   "global.notConnectedToTheInternet" : "Vous n'êtes pas connecté à Internet.",
   "import.headline" : "Importez vos services depuis la version 4 de Franz.",
@@ -79,7 +81,7 @@
   "password.noUser" : "Aucun utilisateur n'a été trouvé avec cette adresse e-mail",
   "password.submit.label" : "Soumettre",
   "password.successInfo" : "Merci de consulter vos e-mails",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Mettre à niveau mon compte",
   "pricing.headline" : "Soutenez Franz",
   "pricing.link.skipPayment" : "Je ne veux pas soutenir le développement de Franz.",
   "pricing.submit.label" : "Je veux soutenir le développement de Franz",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} a causé une erreur.",
   "service.disabledHandler.action" : "Activer {name}",
   "service.disabledHandler.headline" : "{name} est désactivé",
+   "service.errorHandler.action" : "Recharger {name}",
+   "service.errorHandler.editAction" : "Modifier {name}",
+   "service.errorHandler.headline" : "Oh non !",
+   "service.errorHandler.message" : "Erreur",
+   "service.errorHandler.text" : "Le chargement de {name} a échoué.",
   "services.getStarted" : "Commencer",
   "services.welcome" : "Bienvenue dans Franz",
   "settings.account.account.editButton" : "Modifier le compte",
@@ -120,7 +127,7 @@
   "settings.app.form.autoLaunchInBackground" : "Ouvrir en arrière-plan",
   "settings.app.form.autoLaunchOnStart" : "Lancer Franz au démarrage",
   "settings.app.form.beta" : "Accepter les versions bêta",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Rejoins le côté obscur",
   "settings.app.form.enableGPUAcceleration" : "Activer l'accélération GPU",
   "settings.app.form.enableMenuBar" : "Afficher Franz dans la barre des menus",
   "settings.app.form.enableSpellchecking" : "Activer la vérification orthographique",
@@ -131,7 +138,7 @@
   "settings.app.form.runInBackground" : "Garder Franz ouvert en arrière-plan à la fermeture de la fenêtre",
   "settings.app.form.showDisabledServices" : "Afficher les onglets des services désactivés",
   "settings.app.form.showMessagesBadgesWhenMuted" : "Afficher les badges de messages non lus quand les notifications sont désactivées.",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Langue de la vérification orthographique",
   "settings.app.headline" : "Paramètres",
   "settings.app.headlineAdvanced" : "Paramètres avancés",
   "settings.app.headlineAppearance" : "Apparence",
@@ -172,7 +179,7 @@
   "settings.service.form.editServiceHeadline" : "Modifier {name}",
   "settings.service.form.enableAudio" : "Activer l'audio",
   "settings.service.form.enableBadge" : "Afficher le badge des messages non lus",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Activer le mode sombre",
   "settings.service.form.enableNotification" : "Activer les notifications",
   "settings.service.form.enableService" : "Activer le service",
   "settings.service.form.headlineBadges" : "Badge des messages non lus",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Afficher le badge des messages pour tous les nouveaux messages",
   "settings.service.form.isMutedInfo" : "Lorsque désactivé, tous les sons de notifications ainsi que l'audio sont coupés",
   "settings.service.form.name" : "Nom",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "Paramètres Proxy HTTP\/HTTPS",
-   "settings.service.form.proxy.host" : "Proxy Host\/IP",
+   "settings.service.form.proxy.host" : "Hôte\/IP du proxy",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
+   "settings.service.form.proxy.info" : "Les paramètres de proxy ne seront pas synchronisés avec les serveurs de Franz.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
+   "settings.service.form.proxy.isEnabled" : "Utiliser un proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.password" : "Mot de passe (facultatif)",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Veuillez redémarrer Franz après avoir modifier les paramètres proxy.",
+   "settings.service.form.proxy.user" : "Utilisateur (facultatif)",
   "settings.service.form.saveButton" : "Enregistrer le service",
+   "settings.service.form.spellcheckerLanguage" : "Veuillez vérifier l'épellation Langage",
+   "settings.service.form.spellcheckerLanguage.default" : "Par défaut ({default})",
   "settings.service.form.tabHosted" : "Hébergé",
   "settings.service.form.tabOnPremise" : "Auto-hébergé ⭐️",
   "settings.service.form.team" : "Équipe",
@@ -234,11 +245,11 @@
   "subscription.features.ads" : "Plus de pubs !",
   "subscription.features.comingSoon" : "Bientôt disponible",
   "subscription.features.encryptedSync" : "Synchronisation de session cryptée",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "Aucun délai dans l'application ni de harcèlement pour mettre à niveau la licence",
   "subscription.features.onpremise" : "Ajouter des services locaux\/hébergés comme HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.onpremise.mattermost" : "Ajouter des services auto-hébergés comme Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.features.proxy" : "Support proxy pour les services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.spellchecker" : "Prise en charge du correcteur orthographique",
   "subscription.includedFeatures" : "Le compte payant Supporter Premium Franz inclut",
   "subscription.paymentSessionError" : "Initialisation du paiement impossible",
   "subscription.submit.label" : "Je souhaite aider au développement de Franz",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 3bb838ba3..0d3d8623e 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Athlódáil",
+   "app.errorHandler.headline" : "Something went wrong",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "Tá {name} tar éis earráid a dhéanamh.",
   "service.disabledHandler.action" : "Cumasaigh {name}",
   "service.disabledHandler.headline" : "Tá {name} díchumasaithe",
+   "service.errorHandler.action" : "Athlódáil {name}",
+   "service.errorHandler.editAction" : "Cuir {name} in eagar",
+   "service.errorHandler.headline" : "Oró, ní hea!",
+   "service.errorHandler.message" : "Earráid",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Cuir tús",
   "services.welcome" : "Fáilte go Franz",
   "settings.account.account.editButton" : "Cuir cuntas in eagar",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Taispeáin comhartha theachtaireachta do gach teachtaireacht nua",
   "settings.service.form.isMutedInfo" : "Tachtar gach fuaim fógraí agus athchasadh fuaime",
   "settings.service.form.name" : "Ainm",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
   "settings.service.form.proxy.isEnabled" : "Use Proxy",
   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
   "settings.service.form.proxy.user" : "User (optional)",
   "settings.service.form.saveButton" : "Sábháil seirbhís",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Óstáilte",
   "settings.service.form.tabOnPremise" : "Féinóstáilte ⭐️",
   "settings.service.form.team" : "Foireann",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index ae9f25695..2ff69755d 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Ponovno učitavanje",
+   "app.errorHandler.headline" : "Something went wrong",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} je izazvalo grešku. ",
   "service.disabledHandler.action" : "Omogući {name}",
   "service.disabledHandler.headline" : "{name} je onemogućen\/o",
+   "service.errorHandler.action" : "Osvježi okvir",
+   "service.errorHandler.editAction" : "Uredite {ime}",
+   "service.errorHandler.headline" : "O, ne! ",
+   "service.errorHandler.message" : "Greška",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Započnimo!",
   "services.welcome" : "Dobrodošli u Franz",
   "settings.account.account.editButton" : "Uredi račun",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Prikaži značku na svim novim porukuama",
   "settings.service.form.isMutedInfo" : "Kada je onemogućeno, sve obavijesti, svi zvukovi i sva pozadinska podrška će biti nečujna. ",
   "settings.service.form.name" : "Ime",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
   "settings.service.form.proxy.isEnabled" : "Use Proxy",
   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
   "settings.service.form.proxy.user" : "User (optional)",
   "settings.service.form.saveButton" : "Sačuvaj uslugu\/e",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Hostovano",
   "settings.service.form.tabOnPremise" : "Samo-hostovano ⭐️",
   "settings.service.form.team" : "Tim",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 365dec9c6..0b396cf3b 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Újratöltés",
+   "app.errorHandler.headline" : "Something went wrong",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} hibát okozott.",
   "service.disabledHandler.action" : "{name} engedélyezése",
   "service.disabledHandler.headline" : "{name} letiltva",
+   "service.errorHandler.action" : "{name} újratöltése",
+   "service.errorHandler.editAction" : "{name} szerkesztése",
+   "service.errorHandler.headline" : "Jajj ne!",
+   "service.errorHandler.message" : "Hiba",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Kezdj hozzá",
   "services.welcome" : "Üdvözöl a Franz",
   "settings.account.account.editButton" : "Fiók szerkesztése",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Üzenet kitűző megjelenítése minden üzenethez",
   "settings.service.form.isMutedInfo" : "Ha kikapcsolod, minden értesítési és lejátszott hang némításra kerül.",
   "settings.service.form.name" : "Név",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
   "settings.service.form.proxy.isEnabled" : "Use Proxy",
   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
   "settings.service.form.proxy.user" : "User (optional)",
   "settings.service.form.saveButton" : "Szolgáltatás mentése",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Üzemeltetett",
   "settings.service.form.tabOnPremise" : "Egyénileg üzemeltetett",
   "settings.service.form.team" : "Csapat",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 437c1304f..11596d142 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -1,9 +1,11 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
+   "app.errorHandler.action" : "Muat Ulang",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
+   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.delayApp.action" : "Dapatkan Franz Supporter License",
+   "feature.delayApp.headline" : "Beli Franz Supporter License agar tidak perlu menunggu",
+   "feature.delayApp.text" : "Franz akan melanjutkan dalam {seconds} detik.",
   "global.api.unhealthy" : "Tidak dapat tersambung ke layanan Franz",
-   "global.notConnectedToTheInternet" : "Anda tidak mempunyai koneksi internet",
+   "global.notConnectedToTheInternet" : "Anda tidak tersambung ke internet.",
   "import.headline" : "Impor layanan Franz 4 Anda",
   "import.notSupportedHeadline" : "Layanan belum didukung di Franz 5",
   "import.skip.label" : "Saya ingin menambahkan layanan secara manual",
@@ -79,7 +81,7 @@
   "password.noUser" : "Tidak ditemukan pengguna dengan email tersebut",
   "password.submit.label" : "Kirim",
   "password.successInfo" : "Periksa email Anda",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Tingkatkan akun",
   "pricing.headline" : "Dukung Franz",
   "pricing.link.skipPayment" : "Saya tidak ingin mendukung pengembangan Franz.",
   "pricing.submit.label" : "Saya ingin mendukung pengembangan Franz",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} menyebabkan kesalahan.",
   "service.disabledHandler.action" : "Aktifkan {name}",
   "service.disabledHandler.headline" : "{name} dinonaktifkan",
+   "service.errorHandler.action" : "Muat Ulang {name}",
+   "service.errorHandler.editAction" : "Edit {nama}",
+   "service.errorHandler.headline" : "Ya Ampun!",
+   "service.errorHandler.message" : "Kesalahan",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Ayo mulai!",
   "services.welcome" : "Selamat datang di Franz",
   "settings.account.account.editButton" : "Edit akun",
@@ -120,7 +127,7 @@
   "settings.app.form.autoLaunchInBackground" : "Buka di latar belakang",
   "settings.app.form.autoLaunchOnStart" : "Jalankan Franz saat komputer dimulai",
   "settings.app.form.beta" : "Sertakan versi beta",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Sisi Kelam menunggu Anda (Mode Gelap)",
   "settings.app.form.enableGPUAcceleration" : "Aktifkan Akselerasi GPU",
   "settings.app.form.enableMenuBar" : "Tampilkan Franz di Bilah Menu",
   "settings.app.form.enableSpellchecking" : "Aktifkan pemeriksaan ejaan",
@@ -131,7 +138,7 @@
   "settings.app.form.runInBackground" : "Tetap jalankan Franz di latar belakang saat menutup jendela",
   "settings.app.form.showDisabledServices" : "Tampilkan tab layanan yang dinonaktifkan",
   "settings.app.form.showMessagesBadgesWhenMuted" : "Tampilkan lencana pesan belum dibaca saat pemberitahuan dinonaktifkan",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Periksa ejaan",
   "settings.app.headline" : "Pengaturan",
   "settings.app.headlineAdvanced" : "Tingkat Lanjut",
   "settings.app.headlineAppearance" : "Tampilan",
@@ -172,7 +179,7 @@
   "settings.service.form.editServiceHeadline" : "Edit {nama}",
   "settings.service.form.enableAudio" : "Aktifkan audio",
   "settings.service.form.enableBadge" : "Tampilkan lencana pesan belum dibaca",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Aktifkan Mode Gelap",
   "settings.service.form.enableNotification" : "Aktifkan pemberitahuan",
   "settings.service.form.enableService" : "Aktifkan layanan",
   "settings.service.form.headlineBadges" : "Lencana pesan belum dibaca",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Tampilkan lencana pesan untuk semua pesan baru",
   "settings.service.form.isMutedInfo" : "Saat dinonaktifkan, semua suara pemberitahuan dan pemutaran audio akan dibisukan",
   "settings.service.form.name" : "Nama",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
-   "settings.service.form.proxy.host" : "Proxy Host\/IP",
+   "settings.service.form.proxy.host" : "Host\/IP Proksi",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
+   "settings.service.form.proxy.info" : "Pengaturan proksi tidak akan disinkronkan dengan server Franz.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
+   "settings.service.form.proxy.isEnabled" : "Gunakan Proksi",
-   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.password" : "Sandi (opsional)",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.user" : "Pengguna (opsional)",
   "settings.service.form.saveButton" : "Simpan layanan",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Hosted",
   "settings.service.form.tabOnPremise" : "Hosted mandiri",
   "settings.service.form.team" : "Tim",
@@ -234,11 +245,11 @@
   "subscription.features.ads" : "Tanpa iklan, selamanya!",
   "subscription.features.comingSoon" : "segera hadir",
   "subscription.features.encryptedSync" : "Sinkronisasi sesi terenkripsi",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "Tanpa menunggu dan ditanya untuk meningkatkan lisensi",
-   "subscription.features.onpremise" : "Layanan add-on premise\/hosted seperti HipChat",
+   "subscription.features.onpremise" : "Integrasi layanan hosted, misalnya HipChat",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.onpremise.mattermost" : "Integrasi layanan hosted, misalnya Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.features.proxy" : "Dukungan proksi untuk layanan",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.spellchecker" : "Dukungan pengecek ejaan",
   "subscription.includedFeatures" : "Franz Premium Supporter Account berbayar menyertakan",
   "subscription.paymentSessionError" : "Tidak bisa menginisialisasi formulir pembayaran",
   "subscription.submit.label" : "Saya ingin mendukung pengembangan Franz",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 958d1470d..47cbd8f1e 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -1,7 +1,9 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
+   "app.errorHandler.action" : "Ricarica",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
+   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.delayApp.action" : "Ricevi una Licenza Supporter di Franz",
+   "feature.delayApp.headline" : "Per favore, compra una Licenza Supporter di Franz per saltare l'attesa",
+   "feature.delayApp.text" : "Franz continuerà a funzionare tra {seconds} secondi.",
   "global.api.unhealthy" : "Impossibile connettersi ai servizi online di Franz",
   "global.notConnectedToTheInternet" : "Non sei connesso a Internet.",
   "import.headline" : "Importa i servizi di Franz 4",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} ha causato un errore.",
   "service.disabledHandler.action" : "Attiva {name}",
   "service.disabledHandler.headline" : "{name} è disattivato",
+   "service.errorHandler.action" : "Ricarica {name}",
+   "service.errorHandler.editAction" : "Modifica {name}",
+   "service.errorHandler.headline" : "Oh no!",
+   "service.errorHandler.message" : "Errore",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Iniziamo",
   "services.welcome" : "Benvenuto su Franz",
   "settings.account.account.editButton" : "Modifica account",
@@ -120,7 +127,7 @@
   "settings.app.form.autoLaunchInBackground" : "Apri in background",
   "settings.app.form.autoLaunchOnStart" : "Esegui Franz all'avvio",
   "settings.app.form.beta" : "Includi versioni beta",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Unisciti al Lato Oscuro.",
   "settings.app.form.enableGPUAcceleration" : "Attiva Accelerazione GPU",
   "settings.app.form.enableMenuBar" : "Mostra Franz nella Barra del Menu",
   "settings.app.form.enableSpellchecking" : "Attiva controllo ortografico",
@@ -172,7 +179,7 @@
   "settings.service.form.editServiceHeadline" : "Modifica {name}",
   "settings.service.form.enableAudio" : "Attiva audio",
   "settings.service.form.enableBadge" : "Mostra l'etichetta dei messaggi non letti",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Attiva la modalità scura.",
   "settings.service.form.enableNotification" : "Attiva le notifiche",
   "settings.service.form.enableService" : "Attiva il servizio",
   "settings.service.form.headlineBadges" : "Etichetta dei messaggi non letti",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Mostra l'etichetta per tutti i nuovi messaggi",
   "settings.service.form.isMutedInfo" : "Se disattivato, tutte le notifiche sonore e le riproduzioni audio saranno mutate",
   "settings.service.form.name" : "Nome",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
   "settings.service.form.proxy.isEnabled" : "Use Proxy",
   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
   "settings.service.form.proxy.user" : "User (optional)",
   "settings.service.form.saveButton" : "Salva servizio",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Hosted",
   "settings.service.form.tabOnPremise" : "Self hosted ⭐️",
   "settings.service.form.team" : "Gruppo",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 57b767ef1..6eea64c3a 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -1,7 +1,9 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
+   "app.errorHandler.action" : "再読み込み",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
+   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.delayApp.action" : "Franz サポーターライセンスを購入する",
+   "feature.delayApp.headline" : "Franz をすぐに起動するには、Franz サポーターライセンスを購入してください。",
+   "feature.delayApp.text" : "Franz はあと{seconds}秒後に起動します。",
   "global.api.unhealthy" : "Franzのオンラインサービスに接続できません。",
   "global.notConnectedToTheInternet" : "インターネットに接続されていません。",
   "import.headline" : "Franz 4のサービスをインポートして下さい",
@@ -79,7 +81,7 @@
   "password.noUser" : "このメールアドレスはまだ登録されていません",
   "password.submit.label" : "送信",
   "password.successInfo" : "メールを確認して下さい",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "アカウントをアップグレード",
   "pricing.headline" : "Franzを支援する",
   "pricing.link.skipPayment" : "Franzの開発を支援したくない。",
   "pricing.submit.label" : "Franzの開発を支援したい。",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name}はエラーを起こしました。",
   "service.disabledHandler.action" : "{name}を有効にする",
   "service.disabledHandler.headline" : "{name}は無効です",
+   "service.errorHandler.action" : "{name}を再読み込み",
+   "service.errorHandler.editAction" : "{name}を編集",
+   "service.errorHandler.headline" : "しまった！",
+   "service.errorHandler.message" : "エラー",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "はじめる",
   "services.welcome" : "Franzにようこそ",
   "settings.account.account.editButton" : "アカウントの編集",
@@ -120,7 +127,7 @@
   "settings.app.form.autoLaunchInBackground" : "バックグラウンドで開く",
   "settings.app.form.autoLaunchOnStart" : "システム起動時にFranzを開く",
   "settings.app.form.beta" : "Betaバージョンを含める",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "ダークモードを有効にする",
   "settings.app.form.enableGPUAcceleration" : "GPUアクセラレーションを有効にする",
   "settings.app.form.enableMenuBar" : "メニューバーにFranzを表示する",
   "settings.app.form.enableSpellchecking" : "スペルチェックを有効にする",
@@ -131,7 +138,7 @@
   "settings.app.form.runInBackground" : "ウインドウを閉じた際にFranzをバックグラウンドで実行させておく",
   "settings.app.form.showDisabledServices" : "無効化されたサービスのタブを表示する",
   "settings.app.form.showMessagesBadgesWhenMuted" : "通知の無効時に未読メッセージ件数を表示する",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "スペルチェックする言語",
   "settings.app.headline" : "設定",
   "settings.app.headlineAdvanced" : "詳細",
   "settings.app.headlineAppearance" : "表示スタイル",
@@ -172,7 +179,7 @@
   "settings.service.form.editServiceHeadline" : "{name}を編集",
   "settings.service.form.enableAudio" : "オーディオを有効にする",
   "settings.service.form.enableBadge" : "未読件数の通知バッジを表示する",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "ダークモードを有効にする",
   "settings.service.form.enableNotification" : "通知を有効にする",
   "settings.service.form.enableService" : "サービスを有効にする",
   "settings.service.form.headlineBadges" : "未読件数の通知バッジ",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "すべての新規メッセージについてバッジを表示する",
   "settings.service.form.isMutedInfo" : "無効化されている場合、全ての通知音やオーディオ再生は無音になります",
   "settings.service.form.name" : "サービス名",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
-   "settings.service.form.proxy.host" : "Proxy Host\/IP",
+   "settings.service.form.proxy.host" : "プロキシサーバー\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
+   "settings.service.form.proxy.info" : "プロキシ設定はFranz アカウントで同期されません。",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
+   "settings.service.form.proxy.isEnabled" : "プロキシ設定を有効にする",
-   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.password" : "パスワード（任意）",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.user" : "ユーザー名（任意）",
   "settings.service.form.saveButton" : "サービスの保存",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "ホスト",
   "settings.service.form.tabOnPremise" : "セルフホスト ⭐️",
   "settings.service.form.team" : "チーム",
@@ -234,11 +245,11 @@
   "subscription.features.ads" : "広告は一切ありません!",
   "subscription.features.comingSoon" : "まもなく登場",
   "subscription.features.encryptedSync" : "暗号化されたセッションの同期",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "待ち時間なしでFranz をお使いいただけます",
   "subscription.features.onpremise" : "HipChatのようなオンプレミス\/ホスト型サービスの追加",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.onpremise.mattermost" : "Mattermost のようなオンプレミス（自社運用）型のサービスを追加できるようになります",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.features.proxy" : "プロキシ設定が利用可能",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.spellchecker" : "スペルチェック機能をお使いいただけます",
   "subscription.includedFeatures" : "Franz Premium Supporter有料アカウントには以下が含まれます",
   "subscription.paymentSessionError" : "支払いフォームを初期化出来ません",
   "subscription.submit.label" : "Franzの開発を支援したい",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index d521c838a..632ca618e 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "ჩატვირთვა",
+   "app.errorHandler.headline" : "Something went wrong",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} has caused an error.",
   "service.disabledHandler.action" : "Enable {name}",
   "service.disabledHandler.headline" : "{name} is disabled",
+   "service.errorHandler.action" : "Reload {name}",
+   "service.errorHandler.editAction" : "შეასწორე {name}",
+   "service.errorHandler.headline" : "Oh no!",
+   "service.errorHandler.message" : "შეცდომა",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "დაწყება",
   "services.welcome" : "მოგესალმებით Franz-ზე",
   "settings.account.account.editButton" : "ანგარიშის მართვა",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "აჩვენე შეტყობინებების ნიშანი ყოველი ახალი შეტყობინებისთვის",
   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
   "settings.service.form.name" : "სახელი",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
   "settings.service.form.proxy.isEnabled" : "Use Proxy",
   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
   "settings.service.form.proxy.user" : "User (optional)",
   "settings.service.form.saveButton" : "სერვისის შენახვა",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "დაჰოსტილი",
   "settings.service.form.tabOnPremise" : "თვით დაჰოსტილი ⭐️",
   "settings.service.form.team" : "გუნდი",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 5807f11f6..c38a7f024 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Herladen",
+   "app.errorHandler.headline" : "Something went wrong",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} heeft een probleem veroorzaakt.",
   "service.disabledHandler.action" : "Activeer {name}",
   "service.disabledHandler.headline" : "{name} is uitgeschakeld",
+   "service.errorHandler.action" : "{naam} herladen",
+   "service.errorHandler.editAction" : "{name} aanpassen",
+   "service.errorHandler.headline" : "Oh nee!",
+   "service.errorHandler.message" : "Fout",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Beginnen",
   "services.welcome" : "Welkom bij Franz",
   "settings.account.account.editButton" : "Bewerk account",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Toon berichten-badge voor alle nieuwe berichten",
   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
   "settings.service.form.name" : "Naam",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
   "settings.service.form.proxy.isEnabled" : "Use Proxy",
   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
   "settings.service.form.proxy.user" : "User (optional)",
   "settings.service.form.saveButton" : "Service bewaren",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Gehost",
   "settings.service.form.tabOnPremise" : "Intern gehost ⭐️",
   "settings.service.form.team" : "Team",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index a6db3d773..940f24b0b 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -1,7 +1,9 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
+   "app.errorHandler.action" : "Laad opnieuw",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
+   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.delayApp.action" : "Sponsor Franz",
+   "feature.delayApp.headline" : "Sponsor Franz om wachten over te slaan",
+   "feature.delayApp.text" : "Franz gaat over {seconds} seconden verder.",
   "global.api.unhealthy" : "Kan geen verbinding maken met de Franz-services",
   "global.notConnectedToTheInternet" : "U bent niet verbonden met het internet.",
   "import.headline" : "Importeer uw Franz 4-services",
@@ -79,7 +81,7 @@
   "password.noUser" : "Geen gebruiker bekend met dat e-mailadres",
   "password.submit.label" : "Verzenden",
   "password.successInfo" : "Controleer alsjeblieft je e-mail",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Upgrade Account",
   "pricing.headline" : "Steun Franz",
   "pricing.link.skipPayment" : "Ik wil de ontwikkeling van Franz niet ondersteunen.",
   "pricing.submit.label" : "Ik wil de ontwikkeling van Franz steunen",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} heeft een fout veroorzaakt.",
   "service.disabledHandler.action" : "Activeer {name}",
   "service.disabledHandler.headline" : "{name} is uitgeschakeld",
+   "service.errorHandler.action" : "Laad {name} opnieuw",
+   "service.errorHandler.editAction" : "Bewerk {name}",
+   "service.errorHandler.headline" : "Oh nee!",
+   "service.errorHandler.message" : "Fout",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Begin",
   "services.welcome" : "Welkom bij Franz",
   "settings.account.account.editButton" : "Bewerk account",
@@ -120,7 +127,7 @@
   "settings.app.form.autoLaunchInBackground" : "Open op de achtergrond",
   "settings.app.form.autoLaunchOnStart" : "Open Franz bij opstarten",
   "settings.app.form.beta" : "Inclusief bètaversies",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Stap over naar de donkere kant",
   "settings.app.form.enableGPUAcceleration" : "Schakel videokaart acceleratie in ",
   "settings.app.form.enableMenuBar" : "Toon Franz in menubalk",
   "settings.app.form.enableSpellchecking" : "Zet spellingcontrole aan",
@@ -131,7 +138,7 @@
   "settings.app.form.runInBackground" : "Houd Franz op de achtergrond wanneer het venster gesloten wordt",
   "settings.app.form.showDisabledServices" : "Toon uitgeschakelde services",
   "settings.app.form.showMessagesBadgesWhenMuted" : "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Spelling checken",
   "settings.app.headline" : "Instellingen",
   "settings.app.headlineAdvanced" : "Geavanceerd",
   "settings.app.headlineAppearance" : "Weergave",
@@ -172,7 +179,7 @@
   "settings.service.form.editServiceHeadline" : "Bewerk {name}",
   "settings.service.form.enableAudio" : "Audio inschakelen",
   "settings.service.form.enableBadge" : "Toon badges met ongelezen berichten",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Dark mode aanzetten",
   "settings.service.form.enableNotification" : "Meldingen inschakelen",
   "settings.service.form.enableService" : "Service inschakelen",
   "settings.service.form.headlineBadges" : "Ongelezen berichten badges",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Toon berichtenbadge voor alle nieuwe berichten",
   "settings.service.form.isMutedInfo" : "Indien uitgeschakeld zullen alle meldinggeluiden en afgespeelde audio uitgeschakeld zijn",
   "settings.service.form.name" : "Naam",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
+   "settings.service.form.proxy.info" : "Proxy instellingen worden niet gesynchroniseerd met de Franz servers",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
+   "settings.service.form.proxy.isEnabled" : "Proxy gebruiken",
-   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.password" : "Wachtwoord (optioneel)",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.user" : "Gebruiker (optioneel)",
   "settings.service.form.saveButton" : "Service opslaan",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Gehost",
   "settings.service.form.tabOnPremise" : "Zelf-gehost ⭐️",
   "settings.service.form.team" : "Team",
@@ -234,11 +245,11 @@
   "subscription.features.ads" : "Geen advertenties, nooit!",
   "subscription.features.comingSoon" : "komt binnenkort",
   "subscription.features.encryptedSync" : "Beveiligde sessie synchronisatie",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.features.noInterruptions" : "Geen haperingen & pop ups over upgrades",
   "subscription.features.onpremise" : "Add on-geschikt\/gehoste services zoals HipChat",
   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.features.proxy" : "Proxy understeuning voor diensten",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.spellchecker" : "Ondersteuning voor spellingscheck",
   "subscription.includedFeatures" : "Betaald Franz Premium Supporter Account bevat",
   "subscription.paymentSessionError" : "Kan betaalformulier niet initialiseren",
   "subscription.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 60ced5933..d45e5ce24 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -1,7 +1,9 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
+   "app.errorHandler.action" : "Przeładuj",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
+   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.delayApp.action" : "Uzyskaj licencję Franz Supporter",
+   "feature.delayApp.headline" : "Kup licencję Franz Supporter , aby nie czekać",
+   "feature.delayApp.text" : "Franz będzie kontynuował za {seconds} sekund.",
   "global.api.unhealthy" : "Nie można połączyć się z usługami Franz online",
   "global.notConnectedToTheInternet" : "Nie masz połączenia z Internetem.",
   "import.headline" : "Importuj usługi Franz 4",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} spowodował problem.",
   "service.disabledHandler.action" : "Włącz {name}",
   "service.disabledHandler.headline" : "{name} jest wyłączony",
+   "service.errorHandler.action" : "Przeładuj {name}",
+   "service.errorHandler.editAction" : "Edytuj {name}",
+   "service.errorHandler.headline" : "O nie!",
+   "service.errorHandler.message" : "Błąd",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Zacznij",
   "services.welcome" : "Witaj w programie Franz",
   "settings.account.account.editButton" : "Modyfikuj konta",
@@ -120,7 +127,7 @@
   "settings.app.form.autoLaunchInBackground" : "Otwórz w tle",
   "settings.app.form.autoLaunchOnStart" : "Uruchom Franz na początku",
   "settings.app.form.beta" : "Uwzględnij wersje beta",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Przejdź na Ciemną Stronę",
   "settings.app.form.enableGPUAcceleration" : "Włącz akcelerację GPU",
   "settings.app.form.enableMenuBar" : "Pokaż Franz na pasku menu",
   "settings.app.form.enableSpellchecking" : "Włącz sprawdzanie pisowni",
@@ -131,7 +138,7 @@
   "settings.app.form.runInBackground" : "Zachowaj aplikację Franz w tle po zamknięciu okna",
   "settings.app.form.showDisabledServices" : "Wyłącz wyświetlanie zakładek z usługami",
   "settings.app.form.showMessagesBadgesWhenMuted" : "Pokaż licznik nieprzeczytanych wiadomości gdy powiadomienia są wyłączone",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Język słownika",
   "settings.app.headline" : "Ustawienia",
   "settings.app.headlineAdvanced" : "Zaawansowane",
   "settings.app.headlineAppearance" : "Wygląd",
@@ -172,7 +179,7 @@
   "settings.service.form.editServiceHeadline" : "Edytuj {name}",
   "settings.service.form.enableAudio" : "Włącz dźwięk",
   "settings.service.form.enableBadge" : "Pokaż znacznik nieprzeczytanych wiadomości",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Włącz Ciemny motyw",
   "settings.service.form.enableNotification" : "Aktywuj powiadomienia",
   "settings.service.form.enableService" : "Aktywuj usługę",
   "settings.service.form.headlineBadges" : "Znaczniki nieprzeczytanych wiadomości",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Pokaż ikonę wiadomości dla wszystkich nowych wiadomości",
   "settings.service.form.isMutedInfo" : "Kiedy nieaktywne, wszystkie dźwięki powiadomień są wyciszone",
   "settings.service.form.name" : "Nazwa",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
-   "settings.service.form.proxy.host" : "Proxy Host\/IP",
+   "settings.service.form.proxy.host" : "Host Proxy\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
+   "settings.service.form.proxy.info" : "Ustawienia proxy nie będą zsynchronizowane z serwerami Franza.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
+   "settings.service.form.proxy.isEnabled" : "Użyj Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.password" : "Hasło (opcjonalnie)",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.user" : "Użytkownik (opcjonalnie)",
   "settings.service.form.saveButton" : "Zapisz usługę",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Hostowane",
   "settings.service.form.tabOnPremise" : "Hostowane lokalnie ⭐️",
   "settings.service.form.team" : "Zespół",
@@ -237,7 +248,7 @@
   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
   "subscription.features.onpremise" : "Dodawanie lokalnych\/hostowanych usług takich jak HipChat",
   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.features.proxy" : "Obsługa proxy dla usług",
   "subscription.features.spellchecker" : "Support for spellchecker",
   "subscription.includedFeatures" : "Płatne konto Franz Premium obejmuje",
   "subscription.paymentSessionError" : "Nie można wczytać formularza płatności\"",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 70f6431df..c0cf0039f 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -1,7 +1,9 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
+   "app.errorHandler.action" : "Recarregar",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
+   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.delayApp.action" : "Adquira uma licença Franz Supporter",
+   "feature.delayApp.headline" : "Por favor, adquira uma licença Franz Supporter para pular o tempo de espera",
+   "feature.delayApp.text" : "Franz continuará em {seconds} segundos.",
   "global.api.unhealthy" : "Não foi possível conectar-se aos serviços on-line do Franz.",
   "global.notConnectedToTheInternet" : "Você não está conectado à internet",
   "import.headline" : "Importe seus serviços do Franz 4 ",
@@ -79,7 +81,7 @@
   "password.noUser" : "Nenhum usuário com este e-mail foi encontrado",
   "password.submit.label" : "Enviar",
   "password.successInfo" : "Por favor, verifique o seu e-mail",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Atualizar conta",
   "pricing.headline" : "Apoie o Franz",
   "pricing.link.skipPayment" : "Eu não quero apoiar o desenvolvimento do Franz.",
   "pricing.submit.label" : "Eu quero apoiar o desenvolvimento do Franz",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} causou um erro.",
   "service.disabledHandler.action" : "Ativar {name}",
   "service.disabledHandler.headline" : "{name} está desativado",
+   "service.errorHandler.action" : "Recarregar {name}",
+   "service.errorHandler.editAction" : "Editar {name}",
+   "service.errorHandler.headline" : "Ah, não!",
+   "service.errorHandler.message" : "Erro",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Iniciar",
   "services.welcome" : "Bem-vindo ao Franz!",
   "settings.account.account.editButton" : "Editar conta",
@@ -120,7 +127,7 @@
   "settings.app.form.autoLaunchInBackground" : "Abrir em segundo plano",
   "settings.app.form.autoLaunchOnStart" : "Abrir o Franz ao iniciar o sistema",
   "settings.app.form.beta" : "Incluir versões beta",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Venha para o Lado Negro da força",
   "settings.app.form.enableGPUAcceleration" : "Ativar Aceleração de GPU",
   "settings.app.form.enableMenuBar" : "Mostrar Franz na Barra de Menu",
   "settings.app.form.enableSpellchecking" : "Ativar correção ortográfica",
@@ -131,7 +138,7 @@
   "settings.app.form.runInBackground" : "Manter o Franz no fundo quando fechar a janela",
   "settings.app.form.showDisabledServices" : "Mostrar abas de serviços desativados",
   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostrar ícone de mensagem não lida quando as notificações estiverem desativadas",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "Idioma de verificação ortográfica",
   "settings.app.headline" : "Configurações",
   "settings.app.headlineAdvanced" : "Avançado",
   "settings.app.headlineAppearance" : "Aparência",
@@ -172,7 +179,7 @@
   "settings.service.form.editServiceHeadline" : "Editar {name}",
   "settings.service.form.enableAudio" : "Ativar áudio",
   "settings.service.form.enableBadge" : "Mostrar aviso de mensagens não lidas",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Ativar modo noturno",
   "settings.service.form.enableNotification" : "Ativar notificações",
   "settings.service.form.enableService" : "Ativar serviço",
   "settings.service.form.headlineBadges" : "Mensagens não lidas",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Mostrar avisos para todas as mensagens",
   "settings.service.form.isMutedInfo" : "Quando desativado, as notificações sonoras e áudios ficarão em silêncio",
   "settings.service.form.name" : "Nome",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
+   "settings.service.form.proxy.info" : "As configurações de proxy não serão sincronizadas com os servidores do Franz.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
+   "settings.service.form.proxy.isEnabled" : "Usar o Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.password" : "Senha (opcional)",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.user" : "Usuário (opcional)",
   "settings.service.form.saveButton" : "Salvar serviço",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Hospedado",
   "settings.service.form.tabOnPremise" : "Auto-hospedado ⭐️",
   "settings.service.form.team" : "Equipe",
@@ -237,8 +248,8 @@
   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
   "subscription.features.onpremise" : "Adicionar serviços locais\/hospedados como o HipChat",
   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.features.proxy" : "Suporte de proxy para serviços",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.spellchecker" : "Suporte para corretor ortográfico",
   "subscription.includedFeatures" : "A conta Apoiador Franz Premium inclui",
   "subscription.paymentSessionError" : "Não foi possível abrir o formulário de pagamento",
   "subscription.submit.label" : "Eu quero apoiar o desenvolvimento do Franz",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 71978ed6b..80e8094f5 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Recarregar",
+   "app.errorHandler.headline" : "Something went wrong",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} causou um erro.",
   "service.disabledHandler.action" : "Ativar {name}",
   "service.disabledHandler.headline" : "{name} está desativado",
+   "service.errorHandler.action" : "Recarregar {name}",
+   "service.errorHandler.editAction" : "Editar {name}",
+   "service.errorHandler.headline" : "Oh não!",
+   "service.errorHandler.message" : "Erro",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Vamos começar",
   "services.welcome" : "Bem-vindo ao Franz",
   "settings.account.account.editButton" : "Editar conta",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Mostrar o emblema da mensagem para todas as novas mensagens",
   "settings.service.form.isMutedInfo" : "Quando desativado, todos sons e reproduções de áudio serão silenciados",
   "settings.service.form.name" : "Nome",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
   "settings.service.form.proxy.isEnabled" : "Use Proxy",
   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
   "settings.service.form.proxy.user" : "User (optional)",
   "settings.service.form.saveButton" : "Guardar serviço",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Com domínio",
   "settings.service.form.tabOnPremise" : "Com domínio próprio ⭐️",
   "settings.service.form.team" : "Equipa",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 78030dc15..b605afc4d 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Перезагрузить",
+   "app.errorHandler.headline" : "Something went wrong",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} вызвало ошибку.",
   "service.disabledHandler.action" : "Включить {name}",
   "service.disabledHandler.headline" : "{name} выключено",
+   "service.errorHandler.action" : "Перезагрузить {name}",
+   "service.errorHandler.editAction" : "Редактирование {name}",
+   "service.errorHandler.headline" : "О, нет!",
+   "service.errorHandler.message" : "Ошибка",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Начать работу",
   "services.welcome" : "Добро пожаловать во Franz",
   "settings.account.account.editButton" : "Редактировать аккаунт",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Показывать значок уведомлений для всех новых сообщений",
   "settings.service.form.isMutedInfo" : "Когда выключено, все звуковые уведомления будут отключены",
   "settings.service.form.name" : "Название",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
   "settings.service.form.proxy.isEnabled" : "Use Proxy",
   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
   "settings.service.form.proxy.user" : "User (optional)",
   "settings.service.form.saveButton" : "Сохранить сервис",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Размещено",
   "settings.service.form.tabOnPremise" : "Свой хостинг ⭐️",
   "settings.service.form.team" : "Команда",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 70e3e7f2d..ca7335fe9 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Obnoviť",
+   "app.errorHandler.headline" : "Something went wrong",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} spôsobil chybu.",
   "service.disabledHandler.action" : "Zapnúť {name}",
   "service.disabledHandler.headline" : "{name} je vypnuté",
+   "service.errorHandler.action" : "Znovu načítať {name}",
+   "service.errorHandler.editAction" : "Upraviť {name}",
+   "service.errorHandler.headline" : "Ale nie!",
+   "service.errorHandler.message" : "Chyba",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Začíname",
   "services.welcome" : "Vítajte v aplikácii Franz",
   "settings.account.account.editButton" : "Upraviť účet",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Zobraziť symbol správy pre všetky nové správy",
   "settings.service.form.isMutedInfo" : "Ak je vypnuté, všetky zvuky oznámení a iné prehrávania budú stíšené",
   "settings.service.form.name" : "Meno",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
   "settings.service.form.proxy.isEnabled" : "Use Proxy",
   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
   "settings.service.form.proxy.user" : "User (optional)",
   "settings.service.form.saveButton" : "Uložiť službu",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Hostované",
   "settings.service.form.tabOnPremise" : "Vlastné hostovanie ⭐️",
   "settings.service.form.team" : "Tím",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index dd4c74277..df0b849c4 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Ponovno učitavanje",
+   "app.errorHandler.headline" : "Something went wrong",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{ime} je izazvalo grešku. ",
   "service.disabledHandler.action" : "Omogući {ime} ",
   "service.disabledHandler.headline" : "{ime} je onemogućen\/o",
+   "service.errorHandler.action" : "Osvježi {ime}",
+   "service.errorHandler.editAction" : "Uredite {ime}",
+   "service.errorHandler.headline" : "O, ne! ",
+   "service.errorHandler.message" : "Greška ",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Započnimo! ",
   "services.welcome" : "Dobrodošli u Franz",
   "settings.account.account.editButton" : "Uredi račun",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Prikaži značku na svim novim porukuama",
   "settings.service.form.isMutedInfo" : "Kada je onemogućeno, sve obavijesti, svi zvukovi i sva pozadinska podrška će biti nečujna.",
   "settings.service.form.name" : "Ime",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
   "settings.service.form.proxy.isEnabled" : "Use Proxy",
   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
   "settings.service.form.proxy.user" : "User (optional)",
   "settings.service.form.saveButton" : "Sačuvaj uslugu\/e",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Hostovano",
   "settings.service.form.tabOnPremise" : "Samo-hostovano ⭐️",
   "settings.service.form.team" : "Tim",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 130b51ddf..9e7619454 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -1,11 +1,13 @@
 {
-   "feature.delayApp.action" : "Get a Franz Supporter License",
+   "app.errorHandler.action" : "Yeniden Yükle",
-   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
+   "app.errorHandler.headline" : "Something went wrong",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.delayApp.action" : "Franz Destek Lisansı'nı alın.",
+   "feature.delayApp.headline" : "Beklememek için Franz Destek Lisansı'nı satın alın.",
+   "feature.delayApp.text" : "Franz {seconds} saniye sonra devam edecek.",
   "global.api.unhealthy" : "Franz hizmetlerine şu anda erişilemiyor.",
   "global.notConnectedToTheInternet" : "İnternete bağlı değilsiniz.",
   "import.headline" : "Franz 4 servislerinizi ekleyin.",
-   "import.notSupportedHeadline" : "Servisler henüz Franz 5'de desteklenmiyor.",
+   "import.notSupportedHeadline" : "Servisler henüz Franz 5'te desteklenmiyor.",
   "import.skip.label" : "Servisleri kendim eklemek istiyorum",
   "import.submit.label" : "Servisleri içe aktar",
   "infobar.buttonChangelog" : "Yeni ne var?",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} bir hataya neden oldu.",
   "service.disabledHandler.action" : "{name} aktif",
   "service.disabledHandler.headline" : "{name} devredışı",
+   "service.errorHandler.action" : "{name} yeniden yükle",
+   "service.errorHandler.editAction" : "{name} düzenle",
+   "service.errorHandler.headline" : "Aman Tanrım hayır!",
+   "service.errorHandler.message" : "Hata",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Haydi başlayalım",
   "services.welcome" : "Franz'a Hoşgeldiniz",
   "settings.account.account.editButton" : "Hesabı düzenle",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Mesaj rozetini tüm yeni mesajlar için göster",
   "settings.service.form.isMutedInfo" : "Devre dışı bırakıldığında, tüm bildirim sesleri sessize alınır",
   "settings.service.form.name" : "İsim",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
   "settings.service.form.proxy.isEnabled" : "Use Proxy",
   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
   "settings.service.form.proxy.user" : "User (optional)",
   "settings.service.form.saveButton" : "Servisi kaydet",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Barındırılan",
   "settings.service.form.tabOnPremise" : "Kendi barındırılan",
   "settings.service.form.team" : "Takım",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 94c6f7e54..7d51b380e 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -1,4 +1,6 @@
 {
+   "app.errorHandler.action" : "Перезавантажити",
+   "app.errorHandler.headline" : "Something went wrong",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name} призвів до помилки.",
   "service.disabledHandler.action" : "Увімкнути {name} ",
   "service.disabledHandler.headline" : "{name} вимкнено",
+   "service.errorHandler.action" : "Перезавантажити {name}",
+   "service.errorHandler.editAction" : "Редагувати {name}",
+   "service.errorHandler.headline" : "О, ні!",
+   "service.errorHandler.message" : "Помилка",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "Почати",
   "services.welcome" : "Ласкаво просимо в Franz",
   "settings.account.account.editButton" : "Редагувати акаунт",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "Показувати значок повідомлення для всіх нових повідомлень",
   "settings.service.form.isMutedInfo" : "Коли вимкнено, всі сповищення та відтворення ігноруються",
   "settings.service.form.name" : "Ім'я",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
   "settings.service.form.proxy.isEnabled" : "Use Proxy",
   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
   "settings.service.form.proxy.user" : "User (optional)",
   "settings.service.form.saveButton" : "Зберегти сервіс",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "Розміщений",
   "settings.service.form.tabOnPremise" : "Самостійно розміщений ⭐️",
   "settings.service.form.team" : "Команда",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index 23bff247d..cfb1d3dce 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -1,11 +1,13 @@
 {
+   "app.errorHandler.action" : "重新載入",
+   "app.errorHandler.headline" : "有些東西出錯了",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
   "global.api.unhealthy" : "無法連線至Franz的伺服器。",
   "global.notConnectedToTheInternet" : "你沒有連上網路。",
-   "import.headline" : "匯入Franz 4的服務",
+   "import.headline" : "匯入 Franz 4 的服務",
-   "import.notSupportedHeadline" : "Franz 5尚未支援此服務",
+   "import.notSupportedHeadline" : "Franz 5 尚未支援此服務",
   "import.skip.label" : "手動添加服務",
   "import.submit.label" : "匯入服務",
   "infobar.buttonChangelog" : "有什麼新功能呢?",
@@ -79,7 +81,7 @@
   "password.noUser" : "找不到該電子郵件地址的用戶",
   "password.submit.label" : "送出",
   "password.successInfo" : "請檢查您的電子郵件",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "升級帳號",
   "pricing.headline" : "支持Franz",
   "pricing.link.skipPayment" : "我不想支持Franz的開發。",
   "pricing.submit.label" : "我想支持Franz的開發。",
@@ -90,6 +92,11 @@
   "service.crashHandler.text" : "{name}導致了一個錯誤。",
   "service.disabledHandler.action" : "啟用{name}",
   "service.disabledHandler.headline" : "{name}已停用",
+   "service.errorHandler.action" : "重新載入{name}",
+   "service.errorHandler.editAction" : "編輯{名稱}",
+   "service.errorHandler.headline" : "噢不!",
+   "service.errorHandler.message" : "錯誤",
+   "service.errorHandler.text" : "{name} has failed to load.",
   "services.getStarted" : "開始",
   "services.welcome" : "歡迎使用Franz",
   "settings.account.account.editButton" : "編輯帳號",
@@ -131,7 +138,7 @@
   "settings.app.form.runInBackground" : "當關閉視窗時保持Franz在背景運作",
   "settings.app.form.showDisabledServices" : "顯示停用的服務標籤",
   "settings.app.form.showMessagesBadgesWhenMuted" : "當通知關閉時，標記未讀的訊息",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
+   "settings.app.form.spellcheckerLanguage" : "拼字檢查語言",
   "settings.app.headline" : "設定",
   "settings.app.headlineAdvanced" : "進階",
   "settings.app.headlineAppearance" : "外觀",
@@ -172,7 +179,7 @@
   "settings.service.form.editServiceHeadline" : "編輯{名稱}",
   "settings.service.form.enableAudio" : "啟用音訊",
   "settings.service.form.enableBadge" : "顯示未讀訊息圖示",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "開啟深色模式",
   "settings.service.form.enableNotification" : "啟用通知",
   "settings.service.form.enableService" : "啟用服務",
   "settings.service.form.headlineBadges" : "未讀訊息圖示",
@@ -185,13 +192,17 @@
   "settings.service.form.indirectMessages" : "顯示所有新消息的消息標誌",
   "settings.service.form.isMutedInfo" : "停用時，所有通知聲和聲音播放都將靜音",
   "settings.service.form.name" : "名稱",
-   "settings.service.form.proxy.headline" : "Proxy Settings",
+   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
+   "settings.service.form.proxy.info" : "Proxy 設定不會與 Franz 伺服器同步",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
+   "settings.service.form.proxy.isEnabled" : "使用 Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.password" : "密碼 (選填)",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.port" : "Port",
+   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
+   "settings.service.form.proxy.user" : "使用者 (選填)",
   "settings.service.form.saveButton" : "保存服務",
+   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
+   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
   "settings.service.form.tabHosted" : "託管",
   "settings.service.form.tabOnPremise" : "自我託管⭐️",
   "settings.service.form.team" : "團隊",
@@ -238,7 +249,7 @@
   "subscription.features.onpremise" : "添加本地\/託管服務如HipChat",
   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.spellchecker" : "支援拼字檢查",
   "subscription.includedFeatures" : "包含高級Franz付費帳戶",
   "subscription.paymentSessionError" : "無法初始化付款表單",
   "subscription.submit.label" : "我想支持Franz的開發",
diff --git a/src/index.js b/src/index.js
index 7f3fe5b44..830166dcf 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,10 +1,14 @@
-import { app, BrowserWindow, shell, ipcMain } from 'electron';
+import {
+  app, BrowserWindow, shell, ipcMain,
+} from 'electron';
 import fs from 'fs-extra';
 import path from 'path';
 import windowStateKeeper from 'electron-window-state';
-import { isDevMode, isMac, isWindows, isLinux } from './environment';
+import {
+  isDevMode, isMac, isWindows, isLinux,
+} from './environment';
 // DEV MODE: Save user data into FranzDev
 if (isDevMode) {
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index 588fa75bf..669b02709 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -1,4 +1,6 @@
-import { app, Tray, Menu, systemPreferences, nativeImage } from 'electron';
+import {
+  app, Tray, Menu, systemPreferences, nativeImage,
+} from 'electron';
 import path from 'path';
 const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png';
@@ -7,7 +9,9 @@ const INDICATOR_TRAY_UNREAD = 'tray-unread';
 export default class TrayIcon {
  trayIcon = null;
  indicator = 0;
  themeChangeSubscriberId = null;
  show() {
@@ -79,7 +83,7 @@ export default class TrayIcon {
    }
    return nativeImage.createFromPath(path.join(
-      __dirname, '..', 'assets', 'images', type, platform, `${asset}.${FILE_EXTENSION}`),
+      __dirname, '..', 'assets', 'images', type, platform, `${asset}.${FILE_EXTENSION}`,
-    );
+    ));
  }
 }
diff --git a/src/models/News.js b/src/models/News.js
index caf1d70e5..acacb97dd 100644
--- a/src/models/News.js
+++ b/src/models/News.js
@@ -2,8 +2,11 @@
 export default class News {
  id = '';
  message = '';
  type = 'primary';
  sticky = false;
  constructor(data) {
diff --git a/src/models/Order.js b/src/models/Order.js
index 0e10b01d6..f7624c627 100644
--- a/src/models/Order.js
+++ b/src/models/Order.js
@@ -1,9 +1,14 @@
 export default class Order {
  id = '';
  subscriptionId = '';
  name = '';
  invoiceUrl = '';
  price = '';
  date = '';
  constructor(data) {
diff --git a/src/models/Plan.js b/src/models/Plan.js
index c7b4a0962..3dedf0d5e 100644
--- a/src/models/Plan.js
+++ b/src/models/Plan.js
@@ -5,6 +5,7 @@ export default class Plan {
    id: '',
    price: 0,
  }
  year = {
    id: '',
    price: 0,
diff --git a/src/models/Recipe.js b/src/models/Recipe.js
index 43c44514c..b0d60e75e 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -5,21 +5,33 @@ import path from 'path';
 export default class Recipe {
  id = '';
  name = '';
  description = '';
  version = '';
  path = '';
  serviceURL = '';
  hasDirectMessages = true;
  hasIndirectMessages = false;
  hasNotificationSound = false;
  hasTeamId = false;
  hasPredefinedUrl = false;
  hasCustomUrl = false;
  hasHostedOption = false;
  urlInputPrefix = '';
  urlInputSuffix = '';
  message = '';
diff --git a/src/models/RecipePreview.js b/src/models/RecipePreview.js
index 7470d757a..cfb22f860 100644
--- a/src/models/RecipePreview.js
+++ b/src/models/RecipePreview.js
@@ -2,8 +2,12 @@
 export default class RecipePreview {
  id = '';
  name = '';
-  icon = ''; // TODO: check if this isn't replaced by `icons`
+  icon = '';
+  // TODO: check if this isn't replaced by `icons`
  featured = false;
  constructor(data) {
diff --git a/src/models/Service.js b/src/models/Service.js
index 41180dd76..4cc6102ff 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -2,11 +2,17 @@ import { computed, observable, autorun } from 'mobx';
 import path from 'path';
 import normalizeUrl from 'normalize-url';
+const debug = require('debug')('Franz:Service');
 export default class Service {
  id = '';
  recipe = '';
  webview = null;
  timer = null;
  events = {};
  isAttached = false;
@@ -14,22 +20,45 @@ export default class Service {
  @observable isActive = false; // Is current webview active
  @observable name = '';
  @observable unreadDirectMessageCount = 0;
  @observable unreadIndirectMessageCount = 0;
  @observable order = 99;
  @observable isEnabled = true;
  @observable isMuted = false;
  @observable team = '';
  @observable customUrl = '';
  @observable isNotificationEnabled = true;
  @observable isBadgeEnabled = true;
  @observable isIndirectMessageBadgeEnabled = true;
  @observable iconUrl = '';
  @observable hasCustomUploadedIcon = false;
  @observable hasCrashed = false;
  @observable isDarkModeEnabled = false;
+  @observable spellcheckerLanguage = null;
+  @observable isFirstLoad = true;
+  @observable isLoading = true;
+  @observable isError = false;
+  @observable errorMessage = '';
  constructor(data, recipe) {
    if (!data) {
      console.error('Service config not valid');
@@ -71,6 +100,8 @@ export default class Service {
    this.proxy = data.proxy !== undefined ? data.proxy : this.proxy;
+    this.spellcheckerLanguage = data.spellcheckerLanguage !== undefined ? data.spellcheckerLanguage : this.spellcheckerLanguage;
    this.recipe = recipe;
    autorun(() => {
@@ -147,9 +178,29 @@ export default class Service {
    this.webview.addEventListener('did-start-loading', () => {
      this.hasCrashed = false;
+      this.isLoading = true;
+      this.isError = false;
+    });
+    this.webview.addEventListener('did-frame-finish-load', () => {
+      this.isLoading = false;
+      if (!this.isError) {
+        this.isFirstLoad = false;
+      }
+    });
+    this.webview.addEventListener('did-fail-load', (event) => {
+      debug('Service failed to load', this.name, event);
+      if (event.isMainFrame) {
+        this.isError = true;
+        this.errorMessage = event.errorDescription;
+        this.isLoading = false;
+      }
    });
    this.webview.addEventListener('crashed', () => {
+      debug('Service crashed', this.name);
      this.hasCrashed = true;
    });
  }
diff --git a/src/models/User.js b/src/models/User.js
index 3e4aa187d..bec78fc16 100644
--- a/src/models/User.js
+++ b/src/models/User.js
@@ -2,19 +2,34 @@ import { observable } from 'mobx';
 export default class User {
  id = null;
  @observable email = null;
  @observable firstname = null;
  @observable lastname = null;
  @observable organization = null;
  @observable accountType = null;
-  @observable emailIsConfirmed = true; // better assume it's confirmed to avoid noise
+  @observable emailIsConfirmed = true;
+  // better assume it's confirmed to avoid noise
  @observable subscription = {};
  @observable isSubscriptionOwner = false;
  @observable isPremium = false;
  @observable beta = false;
  @observable donor = {};
  @observable isDonor = false;
  @observable isMiner = false;
  @observable locale = false;
  constructor(data) {
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 6f156a96d..dd4642d70 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -38,12 +38,15 @@ export default class AppStore extends Store {
  };
  @observable healthCheckRequest = new Request(this.api.app, 'health');
  @observable getAppCacheSizeRequest = new Request(this.api.local, 'getAppCacheSize');
  @observable clearAppCacheRequest = new Request(this.api.local, 'clearAppCache');
  @observable autoLaunchOnStart = true;
  @observable isOnline = navigator.onLine;
  @observable timeOfflineStart;
  @observable updateStatus = null;
@@ -150,19 +153,22 @@ export default class AppStore extends Store {
    key(
      '⌘+pagedown, ctrl+pagedown, ⌘+alt+right, ctrl+tab', () => {
        this.actions.service.setActiveNext();
-      });
+      },
+    );
    // Set active the prev service
    key(
      '⌘+pageup, ctrl+pageup, ⌘+alt+left, ctrl+shift+tab', () => {
        this.actions.service.setActivePrev();
-      });
+      },
+    );
    // Global Mute
    key(
      '⌘+shift+m ctrl+shift+m', () => {
        this.actions.app.toggleMuteApp();
-      });
+      },
+    );
    this.locale = this._getDefaultLocale();
@@ -182,7 +188,9 @@ export default class AppStore extends Store {
  }
  // Actions
-  @action _notify({ title, options, notificationId, serviceId = null }) {
+  @action _notify({
+    title, options, notificationId, serviceId = null,
+  }) {
    if (this.stores.settings.all.app.isAppMuted) return;
    const notification = new window.Notification(title, options);
diff --git a/src/stores/DictionaryStore.js b/src/stores/DictionaryStore.js
deleted file mode 100644
index b9c5f2abf..000000000
--- a/src/stores/DictionaryStore.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import { observable } from 'mobx';
-import { createDownloader } from 'hunspell-dict-downloader';
-import Store from './lib/Store';
-import { DICTIONARY_PATH } from '../config';
-const debug = require('debug')('Franz:DictionaryStore');
-export default class DictionaryStore extends Store {
-  @observable available = []
-  @observable installed = []
-  _dictDownloader = null
-  constructor(...args) {
-    super(...args);
-    this.registerReactions([
-      this._downloadDictForUserLocale.bind(this),
-    ]);
-  }
-  async setup() {
-    this._dictDownloader = await createDownloader(DICTIONARY_PATH);
-    debug('dicts', this._dictDownloader);
-    this.available = this._dictDownloader.availableDictionaries;
-    this.installed = this._dictDownloader.installedDictionaries;
-    if (!this.installed.includes('en-us')) {
-      this._dictDownloader.installDictionary('en-us');
-    }
-  }
-  _downloadDictForUserLocale() {
-    const spellcheckerLanguage = this.stores.settings.app.spellcheckerLanguage;
-    debug('trying to Downloading dict for', spellcheckerLanguage);
-    if (!this.installed.includes(spellcheckerLanguage) && this.available.includes(spellcheckerLanguage) && spellcheckerLanguage !== 'en-us') {
-      debug('Downloading dict for', spellcheckerLanguage);
-      this._dictDownloader.installDictionary(spellcheckerLanguage);
-    }
-  }
-}
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 10c893d3f..2a0713b6f 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -11,6 +11,7 @@ import { DEFAULT_FEATURES_CONFIG } from '../config';
 export default class FeaturesStore extends Store {
  @observable defaultFeaturesRequest = new CachedRequest(this.api.features, 'default');
  @observable featuresRequest = new CachedRequest(this.api.features, 'features');
  async setup() {
diff --git a/src/stores/GlobalErrorStore.js b/src/stores/GlobalErrorStore.js
index f4b9d7838..90bf751c3 100644
--- a/src/stores/GlobalErrorStore.js
+++ b/src/stores/GlobalErrorStore.js
@@ -4,6 +4,7 @@ import Request from './lib/Request';
 export default class GlobalErrorStore extends Store {
  @observable error = null;
  @observable response = {};
  constructor(...args) {
diff --git a/src/stores/NewsStore.js b/src/stores/NewsStore.js
index e5091834f..6984425df 100644
--- a/src/stores/NewsStore.js
+++ b/src/stores/NewsStore.js
@@ -8,6 +8,7 @@ import { CHECK_INTERVAL } from '../config';
 export default class NewsStore extends Store {
  @observable latestNewsRequest = new CachedRequest(this.api.news, 'latest');
  @observable hideNewsRequest = new Request(this.api.news, 'hide');
  constructor(...args) {
diff --git a/src/stores/PaymentStore.js b/src/stores/PaymentStore.js
index 9e348d14e..4cabee194 100644
--- a/src/stores/PaymentStore.js
+++ b/src/stores/PaymentStore.js
@@ -7,8 +7,11 @@ import { gaEvent } from '../lib/analytics';
 export default class PaymentStore extends Store {
  @observable plansRequest = new CachedRequest(this.api.payment, 'plans');
  @observable createHostedPageRequest = new Request(this.api.payment, 'getHostedPage');
  @observable createDashboardUrlRequest = new Request(this.api.payment, 'getDashboardUrl');
  @observable ordersDataRequest = new CachedRequest(this.api.payment, 'getOrders');
  constructor(...args) {
diff --git a/src/stores/RecipePreviewsStore.js b/src/stores/RecipePreviewsStore.js
index e25936f15..10b2928e3 100644
--- a/src/stores/RecipePreviewsStore.js
+++ b/src/stores/RecipePreviewsStore.js
@@ -8,7 +8,9 @@ import { gaEvent } from '../lib/analytics';
 export default class RecipePreviewsStore extends Store {
  @observable allRecipePreviewsRequest = new CachedRequest(this.api.recipePreviews, 'all');
  @observable featuredRecipePreviewsRequest = new CachedRequest(this.api.recipePreviews, 'featured');
  @observable searchRecipePreviewsRequest = new Request(this.api.recipePreviews, 'search');
  constructor(...args) {
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index f2480bc8e..ab64bf79c 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -9,7 +9,9 @@ const debug = require('debug')('Franz:RecipeStore');
 export default class RecipesStore extends Store {
  @observable allRecipesRequest = new CachedRequest(this.api.recipes, 'all');
  @observable installRecipeRequest = new Request(this.api.recipes, 'install');
  @observable getRecipeUpdatesRequest = new Request(this.api.recipes, 'update');
  constructor(...args) {
diff --git a/src/stores/RequestStore.js b/src/stores/RequestStore.js
index bbfe6f6df..2629e0a38 100644
--- a/src/stores/RequestStore.js
+++ b/src/stores/RequestStore.js
@@ -6,10 +6,13 @@ const debug = require('debug')('Franz:RequestsStore');
 export default class RequestStore extends Store {
  @observable userInfoRequest;
  @observable servicesRequest;
  @observable showRequiredRequestsError = false;
  retries = 0;
  retryDelay = 2000;
  constructor(...args) {
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 99b091589..5b70ca271 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -1,4 +1,6 @@
-import { action, reaction, computed, observable } from 'mobx';
+import {
+  action, reaction, computed, observable,
+} from 'mobx';
 import { debounce, remove } from 'lodash';
 import Store from './lib/Store';
@@ -11,10 +13,15 @@ const debug = require('debug')('Franz:ServiceStore');
 export default class ServicesStore extends Store {
  @observable allServicesRequest = new CachedRequest(this.api.services, 'all');
  @observable createServiceRequest = new Request(this.api.services, 'create');
  @observable updateServiceRequest = new Request(this.api.services, 'update');
  @observable reorderServicesRequest = new Request(this.api.services, 'reorder');
  @observable deleteServiceRequest = new Request(this.api.services, 'delete');
  @observable clearCacheRequest = new Request(this.api.services, 'clearCache');
  @observable filterNeedle = null;
@@ -400,6 +407,18 @@ export default class ServicesStore extends Store {
      const url = args[0];
      this.actions.app.openExternalUrl({ url });
+    } else if (channel === 'set-service-spellchecker-language') {
+      if (!args) {
+        console.warn('Did not receive locale');
+      } else {
+        this.actions.service.updateService({
+          serviceId,
+          serviceData: {
+            spellcheckerLanguage: args[0] === 'reset' ? '' : args[0],
+          },
+          redirect: false,
+        });
+      }
    }
  }
@@ -625,7 +644,7 @@ export default class ServicesStore extends Store {
    const service = this.one(serviceId);
    if (service.webview) {
-      service.webview.send('initializeRecipe', service);
+      service.webview.send('initialize-recipe', service);
    }
  }
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 4c01e9910..a456195bf 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,5 +1,7 @@
 import { ipcRenderer } from 'electron';
-import { action, computed, observable } from 'mobx';
+import {
+  action, computed, observable, set,
+} from 'mobx';
 import localStorage from 'mobx-localstorage';
 import Store from './lib/Store';
@@ -14,11 +16,13 @@ const debug = require('debug')('Franz:SettingsStore');
 export default class SettingsStore extends Store {
  @observable appSettingsRequest = new CachedRequest(this.api.local, 'getAppSettings');
  @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings');
-  @observable fileSystemSettingsRequests = [];
+  fileSystemSettingsRequests = [];
  fileSystemSettingsTypes = FILE_SYSTEM_SETTINGS_TYPES;
  @observable _fileSystemSettingsCache = {
    app: DEFAULT_APP_SETTINGS,
    proxy: {},
@@ -57,6 +61,21 @@ export default class SettingsStore extends Store {
  }
  @computed get proxy() {
+    // // We need to provide the final data structure as mobx autoruns won't work
+    // const proxySettings = observable({});
+    // this.stores.services.all.forEach((service) => {
+    //   proxySettings[service.id] = {
+    //     isEnabled: false,
+    //     host: null,
+    //     user: null,
+    //     password: null,
+    //   };
+    // });
+    // debug('this._fileSystemSettingsCache.proxy', this._fileSystemSettingsCache.proxy, proxySettings);
+    // return Object.assign(proxySettings, this._fileSystemSettingsCache.proxy);
    return this._fileSystemSettingsCache.proxy || {};
  }
@@ -98,7 +117,7 @@ export default class SettingsStore extends Store {
        data,
      });
-      Object.assign(this._fileSystemSettingsCache[type], data);
+      set(this._fileSystemSettingsCache[type], data);
    }
  }
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 26ac2c60e..7addb5760 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -14,29 +14,47 @@ const debug = require('debug')('Franz:UserStore');
 // TODO: split stores into UserStore and AuthStore
 export default class UserStore extends Store {
  BASE_ROUTE = '/auth';
  WELCOME_ROUTE = `${this.BASE_ROUTE}/welcome`;
  LOGIN_ROUTE = `${this.BASE_ROUTE}/login`;
  LOGOUT_ROUTE = `${this.BASE_ROUTE}/logout`;
  SIGNUP_ROUTE = `${this.BASE_ROUTE}/signup`;
  PRICING_ROUTE = `${this.BASE_ROUTE}/signup/pricing`;
  IMPORT_ROUTE = `${this.BASE_ROUTE}/signup/import`;
  INVITE_ROUTE = `${this.BASE_ROUTE}/signup/invite`;
  PASSWORD_ROUTE = `${this.BASE_ROUTE}/password`;
  @observable loginRequest = new Request(this.api.user, 'login');
  @observable signupRequest = new Request(this.api.user, 'signup');
  @observable passwordRequest = new Request(this.api.user, 'password');
  @observable inviteRequest = new Request(this.api.user, 'invite');
  @observable getUserInfoRequest = new CachedRequest(this.api.user, 'getInfo');
  @observable updateUserInfoRequest = new Request(this.api.user, 'updateInfo');
  @observable getLegacyServicesRequest = new CachedRequest(this.api.user, 'getLegacyServices');
  @observable deleteAccountRequest = new CachedRequest(this.api.user, 'delete');
  @observable isImportLegacyServicesExecuting = false;
  @observable isImportLegacyServicesCompleted = false;
  @observable id;
  @observable authToken = localStorage.getItem('authToken') || null;
  @observable accountType;
  @observable hasCompletedSignup = null;
@@ -48,6 +66,7 @@ export default class UserStore extends Store {
  logoutReasonTypes = {
    SERVER: 'SERVER',
  };
  @observable logoutReason = null;
  constructor(...args) {
@@ -141,7 +160,9 @@ export default class UserStore extends Store {
    gaEvent('User', 'login');
  }
-  @action async _signup({ firstname, lastname, email, password, accountType, company }) {
+  @action async _signup({
+    firstname, lastname, email, password, accountType, company,
+  }) {
    const authToken = await this.signupRequest.execute({
      firstname,
      lastname,
@@ -198,10 +219,11 @@ export default class UserStore extends Store {
  }
  @action _logout() {
+    // workaround mobx issue
    localStorage.removeItem('authToken');
+    window.localStorage.removeItem('authToken');
    this.getUserInfoRequest.invalidate().reset();
    this.authToken = null;
-    // this.data = {};
  }
  @action async _importLegacyServices({ services }) {
diff --git a/src/stores/index.js b/src/stores/index.js
index f547d0a7a..96b844c95 100644
--- a/src/stores/index.js
+++ b/src/stores/index.js
@@ -9,7 +9,6 @@ import UIStore from './UIStore';
 import PaymentStore from './PaymentStore';
 import NewsStore from './NewsStore';
 import RequestStore from './RequestStore';
-import DictionaryStore from './DictionaryStore';
 import GlobalErrorStore from './GlobalErrorStore';
 export default (api, actions, router) => {
@@ -27,7 +26,6 @@ export default (api, actions, router) => {
    payment: new PaymentStore(stores, api, actions),
    news: new NewsStore(stores, api, actions),
    requests: new RequestStore(stores, api, actions),
-    dictionary: new DictionaryStore(stores, api, actions),
    globalError: new GlobalErrorStore(stores, api, actions),
  });
  // Initialize all stores
diff --git a/src/stores/lib/CachedRequest.js b/src/stores/lib/CachedRequest.js
index c0c3d40a1..ac8b2bd81 100644
--- a/src/stores/lib/CachedRequest.js
+++ b/src/stores/lib/CachedRequest.js
@@ -5,6 +5,7 @@ import Request from './Request';
 export default class CachedRequest extends Request {
  _apiCalls = [];
  _isInvalidated = true;
  execute(...callArgs) {
diff --git a/src/stores/lib/Reaction.js b/src/stores/lib/Reaction.js
index e9bc26d81..46aa4dae6 100644
--- a/src/stores/lib/Reaction.js
+++ b/src/stores/lib/Reaction.js
@@ -3,7 +3,9 @@ import { autorun } from 'mobx';
 export default class Reaction {
  reaction;
  hasBeenStarted;
  dispose;
  constructor(reaction) {
diff --git a/src/stores/lib/Request.js b/src/stores/lib/Request.js
index 4a6925cc5..04f528156 100644
--- a/src/stores/lib/Request.js
+++ b/src/stores/lib/Request.js
@@ -9,15 +9,23 @@ export default class Request {
  }
  @observable result = null;
  @observable error = null;
  @observable isExecuting = false;
  @observable isError = false;
  @observable wasExecuted = false;
  _promise = Promise;
  _api = {};
  _method = '';
  _isWaitingForResponse = false;
  _currentApiCall = null;
  constructor(api, method) {
diff --git a/src/stores/lib/Store.js b/src/stores/lib/Store.js
index 873da7b37..8d2fb4066 100644
--- a/src/stores/lib/Store.js
+++ b/src/stores/lib/Store.js
@@ -3,16 +3,20 @@ import Reaction from './Reaction';
 export default class Store {
  stores = {};
  api = {};
  actions = {};
  _reactions = [];
  // status implementation
  @observable _status = null;
  @computed get actionStatus() {
    return this._status || [];
  }
  set actionStatus(status) {
    this._status = status;
  }
diff --git a/src/styles/auth.scss b/src/styles/auth.scss
index 54e264dc6..817801982 100644
--- a/src/styles/auth.scss
+++ b/src/styles/auth.scss
@@ -33,17 +33,9 @@
  .auth__layout {
    width: 100%;
+    display: flex;
-    & > div {
+    align-items: center;
-      align-items: center;
+    justify-content: center;
-      display: flex;
-      justify-content: center;
-      & > span {
-        position: absolute;
-        width: 100%;
-      }
-    }
  }
  .auth__container {
diff --git a/src/styles/content-tabs.scss b/src/styles/content-tabs.scss
index ca3820fb4..03befedcb 100644
--- a/src/styles/content-tabs.scss
+++ b/src/styles/content-tabs.scss
@@ -1,5 +1,21 @@
 @import './config.scss';
+.theme__dark {
+  .content-tabs {
+    .content-tabs__content {
+      background: $dark-theme-gray-darker;
+    }
+    .content-tabs__tabs {
+      .content-tabs__item {
+        background: $dark-theme-gray;
+        color: #FFF;
+        border: 0;
+      }
+    }
+  }
+}
 .content-tabs {
  .content-tabs__tabs {
    border-top-left-radius: $theme-border-radius-small;
diff --git a/src/styles/searchInput.scss b/src/styles/searchInput.scss
index 32b9da065..91453c600 100644
--- a/src/styles/searchInput.scss
+++ b/src/styles/searchInput.scss
@@ -22,6 +22,10 @@
  padding: 5px 10px;
  width: 100%;
+  label {
+    width: 100%;
+  }
  input {
    background: none;
    border: 0;
diff --git a/src/styles/select.scss b/src/styles/select.scss
index ed0fc0fc2..513975f9c 100644
--- a/src/styles/select.scss
+++ b/src/styles/select.scss
@@ -20,4 +20,8 @@ $toggle: "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj
  min-width: 200px;
  padding: 10px;
  -webkit-appearance: none;
+  &[disabled] {
+    opacity: 0.5;
+  }
 }
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index f94ca114d..750b6bedd 100644
--- a/src/styles/settings.scss
+++ b/src/styles/settings.scss
@@ -216,6 +216,10 @@
        letter-spacing: -0.1px;
      }
    }
+    .proxyHost {
+      flex-basis: 70%;
+    }
  }
  .settings__close {
diff --git a/src/styles/welcome.scss b/src/styles/welcome.scss
index b3d6515b1..b517431f0 100644
--- a/src/styles/welcome.scss
+++ b/src/styles/welcome.scss
@@ -1,9 +1,12 @@
 .auth .welcome {
+  height: auto;
+  
  &__content {
    align-items: center;
    color: #FFF;
    display: flex;
    justify-content: center;
+    height: auto;
  }
  &__logo { width: 100px; }
@@ -37,6 +40,7 @@
    display: block;
    margin-top: 100px;
    text-align: center;
+    height: auto;
    .button:first-of-type { margin-right: 25px; }
  }
@@ -71,6 +75,7 @@
    padding: 20px 20px 5px;
    text-align: center;
    width: 480px;
+    height: auto;
  }
  &__featured-service {
diff --git a/src/theme/dark/index.js b/src/theme/dark/index.js
index 496a51119..fb1713184 100644
--- a/src/theme/dark/index.js
+++ b/src/theme/dark/index.js
@@ -1,6 +1,13 @@
+import hexToRgba from 'hex-to-rgba';
 import * as legacyStyles from '../default/legacy';
 export const colorBackground = legacyStyles.darkThemeGrayDarkest;
 export const colorBackgroundSubscriptionContainer = legacyStyles.themeBrandInfo;
 export const colorHeadline = legacyStyles.darkThemeTextColor;
+export const colorText = legacyStyles.darkThemeTextColor;
+// Loader
+export const colorFullscreenLoaderSpinner = '#FFF';
+export const colorWebviewLoaderBackground = hexToRgba(legacyStyles.darkThemeGrayDarkest, 0.5);
diff --git a/src/theme/default/index.js b/src/theme/default/index.js
index 8766fb609..37827621c 100644
--- a/src/theme/default/index.js
+++ b/src/theme/default/index.js
@@ -1,3 +1,5 @@
+import hexToRgba from 'hex-to-rgba';
 import * as legacyStyles from './legacy';
 export const brandPrimary = '#3498db';
@@ -12,6 +14,8 @@ export const borderRadiusSmall = legacyStyles.themeBorderRadiusSmall;
 export const colorBackground = legacyStyles.themeGrayLighter;
 export const colorHeadline = legacyStyles.themeGrayDark;
+export const colorText = legacyStyles.themeTextColor;
 // Subscription Container Component
 export const colorSubscriptionContainerBackground = 'none';
 export const colorSubscriptionContainerBorder = [1, 'solid', brandPrimary];
@@ -19,3 +23,7 @@ export const colorSubscriptionContainerTitle = brandPrimary;
 export const colorSubscriptionContainerActionButtonBackground = brandPrimary;
 export const colorSubscriptionContainerActionButtonColor = '#FFF';
+// Loader
+export const colorAppLoaderSpinner = '#FFF';
+export const colorFullscreenLoaderSpinner = legacyStyles.themeGrayDark;
+export const colorWebviewLoaderBackground = hexToRgba(legacyStyles.themeGrayLighter, 0.8);
diff --git a/src/webview/contextMenu.js b/src/webview/contextMenu.js
index ad156128c..bd099987d 100644
--- a/src/webview/contextMenu.js
+++ b/src/webview/contextMenu.js
@@ -1,9 +1,12 @@
 // This is heavily based on https://github.com/sindresorhus/electron-context-menu
 // ❤ @sindresorhus
-import { clipboard, remote, ipcRenderer, shell } from 'electron';
+import {
+  clipboard, remote, ipcRenderer, shell,
+} from 'electron';
 import { isDevMode, isMac } from '../environment';
+import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 const debug = require('debug')('Franz:contextMenu');
@@ -21,7 +24,7 @@ function delUnusedElements(menuTpl) {
  });
 }
-const buildMenuTpl = (props, suggestions) => {
+const buildMenuTpl = (props, suggestions, isSpellcheckEnabled, defaultSpellcheckerLanguage, spellcheckerLanguage) => {
  const { editFlags } = props;
  const textSelection = props.selectionText.trim();
  const hasText = textSelection.length > 0;
@@ -190,6 +193,54 @@ const buildMenuTpl = (props, suggestions) => {
    });
  }
+  const spellcheckingLanguages = [];
+  Object.keys(SPELLCHECKER_LOCALES).sort(Intl.Collator().compare).forEach((key) => {
+    spellcheckingLanguages.push({
+      id: `lang-${key}`,
+      label: SPELLCHECKER_LOCALES[key],
+      type: 'radio',
+      checked: spellcheckerLanguage === key,
+      click() {
+        debug('Setting service spellchecker to', key);
+        ipcRenderer.sendToHost('set-service-spellchecker-language', key);
+      },
+    });
+  });
+  console.log('isSpellcheckEnabled', isSpellcheckEnabled);
+  menuTpl.push({
+    type: 'separator',
+  }, {
+    id: 'spellchecker',
+    label: 'Spell Checking',
+    visible: isSpellcheckEnabled,
+    submenu: [
+      {
+        id: 'spellchecker',
+        label: 'Available Languages',
+        enabled: false,
+      }, {
+        type: 'separator',
+      },
+      {
+        id: 'resetToDefault',
+        label: `Reset to system default (${SPELLCHECKER_LOCALES[defaultSpellcheckerLanguage]})`,
+        type: 'radio',
+        visible: defaultSpellcheckerLanguage !== spellcheckerLanguage,
+        click() {
+          debug('Resetting service spellchecker to system default');
+          ipcRenderer.sendToHost('set-service-spellchecker-language', 'reset');
+        },
+      },
+      {
+        type: 'separator',
+        visible: defaultSpellcheckerLanguage !== spellcheckerLanguage,
+      },
+      ...spellcheckingLanguages],
+  });
  if (isDevMode) {
    menuTpl.push({
      type: 'separator',
@@ -205,7 +256,7 @@ const buildMenuTpl = (props, suggestions) => {
  return delUnusedElements(menuTpl);
 };
-export default function contextMenu(spellcheckProvider) {
+export default function contextMenu(spellcheckProvider, isSpellcheckEnabled, getDefaultSpellcheckerLanguage, getSpellcheckerLanguage) {
  webContents.on('context-menu', (e, props) => {
    e.preventDefault();
@@ -216,7 +267,15 @@ export default function contextMenu(spellcheckProvider) {
      debug('Suggestions', suggestions);
    }
-    const menu = Menu.buildFromTemplate(buildMenuTpl(props, suggestions.slice(0, 5)));
+    const menu = Menu.buildFromTemplate(
+      buildMenuTpl(
+        props,
+        suggestions.slice(0, 5),
+        isSpellcheckEnabled(),
+        getDefaultSpellcheckerLanguage(),
+        getSpellcheckerLanguage(),
+      ),
+    );
    menu.popup(remote.getCurrentWindow());
  });
diff --git a/src/webview/darkmode.js b/src/webview/darkmode.js
index 9830ef33c..73c7007c6 100644
--- a/src/webview/darkmode.js
+++ b/src/webview/darkmode.js
@@ -1,7 +1,13 @@
+/* eslint no-bitwise: ["error", { "int32Hint": true }] */
 import path from 'path';
 import fs from 'fs-extra';
-const ID = 'franz-theme-dark-mode';
+const debug = require('debug')('Franz:DarkMode');
+const chars = [...'abcdefghijklmnopqrstuvwxyz'];
+const ID = [...Array(20)].map(() => chars[Math.random() * chars.length | 0]).join``;
 export function injectDarkModeStyle(recipePath) {
  const darkModeStyle = path.join(recipePath, 'darkmode.css');
@@ -12,6 +18,8 @@ export function injectDarkModeStyle(recipePath) {
    styles.innerHTML = data.toString();
    document.querySelector('head').appendChild(styles);
+    debug('Injected Dark Mode style with ID', ID);
  }
 }
@@ -20,6 +28,8 @@ export function removeDarkModeStyle() {
  if (style) {
    style.remove();
+    debug('Removed Dark Mode Style with ID', ID);
  }
 }
diff --git a/src/webview/notifications.js b/src/webview/notifications.js
index 2020bbdc6..f8fe53e1b 100644
--- a/src/webview/notifications.js
+++ b/src/webview/notifications.js
@@ -1,10 +1,13 @@
-const { ipcRenderer } = require('electron');
+import { ipcRenderer } from 'electron';
-const uuidV1 = require('uuid/v1');
+import uuidV1 from 'uuid/v1';
+const debug = require('debug')('Franz:Notifications');
 class Notification {
  static permission = 'granted';
  constructor(title = '', options = {}) {
+    debug('New notification', title, options);
    this.title = title;
    this.options = options;
    this.notificationId = uuidV1();
diff --git a/src/webview/plugin.js b/src/webview/plugin.js
deleted file mode 100644
index 72530733d..000000000
--- a/src/webview/plugin.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import { ipcRenderer } from 'electron';
-import path from 'path';
-import RecipeWebview from './lib/RecipeWebview';
-import spellchecker, { switchDict, disable as disableSpellchecker } from './spellchecker';
-import { injectDarkModeStyle, isDarkModeStyleInjected, removeDarkModeStyle } from './darkmode';
-import contextMenu from './contextMenu';
-import './notifications';
-const debug = require('debug')('Franz:Plugin');
-window.franzSettings = {};
-let serviceData;
-ipcRenderer.on('initializeRecipe', (e, data) => {
-  const modulePath = path.join(data.recipe.path, 'webview.js');
-  // Delete module from cache
-  delete require.cache[require.resolve(modulePath)];
-  try {
-    // eslint-disable-next-line
-    require(modulePath)(new RecipeWebview(), data);
-    debug('Initialize Recipe', data);
-    serviceData = data;
-    if (data.isDarkModeEnabled) {
-      injectDarkModeStyle(data.recipe.path);
-      debug('Add dark theme styles');
-    }
-  } catch (err) {
-    debug('Recipe initialization failed', err);
-  }
-});
-// Needs to run asap to intialize dictionaries
-(async () => {
-  const spellcheckingProvider = await spellchecker();
-  contextMenu(spellcheckingProvider);
-})();
-ipcRenderer.on('settings-update', async (e, data) => {
-  debug('Settings update received', data);
-  if (data.enableSpellchecking) {
-    switchDict(data.spellcheckerLanguage);
-  } else {
-    disableSpellchecker();
-  }
-  window.franzSettings = data;
-});
-ipcRenderer.on('service-settings-update', (e, data) => {
-  debug('Service settings update received', data);
-  if (data.isDarkModeEnabled && !isDarkModeStyleInjected()) {
-    injectDarkModeStyle(serviceData.recipe.path);
-    debug('Enable service dark mode');
-  } else if (!data.isDarkModeEnabled && isDarkModeStyleInjected()) {
-    removeDarkModeStyle();
-    debug('Disable service dark mode');
-  }
-});
-// Needed for current implementation of electrons 'login' event 🤦‍
-ipcRenderer.on('get-service-id', (event) => {
-  debug('Asking for service id', event);
-  event.sender.send('service-id', serviceData.id);
-});
-document.addEventListener('DOMContentLoaded', () => {
-  ipcRenderer.sendToHost('hello');
-}, false);
-// Patching window.open
-const originalWindowOpen = window.open;
-window.open = (url, frameName, features) => {
-  // We need to differentiate if the link should be opened in a popup or in the systems default browser
-  if (!frameName && !features) {
-    return ipcRenderer.sendToHost('new-window', url);
-  }
-  return originalWindowOpen(url, frameName, features);
-};
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
new file mode 100644
index 000000000..944883899
--- /dev/null
+++ b/src/webview/recipe.js
@@ -0,0 +1,131 @@
+import { ipcRenderer } from 'electron';
+import path from 'path';
+import { autorun, computed, observable } from 'mobx';
+import RecipeWebview from './lib/RecipeWebview';
+import spellchecker, { switchDict, disable as disableSpellchecker } from './spellchecker';
+import { injectDarkModeStyle, isDarkModeStyleInjected, removeDarkModeStyle } from './darkmode';
+import contextMenu from './contextMenu';
+import './notifications';
+import { DEFAULT_APP_SETTINGS } from '../config';
+const debug = require('debug')('Franz:Plugin');
+class RecipeController {
+  @observable settings = {
+    overrideSpellcheckerLanguage: false,
+    app: DEFAULT_APP_SETTINGS,
+    service: {
+      isDarkModeEnabled: false,
+      spellcheckerLanguage: '',
+    },
+  };
+  spellcheckProvider = null;
+  ipcEvents = {
+    'initialize-recipe': 'loadRecipeModule',
+    'settings-update': 'updateAppSettings',
+    'service-settings-update': 'updateServiceSettings',
+    'get-service-id': 'serviceIdEcho',
+  }
+  constructor() {
+    this.initialize();
+  }
+  @computed get spellcheckerLanguage() {
+    return this.settings.service.spellcheckerLanguage || this.settings.app.spellcheckerLanguage;
+  }
+  async initialize() {
+    Object.keys(this.ipcEvents).forEach((channel) => {
+      ipcRenderer.on(channel, (event, data) => {
+        debug('Received IPC event for channel', channel, 'with', data);
+        this[this.ipcEvents[channel]](event, data);
+      });
+    });
+    debug('Send "hello" to host');
+    setTimeout(() => ipcRenderer.sendToHost('hello'), 100);
+    this.spellcheckingProvider = await spellchecker();
+    contextMenu(
+      this.spellcheckingProvider,
+      () => this.settings.app.enableSpellchecking,
+      () => this.settings.app.spellcheckerLanguage,
+      () => this.spellcheckerLanguage,
+    );
+    autorun(() => this.update());
+  }
+  loadRecipeModule(event, data) {
+    debug('loadRecipeModule');
+    const modulePath = path.join(data.recipe.path, 'webview.js');
+    // Delete module from cache
+    delete require.cache[require.resolve(modulePath)];
+    try {
+      // eslint-disable-next-line
+      require(modulePath)(new RecipeWebview(), data);
+      debug('Initialize Recipe', data);
+      this.settings.service = data;
+    } catch (err) {
+      console.error('Recipe initialization failed', err);
+    }
+  }
+  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);
+    if (this.settings.app.enableSpellchecking) {
+      debug('Setting spellchecker language to', this.spellcheckerLanguage);
+      switchDict(this.spellcheckerLanguage);
+    } else {
+      debug('Disable spellchecker');
+      disableSpellchecker();
+    }
+    if (this.settings.service.isDarkModeEnabled) {
+      debug('Enable dark mode');
+      injectDarkModeStyle(this.settings.service.recipe.path);
+    } else if (isDarkModeStyleInjected()) {
+      debug('Remove dark mode');
+      removeDarkModeStyle();
+    }
+  }
+  updateAppSettings(event, data) {
+    this.settings.app = Object.assign(this.settings.app, data);
+  }
+  updateServiceSettings(event, data) {
+    this.settings.service = Object.assign(this.settings.service, data);
+  }
+  serviceIdEcho(event) {
+    event.sender.send('service-id', this.settings.service.id);
+  }
+}
+/* eslint-disable no-new */
+new RecipeController();
+/* eslint-enable no-new */
+// Patching window.open
+const originalWindowOpen = window.open;
+window.open = (url, frameName, features) => {
+  // We need to differentiate if the link should be opened in a popup or in the systems default browser
+  if (!frameName && !features) {
+    return ipcRenderer.sendToHost('new-window', url);
+  }
+  return originalWindowOpen(url, frameName, features);
+};
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index b0192b7ef..becaed449 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -1,7 +1,6 @@
 import { webFrame } from 'electron';
-import fs from 'fs';
-import path from 'path';
 import { SpellCheckerProvider } from 'electron-hunspell';
+import path from 'path';
 import { DICTIONARY_PATH } from '../config';
@@ -11,18 +10,13 @@ let provider;
 let currentDict;
 let _isEnabled = false;
-async function loadDictionaries() {
+async function loadDictionary(locale) {
-  const rawList = fs.readdirSync(DICTIONARY_PATH);
+  try {
+    const fileLocation = path.join(DICTIONARY_PATH, `hunspell-dict-${locale}/${locale}`);
-  const dicts = rawList.filter(item => !item.startsWith('.') && fs.lstatSync(path.join(DICTIONARY_PATH, item)).isDirectory());
+    await provider.loadDictionary(locale, `${fileLocation}.dic`, `${fileLocation}.aff`);
+    debug('Loaded dictionary', locale, 'from', fileLocation);
-  debug('Found dictionaries', dicts);
+  } catch (err) {
+    console.error('Could not load dictionary', err);
-  for (let i = 0; i < dicts.length; i += 1) {
-    const fileLocation = `${DICTIONARY_PATH}/${dicts[i]}/${dicts[i]}`;
-    debug('Trying to load', fileLocation);
-    // eslint-disable-next-line
-    await provider.loadDictionary(dicts[i], `${fileLocation}.dic`, `${fileLocation}.aff`);
  }
 }
@@ -30,12 +24,6 @@ export async function switchDict(locale) {
  try {
    debug('Trying to load dictionary', locale);
-    if (!provider.availableDictionaries.includes(locale)) {
-      console.warn('Dict not available', locale);
-      return;
-    }
    if (!provider) {
      console.warn('SpellcheckProvider not initialized');
@@ -48,6 +36,10 @@ export async function switchDict(locale) {
      return;
    }
+    if (currentDict) {
+      provider.unloadDictionary(locale);
+    }
+    loadDictionary(locale);
    provider.switchDictionary(locale);
    debug('Switched dictionary to', locale);
@@ -66,7 +58,7 @@ export default async function initialize(languageCode = 'en-us') {
    debug('Init spellchecker');
    await provider.initialize();
-    await loadDictionaries();
+    // await loadDictionaries();
    debug('Available spellchecker dictionaries', provider.availableDictionaries);
author	Stefan Malzner <stefan@adlk.io>	2018-12-13 14:01:33 +0100
committer	Stefan Malzner <stefan@adlk.io>	2018-12-13 14:01:33 +0100
commit	b5937bd427e02d64b675c9c4719ec8148c68c224 (patch)
tree	3e67ca01935eb36ab6d40a1e197d7c2c0f38b587
parent	Update CHANGELOG.md (diff)
parent	Ignore clicks on premium elements (diff)
download	ferdium-app-5.0.0-beta.21.tar.gz ferdium-app-5.0.0-beta.21.tar.zst ferdium-app-5.0.0-beta.21.zip