chore: upgrade intl dependencies (#1920)

161 files changed, 3117 insertions, 15713 deletions

diff --git a/.eslintrc b/.eslintrc
index 47811e7be..121f28eda 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -2,23 +2,16 @@
   "root": true,
   "parser": "@babel/eslint-parser",
   "extends": "eslint-config-airbnb",
-  "plugins": [
-    "jest"
-  ],
+  "plugins": ["jest"],
   "overrides": [
     {
-      "files": [
-        "**/*.ts",
-        "**/*.tsx"
-      ],
+      "files": ["**/*.ts", "**/*.tsx"],
       "env": {
         "browser": true,
         "es6": true,
         "node": true
       },
-      "extends": [
-        "airbnb-typescript"
-      ],
+      "extends": ["airbnb-typescript"],
       "parser": "@typescript-eslint/parser",
       "parserOptions": {
         "ecmaFeatures": {
@@ -28,9 +21,7 @@
         "sourceType": "module",
         "project": "./tsconfig.json"
       },
-      "plugins": [
-        "@typescript-eslint"
-      ],
+      "plugins": ["@typescript-eslint"],
       "rules": {
         // eslint
         "arrow-parens": 0,
@@ -79,13 +70,9 @@
         "jsx-a11y/label-has-for": [
           2,
           {
-            "components": [
-              "Label"
-            ],
+            "components": ["Label"],
             "required": {
-              "every": [
-                "id"
-              ]
+              "every": ["id"]
             },
             "allowChildren": false
           }
@@ -126,10 +113,7 @@
     "no-console": [
       1,
       {
-        "allow": [
-          "warn",
-          "error"
-        ]
+        "allow": ["warn", "error"]
       }
     ],
     "no-param-reassign": 1,
@@ -152,6 +136,7 @@
     "react/jsx-no-bind": 1,
     "react/jsx-props-no-spreading": 0,
     "react/prefer-stateless-function": 1,
+    "react/prop-types": 0,
     "react/static-property-placement": 0,
     "react/state-in-constructor": 1,
     "react/sort-comp": 0,
diff --git a/babel.config.json b/babel.config.json
index 034e51ce5..d24207a8c 100644
--- a/babel.config.json
+++ b/babel.config.json
@@ -1,8 +1,5 @@
 {
-  "babelrcRoots": [
-    ".",
-    "packages/*"
-  ],
+  "babelrcRoots": [".", "packages/*"],
   "presets": [
     [
       "@babel/preset-env",
@@ -31,11 +28,10 @@
     "@babel/proposal-throw-expressions",
     "@babel/syntax-dynamic-import",
     [
-      "react-intl",
+      "formatjs",
       {
-        "messagesDir": "./src/i18n/messages/",
-        "enforceDescriptions": false,
-        "extractSourceLocation": true
+        "idInterpolationPattern": "[sha512:contenthash:base64:6]",
+        "ast": true
       }
     ],
     [
diff --git a/package-lock.json b/package-lock.json
index 8188513d5..56dd732c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2488,6 +2488,233 @@
         }
       }
     },
+    "@formatjs/cli": {
+      "version": "4.2.33",
+      "resolved": "https://registry.npmjs.org/@formatjs/cli/-/cli-4.2.33.tgz",
+      "integrity": "sha512-4Lg+KZ5QhXgF6+zjHyZlxMG8I0D3m3PZyrj3hRl97vdZ6rAWKVFWw8fkTO/iyhUCP2iC47Eh9r+ZTgGARX9Teg==",
+      "dev": true,
+      "requires": {
+        "@formatjs/icu-messageformat-parser": "2.0.11",
+        "@formatjs/ts-transformer": "3.4.10",
+        "@types/estree": "^0.0.50",
+        "@types/fs-extra": "^9.0.1",
+        "@types/json-stable-stringify": "^1.0.32",
+        "@types/node": "14",
+        "@vue/compiler-core": "^3.0.5",
+        "@vue/compiler-sfc": "^3.0.5",
+        "chalk": "^4.0.0",
+        "commander": "8",
+        "fast-glob": "^3.2.7",
+        "fs-extra": "10",
+        "json-stable-stringify": "^1.0.1",
+        "loud-rejection": "^2.2.0",
+        "tslib": "^2.1.0",
+        "typescript": "4"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "commander": {
+          "version": "8.2.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-8.2.0.tgz",
+          "integrity": "sha512-LLKxDvHeL91/8MIyTAD5BFMNtoIwztGPMiM/7Bl8rIPmHCZXRxmSWr91h57dpOpnQ6jIUqEWdXE/uBYMfiVZDA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "typescript": {
+          "version": "4.4.3",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz",
+          "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==",
+          "dev": true
+        }
+      }
+    },
+    "@formatjs/ecma402-abstract": {
+      "version": "1.9.8",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.9.8.tgz",
+      "integrity": "sha512-2U4n11bLmTij/k4ePCEFKJILPYwdMcJTdnKVBi+JMWBgu5O1N+XhCazlE6QXqVO1Agh2Doh0b/9Jf1mSmSVfhA==",
+      "requires": {
+        "@formatjs/intl-localematcher": "0.2.20",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@formatjs/fast-memoize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-1.2.0.tgz",
+      "integrity": "sha512-fObitP9Tlc31SKrPHgkPgQpGo4+4yXfQQITTCNH8AZdEqB7Mq4nPrjpUL/tNGN3lEeJcFxDbi0haX8HM7QvQ8w==",
+      "requires": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "@formatjs/icu-messageformat-parser": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.11.tgz",
+      "integrity": "sha512-5mWb8U8aulYGwnDZWrr+vdgn5PilvtrqQYQ1pvpgzQes/osi85TwmL2GqTGLlKIvBKD2XNA61kAqXYY95w4LWg==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.9.8",
+        "@formatjs/icu-skeleton-parser": "1.2.12",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@formatjs/icu-skeleton-parser": {
+      "version": "1.2.12",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.2.12.tgz",
+      "integrity": "sha512-DTFxWmEA02ZNW6fsYjGYSADvtrqqjCYF7DSgCmMfaaE0gLP4pCdAgOPE+lkXXU+jP8iCw/YhMT2Seyk/C5lBWg==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.9.8",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@formatjs/intl": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-1.14.1.tgz",
+      "integrity": "sha512-mtL8oBgFwTu0GHFnxaF93fk/zNzNkPzl+27Fwg5AZ88pWHWb7037dpODzoCBnaIVk4FBO5emUn/6jI9Byj8hOw==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.9.8",
+        "@formatjs/fast-memoize": "1.2.0",
+        "@formatjs/icu-messageformat-parser": "2.0.11",
+        "@formatjs/intl-displaynames": "5.2.3",
+        "@formatjs/intl-listformat": "6.3.3",
+        "intl-messageformat": "9.9.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@formatjs/intl-displaynames": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-5.2.3.tgz",
+      "integrity": "sha512-5BmhSurLbfgdeo0OBcNPPkIS8ikMMYaHe2NclxEQZqcMvrnQzNMNnUE2dDF5vZx+mkvKq77aQYzpc8RfqVsRCQ==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.9.8",
+        "@formatjs/intl-localematcher": "0.2.20",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@formatjs/intl-listformat": {
+      "version": "6.3.3",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-6.3.3.tgz",
+      "integrity": "sha512-3nzAKgVS5rePDa5HiH0OwZgAhqxLtzlMc9Pg4QgajRHSP1TqFiMmQnnn52wd3+xVTb7cjZVm3JBnTv51/MhTOg==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.9.8",
+        "@formatjs/intl-localematcher": "0.2.20",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@formatjs/intl-localematcher": {
+      "version": "0.2.20",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.20.tgz",
+      "integrity": "sha512-/Ro85goRZnCojzxOegANFYL0LaDIpdPjAukR7xMTjOtRx+3yyjR0ifGTOW3/Kjhmab3t6GnyHBYWZSudxEOxPA==",
+      "requires": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "@formatjs/ts-transformer": {
+      "version": "3.4.10",
+      "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.4.10.tgz",
+      "integrity": "sha512-5fu8x+8CtyrFe8zdwHvFsYLx9TEPjeJSODRS1ZJxkMVpTBHaNsPqsPkN1TuTk5x3+tSczxXmN1LGrAzUxNN3nQ==",
+      "dev": true,
+      "requires": {
+        "@formatjs/icu-messageformat-parser": "2.0.11",
+        "chalk": "^4.0.0",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "@hapi/hoek": {
       "version": "9.2.0",
       "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.0.tgz",
@@ -6414,6 +6641,15 @@
         "@babel/types": "^7.0.0"
       }
     },
+    "@types/babel__helper-plugin-utils": {
+      "version": "7.10.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__helper-plugin-utils/-/babel__helper-plugin-utils-7.10.0.tgz",
+      "integrity": "sha512-60YtHzhQ9HAkToHVV+TB4VLzBn9lrfgrsOjiJMtbv/c1jPdekBxaByd6DMsGBzROXWoIL6U3lEFvvbu69RkUoA==",
+      "dev": true,
+      "requires": {
+        "@types/babel__core": "*"
+      }
+    },
     "@types/babel__template": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
@@ -6472,6 +6708,12 @@
       "integrity": "sha512-vwNP+pzkI1ipznek2fCA4xj1kQyL9EJcfdBezD9eToe9eP2IgT3WLEBrVqiXal34LOyiAs8xCQKwugEYOKcMkw==",
       "dev": true
     },
+    "@types/estree": {
+      "version": "0.0.50",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
+      "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
+      "dev": true
+    },
     "@types/expect.js": {
       "version": "0.3.29",
       "resolved": "https://registry.npmjs.org/@types/expect.js/-/expect.js-0.3.29.tgz",
@@ -6506,6 +6748,15 @@
         "@types/node": "*"
       }
     },
+    "@types/hoist-non-react-statics": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+      "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
+      "requires": {
+        "@types/react": "*",
+        "hoist-non-react-statics": "^3.3.0"
+      }
+    },
     "@types/html-minifier-terser": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz",
@@ -6542,6 +6793,12 @@
       "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
       "dev": true
     },
+    "@types/json-stable-stringify": {
+      "version": "1.0.33",
+      "resolved": "https://registry.npmjs.org/@types/json-stable-stringify/-/json-stable-stringify-1.0.33.tgz",
+      "integrity": "sha512-qEWiQff6q2tA5gcJGWwzplQcXdJtm+0oy6IHGHzlOf3eFAkGE/FIPXZK9ofWgNSHVp8AFFI33PJJshS0ei3Gvw==",
+      "dev": true
+    },
     "@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
@@ -6625,14 +6882,12 @@
     "@types/prop-types": {
       "version": "15.7.4",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz",
-      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==",
-      "dev": true
+      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
     },
     "@types/react": {
       "version": "16.14.6",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.6.tgz",
       "integrity": "sha512-Ol/aFKune+P0FSFKIgf+XbhGzYGyz0p7g5befSt4rmbzfGLaZR0q7jPew9k7d3bvrcuaL8dPy9Oz3XGZmf9n+w==",
-      "dev": true,
       "requires": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -6657,8 +6912,7 @@
     "@types/scheduler": {
       "version": "0.16.2",
       "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==",
-      "dev": true
+      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
     },
     "@types/semver": {
       "version": "7.3.8",
@@ -7011,6 +7265,121 @@
       "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
       "dev": true
     },
+    "@vue/compiler-core": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.11.tgz",
+      "integrity": "sha512-bcbsLx5XyQg8WDDEGwmpX0BfEfv82wIs9fWFelpyVhNRGMaABvUTalYINyfhVT+jOqNaD4JBhJiVKd/8TmsHWg==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.15.0",
+        "@babel/types": "^7.15.0",
+        "@vue/shared": "3.2.11",
+        "estree-walker": "^2.0.2",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "@vue/compiler-dom": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.11.tgz",
+      "integrity": "sha512-DNvhUHI/1Hn0/+ZYDYGAuDGasUm+XHKC3FE4GqkNCTO/fcLaJMRg/7eT1m1lkc7jPffUwwfh1rZru5mwzOjrNw==",
+      "dev": true,
+      "requires": {
+        "@vue/compiler-core": "3.2.11",
+        "@vue/shared": "3.2.11"
+      }
+    },
+    "@vue/compiler-sfc": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.11.tgz",
+      "integrity": "sha512-cUIaS8mgJrQ6yucj2AupWAwBRITK3W/a8wCOn9g5fJGtOl8h4APY8vN3lzP8HIJDyEeRF3I8SfRhL+oX97kSnw==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.15.0",
+        "@babel/types": "^7.15.0",
+        "@types/estree": "^0.0.48",
+        "@vue/compiler-core": "3.2.11",
+        "@vue/compiler-dom": "3.2.11",
+        "@vue/compiler-ssr": "3.2.11",
+        "@vue/ref-transform": "3.2.11",
+        "@vue/shared": "3.2.11",
+        "consolidate": "^0.16.0",
+        "estree-walker": "^2.0.2",
+        "hash-sum": "^2.0.0",
+        "lru-cache": "^5.1.1",
+        "magic-string": "^0.25.7",
+        "merge-source-map": "^1.1.0",
+        "postcss": "^8.1.10",
+        "postcss-modules": "^4.0.0",
+        "postcss-selector-parser": "^6.0.4",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "@types/estree": {
+          "version": "0.0.48",
+          "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.48.tgz",
+          "integrity": "sha512-LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew==",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
+        }
+      }
+    },
+    "@vue/compiler-ssr": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.11.tgz",
+      "integrity": "sha512-+ptAdUlFDij+Z0VGCbRRkxQlNev5LkbZAntvkxrFjc08CTMhZmiV4Js48n2hAmuSXaKNEpmGkDGU26c/vf1+xw==",
+      "dev": true,
+      "requires": {
+        "@vue/compiler-dom": "3.2.11",
+        "@vue/shared": "3.2.11"
+      }
+    },
+    "@vue/ref-transform": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.11.tgz",
+      "integrity": "sha512-7rX0YsfYb7+1PeKPME1tQyUQcQgt0sIXRRnPD1Vw8Zs2KIo90YLy9CrvwalcRCxGw0ScsjBEhVjJtWIT79TElg==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.15.0",
+        "@vue/compiler-core": "3.2.11",
+        "@vue/shared": "3.2.11",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.25.7"
+      }
+    },
+    "@vue/shared": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.11.tgz",
+      "integrity": "sha512-ovfXAsSsCvV9JVceWjkqC/7OF5HbgLOtCWjCIosmPGG8lxbPuavhIxRH1dTx4Dg9xLgRTNLvI3pVxG4ItQZekg==",
+      "dev": true
+    },
     "@webassemblyjs/ast": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
@@ -8105,6 +8474,12 @@
       "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
       "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8="
     },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "dev": true
+    },
     "array-flatten": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
@@ -8543,6 +8918,86 @@
         "object.assign": "^4.1.0"
       }
     },
+    "babel-plugin-formatjs": {
+      "version": "10.3.8",
+      "resolved": "https://registry.npmjs.org/babel-plugin-formatjs/-/babel-plugin-formatjs-10.3.8.tgz",
+      "integrity": "sha512-pLryt/Q5zmoQWRrybzwiaZ9i0M9I1JJwshHqOuyxn+MlqcxArp2N0E7/X9fhIC1X9yEdDV0zfGbY00J+krmZzQ==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-jsx": "7",
+        "@babel/traverse": "7",
+        "@babel/types": "^7.12.11",
+        "@formatjs/icu-messageformat-parser": "2.0.11",
+        "@formatjs/ts-transformer": "3.4.10",
+        "@types/babel__core": "^7.1.7",
+        "@types/babel__helper-plugin-utils": "^7.10.0",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@formatjs/ts-transformer": {
+          "version": "3.4.10",
+          "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.4.10.tgz",
+          "integrity": "sha512-5fu8x+8CtyrFe8zdwHvFsYLx9TEPjeJSODRS1ZJxkMVpTBHaNsPqsPkN1TuTk5x3+tSczxXmN1LGrAzUxNN3nQ==",
+          "dev": true,
+          "requires": {
+            "@formatjs/icu-messageformat-parser": "2.0.11",
+            "chalk": "^4.0.0",
+            "tslib": "^2.1.0"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "babel-plugin-istanbul": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
@@ -8606,38 +9061,6 @@
         "@babel/helper-define-polyfill-provider": "^0.2.2"
       }
     },
-    "babel-plugin-react-intl": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-react-intl/-/babel-plugin-react-intl-3.5.1.tgz",
-      "integrity": "sha512-1jlEJCSmLaJM4tjIKpu64UZ833COCHmwR77bFJDOye+zlwf80uR1b8p41l4tClx1QsrfI+qV6w/5AiPYQgaMUQ==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.4.5",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@types/babel__core": "^7.1.2",
-        "fs-extra": "^8.0.1",
-        "intl-messageformat-parser": "^1.8.1"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "intl-messageformat-parser": {
-          "version": "1.8.1",
-          "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.8.1.tgz",
-          "integrity": "sha512-IMSCKVf0USrM/959vj3xac7s8f87sc+80Y/ipBzdKy4ifBv5Gsj2tZ41EAaURVg01QU71fYr77uA8Meh6kELbg==",
-          "dev": true
-        }
-      }
-    },
     "babel-preset-current-node-syntax": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
@@ -9921,6 +10344,31 @@
         "node-addon-api": "*",
         "rimraf": "^2.4.0",
         "underscore": "^1.6.0"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "requires": {
+            "glob": "^7.1.3"
+          },
+          "dependencies": {
+            "glob": {
+              "version": "7.1.7",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+              "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+              "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            }
+          }
+        }
       }
     },
     "clean-css": {
@@ -10807,6 +11255,15 @@
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
     },
+    "consolidate": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.16.0.tgz",
+      "integrity": "sha512-Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.7.2"
+      }
+    },
     "constants-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
@@ -11282,6 +11739,31 @@
         "mkdirp": "^0.5.1",
         "rimraf": "^2.5.4",
         "run-queue": "^1.0.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.7",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+          "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "copy-descriptor": {
@@ -11609,6 +12091,12 @@
       "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==",
       "dev": true
     },
+    "cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true
+    },
     "csso": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
@@ -11646,6 +12134,15 @@
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
       "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw=="
     },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dev": true,
+      "requires": {
+        "array-find-index": "^1.0.1"
+      }
+    },
     "cyclist": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
@@ -12024,6 +12521,15 @@
           "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
           "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
           "dev": true
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
         }
       }
     },
@@ -14001,6 +14507,12 @@
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true
     },
+    "estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true
+    },
     "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
@@ -15177,6 +15689,31 @@
         "inherits": "~2.0.0",
         "mkdirp": ">=0.5 0",
         "rimraf": "2"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.7",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+          "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+          "optional": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "optional": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "function-bind": {
@@ -15238,6 +15775,15 @@
         }
       }
     },
+    "generic-names": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/generic-names/-/generic-names-2.0.1.tgz",
+      "integrity": "sha512-kPCHWa1m9wGG/OwQpeweTwM/PYiQLrUIxXbt/P4Nic3LbGjCP0YwrALHW1uNLKZ0LIMg+RF+XRlj2ekT9ZlZAQ==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0"
+      }
+    },
     "gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -16440,6 +16986,12 @@
         }
       }
     },
+    "hash-sum": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
+      "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
+      "dev": true
+    },
     "hash.js": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
@@ -16848,6 +17400,18 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
+    "icss-replace-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
+      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
+      "dev": true
+    },
+    "icss-utils": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "dev": true
+    },
     "ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -17214,30 +17778,14 @@
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
       "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="
     },
-    "intl-format-cache": {
-      "version": "2.2.9",
-      "resolved": "https://registry.npmjs.org/intl-format-cache/-/intl-format-cache-2.2.9.tgz",
-      "integrity": "sha512-Zv/u8wRpekckv0cLkwpVdABYST4hZNTDaX7reFetrYTJwxExR2VyTqQm+l0WmL0Qo8Mjb9Tf33qnfj0T7pjxdQ=="
-    },
     "intl-messageformat": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-2.2.0.tgz",
-      "integrity": "sha1-NFvNRt5jC3aDMwwuUhd/9eq0hPw=",
+      "version": "9.9.1",
+      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.9.1.tgz",
+      "integrity": "sha512-cuzS/XKHn//hvKka77JKU2dseiVY2dofQjIOZv6ZFxFt4Z9sPXnZ7KQ9Ak2r+4XBCjI04MqJ1PhKs/3X22AkfA==",
       "requires": {
-        "intl-messageformat-parser": "1.4.0"
-      }
-    },
-    "intl-messageformat-parser": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz",
-      "integrity": "sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU="
-    },
-    "intl-relativeformat": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/intl-relativeformat/-/intl-relativeformat-2.2.0.tgz",
-      "integrity": "sha512-4bV/7kSKaPEmu6ArxXf9xjv1ny74Zkwuey8Pm01NH4zggPP7JHwg2STk8Y3JdspCKRDriwIyLRfEXnj2ZLr4Bw==",
-      "requires": {
-        "intl-messageformat": "^2.0.0"
+        "@formatjs/fast-memoize": "1.2.0",
+        "@formatjs/icu-messageformat-parser": "2.0.11",
+        "tslib": "^2.1.0"
       }
     },
     "invariant": {
@@ -20505,6 +21053,16 @@
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
+    "loud-rejection": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-2.2.0.tgz",
+      "integrity": "sha512-S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ==",
+      "dev": true,
+      "requires": {
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.2"
+      }
+    },
     "lower-case": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
@@ -20574,6 +21132,15 @@
         }
       }
     },
+    "magic-string": {
+      "version": "0.25.7",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
+      "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+      "dev": true,
+      "requires": {
+        "sourcemap-codec": "^1.4.4"
+      }
+    },
     "make-dir": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
@@ -20879,6 +21446,23 @@
       "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
       "dev": true
     },
+    "merge-source-map": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
+      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
+      "dev": true,
+      "requires": {
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
     "merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -21686,6 +22270,31 @@
         "mkdirp": "^0.5.1",
         "rimraf": "^2.5.4",
         "run-queue": "^1.0.3"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.7",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+          "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "ms": {
@@ -22010,6 +22619,15 @@
             "path-is-absolute": "^1.0.0"
           }
         },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "optional": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
         "semver": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
@@ -22150,6 +22768,19 @@
         "tar": "^4"
       },
       "dependencies": {
+        "glob": {
+          "version": "7.1.7",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+          "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
         "nopt": {
           "version": "4.0.3",
           "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
@@ -22159,6 +22790,14 @@
             "osenv": "^0.1.4"
           }
         },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -22335,6 +22974,17 @@
             "semver": "^5.7.1",
             "tar": "^4.4.12",
             "which": "^1.3.1"
+          },
+          "dependencies": {
+            "rimraf": {
+              "version": "2.7.1",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+              "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+              "dev": true,
+              "requires": {
+                "glob": "^7.1.3"
+              }
+            }
           }
         },
         "nopt": {
@@ -23619,6 +24269,84 @@
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
     },
+    "postcss": {
+      "version": "8.3.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz",
+      "integrity": "sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==",
+      "dev": true,
+      "requires": {
+        "colorette": "^1.2.2",
+        "nanoid": "^3.1.23",
+        "source-map-js": "^0.6.2"
+      }
+    },
+    "postcss-modules": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/postcss-modules/-/postcss-modules-4.2.2.tgz",
+      "integrity": "sha512-/H08MGEmaalv/OU8j6bUKi/kZr2kqGF6huAW8m9UAgOLWtpFdhA14+gPBoymtqyv+D4MLsmqaF2zvIegdCxJXg==",
+      "dev": true,
+      "requires": {
+        "generic-names": "^2.0.1",
+        "icss-replace-symbols": "^1.1.0",
+        "lodash.camelcase": "^4.3.0",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-values": "^4.0.0",
+        "string-hash": "^1.1.1"
+      }
+    },
+    "postcss-modules-extract-imports": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+      "dev": true
+    },
+    "postcss-modules-local-by-default": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
+      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
+      "dev": true,
+      "requires": {
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
+      }
+    },
+    "postcss-modules-scope": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
+      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+      "dev": true,
+      "requires": {
+        "postcss-selector-parser": "^6.0.4"
+      }
+    },
+    "postcss-modules-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+      "dev": true,
+      "requires": {
+        "icss-utils": "^5.0.0"
+      }
+    },
+    "postcss-selector-parser": {
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
+      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
+      "dev": true,
+      "requires": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
+      "dev": true
+    },
     "prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -24577,48 +25305,30 @@
       }
     },
     "react-intl": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.7.2.tgz",
-      "integrity": "sha512-3dcNGLqEw2FKkX+1L2WYLgjP0MVJkvWuVd1uLcnwifIQe8JQvnd9Bss4hb4Gvg/YhBIRcs4LM6C2bAgyklucjw==",
-      "requires": {
-        "hoist-non-react-statics": "^2.5.5",
-        "intl-format-cache": "^2.0.5",
-        "intl-messageformat": "^2.1.0",
-        "intl-relativeformat": "^2.1.0",
-        "invariant": "^2.1.1"
-      },
-      "dependencies": {
-        "hoist-non-react-statics": {
-          "version": "2.5.5",
-          "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=="
-        }
-      }
-    },
-    "react-intl-translations-manager": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/react-intl-translations-manager/-/react-intl-translations-manager-5.0.3.tgz",
-      "integrity": "sha512-EfBeugnOGFcdUbQyY9TqBMbuauQ8wm73ZqFr0UqCljhbXl7YDHQcVzclWFRkVmlUffzxitLQFhAZEVVeRNQSwA==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.3.2",
-        "glob": "^7.1.2",
-        "json-stable-stringify": "^1.0.1",
-        "mkdirp": "^0.5.1"
+      "version": "5.20.10",
+      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-5.20.10.tgz",
+      "integrity": "sha512-zy0ZQhpjkGsKcK1BFo2HbGM/q8GBVovzoXZGQ76DowR0yr6UzQuPLkrlIrObL2zxIYiDaxaz+hUJaoa2a1xqOQ==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.9.8",
+        "@formatjs/icu-messageformat-parser": "2.0.11",
+        "@formatjs/intl": "1.14.1",
+        "@formatjs/intl-displaynames": "5.2.3",
+        "@formatjs/intl-listformat": "6.3.3",
+        "@types/hoist-non-react-statics": "^3.3.1",
+        "@types/react": "17",
+        "hoist-non-react-statics": "^3.3.2",
+        "intl-messageformat": "9.9.1",
+        "tslib": "^2.1.0"
       },
       "dependencies": {
-        "glob": {
-          "version": "7.1.7",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-          "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-          "dev": true,
+        "@types/react": {
+          "version": "17.0.20",
+          "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.20.tgz",
+          "integrity": "sha512-wWZrPlihslrPpcKyCSlmIlruakxr57/buQN1RjlIeaaTWDLtJkTtRW429MoQJergvVKc4IWBpRhWw7YNh/7GVA==",
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "@types/prop-types": "*",
+            "@types/scheduler": "*",
+            "csstype": "^3.0.2"
           }
         }
       }
@@ -25567,9 +26277,10 @@
       "dev": true
     },
     "rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
       "requires": {
         "glob": "^7.1.3"
       },
@@ -25578,6 +26289,7 @@
           "version": "7.1.7",
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
           "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+          "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
             "inflight": "^1.0.4",
@@ -26522,6 +27234,12 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
     },
+    "source-map-js": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz",
+      "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==",
+      "dev": true
+    },
     "source-map-resolve": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
@@ -26557,6 +27275,12 @@
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="
     },
+    "sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "dev": true
+    },
     "sparkles": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
@@ -26961,6 +27685,12 @@
       "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
     },
+    "string-hash": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz",
+      "integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs=",
+      "dev": true
+    },
     "string-length": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -27503,6 +28233,17 @@
             "ssri": "^6.0.1",
             "unique-filename": "^1.1.1",
             "y18n": "^4.0.0"
+          },
+          "dependencies": {
+            "rimraf": {
+              "version": "2.7.1",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+              "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+              "dev": true,
+              "requires": {
+                "glob": "^7.1.3"
+              }
+            }
           }
         },
         "glob": {
diff --git a/package.json b/package.json
index f4ee15e34..f95116218 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,9 @@
     "test": "jest",
     "test:watch": "jest --watch",
     "lint": "eslint \"{src,scripts,packages,uidev}/**/*.{js,jsx,ts,tsx}\" --quiet --fix",
-    "manage-translations": "node ./src/i18n/manage-translations.js",
+    "extract": "formatjs extract 'src/**/*.{js,ts}' --out-file temp.json --flatten --id-interpolation-pattern '[sha512:contenthash:base64:6]'",
+    "compile": "formatjs compile 'temp.json' --out-file src/i18n/locales/en-US.json",
+    "manage-translations": "npm run extract && npm run compile && rimraf temp.json",
     "prebuild": "preval-build-info-cli && gulp build",
     "build": "electron-builder",
     "commit": "git-cz",
@@ -114,7 +116,7 @@
     "react-dom": "16.14.0",
     "react-dropzone": "11.3.4",
     "react-electron-web-view": "2.0.1",
-    "react-intl": "2.7.2",
+    "react-intl": "5.20.10",
     "react-jss": "8.6.1",
     "react-loader": "2.4.7",
     "react-modal": "3.14.3",
@@ -146,6 +148,7 @@
     "@babel/register": "7.15.3",
     "@commitlint/cli": "13.1.0",
     "@commitlint/config-conventional": "13.1.0",
+    "@formatjs/cli": "4.2.33",
     "@tsconfig/node14": "1.0.1",
     "@types/color": "3.0.2",
     "@types/du": "1.0.1",
@@ -163,7 +166,7 @@
     "@typescript-eslint/eslint-plugin": "4.30.0",
     "@typescript-eslint/parser": "4.29.1",
     "all-contributors-cli": "6.20.0",
-    "babel-plugin-react-intl": "3.5.1",
+    "babel-plugin-formatjs": "10.3.8",
     "commitizen": "4.2.4",
     "concurrently": "6.2.1",
     "conventional-changelog-cli": "2.1.1",
@@ -205,7 +208,7 @@
     "node-abi": "2.30.0",
     "prettier": "2.3.2",
     "preval-build-info": "1.0.3",
-    "react-intl-translations-manager": "5.0.3",
+    "rimraf": "3.0.2",
     "sass": "1.37.5",
     "simple-git": "2.45.0",
     "terser": "4.8.0",
diff --git a/src/I18n.js b/src/I18n.js
index 13513fe73..6fb4cdc61 100644
--- a/src/I18n.js
+++ b/src/I18n.js
@@ -8,7 +8,9 @@ import translations from './i18n/translations';
 import UserStore from './stores/UserStore';
 import AppStore from './stores/AppStore';
 
-export default @inject('stores') @observer class I18N extends Component {
+@inject('stores')
+@observer
+class I18N extends Component {
   componentDidUpdate() {
     window.ferdi.menu.rebuild();
   }
@@ -19,7 +21,9 @@ export default @inject('stores') @observer class I18N extends Component {
     return (
       <IntlProvider
         {...{ locale, key: locale, messages: translations[locale] }}
-        ref={(intlProvider) => { window.ferdi.intl = intlProvider ? intlProvider.getChildContext().intl : null; }}
+        ref={intlProvider => {
+          window.ferdi.intl = intlProvider ? intlProvider.state.intl : null;
+        }}
       >
         {children}
       </IntlProvider>
@@ -34,3 +38,5 @@ I18N.wrappedComponent.propTypes = {
   }).isRequired,
   children: oneOrManyChildElements.isRequired,
 };
+
+export default I18N;
diff --git a/src/components/AppUpdateInfoBar.js b/src/components/AppUpdateInfoBar.js
index 30804262a..9dc86bd1d 100644
--- a/src/components/AppUpdateInfoBar.js
+++ b/src/components/AppUpdateInfoBar.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import InfoBar from './ui/InfoBar';
 import { GITHUB_FERDI_URL } from '../config';
@@ -9,15 +9,15 @@ import { openExternalUrl } from '../helpers/url-helpers';
 const messages = defineMessages({
   updateAvailable: {
     id: 'infobar.updateAvailable',
-    defaultMessage: '!!!A new update for Ferdi is available.',
+    defaultMessage: 'A new update for Ferdi is available.',
   },
   changelog: {
     id: 'infobar.buttonChangelog',
-    defaultMessage: '!!!Changelog',
+    defaultMessage: 'Changelog',
   },
   buttonInstallUpdate: {
     id: 'infobar.buttonInstallUpdate',
-    defaultMessage: '!!!Restart & install update',
+    defaultMessage: 'Restart & install update',
   },
 });
 
@@ -27,12 +27,8 @@ class AppUpdateInfoBar extends Component {
     onHide: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
-    const { intl } = this.context;
+    const { intl } = this.props;
     const { onInstallUpdate, onHide } = this.props;
 
     return (
@@ -61,4 +57,4 @@ class AppUpdateInfoBar extends Component {
   }
 }
 
-export default AppUpdateInfoBar;
+export default injectIntl(AppUpdateInfoBar);
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js
index 8235932c2..3e2b75731 100644
--- a/src/components/auth/AuthLayout.js
+++ b/src/components/auth/AuthLayout.js
@@ -1,9 +1,9 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { intlShape } from 'react-intl';
 import { TitleBar } from 'electron-react-titlebar';
 
+import { injectIntl } from 'react-intl';
 import Link from '../ui/Link';
 import InfoBar from '../ui/InfoBar';
 
@@ -17,7 +17,6 @@ import { isWindows } from '../../environment';
 import AppUpdateInfoBar from '../AppUpdateInfoBar';
 import { GITHUB_FERDI_URL } from '../../config';
 
-export default
 @observer
 class AuthLayout extends Component {
   static propTypes = {
@@ -36,10 +35,6 @@ class AuthLayout extends Component {
     shouldShowAppUpdateInfoBar: true,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       children,
@@ -52,7 +47,8 @@ class AuthLayout extends Component {
       installAppUpdate,
       appUpdateIsDownloaded,
     } = this.props;
-    const { intl } = this.context;
+
+    const { intl } = this.props;
 
     return (
       <>
@@ -108,3 +104,5 @@ class AuthLayout extends Component {
     );
   }
 }
+
+export default injectIntl(AuthLayout);
diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js
index 8e8a7af32..b98fb50f7 100644
--- a/src/components/auth/ChangeServer.js
+++ b/src/components/auth/ChangeServer.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import Form from '../../lib/Form';
 import Input from '../ui/Input';
 import Select from '../ui/Select';
@@ -14,56 +14,65 @@ import globalMessages from '../../i18n/globalMessages';
 const messages = defineMessages({
   headline: {
     id: 'changeserver.headline',
-    defaultMessage: '!!!Change server',
+    defaultMessage: 'Change server',
   },
   label: {
     id: 'changeserver.label',
-    defaultMessage: '!!!Server',
+    defaultMessage: 'Server',
   },
   warning: {
     id: 'changeserver.warning',
-    defaultMessage: '!!!Extra settings offered by Ferdi will not be saved',
+    defaultMessage: 'Extra settings offered by Ferdi will not be saved',
   },
   customServerLabel: {
     id: 'changeserver.customServerLabel',
-    defaultMessage: '!!!Custom server',
+    defaultMessage: 'Custom server',
   },
   urlError: {
     id: 'changeserver.urlError',
-    defaultMessage: '!!!Enter a valid URL',
+    defaultMessage: 'Enter a valid URL',
   },
 });
 
-export default @observer class ChangeServer extends Component {
+@observer
+class ChangeServer extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     server: PropTypes.string.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  ferdiServer=LIVE_FERDI_API;
+  ferdiServer = LIVE_FERDI_API;
 
-  franzServer=LIVE_FRANZ_API;
+  franzServer = LIVE_FRANZ_API;
 
-  defaultServers=[this.franzServer, this.ferdiServer];
+  defaultServers = [this.franzServer, this.ferdiServer];
 
-  form = new Form({
-    fields: {
-      server: {
-        label: this.context.intl.formatMessage(messages.label),
-        value: this.props.server,
-        options: [{ value: this.ferdiServer, label: 'Ferdi' }, { value: this.franzServer, label: 'Franz' }, { value: this.defaultServers.includes(this.props.server) ? '' : this.props.server, label: 'Custom' }],
-      },
-      customServer: {
-        label: this.context.intl.formatMessage(messages.customServerLabel),
-        value: '',
-        validators: [url, required],
+  form = new Form(
+    {
+      fields: {
+        server: {
+          label: this.props.intl.formatMessage(messages.label),
+          value: this.props.server,
+          options: [
+            { value: this.ferdiServer, label: 'Ferdi' },
+            { value: this.franzServer, label: 'Franz' },
+            {
+              value: this.defaultServers.includes(this.props.server)
+                ? ''
+                : this.props.server,
+              label: 'Custom',
+            },
+          ],
+        },
+        customServer: {
+          label: this.props.intl.formatMessage(messages.customServerLabel),
+          value: '',
+          validators: [url, required],
+        },
       },
     },
-  }, this.context.intl);
+    this.props.intl,
+  );
 
   componentDidMount() {
     if (this.defaultServers.includes(this.props.server)) {
@@ -77,13 +86,13 @@ export default @observer class ChangeServer extends Component {
   submit(e) {
     e.preventDefault();
     this.form.submit({
-      onSuccess: (form) => {
+      onSuccess: form => {
         if (!this.defaultServers.includes(form.values().server)) {
           form.$('server').onChange(form.values().customServer);
         }
         this.props.onSubmit(form.values());
       },
-      onError: (form) => {
+      onError: form => {
         if (this.defaultServers.includes(form.values().server)) {
           this.props.onSubmit(form.values());
         }
@@ -93,23 +102,21 @@ export default @observer class ChangeServer extends Component {
 
   render() {
     const { form } = this;
-    const { intl } = this.context;
+    const { intl } = this.props;
     return (
       <div className="auth__container">
-        <form className="franz-form auth__form" onSubmit={(e) => this.submit(e)}>
+        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
           <h1>{intl.formatMessage(messages.headline)}</h1>
-          {form.$('server').value === this.franzServer
-          && (
+          {form.$('server').value === this.franzServer && (
             <Infobox type="warning">
               {intl.formatMessage(messages.warning)}
             </Infobox>
           )}
           <Select field={form.$('server')} />
-          {!this.defaultServers.includes(form.$('server').value)
-          && (
+          {!this.defaultServers.includes(form.$('server').value) && (
             <Input
               placeholder="Custom Server"
-              onChange={(e) => this.submit(e)}
+              onChange={e => this.submit(e)}
               field={form.$('customServer')}
             />
           )}
@@ -123,3 +130,5 @@ export default @observer class ChangeServer extends Component {
     );
   }
 }
+
+export default injectIntl(ChangeServer);
diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js
index 3073cad73..44cb7e791 100644
--- a/src/components/auth/Import.js
+++ b/src/components/auth/Import.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router';
 import classnames from 'classnames';
 
@@ -12,23 +12,22 @@ import Button from '../ui/Button';
 const messages = defineMessages({
   headline: {
     id: 'import.headline',
-    defaultMessage: '!!!Import your Ferdi 4 services',
+    defaultMessage: 'Import your Ferdi 4 services',
   },
   notSupportedHeadline: {
     id: 'import.notSupportedHeadline',
-    defaultMessage: '!!!Services not yet supported in Ferdi 5',
+    defaultMessage: 'Services not yet supported in Ferdi 5',
   },
   submitButtonLabel: {
     id: 'import.submit.label',
-    defaultMessage: '!!!Import {count} services',
+    defaultMessage: 'Import {count} services',
   },
   skipButtonLabel: {
     id: 'import.skip.label',
-    defaultMessage: '!!!I want to add services manually',
+    defaultMessage: 'I want to add services manually',
   },
 });
 
-export default
 @observer
 class Import extends Component {
   static propTypes = {
@@ -38,17 +37,13 @@ class Import extends Component {
     inviteRoute: PropTypes.string.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   componentDidMount() {
     const config = {
       fields: {
         import: [
           ...this.props.services
-            .filter((s) => s.recipe)
-            .map((s) => ({
+            .filter(s => s.recipe)
+            .map(s => ({
               fields: {
                 add: {
                   default: true,
@@ -60,20 +55,20 @@ class Import extends Component {
       },
     };
 
-    this.form = new Form(config, this.context.intl);
+    this.form = new Form(config, this.props.intl);
   }
 
   submit(e) {
     const { services } = this.props;
     e.preventDefault();
     this.form.submit({
-      onSuccess: (form) => {
+      onSuccess: form => {
         const servicesImport = form
           .values()
           .import.map(
-            (value, i) => !value.add || services.filter((s) => s.recipe)[i],
+            (value, i) => !value.add || services.filter(s => s.recipe)[i],
           )
-          .filter((s) => typeof s !== 'boolean');
+          .filter(s => typeof s !== 'boolean');
 
         this.props.onSubmit({ services: servicesImport });
       },
@@ -82,18 +77,18 @@ class Import extends Component {
   }
 
   render() {
-    const { intl } = this.context;
+    const { intl } = this.props;
     const { services, isSubmitting, inviteRoute } = this.props;
 
-    const availableServices = services.filter((s) => s.recipe);
-    const unavailableServices = services.filter((s) => !s.recipe);
+    const availableServices = services.filter(s => s.recipe);
+    const unavailableServices = services.filter(s => !s.recipe);
 
     return (
       <div className="auth__scroll-container">
         <div className="auth__container auth__container--signup">
           <form
             className="franz-form auth__form"
-            onSubmit={(e) => this.submit(e)}
+            onSubmit={e => this.submit(e)}
           >
             <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
             <h1>{intl.formatMessage(messages.headline)}</h1>
@@ -107,8 +102,8 @@ class Import extends Component {
                     <td className="service-table__column-icon">
                       <img
                         src={
-                          availableServices[i].custom_icon
-                          || availableServices[i].recipe.icons.svg
+                          availableServices[i].custom_icon ||
+                          availableServices[i].recipe.icons.svg
                         }
                         className={classnames({
                           'service-table__icon': true,
@@ -133,7 +128,7 @@ class Import extends Component {
                 </strong>
                 <p>
                   {services
-                    .filter((s) => !s.recipe)
+                    .filter(s => !s.recipe)
                     .map((service, i) => (
                       <span key={service.id}>
                         {service.name !== '' ? service.name : service.service}
@@ -170,3 +165,5 @@ class Import extends Component {
     );
   }
 }
+
+export default injectIntl(Import);
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index 4b4d63a6b..519691ede 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -1,7 +1,7 @@
 import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router';
 import classnames from 'classnames';
 
@@ -15,35 +15,34 @@ import Button from '../ui/Button';
 const messages = defineMessages({
   settingsHeadline: {
     id: 'settings.invite.headline',
-    defaultMessage: '!!!Invite Friends',
+    defaultMessage: 'Invite Friends',
   },
   headline: {
     id: 'invite.headline.friends',
-    defaultMessage: '!!!Invite 3 of your friends or colleagues',
+    defaultMessage: 'Invite 3 of your friends or colleagues',
   },
   nameLabel: {
     id: 'invite.name.label',
-    defaultMessage: '!!!Name',
+    defaultMessage: 'Name',
   },
   emailLabel: {
     id: 'invite.email.label',
-    defaultMessage: '!!!Email address',
+    defaultMessage: 'Email address',
   },
   submitButtonLabel: {
     id: 'invite.submit.label',
-    defaultMessage: '!!!Send invites',
+    defaultMessage: 'Send invites',
   },
   skipButtonLabel: {
     id: 'invite.skip.label',
-    defaultMessage: '!!!I want to do this later',
+    defaultMessage: 'I want to do this later',
   },
   inviteSuccessInfo: {
     id: 'invite.successInfo',
-    defaultMessage: '!!!Invitations sent successfully',
+    defaultMessage: 'Invitations sent successfully',
   },
 });
 
-export default
 @observer
 class Invite extends Component {
   static propTypes = {
@@ -59,10 +58,6 @@ class Invite extends Component {
     isLoadingInvite: false,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = { showSuccessInfo: false };
 
   componentDidMount() {
@@ -73,8 +68,8 @@ class Invite extends Component {
             ...Array(3).fill({
               fields: {
                 name: {
-                  label: this.context.intl.formatMessage(messages.nameLabel),
-                  placeholder: this.context.intl.formatMessage(
+                  label: this.props.intl.formatMessage(messages.nameLabel),
+                  placeholder: this.props.intl.formatMessage(
                     messages.nameLabel,
                   ),
                   onChange: () => {
@@ -83,8 +78,8 @@ class Invite extends Component {
                   // related: ['invite.0.email'], // path accepted but does not work
                 },
                 email: {
-                  label: this.context.intl.formatMessage(messages.emailLabel),
-                  placeholder: this.context.intl.formatMessage(
+                  label: this.props.intl.formatMessage(messages.emailLabel),
+                  placeholder: this.props.intl.formatMessage(
                     messages.emailLabel,
                   ),
                   onChange: () => {
@@ -97,7 +92,7 @@ class Invite extends Component {
           ],
         },
       },
-      this.context.intl,
+      this.props.intl,
     );
 
     document.querySelector('input:first-child').focus();
@@ -107,7 +102,7 @@ class Invite extends Component {
     e.preventDefault();
 
     this.form.submit({
-      onSuccess: (form) => {
+      onSuccess: form => {
         this.props.onSubmit({ invites: form.values().invite });
 
         this.form.clear();
@@ -121,13 +116,13 @@ class Invite extends Component {
 
   render() {
     const { form } = this;
-    const { intl } = this.context;
+    const { intl } = this.props;
     const { embed, isInviteSuccessful, isLoadingInvite } = this.props;
 
     const atLeastOneEmailAddress = form
       .$('invite')
-      .map((invite) => invite.$('email').value)
-      .some((emailValue) => emailValue.trim() !== '');
+      .map(invite => invite.$('email').value)
+      .some(emailValue => emailValue.trim() !== '');
 
     const sendButtonClassName = classnames({
       auth__button: true,
@@ -148,17 +143,14 @@ class Invite extends Component {
           </Appear>
         )}
 
-        <form
-          className="franz-form auth__form"
-          onSubmit={(e) => this.submit(e)}
-        >
+        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
           {!embed && (
             <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
           )}
           <h1 className={embed && 'invite__embed'}>
             {intl.formatMessage(messages.headline)}
           </h1>
-          {form.$('invite').map((invite) => (
+          {form.$('invite').map(invite => (
             <div className="grid" key={invite.key}>
               <div className="grid__row">
                 <Input field={invite.$('name')} showLabel={false} />
@@ -193,9 +185,7 @@ class Invite extends Component {
       >
         {embed && (
           <div className="settings__header">
-            <h1>
-              {this.context.intl.formatMessage(messages.settingsHeadline)}
-            </h1>
+            <h1>{this.props.intl.formatMessage(messages.settingsHeadline)}</h1>
           </div>
         )}
         {!embed ? (
@@ -207,3 +197,5 @@ class Invite extends Component {
     );
   }
 }
+
+export default injectIntl(Invite);
diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js
index 2ad8a2409..a507ba140 100644
--- a/src/components/auth/Locked.js
+++ b/src/components/auth/Locked.js
@@ -2,7 +2,7 @@ import { systemPreferences } from '@electron/remote';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import Form from '../../lib/Form';
 import Input from '../ui/Input';
@@ -15,39 +15,41 @@ import { globalError as globalErrorPropType } from '../../prop-types';
 const messages = defineMessages({
   headline: {
     id: 'locked.headline',
-    defaultMessage: '!!!Locked',
+    defaultMessage: 'Locked',
   },
   info: {
     id: 'locked.info',
-    defaultMessage: '!!!Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.',
+    defaultMessage:
+      'Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.',
   },
   touchId: {
     id: 'locked.touchId',
-    defaultMessage: '!!!Unlock with Touch ID',
+    defaultMessage: 'Unlock with Touch ID',
   },
   touchIdPrompt: {
     id: 'locked.touchIdPrompt',
-    defaultMessage: '!!!unlock via Touch ID',
+    defaultMessage: 'unlock via Touch ID',
   },
   passwordLabel: {
     id: 'locked.password.label',
-    defaultMessage: '!!!Password',
+    defaultMessage: 'Password',
   },
   submitButtonLabel: {
     id: 'locked.submit.label',
-    defaultMessage: '!!!Unlock',
+    defaultMessage: 'Unlock',
   },
   unlockWithPassword: {
     id: 'locked.unlockWithPassword',
-    defaultMessage: '!!!Unlock with Password',
+    defaultMessage: 'Unlock with Password',
   },
   invalidCredentials: {
     id: 'locked.invalidCredentials',
-    defaultMessage: '!!!Password invalid',
+    defaultMessage: 'Password invalid',
   },
 });
 
-export default @observer class Locked extends Component {
+@observer
+class Locked extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     unlock: PropTypes.func.isRequired,
@@ -56,62 +58,57 @@ export default @observer class Locked extends Component {
     error: globalErrorPropType.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  form = new Form({
-    fields: {
-      password: {
-        label: this.context.intl.formatMessage(messages.passwordLabel),
-        value: '',
-        type: 'password',
+  form = new Form(
+    {
+      fields: {
+        password: {
+          label: this.props.intl.formatMessage(messages.passwordLabel),
+          value: '',
+          type: 'password',
+        },
       },
     },
-  }, this.context.intl);
+    this.props.intl,
+  );
 
   submit(e) {
     e.preventDefault();
     this.form.submit({
-      onSuccess: (form) => {
+      onSuccess: form => {
         this.props.onSubmit(form.values());
       },
-      onError: () => { },
+      onError: () => {},
     });
   }
 
   touchIdUnlock() {
-    const { intl } = this.context;
+    const { intl } = this.props;
 
-    systemPreferences.promptTouchID(intl.formatMessage(messages.touchIdPrompt)).then(() => {
-      this.props.unlock();
-    });
+    systemPreferences
+      .promptTouchID(intl.formatMessage(messages.touchIdPrompt))
+      .then(() => {
+        this.props.unlock();
+      });
   }
 
   render() {
     const { form } = this;
-    const { intl } = this.context;
-    const {
-      isSubmitting,
-      error,
-      useTouchIdToUnlock,
-    } = this.props;
+    const { intl } = this.props;
+    const { isSubmitting, error, useTouchIdToUnlock } = this.props;
 
-    const touchIdEnabled = isMac ? (useTouchIdToUnlock && systemPreferences.canPromptTouchID()) : false;
-    const submitButtonLabel = touchIdEnabled ? intl.formatMessage(messages.unlockWithPassword) : intl.formatMessage(messages.submitButtonLabel);
+    const touchIdEnabled = isMac
+      ? useTouchIdToUnlock && systemPreferences.canPromptTouchID()
+      : false;
+    const submitButtonLabel = touchIdEnabled
+      ? intl.formatMessage(messages.unlockWithPassword)
+      : intl.formatMessage(messages.submitButtonLabel);
 
     return (
       <div className="auth__container">
-        <form className="franz-form auth__form" onSubmit={(e) => this.submit(e)}>
-          <img
-            src="./assets/images/logo.svg"
-            className="auth__logo"
-            alt=""
-          />
+        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
+          <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
           <h1>{intl.formatMessage(messages.headline)}</h1>
-          <Infobox type="warning">
-            {intl.formatMessage(messages.info)}
-          </Infobox>
+          <Infobox type="warning">{intl.formatMessage(messages.info)}</Infobox>
 
           {touchIdEnabled && (
             <>
@@ -125,13 +122,11 @@ export default @observer class Locked extends Component {
             </>
           )}
 
-          <Input
-            field={form.$('password')}
-            showPasswordToggle
-            focus
-          />
+          <Input field={form.$('password')} showPasswordToggle focus />
           {error.code === 'invalid-credentials' && (
-            <p className="error-message center">{intl.formatMessage(messages.invalidCredentials)}</p>
+            <p className="error-message center">
+              {intl.formatMessage(messages.invalidCredentials)}
+            </p>
           )}
           {isSubmitting ? (
             <Button
@@ -153,3 +148,5 @@ export default @observer class Locked extends Component {
     );
   }
 }
+
+export default injectIntl(Locked);
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index 9e6a8d046..a47834e19 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -2,7 +2,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import { LIVE_FRANZ_API } from '../../config';
 import { API_VERSION, isDevMode, useLiveAPI } from '../../environment';
@@ -19,59 +19,61 @@ import { globalError as globalErrorPropType } from '../../prop-types';
 const messages = defineMessages({
   headline: {
     id: 'login.headline',
-    defaultMessage: '!!!Sign in',
+    defaultMessage: 'Sign in',
   },
   emailLabel: {
     id: 'login.email.label',
-    defaultMessage: '!!!Email address',
+    defaultMessage: 'Email address',
   },
   passwordLabel: {
     id: 'login.password.label',
-    defaultMessage: '!!!Password',
+    defaultMessage: 'Password',
   },
   submitButtonLabel: {
     id: 'login.submit.label',
-    defaultMessage: '!!!Sign in',
+    defaultMessage: 'Sign in',
   },
   invalidCredentials: {
     id: 'login.invalidCredentials',
-    defaultMessage: '!!!Email or password not valid',
+    defaultMessage: 'Email or password not valid',
   },
   customServerQuestion: {
     id: 'login.customServerQuestion',
-    defaultMessage: '!!!Using a Franz account to log in?',
+    defaultMessage: 'Using a Franz account to log in?',
   },
   customServerSuggestion: {
     id: 'login.customServerSuggestion',
-    defaultMessage: '!!!Try importing your Franz account into Ferdi',
+    defaultMessage: 'Try importing your Franz account into Ferdi',
   },
   tokenExpired: {
     id: 'login.tokenExpired',
-    defaultMessage: '!!!Your session expired, please login again.',
+    defaultMessage: 'Your session expired, please login again.',
   },
   serverLogout: {
     id: 'login.serverLogout',
-    defaultMessage: '!!!Your session expired, please login again.',
+    defaultMessage: 'Your session expired, please login again.',
   },
   signupLink: {
     id: 'login.link.signup',
-    defaultMessage: '!!!Create a free account',
+    defaultMessage: 'Create a free account',
   },
   changeServer: {
     id: 'login.changeServer',
-    defaultMessage: '!!!Change server',
+    defaultMessage: 'Change server',
   },
   serverless: {
     id: 'services.serverless',
-    defaultMessage: '!!!Use Ferdi without an Account',
+    defaultMessage: 'Use Ferdi without an Account',
   },
   passwordLink: {
     id: 'login.link.password',
-    defaultMessage: '!!!Forgot password',
+    defaultMessage: 'Forgot password',
   },
 });
 
-export default @inject('actions') @observer class Login extends Component {
+@inject('actions')
+@observer
+class Login extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     isSubmitting: PropTypes.bool.isRequired,
@@ -84,35 +86,34 @@ export default @inject('actions') @observer class Login extends Component {
     actions: PropTypes.object.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  form = new Form({
-    fields: {
-      email: {
-        label: this.context.intl.formatMessage(messages.emailLabel),
-        value: '',
-        validators: [required, email],
-      },
-      password: {
-        label: this.context.intl.formatMessage(messages.passwordLabel),
-        value: '',
-        validators: [required],
-        type: 'password',
+  form = new Form(
+    {
+      fields: {
+        email: {
+          label: this.props.intl.formatMessage(messages.emailLabel),
+          value: '',
+          validators: [required, email],
+        },
+        password: {
+          label: this.props.intl.formatMessage(messages.passwordLabel),
+          value: '',
+          validators: [required],
+          type: 'password',
+        },
       },
     },
-  }, this.context.intl);
+    this.props.intl,
+  );
 
   emailField = null;
 
   submit(e) {
     e.preventDefault();
     this.form.submit({
-      onSuccess: (form) => {
+      onSuccess: form => {
         this.props.onSubmit(form.values());
       },
-      onError: () => { },
+      onError: () => {},
     });
   }
 
@@ -122,7 +123,7 @@ export default @inject('actions') @observer class Login extends Component {
 
   render() {
     const { form } = this;
-    const { intl } = this.context;
+    const { intl } = this.props;
     const {
       isSubmitting,
       isTokenExpired,
@@ -135,42 +136,47 @@ export default @inject('actions') @observer class Login extends Component {
 
     return (
       <div className="auth__container">
-        <form className="franz-form auth__form" onSubmit={(e) => this.submit(e)}>
-          <img
-            src="./assets/images/logo.svg"
-            className="auth__logo"
-            alt=""
-          />
+        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
+          <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
           <h1>{intl.formatMessage(messages.headline)}</h1>
           {isDevMode && !useLiveAPI && (
             <Infobox type="warning">
-              In Dev Mode your data is not persistent. Please use the live app for accessing the production API.
+              In Dev Mode your data is not persistent. Please use the live app
+              for accessing the production API.
             </Infobox>
           )}
           {isTokenExpired && (
-            <p className="error-message center">{intl.formatMessage(messages.tokenExpired)}</p>
+            <p className="error-message center">
+              {intl.formatMessage(messages.tokenExpired)}
+            </p>
           )}
           {isServerLogout && (
-            <p className="error-message center">{intl.formatMessage(messages.serverLogout)}</p>
+            <p className="error-message center">
+              {intl.formatMessage(messages.serverLogout)}
+            </p>
           )}
           <Input
             field={form.$('email')}
-            ref={(element) => { this.emailField = element; }}
+            ref={element => {
+              this.emailField = element;
+            }}
             focus
           />
-          <Input
-            field={form.$('password')}
-            showPasswordToggle
-          />
+          <Input field={form.$('password')} showPasswordToggle />
           {error.code === 'invalid-credentials' && (
             <>
-              <p className="error-message center">{intl.formatMessage(messages.invalidCredentials)}</p>
-              { window.ferdi.stores.settings.all.app.server !== LIVE_FRANZ_API && (
+              <p className="error-message center">
+                {intl.formatMessage(messages.invalidCredentials)}
+              </p>
+              {window.ferdi.stores.settings.all.app.server !==
+                LIVE_FRANZ_API && (
                 <p className="error-message center">
-                    {intl.formatMessage(messages.customServerQuestion)}
-                  {' '}
+                  {intl.formatMessage(messages.customServerQuestion)}{' '}
                   <Link
-                    to={`${window.ferdi.stores.settings.all.app.server.replace(API_VERSION, '')}/import`}
+                    to={`${window.ferdi.stores.settings.all.app.server.replace(
+                      API_VERSION,
+                      '',
+                    )}/import`}
                     target="_blank"
                     style={{ cursor: 'pointer', textDecoration: 'underline' }}
                   >
@@ -197,12 +203,22 @@ export default @inject('actions') @observer class Login extends Component {
           )}
         </form>
         <div className="auth__links">
-          <Link to={changeServerRoute}>{intl.formatMessage(messages.changeServer)}</Link>
-          <a onClick={this.useLocalServer.bind(this)}>{intl.formatMessage(messages.serverless)}</a>
-          <Link to={signupRoute}>{intl.formatMessage(messages.signupLink)}</Link>
-          <Link to={passwordRoute}>{intl.formatMessage(messages.passwordLink)}</Link>
+          <Link to={changeServerRoute}>
+            {intl.formatMessage(messages.changeServer)}
+          </Link>
+          <a onClick={this.useLocalServer.bind(this)}>
+            {intl.formatMessage(messages.serverless)}
+          </a>
+          <Link to={signupRoute}>
+            {intl.formatMessage(messages.signupLink)}
+          </Link>
+          <Link to={passwordRoute}>
+            {intl.formatMessage(messages.passwordLink)}
+          </Link>
         </div>
       </div>
     );
   }
 }
+
+export default injectIntl(Login);
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js
index 1be2097bd..74346b382 100644
--- a/src/components/auth/Password.js
+++ b/src/components/auth/Password.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import Form from '../../lib/Form';
 import { required, email } from '../../helpers/validation-helpers';
@@ -14,31 +14,32 @@ import globalMessages from '../../i18n/globalMessages';
 const messages = defineMessages({
   headline: {
     id: 'password.headline',
-    defaultMessage: '!!!Forgot password',
+    defaultMessage: 'Forgot password',
   },
   emailLabel: {
     id: 'password.email.label',
-    defaultMessage: '!!!Email address',
+    defaultMessage: 'Email address',
   },
   successInfo: {
     id: 'password.successInfo',
-    defaultMessage: '!!!Your new password was sent to your email address',
+    defaultMessage: 'Your new password was sent to your email address',
   },
   noUser: {
     id: 'password.noUser',
-    defaultMessage: '!!!No user affiliated with that email address',
+    defaultMessage: 'No user affiliated with that email address',
   },
   signupLink: {
     id: 'password.link.signup',
-    defaultMessage: '!!!Create a free account',
+    defaultMessage: 'Create a free account',
   },
   loginLink: {
     id: 'password.link.login',
-    defaultMessage: '!!!Sign in to your account',
+    defaultMessage: 'Sign in to your account',
   },
 });
 
-export default @observer class Password extends Component {
+@observer
+class Password extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     isSubmitting: PropTypes.bool.isRequired,
@@ -47,24 +48,23 @@ export default @observer class Password extends Component {
     status: MobxPropTypes.arrayOrObservableArray.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  form = new Form({
-    fields: {
-      email: {
-        label: this.context.intl.formatMessage(messages.emailLabel),
-        value: '',
-        validators: [required, email],
+  form = new Form(
+    {
+      fields: {
+        email: {
+          label: this.props.intl.formatMessage(messages.emailLabel),
+          value: '',
+          validators: [required, email],
+        },
       },
     },
-  }, this.context.intl);
+    this.props.intl,
+  );
 
   submit(e) {
     e.preventDefault();
     this.form.submit({
-      onSuccess: (form) => {
+      onSuccess: form => {
         this.props.onSubmit(form.values());
       },
       onError: () => {},
@@ -73,37 +73,24 @@ export default @observer class Password extends Component {
 
   render() {
     const { form } = this;
-    const { intl } = this.context;
-    const {
-      isSubmitting,
-      signupRoute,
-      loginRoute,
-      status,
-    } = this.props;
+    const { intl } = this.props;
+    const { isSubmitting, signupRoute, loginRoute, status } = this.props;
 
     return (
       <div className="auth__container">
-        <form className="franz-form auth__form" onSubmit={(e) => this.submit(e)}>
-          <img
-            src="./assets/images/logo.svg"
-            className="auth__logo"
-            alt=""
-          />
+        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
+          <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
           <h1>{intl.formatMessage(messages.headline)}</h1>
           {status.length > 0 && status.includes('sent') && (
-            <Infobox
-              type="success"
-              icon="checkbox-marked-circle-outline"
-            >
+            <Infobox type="success" icon="checkbox-marked-circle-outline">
               {intl.formatMessage(messages.successInfo)}
             </Infobox>
           )}
-          <Input
-            field={form.$('email')}
-            focus
-          />
+          <Input field={form.$('email')} focus />
           {status.length > 0 && status.includes('no-user') && (
-            <p className="error-message center">{intl.formatMessage(messages.noUser)}</p>
+            <p className="error-message center">
+              {intl.formatMessage(messages.noUser)}
+            </p>
           )}
           {isSubmitting ? (
             <Button
@@ -123,9 +110,13 @@ export default @observer class Password extends Component {
         </form>
         <div className="auth__links">
           <Link to={loginRoute}>{intl.formatMessage(messages.loginLink)}</Link>
-          <Link to={signupRoute}>{intl.formatMessage(messages.signupLink)}</Link>
+          <Link to={signupRoute}>
+            {intl.formatMessage(messages.signupLink)}
+          </Link>
         </div>
       </div>
     );
   }
 }
+
+export default injectIntl(Password);
diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js
index ded36bbe7..299c40c63 100644
--- a/src/components/auth/SetupAssistant.js
+++ b/src/components/auth/SetupAssistant.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import injectSheet from 'react-jss';
 import classnames from 'classnames';
 
@@ -19,20 +19,20 @@ const SLACK_ID = 'slack';
 const messages = defineMessages({
   headline: {
     id: 'setupAssistant.headline',
-    defaultMessage: "!!!Let's get started",
+    defaultMessage: "Let's get started",
   },
   subHeadline: {
     id: 'setupAssistant.subheadline',
     defaultMessage:
-      '!!!Choose from our most used services and get back on top of your messaging now.',
+      'Choose from our most used services and get back on top of your messaging now.',
   },
   submitButtonLabel: {
     id: 'setupAssistant.submit.label',
-    defaultMessage: "!!!Let's go",
+    defaultMessage: "Let's go",
   },
   inviteSuccessInfo: {
     id: 'invite.successInfo',
-    defaultMessage: '!!!Invitations sent successfully',
+    defaultMessage: 'Invitations sent successfully',
   },
 });
 
@@ -145,10 +145,6 @@ class SetupAssistant extends Component {
     isInviteSuccessful: false,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     services: [
       {
@@ -189,7 +185,7 @@ class SetupAssistant extends Component {
   }
 
   render() {
-    const { intl } = this.context;
+    const { intl } = this.props;
     const {
       classes,
       isInviteSuccessful,
@@ -330,4 +326,4 @@ class SetupAssistant extends Component {
   }
 }
 
-export default SetupAssistant;
+export default injectIntl(SetupAssistant);
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 6fb41a164..4d39835a2 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -2,7 +2,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import { isDevMode, useLiveAPI } from '../../environment';
 import Form from '../../lib/Form';
@@ -19,63 +19,65 @@ import { termsBase } from '../../api/apiBase';
 const messages = defineMessages({
   headline: {
     id: 'signup.headline',
-    defaultMessage: '!!!Sign up',
+    defaultMessage: 'Sign up',
   },
   firstnameLabel: {
     id: 'signup.firstname.label',
-    defaultMessage: '!!!Firstname',
+    defaultMessage: 'Firstname',
   },
   lastnameLabel: {
     id: 'signup.lastname.label',
-    defaultMessage: '!!!Lastname',
+    defaultMessage: 'Lastname',
   },
   emailLabel: {
     id: 'signup.email.label',
-    defaultMessage: '!!!Email address',
+    defaultMessage: 'Email address',
   },
   // companyLabel: {
   //   id: 'signup.company.label',
-  //   defaultMessage: '!!!Company',
+  //   defaultMessage: 'Company',
   // },
   passwordLabel: {
     id: 'signup.password.label',
-    defaultMessage: '!!!Password',
+    defaultMessage: 'Password',
   },
   legalInfo: {
     id: 'signup.legal.info',
-    defaultMessage: '!!!By creating a Ferdi account you accept the',
+    defaultMessage: 'By creating a Ferdi account you accept the',
   },
   terms: {
     id: 'signup.legal.terms',
-    defaultMessage: '!!!Terms of service',
+    defaultMessage: 'Terms of service',
   },
   privacy: {
     id: 'signup.legal.privacy',
-    defaultMessage: '!!!Privacy Statement',
+    defaultMessage: 'Privacy Statement',
   },
   submitButtonLabel: {
     id: 'signup.submit.label',
-    defaultMessage: '!!!Create account',
+    defaultMessage: 'Create account',
   },
   loginLink: {
     id: 'signup.link.login',
-    defaultMessage: '!!!Already have an account, sign in?',
+    defaultMessage: 'Already have an account, sign in?',
   },
   changeServer: {
     id: 'login.changeServer',
-    defaultMessage: '!!!Change server',
+    defaultMessage: 'Change server',
   },
   serverless: {
     id: 'services.serverless',
-    defaultMessage: '!!!Use Ferdi without an Account',
+    defaultMessage: 'Use Ferdi without an Account',
   },
   emailDuplicate: {
     id: 'signup.emailDuplicate',
-    defaultMessage: '!!!A user with that email address already exists',
+    defaultMessage: 'A user with that email address already exists',
   },
 });
 
-export default @inject('actions') @observer class Signup extends Component {
+@inject('actions')
+@observer
+class Signup extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     isSubmitting: PropTypes.bool.isRequired,
@@ -85,40 +87,39 @@ export default @inject('actions') @observer class Signup extends Component {
     actions: PropTypes.object.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  form = new Form({
-    fields: {
-      firstname: {
-        label: this.context.intl.formatMessage(messages.firstnameLabel),
-        value: '',
-        validators: [required],
-      },
-      lastname: {
-        label: this.context.intl.formatMessage(messages.lastnameLabel),
-        value: '',
-        validators: [required],
-      },
-      email: {
-        label: this.context.intl.formatMessage(messages.emailLabel),
-        value: '',
-        validators: [required, email],
-      },
-      password: {
-        label: this.context.intl.formatMessage(messages.passwordLabel),
-        value: '',
-        validators: [required, minLength(6)],
-        type: 'password',
+  form = new Form(
+    {
+      fields: {
+        firstname: {
+          label: this.props.intl.formatMessage(messages.firstnameLabel),
+          value: '',
+          validators: [required],
+        },
+        lastname: {
+          label: this.props.intl.formatMessage(messages.lastnameLabel),
+          value: '',
+          validators: [required],
+        },
+        email: {
+          label: this.props.intl.formatMessage(messages.emailLabel),
+          value: '',
+          validators: [required, email],
+        },
+        password: {
+          label: this.props.intl.formatMessage(messages.passwordLabel),
+          value: '',
+          validators: [required, minLength(6)],
+          type: 'password',
+        },
       },
     },
-  }, this.context.intl);
+    this.props.intl,
+  );
 
   submit(e) {
     e.preventDefault();
     this.form.submit({
-      onSuccess: (form) => {
+      onSuccess: form => {
         this.props.onSubmit(form.values());
       },
       onError: () => {},
@@ -131,24 +132,22 @@ export default @inject('actions') @observer class Signup extends Component {
 
   render() {
     const { form } = this;
-    const { intl } = this.context;
-    const {
-      isSubmitting, loginRoute, error, changeServerRoute,
-    } = this.props;
+    const { intl } = this.props;
+    const { isSubmitting, loginRoute, error, changeServerRoute } = this.props;
 
     return (
       <div className="auth__scroll-container">
         <div className="auth__container auth__container--signup">
-          <form className="franz-form auth__form" onSubmit={(e) => this.submit(e)}>
-            <img
-              src="./assets/images/logo.svg"
-              className="auth__logo"
-              alt=""
-            />
+          <form
+            className="franz-form auth__form"
+            onSubmit={e => this.submit(e)}
+          >
+            <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
             <h1>{intl.formatMessage(messages.headline)}</h1>
             {isDevMode && !useLiveAPI && (
               <Infobox type="warning">
-                In Dev Mode your data is not persistent. Please use the live app for accesing the production API.
+                In Dev Mode your data is not persistent. Please use the live app
+                for accesing the production API.
               </Infobox>
             )}
             <div className="grid__row">
@@ -162,7 +161,9 @@ export default @inject('actions') @observer class Signup extends Component {
               scorePassword
             />
             {error.code === 'email-duplicate' && (
-              <p className="error-message center">{intl.formatMessage(messages.emailDuplicate)}</p>
+              <p className="error-message center">
+                {intl.formatMessage(messages.emailDuplicate)}
+              </p>
             )}
             {isSubmitting ? (
               <Button
@@ -200,12 +201,20 @@ export default @inject('actions') @observer class Signup extends Component {
             </p>
           </form>
           <div className="auth__links">
-            <Link to={changeServerRoute}>{intl.formatMessage(messages.changeServer)}</Link>
-            <a onClick={this.useLocalServer.bind(this)}>{intl.formatMessage(messages.serverless)}</a>
-            <Link to={loginRoute}>{intl.formatMessage(messages.loginLink)}</Link>
+            <Link to={changeServerRoute}>
+              {intl.formatMessage(messages.changeServer)}
+            </Link>
+            <a onClick={this.useLocalServer.bind(this)}>
+              {intl.formatMessage(messages.serverless)}
+            </a>
+            <Link to={loginRoute}>
+              {intl.formatMessage(messages.loginLink)}
+            </Link>
           </div>
         </div>
       </div>
     );
   }
 }
+
+export default injectIntl(Signup);
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js
index cb522e26e..2d2e2ab28 100644
--- a/src/components/auth/Welcome.js
+++ b/src/components/auth/Welcome.js
@@ -2,7 +2,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import serverlessLogin from '../../helpers/serverless-helpers';
 
 import Link from '../ui/Link';
@@ -10,19 +10,21 @@ import Link from '../ui/Link';
 const messages = defineMessages({
   signupButton: {
     id: 'welcome.signupButton',
-    defaultMessage: '!!!Create a free account',
+    defaultMessage: 'Create a free account',
   },
   loginButton: {
     id: 'welcome.loginButton',
-    defaultMessage: '!!!Login to your account',
+    defaultMessage: 'Login to your account',
   },
   serverless: {
     id: 'services.serverless',
-    defaultMessage: '!!!Use Ferdi without an Account',
+    defaultMessage: 'Use Ferdi without an Account',
   },
 });
 
-export default @inject('actions') @observer class Login extends Component {
+@inject('actions')
+@observer
+class Login extends Component {
   static propTypes = {
     loginRoute: PropTypes.string.isRequired,
     signupRoute: PropTypes.string.isRequired,
@@ -31,27 +33,22 @@ export default @inject('actions') @observer class Login extends Component {
     actions: PropTypes.object.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   useLocalServer() {
     serverlessLogin(this.props.actions);
   }
 
   render() {
-    const { intl } = this.context;
-    const {
-      loginRoute,
-      signupRoute,
-      changeServerRoute,
-      recipes,
-    } = this.props;
+    const { intl } = this.props;
+    const { loginRoute, signupRoute, changeServerRoute, recipes } = this.props;
 
     return (
       <div className="welcome">
         <div className="welcome__content">
-          <img src="./assets/images/logo.svg" className="welcome__logo" alt="" />
+          <img
+            src="./assets/images/logo.svg"
+            className="welcome__logo"
+            alt=""
+          />
           {/* <img src="./assets/images/welcome.png" className="welcome__services" alt="" /> */}
           <div className="welcome__text">
             <h1>Ferdi</h1>
@@ -73,27 +70,21 @@ export default @inject('actions') @observer class Login extends Component {
           <br />
 
           <Link to={changeServerRoute}>
-            <span style={{
-              textAlign: 'center',
-              width: '100%',
-              cursor: 'pointer',
-            }}
+            <span
+              style={{
+                textAlign: 'center',
+                width: '100%',
+                cursor: 'pointer',
+              }}
             >
               Change server
             </span>
           </Link>
         </div>
         <div className="welcome__featured-services">
-          {recipes.map((recipe) => (
-            <div
-              key={recipe.id}
-              className="welcome__featured-service"
-            >
-              <img
-                key={recipe.id}
-                src={recipe.icons.svg}
-                alt=""
-              />
+          {recipes.map(recipe => (
+            <div key={recipe.id} className="welcome__featured-service">
+              <img key={recipe.id} src={recipe.icons.svg} alt="" />
             </div>
           ))}
         </div>
@@ -101,3 +92,5 @@ export default @inject('actions') @observer class Login extends Component {
     );
   }
 }
+
+export default injectIntl(Login);
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index e6e5d40fe..83e037083 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { TitleBar } from 'electron-react-titlebar';
 import injectSheet from 'react-jss';
 
@@ -27,20 +27,20 @@ function createMarkup(HTMLString) {
 const messages = defineMessages({
   servicesUpdated: {
     id: 'infobar.servicesUpdated',
-    defaultMessage: '!!!Your services have been updated.',
+    defaultMessage: 'Your services have been updated.',
   },
   buttonReloadServices: {
     id: 'infobar.buttonReloadServices',
-    defaultMessage: '!!!Reload services',
+    defaultMessage: 'Reload services',
   },
   requiredRequestsFailed: {
     id: 'infobar.requiredRequestsFailed',
-    defaultMessage: '!!!Could not load services and user information',
+    defaultMessage: 'Could not load services and user information',
   },
   authRequestFailed: {
     id: 'infobar.authRequestFailed',
     defaultMessage:
-      '!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.',
+      'There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.',
   },
 });
 
@@ -94,10 +94,6 @@ class AppLayout extends Component {
     children: [],
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       classes,
@@ -119,7 +115,7 @@ class AppLayout extends Component {
       areRequiredRequestsLoading,
     } = this.props;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <ErrorBoundary>
@@ -213,4 +209,4 @@ class AppLayout extends Component {
   }
 }
 
-export default AppLayout;
+export default injectIntl(AppLayout);
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 1ee7733b9..87233f7ca 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -1,12 +1,19 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ReactTooltip from 'react-tooltip';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { inject, observer } from 'mobx-react';
 import { Link } from 'react-router';
 
 import Tabbar from '../services/tabs/Tabbar';
-import { settingsShortcutKey, lockFerdiShortcutKey, todosToggleShortcutKey, workspaceToggleShortcutKey, addNewServiceShortcutKey, muteFerdiShortcutKey } from '../../environment';
+import {
+  settingsShortcutKey,
+  lockFerdiShortcutKey,
+  todosToggleShortcutKey,
+  workspaceToggleShortcutKey,
+  addNewServiceShortcutKey,
+  muteFerdiShortcutKey,
+} from '../../environment';
 import { workspaceStore } from '../../features/workspaces';
 import { todosStore } from '../../features/todos';
 import { todoActions } from '../../features/todos/actions';
@@ -17,39 +24,41 @@ import globalMessages from '../../i18n/globalMessages';
 const messages = defineMessages({
   addNewService: {
     id: 'sidebar.addNewService',
-    defaultMessage: '!!!Add new service',
+    defaultMessage: 'Add new service',
   },
   mute: {
     id: 'sidebar.muteApp',
-    defaultMessage: '!!!Disable notifications & audio',
+    defaultMessage: 'Disable notifications & audio',
   },
   unmute: {
     id: 'sidebar.unmuteApp',
-    defaultMessage: '!!!Enable notifications & audio',
+    defaultMessage: 'Enable notifications & audio',
   },
   openWorkspaceDrawer: {
     id: 'sidebar.openWorkspaceDrawer',
-    defaultMessage: '!!!Open workspace drawer',
+    defaultMessage: 'Open workspace drawer',
   },
   closeWorkspaceDrawer: {
     id: 'sidebar.closeWorkspaceDrawer',
-    defaultMessage: '!!!Close workspace drawer',
+    defaultMessage: 'Close workspace drawer',
   },
   openTodosDrawer: {
     id: 'sidebar.openTodosDrawer',
-    defaultMessage: '!!!Open Ferdi Todos',
+    defaultMessage: 'Open Ferdi Todos',
   },
   closeTodosDrawer: {
     id: 'sidebar.closeTodosDrawer',
-    defaultMessage: '!!!Close Ferdi Todos',
+    defaultMessage: 'Close Ferdi Todos',
   },
   lockFerdi: {
     id: 'sidebar.lockFerdi',
-    defaultMessage: '!!!Lock Ferdi',
+    defaultMessage: 'Lock Ferdi',
   },
 });
 
-export default @inject('stores', 'actions') @observer class Sidebar extends Component {
+@inject('stores', 'actions')
+@observer
+class Sidebar extends Component {
   static propTypes = {
     openSettings: PropTypes.func.isRequired,
     closeSettings: PropTypes.func.isRequired,
@@ -79,10 +88,6 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
     }).isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     tooltipEnabled: true,
   };
@@ -115,14 +120,14 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
       actions,
       isTodosServiceActive,
     } = this.props;
-    const { intl } = this.context;
-    const todosToggleMessage = (
-      todosStore.isTodosPanelVisible ? messages.closeTodosDrawer : messages.openTodosDrawer
-    );
+    const { intl } = this.props;
+    const todosToggleMessage = todosStore.isTodosPanelVisible
+      ? messages.closeTodosDrawer
+      : messages.openTodosDrawer;
 
-    const workspaceToggleMessage = (
-      isWorkspaceDrawerOpen ? messages.closeWorkspaceDrawer : messages.openWorkspaceDrawer
-    );
+    const workspaceToggleMessage = isWorkspaceDrawerOpen
+      ? messages.closeWorkspaceDrawer
+      : messages.openWorkspaceDrawer;
     const isLoggedIn = Boolean(localStorage.getItem('authToken'));
 
     return (
@@ -133,9 +138,9 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
           disableToolTip={() => this.disableToolTip()}
           useVerticalStyle={stores.settings.all.app.useVerticalStyle}
         />
-        { isLoggedIn ? (
+        {isLoggedIn ? (
           <>
-            { stores.settings.all.app.lockingFeatureEnabled ? (
+            {stores.settings.all.app.lockingFeatureEnabled ? (
               <button
                 type="button"
                 className="sidebar__button"
@@ -147,12 +152,15 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
                     },
                   });
                 }}
-                data-tip={`${intl.formatMessage(messages.lockFerdi)} (${lockFerdiShortcutKey(false)})`}
+                data-tip={`${intl.formatMessage(
+                  messages.lockFerdi,
+                )} (${lockFerdiShortcutKey(false)})`}
               >
                 <i className="mdi mdi-lock" />
               </button>
             ) : null}
-            {todosStore.isFeatureEnabled && todosStore.isFeatureEnabledByUser ? (
+            {todosStore.isFeatureEnabled &&
+            todosStore.isFeatureEnabledByUser ? (
               <button
                 type="button"
                 onClick={() => {
@@ -160,12 +168,16 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
                   this.updateToolTip();
                 }}
                 disabled={isTodosServiceActive}
-                className={`sidebar__button sidebar__button--todos ${todosStore.isTodosPanelVisible ? 'is-active' : ''}`}
-                data-tip={`${intl.formatMessage(todosToggleMessage)} (${todosToggleShortcutKey(false)})`}
+                className={`sidebar__button sidebar__button--todos ${
+                  todosStore.isTodosPanelVisible ? 'is-active' : ''
+                }`}
+                data-tip={`${intl.formatMessage(
+                  todosToggleMessage,
+                )} (${todosToggleShortcutKey(false)})`}
               >
                 <i className="mdi mdi-check-all" />
               </button>
-            ) : null}
+              ) : null}
             {workspaceStore.isFeatureEnabled ? (
               <button
                 type="button"
@@ -173,8 +185,12 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
                   toggleWorkspaceDrawer();
                   this.updateToolTip();
                 }}
-                className={`sidebar__button sidebar__button--workspaces ${isWorkspaceDrawerOpen ? 'is-active' : ''}`}
-                data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${workspaceToggleShortcutKey(false)})`}
+                className={`sidebar__button sidebar__button--workspaces ${
+                  isWorkspaceDrawerOpen ? 'is-active' : ''
+                }`}
+                data-tip={`${intl.formatMessage(
+                  workspaceToggleMessage,
+                )} (${workspaceToggleShortcutKey(false)})`}
               >
                 <i className="mdi mdi-view-grid" />
               </button>
@@ -185,8 +201,12 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
                 toggleMuteApp();
                 this.updateToolTip();
               }}
-              className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
-              data-tip={`${intl.formatMessage(isAppMuted ? messages.unmute : messages.mute)} (${muteFerdiShortcutKey(false)})`}
+              className={`sidebar__button sidebar__button--audio ${
+                isAppMuted ? 'is-muted' : ''
+              }`}
+              data-tip={`${intl.formatMessage(
+                isAppMuted ? messages.unmute : messages.mute,
+              )} (${muteFerdiShortcutKey(false)})`}
             >
               <i className={`mdi mdi-bell${isAppMuted ? '-off' : ''}`} />
             </button>
@@ -194,7 +214,9 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
               type="button"
               onClick={() => openSettings({ path: 'recipes' })}
               className="sidebar__button sidebar__button--new-service"
-              data-tip={`${intl.formatMessage(messages.addNewService)} (${addNewServiceShortcutKey(false)})`}
+              data-tip={`${intl.formatMessage(
+                messages.addNewService,
+              )} (${addNewServiceShortcutKey(false)})`}
             >
               <i className="mdi mdi-plus-box" />
             </button>
@@ -212,15 +234,17 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
           type="button"
           onClick={() => openSettings({ path: 'app' })}
           className="sidebar__button sidebar__button--settings"
-          data-tip={`${intl.formatMessage(globalMessages.settings)} (${settingsShortcutKey(false)})`}
+          data-tip={`${intl.formatMessage(
+            globalMessages.settings,
+          )} (${settingsShortcutKey(false)})`}
         >
           <i className="mdi mdi-cog" />
-          { (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE
-            || this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.DOWNLOADED) && (
-            <span className="update-available">
-              •
-            </span>
-          ) }
+          {(this.props.stores.app.updateStatus ===
+            this.props.stores.app.updateStatusTypes.AVAILABLE ||
+            this.props.stores.app.updateStatus ===
+              this.props.stores.app.updateStatusTypes.DOWNLOADED) && (
+              <span className="update-available">•</span>
+          )}
         </button>
         {this.state.tooltipEnabled && (
           <ReactTooltip place="right" type="dark" effect="solid" />
@@ -229,3 +253,5 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
     );
   }
 }
+
+export default injectIntl(Sidebar);
diff --git a/src/components/services/content/ConnectionLostBanner.js b/src/components/services/content/ConnectionLostBanner.js
index ebe863333..423edb3c7 100644
--- a/src/components/services/content/ConnectionLostBanner.js
+++ b/src/components/services/content/ConnectionLostBanner.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
 import { Icon } from '@meetfranz/ui';
-import { intlShape, defineMessages } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import { mdiAlert } from '@mdi/js';
 import { LIVE_API_FERDI_WEBSITE } from '../../../config';
@@ -12,15 +12,15 @@ import { LIVE_API_FERDI_WEBSITE } from '../../../config';
 const messages = defineMessages({
   text: {
     id: 'connectionLostBanner.message',
-    defaultMessage: '!!!Oh no! Ferdi lost the connection to {name}.',
+    defaultMessage: 'Oh no! Ferdi lost the connection to {name}.',
   },
   moreInformation: {
     id: 'connectionLostBanner.informationLink',
-    defaultMessage: '!!!What happened?',
+    defaultMessage: 'What happened?',
   },
   cta: {
     id: 'connectionLostBanner.cta',
-    defaultMessage: '!!!Reload Service',
+    defaultMessage: 'Reload Service',
   },
 });
 
@@ -78,16 +78,12 @@ class ConnectionLostBanner extends Component {
     reload: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   inputRef = React.createRef();
 
   render() {
     const { classes, name, reload } = this.props;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <div className={classes.root}>
@@ -110,4 +106,4 @@ class ConnectionLostBanner extends Component {
   }
 }
 
-export default ConnectionLostBanner;
+export default injectIntl(ConnectionLostBanner);
diff --git a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
index 36e0ac418..41d84c0b0 100644
--- a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
+++ b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import injectSheet from 'react-jss';
 
 import Button from '../../../ui/Button';
@@ -11,27 +11,29 @@ import styles from './styles';
 const messages = defineMessages({
   headline: {
     id: 'service.errorHandler.headline',
-    defaultMessage: '!!!Oh no!',
+    defaultMessage: 'Oh no!',
   },
   text: {
     id: 'service.errorHandler.text',
-    defaultMessage: '!!!{name} has failed to load.',
+    defaultMessage: '{name} has failed to load.',
   },
   action: {
     id: 'service.errorHandler.action',
-    defaultMessage: '!!!Reload {name}',
+    defaultMessage: 'Reload {name}',
   },
   editAction: {
     id: 'service.errorHandler.editAction',
-    defaultMessage: '!!!Edit {name}',
+    defaultMessage: 'Edit {name}',
   },
   errorMessage: {
     id: 'service.errorHandler.message',
-    defaultMessage: '!!!Error:',
+    defaultMessage: 'Error:',
   },
 });
 
-export default @injectSheet(styles) @observer class WebviewErrorHandler extends Component {
+@injectSheet(styles)
+@observer
+class WebviewErrorHandler extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
     reload: PropTypes.func.isRequired,
@@ -40,30 +42,16 @@ export default @injectSheet(styles) @observer class WebviewErrorHandler extends
     classes: PropTypes.object.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
-    const {
-      name,
-      reload,
-      edit,
-      errorMessage,
-      classes,
-    } = this.props;
-    const { intl } = this.context;
+    const { name, reload, edit, errorMessage, classes } = this.props;
+    const { intl } = this.props;
 
     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>
-          {' '}
+          <strong>{intl.formatMessage(messages.errorMessage)}:</strong>{' '}
           {errorMessage}
         </p>
         <div className={classes.buttonContainer}>
@@ -82,3 +70,5 @@ export default @injectSheet(styles) @observer class WebviewErrorHandler extends
     );
   }
 }
+
+export default injectIntl(WebviewErrorHandler);
diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js
index d0f12256e..e59ed58bd 100644
--- a/src/components/services/content/ServiceDisabled.js
+++ b/src/components/services/content/ServiceDisabled.js
@@ -1,38 +1,35 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import Button from '../../ui/Button';
 
 const messages = defineMessages({
   headline: {
     id: 'service.disabledHandler.headline',
-    defaultMessage: '!!!{name} is disabled',
+    defaultMessage: '{name} is disabled',
   },
   action: {
     id: 'service.disabledHandler.action',
-    defaultMessage: '!!!Enable {name}',
+    defaultMessage: 'Enable {name}',
   },
 });
 
-export default @observer class ServiceDisabled extends Component {
+@observer
+class ServiceDisabled extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
     enable: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   countdownInterval = null;
 
   countdownIntervalTimeout = 1000;
 
   render() {
     const { name, enable } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <div className="services__info-layer">
@@ -46,3 +43,5 @@ export default @observer class ServiceDisabled extends Component {
     );
   }
 }
+
+export default injectIntl(ServiceDisabled);
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index 3fc084ff0..fa866e153 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -15,7 +15,9 @@ import SettingsStore from '../../../stores/SettingsStore';
 import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen';
 import { CUSTOM_WEBSITE_RECIPE_ID } from '../../../config';
 
-export default @inject('stores', 'actions') @observer class ServiceView extends Component {
+@inject('stores', 'actions')
+@observer
+class ServiceView extends Component {
   static propTypes = {
     service: PropTypes.instanceOf(ServiceModel).isRequired,
     setWebviewReference: PropTypes.func.isRequired,
@@ -63,7 +65,7 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
     clearTimeout(this.hibernationTimer);
   }
 
-  updateTargetUrl = (event) => {
+  updateTargetUrl = event => {
     let visible = true;
     if (event.url === '' || event.url === '#') {
       visible = false;
@@ -86,11 +88,12 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
       isSpellcheckerEnabled,
     } = this.props;
 
-    const {
-      navigationBarBehaviour,
-    } = stores.settings.app;
+    const { navigationBarBehaviour } = stores.settings.app;
 
-    const showNavBar = navigationBarBehaviour === 'always' || (navigationBarBehaviour === 'custom' && service.recipe.id === CUSTOM_WEBSITE_RECIPE_ID);
+    const showNavBar =
+      navigationBarBehaviour === 'always' ||
+      (navigationBarBehaviour === 'custom' &&
+        service.recipe.id === CUSTOM_WEBSITE_RECIPE_ID);
 
     const webviewClasses = classnames({
       services__webview: true,
@@ -101,9 +104,7 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
 
     let statusBar = null;
     if (this.state.statusBarVisible) {
-      statusBar = (
-        <StatusBarTargetUrl text={this.state.targetUrl} />
-      );
+      statusBar = <StatusBarTargetUrl text={this.state.targetUrl} />;
     }
 
     return (
@@ -117,11 +118,11 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
                 reload={reload}
               />
             )}
-            {service.isEnabled && service.isLoading && service.isFirstLoad && !service.isServiceAccessRestricted && (
-              <WebviewLoader
-                loaded={false}
-                name={service.name}
-              />
+            {service.isEnabled &&
+              service.isLoading &&
+              service.isFirstLoad &&
+              !service.isServiceAccessRestricted && (
+                <WebviewLoader loaded={false} name={service.name} />
             )}
             {service.isError && (
               <WebviewErrorHandler
@@ -147,9 +148,7 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
           <>
             {!service.isHibernating ? (
               <>
-                {showNavBar && (
-                  <WebControlsScreen service={service} />
-                )}
+                {showNavBar && <WebControlsScreen service={service} />}
                 <ServiceWebview
                   service={service}
                   setWebviewReference={setWebviewReference}
@@ -159,9 +158,11 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
               </>
             ) : (
               <div>
-                <span role="img" aria-label="Sleeping Emoji">😴</span>
-                {' '}
-                This service is currently hibernating. If this page doesn&#x27;t close soon, please try reloading Ferdi.
+                <span role="img" aria-label="Sleeping Emoji">
+                  😴
+                </span>{' '}
+                This service is currently hibernating. If this page doesn&#x27;t
+                close soon, please try reloading Ferdi.
               </div>
             )}
           </>
@@ -171,3 +172,5 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
     );
   }
 }
+
+export default ServiceView;
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index bb93ff7d4..fb43fb816 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react';
 import { Link } from 'react-router';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import Confetti from 'react-confetti';
 import ms from 'ms';
 import injectSheet from 'react-jss';
@@ -14,23 +14,24 @@ import serverlessLogin from '../../../helpers/serverless-helpers';
 const messages = defineMessages({
   welcome: {
     id: 'services.welcome',
-    defaultMessage: '!!!Welcome to Ferdi',
+    defaultMessage: 'Welcome to Ferdi',
   },
   getStarted: {
     id: 'services.getStarted',
-    defaultMessage: '!!!Get started',
+    defaultMessage: 'Get started',
   },
   login: {
     id: 'services.login',
-    defaultMessage: '!!!Please login to use Ferdi.',
+    defaultMessage: 'Please login to use Ferdi.',
   },
   serverless: {
     id: 'services.serverless',
-    defaultMessage: '!!!Use Ferdi without an Account',
+    defaultMessage: 'Use Ferdi without an Account',
   },
   serverInfo: {
     id: 'services.serverInfo',
-    defaultMessage: '!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!',
+    defaultMessage:
+      'Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!',
   },
 });
 
@@ -43,7 +44,10 @@ const styles = {
   },
 };
 
-export default @injectSheet(styles) @inject('actions') @observer class Services extends Component {
+@injectSheet(styles)
+@inject('actions')
+@observer
+class Services extends Component {
   static propTypes = {
     services: MobxPropTypes.arrayOrObservableArray,
     setWebviewReference: PropTypes.func.isRequired,
@@ -63,10 +67,6 @@ export default @injectSheet(styles) @inject('actions') @observer class Services
     services: [],
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     showConfetti: true,
   };
@@ -112,11 +112,9 @@ export default @injectSheet(styles) @inject('actions') @observer class Services
       isSpellcheckerEnabled,
     } = this.props;
 
-    const {
-      showConfetti,
-    } = this.state;
+    const { showConfetti } = this.state;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
     const isLoggedIn = Boolean(localStorage.getItem('authToken'));
 
     return (
@@ -131,25 +129,28 @@ export default @injectSheet(styles) @inject('actions') @observer class Services
           </div>
         )}
         {services.length === 0 && (
-          <Appear
-            timeout={1500}
-            transitionName="slideUp"
-          >
+          <Appear timeout={1500} transitionName="slideUp">
             <div className="services__no-service">
-              <img src="./assets/images/logo.svg" alt="Logo" style={{ maxHeight: '50vh' }} />
+              <img
+                src="./assets/images/logo.svg"
+                alt="Logo"
+                style={{ maxHeight: '50vh' }}
+              />
               <h1>{intl.formatMessage(messages.welcome)}</h1>
-              { !isLoggedIn && (
+              {!isLoggedIn && (
                 <>
                   <p>{intl.formatMessage(messages.login)}</p>
                   <p>{intl.formatMessage(messages.serverInfo)}</p>
                 </>
-              ) }
-              <Appear
-                timeout={300}
-                transitionName="slideUp"
-              >
-                <Link to={isLoggedIn ? '/settings/recipes' : '/auth/welcome'} className="button">
-                  { isLoggedIn ? intl.formatMessage(messages.getStarted) : 'Login' }
+              )}
+              <Appear timeout={300} transitionName="slideUp">
+                <Link
+                  to={isLoggedIn ? '/settings/recipes' : '/auth/welcome'}
+                  className="button"
+                >
+                  {isLoggedIn
+                    ? intl.formatMessage(messages.getStarted)
+                    : 'Login'}
                 </Link>
                 {!isLoggedIn && (
                   <button
@@ -167,27 +168,33 @@ export default @injectSheet(styles) @inject('actions') @observer class Services
             </div>
           </Appear>
         )}
-        {services.filter((service) => !service.isTodosService).map((service) => (
-          <ServiceView
-            key={service.id}
-            service={service}
-            handleIPCMessage={handleIPCMessage}
-            setWebviewReference={setWebviewReference}
-            detachService={detachService}
-            openWindow={openWindow}
-            reload={() => reload({ serviceId: service.id })}
-            edit={() => openSettings({ path: `services/edit/${service.id}` })}
-            enable={() => update({
-              serviceId: service.id,
-              serviceData: {
-                isEnabled: true,
-              },
-              redirect: false,
-            })}
-            isSpellcheckerEnabled={isSpellcheckerEnabled}
-          />
-        ))}
+        {services
+          .filter(service => !service.isTodosService)
+          .map(service => (
+            <ServiceView
+              key={service.id}
+              service={service}
+              handleIPCMessage={handleIPCMessage}
+              setWebviewReference={setWebviewReference}
+              detachService={detachService}
+              openWindow={openWindow}
+              reload={() => reload({ serviceId: service.id })}
+              edit={() => openSettings({ path: `services/edit/${service.id}` })}
+              enable={() =>
+                update({
+                  serviceId: service.id,
+                  serviceData: {
+                    isEnabled: true,
+                  },
+                  redirect: false,
+                })
+              }
+              isSpellcheckerEnabled={isSpellcheckerEnabled}
+            />
+          ))}
       </div>
     );
   }
 }
+
+export default injectIntl(Services);
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js
index 10ff0bbbb..a332602be 100644
--- a/src/components/services/content/WebviewCrashHandler.js
+++ b/src/components/services/content/WebviewCrashHandler.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import ms from 'ms';
 
 import Button from '../../ui/Button';
@@ -9,35 +9,33 @@ import Button from '../../ui/Button';
 const messages = defineMessages({
   headline: {
     id: 'service.crashHandler.headline',
-    defaultMessage: '!!!Oh no!',
+    defaultMessage: 'Oh no!',
   },
   text: {
     id: 'service.crashHandler.text',
-    defaultMessage: '!!!{name} has caused an error.',
+    defaultMessage: '{name} has caused an error.',
   },
   action: {
     id: 'service.crashHandler.action',
-    defaultMessage: '!!!Reload {name}',
+    defaultMessage: 'Reload {name}',
   },
   autoReload: {
     id: 'service.crashHandler.autoReload',
-    defaultMessage: '!!!Trying to automatically restore {name} in {seconds} seconds',
+    defaultMessage:
+      'Trying to automatically restore {name} in {seconds} seconds',
   },
 });
 
-export default @observer class WebviewCrashHandler extends Component {
+@observer
+class WebviewCrashHandler extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
     reload: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     countdown: ms('10s'),
-  }
+  };
 
   countdownInterval = null;
 
@@ -47,7 +45,7 @@ export default @observer class WebviewCrashHandler extends Component {
     const { reload } = this.props;
 
     this.countdownInterval = setInterval(() => {
-      this.setState((prevState) => ({
+      this.setState(prevState => ({
         countdown: prevState.countdown - this.countdownIntervalTimeout,
       }));
 
@@ -60,7 +58,7 @@ export default @observer class WebviewCrashHandler extends Component {
 
   render() {
     const { name, reload } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <div className="services__info-layer">
@@ -82,3 +80,5 @@ export default @observer class WebviewCrashHandler extends Component {
     );
   }
 }
+
+export default injectIntl(WebviewCrashHandler);
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index e5892be5d..b1a3ffbbb 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -1,6 +1,6 @@
 import { Menu, dialog, app, getCurrentWindow } from '@electron/remote';
 import React, { Component } from 'react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import classnames from 'classnames';
@@ -20,56 +20,55 @@ const IS_SERVICE_DEBUGGING_ENABLED = (
 const messages = defineMessages({
   reload: {
     id: 'tabs.item.reload',
-    defaultMessage: '!!!Reload',
+    defaultMessage: 'Reload',
   },
   disableNotifications: {
     id: 'tabs.item.disableNotifications',
-    defaultMessage: '!!!Disable notifications',
+    defaultMessage: 'Disable notifications',
   },
   enableNotifications: {
     id: 'tabs.item.enableNotification',
-    defaultMessage: '!!!Enable notifications',
+    defaultMessage: 'Enable notifications',
   },
   disableAudio: {
     id: 'tabs.item.disableAudio',
-    defaultMessage: '!!!Disable audio',
+    defaultMessage: 'Disable audio',
   },
   enableAudio: {
     id: 'tabs.item.enableAudio',
-    defaultMessage: '!!!Enable audio',
+    defaultMessage: 'Enable audio',
   },
   enableDarkMode: {
     id: 'tabs.item.enableDarkMode',
-    defaultMessage: '!!!Enable Dark mode',
+    defaultMessage: 'Enable Dark mode',
   },
   disableDarkMode: {
     id: 'tabs.item.disableDarkMode',
-    defaultMessage: '!!!Disable Dark mode',
+    defaultMessage: 'Disable Dark mode',
   },
   disableService: {
     id: 'tabs.item.disableService',
-    defaultMessage: '!!!Disable Service',
+    defaultMessage: 'Disable Service',
   },
   enableService: {
     id: 'tabs.item.enableService',
-    defaultMessage: '!!!Enable Service',
+    defaultMessage: 'Enable Service',
   },
   hibernateService: {
     id: 'tabs.item.hibernateService',
-    defaultMessage: '!!!Hibernate Service',
+    defaultMessage: 'Hibernate Service',
   },
   wakeUpService: {
     id: 'tabs.item.wakeUpService',
-    defaultMessage: '!!!Wake Up Service',
+    defaultMessage: 'Wake Up Service',
   },
   deleteService: {
     id: 'tabs.item.deleteService',
-    defaultMessage: '!!!Delete Service',
+    defaultMessage: 'Delete Service',
   },
   confirmDeleteService: {
     id: 'tabs.item.confirmDeleteService',
-    defaultMessage:
-      '!!!Do you really want to delete the {serviceName} service?',
+    defaultMessage: 'Do you really want to delete the {serviceName} service?',
   },
 });
 
@@ -134,10 +133,6 @@ class TabItem extends Component {
     showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   @observable isPolled = false;
 
   @observable isPollAnswered = false;
@@ -185,7 +180,7 @@ class TabItem extends Component {
       showMessageBadgeWhenMutedSetting,
       showMessageBadgesEvenWhenMuted,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     const menuTemplate = [
       {
@@ -256,7 +251,10 @@ class TabItem extends Component {
             detail: intl.formatMessage(messages.confirmDeleteService, {
               serviceName: service.name || service.recipe.name,
             }),
-            buttons: [intl.formatMessage(globalMessages.yes), intl.formatMessage(globalMessages.no)],
+            buttons: [
+              intl.formatMessage(globalMessages.yes),
+              intl.formatMessage(globalMessages.no),
+            ],
           });
           if (selection === 0) {
             deleteService();
@@ -304,7 +302,9 @@ class TabItem extends Component {
         onClick={clickHandler}
         onContextMenu={() => menu.popup(getCurrentWindow())}
         data-tip={`${service.name} ${
-          shortcutIndex <= 9 ? `(${cmdOrCtrlShortcutKey(false)}+${shortcutIndex})` : ''
+          shortcutIndex <= 9
+            ? `(${cmdOrCtrlShortcutKey(false)}+${shortcutIndex})`
+            : ''
         }`}
       >
         <img src={service.icon} className="tab-item__icon" alt="" />
@@ -332,4 +332,4 @@ class TabItem extends Component {
   }
 }
 
-export default SortableElement(TabItem);
+export default injectIntl(SortableElement(TabItem));
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js
index c1421a2b1..a77799819 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.js
@@ -4,7 +4,8 @@ import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 
 import TabBarSortableList from './TabBarSortableList';
 
-export default @observer class TabBar extends Component {
+@observer
+class TabBar extends Component {
   static propTypes = {
     services: MobxPropTypes.arrayOrObservableArray.isRequired,
     setActive: PropTypes.func.isRequired,
@@ -26,16 +27,13 @@ export default @observer class TabBar extends Component {
   };
 
   onSortEnd = ({ oldIndex, newIndex }) => {
-    const {
-      enableToolTip,
-      reorder,
-    } = this.props;
+    const { enableToolTip, reorder } = this.props;
 
     enableToolTip();
     reorder({ oldIndex, newIndex });
   };
 
-  shouldPreventSorting = (event) => event.target.tagName !== 'LI';
+  shouldPreventSorting = event => event.target.tagName !== 'LI';
 
   toggleService = ({ serviceId, isEnabled }) => {
     const { updateService } = this.props;
@@ -102,10 +100,10 @@ export default @observer class TabBar extends Component {
           toggleAudio={toggleAudio}
           toggleDarkMode={toggleDarkMode}
           deleteService={deleteService}
-          disableService={(args) => this.disableService(args)}
-          enableService={(args) => this.enableService(args)}
-          hibernateService={(args) => this.hibernateService(args)}
-          wakeUpService={(args) => this.wakeUpService(args)}
+          disableService={args => this.disableService(args)}
+          enableService={args => this.enableService(args)}
+          hibernateService={args => this.hibernateService(args)}
+          wakeUpService={args => this.wakeUpService(args)}
           openSettings={openSettings}
           distance={20}
           axis={axis}
@@ -118,3 +116,5 @@ export default @observer class TabBar extends Component {
     );
   }
 }
+
+export default TabBar;
diff --git a/src/components/settings/SettingsLayout.js b/src/components/settings/SettingsLayout.js
index 5b3b754fa..0574b3765 100644
--- a/src/components/settings/SettingsLayout.js
+++ b/src/components/settings/SettingsLayout.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import ErrorBoundary from '../util/ErrorBoundary';
 import { oneOrManyChildElements } from '../../prop-types';
@@ -10,11 +10,10 @@ import Appear from '../ui/effects/Appear';
 const messages = defineMessages({
   closeSettings: {
     id: 'settings.app.closeSettings',
-    defaultMessage: '!!!Close settings',
+    defaultMessage: 'Close settings',
   },
 });
 
-export default
 @observer
 class SettingsLayout extends Component {
   static propTypes = {
@@ -23,10 +22,6 @@ class SettingsLayout extends Component {
     closeSettings: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   componentDidMount() {
     document.addEventListener('keydown', this.handleKeyDown.bind(this), false);
   }
@@ -49,7 +44,7 @@ class SettingsLayout extends Component {
   render() {
     const { navigation, children, closeSettings } = this.props;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <Appear transitionName="fadeIn-fast">
@@ -77,3 +72,5 @@ class SettingsLayout extends Component {
     );
   }
 }
+
+export default injectIntl(SettingsLayout);
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index ef7748343..933d47d12 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import ReactTooltip from 'react-tooltip';
 import { H1, H2 } from '@meetfranz/ui';
 
@@ -13,7 +13,7 @@ import { LOCAL_SERVER, LIVE_FRANZ_API } from '../../../config';
 const messages = defineMessages({
   headline: {
     id: 'settings.account.headline',
-    defaultMessage: '!!!Account',
+    defaultMessage: 'Account',
   },
   headlineDangerZone: {
     id: 'settings.account.headlineDangerZone',
@@ -21,7 +21,7 @@ const messages = defineMessages({
   },
   accountEditButton: {
     id: 'settings.account.account.editButton',
-    defaultMessage: '!!!Edit Account',
+    defaultMessage: 'Edit Account',
   },
   invoicesButton: {
     id: 'settings.account.headlineInvoices',
@@ -29,29 +29,29 @@ const messages = defineMessages({
   },
   userInfoRequestFailed: {
     id: 'settings.account.userInfoRequestFailed',
-    defaultMessage: '!!!Could not load user information',
+    defaultMessage: 'Could not load user information',
   },
   tryReloadUserInfoRequest: {
     id: 'settings.account.tryReloadUserInfoRequest',
-    defaultMessage: '!!!Try again',
+    defaultMessage: 'Try again',
   },
   deleteAccount: {
     id: 'settings.account.deleteAccount',
-    defaultMessage: '!!!Delete account',
+    defaultMessage: 'Delete account',
   },
   deleteInfo: {
     id: 'settings.account.deleteInfo',
     defaultMessage:
-      "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
+      "If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
   },
   deleteEmailSent: {
     id: 'settings.account.deleteEmailSent',
     defaultMessage:
-      '!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!',
+      'You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!',
   },
   yourLicense: {
     id: 'settings.account.yourLicense',
-    defaultMessage: '!!!Your Franz License:',
+    defaultMessage: 'Your Franz License:',
   },
   accountUnavailable: {
     id: 'settings.account.accountUnavailable',
@@ -59,7 +59,8 @@ const messages = defineMessages({
   },
   accountUnavailableInfo: {
     id: 'settings.account.accountUnavailableInfo',
-    defaultMessage: 'You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.',
+    defaultMessage:
+      'You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.',
   },
 });
 
@@ -78,10 +79,6 @@ class AccountDashboard extends Component {
     server: PropTypes.string.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       user,
@@ -95,7 +92,7 @@ class AccountDashboard extends Component {
       openInvoices,
       server,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     const isUsingWithoutAccount = server === LOCAL_SERVER;
     const isUsingFranzServer = server === LIVE_FRANZ_API;
@@ -182,9 +179,7 @@ class AccountDashboard extends Component {
                         <div className="account">
                           <div className="account__box">
                             <H2>{intl.formatMessage(messages.yourLicense)}</H2>
-                            <p>
-                              Franz
-                            </p>
+                            <p>Franz</p>
                             <div className="manage-user-links">
                               <Button
                                 label={intl.formatMessage(
@@ -203,7 +198,9 @@ class AccountDashboard extends Component {
                   {isUsingFranzServer && (
                     <div className="account franz-form">
                       <div className="account__box">
-                        <H2>{intl.formatMessage(messages.headlineDangerZone)}</H2>
+                        <H2>
+                          {intl.formatMessage(messages.headlineDangerZone)}
+                        </H2>
                         {!isDeleteAccountSuccessful && (
                           <div className="account__subscription">
                             <p>{intl.formatMessage(messages.deleteInfo)}</p>
@@ -232,4 +229,4 @@ class AccountDashboard extends Component {
   }
 }
 
-export default AccountDashboard;
+export default injectIntl(AccountDashboard);
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 0a5ace586..72c7faa66 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { inject, observer } from 'mobx-react';
 import { RouterStore } from 'mobx-react-router';
 
@@ -15,35 +15,37 @@ import globalMessages from '../../../i18n/globalMessages';
 const messages = defineMessages({
   availableServices: {
     id: 'settings.navigation.availableServices',
-    defaultMessage: '!!!Available services',
+    defaultMessage: 'Available services',
   },
   yourServices: {
     id: 'settings.navigation.yourServices',
-    defaultMessage: '!!!Your services',
+    defaultMessage: 'Your services',
   },
   yourWorkspaces: {
     id: 'settings.navigation.yourWorkspaces',
-    defaultMessage: '!!!Your workspaces',
+    defaultMessage: 'Your workspaces',
   },
   account: {
     id: 'settings.navigation.account',
-    defaultMessage: '!!!Account',
+    defaultMessage: 'Account',
   },
   team: {
     id: 'settings.navigation.team',
-    defaultMessage: '!!!Manage Team',
+    defaultMessage: 'Manage Team',
   },
   supportFerdi: {
     id: 'settings.navigation.supportFerdi',
-    defaultMessage: '!!!About Ferdi',
+    defaultMessage: 'About Ferdi',
   },
   logout: {
     id: 'settings.navigation.logout',
-    defaultMessage: '!!!Logout',
+    defaultMessage: 'Logout',
   },
 });
 
-export default @inject('stores', 'actions') @observer class SettingsNavigation extends Component {
+@inject('stores', 'actions')
+@observer
+class SettingsNavigation extends Component {
   static propTypes = {
     stores: PropTypes.shape({
       ui: PropTypes.instanceOf(UIStore).isRequired,
@@ -58,13 +60,10 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
     workspaceCount: PropTypes.number.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   handleLoginLogout() {
     const isLoggedIn = Boolean(localStorage.getItem('authToken'));
-    const isUsingWithoutAccount = this.props.stores.settings.app.server === LOCAL_SERVER;
+    const isUsingWithoutAccount =
+      this.props.stores.settings.app.server === LOCAL_SERVER;
 
     if (isLoggedIn) {
       // Remove current auth token
@@ -82,7 +81,9 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
       this.props.stores.user.isLoggingOut = true;
     }
 
-    this.props.stores.router.push(isLoggedIn ? '/auth/logout' : '/auth/welcome');
+    this.props.stores.router.push(
+      isLoggedIn ? '/auth/logout' : '/auth/welcome',
+    );
 
     if (isLoggedIn) {
       // Reload Ferdi, otherwise many settings won't sync correctly with the server
@@ -93,7 +94,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
 
   render() {
     const { serviceCount, workspaceCount, stores } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
     const isLoggedIn = Boolean(localStorage.getItem('authToken'));
     const isUsingWithoutAccount = stores.settings.app.server === LOCAL_SERVER;
     const isUsingFranzServer = stores.settings.app.server === LIVE_FRANZ_API;
@@ -113,11 +114,8 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
           activeClassName="is-active"
           disabled={!isLoggedIn}
         >
-          {intl.formatMessage(messages.yourServices)}
-          {' '}
-          <span className="badge">
-            {serviceCount}
-          </span>
+          {intl.formatMessage(messages.yourServices)}{' '}
+          <span className="badge">{serviceCount}</span>
         </Link>
         {workspaceStore.isFeatureEnabled ? (
           <Link
@@ -126,8 +124,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
             activeClassName="is-active"
             disabled={!isLoggedIn}
           >
-            {intl.formatMessage(messages.yourWorkspaces)}
-            {' '}
+            {intl.formatMessage(messages.yourWorkspaces)}{' '}
             <span className="badge">{workspaceCount}</span>
           </Link>
         ) : null}
@@ -172,9 +169,13 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
           className="settings-navigation__link"
           onClick={this.handleLoginLogout.bind(this)}
         >
-          { isLoggedIn && !isUsingWithoutAccount ? intl.formatMessage(messages.logout) : 'Login'}
+          {isLoggedIn && !isUsingWithoutAccount
+            ? intl.formatMessage(messages.logout)
+            : 'Login'}
         </button>
       </div>
     );
   }
 }
+
+export default injectIntl(SettingsNavigation);
diff --git a/src/components/settings/recipes/RecipeItem.js b/src/components/settings/recipes/RecipeItem.js
index 55f415bd5..ca188aa99 100644
--- a/src/components/settings/recipes/RecipeItem.js
+++ b/src/components/settings/recipes/RecipeItem.js
@@ -4,7 +4,8 @@ import { observer } from 'mobx-react';
 
 import RecipePreviewModel from '../../../models/RecipePreview';
 
-export default @observer class RecipeItem extends Component {
+@observer
+class RecipeItem extends Component {
   static propTypes = {
     recipe: PropTypes.instanceOf(RecipePreviewModel).isRequired,
     onClick: PropTypes.func.isRequired,
@@ -14,19 +15,11 @@ export default @observer class RecipeItem extends Component {
     const { recipe, onClick } = this.props;
 
     return (
-      <button
-        type="button"
-        className="recipe-teaser"
-        onClick={onClick}
-      >
+      <button type="button" className="recipe-teaser" onClick={onClick}>
         {recipe.isDevRecipe && (
           <span className="recipe-teaser__dev-badge">dev</span>
         )}
-        <img
-          src={recipe.icons.svg}
-          className="recipe-teaser__icon"
-          alt=""
-        />
+        <img src={recipe.icons.svg} className="recipe-teaser__icon" alt="" />
         <span className="recipe-teaser__label">{recipe.name}</span>
         {recipe.aliases && recipe.aliases.length > 0 && (
           <span className="recipe-teaser__alias_label">
@@ -37,3 +30,5 @@ export default @observer class RecipeItem extends Component {
     );
   }
 }
+
+export default RecipeItem;
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js
index 44ff2d0d7..e620abf93 100644
--- a/src/components/settings/recipes/RecipesDashboard.js
+++ b/src/components/settings/recipes/RecipesDashboard.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router';
 
 import { Button, Input } from '@meetfranz/forms';
@@ -18,55 +18,56 @@ import RecipePreview from '../../../models/RecipePreview';
 const messages = defineMessages({
   headline: {
     id: 'settings.recipes.headline',
-    defaultMessage: '!!!Available Services',
+    defaultMessage: 'Available Services',
   },
   searchService: {
     id: 'settings.searchService',
-    defaultMessage: '!!!Search service',
+    defaultMessage: 'Search service',
   },
   allRecipes: {
     id: 'settings.recipes.all',
-    defaultMessage: '!!!All services',
+    defaultMessage: 'All services',
   },
   customRecipes: {
     id: 'settings.recipes.custom',
-    defaultMessage: '!!!Custom Services',
+    defaultMessage: 'Custom Services',
   },
   nothingFound: {
     id: 'settings.recipes.nothingFound',
-    defaultMessage: '!!!Sorry, but no service matched your search term - but you can still probably add it using the "Custom Website" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.',
+    defaultMessage:
+      'Sorry, but no service matched your search term - but you can still probably add it using the "Custom Website" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.',
   },
   servicesSuccessfulAddedInfo: {
     id: 'settings.recipes.servicesSuccessfulAddedInfo',
-    defaultMessage: '!!!Service successfully added',
+    defaultMessage: 'Service successfully added',
   },
   missingService: {
     id: 'settings.recipes.missingService',
-    defaultMessage: '!!!Missing a service?',
+    defaultMessage: 'Missing a service?',
   },
   customRecipeIntro: {
     id: 'settings.recipes.customService.intro',
-    defaultMessage: '!!!To add a custom service, copy the recipe folder into:',
+    defaultMessage: 'To add a custom service, copy the recipe folder into:',
   },
   openFolder: {
     id: 'settings.recipes.customService.openFolder',
-    defaultMessage: '!!!Open directory',
+    defaultMessage: 'Open directory',
   },
   openDevDocs: {
     id: 'settings.recipes.customService.openDevDocs',
-    defaultMessage: '!!!Developer Documentation',
+    defaultMessage: 'Developer Documentation',
   },
   headlineCustomRecipes: {
     id: 'settings.recipes.customService.headline.customRecipes',
-    defaultMessage: '!!!Custom 3rd Party Recipes',
+    defaultMessage: 'Custom 3rd Party Recipes',
   },
   headlineCommunityRecipes: {
     id: 'settings.recipes.customService.headline.communityRecipes',
-    defaultMessage: '!!!Community 3rd Party Recipes',
+    defaultMessage: 'Community 3rd Party Recipes',
   },
   headlineDevRecipes: {
     id: 'settings.recipes.customService.headline.devRecipes',
-    defaultMessage: '!!!Your Development Service Recipes',
+    defaultMessage: 'Your Development Service Recipes',
   },
 });
 
@@ -81,7 +82,8 @@ const styles = {
     marginTop: 20,
 
     '& > div': {
-      fontFamily: 'SFMono-Regular,Consolas,Liberation Mono,Menlo,Courier,monospace',
+      fontFamily:
+        'SFMono-Regular,Consolas,Liberation Mono,Menlo,Courier,monospace',
     },
   },
   actionContainer: {
@@ -98,7 +100,9 @@ const styles = {
   },
 };
 
-export default @injectSheet(styles) @observer class RecipesDashboard extends Component {
+@injectSheet(styles)
+@observer
+class RecipesDashboard extends Component {
   static propTypes = {
     recipes: MobxPropTypes.arrayOrObservableArray.isRequired,
     customWebsiteRecipe: PropTypes.instanceOf(RecipePreview).isRequired,
@@ -118,10 +122,6 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
   static defaultProps = {
     searchNeedle: '',
     recipeFilter: 'all',
-  }
-
-  static contextTypes = {
-    intl: intlShape,
   };
 
   render() {
@@ -140,7 +140,7 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
       openDevDocs,
       classes,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     const communityRecipes = recipes.filter(r => !r.isDevRecipe);
     const devRecipes = recipes.filter(r => r.isDevRecipe);
@@ -188,9 +188,13 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
             >
               {intl.formatMessage(messages.customRecipes)}
             </Link>
-            <a href={FRANZ_SERVICE_REQUEST} target="_blank" className="link recipes__service-request" rel="noreferrer">
-              {intl.formatMessage(messages.missingService)}
-              {' '}
+            <a
+              href={FRANZ_SERVICE_REQUEST}
+              target="_blank"
+              className="link recipes__service-request"
+              rel="noreferrer"
+            >
+              {intl.formatMessage(messages.missingService)}{' '}
               <i className="mdi mdi-open-in-new" />
             </a>
           </div>
@@ -201,13 +205,9 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
             <>
               {recipeFilter === 'dev' && (
                 <>
-                  <H2>
-                    {intl.formatMessage(messages.headlineCustomRecipes)}
-                  </H2>
+                  <H2>{intl.formatMessage(messages.headlineCustomRecipes)}</H2>
                   <div className={classes.devRecipeIntroContainer}>
-                    <p>
-                      {intl.formatMessage(messages.customRecipeIntro)}
-                    </p>
+                    <p>{intl.formatMessage(messages.customRecipeIntro)}</p>
                     <Input
                       value={recipeDirectory}
                       className={classes.path}
@@ -238,12 +238,19 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
                       <img src="./assets/images/emoji/dontknow.png" alt="" />
                     </span>
 
-                    <p className="settings__empty-state-text">{intl.formatMessage(messages.nothingFound)}</p>
+                    <p className="settings__empty-state-text">
+                      {intl.formatMessage(messages.nothingFound)}
+                    </p>
 
                     <RecipeItem
                       key={customWebsiteRecipe.id}
                       recipe={customWebsiteRecipe}
-                      onClick={() => isLoggedIn && showAddServiceInterface({ recipeId: customWebsiteRecipe.id })}
+                      onClick={() =>
+                        isLoggedIn &&
+                        showAddServiceInterface({
+                          recipeId: customWebsiteRecipe.id,
+                        })
+                      }
                     />
                   </div>
                 )}
@@ -251,7 +258,10 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
                   <RecipeItem
                     key={recipe.id}
                     recipe={recipe}
-                    onClick={() => isLoggedIn && showAddServiceInterface({ recipeId: recipe.id })}
+                    onClick={() =>
+                      isLoggedIn &&
+                      showAddServiceInterface({ recipeId: recipe.id })
+                    }
                   />
                 ))}
               </div>
@@ -263,7 +273,10 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
                       <RecipeItem
                         key={recipe.id}
                         recipe={recipe}
-                        onClick={() => isLoggedIn && showAddServiceInterface({ recipeId: recipe.id })}
+                        onClick={() =>
+                          isLoggedIn &&
+                          showAddServiceInterface({ recipeId: recipe.id })
+                        }
                       />
                     ))}
                   </div>
@@ -276,3 +289,5 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
     );
   }
 }
+
+export default injectIntl(RecipesDashboard);
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index c41cdd56a..3fbb57cbb 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { Link } from 'react-router';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import normalizeUrl from 'normalize-url';
 
 import Form from '../../../lib/Form';
@@ -22,111 +22,117 @@ import globalMessages from '../../../i18n/globalMessages';
 const messages = defineMessages({
   saveService: {
     id: 'settings.service.form.saveButton',
-    defaultMessage: '!!!Save service',
+    defaultMessage: 'Save service',
   },
   deleteService: {
     id: 'settings.service.form.deleteButton',
-    defaultMessage: '!!!Delete Service',
+    defaultMessage: 'Delete Service',
   },
   openDarkmodeCss: {
     id: 'settings.service.form.openDarkmodeCss',
-    defaultMessage: '!!!Open darkmode.css',
+    defaultMessage: 'Open darkmode.css',
   },
   openUserCss: {
     id: 'settings.service.form.openUserCss',
-    defaultMessage: '!!!Open user.css',
+    defaultMessage: 'Open user.css',
   },
   openUserJs: {
     id: 'settings.service.form.openUserJs',
-    defaultMessage: '!!!Open user.js',
+    defaultMessage: 'Open user.js',
   },
   recipeFileInfo: {
     id: 'settings.service.form.recipeFileInfo',
-    defaultMessage: '!!!Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.',
+    defaultMessage:
+      'Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.',
   },
   availableServices: {
     id: 'settings.service.form.availableServices',
-    defaultMessage: '!!!Available services',
+    defaultMessage: 'Available services',
   },
   yourServices: {
     id: 'settings.service.form.yourServices',
-    defaultMessage: '!!!Your services',
+    defaultMessage: 'Your services',
   },
   addServiceHeadline: {
     id: 'settings.service.form.addServiceHeadline',
-    defaultMessage: '!!!Add {name}',
+    defaultMessage: 'Add {name}',
   },
   editServiceHeadline: {
     id: 'settings.service.form.editServiceHeadline',
-    defaultMessage: '!!!Edit {name}',
+    defaultMessage: 'Edit {name}',
   },
   tabHosted: {
     id: 'settings.service.form.tabHosted',
-    defaultMessage: '!!!Hosted',
+    defaultMessage: 'Hosted',
   },
   tabOnPremise: {
     id: 'settings.service.form.tabOnPremise',
-    defaultMessage: '!!!Self hosted ⭐️',
+    defaultMessage: 'Self hosted ⭐️',
   },
   useHostedService: {
     id: 'settings.service.form.useHostedService',
-    defaultMessage: '!!!Use the hosted {name} service.',
+    defaultMessage: 'Use the hosted {name} service.',
   },
   customUrlValidationError: {
     id: 'settings.service.form.customUrlValidationError',
-    defaultMessage: '!!!Could not validate custom {name} server.',
+    defaultMessage: 'Could not validate custom {name} server.',
   },
   indirectMessageInfo: {
     id: 'settings.service.form.indirectMessageInfo',
-    defaultMessage: '!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...',
+    defaultMessage:
+      'You will be notified about all new messages in a channel, not just @username, @channel, @here, ...',
   },
   isMutedInfo: {
     id: 'settings.service.form.isMutedInfo',
-    defaultMessage: '!!!When disabled, all notification sounds and audio playback are muted',
+    defaultMessage:
+      'When disabled, all notification sounds and audio playback are muted',
   },
   isHibernationEnabledInfo: {
     id: 'settings.service.form.isHibernatedEnabledInfo',
-    defaultMessage: '!!!When enabled, a service will be shut down after a period of time to save system resources.',
+    defaultMessage:
+      'When enabled, a service will be shut down after a period of time to save system resources.',
   },
   headlineNotifications: {
     id: 'settings.service.form.headlineNotifications',
-    defaultMessage: '!!!Notifications',
+    defaultMessage: 'Notifications',
   },
   headlineBadges: {
     id: 'settings.service.form.headlineBadges',
-    defaultMessage: '!!!Unread message badges',
+    defaultMessage: 'Unread message badges',
   },
   headlineGeneral: {
     id: 'settings.service.form.headlineGeneral',
-    defaultMessage: '!!!General',
+    defaultMessage: 'General',
   },
   headlineDarkReaderSettings: {
     id: 'settings.service.form.headlineDarkReaderSettings',
-    defaultMessage: '!!!Dark Reader Settings',
+    defaultMessage: 'Dark Reader Settings',
   },
   iconDelete: {
     id: 'settings.service.form.iconDelete',
-    defaultMessage: '!!!Delete',
+    defaultMessage: 'Delete',
   },
   iconUpload: {
     id: 'settings.service.form.iconUpload',
-    defaultMessage: '!!!Drop your image, or click here',
+    defaultMessage: 'Drop your image, or click here',
   },
   headlineProxy: {
     id: 'settings.service.form.proxy.headline',
-    defaultMessage: '!!!HTTP/HTTPS Proxy Settings',
+    defaultMessage: 'HTTP/HTTPS Proxy Settings',
   },
   proxyRestartInfo: {
     id: 'settings.service.form.proxy.restartInfo',
-    defaultMessage: '!!!Please restart Ferdi after changing proxy Settings.',
+    defaultMessage: 'Please restart Ferdi after changing proxy Settings.',
   },
   proxyInfo: {
     id: 'settings.service.form.proxy.info',
-    defaultMessage: '!!!Proxy settings will not be synchronized with the Ferdi servers.',
+    defaultMessage:
+      'Proxy settings will not be synchronized with the Ferdi servers.',
   },
 });
 
-export default @observer class EditServiceForm extends Component {
+@observer
+class EditServiceForm extends Component {
   static propTypes = {
     recipe: PropTypes.instanceOf(Recipe).isRequired,
     service(props, propName) {
@@ -151,20 +157,16 @@ export default @observer class EditServiceForm extends Component {
     service: {},
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     isValidatingCustomUrl: false,
-  }
+  };
 
   submit(e) {
     const { recipe } = this.props;
 
     e.preventDefault();
     this.props.form.submit({
-      onSuccess: async (form) => {
+      onSuccess: async form => {
         const values = form.values();
         let isValid = true;
 
@@ -176,7 +178,10 @@ export default @observer class EditServiceForm extends Component {
         if (recipe.validateUrl && values.customUrl) {
           this.setState({ isValidatingCustomUrl: true });
           try {
-            values.customUrl = normalizeUrl(values.customUrl, { stripWWW: false, removeTrailingSlash: false });
+            values.customUrl = normalizeUrl(values.customUrl, {
+              stripWWW: false,
+              removeTrailingSlash: false,
+            });
             isValid = await recipe.validateUrl(values.customUrl);
           } catch (err) {
             console.warn('ValidateURL', err);
@@ -208,7 +213,7 @@ export default @observer class EditServiceForm extends Component {
       openRecipeFile,
       isProxyFeatureEnabled,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     const { isValidatingCustomUrl } = this.state;
 
@@ -236,7 +241,8 @@ export default @observer class EditServiceForm extends Component {
       activeTabIndex = 2;
     }
 
-    const requiresUserInput = !recipe.hasHostedOption && (recipe.hasTeamId || recipe.hasCustomUrl);
+    const requiresUserInput =
+      !recipe.hasHostedOption && (recipe.hasTeamId || recipe.hasCustomUrl);
 
     return (
       <div className="settings__main">
@@ -254,29 +260,27 @@ export default @observer class EditServiceForm extends Component {
           </span>
           <span className="separator" />
           <span className="settings__header-item">
-            {action === 'add' ? (
-              intl.formatMessage(messages.addServiceHeadline, {
+            {action === 'add'
+              ? intl.formatMessage(messages.addServiceHeadline, {
                 name: recipe.name,
               })
-            ) : (
-              intl.formatMessage(messages.editServiceHeadline, {
+              : intl.formatMessage(messages.editServiceHeadline, {
                 name: service.name !== '' ? service.name : recipe.name,
-              })
-            )}
+              })}
           </span>
         </div>
         <div className="settings__body">
-          <form onSubmit={(e) => this.submit(e)} id="form">
+          <form onSubmit={e => this.submit(e)} id="form">
             <div className="service-name">
               <Input field={form.$('name')} focus />
             </div>
             {(recipe.hasTeamId || recipe.hasCustomUrl) && (
-              <Tabs
-                active={activeTabIndex}
-              >
+              <Tabs active={activeTabIndex}>
                 {recipe.hasHostedOption && (
                   <TabItem title={recipe.name}>
-                    {intl.formatMessage(messages.useHostedService, { name: recipe.name })}
+                    {intl.formatMessage(messages.useHostedService, {
+                      name: recipe.name,
+                    })}
                   </TabItem>
                 )}
                 {recipe.hasTeamId && (
@@ -293,7 +297,9 @@ export default @observer class EditServiceForm extends Component {
                     <Input field={form.$('customUrl')} />
                     {form.error === 'url-validation-error' && (
                       <p className="franz-form__error">
-                        {intl.formatMessage(messages.customUrlValidationError, { name: recipe.name })}
+                        {intl.formatMessage(messages.customUrlValidationError, {
+                          name: recipe.name,
+                        })}
                       </p>
                     )}
                   </TabItem>
@@ -326,13 +332,16 @@ export default @observer class EditServiceForm extends Component {
                 <div className="settings__settings-group">
                   <h3>{intl.formatMessage(messages.headlineBadges)}</h3>
                   <Toggle field={form.$('isBadgeEnabled')} />
-                  {recipe.hasIndirectMessages && form.$('isBadgeEnabled').value && (
-                    <>
-                      <Toggle field={form.$('isIndirectMessageBadgeEnabled')} />
-                      <p className="settings__help indented__help">
-                        {intl.formatMessage(messages.indirectMessageInfo)}
-                      </p>
-                    </>
+                  {recipe.hasIndirectMessages &&
+                    form.$('isBadgeEnabled').value && (
+                      <>
+                        <Toggle
+                          field={form.$('isIndirectMessageBadgeEnabled')}
+                        />
+                        <p className="settings__help indented__help">
+                          {intl.formatMessage(messages.indirectMessageInfo)}
+                        </p>
+                      </>
                   )}
                 </div>
 
@@ -344,15 +353,18 @@ export default @observer class EditServiceForm extends Component {
                     {intl.formatMessage(messages.isHibernationEnabledInfo)}
                   </p>
                   <Toggle field={form.$('isDarkModeEnabled')} />
-                  {form.$('isDarkModeEnabled').value
-                    && (
-                      <>
-                        <h3>{intl.formatMessage(messages.headlineDarkReaderSettings)}</h3>
-                        <Slider field={form.$('darkReaderBrightness')} />
-                        <Slider field={form.$('darkReaderContrast')} />
-                        <Slider field={form.$('darkReaderSepia')} />
-                      </>
-                    )}
+                  {form.$('isDarkModeEnabled').value && (
+                    <>
+                      <h3>
+                        {intl.formatMessage(
+                          messages.headlineDarkReaderSettings,
+                        )}
+                      </h3>
+                      <Slider field={form.$('darkReaderBrightness')} />
+                      <Slider field={form.$('darkReaderContrast')} />
+                      <Slider field={form.$('darkReaderSepia')} />
+                    </>
+                  )}
                 </div>
               </div>
               <div className="service-icon">
@@ -381,7 +393,10 @@ export default @observer class EditServiceForm extends Component {
                   <>
                     <div className="grid">
                       <div className="grid__row">
-                        <Input field={form.$('proxy.host')} className="proxyHost" />
+                        <Input
+                          field={form.$('proxy.host')}
+                          className="proxyHost"
+                        />
                         <Input field={form.$('proxy.port')} />
                       </div>
                     </div>
@@ -409,7 +424,9 @@ export default @observer class EditServiceForm extends Component {
 
             <div className="user-agent">
               <Input field={form.$('userAgentPref')} />
-              <p className="settings__help">{intl.formatMessage(globalMessages.userAgentHelp)}</p>
+              <p className="settings__help">
+                {intl.formatMessage(globalMessages.userAgentHelp)}
+              </p>
             </div>
           </form>
 
@@ -464,7 +481,9 @@ export default @observer class EditServiceForm extends Component {
               type="submit"
               label={intl.formatMessage(messages.saveService)}
               htmlForm="form"
-              disabled={action !== 'edit' && (form.isPristine && requiresUserInput)}
+              disabled={
+                action !== 'edit' && form.isPristine && requiresUserInput
+              }
             />
           )}
         </div>
@@ -472,3 +491,5 @@ export default @observer class EditServiceForm extends Component {
     );
   }
 }
+
+export default injectIntl(EditServiceForm);
diff --git a/src/components/settings/services/ServiceError.js b/src/components/settings/services/ServiceError.js
index 3cfc080d6..d16d76db2 100644
--- a/src/components/settings/services/ServiceError.js
+++ b/src/components/settings/services/ServiceError.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { observer } from 'mobx-react';
 import { Link } from 'react-router';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import Infobox from '../../ui/Infobox';
 import Button from '../../ui/Button';
@@ -9,29 +9,26 @@ import Button from '../../ui/Button';
 const messages = defineMessages({
   headline: {
     id: 'settings.service.error.headline',
-    defaultMessage: '!!!Error',
+    defaultMessage: 'Error',
   },
   goBack: {
     id: 'settings.service.error.goBack',
-    defaultMessage: '!!!Back to services',
+    defaultMessage: 'Back to services',
   },
   availableServices: {
     id: 'settings.service.form.availableServices',
-    defaultMessage: '!!!Available services',
+    defaultMessage: 'Available services',
   },
   errorMessage: {
     id: 'settings.service.error.message',
-    defaultMessage: '!!!Could not load service recipe.',
+    defaultMessage: 'Could not load service recipe.',
   },
 });
 
-export default @observer class ServiceError extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
+@observer
+class ServiceError extends Component {
   render() {
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <div className="settings__main">
@@ -47,10 +44,7 @@ export default @observer class ServiceError extends Component {
           </span>
         </div>
         <div className="settings__body">
-          <Infobox
-            type="danger"
-            icon="alert"
-          >
+          <Infobox type="danger" icon="alert">
             {intl.formatMessage(messages.errorMessage)}
           </Infobox>
         </div>
@@ -65,3 +59,5 @@ export default @observer class ServiceError extends Component {
     );
   }
 }
+
+export default injectIntl(ServiceError);
diff --git a/src/components/settings/services/ServiceItem.js b/src/components/settings/services/ServiceItem.js
index ebc618a00..4916e4ecc 100644
--- a/src/components/settings/services/ServiceItem.js
+++ b/src/components/settings/services/ServiceItem.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import ReactTooltip from 'react-tooltip';
 import { observer } from 'mobx-react';
 import classnames from 'classnames';
@@ -10,35 +10,32 @@ import ServiceModel from '../../../models/Service';
 const messages = defineMessages({
   tooltipIsDisabled: {
     id: 'settings.services.tooltip.isDisabled',
-    defaultMessage: '!!!Service is disabled',
+    defaultMessage: 'Service is disabled',
   },
   tooltipNotificationsDisabled: {
     id: 'settings.services.tooltip.notificationsDisabled',
-    defaultMessage: '!!!Notifications are disabled',
+    defaultMessage: 'Notifications are disabled',
   },
   tooltipIsMuted: {
     id: 'settings.services.tooltip.isMuted',
-    defaultMessage: '!!!All sounds are muted',
+    defaultMessage: 'All sounds are muted',
   },
 });
 
-export default @observer class ServiceItem extends Component {
+@observer
+class ServiceItem extends Component {
   static propTypes = {
     service: PropTypes.instanceOf(ServiceModel).isRequired,
     goToServiceForm: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       service,
       // toggleAction,
       goToServiceForm,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <tr
@@ -47,10 +44,7 @@ export default @observer class ServiceItem extends Component {
           'service-table__row--disabled': !service.isEnabled,
         })}
       >
-        <td
-          className="service-table__column-icon"
-          onClick={goToServiceForm}
-        >
+        <td className="service-table__column-icon" onClick={goToServiceForm}>
           <img
             src={service.icon}
             className={classnames({
@@ -60,16 +54,10 @@ export default @observer class ServiceItem extends Component {
             alt=""
           />
         </td>
-        <td
-          className="service-table__column-name"
-          onClick={goToServiceForm}
-        >
+        <td className="service-table__column-name" onClick={goToServiceForm}>
           {service.name !== '' ? service.name : service.recipe.name}
         </td>
-        <td
-          className="service-table__column-info"
-          onClick={goToServiceForm}
-        >
+        <td className="service-table__column-info" onClick={goToServiceForm}>
           {service.isMuted && (
             <span
               className="mdi mdi-bell-off"
@@ -77,10 +65,7 @@ export default @observer class ServiceItem extends Component {
             />
           )}
         </td>
-        <td
-          className="service-table__column-info"
-          onClick={goToServiceForm}
-        >
+        <td className="service-table__column-info" onClick={goToServiceForm}>
           {!service.isEnabled && (
             <span
               className="mdi mdi-power"
@@ -88,14 +73,13 @@ export default @observer class ServiceItem extends Component {
             />
           )}
         </td>
-        <td
-          className="service-table__column-info"
-          onClick={goToServiceForm}
-        >
+        <td className="service-table__column-info" onClick={goToServiceForm}>
           {!service.isNotificationEnabled && (
             <span
               className="mdi mdi-message-bulleted-off"
-              data-tip={intl.formatMessage(messages.tooltipNotificationsDisabled)}
+              data-tip={intl.formatMessage(
+                messages.tooltipNotificationsDisabled,
+              )}
             />
           )}
           <ReactTooltip place="top" type="dark" effect="solid" />
@@ -104,3 +88,5 @@ export default @observer class ServiceItem extends Component {
     );
   }
 }
+
+export default injectIntl(ServiceItem);
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js
index 11d3eaa79..847f2ea06 100644
--- a/src/components/settings/services/ServicesDashboard.js
+++ b/src/components/settings/services/ServicesDashboard.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { Link } from 'react-router';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import SearchInput from '../../ui/SearchInput';
 import Infobox from '../../ui/Infobox';
@@ -14,43 +14,45 @@ import Appear from '../../ui/effects/Appear';
 const messages = defineMessages({
   headline: {
     id: 'settings.services.headline',
-    defaultMessage: '!!!Your services',
+    defaultMessage: 'Your services',
   },
   searchService: {
     id: 'settings.searchService',
-    defaultMessage: '!!!Search service',
+    defaultMessage: 'Search service',
   },
   noServicesAdded: {
     id: 'settings.services.noServicesAdded',
-    defaultMessage: '!!!Start by adding a service.',
+    defaultMessage: 'Start by adding a service.',
   },
   noServiceFound: {
     id: 'settings.recipes.nothingFound',
-    defaultMessage: '!!!Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.',
+    defaultMessage:
+      'Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.',
   },
   discoverServices: {
     id: 'settings.services.discoverServices',
-    defaultMessage: '!!!Discover services',
+    defaultMessage: 'Discover services',
   },
   servicesRequestFailed: {
     id: 'settings.services.servicesRequestFailed',
-    defaultMessage: '!!!Could not load your services',
+    defaultMessage: 'Could not load your services',
   },
   tryReloadServices: {
     id: 'settings.account.tryReloadServices',
-    defaultMessage: '!!!Try again',
+    defaultMessage: 'Try again',
   },
   updatedInfo: {
     id: 'settings.services.updatedInfo',
-    defaultMessage: '!!!Your changes have been saved',
+    defaultMessage: 'Your changes have been saved',
   },
   deletedInfo: {
     id: 'settings.services.deletedInfo',
-    defaultMessage: '!!!Service has been deleted',
+    defaultMessage: 'Service has been deleted',
   },
 });
 
-export default @observer class ServicesDashboard extends Component {
+@observer
+class ServicesDashboard extends Component {
   static propTypes = {
     services: MobxPropTypes.arrayOrObservableArray.isRequired,
     isLoading: PropTypes.bool.isRequired,
@@ -68,10 +70,6 @@ export default @observer class ServicesDashboard extends Component {
     searchNeedle: '',
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       services,
@@ -85,7 +83,7 @@ export default @observer class ServicesDashboard extends Component {
       status,
       searchNeedle,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <div className="settings__main">
@@ -96,7 +94,7 @@ export default @observer class ServicesDashboard extends Component {
           {(services.length !== 0 || searchNeedle) && !isLoading && (
             <SearchInput
               placeholder={intl.formatMessage(messages.searchService)}
-              onChange={(needle) => filterServices({ needle })}
+              onChange={needle => filterServices({ needle })}
               onReset={() => resetFilter()}
               autoFocus
             />
@@ -145,7 +143,9 @@ export default @observer class ServicesDashboard extends Component {
                 </span>
                 {intl.formatMessage(messages.noServicesAdded)}
               </p>
-              <Link to="/settings/recipes" className="button">{intl.formatMessage(messages.discoverServices)}</Link>
+              <Link to="/settings/recipes" className="button">
+                {intl.formatMessage(messages.discoverServices)}
+              </Link>
             </div>
           )}
           {!isLoading && services.length === 0 && searchNeedle && (
@@ -163,12 +163,16 @@ export default @observer class ServicesDashboard extends Component {
           ) : (
             <table className="service-table">
               <tbody>
-                {services.map((service) => (
+                {services.map(service => (
                   <ServiceItem
                     key={service.id}
                     service={service}
-                    toggleAction={() => toggleService({ serviceId: service.id })}
-                    goToServiceForm={() => goTo(`/settings/services/edit/${service.id}`)}
+                    toggleAction={() =>
+                      toggleService({ serviceId: service.id })
+                    }
+                    goToServiceForm={() =>
+                      goTo(`/settings/services/edit/${service.id}`)
+                    }
                   />
                 ))}
               </tbody>
@@ -176,12 +180,12 @@ export default @observer class ServicesDashboard extends Component {
           )}
 
           <FAB>
-            <Link to="/settings/recipes">
-              +
-            </Link>
+            <Link to="/settings/recipes">+</Link>
           </FAB>
         </div>
       </div>
     );
   }
 }
+
+export default injectIntl(ServicesDashboard);
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 6a919b902..0a468e342 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import prettyBytes from 'pretty-bytes';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import Form from '../../../lib/Form';
 import Button from '../../ui/Button';
@@ -13,154 +13,173 @@ import Select from '../../ui/Select';
 import Input from '../../ui/Input';
 
 import { FRANZ_TRANSLATION, GITHUB_FRANZ_URL } from '../../../config';
-import { DEFAULT_APP_SETTINGS, ferdiVersion, isMac, isWindows, lockFerdiShortcutKey, userDataPath, userDataRecipesPath } from '../../../environment';
+import {
+  DEFAULT_APP_SETTINGS,
+  ferdiVersion,
+  isMac,
+  isWindows,
+  lockFerdiShortcutKey,
+  userDataPath,
+  userDataRecipesPath,
+} from '../../../environment';
 import { openPath } from '../../../helpers/url-helpers';
 import globalMessages from '../../../i18n/globalMessages';
 
 const messages = defineMessages({
   headlineGeneral: {
     id: 'settings.app.headlineGeneral',
-    defaultMessage: '!!!General',
+    defaultMessage: 'General',
   },
   sentryInfo: {
     id: 'settings.app.sentryInfo',
-    defaultMessage: '!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!',
+    defaultMessage:
+      'Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!',
   },
   hibernateInfo: {
     id: 'settings.app.hibernateInfo',
-    defaultMessage: '!!!By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.',
+    defaultMessage:
+      'By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.',
   },
   inactivityLockInfo: {
     id: 'settings.app.inactivityLockInfo',
-    defaultMessage: '!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable',
+    defaultMessage:
+      'Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable',
   },
   todoServerInfo: {
     id: 'settings.app.todoServerInfo',
-    defaultMessage: '!!!This server will be used for the "Franz Todo" feature. (default: https://app.franztodos.com)',
+    defaultMessage:
+      'This server will be used for the "Franz Todo" feature. (default: https://app.franztodos.com)',
   },
   lockedPassword: {
     id: 'settings.app.lockedPassword',
-    defaultMessage: '!!!Password',
+    defaultMessage: 'Password',
   },
   lockedPasswordInfo: {
     id: 'settings.app.lockedPasswordInfo',
-    defaultMessage: '!!!Please make sure to set a password you\'ll remember.\nIf you loose this password, you will have to reinstall Ferdi.',
+    defaultMessage:
+      "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
   },
   lockInfo: {
     id: 'settings.app.lockInfo',
-    defaultMessage: '!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.',
+    defaultMessage:
+      'Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.',
   },
   scheduledDNDTimeInfo: {
     id: 'settings.app.scheduledDNDTimeInfo',
-    defaultMessage: '!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.',
+    defaultMessage:
+      'Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.',
   },
   scheduledDNDInfo: {
     id: 'settings.app.scheduledDNDInfo',
-    defaultMessage: '!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.',
+    defaultMessage:
+      'Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.',
   },
   headlineLanguage: {
     id: 'settings.app.headlineLanguage',
-    defaultMessage: '!!!Language',
+    defaultMessage: 'Language',
   },
   headlineUpdates: {
     id: 'settings.app.headlineUpdates',
-    defaultMessage: '!!!Updates',
+    defaultMessage: 'Updates',
   },
   headlineAppearance: {
     id: 'settings.app.headlineAppearance',
-    defaultMessage: '!!!Appearance',
+    defaultMessage: 'Appearance',
   },
   universalDarkModeInfo: {
     id: 'settings.app.universalDarkModeInfo',
-    defaultMessage: '!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.',
+    defaultMessage:
+      'Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.',
   },
   accentColorInfo: {
     id: 'settings.app.accentColorInfo',
-    defaultMessage: '!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})',
+    defaultMessage:
+      'Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})',
   },
   headlinePrivacy: {
     id: 'settings.app.headlinePrivacy',
-    defaultMessage: '!!!Privacy',
+    defaultMessage: 'Privacy',
   },
   headlineAdvanced: {
     id: 'settings.app.headlineAdvanced',
-    defaultMessage: '!!!Advanced',
+    defaultMessage: 'Advanced',
   },
   translationHelp: {
     id: 'settings.app.translationHelp',
-    defaultMessage: '!!!Help us to translate Ferdi into your language.',
+    defaultMessage: 'Help us to translate Ferdi into your language.',
   },
   spellCheckerLanguageInfo: {
     id: 'settings.app.spellCheckerLanguageInfo',
-    defaultMessage: '!!!Ferdi uses your Mac\'s build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac\'s System Preferences.',
+    defaultMessage:
+      "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   },
   subheadlineCache: {
     id: 'settings.app.subheadlineCache',
-    defaultMessage: '!!!Cache',
+    defaultMessage: 'Cache',
   },
   cacheInfo: {
     id: 'settings.app.cacheInfo',
-    defaultMessage: '!!!Ferdi cache is currently using {size} of disk space.',
+    defaultMessage: 'Ferdi cache is currently using {size} of disk space.',
   },
   cacheNotCleared: {
     id: 'settings.app.cacheNotCleared',
-    defaultMessage: '!!!Couldn\'t clear all cache',
+    defaultMessage: "Couldn't clear all cache",
   },
   buttonClearAllCache: {
     id: 'settings.app.buttonClearAllCache',
-    defaultMessage: '!!!Clear cache',
+    defaultMessage: 'Clear cache',
   },
   subheadlineFerdiProfile: {
     id: 'settings.app.subheadlineFerdiProfile',
-    defaultMessage: '!!!Ferdi Profile',
+    defaultMessage: 'Ferdi Profile',
   },
   buttonOpenFerdiProfileFolder: {
     id: 'settings.app.buttonOpenFerdiProfileFolder',
-    defaultMessage: '!!!Open Profile folder',
+    defaultMessage: 'Open Profile folder',
   },
   buttonOpenFerdiServiceRecipesFolder: {
     id: 'settings.app.buttonOpenFerdiServiceRecipesFolder',
-    defaultMessage: '!!!Open Service Recipes folder',
+    defaultMessage: 'Open Service Recipes folder',
   },
   buttonSearchForUpdate: {
     id: 'settings.app.buttonSearchForUpdate',
-    defaultMessage: '!!!Check for updates',
+    defaultMessage: 'Check for updates',
   },
   buttonInstallUpdate: {
     id: 'settings.app.buttonInstallUpdate',
-    defaultMessage: '!!!Restart & install update',
+    defaultMessage: 'Restart & install update',
   },
   updateStatusSearching: {
     id: 'settings.app.updateStatusSearching',
-    defaultMessage: '!!!Is searching for update',
+    defaultMessage: 'Is searching for update',
   },
   updateStatusAvailable: {
     id: 'settings.app.updateStatusAvailable',
-    defaultMessage: '!!!Update available, downloading...',
+    defaultMessage: 'Update available, downloading...',
   },
   updateStatusUpToDate: {
     id: 'settings.app.updateStatusUpToDate',
-    defaultMessage: '!!!You are using the latest version of Ferdi',
+    defaultMessage: 'You are using the latest version of Ferdi',
   },
   currentVersion: {
     id: 'settings.app.currentVersion',
-    defaultMessage: '!!!Current version:',
+    defaultMessage: 'Current version:',
   },
   appRestartRequired: {
     id: 'settings.app.restartRequired',
-    defaultMessage: '!!!Changes require restart',
+    defaultMessage: 'Changes require restart',
   },
   languageDisclaimer: {
     id: 'settings.app.languageDisclaimer',
-    defaultMessage: '!!!Official translations are English & German. All other languages are community based translations.',
+    defaultMessage:
+      'Official translations are English & German. All other languages are community based translations.',
   },
 });
 
-const Hr = () => (
-  <hr style={{ marginBottom: 20 }} />
-);
+const Hr = () => <hr style={{ marginBottom: 20 }} />;
 
-export default @observer class EditSettingsForm extends Component {
+@observer
+class EditSettingsForm extends Component {
   static propTypes = {
     checkForUpdates: PropTypes.func.isRequired,
     installUpdate: PropTypes.func.isRequired,
@@ -184,14 +203,10 @@ export default @observer class EditSettingsForm extends Component {
     isOnline: PropTypes.bool.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     activeSetttingsTab: 'general',
     clearCacheButtonClicked: false,
-  }
+  };
 
   setActiveSettingsTab(tab) {
     this.setState({
@@ -199,14 +214,14 @@ export default @observer class EditSettingsForm extends Component {
     });
   }
 
-  onClearCacheClicked=() => {
+  onClearCacheClicked = () => {
     this.setState({ clearCacheButtonClicked: true });
-  }
+  };
 
   submit(e) {
     e.preventDefault();
     this.props.form.submit({
-      onSuccess: (form) => {
+      onSuccess: form => {
         const values = form.values();
         this.props.onSubmit(values);
       },
@@ -236,7 +251,7 @@ export default @observer class EditSettingsForm extends Component {
       hasAddedTodosAsService,
       isOnline,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     let updateButtonLabelMessage = messages.buttonSearchForUpdate;
     if (isCheckingForUpdates) {
@@ -247,10 +262,8 @@ export default @observer class EditSettingsForm extends Component {
       updateButtonLabelMessage = messages.buttonSearchForUpdate;
     }
 
-    const {
-      lockingFeatureEnabled,
-      scheduledDNDEnabled,
-    } = window.ferdi.stores.settings.all.app;
+    const { lockingFeatureEnabled, scheduledDNDEnabled } =
+      window.ferdi.stores.settings.all.app;
 
     let cacheSize;
     let notCleared;
@@ -258,7 +271,10 @@ export default @observer class EditSettingsForm extends Component {
       const cacheSizeBytes = getCacheSize();
       if (typeof cacheSizeBytes === 'number') {
         cacheSize = prettyBytes(cacheSizeBytes);
-        notCleared = this.state.clearCacheButtonClicked && isClearingAllCache === false && cacheSizeBytes !== 0;
+        notCleared =
+          this.state.clearCacheButtonClicked &&
+          isClearingAllCache === false &&
+          cacheSizeBytes !== 0;
       } else {
         cacheSize = '…';
         notCleared = false;
@@ -275,58 +291,94 @@ export default @observer class EditSettingsForm extends Component {
         </div>
         <div className="settings__body">
           <form
-            onSubmit={(e) => this.submit(e)}
-            onChange={(e) => this.submit(e)}
+            onSubmit={e => this.submit(e)}
+            onChange={e => this.submit(e)}
             id="form"
           >
             {/* Titles */}
             <div className="recipes__navigation">
               <h2
                 id="general"
-                className={this.state.activeSetttingsTab === 'general' ? 'badge badge--primary' : 'badge'}
-                onClick={() => { this.setActiveSettingsTab('general'); }}
+                className={
+                  this.state.activeSetttingsTab === 'general'
+                    ? 'badge badge--primary'
+                    : 'badge'
+                }
+                onClick={() => {
+                  this.setActiveSettingsTab('general');
+                }}
               >
                 {intl.formatMessage(messages.headlineGeneral)}
               </h2>
               <h2
                 id="appearance"
-                className={this.state.activeSetttingsTab === 'appearance' ? 'badge badge--primary' : 'badge'}
-                onClick={() => { this.setActiveSettingsTab('appearance'); }}
+                className={
+                  this.state.activeSetttingsTab === 'appearance'
+                    ? 'badge badge--primary'
+                    : 'badge'
+                }
+                onClick={() => {
+                  this.setActiveSettingsTab('appearance');
+                }}
               >
                 {intl.formatMessage(messages.headlineAppearance)}
               </h2>
               <h2
                 id="privacy"
-                className={this.state.activeSetttingsTab === 'privacy' ? 'badge badge--primary' : 'badge'}
-                onClick={() => { this.setActiveSettingsTab('privacy'); }}
+                className={
+                  this.state.activeSetttingsTab === 'privacy'
+                    ? 'badge badge--primary'
+                    : 'badge'
+                }
+                onClick={() => {
+                  this.setActiveSettingsTab('privacy');
+                }}
               >
                 {intl.formatMessage(messages.headlinePrivacy)}
               </h2>
               <h2
                 id="language"
-                className={this.state.activeSetttingsTab === 'language' ? 'badge badge--primary' : 'badge'}
-                onClick={() => { this.setActiveSettingsTab('language'); }}
+                className={
+                  this.state.activeSetttingsTab === 'language'
+                    ? 'badge badge--primary'
+                    : 'badge'
+                }
+                onClick={() => {
+                  this.setActiveSettingsTab('language');
+                }}
               >
                 {intl.formatMessage(messages.headlineLanguage)}
               </h2>
               <h2
                 id="advanced"
-                className={this.state.activeSetttingsTab === 'advanced' ? 'badge badge--primary' : 'badge'}
-                onClick={() => { this.setActiveSettingsTab('advanced'); }}
+                className={
+                  this.state.activeSetttingsTab === 'advanced'
+                    ? 'badge badge--primary'
+                    : 'badge'
+                }
+                onClick={() => {
+                  this.setActiveSettingsTab('advanced');
+                }}
               >
                 {intl.formatMessage(messages.headlineAdvanced)}
               </h2>
               <h2
                 id="updates"
-                className={this.state.activeSetttingsTab === 'updates' ? 'badge badge--primary' : 'badge'}
-                onClick={() => { this.setActiveSettingsTab('updates'); }}
+                className={
+                  this.state.activeSetttingsTab === 'updates'
+                    ? 'badge badge--primary'
+                    : 'badge'
+                }
+                onClick={() => {
+                  this.setActiveSettingsTab('updates');
+                }}
               >
                 {intl.formatMessage(messages.headlineUpdates)}
               </h2>
             </div>
 
             {/* General */}
-            { this.state.activeSetttingsTab === 'general' && (
+            {this.state.activeSetttingsTab === 'general' && (
               <div>
                 <Toggle field={form.$('autoLaunchOnStart')} />
                 <Toggle field={form.$('runInBackground')} />
@@ -334,12 +386,8 @@ export default @observer class EditSettingsForm extends Component {
                 <Toggle field={form.$('enableSystemTray')} />
                 <Toggle field={form.$('reloadAfterResume')} />
                 <Toggle field={form.$('startMinimized')} />
-                {isWindows && (
-                  <Toggle field={form.$('minimizeToSystemTray')} />
-                )}
-                {isWindows && (
-                  <Toggle field={form.$('closeToSystemTray')} />
-                )}
+                {isWindows && <Toggle field={form.$('minimizeToSystemTray')} />}
+                {isWindows && <Toggle field={form.$('closeToSystemTray')} />}
                 <Select field={form.$('navigationBarBehaviour')} />
 
                 <Hr />
@@ -349,12 +397,13 @@ export default @observer class EditSettingsForm extends Component {
                 <p
                   className="settings__message"
                   style={{
-                    borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
+                    borderTop: 0,
+                    marginTop: 0,
+                    paddingTop: 0,
+                    marginBottom: '2rem',
                   }}
                 >
-                  <span>
-                    { intl.formatMessage(messages.hibernateInfo) }
-                  </span>
+                  <span>{intl.formatMessage(messages.hibernateInfo)}</span>
                 </p>
 
                 <Select field={form.$('wakeUpStrategy')} />
@@ -374,20 +423,24 @@ export default @observer class EditSettingsForm extends Component {
                     {isTodosActivated && (
                       <div>
                         <Select field={form.$('predefinedTodoServer')} />
-                        {form.$('predefinedTodoServer').value === 'isUsingCustomTodoService' && (
+                        {form.$('predefinedTodoServer').value ===
+                          'isUsingCustomTodoService' && (
                           <div>
                             <Input
                               placeholder="Todo Server"
-                              onChange={(e) => this.submit(e)}
+                              onChange={e => this.submit(e)}
                               field={form.$('customTodoServer')}
                             />
                             <p
                               className="settings__message"
                               style={{
-                                borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
+                                borderTop: 0,
+                                marginTop: 0,
+                                paddingTop: 0,
+                                marginBottom: '2rem',
                               }}
                             >
-                              { intl.formatMessage(messages.todoServerInfo) }
+                              {intl.formatMessage(messages.todoServerInfo)}
                             </p>
                           </div>
                         )}
@@ -400,56 +453,58 @@ export default @observer class EditSettingsForm extends Component {
                 <Toggle field={form.$('scheduledDNDEnabled')} />
                 {scheduledDNDEnabled && (
                   <>
-                    <div style={{
-                      display: 'flex',
-                      justifyContent: 'center',
-                    }}
-                    >
-                      <div style={{
-                        padding: '0 1rem',
-                        width: '100%',
+                    <div
+                      style={{
+                        display: 'flex',
+                        justifyContent: 'center',
                       }}
+                    >
+                      <div
+                        style={{
+                          padding: '0 1rem',
+                          width: '100%',
+                        }}
                       >
                         <Input
                           placeholder="17:00"
-                          onChange={(e) => this.submit(e)}
+                          onChange={e => this.submit(e)}
                           field={form.$('scheduledDNDStart')}
                           type="time"
                         />
                       </div>
-                      <div style={{
-                        padding: '0 1rem',
-                        width: '100%',
-                      }}
+                      <div
+                        style={{
+                          padding: '0 1rem',
+                          width: '100%',
+                        }}
                       >
                         <Input
                           placeholder="09:00"
-                          onChange={(e) => this.submit(e)}
+                          onChange={e => this.submit(e)}
                           field={form.$('scheduledDNDEnd')}
                           type="time"
                         />
                       </div>
                     </div>
-                    <p>
-                      { intl.formatMessage(messages.scheduledDNDTimeInfo) }
-                    </p>
+                    <p>{intl.formatMessage(messages.scheduledDNDTimeInfo)}</p>
                   </>
                 )}
                 <p
                   className="settings__message"
                   style={{
-                    borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
+                    borderTop: 0,
+                    marginTop: 0,
+                    paddingTop: 0,
+                    marginBottom: '2rem',
                   }}
                 >
-                  <span>
-                    { intl.formatMessage(messages.scheduledDNDInfo) }
-                  </span>
+                  <span>{intl.formatMessage(messages.scheduledDNDInfo)}</span>
                 </p>
               </div>
             )}
 
             {/* Appearance */}
-            { this.state.activeSetttingsTab === 'appearance' && (
+            {this.state.activeSetttingsTab === 'appearance' && (
               <div>
                 <Toggle field={form.$('showDisabledServices')} />
                 <Toggle field={form.$('showMessageBadgeWhenMuted')} />
@@ -459,21 +514,26 @@ export default @observer class EditSettingsForm extends Component {
                 <Hr />
 
                 <Toggle field={form.$('adaptableDarkMode')} />
-                {!isAdaptableDarkModeEnabled && <Toggle field={form.$('darkMode')} />}
+                {!isAdaptableDarkModeEnabled && (
+                  <Toggle field={form.$('darkMode')} />
+                )}
                 {(isDarkmodeEnabled || isAdaptableDarkModeEnabled) && (
-                <>
-                  <Toggle field={form.$('universalDarkMode')} />
-                  <p
-                    className="settings__message"
-                    style={{
-                      borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
-                    }}
-                  >
-                    <span>
-                      { intl.formatMessage(messages.universalDarkModeInfo) }
-                    </span>
-                  </p>
-                </>
+                  <>
+                    <Toggle field={form.$('universalDarkMode')} />
+                    <p
+                      className="settings__message"
+                      style={{
+                        borderTop: 0,
+                        marginTop: 0,
+                        paddingTop: 0,
+                        marginBottom: '2rem',
+                      }}
+                    >
+                      <span>
+                        {intl.formatMessage(messages.universalDarkModeInfo)}
+                      </span>
+                    </p>
+                  </>
                 )}
 
                 <Hr />
@@ -491,23 +551,25 @@ export default @observer class EditSettingsForm extends Component {
 
                 <Input
                   placeholder="Accent Color"
-                  onChange={(e) => this.submit(e)}
+                  onChange={e => this.submit(e)}
                   field={form.$('accentColor')}
                 />
                 <p>
-                  {intl.formatMessage(messages.accentColorInfo,
-                    { defaultAccentColor: DEFAULT_APP_SETTINGS.accentColor })}
+                  {intl.formatMessage(messages.accentColorInfo, {
+                    defaultAccentColor: DEFAULT_APP_SETTINGS.accentColor,
+                  })}
                 </p>
               </div>
             )}
 
             {/* Privacy */}
-            { this.state.activeSetttingsTab === 'privacy' && (
+            {this.state.activeSetttingsTab === 'privacy' && (
               <div>
                 <Toggle field={form.$('privateNotifications')} />
                 <Toggle field={form.$('clipboardNotifications')} />
                 {(isWindows || isMac) && (
-                  <Toggle field={form.$('notifyTaskBarOnMessage')} />)}
+                  <Toggle field={form.$('notifyTaskBarOnMessage')} />
+                )}
 
                 <Hr />
 
@@ -516,8 +578,12 @@ export default @observer class EditSettingsForm extends Component {
                 <Hr />
 
                 <Toggle field={form.$('sentry')} />
-                <p className="settings__help">{intl.formatMessage(messages.sentryInfo)}</p>
-                <p className="settings__help">{intl.formatMessage(messages.appRestartRequired)}</p>
+                <p className="settings__help">
+                  {intl.formatMessage(messages.sentryInfo)}
+                </p>
+                <p className="settings__help">
+                  {intl.formatMessage(messages.appRestartRequired)}
+                </p>
 
                 <Hr />
 
@@ -530,57 +596,60 @@ export default @observer class EditSettingsForm extends Component {
 
                     <Input
                       placeholder={intl.formatMessage(messages.lockedPassword)}
-                      onChange={(e) => this.submit(e)}
+                      onChange={e => this.submit(e)}
                       field={form.$('lockedPassword')}
                       type="password"
                       scorePassword
                       showPasswordToggle
                     />
-                    <p>
-                      { intl.formatMessage(messages.lockedPasswordInfo) }
-                    </p>
+                    <p>{intl.formatMessage(messages.lockedPasswordInfo)}</p>
 
                     <Input
                       placeholder="Lock after inactivity"
-                      onChange={(e) => this.submit(e)}
+                      onChange={e => this.submit(e)}
                       field={form.$('inactivityLock')}
                       autoFocus
                     />
-                    <p>
-                      { intl.formatMessage(messages.inactivityLockInfo) }
-                    </p>
+                    <p>{intl.formatMessage(messages.inactivityLockInfo)}</p>
                   </>
                 )}
                 <p
                   className="settings__message"
                   style={{
-                    borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
+                    borderTop: 0,
+                    marginTop: 0,
+                    paddingTop: 0,
+                    marginBottom: '2rem',
                   }}
                 >
                   <span>
-                    { intl.formatMessage(messages.lockInfo, { lockShortcut: `${lockFerdiShortcutKey(false)}` }) }
+                    {intl.formatMessage(messages.lockInfo, {
+                      lockShortcut: `${lockFerdiShortcutKey(false)}`,
+                    })}
                   </span>
                 </p>
               </div>
             )}
 
             {/* Language */}
-            { this.state.activeSetttingsTab === 'language' && (
+            {this.state.activeSetttingsTab === 'language' && (
               <div>
                 <Select field={form.$('locale')} showLabel={false} />
 
                 <Hr />
 
-                <Toggle
-                  field={form.$('enableSpellchecking')}
-                />
+                <Toggle field={form.$('enableSpellchecking')} />
                 {!isMac && form.$('enableSpellchecking').value && (
                   <Select field={form.$('spellcheckerLanguage')} />
                 )}
                 {isMac && form.$('enableSpellchecking').value && (
-                  <p className="settings__help">{intl.formatMessage(messages.spellCheckerLanguageInfo)}</p>
+                  <p className="settings__help">
+                    {intl.formatMessage(messages.spellCheckerLanguageInfo)}
+                  </p>
                 )}
-                <p className="settings__help">{intl.formatMessage(messages.appRestartRequired)}</p>
+                <p className="settings__help">
+                  {intl.formatMessage(messages.appRestartRequired)}
+                </p>
 
                 <Hr />
 
@@ -590,52 +659,54 @@ export default @observer class EditSettingsForm extends Component {
                   className="link"
                   rel="noreferrer"
                 >
-                  {intl.formatMessage(messages.translationHelp)}
-                  {' '}
+                  {intl.formatMessage(messages.translationHelp)}{' '}
                   <i className="mdi mdi-open-in-new" />
                 </a>
               </div>
             )}
 
             {/* Advanced */}
-            { this.state.activeSetttingsTab === 'advanced' && (
+            {this.state.activeSetttingsTab === 'advanced' && (
               <div>
                 <Toggle field={form.$('enableGPUAcceleration')} />
-                <p className="settings__help indented__help">{intl.formatMessage(messages.appRestartRequired)}</p>
+                <p className="settings__help indented__help">
+                  {intl.formatMessage(messages.appRestartRequired)}
+                </p>
 
                 <Hr />
 
                 <Input
                   placeholder="User Agent"
-                  onChange={(e) => this.submit(e)}
+                  onChange={e => this.submit(e)}
                   field={form.$('userAgentPref')}
                 />
-                <p className="settings__help">{intl.formatMessage(globalMessages.userAgentHelp)}</p>
-                <p className="settings__help">{intl.formatMessage(messages.appRestartRequired)}</p>
+                <p className="settings__help">
+                  {intl.formatMessage(globalMessages.userAgentHelp)}
+                </p>
+                <p className="settings__help">
+                  {intl.formatMessage(messages.appRestartRequired)}
+                </p>
 
                 <Hr />
 
                 <div className="settings__settings-group">
-                  <h3>
-                    {intl.formatMessage(messages.subheadlineCache)}
-                  </h3>
+                  <h3>{intl.formatMessage(messages.subheadlineCache)}</h3>
                   <p>
                     {intl.formatMessage(messages.cacheInfo, {
                       size: cacheSize,
                     })}
                   </p>
-                  {
-                    notCleared && (
-                      <p>
-                        {intl.formatMessage(messages.cacheNotCleared)}
-                      </p>
-                    )
-                  }
+                  {notCleared && (
+                    <p>{intl.formatMessage(messages.cacheNotCleared)}</p>
+                  )}
                   <p>
                     <Button
                       buttonType="secondary"
                       label={intl.formatMessage(messages.buttonClearAllCache)}
-                      onClick={() => { onClearAllCache(); this.onClearCacheClicked(); }}
+                      onClick={() => {
+                        onClearAllCache();
+                        this.onClearCacheClicked();
+                      }}
                       disabled={isClearingAllCache}
                       loaded={!isClearingAllCache}
                     />
@@ -652,13 +723,17 @@ export default @observer class EditSettingsForm extends Component {
                     <div className="settings__open-settings-file-container">
                       <Button
                         buttonType="secondary"
-                        label={intl.formatMessage(messages.buttonOpenFerdiProfileFolder)}
+                        label={intl.formatMessage(
+                          messages.buttonOpenFerdiProfileFolder,
+                        )}
                         className="settings__open-settings-file-button"
                         onClick={() => openPath(profileFolder)}
                       />
                       <Button
                         buttonType="secondary"
-                        label={intl.formatMessage(messages.buttonOpenFerdiServiceRecipesFolder)}
+                        label={intl.formatMessage(
+                          messages.buttonOpenFerdiServiceRecipesFolder,
+                        )}
                         className="settings__open-settings-file-button"
                         onClick={() => openPath(recipeFolder)}
                       />
@@ -669,66 +744,78 @@ export default @observer class EditSettingsForm extends Component {
             )}
 
             {/* Updates */}
-            { this.state.activeSetttingsTab === 'updates' && (
-            <div>
-              <Toggle field={form.$('automaticUpdates')} />
-              {automaticUpdates && (
+            {this.state.activeSetttingsTab === 'updates' && (
               <div>
-                <Toggle field={form.$('beta')} />
-                <ToggleRaw
-                  field={{
-                    value: isNightlyEnabled,
-                    id: 'nightly',
-                    label: 'Include nightly versions',
-                    name: 'Nightly builds',
-                  }}
-                  onChange={window.ferdi.features.nightlyBuilds.toggleFeature}
-                />
-                {updateIsReadyToInstall ? (
-                  <Button
-                    label={intl.formatMessage(messages.buttonInstallUpdate)}
-                    onClick={installUpdate}
-                  />
-                ) : (
-                  <Button
-                    buttonType="secondary"
-                    label={intl.formatMessage(updateButtonLabelMessage)}
-                    onClick={checkForUpdates}
-                    disabled={!automaticUpdates || isCheckingForUpdates || isUpdateAvailable || !isOnline}
-                    loaded={!isCheckingForUpdates || !isUpdateAvailable}
-                  />
+                <Toggle field={form.$('automaticUpdates')} />
+                {automaticUpdates && (
+                  <div>
+                    <Toggle field={form.$('beta')} />
+                    <ToggleRaw
+                      field={{
+                        value: isNightlyEnabled,
+                        id: 'nightly',
+                        label: 'Include nightly versions',
+                        name: 'Nightly builds',
+                      }}
+                      onChange={
+                        window.ferdi.features.nightlyBuilds.toggleFeature
+                      }
+                    />
+                    {updateIsReadyToInstall ? (
+                      <Button
+                        label={intl.formatMessage(messages.buttonInstallUpdate)}
+                        onClick={installUpdate}
+                      />
+                    ) : (
+                      <Button
+                        buttonType="secondary"
+                        label={intl.formatMessage(updateButtonLabelMessage)}
+                        onClick={checkForUpdates}
+                        disabled={
+                          !automaticUpdates ||
+                          isCheckingForUpdates ||
+                          isUpdateAvailable ||
+                          !isOnline
+                        }
+                        loaded={!isCheckingForUpdates || !isUpdateAvailable}
+                      />
+                    )}
+                    <br />
+                  </div>
+                )}
+                {intl.formatMessage(messages.currentVersion)} {ferdiVersion}
+                {noUpdateAvailable && (
+                  <>
+                    <br />
+                    <br />
+                    {intl.formatMessage(messages.updateStatusUpToDate)}
+                  </>
                 )}
-                <br />
+                <p className="settings__message">
+                  <span className="mdi mdi-github-face" />
+                  <span>
+                    Ferdi is based on{' '}
+                    <a
+                      href={`${GITHUB_FRANZ_URL}/franz`}
+                      target="_blank"
+                      rel="noreferrer"
+                    >
+                      Franz
+                    </a>
+                    , a project published under the{' '}
+                    <a
+                      href={`${GITHUB_FRANZ_URL}/franz/blob/master/LICENSE`}
+                      target="_blank"
+                      rel="noreferrer"
+                    >
+                      Apache-2.0 License
+                    </a>
+                  </span>
+                  <br />
+                  <span className="mdi mdi-information" />
+                  {intl.formatMessage(messages.languageDisclaimer)}
+                </p>
               </div>
-              )}
-              {intl.formatMessage(messages.currentVersion)}
-              {' '}
-              {ferdiVersion}
-              {noUpdateAvailable && (
-              <>
-                <br />
-                <br />
-                {intl.formatMessage(messages.updateStatusUpToDate)}
-              </>
-              )}
-              <p className="settings__message">
-                <span className="mdi mdi-github-face" />
-                <span>
-
-                  Ferdi is based on
-                  {' '}
-                  <a href={`${GITHUB_FRANZ_URL}/franz`} target="_blank" rel="noreferrer">Franz</a>
-
-                  , a project published
-                  under the
-                  {' '}
-                  <a href={`${GITHUB_FRANZ_URL}/franz/blob/master/LICENSE`} target="_blank" rel="noreferrer">Apache-2.0 License</a>
-                </span>
-                <br />
-                <span className="mdi mdi-information" />
-                {intl.formatMessage(messages.languageDisclaimer)}
-              </p>
-            </div>
             )}
           </form>
         </div>
@@ -736,3 +823,5 @@ export default @observer class EditSettingsForm extends Component {
     );
   }
 }
+
+export default injectIntl(EditSettingsForm);
diff --git a/src/components/settings/supportFerdi/SupportFerdiDashboard.js b/src/components/settings/supportFerdi/SupportFerdiDashboard.js
index b84e06739..c4d4bd72f 100644
--- a/src/components/settings/supportFerdi/SupportFerdiDashboard.js
+++ b/src/components/settings/supportFerdi/SupportFerdiDashboard.js
@@ -1,76 +1,77 @@
 import React, { Component } from 'react';
-import { defineMessages, FormattedHTMLMessage, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { BrowserWindow } from '@electron/remote';
 import InfoBar from '../../ui/InfoBar';
 
 const messages = defineMessages({
   headline: {
     id: 'settings.supportFerdi.headline',
-    defaultMessage: '!!!About Ferdi',
+    defaultMessage: 'About Ferdi',
   },
   title: {
     id: 'settings.supportFerdi.title',
-    defaultMessage: '!!!Do you like Ferdi?',
+    defaultMessage: 'Do you like Ferdi?',
   },
   aboutIntro: {
     id: 'settings.supportFerdi.aboutIntro',
-    defaultMessage: '!!!<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>',
+    defaultMessage:
+      '<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>',
   },
   textListContributors: {
     id: 'settings.supportFerdi.textListContributors',
-    defaultMessage: '!!!Full list of contributor',
+    defaultMessage: 'Full list of contributor',
   },
   textListContributorsHere: {
     id: 'settings.supportFerdi.textListContributorsHere',
-    defaultMessage: '!!!here',
+    defaultMessage: 'here',
   },
   textVolunteers: {
     id: 'settings.supportFerdi.textVolunteers',
-    defaultMessage: '!!!The development of Ferdi is done by volunteers. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.',
+    defaultMessage:
+      'The development of Ferdi is done by volunteers. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.',
   },
   textSupportWelcome: {
     id: 'settings.supportFerdi.textSupportWelcome',
-    defaultMessage: '!!!Support is always welcome. You can find a list of the help we need',
+    defaultMessage:
+      'Support is always welcome. You can find a list of the help we need',
   },
   textSupportWelcomeHere: {
     id: 'settings.supportFerdi.textSupportWelcomeHere',
-    defaultMessage: '!!!here',
+    defaultMessage: 'here',
   },
   textExpenses: {
     id: 'settings.supportFerdi.textExpenses',
-    defaultMessage: '!!!While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our',
+    defaultMessage:
+      'While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our',
   },
   textOpenCollective: {
     id: 'settings.supportFerdi.textOpenCollective',
-    defaultMessage: '!!!Open Collective',
+    defaultMessage: 'Open Collective',
   },
   textDonation: {
     id: 'settings.supportFerdi.textDonation',
-    defaultMessage: '!!!If you feel like supporting Ferdi development with a donation, you can do so on both,',
+    defaultMessage:
+      'If you feel like supporting Ferdi development with a donation, you can do so on both,',
   },
   textDonationAnd: {
     id: 'settings.supportFerdi.textDonationAnd',
-    defaultMessage: '!!!and',
+    defaultMessage: 'and',
   },
   textGitHubSponsors: {
     id: 'settings.supportFerdi.textGitHubSponsors',
-    defaultMessage: '!!!GitHub Sponsors',
+    defaultMessage: 'GitHub Sponsors',
   },
   openSurvey: {
     id: 'settings.supportFerdi.openSurvey',
-    defaultMessage: '!!!Open Survey',
+    defaultMessage: 'Open Survey',
   },
   bannerText: {
     id: 'settings.supportFerdi.bannerText',
-    defaultMessage: '!!!Do you want to help us improve Ferdi?',
+    defaultMessage: 'Do you want to help us improve Ferdi?',
   },
 });
 
 class SupportFerdiDashboard extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   openSurveyWindow() {
     let win = new BrowserWindow({ width: 670, height: 400 });
     win.on('closed', () => {
@@ -81,7 +82,9 @@ class SupportFerdiDashboard extends Component {
   }
 
   render() {
-    const { intl } = this.context;
+    const { intl } = this.props;
+
+    const aboutIntro = intl.formatMessage(messages.aboutIntro);
 
     return (
       <div className="settings__main">
@@ -94,22 +97,67 @@ class SupportFerdiDashboard extends Component {
           <h1>{intl.formatMessage(messages.title)}</h1>
           <div>
             <p className="settings__support-badges">
-              <a href="https://github.com/getferdi/ferdi" target="_blank" rel="noreferrer"><img alt="GitHub Stars" src="https://img.shields.io/github/stars/getferdi/ferdi?style=social" /></a>
-              <a href="https://twitter.com/getferdi/" target="_blank" rel="noreferrer"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/getferdi?label=Follow&style=social" /></a>
-              <a href="https://opencollective.com/getferdi#section-contributors" target="_blank" rel="noreferrer"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective" /></a>
-              <a href="https://opencollective.com/getferdi#section-contributors" target="_blank" rel="noreferrer"><img alt="Open Collective sponsors" src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective" /></a>
+              <a
+                href="https://github.com/getferdi/ferdi"
+                target="_blank"
+                rel="noreferrer"
+              >
+                <img
+                  alt="GitHub Stars"
+                  src="https://img.shields.io/github/stars/getferdi/ferdi?style=social"
+                />
+              </a>
+              <a
+                href="https://twitter.com/getferdi/"
+                target="_blank"
+                rel="noreferrer"
+              >
+                <img
+                  alt="Twitter Follow"
+                  src="https://img.shields.io/twitter/follow/getferdi?label=Follow&style=social"
+                />
+              </a>
+              <a
+                href="https://opencollective.com/getferdi#section-contributors"
+                target="_blank"
+                rel="noreferrer"
+              >
+                <img
+                  alt="Open Collective backers"
+                  src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective"
+                />
+              </a>
+              <a
+                href="https://opencollective.com/getferdi#section-contributors"
+                target="_blank"
+                rel="noreferrer"
+              >
+                <img
+                  alt="Open Collective sponsors"
+                  src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective"
+                />
+              </a>
             </p>
-            <FormattedHTMLMessage {...messages.aboutIntro} />
+            <span dangerouslySetInnerHTML={{ __html: aboutIntro }} />
             <br />
             <br />
             <p>
               <a href="#contributors-via-opencollective">
-                <img alt="GitHub contributors (non-exhaustive)" width="100%" src="https://opencollective.com/getferdi/contributors.svg?width=642&button=false" />
+                <img
+                  alt="GitHub contributors (non-exhaustive)"
+                  width="100%"
+                  src="https://opencollective.com/getferdi/contributors.svg?width=642&button=false"
+                />
               </a>
             </p>
             <p>
               {intl.formatMessage(messages.textListContributors)}
-              <a href="https://github.com/getferdi/ferdi#contributors-" target="_blank" className="link" rel="noreferrer">
+              <a
+                href="https://github.com/getferdi/ferdi#contributors-"
+                target="_blank"
+                className="link"
+                rel="noreferrer"
+              >
                 {' '}
                 {intl.formatMessage(messages.textListContributorsHere)}
                 <i className="mdi mdi-open-in-new" />
@@ -117,12 +165,15 @@ class SupportFerdiDashboard extends Component {
               <br />
               <br />
             </p>
-            <p>
-              {intl.formatMessage(messages.textVolunteers)}
-            </p>
+            <p>{intl.formatMessage(messages.textVolunteers)}</p>
             <p>
               {intl.formatMessage(messages.textSupportWelcome)}
-              <a href="https://help.getferdi.com/general/support" target="_blank" className="link" rel="noreferrer">
+              <a
+                href="https://help.getferdi.com/general/support"
+                target="_blank"
+                className="link"
+                rel="noreferrer"
+              >
                 {' '}
                 {intl.formatMessage(messages.textSupportWelcomeHere)}
                 <i className="mdi mdi-open-in-new" />
@@ -130,7 +181,12 @@ class SupportFerdiDashboard extends Component {
             </p>
             <p>
               {intl.formatMessage(messages.textExpenses)}
-              <a href="https://opencollective.com/getferdi#section-budget" target="_blank" className="link" rel="noreferrer">
+              <a
+                href="https://opencollective.com/getferdi#section-budget"
+                target="_blank"
+                className="link"
+                rel="noreferrer"
+              >
                 {' '}
                 {intl.formatMessage(messages.textOpenCollective)}
                 <i className="mdi mdi-open-in-new" />
@@ -138,14 +194,23 @@ class SupportFerdiDashboard extends Component {
             </p>
             <p>
               {intl.formatMessage(messages.textDonation)}
-              <a href="https://opencollective.com/getferdi#section-contribute" target="_blank" className="link" rel="noreferrer">
+              <a
+                href="https://opencollective.com/getferdi#section-contribute"
+                target="_blank"
+                className="link"
+                rel="noreferrer"
+              >
                 {' '}
                 {intl.formatMessage(messages.textOpenCollective)}
                 <i className="mdi mdi-open-in-new" />
-              </a>
-              {' '}
+              </a>{' '}
               {intl.formatMessage(messages.textDonationAnd)}
-              <a href="https://github.com/sponsors/getferdi" target="_blank" className="link" rel="noreferrer">
+              <a
+                href="https://github.com/sponsors/getferdi"
+                target="_blank"
+                className="link"
+                rel="noreferrer"
+              >
                 {' '}
                 {intl.formatMessage(messages.textGitHubSponsors)}
                 <i className="mdi mdi-open-in-new" />
@@ -166,4 +231,4 @@ class SupportFerdiDashboard extends Component {
   }
 }
 
-export default SupportFerdiDashboard;
+export default injectIntl(SupportFerdiDashboard);
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js
index 437225058..176365fa8 100644
--- a/src/components/settings/team/TeamDashboard.js
+++ b/src/components/settings/team/TeamDashboard.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import ReactTooltip from 'react-tooltip';
 import injectSheet from 'react-jss';
 import classnames from 'classnames';
@@ -14,31 +14,34 @@ import { LIVE_FRANZ_API } from '../../../config';
 const messages = defineMessages({
   headline: {
     id: 'settings.team.headline',
-    defaultMessage: '!!!Team',
+    defaultMessage: 'Team',
   },
   contentHeadline: {
     id: 'settings.team.contentHeadline',
-    defaultMessage: '!!!Franz Team Management',
+    defaultMessage: 'Franz Team Management',
   },
   intro: {
     id: 'settings.team.intro',
-    defaultMessage: '!!!Your are currently using Franz Servers, which is why you have access to Team Management.',
+    defaultMessage:
+      'Your are currently using Franz Servers, which is why you have access to Team Management.',
   },
   copy: {
     id: 'settings.team.copy',
-    defaultMessage: '!!!Franz\'s Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don\'t loose any functionality in managing your account.',
+    defaultMessage:
+      "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   },
   manageButton: {
     id: 'settings.team.manageAction',
-    defaultMessage: '!!!Manage your Team on meetfranz.com',
+    defaultMessage: 'Manage your Team on meetfranz.com',
   },
   teamsUnavailable: {
     id: 'settings.team.teamsUnavailable',
-    defaultMessage: '!!!Teams are unavailable',
+    defaultMessage: 'Teams are unavailable',
   },
   teamsUnavailableInfo: {
     id: 'settings.team.teamsUnavailableInfo',
-    defaultMessage: '!!!Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.',
+    defaultMessage:
+      'Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.',
   },
 });
 
@@ -87,7 +90,9 @@ const styles = {
   },
 };
 
-export default @injectSheet(styles) @observer class TeamDashboard extends Component {
+@injectSheet(styles)
+@observer
+class TeamDashboard extends Component {
   static propTypes = {
     isLoading: PropTypes.bool.isRequired,
     userInfoRequestFailed: PropTypes.bool.isRequired,
@@ -97,10 +102,6 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
     server: PropTypes.string.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       isLoading,
@@ -110,7 +111,7 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
       classes,
       server,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     if (server === LIVE_FRANZ_API) {
       return (
@@ -121,9 +122,7 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
             </span>
           </div>
           <div className="settings__body">
-            {isLoading && (
-              <Loader />
-            )}
+            {isLoading && <Loader />}
 
             {!isLoading && userInfoRequestFailed && (
               <Infobox
@@ -142,20 +141,24 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
                 {!isLoading && (
                   <>
                     <>
-                      <h1 className={classnames({
-                        [classes.headline]: true,
-                        [classes.headlineWithSpacing]: true,
-                      })}
+                      <h1
+                        className={classnames({
+                          [classes.headline]: true,
+                          [classes.headlineWithSpacing]: true,
+                        })}
                       >
                         {intl.formatMessage(messages.contentHeadline)}
-
                       </h1>
                       <div className={classes.container}>
                         <div className={classes.content}>
                           <p>{intl.formatMessage(messages.intro)}</p>
                           <p>{intl.formatMessage(messages.copy)}</p>
                         </div>
-                        <img className={classes.image} src="https://cdn.franzinfra.com/announcements/assets/teams.png" alt="Ferdi for Teams" />
+                        <img
+                          className={classes.image}
+                          src="https://cdn.franzinfra.com/announcements/assets/teams.png"
+                          alt="Ferdi for Teams"
+                        />
                       </div>
                       <div className={classes.buttonContainer}>
                         <Button
@@ -188,7 +191,8 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
           <p
             className="settings__message"
             style={{
-              borderTop: 0, marginTop: 0,
+              borderTop: 0,
+              marginTop: 0,
             }}
           >
             {intl.formatMessage(messages.teamsUnavailableInfo)}
@@ -198,3 +202,5 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
     );
   }
 }
+
+export default injectIntl(TeamDashboard);
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js
index db78acb69..4067881b8 100644
--- a/src/components/settings/user/EditUserForm.js
+++ b/src/components/settings/user/EditUserForm.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router';
 import { Input } from '@meetfranz/forms';
 
@@ -14,31 +14,32 @@ import Infobox from '../../ui/Infobox';
 const messages = defineMessages({
   headline: {
     id: 'settings.account.headline',
-    defaultMessage: '!!!Account',
+    defaultMessage: 'Account',
   },
   headlineProfile: {
     id: 'settings.account.headlineProfile',
-    defaultMessage: '!!!Update Profile',
+    defaultMessage: 'Update Profile',
   },
   headlineAccount: {
     id: 'settings.account.headlineAccount',
-    defaultMessage: '!!!Account Information',
+    defaultMessage: 'Account Information',
   },
   headlinePassword: {
     id: 'settings.account.headlinePassword',
-    defaultMessage: '!!!Change Password',
+    defaultMessage: 'Change Password',
   },
   successInfo: {
     id: 'settings.account.successInfo',
-    defaultMessage: '!!!Your changes have been saved',
+    defaultMessage: 'Your changes have been saved',
   },
   buttonSave: {
     id: 'settings.account.buttonSave',
-    defaultMessage: '!!!Update profile',
+    defaultMessage: 'Update profile',
   },
 });
 
-export default @observer class EditUserForm extends Component {
+@observer
+class EditUserForm extends Component {
   static propTypes = {
     status: MobxPropTypes.observableArray.isRequired,
     form: PropTypes.instanceOf(Form).isRequired,
@@ -46,14 +47,10 @@ export default @observer class EditUserForm extends Component {
     isSaving: PropTypes.bool.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   submit(e) {
     e.preventDefault();
     this.props.form.submit({
-      onSuccess: (form) => {
+      onSuccess: form => {
         const values = form.values();
         this.props.onSubmit(values);
       },
@@ -68,7 +65,7 @@ export default @observer class EditUserForm extends Component {
       form,
       isSaving,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <div className="settings__main">
@@ -84,12 +81,9 @@ export default @observer class EditUserForm extends Component {
           </span>
         </div>
         <div className="settings__body">
-          <form onSubmit={(e) => this.submit(e)} id="form">
+          <form onSubmit={e => this.submit(e)} id="form">
             {status.length > 0 && status.includes('data-updated') && (
-              <Infobox
-                type="success"
-                icon="checkbox-marked-circle-outline"
-              >
+              <Infobox type="success" icon="checkbox-marked-circle-outline">
                 {intl.formatMessage(messages.successInfo)}
               </Infobox>
             )}
@@ -104,10 +98,7 @@ export default @observer class EditUserForm extends Component {
               <Input field={form.$('organization')} />
             )}
             <h2>{intl.formatMessage(messages.headlinePassword)}</h2>
-            <Input
-              {...form.$('oldPassword').bind()}
-              showPasswordToggle
-            />
+            <Input {...form.$('oldPassword').bind()} showPasswordToggle />
             <Input
               {...form.$('newPassword').bind()}
               showPasswordToggle
@@ -137,3 +128,5 @@ export default @observer class EditUserForm extends Component {
     );
   }
 }
+
+export default injectIntl(EditUserForm);
diff --git a/src/components/ui/AppLoader/index.js b/src/components/ui/AppLoader/index.js
index bbfd5de28..fa4a719ab 100644
--- a/src/components/ui/AppLoader/index.js
+++ b/src/components/ui/AppLoader/index.js
@@ -19,7 +19,9 @@ const textList = shuffleArray([
   'Fixing bugs',
 ]);
 
-export default @injectSheet(styles) @withTheme class AppLoader extends Component {
+@injectSheet(styles)
+@withTheme
+class AppLoader extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
     theme: PropTypes.object.isRequired,
@@ -28,7 +30,7 @@ export default @injectSheet(styles) @withTheme class AppLoader extends Component
 
   static defaultProps = {
     texts: textList,
-  }
+  };
 
   state = {
     step: 0,
@@ -38,7 +40,7 @@ export default @injectSheet(styles) @withTheme class AppLoader extends Component
 
   componentDidMount() {
     this.interval = setInterval(() => {
-      this.setState((prevState) => ({
+      this.setState(prevState => ({
         step: prevState.step === textList.length - 1 ? 0 : prevState.step + 1,
       }));
     }, 2500);
@@ -73,3 +75,5 @@ export default @injectSheet(styles) @withTheme class AppLoader extends Component
     );
   }
 }
+
+export default AppLoader;
diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js
index 5066b9c06..f6c9fd3d3 100644
--- a/src/components/ui/Button.js
+++ b/src/components/ui/Button.js
@@ -4,7 +4,9 @@ import { observer, inject } from 'mobx-react';
 import Loader from 'react-loader';
 import classnames from 'classnames';
 
-export default @inject('stores') @observer class Button extends Component {
+@inject('stores')
+@observer
+class Button extends Component {
   static propTypes = {
     className: PropTypes.string,
     label: PropTypes.string.isRequired,
@@ -26,7 +28,7 @@ export default @inject('stores') @observer class Button extends Component {
   static defaultProps = {
     className: null,
     disabled: false,
-    onClick: () => { },
+    onClick: () => {},
     type: 'button',
     buttonType: '',
     loaded: true,
@@ -76,7 +78,11 @@ export default @inject('stores') @observer class Button extends Component {
           loaded={loaded}
           lines={10}
           scale={0.4}
-          color={buttonType !== 'secondary' ? '#FFF' : this.props.stores.settings.app.accentColor}
+          color={
+            buttonType !== 'secondary'
+              ? '#FFF'
+              : this.props.stores.settings.app.accentColor
+          }
           component="span"
         />
         {label}
@@ -85,3 +91,5 @@ export default @inject('stores') @observer class Button extends Component {
     );
   }
 }
+
+export default Button;
diff --git a/src/components/ui/FAB.js b/src/components/ui/FAB.js
index 633edbe2c..a3aa06bc9 100644
--- a/src/components/ui/FAB.js
+++ b/src/components/ui/FAB.js
@@ -8,7 +8,8 @@ import classnames from 'classnames';
 
 import { oneOrManyChildElements } from '../../prop-types';
 
-export default @observer class Button extends Component {
+@observer
+class Button extends Component {
   static propTypes = {
     className: PropTypes.string,
     disabled: PropTypes.bool,
@@ -21,7 +22,7 @@ export default @observer class Button extends Component {
   static defaultProps = {
     className: null,
     disabled: false,
-    onClick: () => { },
+    onClick: () => {},
     type: 'button',
     htmlForm: '',
   };
@@ -29,14 +30,8 @@ export default @observer class Button extends Component {
   element = null;
 
   render() {
-    const {
-      className,
-      disabled,
-      onClick,
-      type,
-      children,
-      htmlForm,
-    } = this.props;
+    const { className, disabled, onClick, type, children, htmlForm } =
+      this.props;
 
     const buttonProps = {
       className: classnames({
@@ -66,3 +61,5 @@ export default @observer class Button extends Component {
     );
   }
 }
+
+export default Button;
diff --git a/src/components/ui/FeatureList.js b/src/components/ui/FeatureList.js
index cf2664830..14e7ec3c4 100644
--- a/src/components/ui/FeatureList.js
+++ b/src/components/ui/FeatureList.js
@@ -1,53 +1,53 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import { FeatureItem } from './FeatureItem';
 
 const messages = defineMessages({
   availableRecipes: {
     id: 'pricing.features.recipes',
-    defaultMessage: '!!!Choose from more than 70 Services', // TODO: Make this dynamic
+    defaultMessage: 'Choose from more than 70 Services', // TODO: Make this dynamic
   },
   accountSync: {
     id: 'pricing.features.accountSync',
-    defaultMessage: '!!!Account Synchronisation',
+    defaultMessage: 'Account Synchronisation',
   },
   desktopNotifications: {
     id: 'pricing.features.desktopNotifications',
-    defaultMessage: '!!!Desktop Notifications',
+    defaultMessage: 'Desktop Notifications',
   },
   unlimitedServices: {
     id: 'pricing.features.unlimitedServices',
-    defaultMessage: '!!!Add unlimited services',
+    defaultMessage: 'Add unlimited services',
   },
   spellchecker: {
     id: 'pricing.features.spellchecker',
-    defaultMessage: '!!!Spellchecker support',
+    defaultMessage: 'Spellchecker support',
   },
   workspaces: {
     id: 'pricing.features.workspaces',
-    defaultMessage: '!!!Workspaces',
+    defaultMessage: 'Workspaces',
   },
   customWebsites: {
     id: 'pricing.features.customWebsites',
-    defaultMessage: '!!!Add Custom Websites',
+    defaultMessage: 'Add Custom Websites',
   },
   onPremise: {
     id: 'pricing.features.onPremise',
-    defaultMessage: '!!!On-premise & other Hosted Services',
+    defaultMessage: 'On-premise & other Hosted Services',
   },
   thirdPartyServices: {
     id: 'pricing.features.thirdPartyServices',
-    defaultMessage: '!!!Install 3rd party services',
+    defaultMessage: 'Install 3rd party services',
   },
   serviceProxies: {
     id: 'pricing.features.serviceProxies',
-    defaultMessage: '!!!Service Proxies',
+    defaultMessage: 'Service Proxies',
   },
   teamManagement: {
     id: 'pricing.features.teamManagement',
-    defaultMessage: '!!!Team Management',
+    defaultMessage: 'Team Management',
   },
 });
 
@@ -60,18 +60,11 @@ export class FeatureList extends Component {
   static defaultProps = {
     className: '',
     featureClassName: '',
-  }
-
-  static contextTypes = {
-    intl: intlShape,
   };
 
   render() {
-    const {
-      className,
-      featureClassName,
-    } = this.props;
-    const { intl } = this.context;
+    const { className, featureClassName } = this.props;
+    const { intl } = this.props;
 
     const features = [
       messages.availableRecipes,
@@ -92,10 +85,15 @@ export class FeatureList extends Component {
 
     return (
       <ul className={className}>
-        {features.map((feature) => <FeatureItem name={intl.formatMessage(feature)} className={featureClassName} />)}
+        {features.map(feature => (
+          <FeatureItem
+            name={intl.formatMessage(feature)}
+            className={featureClassName}
+          />
+        ))}
       </ul>
     );
   }
 }
 
-export default FeatureList;
+export default injectIntl(FeatureList);
diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js
index 2952cd96b..ab5e2f365 100644
--- a/src/components/ui/FullscreenLoader/index.js
+++ b/src/components/ui/FullscreenLoader/index.js
@@ -8,7 +8,10 @@ import Loader from '../Loader';
 
 import styles from './styles';
 
-export default @withTheme @injectSheet(styles) @observer class FullscreenLoader extends Component {
+@withTheme
+@injectSheet(styles)
+@observer
+class FullscreenLoader extends Component {
   static propTypes = {
     className: PropTypes.string,
     title: PropTypes.string.isRequired,
@@ -25,14 +28,8 @@ export default @withTheme @injectSheet(styles) @observer class FullscreenLoader
   };
 
   render() {
-    const {
-      classes,
-      title,
-      children,
-      spinnerColor,
-      className,
-      theme,
-    } = this.props;
+    const { classes, title, children, spinnerColor, className, theme } =
+      this.props;
 
     return (
       <div className={classes.wrapper}>
@@ -44,13 +41,11 @@ export default @withTheme @injectSheet(styles) @observer class FullscreenLoader
         >
           <h1 className={classes.title}>{title}</h1>
           <Loader color={spinnerColor || theme.colorFullscreenLoaderSpinner} />
-          {children && (
-            <div className={classes.content}>
-              {children}
-            </div>
-          )}
+          {children && <div className={classes.content}>{children}</div>}
         </div>
       </div>
     );
   }
 }
+
+export default FullscreenLoader;
diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js
index bb4ea0565..8ea31ca40 100644
--- a/src/components/ui/ImageUpload.js
+++ b/src/components/ui/ImageUpload.js
@@ -6,7 +6,8 @@ import classnames from 'classnames';
 import Dropzone from 'react-dropzone';
 import { isWindows } from '../../environment';
 
-export default @observer class ImageUpload extends Component {
+@observer
+class ImageUpload extends Component {
   static propTypes = {
     field: PropTypes.instanceOf(Field).isRequired,
     className: PropTypes.string,
@@ -29,7 +30,7 @@ export default @observer class ImageUpload extends Component {
   onDrop(acceptedFiles) {
     const { field } = this.props;
 
-    acceptedFiles.forEach((file) => {
+    acceptedFiles.forEach(file => {
       const imgPath = isWindows ? file.path.replace(/\\/g, '/') : file.path;
       this.setState({
         path: imgPath,
@@ -42,9 +43,7 @@ export default @observer class ImageUpload extends Component {
   }
 
   render() {
-    const {
-      field, className, multiple, textDelete, textUpload,
-    } = this.props;
+    const { field, className, multiple, textDelete, textUpload } = this.props;
 
     const cssClasses = classnames({
       'image-upload__dropzone': true,
@@ -86,7 +85,7 @@ export default @observer class ImageUpload extends Component {
             </>
           ) : (
             <Dropzone
-              ref={(node) => {
+              ref={node => {
                 this.dropzoneRef = node;
               }}
               onDrop={this.onDrop.bind(this)}
@@ -107,3 +106,5 @@ export default @observer class ImageUpload extends Component {
     );
   }
 }
+
+export default ImageUpload;
diff --git a/src/components/ui/InfoBar.js b/src/components/ui/InfoBar.js
index bd2af2296..f5cbad48b 100644
--- a/src/components/ui/InfoBar.js
+++ b/src/components/ui/InfoBar.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import Loader from 'react-loader';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 // import { oneOrManyChildElements } from '../../prop-types';
 import Appear from './effects/Appear';
@@ -11,11 +11,10 @@ import Appear from './effects/Appear';
 const messages = defineMessages({
   hide: {
     id: 'infobar.hide',
-    defaultMessage: '!!!Hide',
+    defaultMessage: 'Hide',
   },
 });
 
-export default
 @observer
 class InfoBar extends Component {
   static propTypes = {
@@ -42,10 +41,6 @@ class InfoBar extends Component {
     onHide: () => null,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       children,
@@ -59,7 +54,7 @@ class InfoBar extends Component {
       onHide,
     } = this.props;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     let transitionName = 'slideUp';
     if (position === 'top') {
@@ -103,3 +98,5 @@ class InfoBar extends Component {
     );
   }
 }
+
+export default injectIntl(InfoBar);
diff --git a/src/components/ui/Infobox.js b/src/components/ui/Infobox.js
index 73b48b957..13ae2303b 100644
--- a/src/components/ui/Infobox.js
+++ b/src/components/ui/Infobox.js
@@ -3,16 +3,15 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import Loader from 'react-loader';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 const messages = defineMessages({
   dismiss: {
     id: 'infobox.dismiss',
-    defaultMessage: '!!!Dismiss',
+    defaultMessage: 'Dismiss',
   },
 });
 
-export default
 @observer
 class Infobox extends Component {
   static propTypes = {
@@ -38,10 +37,6 @@ class Infobox extends Component {
     onSeen: () => null,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     dismissed: false,
   };
@@ -63,7 +58,7 @@ class Infobox extends Component {
       onDismiss,
     } = this.props;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     if (this.state.dismissed) {
       return null;
@@ -106,3 +101,5 @@ class Infobox extends Component {
     );
   }
 }
+
+export default injectIntl(Infobox);
diff --git a/src/components/ui/Input.js b/src/components/ui/Input.js
index 7417fef1c..335367f03 100644
--- a/src/components/ui/Input.js
+++ b/src/components/ui/Input.js
@@ -3,18 +3,17 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { Field } from 'mobx-react-form';
 import classnames from 'classnames';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import { scorePassword as scorePasswordFunc } from '../../helpers/password-helpers';
 
 const messages = defineMessages({
   passwordToggle: {
     id: 'settings.app.form.passwordToggle',
-    defaultMessage: '!!!Password toggle',
+    defaultMessage: 'Password toggle',
   },
 });
 
-export default
 @observer
 class Input extends Component {
   static propTypes = {
@@ -38,10 +37,6 @@ class Input extends Component {
     suffix: '',
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     showPassword: false,
     passwordScore: 0,
@@ -82,7 +77,7 @@ class Input extends Component {
 
     const { passwordScore } = this.state;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     let { type } = field;
     if (type === 'password' && this.state.showPassword) {
@@ -106,10 +101,10 @@ class Input extends Component {
             name={field.name}
             value={field.value}
             placeholder={field.placeholder}
-            onChange={(e) => this.onChange(e)}
+            onChange={e => this.onChange(e)}
             onBlur={field.onBlur}
             onFocus={field.onFocus}
-            ref={(element) => {
+            ref={element => {
               this.inputElement = element;
             }}
             disabled={field.disabled}
@@ -124,9 +119,11 @@ class Input extends Component {
                 'mdi-eye': !this.state.showPassword,
                 'mdi-eye-off': this.state.showPassword,
               })}
-              onClick={() => this.setState((prevState) => ({
-                showPassword: !prevState.showPassword,
-              }))}
+              onClick={() =>
+                this.setState(prevState => ({
+                  showPassword: !prevState.showPassword,
+                }))
+              }
               tabIndex={-1}
               aria-label={intl.formatMessage(messages.passwordToggle)}
             />
@@ -154,3 +151,5 @@ class Input extends Component {
     );
   }
 }
+
+export default injectIntl(Input);
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js
index 003211e5c..94db3f842 100644
--- a/src/components/ui/Link.js
+++ b/src/components/ui/Link.js
@@ -9,7 +9,9 @@ import { matchRoute } from '../../helpers/routing-helpers';
 import { openExternalUrl } from '../../helpers/url-helpers';
 
 // TODO: create container component for this component
-export default @inject('stores') @observer class Link extends Component {
+@inject('stores')
+@observer
+class Link extends Component {
   onClick(e) {
     if (this.props.disabled) {
       e.preventDefault();
@@ -50,7 +52,7 @@ export default @inject('stores') @observer class Link extends Component {
         href={router.history.createHref(to)}
         className={linkClasses}
         style={style}
-        onClick={(e) => this.onClick(e)}
+        onClick={e => this.onClick(e)}
       >
         {children}
       </a>
@@ -62,10 +64,8 @@ Link.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
     router: PropTypes.instanceOf(RouterStore).isRequired,
   }).isRequired,
-  children: PropTypes.oneOfType([
-    oneOrManyChildElements,
-    PropTypes.string,
-  ]).isRequired,
+  children: PropTypes.oneOfType([oneOrManyChildElements, PropTypes.string])
+    .isRequired,
   to: PropTypes.string.isRequired,
   className: PropTypes.string,
   activeClassName: PropTypes.string,
@@ -83,3 +83,5 @@ Link.wrappedComponent.defaultProps = {
   target: '',
   style: {},
 };
+
+export default Link;
diff --git a/src/components/ui/Loader.js b/src/components/ui/Loader.js
index 4d7113aa1..46c1390bf 100644
--- a/src/components/ui/Loader.js
+++ b/src/components/ui/Loader.js
@@ -5,7 +5,9 @@ import Loader from 'react-loader';
 
 import { oneOrManyChildElements } from '../../prop-types';
 
-export default @inject('stores') @observer class LoaderComponent extends Component {
+@inject('stores')
+@observer
+class LoaderComponent extends Component {
   static propTypes = {
     children: oneOrManyChildElements,
     loaded: PropTypes.bool,
@@ -28,13 +30,12 @@ export default @inject('stores') @observer class LoaderComponent extends Compone
   };
 
   render() {
-    const {
-      children,
-      loaded,
-      className,
-    } = this.props;
+    const { children, loaded, className } = this.props;
 
-    const color = this.props.color !== 'ACCENT' ? this.props.color : this.props.stores.settings.app.accentColor;
+    const color =
+      this.props.color !== 'ACCENT'
+        ? this.props.color
+        : this.props.stores.settings.app.accentColor;
 
     return (
       <Loader
@@ -51,3 +52,5 @@ export default @inject('stores') @observer class LoaderComponent extends Compone
     );
   }
 }
+
+export default LoaderComponent;
diff --git a/src/components/ui/Modal/index.js b/src/components/ui/Modal/index.js
index a9fa0cd1b..9e6830b0c 100644
--- a/src/components/ui/Modal/index.js
+++ b/src/components/ui/Modal/index.js
@@ -10,7 +10,8 @@ import styles from './styles';
 
 // ReactModal.setAppElement('#root');
 
-export default @injectCSS(styles) class Modal extends Component {
+@injectCSS(styles)
+class Modal extends Component {
   static propTypes = {
     children: PropTypes.node.isRequired,
     className: PropTypes.string,
@@ -20,14 +21,14 @@ export default @injectCSS(styles) class Modal extends Component {
     close: PropTypes.func.isRequired,
     shouldCloseOnOverlayClick: PropTypes.bool,
     showClose: PropTypes.bool,
-  }
+  };
 
   static defaultProps = {
     className: null,
     portal: 'modal-portal',
     shouldCloseOnOverlayClick: false,
     showClose: true,
-  }
+  };
 
   render() {
     const {
@@ -56,18 +57,14 @@ export default @injectCSS(styles) class Modal extends Component {
         appElement={document.getElementById('root')}
       >
         {showClose && close && (
-          <button
-            type="button"
-            className={classes.close}
-            onClick={close}
-          >
+          <button type="button" className={classes.close} onClick={close}>
             <Icon icon={mdiClose} size={1.5} />
           </button>
         )}
-        <div className={classes.content}>
-          {children}
-        </div>
+        <div className={classes.content}>{children}</div>
       </ReactModal>
     );
   }
 }
+
+export default Modal;
diff --git a/src/components/ui/Radio.js b/src/components/ui/Radio.js
index e77714eb7..65a777ff1 100644
--- a/src/components/ui/Radio.js
+++ b/src/components/ui/Radio.js
@@ -4,7 +4,8 @@ import { observer } from 'mobx-react';
 import { Field } from 'mobx-react-form';
 import classnames from 'classnames';
 
-export default @observer class Radio extends Component {
+@observer
+class Radio extends Component {
   static propTypes = {
     field: PropTypes.instanceOf(Field).isRequired,
     className: PropTypes.string,
@@ -31,11 +32,7 @@ export default @observer class Radio extends Component {
   }
 
   render() {
-    const {
-      field,
-      className,
-      showLabel,
-    } = this.props;
+    const { field, className, showLabel } = this.props;
 
     return (
       <div
@@ -46,15 +43,12 @@ export default @observer class Radio extends Component {
         })}
       >
         {field.label && showLabel && (
-          <label
-            className="franz-form__label"
-            htmlFor={field.name}
-          >
+          <label className="franz-form__label" htmlFor={field.name}>
             {field.label}
           </label>
         )}
         <div className="franz-form__radio-wrapper">
-          {field.options.map((type) => (
+          {field.options.map(type => (
             <label
               key={type.value}
               htmlFor={`${field.id}-${type.value}`}
@@ -75,14 +69,10 @@ export default @observer class Radio extends Component {
             </label>
           ))}
         </div>
-        {field.error && (
-          <div
-            className="franz-form__error"
-          >
-            {field.error}
-          </div>
-        )}
+        {field.error && <div className="franz-form__error">{field.error}</div>}
       </div>
     );
   }
 }
+
+export default Radio;
diff --git a/src/components/ui/SearchInput.js b/src/components/ui/SearchInput.js
index 0b25734dd..2d760beab 100644
--- a/src/components/ui/SearchInput.js
+++ b/src/components/ui/SearchInput.js
@@ -4,7 +4,8 @@ import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import { debounce } from 'lodash';
 
-export default @observer class SearchInput extends Component {
+@observer
+class SearchInput extends Component {
   static propTypes = {
     value: PropTypes.string,
     placeholder: PropTypes.string,
@@ -27,7 +28,7 @@ export default @observer class SearchInput extends Component {
     onChange: () => null,
     onReset: () => null,
     autoFocus: false,
-  }
+  };
 
   input = null;
 
@@ -38,7 +39,10 @@ export default @observer class SearchInput extends Component {
       value: props.value,
     };
 
-    this.throttledOnChange = debounce(this.throttledOnChange, this.props.throttleDelay);
+    this.throttledOnChange = debounce(
+      this.throttledOnChange,
+      this.props.throttleDelay,
+    );
   }
 
   componentDidMount() {
@@ -80,24 +84,18 @@ export default @observer class SearchInput extends Component {
     const { value } = this.state;
 
     return (
-      <div
-        className={classnames([
-          className,
-          'search-input',
-        ])}
-      >
-        <label
-          htmlFor={name}
-          className="mdi mdi-magnify"
-        >
+      <div className={classnames([className, 'search-input'])}>
+        <label htmlFor={name} className="mdi mdi-magnify">
           <input
             name={name}
             id={name}
             type="text"
             placeholder={placeholder}
             value={value}
-            onChange={(e) => this.onChange(e)}
-            ref={(ref) => { this.input = ref; }}
+            onChange={e => this.onChange(e)}
+            ref={ref => {
+              this.input = ref;
+            }}
           />
         </label>
         {value.length > 0 && (
@@ -110,3 +108,5 @@ export default @observer class SearchInput extends Component {
     );
   }
 }
+
+export default SearchInput;
diff --git a/src/components/ui/Select.js b/src/components/ui/Select.js
index e7a5eafa8..15b4c28e7 100644
--- a/src/components/ui/Select.js
+++ b/src/components/ui/Select.js
@@ -4,7 +4,8 @@ import { observer } from 'mobx-react';
 import { Field } from 'mobx-react-form';
 import classnames from 'classnames';
 
-export default @observer class Select extends Component {
+@observer
+class Select extends Component {
   static propTypes = {
     field: PropTypes.instanceOf(Field).isRequired,
     className: PropTypes.string,
@@ -43,13 +44,7 @@ export default @observer class Select extends Component {
   }
 
   render() {
-    const {
-      field,
-      className,
-      showLabel,
-      disabled,
-      multiple,
-    } = this.props;
+    const { field, className, showLabel, disabled, multiple } = this.props;
 
     let selected = field.value;
 
@@ -74,15 +69,12 @@ export default @observer class Select extends Component {
         })}
       >
         {field.label && showLabel && (
-          <label
-            className="franz-form__label"
-            htmlFor={field.name}
-          >
+          <label className="franz-form__label" htmlFor={field.name}>
             {field.label}
           </label>
         )}
         <select
-          onChange={multiple ? (e) => this.multipleChange(e) : field.onChange}
+          onChange={multiple ? e => this.multipleChange(e) : field.onChange}
           id={field.id}
           defaultValue={selected}
           className="franz-form__select"
@@ -90,7 +82,7 @@ export default @observer class Select extends Component {
           multiple={multiple}
           ref={this.element}
         >
-          {field.options.map((type) => (
+          {field.options.map(type => (
             <option
               key={type.value}
               value={type.value}
@@ -100,14 +92,10 @@ export default @observer class Select extends Component {
             </option>
           ))}
         </select>
-        {field.error && (
-          <div
-            className="franz-form__error"
-          >
-            {field.error}
-          </div>
-        )}
+        {field.error && <div className="franz-form__error">{field.error}</div>}
       </div>
     );
   }
 }
+
+export default Select;
diff --git a/src/components/ui/Slider.js b/src/components/ui/Slider.js
index f344449a0..6f17eae00 100644
--- a/src/components/ui/Slider.js
+++ b/src/components/ui/Slider.js
@@ -4,62 +4,64 @@ import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import { Field } from 'mobx-react-form';
 
-export default @observer class Slider extends Component {
-    static propTypes = {
-      field: PropTypes.instanceOf(Field).isRequired,
-      className: PropTypes.string,
-      showLabel: PropTypes.bool,
-      disabled: PropTypes.bool,
-    };
+@observer
+class Slider extends Component {
+  static propTypes = {
+    field: PropTypes.instanceOf(Field).isRequired,
+    className: PropTypes.string,
+    showLabel: PropTypes.bool,
+    disabled: PropTypes.bool,
+  };
 
-    static defaultProps = {
-      className: '',
-      showLabel: true,
-      disabled: false,
-    };
+  static defaultProps = {
+    className: '',
+    showLabel: true,
+    disabled: false,
+  };
 
-    onChange(e) {
-      const { field } = this.props;
+  onChange(e) {
+    const { field } = this.props;
 
-      field.onChange(e);
-    }
-
-    render() {
-      const {
-        field,
-        className,
-        showLabel,
-        disabled,
-      } = this.props;
+    field.onChange(e);
+  }
 
-      if (field.value === '' && field.default !== '') {
-        field.value = field.default;
-      }
+  render() {
+    const { field, className, showLabel, disabled } = this.props;
 
-      return (
-        <div
-          className={classnames([
-            'franz-form__field',
-            'franz-form__slider-wrapper',
-            className,
-          ])}
-        >
-          <div className="slider-container">
-            <input
-              className="slider"
-              type="range"
-              id={field.id}
-              name={field.name}
-              value={field.value}
-              min="1"
-              max="100"
-              onChange={(e) => (!disabled ? this.onChange(e) : null)}
-            />
-          </div>
+    if (field.value === '' && field.default !== '') {
+      field.value = field.default;
+    }
 
-          {field.error && <div className={field.error}>{field.error}</div>}
-          {field.label && showLabel && <label className="franz-form__label" htmlFor={field.id}>{field.label}</label>}
+    return (
+      <div
+        className={classnames([
+          'franz-form__field',
+          'franz-form__slider-wrapper',
+          className,
+        ])}
+      >
+        <div className="slider-container">
+          <input
+            className="slider"
+            type="range"
+            id={field.id}
+            name={field.name}
+            value={field.value}
+            min="1"
+            max="100"
+            onChange={e => (!disabled ? this.onChange(e) : null)}
+          />
         </div>
-      );
-    }
+
+        {field.error && <div className={field.error}>{field.error}</div>}
+        {field.label && showLabel && (
+          <label className="franz-form__label" htmlFor={field.id}>
+            {field.label}
+          </label>
+        )}
+      </div>
+    );
+  }
 }
+
+export default Slider;
diff --git a/src/components/ui/StatusBarTargetUrl.js b/src/components/ui/StatusBarTargetUrl.js
index 6fc50fe5c..ff4e8c795 100644
--- a/src/components/ui/StatusBarTargetUrl.js
+++ b/src/components/ui/StatusBarTargetUrl.js
@@ -5,7 +5,8 @@ import classnames from 'classnames';
 
 import Appear from './effects/Appear';
 
-export default @observer class StatusBarTargetUrl extends Component {
+@observer
+class StatusBarTargetUrl extends Component {
   static propTypes = {
     className: PropTypes.string,
     text: PropTypes.string,
@@ -17,10 +18,7 @@ export default @observer class StatusBarTargetUrl extends Component {
   };
 
   render() {
-    const {
-      className,
-      text,
-    } = this.props;
+    const { className, text } = this.props;
 
     return (
       <Appear
@@ -29,10 +27,10 @@ export default @observer class StatusBarTargetUrl extends Component {
           [`${className}`]: true,
         })}
       >
-        <div className="status-bar-target-url__content">
-          {text}
-        </div>
+        <div className="status-bar-target-url__content">{text}</div>
       </Appear>
     );
   }
 }
+
+export default StatusBarTargetUrl;
diff --git a/src/components/ui/Tabs/Tabs.js b/src/components/ui/Tabs/Tabs.js
index 56c76f215..195398708 100644
--- a/src/components/ui/Tabs/Tabs.js
+++ b/src/components/ui/Tabs/Tabs.js
@@ -5,7 +5,6 @@ import classnames from 'classnames';
 
 import { oneOrManyChildElements } from '../../../prop-types';
 
-export default
 @observer
 class Tab extends Component {
   constructor(props) {
@@ -28,7 +27,7 @@ class Tab extends Component {
 
   render() {
     const { children: childElements } = this.props;
-    const children = childElements.filter((c) => !!c);
+    const children = childElements.filter(c => !!c);
 
     if (children.length === 1) {
       return <div>{children}</div>;
@@ -69,3 +68,5 @@ class Tab extends Component {
     );
   }
 }
+
+export default Tab;
diff --git a/src/components/ui/Toggle.js b/src/components/ui/Toggle.js
index 14330e5c7..bd7bc242d 100644
--- a/src/components/ui/Toggle.js
+++ b/src/components/ui/Toggle.js
@@ -4,7 +4,8 @@ import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import { Field } from 'mobx-react-form';
 
-export default @observer class Toggle extends Component {
+@observer
+class Toggle extends Component {
   static propTypes = {
     field: PropTypes.instanceOf(Field).isRequired,
     className: PropTypes.string,
@@ -25,12 +26,7 @@ export default @observer class Toggle extends Component {
   }
 
   render() {
-    const {
-      field,
-      className,
-      showLabel,
-      disabled,
-    } = this.props;
+    const { field, className, showLabel, disabled } = this.props;
 
     if (field.value === '' && field.default !== '') {
       field.value = field.default;
@@ -59,12 +55,18 @@ export default @observer class Toggle extends Component {
             name={field.name}
             value={field.name}
             checked={field.value}
-            onChange={(e) => (!disabled ? this.onChange(e) : null)}
+            onChange={e => (!disabled ? this.onChange(e) : null)}
           />
         </label>
         {field.error && <div className={field.error}>{field.error}</div>}
-        {field.label && showLabel && <label className="franz-form__label" htmlFor={field.id}>{field.label}</label>}
+        {field.label && showLabel && (
+          <label className="franz-form__label" htmlFor={field.id}>
+            {field.label}
+          </label>
+        )}
       </div>
     );
   }
 }
+
+export default Toggle;
diff --git a/src/components/ui/ToggleRaw.js b/src/components/ui/ToggleRaw.js
index 4700127d4..1fde879ac 100644
--- a/src/components/ui/ToggleRaw.js
+++ b/src/components/ui/ToggleRaw.js
@@ -6,7 +6,8 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import classnames from 'classnames';
 
-export default @observer class ToggleRaw extends Component {
+@observer
+class ToggleRaw extends Component {
   static propTypes = {
     onChange: PropTypes.func.isRequired,
     field: PropTypes.shape({
@@ -34,12 +35,7 @@ export default @observer class ToggleRaw extends Component {
   }
 
   render() {
-    const {
-      field,
-      className,
-      showLabel,
-      disabled,
-    } = this.props;
+    const { field, className, showLabel, disabled } = this.props;
 
     return (
       <div
@@ -64,12 +60,18 @@ export default @observer class ToggleRaw extends Component {
             name={field.name}
             value={field.name}
             checked={field.value}
-            onChange={(e) => (!disabled ? this.onChange(e) : null)}
+            onChange={e => (!disabled ? this.onChange(e) : null)}
           />
         </label>
         {field.error && <div className={field.error}>{field.error}</div>}
-        {field.label && showLabel && <label className="franz-form__label" htmlFor={field.id}>{field.label}</label>}
+        {field.label && showLabel && (
+          <label className="franz-form__label" htmlFor={field.id}>
+            {field.label}
+          </label>
+        )}
       </div>
     );
   }
 }
+
+export default ToggleRaw;
diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js
index c58d69374..8f4499e7b 100644
--- a/src/components/ui/WebviewLoader/index.js
+++ b/src/components/ui/WebviewLoader/index.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import FullscreenLoader from '../FullscreenLoader';
 import styles from './styles';
@@ -10,23 +10,21 @@ import styles from './styles';
 const messages = defineMessages({
   loading: {
     id: 'service.webviewLoader.loading',
-    defaultMessage: '!!!Loading {service}',
+    defaultMessage: 'Loading {service}',
   },
 });
 
-export default @injectSheet(styles) @observer class WebviewLoader extends Component {
+@injectSheet(styles)
+@observer
+class WebviewLoader extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
     classes: PropTypes.object.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const { classes, name } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
     return (
       <FullscreenLoader
         className={classes.component}
@@ -35,3 +33,5 @@ export default @injectSheet(styles) @observer class WebviewLoader extends Compon
     );
   }
 }
+
+export default injectIntl(WebviewLoader);
diff --git a/src/components/util/ErrorBoundary/index.js b/src/components/util/ErrorBoundary/index.js
index 5db0db226..9c789e981 100644
--- a/src/components/util/ErrorBoundary/index.js
+++ b/src/components/util/ErrorBoundary/index.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import injectSheet from 'react-jss';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import Button from '../../ui/Button';
 
@@ -10,26 +10,23 @@ import styles from './styles';
 const messages = defineMessages({
   headline: {
     id: 'app.errorHandler.headline',
-    defaultMessage: '!!!Something went wrong.',
+    defaultMessage: 'Something went wrong.',
   },
   action: {
     id: 'app.errorHandler.action',
-    defaultMessage: '!!!Reload',
+    defaultMessage: 'Reload',
   },
 });
 
-export default @injectSheet(styles) class ErrorBoundary extends Component {
+@injectSheet(styles)
+class ErrorBoundary extends Component {
   state = {
     hasError: false,
-  }
+  };
 
   static propTypes = {
     classes: PropTypes.object.isRequired,
     children: PropTypes.node.isRequired,
-  }
-
-  static contextTypes = {
-    intl: intlShape,
   };
 
   componentDidCatch() {
@@ -38,7 +35,7 @@ export default @injectSheet(styles) class ErrorBoundary extends Component {
 
   render() {
     const { classes } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     if (this.state.hasError) {
       return (
@@ -58,3 +55,5 @@ export default @injectSheet(styles) class ErrorBoundary extends Component {
     return this.props.children;
   }
 }
+
+export default injectIntl(ErrorBoundary);
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js
index a0d50ab54..7673ab9c7 100644
--- a/src/containers/auth/AuthLayoutContainer.js
+++ b/src/containers/auth/AuthLayoutContainer.js
@@ -14,7 +14,6 @@ import AppLoader from '../../components/ui/AppLoader';
 import { oneOrManyChildElements } from '../../prop-types';
 import FeaturesStore from '../../stores/FeaturesStore';
 
-export default
 @inject('stores', 'actions')
 @observer
 class AuthLayoutContainer extends Component {
@@ -85,3 +84,5 @@ AuthLayoutContainer.wrappedComponent.propTypes = {
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
 };
+
+export default AuthLayoutContainer;
diff --git a/src/containers/auth/ChangeServerScreen.js b/src/containers/auth/ChangeServerScreen.js
index 28ecc0198..94fc98b61 100644
--- a/src/containers/auth/ChangeServerScreen.js
+++ b/src/containers/auth/ChangeServerScreen.js
@@ -5,7 +5,9 @@ import { RouterStore } from 'mobx-react-router';
 import ChangeServer from '../../components/auth/ChangeServer';
 import SettingsStore from '../../stores/SettingsStore';
 
-export default @inject('stores', 'actions') @observer class ChangeServerScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class ChangeServerScreen extends Component {
   constructor(props) {
     super(props);
 
@@ -28,12 +30,7 @@ export default @inject('stores', 'actions') @observer class ChangeServerScreen e
     const { stores } = this.props;
     const { server } = stores.settings.all.app;
 
-    return (
-      <ChangeServer
-        onSubmit={this.onSubmit}
-        server={server}
-      />
-    );
+    return <ChangeServer onSubmit={this.onSubmit} server={server} />;
   }
 }
 
diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js
index 9143ef616..ff2854f6e 100644
--- a/src/containers/auth/ImportScreen.js
+++ b/src/containers/auth/ImportScreen.js
@@ -5,7 +5,9 @@ import { RouterStore } from 'mobx-react-router';
 import Import from '../../components/auth/Import';
 import UserStore from '../../stores/UserStore';
 
-export default @inject('stores', 'actions') @observer class ImportScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class ImportScreen extends Component {
   render() {
     const { actions, stores } = this.props;
 
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js
index 66afaf7e1..d9d52a57c 100644
--- a/src/containers/auth/InviteScreen.js
+++ b/src/containers/auth/InviteScreen.js
@@ -3,16 +3,13 @@ import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import Invite from '../../components/auth/Invite';
 
-export default @inject('stores', 'actions') @observer class InviteScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class InviteScreen extends Component {
   render() {
     const { actions } = this.props;
 
-    return (
-      <Invite
-        onSubmit={actions.user.invite}
-        embed={false}
-      />
-    );
+    return <Invite onSubmit={actions.user.invite} embed={false} />;
   }
 }
 
@@ -23,3 +20,5 @@ InviteScreen.wrappedComponent.propTypes = {
     }).isRequired,
   }).isRequired,
 };
+
+export default InviteScreen;
diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.js
index 4e97c6573..87205c4b9 100644
--- a/src/containers/auth/LockedScreen.js
+++ b/src/containers/auth/LockedScreen.js
@@ -7,10 +7,12 @@ import SettingsStore from '../../stores/SettingsStore';
 import { hash } from '../../helpers/password-helpers';
 import UserStore from '../../stores/UserStore';
 
-export default @inject('stores', 'actions') @observer class LockedScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class LockedScreen extends Component {
   state = {
     error: false,
-  }
+  };
 
   constructor(props) {
     super(props);
diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js
index e636f99e0..d24eb1d22 100644
--- a/src/containers/auth/LoginScreen.js
+++ b/src/containers/auth/LoginScreen.js
@@ -6,7 +6,9 @@ import UserStore from '../../stores/UserStore';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
-export default @inject('stores', 'actions') @observer class LoginScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class LoginScreen extends Component {
   static propTypes = {
     error: globalErrorPropType.isRequired,
   };
@@ -18,7 +20,9 @@ export default @inject('stores', 'actions') @observer class LoginScreen extends
         onSubmit={actions.user.login}
         isSubmitting={stores.user.loginRequest.isExecuting}
         isTokenExpired={stores.user.isTokenExpired}
-        isServerLogout={stores.user.logoutReason === stores.user.logoutReasonTypes.SERVER}
+        isServerLogout={
+          stores.user.logoutReason === stores.user.logoutReasonTypes.SERVER
+        }
         signupRoute={stores.user.signupRoute}
         passwordRoute={stores.user.passwordRoute}
         changeServerRoute={stores.user.changeServerRoute}
diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.js
index 9c6732f1a..47f6dfd01 100644
--- a/src/containers/auth/PasswordScreen.js
+++ b/src/containers/auth/PasswordScreen.js
@@ -4,7 +4,9 @@ import { inject, observer } from 'mobx-react';
 import Password from '../../components/auth/Password';
 import UserStore from '../../stores/UserStore';
 
-export default @inject('stores', 'actions') @observer class PasswordScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class PasswordScreen extends Component {
   render() {
     const { actions, stores } = this.props;
 
diff --git a/src/containers/auth/SetupAssistantScreen.js b/src/containers/auth/SetupAssistantScreen.js
index d7036969a..efda2e9d2 100644
--- a/src/containers/auth/SetupAssistantScreen.js
+++ b/src/containers/auth/SetupAssistantScreen.js
@@ -14,7 +14,6 @@ import ServicesStore from '../../stores/ServicesStore';
 import RecipesStore from '../../stores/RecipesStore';
 import UserStore from '../../stores/UserStore';
 
-export default
 @inject('stores', 'actions')
 @observer
 class SetupAssistantScreen extends Component {
@@ -134,3 +133,5 @@ SetupAssistantScreen.wrappedComponent.propTypes = {
     recipe: PropTypes.instanceOf(RecipesStore).isRequired,
   }).isRequired,
 };
+
+export default SetupAssistantScreen;
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js
index 38c5dfb43..b20a7fd62 100644
--- a/src/containers/auth/SignupScreen.js
+++ b/src/containers/auth/SignupScreen.js
@@ -8,7 +8,9 @@ import FeaturesStore from '../../stores/FeaturesStore';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
-export default @inject('stores', 'actions') @observer class SignupScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class SignupScreen extends Component {
   static propTypes = {
     error: globalErrorPropType.isRequired,
   };
@@ -24,7 +26,7 @@ export default @inject('stores', 'actions') @observer class SignupScreen extends
 
     return (
       <Signup
-        onSubmit={(values) => this.onSignup(values)}
+        onSubmit={values => this.onSignup(values)}
         isSubmitting={stores.user.signupRequest.isExecuting}
         loginRoute={stores.user.loginRoute}
         changeServerRoute={stores.user.changeServerRoute}
@@ -43,3 +45,5 @@ SignupScreen.wrappedComponent.propTypes = {
     features: PropTypes.instanceOf(FeaturesStore).isRequired,
   }).isRequired,
 };
+
+export default SignupScreen;
diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js
index bfcc880d0..d169e5f0f 100644
--- a/src/containers/auth/WelcomeScreen.js
+++ b/src/containers/auth/WelcomeScreen.js
@@ -6,7 +6,9 @@ import Welcome from '../../components/auth/Welcome';
 import UserStore from '../../stores/UserStore';
 import RecipePreviewsStore from '../../stores/RecipePreviewsStore';
 
-export default @inject('stores', 'actions') @observer class LoginScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class LoginScreen extends Component {
   render() {
     const { user, recipePreviews } = this.props.stores;
 
@@ -27,3 +29,5 @@ LoginScreen.wrappedComponent.propTypes = {
     recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired,
   }).isRequired,
 };
+
+export default LoginScreen;
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 83a25168b..3e92b0610 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -25,7 +25,6 @@ import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawe
 import { workspaceStore } from '../../features/workspaces';
 import WorkspacesStore from '../../features/workspaces/store';
 
-export default
 @inject('stores', 'actions')
 @observer
 class AppLayoutContainer extends Component {
@@ -199,3 +198,5 @@ AppLayoutContainer.wrappedComponent.propTypes = {
   }).isRequired,
   children: oneOrManyChildElements,
 };
+
+export default AppLayoutContainer;
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index 8d92b01be..cc3929656 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -12,7 +12,6 @@ import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { LIVE_FRANZ_API } from '../../config';
 import { WEBSITE } from '../../environment';
 
-export default
 @inject('stores', 'actions')
 @observer
 class AccountScreen extends Component {
@@ -58,16 +57,16 @@ class AccountScreen extends Component {
           user={user.data}
           isLoading={isLoadingUserInfo}
           userInfoRequestFailed={
-            user.getUserInfoRequest.wasExecuted
-            && user.getUserInfoRequest.isError
+            user.getUserInfoRequest.wasExecuted &&
+            user.getUserInfoRequest.isError
           }
           retryUserInfoRequest={() => this.reloadData()}
           onCloseSubscriptionWindow={() => this.onCloseWindow()}
           deleteAccount={userActions.delete}
           isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting}
           isDeleteAccountSuccessful={
-            user.deleteAccountRequest.wasExecuted
-            && !user.deleteAccountRequest.isError
+            user.deleteAccountRequest.wasExecuted &&
+            !user.deleteAccountRequest.isError
           }
           openEditAccount={() => this.handleWebsiteLink('/user/profile')}
           openInvoices={() => this.handleWebsiteLink('/user/invoices')}
@@ -89,3 +88,5 @@ AccountScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
+
+export default AccountScreen;
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index c880e97ae..12e7b9e95 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import { RouterStore } from 'mobx-react-router';
 import UserStore from '../../stores/UserStore';
@@ -27,87 +27,85 @@ import globalMessages from '../../i18n/globalMessages';
 const messages = defineMessages({
   name: {
     id: 'settings.service.form.name',
-    defaultMessage: '!!!Name',
+    defaultMessage: 'Name',
   },
   enableService: {
     id: 'settings.service.form.enableService',
-    defaultMessage: '!!!Enable service',
+    defaultMessage: 'Enable service',
   },
   enableHibernation: {
     id: 'settings.service.form.enableHibernation',
-    defaultMessage: '!!!Enable hibernation',
+    defaultMessage: 'Enable hibernation',
   },
   enableNotification: {
     id: 'settings.service.form.enableNotification',
-    defaultMessage: '!!!Enable Notifications',
+    defaultMessage: 'Enable Notifications',
   },
   enableBadge: {
     id: 'settings.service.form.enableBadge',
-    defaultMessage: '!!!Show unread message badges',
+    defaultMessage: 'Show unread message badges',
   },
   enableAudio: {
     id: 'settings.service.form.enableAudio',
-    defaultMessage: '!!!Enable audio',
+    defaultMessage: 'Enable audio',
   },
   team: {
     id: 'settings.service.form.team',
-    defaultMessage: '!!!Team',
+    defaultMessage: 'Team',
   },
   customUrl: {
     id: 'settings.service.form.customUrl',
-    defaultMessage: '!!!Service URL',
+    defaultMessage: 'Service URL',
   },
   indirectMessages: {
     id: 'settings.service.form.indirectMessages',
-    defaultMessage: '!!!Show message badge for all new messages',
+    defaultMessage: 'Show message badge for all new messages',
   },
   icon: {
     id: 'settings.service.form.icon',
-    defaultMessage: '!!!Custom icon',
+    defaultMessage: 'Custom icon',
   },
   enableDarkMode: {
     id: 'settings.service.form.enableDarkMode',
-    defaultMessage: '!!!Enable Dark Mode',
+    defaultMessage: 'Enable Dark Mode',
   },
   darkReaderBrightness: {
     id: 'settings.service.form.darkReaderBrightness',
-    defaultMessage: '!!!Dark Reader Brightness',
+    defaultMessage: 'Dark Reader Brightness',
   },
   darkReaderContrast: {
     id: 'settings.service.form.darkReaderContrast',
-    defaultMessage: '!!!Dark Reader Contrast',
+    defaultMessage: 'Dark Reader Contrast',
   },
   darkReaderSepia: {
     id: 'settings.service.form.darkReaderSepia',
-    defaultMessage: '!!!Dark Reader Sepia',
+    defaultMessage: 'Dark Reader Sepia',
   },
   enableProxy: {
     id: 'settings.service.form.proxy.isEnabled',
-    defaultMessage: '!!!Use Proxy',
+    defaultMessage: 'Use Proxy',
   },
   proxyHost: {
     id: 'settings.service.form.proxy.host',
-    defaultMessage: '!!!Proxy Host/IP',
+    defaultMessage: 'Proxy Host/IP',
   },
   proxyPort: {
     id: 'settings.service.form.proxy.port',
-    defaultMessage: '!!!Port',
+    defaultMessage: 'Port',
   },
   proxyUser: {
     id: 'settings.service.form.proxy.user',
-    defaultMessage: '!!!User',
+    defaultMessage: 'User',
   },
   proxyPassword: {
     id: 'settings.service.form.proxy.password',
-    defaultMessage: '!!!Password',
+    defaultMessage: 'Password',
   },
 });
 
-export default @inject('stores', 'actions') @observer class EditServiceScreen extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
+@inject('stores', 'actions')
+@observer
+class EditServiceScreen extends Component {
   onSubmit(data) {
     const { action } = this.props.router.params;
     const { recipes, services } = this.props.stores;
@@ -132,27 +130,31 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
   }
 
   prepareForm(recipe, service, proxy) {
-    const {
-      intl,
-    } = this.context;
+    const { intl } = this.props;
 
-    const {
-      stores,
-      router,
-    } = this.props;
+    const { stores, router } = this.props;
 
     const { action } = router.params;
 
-    let defaultSpellcheckerLanguage = SPELLCHECKER_LOCALES[stores.settings.app.spellcheckerLanguage];
+    let defaultSpellcheckerLanguage =
+      SPELLCHECKER_LOCALES[stores.settings.app.spellcheckerLanguage];
 
     if (stores.settings.app.spellcheckerLanguage === 'automatic') {
-      defaultSpellcheckerLanguage = intl.formatMessage(globalMessages.spellcheckerAutomaticDetectionShort);
+      defaultSpellcheckerLanguage = intl.formatMessage(
+        globalMessages.spellcheckerAutomaticDetectionShort,
+      );
     }
 
     const spellcheckerLanguage = getSelectOptions({
       locales: SPELLCHECKER_LOCALES,
-      resetToDefaultText: intl.formatMessage(globalMessages.spellcheckerSystemDefault, { default: defaultSpellcheckerLanguage }),
-      automaticDetectionText: stores.settings.app.spellcheckerLanguage !== 'automatic' ? intl.formatMessage(globalMessages.spellcheckerAutomaticDetection) : '',
+      resetToDefaultText: intl.formatMessage(
+        globalMessages.spellcheckerSystemDefault,
+        { default: defaultSpellcheckerLanguage },
+      ),
+      automaticDetectionText:
+        stores.settings.app.spellcheckerLanguage !== 'automatic'
+          ? intl.formatMessage(globalMessages.spellcheckerAutomaticDetection)
+          : '',
     });
 
     const config = {
@@ -169,7 +171,10 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
         },
         isHibernationEnabled: {
           label: intl.formatMessage(messages.enableHibernation),
-          value: action !== 'edit' ? recipe.autoHibernate : service.isHibernationEnabled,
+          value:
+            action !== 'edit'
+              ? recipe.autoHibernate
+              : service.isHibernationEnabled,
           default: true,
         },
         isNotificationEnabled: {
@@ -200,17 +205,23 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
         },
         darkReaderBrightness: {
           label: intl.formatMessage(messages.darkReaderBrightness),
-          value: service.darkReaderSettings ? service.darkReaderSettings.brightness : undefined,
+          value: service.darkReaderSettings
+            ? service.darkReaderSettings.brightness
+            : undefined,
           default: 100,
         },
         darkReaderContrast: {
           label: intl.formatMessage(messages.darkReaderContrast),
-          value: service.darkReaderSettings ? service.darkReaderSettings.contrast : undefined,
+          value: service.darkReaderSettings
+            ? service.darkReaderSettings.contrast
+            : undefined,
           default: 90,
         },
         darkReaderSepia: {
           label: intl.formatMessage(messages.darkReaderSepia),
-          value: service.darkReaderSettings ? service.darkReaderSettings.sepia : undefined,
+          value: service.darkReaderSettings
+            ? service.darkReaderSettings.sepia
+            : undefined,
           default: 10,
         },
         spellcheckerLanguage: {
@@ -252,7 +263,10 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
     // More fine grained and use case specific validation rules
     if (recipe.hasTeamId && recipe.hasCustomUrl) {
       config.fields.team.validators = [oneRequired(['team', 'customUrl'])];
-      config.fields.customUrl.validators = [url, oneRequired(['team', 'customUrl'])];
+      config.fields.customUrl.validators = [
+        url,
+        oneRequired(['team', 'customUrl']),
+      ];
     }
 
     // If a service can be hosted and has a teamId or customUrl
@@ -344,9 +358,7 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
   }
 
   render() {
-    const {
-      recipes, services, user,
-    } = this.props.stores;
+    const { recipes, services, user } = this.props.stores;
     const { action } = this.props.router.params;
 
     let recipe;
@@ -358,9 +370,7 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
 
       // TODO: render error message when recipe is `null`
       if (!recipe) {
-        return (
-          <ServiceError />
-        );
+        return <ServiceError />;
       }
     } else {
       service = services.activeSettings;
@@ -372,13 +382,11 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
     }
 
     if (isLoading) {
-      return (<div>Loading...</div>);
+      return <div>Loading...</div>;
     }
 
     if (!recipe) {
-      return (
-        <div>something went wrong</div>
-      );
+      return <div>something went wrong</div>;
     }
 
     const form = this.prepareForm(recipe, service, proxyFeature);
@@ -392,11 +400,14 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
           user={user.data}
           form={form}
           status={services.actionStatus}
-          isSaving={services.updateServiceRequest.isExecuting || services.createServiceRequest.isExecuting}
+          isSaving={
+            services.updateServiceRequest.isExecuting ||
+            services.createServiceRequest.isExecuting
+          }
           isDeleting={services.deleteServiceRequest.isExecuting}
-          onSubmit={(d) => this.onSubmit(d)}
+          onSubmit={d => this.onSubmit(d)}
           onDelete={() => this.deleteService()}
-          openRecipeFile={(file) => this.openRecipeFile(file)}
+          openRecipeFile={file => this.openRecipeFile(file)}
           isProxyFeatureEnabled={proxyFeature.isEnabled}
         />
       </ErrorBoundary>
@@ -417,3 +428,5 @@ EditServiceScreen.wrappedComponent.propTypes = {
     service: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
 };
+
+export default injectIntl(EditServiceScreen);
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 09244bc3c..8834aa1ae 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import AppStore from '../../stores/AppStore';
 import SettingsStore from '../../stores/SettingsStore';
@@ -10,8 +10,15 @@ import TodosStore from '../../features/todos/store';
 import Form from '../../lib/Form';
 import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
 import {
-  HIBERNATION_STRATEGIES, SIDEBAR_WIDTH, ICON_SIZES, NAVIGATION_BAR_BEHAVIOURS, SEARCH_ENGINE_NAMES, TODO_APPS,
-  DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED, DEFAULT_IS_FEATURE_ENABLED_BY_USER, WAKE_UP_STRATEGIES,
+  HIBERNATION_STRATEGIES,
+  SIDEBAR_WIDTH,
+  ICON_SIZES,
+  NAVIGATION_BAR_BEHAVIOURS,
+  SEARCH_ENGINE_NAMES,
+  TODO_APPS,
+  DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED,
+  DEFAULT_IS_FEATURE_ENABLED_BY_USER,
+  WAKE_UP_STRATEGIES,
 } from '../../config';
 import { DEFAULT_APP_SETTINGS, isMac } from '../../environment';
 
@@ -31,195 +38,193 @@ const debug = require('debug')('Ferdi:EditSettingsScreen');
 const messages = defineMessages({
   autoLaunchOnStart: {
     id: 'settings.app.form.autoLaunchOnStart',
-    defaultMessage: '!!!Launch Ferdi on start',
+    defaultMessage: 'Launch Ferdi on start',
   },
   autoLaunchInBackground: {
     id: 'settings.app.form.autoLaunchInBackground',
-    defaultMessage: '!!!Open in background',
+    defaultMessage: 'Open in background',
   },
   runInBackground: {
     id: 'settings.app.form.runInBackground',
-    defaultMessage: '!!!Keep Ferdi in background when closing the window',
+    defaultMessage: 'Keep Ferdi in background when closing the window',
   },
   startMinimized: {
     id: 'settings.app.form.startMinimized',
-    defaultMessage: '!!!Start minimized',
+    defaultMessage: 'Start minimized',
   },
   confirmOnQuit: {
     id: 'settings.app.form.confirmOnQuit',
-    defaultMessage: '!!!Confirm when quitting Ferdi',
+    defaultMessage: 'Confirm when quitting Ferdi',
   },
   enableSystemTray: {
     id: 'settings.app.form.enableSystemTray',
-    defaultMessage: '!!!Always show Ferdi in System Tray',
+    defaultMessage: 'Always show Ferdi in System Tray',
   },
   enableMenuBar: {
     id: 'settings.app.form.enableMenuBar',
-    defaultMessage: '!!!Always show Ferdi in Menu Bar',
+    defaultMessage: 'Always show Ferdi in Menu Bar',
   },
   reloadAfterResume: {
     id: 'settings.app.form.reloadAfterResume',
-    defaultMessage: '!!!Reload Ferdi after system resume',
+    defaultMessage: 'Reload Ferdi after system resume',
   },
   minimizeToSystemTray: {
     id: 'settings.app.form.minimizeToSystemTray',
-    defaultMessage: '!!!Minimize Ferdi to system tray',
+    defaultMessage: 'Minimize Ferdi to system tray',
   },
   closeToSystemTray: {
     id: 'settings.app.form.closeToSystemTray',
-    defaultMessage: '!!!Close Ferdi to system tray',
+    defaultMessage: 'Close Ferdi to system tray',
   },
   privateNotifications: {
     id: 'settings.app.form.privateNotifications',
-    defaultMessage: '!!!Don\'t show message content in notifications',
+    defaultMessage: "Don't show message content in notifications",
   },
   clipboardNotifications: {
     id: 'settings.app.form.clipboardNotifications',
-    defaultMessage: '!!!Don\'t show notifications for clipboard events',
+    defaultMessage: "Don't show notifications for clipboard events",
   },
   notifyTaskBarOnMessage: {
     id: 'settings.app.form.notifyTaskBarOnMessage',
-    defaultMessage: '!!!Notify TaskBar/Dock on new message',
+    defaultMessage: 'Notify TaskBar/Dock on new message',
   },
   navigationBarBehaviour: {
     id: 'settings.app.form.navigationBarBehaviour',
-    defaultMessage: '!!!Navigation bar behaviour',
+    defaultMessage: 'Navigation bar behaviour',
   },
   searchEngine: {
     id: 'settings.app.form.searchEngine',
-    defaultMessage: '!!!Search engine',
+    defaultMessage: 'Search engine',
   },
   sentry: {
     id: 'settings.app.form.sentry',
-    defaultMessage: '!!!Send telemetry data',
+    defaultMessage: 'Send telemetry data',
   },
   hibernateOnStartup: {
     id: 'settings.app.form.hibernateOnStartup',
-    defaultMessage: '!!!Keep services in hibernation on startup',
+    defaultMessage: 'Keep services in hibernation on startup',
   },
   hibernationStrategy: {
     id: 'settings.app.form.hibernationStrategy',
-    defaultMessage: '!!!Hibernation strategy',
+    defaultMessage: 'Hibernation strategy',
   },
   wakeUpStrategy: {
     id: 'settings.app.form.wakeUpStrategy',
-    defaultMessage: '!!!Wake up strategy',
+    defaultMessage: 'Wake up strategy',
   },
   predefinedTodoServer: {
     id: 'settings.app.form.predefinedTodoServer',
-    defaultMessage: '!!!Todo Server',
+    defaultMessage: 'Todo Server',
   },
   customTodoServer: {
     id: 'settings.app.form.customTodoServer',
-    defaultMessage: '!!!Custom TodoServer',
+    defaultMessage: 'Custom TodoServer',
   },
   enableLock: {
     id: 'settings.app.form.enableLock',
-    defaultMessage: '!!!Enable Password Lock',
+    defaultMessage: 'Enable Password Lock',
   },
   lockPassword: {
     id: 'settings.app.form.lockPassword',
-    defaultMessage: '!!!Password',
+    defaultMessage: 'Password',
   },
   useTouchIdToUnlock: {
     id: 'settings.app.form.useTouchIdToUnlock',
-    defaultMessage: '!!!Allow using Touch ID to unlock',
+    defaultMessage: 'Allow using Touch ID to unlock',
   },
   inactivityLock: {
     id: 'settings.app.form.inactivityLock',
-    defaultMessage: '!!!Lock after inactivity',
+    defaultMessage: 'Lock after inactivity',
   },
   scheduledDNDEnabled: {
     id: 'settings.app.form.scheduledDNDEnabled',
-    defaultMessage: '!!!Enable scheduled Do-not-Disturb',
+    defaultMessage: 'Enable scheduled Do-not-Disturb',
   },
   scheduledDNDStart: {
     id: 'settings.app.form.scheduledDNDStart',
-    defaultMessage: '!!!From',
+    defaultMessage: 'From',
   },
   scheduledDNDEnd: {
     id: 'settings.app.form.scheduledDNDEnd',
-    defaultMessage: '!!!To',
+    defaultMessage: 'To',
   },
   language: {
     id: 'settings.app.form.language',
-    defaultMessage: '!!!Language',
+    defaultMessage: 'Language',
   },
   darkMode: {
     id: 'settings.app.form.darkMode',
-    defaultMessage: '!!!Dark Mode',
+    defaultMessage: 'Dark Mode',
   },
   adaptableDarkMode: {
     id: 'settings.app.form.adaptableDarkMode',
-    defaultMessage: '!!!Synchronize dark mode with my OS\'s dark mode setting',
+    defaultMessage: "Synchronize dark mode with my OS's dark mode setting",
   },
   universalDarkMode: {
     id: 'settings.app.form.universalDarkMode',
-    defaultMessage: '!!!Enable universal Dark Mode',
+    defaultMessage: 'Enable universal Dark Mode',
   },
   serviceRibbonWidth: {
     id: 'settings.app.form.serviceRibbonWidth',
-    defaultMessage: '!!!Sidebar width',
+    defaultMessage: 'Sidebar width',
   },
   iconSize: {
     id: 'settings.app.form.iconSize',
-    defaultMessage: '!!!Service icon size',
+    defaultMessage: 'Service icon size',
   },
   useVerticalStyle: {
     id: 'settings.app.form.useVerticalStyle',
-    defaultMessage: '!!!Use horizontal style',
+    defaultMessage: 'Use horizontal style',
   },
   alwaysShowWorkspaces: {
     id: 'settings.app.form.alwaysShowWorkspaces',
-    defaultMessage: '!!!Always show workspace drawer',
+    defaultMessage: 'Always show workspace drawer',
   },
   accentColor: {
     id: 'settings.app.form.accentColor',
-    defaultMessage: '!!!Accent color',
+    defaultMessage: 'Accent color',
   },
   showDisabledServices: {
     id: 'settings.app.form.showDisabledServices',
-    defaultMessage: '!!!Display disabled services tabs',
+    defaultMessage: 'Display disabled services tabs',
   },
   showMessageBadgeWhenMuted: {
     id: 'settings.app.form.showMessagesBadgesWhenMuted',
-    defaultMessage: '!!!Show unread message badge when notifications are disabled',
+    defaultMessage: 'Show unread message badge when notifications are disabled',
   },
   showDragArea: {
     id: 'settings.app.form.showDragArea',
-    defaultMessage: '!!!Show draggable area on window',
+    defaultMessage: 'Show draggable area on window',
   },
   enableSpellchecking: {
     id: 'settings.app.form.enableSpellchecking',
-    defaultMessage: '!!!Enable spell checking',
+    defaultMessage: 'Enable spell checking',
   },
   enableGPUAcceleration: {
     id: 'settings.app.form.enableGPUAcceleration',
-    defaultMessage: '!!!Enable GPU Acceleration',
+    defaultMessage: 'Enable GPU Acceleration',
   },
   beta: {
     id: 'settings.app.form.beta',
-    defaultMessage: '!!!Include beta versions',
+    defaultMessage: 'Include beta versions',
   },
   automaticUpdates: {
     id: 'settings.app.form.automaticUpdates',
-    defaultMessage: '!!!Enable updates',
+    defaultMessage: 'Enable updates',
   },
   enableTodos: {
     id: 'settings.app.form.enableTodos',
-    defaultMessage: '!!!Enable Franz Todos',
+    defaultMessage: 'Enable Franz Todos',
   },
   keepAllWorkspacesLoaded: {
     id: 'settings.app.form.keepAllWorkspacesLoaded',
-    defaultMessage: '!!!Keep all workspaces loaded',
+    defaultMessage: 'Keep all workspaces loaded',
   },
 });
 
-export default @inject('stores', 'actions') @observer class EditSettingsScreen extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
+@inject('stores', 'actions')
+@observer
+class EditSettingsScreen extends Component {
   constructor(props) {
     super(props);
 
@@ -288,7 +293,9 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         useVerticalStyle: Boolean(settingsData.useVerticalStyle),
         alwaysShowWorkspaces: Boolean(settingsData.alwaysShowWorkspaces),
         accentColor: settingsData.accentColor,
-        showMessageBadgeWhenMuted: Boolean(settingsData.showMessageBadgeWhenMuted),
+        showMessageBadgeWhenMuted: Boolean(
+          settingsData.showMessageBadgeWhenMuted,
+        ),
         showDragArea: Boolean(settingsData.showDragArea),
         enableSpellchecking: Boolean(settingsData.enableSpellchecking),
         spellcheckerLanguage: settingsData.spellcheckerLanguage,
@@ -309,24 +316,27 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
 
     if (workspaces.isFeatureActive) {
       const { keepAllWorkspacesLoaded } = workspaces.settings;
-      if (Boolean(keepAllWorkspacesLoaded) !== Boolean(settingsData.keepAllWorkspacesLoaded)) {
+      if (
+        Boolean(keepAllWorkspacesLoaded) !==
+        Boolean(settingsData.keepAllWorkspacesLoaded)
+      ) {
         workspaceActions.toggleKeepAllWorkspacesLoadedSetting();
       }
     }
 
     if (todos.isFeatureActive) {
       const { isFeatureEnabledByUser } = todos.settings;
-      if (Boolean(isFeatureEnabledByUser) !== Boolean(settingsData.enableTodos)) {
+      if (
+        Boolean(isFeatureEnabledByUser) !== Boolean(settingsData.enableTodos)
+      ) {
         todosActions.toggleTodosFeatureVisibility();
       }
     }
   }
 
   prepareForm() {
-    const {
-      app, settings, user, todos, workspaces,
-    } = this.props.stores;
-    const { intl } = this.context;
+    const { app, settings, user, todos, workspaces } = this.props.stores;
+    const { intl } = this.props;
     const { lockedPassword } = this.state;
 
     const locales = getSelectOptions({
@@ -370,7 +380,9 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
 
     const spellcheckingLanguages = getSelectOptions({
       locales: SPELLCHECKER_LOCALES,
-      automaticDetectionText: this.context.intl.formatMessage(globalMessages.spellcheckerAutomaticDetection),
+      automaticDetectionText: intl.formatMessage(
+        globalMessages.spellcheckerAutomaticDetection,
+      ),
     });
 
     const config = {
@@ -401,7 +413,9 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           default: DEFAULT_APP_SETTINGS.confirmOnQuit,
         },
         enableSystemTray: {
-          label: intl.formatMessage(isMac ? messages.enableMenuBar : messages.enableSystemTray),
+          label: intl.formatMessage(
+            isMac ? messages.enableMenuBar : messages.enableSystemTray,
+          ),
           value: settings.all.app.enableSystemTray,
           default: DEFAULT_APP_SETTINGS.enableSystemTray,
         },
@@ -637,23 +651,15 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
   }
 
   render() {
-    const {
-      app,
-      todos,
-      workspaces,
-      services,
-    } = this.props.stores;
+    const { app, todos, workspaces, services } = this.props.stores;
     const {
       updateStatus,
       updateStatusTypes,
       isClearingAllCache,
       lockingFeatureEnabled,
     } = app;
-    const {
-      checkForUpdates,
-      installUpdate,
-      clearAllCache,
-    } = this.props.actions.app;
+    const { checkForUpdates, installUpdate, clearAllCache } =
+      this.props.actions.app;
     const form = this.prepareForm();
 
     return (
@@ -666,7 +672,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           isUpdateAvailable={updateStatus === updateStatusTypes.AVAILABLE}
           noUpdateAvailable={updateStatus === updateStatusTypes.NOT_AVAILABLE}
           updateIsReadyToInstall={updateStatus === updateStatusTypes.DOWNLOADED}
-          onSubmit={(d) => this.onSubmit(d)}
+          onSubmit={d => this.onSubmit(d)}
           getCacheSize={() => app.cacheSize}
           isClearingAllCache={isClearingAllCache}
           onClearAllCache={clearAllCache}
@@ -675,9 +681,13 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           lockingFeatureEnabled={lockingFeatureEnabled}
           automaticUpdates={this.props.stores.settings.app.automaticUpdates}
           isDarkmodeEnabled={this.props.stores.settings.app.darkMode}
-          isAdaptableDarkModeEnabled={this.props.stores.settings.app.adaptableDarkMode}
+          isAdaptableDarkModeEnabled={
+            this.props.stores.settings.app.adaptableDarkMode
+          }
           isTodosActivated={this.props.stores.todos.isFeatureEnabledByUser}
-          isUsingCustomTodoService={this.props.stores.todos.isUsingCustomTodoService}
+          isUsingCustomTodoService={
+            this.props.stores.todos.isUsingCustomTodoService
+          }
           isNightlyEnabled={this.props.stores.settings.app.nightly}
           hasAddedTodosAsService={services.isTodosServiceAdded}
           isOnline={app.isOnline}
@@ -704,3 +714,5 @@ EditSettingsScreen.wrappedComponent.propTypes = {
     workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired,
   }).isRequired,
 };
+
+export default injectIntl(EditSettingsScreen);
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index 820b5e4d3..92ef94c29 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import UserStore from '../../stores/UserStore';
 import Form from '../../lib/Form';
@@ -13,47 +13,45 @@ import { required, email, minLength } from '../../helpers/validation-helpers';
 const messages = defineMessages({
   firstname: {
     id: 'settings.user.form.firstname',
-    defaultMessage: '!!!Firstname',
+    defaultMessage: 'Firstname',
   },
   lastname: {
     id: 'settings.user.form.lastname',
-    defaultMessage: '!!!Lastname',
+    defaultMessage: 'Lastname',
   },
   email: {
     id: 'settings.user.form.email',
-    defaultMessage: '!!!Email',
+    defaultMessage: 'Email',
   },
   accountTypeLabel: {
     id: 'settings.user.form.accountType.label',
-    defaultMessage: '!!!Account type',
+    defaultMessage: 'Account type',
   },
   accountTypeIndividual: {
     id: 'settings.user.form.accountType.individual',
-    defaultMessage: '!!!Individual',
+    defaultMessage: 'Individual',
   },
   accountTypeNonProfit: {
     id: 'settings.user.form.accountType.non-profit',
-    defaultMessage: '!!!Non-Profit',
+    defaultMessage: 'Non-Profit',
   },
   accountTypeCompany: {
     id: 'settings.user.form.accountType.company',
-    defaultMessage: '!!!Company',
+    defaultMessage: 'Company',
   },
   currentPassword: {
     id: 'settings.user.form.currentPassword',
-    defaultMessage: '!!!Current password',
+    defaultMessage: 'Current password',
   },
   newPassword: {
     id: 'settings.user.form.newPassword',
-    defaultMessage: '!!!New password',
+    defaultMessage: 'New password',
   },
 });
 
-export default @inject('stores', 'actions') @observer class EditUserScreen extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
+@inject('stores', 'actions')
+@observer
+class EditUserScreen extends Component {
   componentWillUnmount() {
     this.props.actions.user.resetStatus();
   }
@@ -67,7 +65,7 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
   }
 
   prepareForm(user) {
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     const config = {
       fields: {
@@ -93,16 +91,20 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
           value: user.accountType,
           validators: [required],
           label: intl.formatMessage(messages.accountTypeLabel),
-          options: [{
-            value: 'individual',
-            label: intl.formatMessage(messages.accountTypeIndividual),
-          }, {
-            value: 'non-profit',
-            label: intl.formatMessage(messages.accountTypeNonProfit),
-          }, {
-            value: 'company',
-            label: intl.formatMessage(messages.accountTypeCompany),
-          }],
+          options: [
+            {
+              value: 'individual',
+              label: intl.formatMessage(messages.accountTypeIndividual),
+            },
+            {
+              value: 'non-profit',
+              label: intl.formatMessage(messages.accountTypeNonProfit),
+            },
+            {
+              value: 'company',
+              label: intl.formatMessage(messages.accountTypeCompany),
+            },
+          ],
         },
         organization: {
           label: intl.formatMessage(messages.accountTypeCompany),
@@ -129,7 +131,7 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
     const { user } = this.props.stores;
 
     if (user.getUserInfoRequest.isExecuting) {
-      return (<div>Loading...</div>);
+      return <div>Loading...</div>;
     }
 
     const form = this.prepareForm(user.data);
@@ -141,7 +143,7 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
           status={user.actionStatus}
           form={form}
           isSaving={user.updateUserInfoRequest.isExecuting}
-          onSubmit={(d) => this.onSubmit(d)}
+          onSubmit={d => this.onSubmit(d)}
         />
       </ErrorBoundary>
     );
@@ -156,3 +158,5 @@ EditUserScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
+
+export default injectIntl(EditUserScreen);
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js
index 4fdaef08b..f17f6390c 100644
--- a/src/containers/settings/InviteScreen.js
+++ b/src/containers/settings/InviteScreen.js
@@ -6,7 +6,9 @@ import Invite from '../../components/auth/Invite';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import UserStore from '../../stores/UserStore';
 
-export default @inject('stores', 'actions') @observer class InviteScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class InviteScreen extends Component {
   componentWillUnmount() {
     this.props.stores.user.inviteRequest.reset();
   }
@@ -20,7 +22,9 @@ export default @inject('stores', 'actions') @observer class InviteScreen extends
         <Invite
           onSubmit={actions.user.invite}
           isLoadingInvite={user.inviteRequest.isExecuting}
-          isInviteSuccessful={user.inviteRequest.wasExecuted && !user.inviteRequest.isError}
+          isInviteSuccessful={
+            user.inviteRequest.wasExecuted && !user.inviteRequest.isError
+          }
           embed
         />
       </ErrorBoundary>
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index 784052bbe..06ddabe4c 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -18,7 +18,9 @@ import RecipePreview from '../../models/RecipePreview';
 import AppStore from '../../stores/AppStore';
 import { openPath } from '../../helpers/url-helpers';
 
-export default @inject('stores', 'actions') @observer class RecipesScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class RecipesScreen extends Component {
   static propTypes = {
     params: PropTypes.shape({
       filter: PropTypes.string,
@@ -75,25 +77,32 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
   }
 
   _sortByName(recipe1, recipe2) {
-    if (recipe1.name.toLowerCase() < recipe2.name.toLowerCase()) { return -1; }
-    if (recipe1.name.toLowerCase() > recipe2.name.toLowerCase()) { return 1; }
+    if (recipe1.name.toLowerCase() < recipe2.name.toLowerCase()) {
+      return -1;
+    }
+    if (recipe1.name.toLowerCase() > recipe2.name.toLowerCase()) {
+      return 1;
+    }
     return 0;
   }
 
   prepareRecipes(recipes) {
-    return recipes
-    // Filter out duplicate recipes
-      .filter((recipe, index, self) => {
-        const ids = self.map((rec) => rec.id);
-        return ids.indexOf(recipe.id) === index;
-
-        // Sort alphabetically
-      }).sort(this._sortByName);
+    return (
+      recipes
+        // Filter out duplicate recipes
+        .filter((recipe, index, self) => {
+          const ids = self.map(rec => rec.id);
+          return ids.indexOf(recipe.id) === index;
+
+          // Sort alphabetically
+        })
+        .sort(this._sortByName)
+    );
   }
 
   // Create an array of RecipePreviews from an array of recipe objects
   createPreviews(recipes) {
-    return recipes.map((recipe) => new RecipePreview(recipe));
+    return recipes.map(recipe => new RecipePreview(recipe));
   }
 
   resetSearch() {
@@ -101,16 +110,9 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
   }
 
   render() {
-    const {
-      recipePreviews,
-      recipes,
-      services,
-    } = this.props.stores;
+    const { recipePreviews, recipes, services } = this.props.stores;
 
-    const {
-      app: appActions,
-      service: serviceActions,
-    } = this.props.actions;
+    const { app: appActions, service: serviceActions } = this.props.actions;
 
     const { filter } = { filter: 'all', ...this.props.params };
     let recipeFilter;
@@ -125,21 +127,33 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
     }
     recipeFilter = recipeFilter.sort(this._sortByName);
 
-    const allRecipes = this.state.needle ? this.prepareRecipes([
-      // All search recipes from server
-      ...recipePreviews.searchResults,
-      // All search recipes from local recipes
-      ...this.createPreviews(
-        this.customRecipes
-          .filter((service) => service.name.toLowerCase().includes(this.state.needle.toLowerCase()) || (service.aliases || []).some(alias => alias.toLowerCase().includes(this.state.needle.toLowerCase()))),
-      ),
-    ]).sort(this._sortByName) : recipeFilter;
-
-    const customWebsiteRecipe = recipePreviews.all.find((service) => service.id === CUSTOM_WEBSITE_RECIPE_ID);
+    const allRecipes = this.state.needle
+      ? this.prepareRecipes([
+        // All search recipes from server
+        ...recipePreviews.searchResults,
+        // All search recipes from local recipes
+        ...this.createPreviews(
+          this.customRecipes.filter(
+            service =>
+              service.name
+                .toLowerCase()
+                .includes(this.state.needle.toLowerCase()) ||
+                (service.aliases || []).some(alias =>
+                  alias.toLowerCase().includes(this.state.needle.toLowerCase()),
+                ),
+          ),
+        ),
+      ]).sort(this._sortByName)
+      : recipeFilter;
+
+    const customWebsiteRecipe = recipePreviews.all.find(
+      service => service.id === CUSTOM_WEBSITE_RECIPE_ID,
+    );
 
-    const isLoading = recipePreviews.allRecipePreviewsRequest.isExecuting
-      || recipes.installRecipeRequest.isExecuting
-      || recipePreviews.searchRecipePreviewsRequest.isExecuting;
+    const isLoading =
+      recipePreviews.allRecipePreviewsRequest.isExecuting ||
+      recipes.installRecipeRequest.isExecuting ||
+      recipePreviews.searchRecipePreviewsRequest.isExecuting;
 
     const recipeDirectory = userDataRecipesPath('dev');
 
@@ -151,14 +165,16 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
           isLoading={isLoading}
           addedServiceCount={services.all.length}
           showAddServiceInterface={serviceActions.showAddServiceInterface}
-          searchRecipes={(e) => this.searchRecipes(e)}
+          searchRecipes={e => this.searchRecipes(e)}
           resetSearch={() => this.resetSearch()}
           searchNeedle={this.state.needle}
           serviceStatus={services.actionStatus}
           recipeFilter={filter}
           recipeDirectory={recipeDirectory}
           openRecipeDirectory={() => openPath(recipeDirectory)}
-          openDevDocs={() => appActions.openExternalUrl({ url: FRANZ_DEV_DOCS })}
+          openDevDocs={() =>
+            appActions.openExternalUrl({ url: FRANZ_DEV_DOCS })
+          }
         />
       </ErrorBoundary>
     );
@@ -180,3 +196,5 @@ RecipesScreen.wrappedComponent.propTypes = {
     }).isRequired,
   }).isRequired,
 };
+
+export default RecipesScreen;
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js
index eb2b1bcb5..c9dfc68d0 100644
--- a/src/containers/settings/ServicesScreen.js
+++ b/src/containers/settings/ServicesScreen.js
@@ -10,7 +10,9 @@ import ServiceStore from '../../stores/ServicesStore';
 import ServicesDashboard from '../../components/settings/services/ServicesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 
-export default @inject('stores', 'actions') @observer class ServicesScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class ServicesScreen extends Component {
   componentWillUnmount() {
     this.props.actions.service.resetFilter();
     this.props.actions.service.resetStatus();
@@ -23,11 +25,7 @@ export default @inject('stores', 'actions') @observer class ServicesScreen exten
 
   render() {
     const { user, services, router } = this.props.stores;
-    const {
-      toggleService,
-      filter,
-      resetFilter,
-    } = this.props.actions.service;
+    const { toggleService, filter, resetFilter } = this.props.actions.service;
     const isLoading = services.allServicesRequest.isExecuting;
 
     let allServices = services.all;
@@ -47,7 +45,10 @@ export default @inject('stores', 'actions') @observer class ServicesScreen exten
           filterServices={filter}
           resetFilter={resetFilter}
           goTo={router.push}
-          servicesRequestFailed={services.allServicesRequest.wasExecuted && services.allServicesRequest.isError}
+          servicesRequestFailed={
+            services.allServicesRequest.wasExecuted &&
+            services.allServicesRequest.isError
+          }
           retryServicesRequest={() => services.allServicesRequest.reload()}
           searchNeedle={services.filterNeedle}
         />
@@ -66,3 +67,5 @@ ServicesScreen.wrappedComponent.propTypes = {
     service: PropTypes.instanceOf(ServiceStore).isRequired,
   }).isRequired,
 };
+
+export default ServicesScreen;
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js
index 9bb64b6fe..58e73f2f3 100644
--- a/src/containers/settings/SettingsWindow.js
+++ b/src/containers/settings/SettingsWindow.js
@@ -11,7 +11,9 @@ import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { workspaceStore } from '../../features/workspaces';
 import UIStore from '../../stores/UIStore';
 
-export default @inject('stores', 'actions') @observer class SettingsContainer extends Component {
+@inject('stores', 'actions')
+@observer
+class SettingsContainer extends Component {
   portalRoot = document.querySelector('#portalContainer');
 
   el = document.createElement('div');
@@ -36,16 +38,11 @@ export default @inject('stores', 'actions') @observer class SettingsContainer ex
     );
 
     return ReactDOM.createPortal(
-      (
-        <ErrorBoundary>
-          <Layout
-            navigation={navigation}
-            closeSettings={closeSettings}
-          >
-            {children}
-          </Layout>
-        </ErrorBoundary>
-      ),
+      <ErrorBoundary>
+        <Layout navigation={navigation} closeSettings={closeSettings}>
+          {children}
+        </Layout>
+      </ErrorBoundary>,
       this.el,
     );
   }
@@ -60,3 +57,5 @@ SettingsContainer.wrappedComponent.propTypes = {
     ui: PropTypes.instanceOf(UIStore).isRequired,
   }).isRequired,
 };
+
+export default SettingsContainer;
diff --git a/src/containers/settings/SupportScreen.js b/src/containers/settings/SupportScreen.js
index 7d3b22f19..646f672ce 100644
--- a/src/containers/settings/SupportScreen.js
+++ b/src/containers/settings/SupportScreen.js
@@ -6,7 +6,8 @@ import SupportFerdi from '../../components/settings/supportFerdi/SupportFerdiDas
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import AppStore from '../../stores/AppStore';
 
-export default @inject('actions') class SupportScreen extends Component {
+@inject('actions')
+class SupportScreen extends Component {
   constructor(props) {
     super(props);
 
@@ -20,9 +21,7 @@ export default @inject('actions') class SupportScreen extends Component {
   render() {
     return (
       <ErrorBoundary>
-        <SupportFerdi
-          openLink={this.openLink}
-        />
+        <SupportFerdi openLink={this.openLink} />
       </ErrorBoundary>
     );
   }
@@ -33,3 +32,5 @@ SupportScreen.wrappedComponent.propTypes = {
     app: PropTypes.instanceOf(AppStore).isRequired,
   }).isRequired,
 };
+
+export default SupportScreen;
diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js
index 10c2e36ef..ea447469b 100644
--- a/src/containers/settings/TeamScreen.js
+++ b/src/containers/settings/TeamScreen.js
@@ -10,7 +10,9 @@ import TeamDashboard from '../../components/settings/team/TeamDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { DEV_API_FRANZ_WEBSITE } from '../../config';
 
-export default @inject('stores', 'actions') @observer class TeamScreen extends Component {
+@inject('stores', 'actions')
+@observer
+class TeamScreen extends Component {
   handleWebsiteLink(route) {
     const { actions, stores } = this.props;
 
@@ -29,7 +31,10 @@ export default @inject('stores', 'actions') @observer class TeamScreen extends C
       <ErrorBoundary>
         <TeamDashboard
           isLoading={isLoadingUserInfo}
-          userInfoRequestFailed={user.getUserInfoRequest.wasExecuted && user.getUserInfoRequest.isError}
+          userInfoRequestFailed={
+            user.getUserInfoRequest.wasExecuted &&
+            user.getUserInfoRequest.isError
+          }
           retryUserInfoRequest={() => this.reloadData()}
           openTeamManagement={() => this.handleWebsiteLink('/user/team')}
           server={server}
@@ -50,3 +55,5 @@ TeamScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
+
+export default TeamScreen;
diff --git a/src/features/basicAuth/Component.js b/src/features/basicAuth/Component.js
index a9601836b..3cf937f98 100644
--- a/src/features/basicAuth/Component.js
+++ b/src/features/basicAuth/Component.js
@@ -2,19 +2,14 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import injectSheet from 'react-jss';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import classnames from 'classnames';
 
 import Modal from '../../components/ui/Modal';
 import Input from '../../components/ui/Input';
 import Button from '../../components/ui/Button';
 
-import {
-  state,
-  resetState,
-  sendCredentials,
-  cancelLogin,
-} from './store';
+import { state, resetState, sendCredentials, cancelLogin } from './store';
 import Form from './Form';
 
 import styles from './styles';
@@ -23,17 +18,15 @@ import globalMessages from '../../i18n/globalMessages';
 const messages = defineMessages({
   signIn: {
     id: 'feature.basicAuth.signIn',
-    defaultMessage: '!!!Sign In',
+    defaultMessage: 'Sign In',
   },
 });
 
-export default @injectSheet(styles) @observer class BasicAuthModal extends Component {
+@injectSheet(styles)
+@observer
+class BasicAuthModal extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
-  }
-
-  static contextTypes = {
-    intl: intlShape,
   };
 
   submit(e) {
@@ -56,20 +49,15 @@ export default @injectSheet(styles) @observer class BasicAuthModal extends Compo
   }
 
   render() {
-    const {
-      classes,
-    } = this.props;
+    const { classes } = this.props;
 
-    const {
-      isModalVisible,
-      authInfo,
-    } = state;
+    const { isModalVisible, authInfo } = state;
 
     if (!authInfo) {
       return null;
     }
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <Modal
@@ -89,10 +77,7 @@ export default @injectSheet(styles) @observer class BasicAuthModal extends Compo
           onSubmit={this.submit.bind(this)}
           className={classnames('franz-form', classes.form)}
         >
-          <Input
-            field={Form.$('user')}
-            showLabel={false}
-          />
+          <Input field={Form.$('user')} showLabel={false} />
           <Input
             field={Form.$('password')}
             showLabel={false}
@@ -105,13 +90,11 @@ export default @injectSheet(styles) @observer class BasicAuthModal extends Compo
               buttonType="secondary"
               onClick={this.cancel.bind(this)}
             />
-            <Button
-              type="submit"
-              label={intl.formatMessage(messages.signIn)}
-            />
+            <Button type="submit" label={intl.formatMessage(messages.signIn)} />
           </div>
         </form>
       </Modal>
     );
   }
 }
+export default injectIntl(BasicAuthModal);
diff --git a/src/features/nightlyBuilds/Component.js b/src/features/nightlyBuilds/Component.js
index e43287db5..814d529d9 100644
--- a/src/features/nightlyBuilds/Component.js
+++ b/src/features/nightlyBuilds/Component.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
 import injectSheet from 'react-jss';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { H1 } from '@meetfranz/ui';
 
 import Modal from '../../components/ui/Modal';
@@ -16,15 +16,16 @@ import globalMessages from '../../i18n/globalMessages';
 const messages = defineMessages({
   title: {
     id: 'feature.nightlyBuilds.title',
-    defaultMessage: '!!!Nightly Builds',
+    defaultMessage: 'Nightly Builds',
   },
   info: {
     id: 'feature.nightlyBuilds.info',
-    defaultMessage: '!!!Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don\'t know what you are doing, we suggest not activating nightly builds.',
+    defaultMessage:
+      "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   },
   activate: {
     id: 'feature.nightlyBuilds.activate',
-    defaultMessage: '!!!Activate',
+    defaultMessage: 'Activate',
   },
 });
 
@@ -52,11 +53,10 @@ const styles = () => ({
   },
 });
 
-export default @injectSheet(styles) @inject('stores', 'actions') @observer class NightlyBuildsModal extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
+@injectSheet(styles)
+@inject('stores', 'actions')
+@observer
+class NightlyBuildsModal extends Component {
   close() {
     ModalState.isModalVisible = false;
 
@@ -84,11 +84,9 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
   render() {
     const { isModalVisible } = ModalState;
 
-    const {
-      classes,
-    } = this.props;
+    const { classes } = this.props;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <Modal
@@ -132,3 +130,5 @@ NightlyBuildsModal.wrappedComponent.propTypes = {
   }).isRequired,
   classes: PropTypes.object.isRequired,
 };
+
+export default injectIntl(NightlyBuildsModal);
diff --git a/src/features/publishDebugInfo/Component.js b/src/features/publishDebugInfo/Component.js
index 5387bd358..5b5036752 100644
--- a/src/features/publishDebugInfo/Component.js
+++ b/src/features/publishDebugInfo/Component.js
@@ -2,7 +2,7 @@ import { H1 } from '@meetfranz/ui';
 import { inject, observer } from 'mobx-react';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import injectSheet from 'react-jss';
 import { state as ModalState } from './store';
 import { sendAuthRequest } from '../../api/utils/auth';
@@ -18,35 +18,37 @@ const debug = require('debug')('Ferdi:feature:publishDebugInfo');
 const messages = defineMessages({
   title: {
     id: 'feature.publishDebugInfo.title',
-    defaultMessage: '!!!Publish debug information',
+    defaultMessage: 'Publish debug information',
   },
   info: {
     id: 'feature.publishDebugInfo.info',
-    defaultMessage: '!!!Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger\'s privacy policy and terms of service',
+    defaultMessage:
+      "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   },
   error: {
     id: 'feature.publishDebugInfo.error',
-    defaultMessage: '!!!There was an error while trying to publish the debug information. Please try again later or view the console for more information.',
+    defaultMessage:
+      'There was an error while trying to publish the debug information. Please try again later or view the console for more information.',
   },
   privacy: {
     id: 'feature.publishDebugInfo.privacy',
-    defaultMessage: '!!!Privacy policy',
+    defaultMessage: 'Privacy policy',
   },
   terms: {
     id: 'feature.publishDebugInfo.terms',
-    defaultMessage: '!!!Terms of service',
+    defaultMessage: 'Terms of service',
   },
   publish: {
     id: 'feature.publishDebugInfo.publish',
-    defaultMessage: '!!!Accept and publish',
+    defaultMessage: 'Accept and publish',
   },
   published: {
     id: 'feature.publishDebugInfo.published',
-    defaultMessage: '!!!Your debug log was published and is now availible at',
+    defaultMessage: 'Your debug log was published and is now availible at',
   },
 });
 
-const styles = (theme) => ({
+const styles = theme => ({
   container: {
     minWidth: '70vw',
   },
@@ -69,7 +71,8 @@ const styles = (theme) => ({
     width: '100%',
 
     '& div': {
-      fontFamily: 'SFMono-Regular,Consolas,Liberation Mono,Menlo,Courier,monospace',
+      fontFamily:
+        'SFMono-Regular,Consolas,Liberation Mono,Menlo,Courier,monospace',
     },
 
     '& input': {
@@ -81,20 +84,19 @@ const styles = (theme) => ({
   },
 });
 
-export default @injectSheet(styles) @inject('stores', 'actions') @observer class PublishDebugLogModal extends Component {
+@injectSheet(styles)
+@inject('stores', 'actions')
+@observer
+class PublishDebugLogModal extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     log: null,
     error: false,
     isSendingLog: false,
-  }
+  };
 
   // Close this modal
   close() {
@@ -109,12 +111,16 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
 
     const debugInfo = JSON.stringify(this.props.stores.app.debugInfo);
 
-    const request = await sendAuthRequest(`${DEBUG_API}/create`, {
-      method: 'POST',
-      body: JSON.stringify({
-        log: debugInfo,
-      }),
-    }, false);
+    const request = await sendAuthRequest(
+      `${DEBUG_API}/create`,
+      {
+        method: 'POST',
+        body: JSON.stringify({
+          log: debugInfo,
+        }),
+      },
+      false,
+    );
 
     debug(`debugInfo: publishing status: ${request.status}`);
     if (request.status === 200) {
@@ -140,17 +146,11 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
   render() {
     const { isModalVisible } = ModalState;
 
-    const {
-      classes,
-    } = this.props;
+    const { classes } = this.props;
 
-    const {
-      log,
-      error,
-      isSendingLog,
-    } = this.state;
+    const { log, error, isSendingLog } = this.state;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <Modal
@@ -159,12 +159,12 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
         close={() => this.close()}
       >
         <div className={classes.container}>
-          <H1>
-            {intl.formatMessage(messages.title)}
-          </H1>
-          { log && (
+          <H1>{intl.formatMessage(messages.title)}</H1>
+          {log && (
             <>
-              <p className={classes.info}>{intl.formatMessage(messages.published)}</p>
+              <p className={classes.info}>
+                {intl.formatMessage(messages.published)}
+              </p>
               <Input
                 className={classes.url}
                 showLabel={false}
@@ -184,12 +184,24 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
 
           {!log && !error && (
             <>
-              <p className={classes.info}>{intl.formatMessage(messages.info)}</p>
-
-              <a href={`${DEBUG_API}/privacy.html`} target="_blank" className={classes.link} rel="noreferrer">
+              <p className={classes.info}>
+                {intl.formatMessage(messages.info)}
+              </p>
+
+              <a
+                href={`${DEBUG_API}/privacy.html`}
+                target="_blank"
+                className={classes.link}
+                rel="noreferrer"
+              >
                 {intl.formatMessage(messages.privacy)}
               </a>
-              <a href={`${DEBUG_API}/terms.html`} target="_blank" className={classes.link} rel="noreferrer">
+              <a
+                href={`${DEBUG_API}/terms.html`}
+                target="_blank"
+                className={classes.link}
+                rel="noreferrer"
+              >
                 {intl.formatMessage(messages.terms)}
               </a>
 
@@ -216,3 +228,5 @@ PublishDebugLogModal.wrappedComponent.propTypes = {
     service: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
 };
+
+export default injectIntl(PublishDebugLogModal);
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js
index 78d5d94a0..df2bf968d 100644
--- a/src/features/quickSwitch/Component.js
+++ b/src/features/quickSwitch/Component.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
 import { reaction } from 'mobx';
 import injectSheet from 'react-jss';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { Input } from '@meetfranz/forms';
 import { H1 } from '@meetfranz/ui';
 
@@ -16,19 +16,20 @@ import ServicesStore from '../../stores/ServicesStore';
 const messages = defineMessages({
   title: {
     id: 'feature.quickSwitch.title',
-    defaultMessage: '!!!QuickSwitch',
+    defaultMessage: 'QuickSwitch',
   },
   search: {
     id: 'feature.quickSwitch.search',
-    defaultMessage: '!!!Search...',
+    defaultMessage: 'Search...',
   },
   info: {
     id: 'feature.quickSwitch.info',
-    defaultMessage: '!!!Select a service with TAB, ↑ and ↓. Open a service with ENTER.',
+    defaultMessage:
+      'Select a service with TAB, ↑ and ↓. Open a service with ENTER.',
   },
 });
 
-const styles = (theme) => ({
+const styles = theme => ({
   modal: {
     width: '80%',
     maxWidth: 600,
@@ -80,20 +81,19 @@ const styles = (theme) => ({
   },
 });
 
-export default @injectSheet(styles) @inject('stores', 'actions') @observer class QuickSwitchModal extends Component {
+@injectSheet(styles)
+@inject('stores', 'actions')
+@observer
+class QuickSwitchModal extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     selected: 0,
     search: '',
     wasPrevVisible: false,
-  }
+  };
 
   ARROW_DOWN = 40;
 
@@ -118,9 +118,7 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
     this.openService = this.openService.bind(this);
 
     reaction(
-      () => (
-        ModalState.isModalVisible
-      ),
+      () => ModalState.isModalVisible,
       () => {
         this._handleVisibilityChange();
       },
@@ -140,10 +138,17 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
   // Get currently shown services
   services() {
     let services = [];
-    if (this.state.search && compact(invoke(this.state.search, 'match', /^[a-z0-9]/i)).length > 0) {
+    if (
+      this.state.search &&
+      compact(invoke(this.state.search, 'match', /^[a-z0-9]/i)).length > 0
+    ) {
       // Apply simple search algorythm to list of all services
       services = this.props.stores.services.allDisplayed;
-      services = services.filter((service) => service.name.toLowerCase().search(this.state.search.toLowerCase()) !== -1);
+      services = services.filter(
+        service =>
+          service.name.toLowerCase().search(this.state.search.toLowerCase()) !==
+          -1,
+      );
     } else {
       // Add the currently active service first
       const currentService = this.props.stores.services.active;
@@ -186,14 +191,14 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
   // Change the selected service
   // factor should be -1 or 1
   changeSelected(factor) {
-    this.setState((state) => {
+    this.setState(state => {
       let newSelected = state.selected + factor;
       const services = this.services().length;
 
       // Roll around when on edge of list
       if (state.selected < 1 && factor === -1) {
         newSelected = services - 1;
-      } else if ((state.selected >= (services - 1)) && factor === 1) {
+      } else if (state.selected >= services - 1 && factor === 1) {
         newSelected = 0;
       }
 
@@ -286,17 +291,13 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
   render() {
     const { isModalVisible } = ModalState;
 
-    const {
-      openService,
-    } = this;
+    const { openService } = this;
 
-    const {
-      classes,
-    } = this.props;
+    const { classes } = this.props;
 
     const services = this.services();
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <Modal
@@ -318,12 +319,16 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
         </div>
 
         <div className={classes.services}>
-          { services.map((service, index) => (
+          {services.map((service, index) => (
             <div
-              className={`${classes.service} ${this.state.selected === index ? `${classes.activeService} active` : ''} service`}
+              className={`${classes.service} ${
+                this.state.selected === index
+                  ? `${classes.activeService} active`
+                  : ''
+              } service`}
               onClick={() => openService(index)}
               key={service.id}
-              ref={(el) => {
+              ref={el => {
                 this.serviceElements[index] = el;
               }}
             >
@@ -332,9 +337,7 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class
                 className={classes.serviceIcon}
                 alt={service.recipe.name}
               />
-              <div>
-                { service.name }
-              </div>
+              <div>{service.name}</div>
             </div>
           ))}
         </div>
@@ -356,3 +359,5 @@ QuickSwitchModal.wrappedComponent.propTypes = {
     service: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
 };
+
+export default injectIntl(QuickSwitchModal);
diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js
index bebf52c08..97fa20dcc 100644
--- a/src/features/webControls/components/WebControls.js
+++ b/src/features/webControls/components/WebControls.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
 import { Icon } from '@meetfranz/ui';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import {
   mdiReload,
@@ -16,23 +16,23 @@ import {
 const messages = defineMessages({
   goHome: {
     id: 'webControls.goHome',
-    defaultMessage: '!!!Home',
+    defaultMessage: 'Home',
   },
   openInBrowser: {
     id: 'webControls.openInBrowser',
-    defaultMessage: '!!!Open in Browser',
+    defaultMessage: 'Open in Browser',
   },
   back: {
     id: 'webControls.back',
-    defaultMessage: '!!!Back',
+    defaultMessage: 'Back',
   },
   forward: {
     id: 'webControls.forward',
-    defaultMessage: '!!!Forward',
+    defaultMessage: 'Forward',
   },
   reload: {
     id: 'webControls.reload',
-    defaultMessage: '!!!Reload',
+    defaultMessage: 'Reload',
   },
 });
 
@@ -109,10 +109,6 @@ class WebControls extends Component {
     navigate: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   static getDerivedStateFromProps(props, state) {
     const { url } = props;
     const { editUrl } = state;
@@ -148,7 +144,7 @@ class WebControls extends Component {
 
     const { inputUrl, editUrl } = this.state;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <div className={classes.root}>
@@ -241,4 +237,4 @@ class WebControls extends Component {
   }
 }
 
-export default WebControls;
+export default injectIntl(WebControls);
diff --git a/src/features/workspaces/components/CreateWorkspaceForm.js b/src/features/workspaces/components/CreateWorkspaceForm.js
index 15b97121d..c9b05b87f 100644
--- a/src/features/workspaces/components/CreateWorkspaceForm.js
+++ b/src/features/workspaces/components/CreateWorkspaceForm.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { Input, Button } from '@meetfranz/forms';
 import injectSheet from 'react-jss';
 import Form from '../../../lib/Form';
@@ -11,11 +11,11 @@ import { workspaceStore } from '../index';
 const messages = defineMessages({
   submitButton: {
     id: 'settings.workspace.add.form.submitButton',
-    defaultMessage: '!!!Create workspace',
+    defaultMessage: 'Create workspace',
   },
   name: {
     id: 'settings.workspace.add.form.name',
-    defaultMessage: '!!!Name',
+    defaultMessage: 'Name',
   },
 });
 
@@ -32,12 +32,9 @@ const styles = () => ({
   },
 });
 
-@injectSheet(styles) @observer
+@injectSheet(styles)
+@observer
 class CreateWorkspaceForm extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   static propTypes = {
     classes: PropTypes.object.isRequired,
     isSubmitting: PropTypes.bool.isRequired,
@@ -45,7 +42,7 @@ class CreateWorkspaceForm extends Component {
   };
 
   form = (() => {
-    const { intl } = this.context;
+    const { intl } = this.props;
     return new Form({
       fields: {
         name: {
@@ -61,7 +58,7 @@ class CreateWorkspaceForm extends Component {
   submitForm() {
     const { form } = this;
     form.submit({
-      onSuccess: async (f) => {
+      onSuccess: async f => {
         const { onSubmit } = this.props;
         const values = f.values();
         onSubmit(values);
@@ -70,7 +67,7 @@ class CreateWorkspaceForm extends Component {
   }
 
   render() {
-    const { intl } = this.context;
+    const { intl } = this.props;
     const { classes, isSubmitting } = this.props;
     const { form } = this;
     return (
@@ -95,4 +92,4 @@ class CreateWorkspaceForm extends Component {
   }
 }
 
-export default CreateWorkspaceForm;
+export default injectIntl(CreateWorkspaceForm);
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js
index c97d4bd9c..cae95e9ed 100644
--- a/src/features/workspaces/components/EditWorkspaceForm.js
+++ b/src/features/workspaces/components/EditWorkspaceForm.js
@@ -1,7 +1,7 @@
 import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router';
 import { Input, Button } from '@meetfranz/forms';
 import injectSheet from 'react-jss';
@@ -20,40 +20,40 @@ import Toggle from '../../../components/ui/Toggle';
 const messages = defineMessages({
   buttonDelete: {
     id: 'settings.workspace.form.buttonDelete',
-    defaultMessage: '!!!Delete workspace',
+    defaultMessage: 'Delete workspace',
   },
   buttonSave: {
     id: 'settings.workspace.form.buttonSave',
-    defaultMessage: '!!!Save workspace',
+    defaultMessage: 'Save workspace',
   },
   name: {
     id: 'settings.workspace.form.name',
-    defaultMessage: '!!!Name',
+    defaultMessage: 'Name',
   },
   yourWorkspaces: {
     id: 'settings.workspace.form.yourWorkspaces',
-    defaultMessage: '!!!Your workspaces',
+    defaultMessage: 'Your workspaces',
   },
   keepLoaded: {
     id: 'settings.workspace.form.keepLoaded',
-    defaultMessage: '!!!Keep this workspace loaded*',
+    defaultMessage: 'Keep this workspace loaded*',
   },
   keepLoadedInfo: {
     id: 'settings.workspace.form.keepLoadedInfo',
     defaultMessage:
-      '!!!*This option will be overwritten by the global "Keep all workspaces loaded" option.',
+      '*This option will be overwritten by the global "Keep all workspaces loaded" option.',
   },
   servicesInWorkspaceHeadline: {
     id: 'settings.workspace.form.servicesInWorkspaceHeadline',
-    defaultMessage: '!!!Services in this Workspace',
+    defaultMessage: 'Services in this Workspace',
   },
   noServicesAdded: {
     id: 'settings.services.noServicesAdded',
-    defaultMessage: '!!!Start by adding a service.',
+    defaultMessage: 'Start by adding a service.',
   },
   discoverServices: {
     id: 'settings.services.discoverServices',
-    defaultMessage: '!!!Discover services',
+    defaultMessage: 'Discover services',
   },
 });
 
@@ -72,10 +72,6 @@ const styles = () => ({
 @injectSheet(styles)
 @observer
 class EditWorkspaceForm extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   static propTypes = {
     classes: PropTypes.object.isRequired,
     onDelete: PropTypes.func.isRequired,
@@ -97,7 +93,7 @@ class EditWorkspaceForm extends Component {
   }
 
   prepareWorkspaceForm(workspace) {
-    const { intl } = this.context;
+    const { intl } = this.props;
     return new Form({
       fields: {
         name: {
@@ -120,7 +116,7 @@ class EditWorkspaceForm extends Component {
 
   save(form) {
     form.submit({
-      onSuccess: async (f) => {
+      onSuccess: async f => {
         const { onSave } = this.props;
         const values = f.values();
         onSave(values);
@@ -146,7 +142,7 @@ class EditWorkspaceForm extends Component {
   }
 
   render() {
-    const { intl } = this.context;
+    const { intl } = this.props;
     const {
       classes,
       workspace,
@@ -194,7 +190,7 @@ class EditWorkspaceForm extends Component {
               </div>
             ) : (
               <>
-                {services.map((s) => (
+                {services.map(s => (
                   <WorkspaceServiceListItem
                     key={s.id}
                     service={s}
@@ -233,4 +229,4 @@ class EditWorkspaceForm extends Component {
   }
 }
 
-export default EditWorkspaceForm;
+export default injectIntl(EditWorkspaceForm);
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js
index 1138f23d7..03a829a64 100644
--- a/src/features/workspaces/components/WorkspaceDrawer.js
+++ b/src/features/workspaces/components/WorkspaceDrawer.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { H1, Icon } from '@meetfranz/ui';
 import ReactTooltip from 'react-tooltip';
 
@@ -14,27 +14,27 @@ import { workspaceStore } from '../index';
 const messages = defineMessages({
   headline: {
     id: 'workspaceDrawer.headline',
-    defaultMessage: '!!!Workspaces',
+    defaultMessage: 'Workspaces',
   },
   allServices: {
     id: 'workspaceDrawer.allServices',
-    defaultMessage: '!!!All services',
+    defaultMessage: 'All services',
   },
   workspacesSettingsTooltip: {
     id: 'workspaceDrawer.workspacesSettingsTooltip',
-    defaultMessage: '!!!Workspaces settings',
+    defaultMessage: 'Workspaces settings',
   },
   workspaceFeatureInfo: {
     id: 'workspaceDrawer.workspaceFeatureInfo',
-    defaultMessage: '!!!Info about workspace feature',
+    defaultMessage: 'Info about workspace feature',
   },
   addNewWorkspaceLabel: {
     id: 'workspaceDrawer.addNewWorkspaceLabel',
-    defaultMessage: '!!!add new workspace',
+    defaultMessage: 'add new workspace',
   },
 });
 
-const styles = (theme) => ({
+const styles = theme => ({
   drawer: {
     background: theme.workspaces.drawer.background,
     width: `${theme.workspaces.drawer.width}px`,
@@ -85,34 +85,26 @@ const styles = (theme) => ({
   },
 });
 
-@injectSheet(styles) @observer
+@injectSheet(styles)
+@observer
 class WorkspaceDrawer extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
     getServicesForWorkspace: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   componentDidMount() {
     ReactTooltip.rebuild();
   }
 
   render() {
-    const {
-      classes,
-      getServicesForWorkspace,
-    } = this.props;
-    const { intl } = this.context;
-    const {
-      activeWorkspace,
-      isSwitchingWorkspace,
-      nextWorkspace,
-      workspaces,
-    } = workspaceStore;
-    const actualWorkspace = isSwitchingWorkspace ? nextWorkspace : activeWorkspace;
+    const { classes, getServicesForWorkspace } = this.props;
+    const { intl } = this.props;
+    const { activeWorkspace, isSwitchingWorkspace, nextWorkspace, workspaces } =
+      workspaceStore;
+    const actualWorkspace = isSwitchingWorkspace
+      ? nextWorkspace
+      : activeWorkspace;
     return (
       <div className={`${classes.drawer} workspaces-drawer`}>
         <H1 className={classes.headline}>
@@ -122,7 +114,9 @@ class WorkspaceDrawer extends Component {
             onClick={() => {
               workspaceActions.openWorkspaceSettings();
             }}
-            data-tip={`${intl.formatMessage(messages.workspacesSettingsTooltip)}`}
+            data-tip={`${intl.formatMessage(
+              messages.workspacesSettingsTooltip,
+            )}`}
           >
             <Icon
               icon={mdiSettings}
@@ -152,7 +146,9 @@ class WorkspaceDrawer extends Component {
                 workspaceActions.activate({ workspace });
                 workspaceActions.toggleWorkspaceDrawer();
               }}
-              onContextMenuEditClick={() => workspaceActions.edit({ workspace })}
+              onContextMenuEditClick={() =>
+                workspaceActions.edit({ workspace })
+              }
               services={getServicesForWorkspace(workspace)}
               shortcutIndex={index + 1}
             />
@@ -168,9 +164,7 @@ class WorkspaceDrawer extends Component {
               size={1}
               className={classes.workspacesSettingsButtonIcon}
             />
-            <span>
-              {intl.formatMessage(messages.addNewWorkspaceLabel)}
-            </span>
+            <span>{intl.formatMessage(messages.addNewWorkspaceLabel)}</span>
           </div>
         </div>
         <ReactTooltip place="right" type="dark" effect="solid" />
@@ -179,4 +173,4 @@ class WorkspaceDrawer extends Component {
   }
 }
 
-export default WorkspaceDrawer;
+export default injectIntl(WorkspaceDrawer);
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.js b/src/features/workspaces/components/WorkspaceDrawerItem.js
index 252158364..82e1b81a4 100644
--- a/src/features/workspaces/components/WorkspaceDrawerItem.js
+++ b/src/features/workspaces/components/WorkspaceDrawerItem.js
@@ -4,17 +4,17 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
 import classnames from 'classnames';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { altKey, cmdOrCtrlShortcutKey } from '../../../environment';
 
 const messages = defineMessages({
   noServicesAddedYet: {
     id: 'workspaceDrawer.item.noServicesAddedYet',
-    defaultMessage: '!!!No services added yet',
+    defaultMessage: 'No services added yet',
   },
   contextMenuEdit: {
     id: 'workspaceDrawer.item.contextMenuEdit',
-    defaultMessage: '!!!edit',
+    defaultMessage: 'edit',
   },
 });
 
@@ -82,10 +82,6 @@ class WorkspaceDrawerItem extends Component {
     onContextMenuEditClick: null,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       classes,
@@ -96,7 +92,8 @@ class WorkspaceDrawerItem extends Component {
       services,
       shortcutIndex,
     } = this.props;
-    const { intl } = this.context;
+
+    const { intl } = this.props;
 
     const contextMenuTemplate = [
       {
@@ -125,7 +122,11 @@ class WorkspaceDrawerItem extends Component {
           onContextMenuEditClick && contextMenu.popup(getCurrentWindow())
         }
         data-tip={`${
-          shortcutIndex <= 9 ? `(${cmdOrCtrlShortcutKey(false)}+${altKey(false)}+${shortcutIndex})` : ''
+          shortcutIndex <= 9
+            ? `(${cmdOrCtrlShortcutKey(false)}+${altKey(
+              false,
+            )}+${shortcutIndex})`
+            : ''
         }`}
       >
         <span
@@ -151,4 +152,4 @@ class WorkspaceDrawerItem extends Component {
   }
 }
 
-export default WorkspaceDrawerItem;
+export default injectIntl(WorkspaceDrawerItem);
diff --git a/src/features/workspaces/components/WorkspaceItem.js b/src/features/workspaces/components/WorkspaceItem.js
index 85fc02d51..ec7b19add 100644
--- a/src/features/workspaces/components/WorkspaceItem.js
+++ b/src/features/workspaces/components/WorkspaceItem.js
@@ -1,12 +1,11 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { intlShape } from 'react-intl';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
 
 import Workspace from '../models/Workspace';
 
-const styles = (theme) => ({
+const styles = theme => ({
   row: {
     height: theme.workspaces.settings.listItems.height,
     borderBottom: `1px solid ${theme.workspaces.settings.listItems.borderColor}`,
@@ -17,7 +16,8 @@ const styles = (theme) => ({
   columnName: {},
 });
 
-@injectSheet(styles) @observer
+@injectSheet(styles)
+@observer
 class WorkspaceItem extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
@@ -25,18 +25,12 @@ class WorkspaceItem extends Component {
     onItemClick: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const { classes, workspace, onItemClick } = this.props;
 
     return (
       <tr className={classes.row}>
-        <td onClick={() => onItemClick(workspace)}>
-          {workspace.name}
-        </td>
+        <td onClick={() => onItemClick(workspace)}>{workspace.name}</td>
       </tr>
     );
   }
diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
index c8ec0bc4c..33a82cf4b 100644
--- a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
+++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
@@ -4,14 +4,14 @@ import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
 import classnames from 'classnames';
 import { Loader } from '@meetfranz/ui';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import { workspaceStore } from '../index';
 
 const messages = defineMessages({
   switchingTo: {
     id: 'workspaces.switchingIndicator.switchingTo',
-    defaultMessage: '!!!Switching to',
+    defaultMessage: 'Switching to',
   },
 });
 
@@ -61,13 +61,9 @@ class WorkspaceSwitchingIndicator extends Component {
     theme: PropTypes.object.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const { classes, theme } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
     const { isSwitchingWorkspace, nextWorkspace } = workspaceStore;
     if (!isSwitchingWorkspace) return null;
     const nextWorkspaceName = nextWorkspace
@@ -89,4 +85,4 @@ class WorkspaceSwitchingIndicator extends Component {
   }
 }
 
-export default WorkspaceSwitchingIndicator;
+export default injectIntl(WorkspaceSwitchingIndicator);
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
index 5f34204f1..fd279f896 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.js
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import injectSheet from 'react-jss';
 import { Infobox } from '@meetfranz/ui';
 
@@ -16,35 +16,35 @@ import UIStore from '../../../stores/UIStore';
 const messages = defineMessages({
   headline: {
     id: 'settings.workspaces.headline',
-    defaultMessage: '!!!Your workspaces',
+    defaultMessage: 'Your workspaces',
   },
   noServicesAdded: {
     id: 'settings.workspaces.noWorkspacesAdded',
-    defaultMessage: "!!!You haven't created any workspaces yet.",
+    defaultMessage: "You haven't created any workspaces yet.",
   },
   workspacesRequestFailed: {
     id: 'settings.workspaces.workspacesRequestFailed',
-    defaultMessage: '!!!Could not load your workspaces',
+    defaultMessage: 'Could not load your workspaces',
   },
   tryReloadWorkspaces: {
     id: 'settings.workspaces.tryReloadWorkspaces',
-    defaultMessage: '!!!Try again',
+    defaultMessage: 'Try again',
   },
   updatedInfo: {
     id: 'settings.workspaces.updatedInfo',
-    defaultMessage: '!!!Your changes have been saved',
+    defaultMessage: 'Your changes have been saved',
   },
   deletedInfo: {
     id: 'settings.workspaces.deletedInfo',
-    defaultMessage: '!!!Workspace has been deleted',
+    defaultMessage: 'Workspace has been deleted',
   },
   workspaceFeatureInfo: {
     id: 'settings.workspaces.workspaceFeatureInfo',
-    defaultMessage: '!!!Info about workspace feature',
+    defaultMessage: 'Info about workspace feature',
   },
   workspaceFeatureHeadline: {
     id: 'settings.workspaces.workspaceFeatureHeadline',
-    defaultMessage: '!!!Less is More: Introducing Ferdi Workspaces',
+    defaultMessage: 'Less is More: Introducing Ferdi Workspaces',
   },
 });
 
@@ -83,10 +83,6 @@ class WorkspacesDashboard extends Component {
     workspaces: MobxPropTypes.arrayOrObservableArray.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       classes,
@@ -99,7 +95,7 @@ class WorkspacesDashboard extends Component {
       workspaces,
     } = this.props;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <div className="settings__main">
@@ -193,7 +189,7 @@ class WorkspacesDashboard extends Component {
   }
 }
 
-export default WorkspacesDashboard;
+export default injectIntl(WorkspacesDashboard);
 
 WorkspacesDashboard.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
diff --git a/src/helpers/validation-helpers.js b/src/helpers/validation-helpers.js
index 116f19905..569b13bb0 100644
--- a/src/helpers/validation-helpers.js
+++ b/src/helpers/validation-helpers.js
@@ -4,35 +4,41 @@ import isEmail from 'validator/lib/isEmail';
 const messages = defineMessages({
   required: {
     id: 'validation.required',
-    defaultMessage: '!!!Field is required',
+    defaultMessage: 'Field is required',
   },
   email: {
     id: 'validation.email',
-    defaultMessage: '!!!Email not valid',
+    defaultMessage: 'Email not valid',
   },
   url: {
     id: 'validation.url',
-    defaultMessage: '!!!Not a valid URL',
+    defaultMessage: 'Not a valid URL',
   },
   minLength: {
     id: 'validation.minLength',
-    defaultMessage: '!!!Too few characters',
+    defaultMessage: 'Too few characters',
   },
   oneRequired: {
     id: 'validation.oneRequired',
-    defaultMessage: '!!!At least one is required',
+    defaultMessage: 'At least one is required',
   },
 });
 
 export function required({ field }) {
-  const isValid = (field.value.trim() !== '');
-  return [isValid, window.ferdi.intl.formatMessage(messages.required, { field: field.label })];
+  const isValid = field.value.trim() !== '';
+  return [
+    isValid,
+    window.ferdi.intl.formatMessage(messages.required, { field: field.label }),
+  ];
 }
 
 export function email({ field }) {
   const value = field.value.trim();
   const isValid = isEmail(value);
-  return [isValid, window.ferdi.intl.formatMessage(messages.email, { field: field.label })];
+  return [
+    isValid,
+    window.ferdi.intl.formatMessage(messages.email, { field: field.label }),
+  ];
 }
 
 export function url({ field }) {
@@ -41,12 +47,19 @@ export function url({ field }) {
 
   if (value !== '') {
     // eslint-disable-next-line
-    isValid = Boolean(value.match(/(^|[\s.:;?\-\]<(])(https?:\/\/[-\w;/?:@&=+$|_.!~*|'()[\]%#,☺]+[\w/#](\(\))?)(?=$|[\s',|().:;?\-[\]>)])/i));
+    isValid = Boolean(
+      value.match(
+        /(^|[\s.:;?\-\]<(])(https?:\/\/[-\w;/?:@&=+$|_.!~*|'()[\]%#,☺]+[\w/#](\(\))?)(?=$|[\s',|().:;?\-[\]>)])/i,
+      ),
+    );
   } else {
     isValid = true;
   }
 
-  return [isValid, window.ferdi.intl.formatMessage(messages.url, { field: field.label })];
+  return [
+    isValid,
+    window.ferdi.intl.formatMessage(messages.url, { field: field.label }),
+  ];
 }
 
 export function minLength(length) {
@@ -55,13 +68,24 @@ export function minLength(length) {
     if (field.touched) {
       isValid = field.value.length >= length;
     }
-    return [isValid, window.ferdi.intl.formatMessage(messages.minLength, { field: field.label, length })];
+    return [
+      isValid,
+      window.ferdi.intl.formatMessage(messages.minLength, {
+        field: field.label,
+        length,
+      }),
+    ];
   };
 }
 
 export function oneRequired(targets) {
   return ({ field, form }) => {
-    const invalidFields = targets.filter((target) => form.$(target).value === '');
-    return [targets.length !== invalidFields.length, window.ferdi.intl.formatMessage(messages.required, { field: field.label })];
+    const invalidFields = targets.filter(target => form.$(target).value === '');
+    return [
+      targets.length !== invalidFields.length,
+      window.ferdi.intl.formatMessage(messages.required, {
+        field: field.label,
+      }),
+    ];
   };
 }
diff --git a/src/i18n/apply-branding.js b/src/i18n/apply-branding.js
index 40a07ded0..7aeabc4af 100644
--- a/src/i18n/apply-branding.js
+++ b/src/i18n/apply-branding.js
@@ -21,12 +21,7 @@ const ignore = [
 ];
 
 // Files to ignore when applying branding
-const ignoreFiles = [
-  'defaultMessages.json',
-  '.DS_Store',
-  '.',
-  '..',
-];
+const ignoreFiles = ['.DS_Store', '.', '..'];
 
 // What to replace
 const replace = {
@@ -49,7 +44,7 @@ const replaceStr = (str, find, replaceWith) => {
   return str;
 };
 
-files.forEach(async (file) => {
+files.forEach(async file => {
   if (ignoreFiles.includes(file)) return;
 
   // Read locale data
diff --git a/src/i18n/globalMessages.js b/src/i18n/globalMessages.js
index 66fce8d0f..bc3c559bf 100644
--- a/src/i18n/globalMessages.js
+++ b/src/i18n/globalMessages.js
@@ -3,75 +3,75 @@ import { defineMessages } from 'react-intl';
 export default defineMessages({
   APIUnhealthy: {
     id: 'global.api.unhealthy',
-    defaultMessage: '!!!Can\'t connect to Ferdi Online Services',
+    defaultMessage: "Can't connect to Ferdi Online Services",
   },
   notConnectedToTheInternet: {
     id: 'global.notConnectedToTheInternet',
-    defaultMessage: '!!!You are not connected to the internet.',
+    defaultMessage: 'You are not connected to the internet.',
   },
   spellcheckerLanguage: {
     id: 'global.spellchecking.language',
-    defaultMessage: '!!!Spell checking language',
+    defaultMessage: 'Spell checking language',
   },
   spellcheckerSystemDefault: {
     id: 'global.spellchecker.useDefault',
-    defaultMessage: '!!!Use System Default ({default})',
+    defaultMessage: 'Use System Default ({default})',
   },
   spellcheckerAutomaticDetection: {
     id: 'global.spellchecking.autodetect',
-    defaultMessage: '!!!Detect language automatically',
+    defaultMessage: 'Detect language automatically',
   },
   spellcheckerAutomaticDetectionShort: {
     id: 'global.spellchecking.autodetect.short',
-    defaultMessage: '!!!Automatic',
+    defaultMessage: 'Automatic',
   },
   userAgentPref: {
     id: 'global.userAgentPref',
-    defaultMessage: '!!!User Agent',
+    defaultMessage: 'User Agent',
   },
   userAgentHelp: {
     id: 'global.userAgentHelp',
-    defaultMessage: "!!!Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
+    defaultMessage:
+      "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   },
   yes: {
     id: 'global.yes',
-    defaultMessage: '!!!Yes',
+    defaultMessage: 'Yes',
   },
   no: {
     id: 'global.no',
-    defaultMessage: '!!!No',
+    defaultMessage: 'No',
   },
   ok: {
     id: 'global.ok',
-    defaultMessage: '!!!Ok',
+    defaultMessage: 'Ok',
   },
   cancel: {
     id: 'global.cancel',
-    defaultMessage: '!!!Cancel',
+    defaultMessage: 'Cancel',
   },
   save: {
     id: 'global.save',
-    defaultMessage: '!!!Save',
+    defaultMessage: 'Save',
   },
   submit: {
     id: 'global.submit',
-    defaultMessage: '!!!Submit',
+    defaultMessage: 'Submit',
   },
   quit: {
     id: 'global.quit',
-    defaultMessage: '!!!Quit',
+    defaultMessage: 'Quit',
   },
   quitConfirmation: {
     id: 'global.quitConfirmation',
-    defaultMessage:
-      '!!!Do you really want to quit Ferdi?',
+    defaultMessage: 'Do you really want to quit Ferdi?',
   },
   settings: {
     id: 'global.settings',
-    defaultMessage: '!!!Settings',
+    defaultMessage: 'Settings',
   },
   edit: {
     id: 'global.edit',
-    defaultMessage: '!!!Edit',
+    defaultMessage: 'Edit',
   },
 });
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
deleted file mode 100644
index 3a41c66f6..000000000
--- a/src/i18n/locales/defaultMessages.json
+++ /dev/null
@@ -1,6862 +0,0 @@
-[
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!A new update for Ferdi is available.",
-        "end": {
-          "column": 3,
-          "line": 13
-        },
-        "file": "src/components/AppUpdateInfoBar.js",
-        "id": "infobar.updateAvailable",
-        "start": {
-          "column": 19,
-          "line": 10
-        }
-      },
-      {
-        "defaultMessage": "!!!Changelog",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/components/AppUpdateInfoBar.js",
-        "id": "infobar.buttonChangelog",
-        "start": {
-          "column": 13,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!!Restart & install update",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/AppUpdateInfoBar.js",
-        "id": "infobar.buttonInstallUpdate",
-        "start": {
-          "column": 23,
-          "line": 18
-        }
-      }
-    ],
-    "path": "src/components/AppUpdateInfoBar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Change server",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/auth/ChangeServer.js",
-        "id": "changeserver.headline",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Server",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/auth/ChangeServer.js",
-        "id": "changeserver.label",
-        "start": {
-          "column": 9,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Extra settings offered by Ferdi will not be saved",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/auth/ChangeServer.js",
-        "id": "changeserver.warning",
-        "start": {
-          "column": 11,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Custom server",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/auth/ChangeServer.js",
-        "id": "changeserver.customServerLabel",
-        "start": {
-          "column": 21,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Enter a valid URL",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/auth/ChangeServer.js",
-        "id": "changeserver.urlError",
-        "start": {
-          "column": 12,
-          "line": 31
-        }
-      }
-    ],
-    "path": "src/components/auth/ChangeServer.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Import your Ferdi 4 services",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/auth/Import.js",
-        "id": "import.headline",
-        "start": {
-          "column": 12,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Services not yet supported in Ferdi 5",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/auth/Import.js",
-        "id": "import.notSupportedHeadline",
-        "start": {
-          "column": 24,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Import {count} services",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/auth/Import.js",
-        "id": "import.submit.label",
-        "start": {
-          "column": 21,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!I want to add services manually",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/auth/Import.js",
-        "id": "import.skip.label",
-        "start": {
-          "column": 19,
-          "line": 25
-        }
-      }
-    ],
-    "path": "src/components/auth/Import.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Invite Friends",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "settings.invite.headline",
-        "start": {
-          "column": 20,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Invite 3 of your friends or colleagues",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "invite.headline.friends",
-        "start": {
-          "column": 12,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Name",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "invite.name.label",
-        "start": {
-          "column": 13,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Email address",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "invite.email.label",
-        "start": {
-          "column": 14,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Send invites",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "invite.submit.label",
-        "start": {
-          "column": 21,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!I want to do this later",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "invite.skip.label",
-        "start": {
-          "column": 19,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Invitations sent successfully",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "invite.successInfo",
-        "start": {
-          "column": 21,
-          "line": 40
-        }
-      }
-    ],
-    "path": "src/components/auth/Invite.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Locked",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.headline",
-        "start": {
-          "column": 12,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.info",
-        "start": {
-          "column": 8,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Unlock with Touch ID",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.touchId",
-        "start": {
-          "column": 11,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!unlock via Touch ID",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.touchIdPrompt",
-        "start": {
-          "column": 17,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Password",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.password.label",
-        "start": {
-          "column": 17,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Unlock",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.submit.label",
-        "start": {
-          "column": 21,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Unlock with Password",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.unlockWithPassword",
-        "start": {
-          "column": 22,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Password invalid",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.invalidCredentials",
-        "start": {
-          "column": 22,
-          "line": 44
-        }
-      }
-    ],
-    "path": "src/components/auth/Locked.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Sign in",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.headline",
-        "start": {
-          "column": 12,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Email address",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.email.label",
-        "start": {
-          "column": 14,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Password",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.password.label",
-        "start": {
-          "column": 17,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Sign in",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.submit.label",
-        "start": {
-          "column": 21,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Email or password not valid",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.invalidCredentials",
-        "start": {
-          "column": 22,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Using a Franz account to log in?",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.customServerQuestion",
-        "start": {
-          "column": 24,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Try importing your Franz account into Ferdi",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.customServerSuggestion",
-        "start": {
-          "column": 26,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Your session expired, please login again.",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.tokenExpired",
-        "start": {
-          "column": 16,
-          "line": 48
-        }
-      },
-      {
-        "defaultMessage": "!!!Your session expired, please login again.",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.serverLogout",
-        "start": {
-          "column": 16,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "!!!Create a free account",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.link.signup",
-        "start": {
-          "column": 14,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "!!!Change server",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.changeServer",
-        "start": {
-          "column": 16,
-          "line": 60
-        }
-      },
-      {
-        "defaultMessage": "!!!Use Ferdi without an Account",
-        "end": {
-          "column": 3,
-          "line": 67
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "services.serverless",
-        "start": {
-          "column": 14,
-          "line": 64
-        }
-      },
-      {
-        "defaultMessage": "!!!Forgot password",
-        "end": {
-          "column": 3,
-          "line": 71
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.link.password",
-        "start": {
-          "column": 16,
-          "line": 68
-        }
-      }
-    ],
-    "path": "src/components/auth/Login.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Forgot password",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.headline",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Email address",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.email.label",
-        "start": {
-          "column": 14,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Your new password was sent to your email address",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.successInfo",
-        "start": {
-          "column": 15,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!No user affiliated with that email address",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.noUser",
-        "start": {
-          "column": 10,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Create a free account",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.link.signup",
-        "start": {
-          "column": 14,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Sign in to your account",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.link.login",
-        "start": {
-          "column": 13,
-          "line": 35
-        }
-      }
-    ],
-    "path": "src/components/auth/Password.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Invite Friends",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "settings.invite.headline",
-        "start": {
-          "column": 20,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Invite 3 of your friends or colleagues",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "invite.headline.friends",
-        "start": {
-          "column": 12,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Name",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "invite.name.label",
-        "start": {
-          "column": 13,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Email address",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "invite.email.label",
-        "start": {
-          "column": 14,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Send invites",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "invite.submit.label",
-        "start": {
-          "column": 21,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!I want to do this later",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "invite.skip.label",
-        "start": {
-          "column": 19,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Invitations sent successfully",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "invite.successInfo",
-        "start": {
-          "column": 21,
-          "line": 40
-        }
-      }
-    ],
-    "path": "src/components/auth/ServiceAssistant.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Let's get started",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/auth/SetupAssistant.js",
-        "id": "setupAssistant.headline",
-        "start": {
-          "column": 12,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Choose from our most used services and get back on top of your messaging now.",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/auth/SetupAssistant.js",
-        "id": "setupAssistant.subheadline",
-        "start": {
-          "column": 15,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Let's go",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/auth/SetupAssistant.js",
-        "id": "setupAssistant.submit.label",
-        "start": {
-          "column": 21,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Invitations sent successfully",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/components/auth/SetupAssistant.js",
-        "id": "invite.successInfo",
-        "start": {
-          "column": 21,
-          "line": 33
-        }
-      }
-    ],
-    "path": "src/components/auth/SetupAssistant.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Sign up",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.headline",
-        "start": {
-          "column": 12,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Firstname",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.firstname.label",
-        "start": {
-          "column": 18,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Lastname",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.lastname.label",
-        "start": {
-          "column": 17,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Email address",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.email.label",
-        "start": {
-          "column": 14,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Password",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.password.label",
-        "start": {
-          "column": 17,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!By creating a Ferdi account you accept the",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.legal.info",
-        "start": {
-          "column": 13,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Terms of service",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.legal.terms",
-        "start": {
-          "column": 9,
-          "line": 48
-        }
-      },
-      {
-        "defaultMessage": "!!!Privacy Statement",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.legal.privacy",
-        "start": {
-          "column": 11,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "!!!Create account",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.submit.label",
-        "start": {
-          "column": 21,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "!!!Already have an account, sign in?",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.link.login",
-        "start": {
-          "column": 13,
-          "line": 60
-        }
-      },
-      {
-        "defaultMessage": "!!!Change server",
-        "end": {
-          "column": 3,
-          "line": 67
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "login.changeServer",
-        "start": {
-          "column": 16,
-          "line": 64
-        }
-      },
-      {
-        "defaultMessage": "!!!Use Ferdi without an Account",
-        "end": {
-          "column": 3,
-          "line": 71
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "services.serverless",
-        "start": {
-          "column": 14,
-          "line": 68
-        }
-      },
-      {
-        "defaultMessage": "!!!A user with that email address already exists",
-        "end": {
-          "column": 3,
-          "line": 75
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.emailDuplicate",
-        "start": {
-          "column": 18,
-          "line": 72
-        }
-      }
-    ],
-    "path": "src/components/auth/Signup.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Create a free account",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/auth/Welcome.js",
-        "id": "welcome.signupButton",
-        "start": {
-          "column": 16,
-          "line": 11
-        }
-      },
-      {
-        "defaultMessage": "!!!Login to your account",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/auth/Welcome.js",
-        "id": "welcome.loginButton",
-        "start": {
-          "column": 15,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Use Ferdi without an Account",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/auth/Welcome.js",
-        "id": "services.serverless",
-        "start": {
-          "column": 14,
-          "line": 19
-        }
-      }
-    ],
-    "path": "src/components/auth/Welcome.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Your services have been updated.",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/layout/AppLayout.js",
-        "id": "infobar.servicesUpdated",
-        "start": {
-          "column": 19,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload services",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/layout/AppLayout.js",
-        "id": "infobar.buttonReloadServices",
-        "start": {
-          "column": 24,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not load services and user information",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/layout/AppLayout.js",
-        "id": "infobar.requiredRequestsFailed",
-        "start": {
-          "column": 26,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-        "end": {
-          "column": 3,
-          "line": 44
-        },
-        "file": "src/components/layout/AppLayout.js",
-        "id": "infobar.authRequestFailed",
-        "start": {
-          "column": 21,
-          "line": 40
-        }
-      }
-    ],
-    "path": "src/components/layout/AppLayout.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Add new service",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.addNewService",
-        "start": {
-          "column": 17,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Disable notifications & audio",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.muteApp",
-        "start": {
-          "column": 8,
-          "line": 22
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable notifications & audio",
-        "end": {
-          "column": 3,
-          "line": 29
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.unmuteApp",
-        "start": {
-          "column": 10,
-          "line": 26
-        }
-      },
-      {
-        "defaultMessage": "!!!Open workspace drawer",
-        "end": {
-          "column": 3,
-          "line": 33
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.openWorkspaceDrawer",
-        "start": {
-          "column": 23,
-          "line": 30
-        }
-      },
-      {
-        "defaultMessage": "!!!Close workspace drawer",
-        "end": {
-          "column": 3,
-          "line": 37
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.closeWorkspaceDrawer",
-        "start": {
-          "column": 24,
-          "line": 34
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Ferdi Todos",
-        "end": {
-          "column": 3,
-          "line": 41
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.openTodosDrawer",
-        "start": {
-          "column": 19,
-          "line": 38
-        }
-      },
-      {
-        "defaultMessage": "!!!Close Ferdi Todos",
-        "end": {
-          "column": 3,
-          "line": 45
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.closeTodosDrawer",
-        "start": {
-          "column": 20,
-          "line": 42
-        }
-      },
-      {
-        "defaultMessage": "!!!Lock Ferdi",
-        "end": {
-          "column": 3,
-          "line": 49
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.lockFerdi",
-        "start": {
-          "column": 13,
-          "line": 46
-        }
-      }
-    ],
-    "path": "src/components/layout/Sidebar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Home",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/services/content/ConnectionBanner.js",
-        "id": "webControls.goHome",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Open in Browser",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/services/content/ConnectionBanner.js",
-        "id": "webControls.openInBrowser",
-        "start": {
-          "column": 17,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Back",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/services/content/ConnectionBanner.js",
-        "id": "webControls.back",
-        "start": {
-          "column": 8,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Forward",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/services/content/ConnectionBanner.js",
-        "id": "webControls.forward",
-        "start": {
-          "column": 11,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/services/content/ConnectionBanner.js",
-        "id": "webControls.reload",
-        "start": {
-          "column": 10,
-          "line": 29
-        }
-      }
-    ],
-    "path": "src/components/services/content/ConnectionBanner.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Home",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/services/content/ConnectionLost.js",
-        "id": "webControls.goHome",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Open in Browser",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/services/content/ConnectionLost.js",
-        "id": "webControls.openInBrowser",
-        "start": {
-          "column": 17,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Back",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/services/content/ConnectionLost.js",
-        "id": "webControls.back",
-        "start": {
-          "column": 8,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Forward",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/services/content/ConnectionLost.js",
-        "id": "webControls.forward",
-        "start": {
-          "column": 11,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/services/content/ConnectionLost.js",
-        "id": "webControls.reload",
-        "start": {
-          "column": 10,
-          "line": 29
-        }
-      }
-    ],
-    "path": "src/components/services/content/ConnectionLost.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Oh no! Ferdi lost the connection to {name}.",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/services/content/ConnectionLostBanner.js",
-        "id": "connectionLostBanner.message",
-        "start": {
-          "column": 8,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!What happened?",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/services/content/ConnectionLostBanner.js",
-        "id": "connectionLostBanner.informationLink",
-        "start": {
-          "column": 19,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload Service",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/services/content/ConnectionLostBanner.js",
-        "id": "connectionLostBanner.cta",
-        "start": {
-          "column": 7,
-          "line": 21
-        }
-      }
-    ],
-    "path": "src/components/services/content/ConnectionLostBanner.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Oh no!",
-        "end": {
-          "column": 3,
-          "line": 15
-        },
-        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-        "id": "service.errorHandler.headline",
-        "start": {
-          "column": 12,
-          "line": 12
-        }
-      },
-      {
-        "defaultMessage": "!!!{name} has failed to load.",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-        "id": "service.errorHandler.text",
-        "start": {
-          "column": 8,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload {name}",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-        "id": "service.errorHandler.action",
-        "start": {
-          "column": 10,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Edit {name}",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-        "id": "service.errorHandler.editAction",
-        "start": {
-          "column": 14,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Error:",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-        "id": "service.errorHandler.message",
-        "start": {
-          "column": 16,
-          "line": 28
-        }
-      }
-    ],
-    "path": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!{name} is disabled",
-        "end": {
-          "column": 3,
-          "line": 12
-        },
-        "file": "src/components/services/content/ServiceDisabled.js",
-        "id": "service.disabledHandler.headline",
-        "start": {
-          "column": 12,
-          "line": 9
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable {name}",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/services/content/ServiceDisabled.js",
-        "id": "service.disabledHandler.action",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      }
-    ],
-    "path": "src/components/services/content/ServiceDisabled.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Welcome to Ferdi",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/services/content/Services.js",
-        "id": "services.welcome",
-        "start": {
-          "column": 11,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Get started",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/services/content/Services.js",
-        "id": "services.getStarted",
-        "start": {
-          "column": 14,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Please login to use Ferdi.",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/services/content/Services.js",
-        "id": "services.login",
-        "start": {
-          "column": 9,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Use Ferdi without an Account",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/services/content/Services.js",
-        "id": "services.serverless",
-        "start": {
-          "column": 14,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/services/content/Services.js",
-        "id": "services.serverInfo",
-        "start": {
-          "column": 14,
-          "line": 31
-        }
-      }
-    ],
-    "path": "src/components/services/content/Services.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Home",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/services/content/WebControls.js",
-        "id": "webControls.goHome",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Open in Browser",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/services/content/WebControls.js",
-        "id": "webControls.openInBrowser",
-        "start": {
-          "column": 17,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Back",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/services/content/WebControls.js",
-        "id": "webControls.back",
-        "start": {
-          "column": 8,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Forward",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/services/content/WebControls.js",
-        "id": "webControls.forward",
-        "start": {
-          "column": 11,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/services/content/WebControls.js",
-        "id": "webControls.reload",
-        "start": {
-          "column": 10,
-          "line": 29
-        }
-      }
-    ],
-    "path": "src/components/services/content/WebControls.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Oh no!",
-        "end": {
-          "column": 3,
-          "line": 13
-        },
-        "file": "src/components/services/content/WebviewCrashHandler.js",
-        "id": "service.crashHandler.headline",
-        "start": {
-          "column": 12,
-          "line": 10
-        }
-      },
-      {
-        "defaultMessage": "!!!{name} has caused an error.",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/components/services/content/WebviewCrashHandler.js",
-        "id": "service.crashHandler.text",
-        "start": {
-          "column": 8,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload {name}",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/services/content/WebviewCrashHandler.js",
-        "id": "service.crashHandler.action",
-        "start": {
-          "column": 10,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Trying to automatically restore {name} in {seconds} seconds",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/services/content/WebviewCrashHandler.js",
-        "id": "service.crashHandler.autoReload",
-        "start": {
-          "column": 14,
-          "line": 22
-        }
-      }
-    ],
-    "path": "src/components/services/content/WebviewCrashHandler.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.reload",
-        "start": {
-          "column": 10,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Disable notifications",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.disableNotifications",
-        "start": {
-          "column": 24,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable notifications",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.enableNotification",
-        "start": {
-          "column": 23,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Disable audio",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.disableAudio",
-        "start": {
-          "column": 16,
-          "line": 33
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable audio",
-        "end": {
-          "column": 3,
-          "line": 40
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.enableAudio",
-        "start": {
-          "column": 15,
-          "line": 37
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Dark mode",
-        "end": {
-          "column": 3,
-          "line": 44
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.enableDarkMode",
-        "start": {
-          "column": 18,
-          "line": 41
-        }
-      },
-      {
-        "defaultMessage": "!!!Disable Dark mode",
-        "end": {
-          "column": 3,
-          "line": 48
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.disableDarkMode",
-        "start": {
-          "column": 19,
-          "line": 45
-        }
-      },
-      {
-        "defaultMessage": "!!!Disable Service",
-        "end": {
-          "column": 3,
-          "line": 52
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.disableService",
-        "start": {
-          "column": 18,
-          "line": 49
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Service",
-        "end": {
-          "column": 3,
-          "line": 56
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.enableService",
-        "start": {
-          "column": 17,
-          "line": 53
-        }
-      },
-      {
-        "defaultMessage": "!!!Hibernate Service",
-        "end": {
-          "column": 3,
-          "line": 60
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.hibernateService",
-        "start": {
-          "column": 20,
-          "line": 57
-        }
-      },
-      {
-        "defaultMessage": "!!!Wake Up Service",
-        "end": {
-          "column": 3,
-          "line": 64
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.wakeUpService",
-        "start": {
-          "column": 17,
-          "line": 61
-        }
-      },
-      {
-        "defaultMessage": "!!!Delete Service",
-        "end": {
-          "column": 3,
-          "line": 68
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.deleteService",
-        "start": {
-          "column": 17,
-          "line": 65
-        }
-      },
-      {
-        "defaultMessage": "!!!Do you really want to delete the {serviceName} service?",
-        "end": {
-          "column": 3,
-          "line": 73
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.confirmDeleteService",
-        "start": {
-          "column": 24,
-          "line": 69
-        }
-      }
-    ],
-    "path": "src/components/services/tabs/TabItem.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Account",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.headline",
-        "start": {
-          "column": 12,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!Danger Zone",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.headlineDangerZone",
-        "start": {
-          "column": 22,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Edit Account",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.account.editButton",
-        "start": {
-          "column": 21,
-          "line": 22
-        }
-      },
-      {
-        "defaultMessage": "!!Invoices",
-        "end": {
-          "column": 3,
-          "line": 29
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.headlineInvoices",
-        "start": {
-          "column": 18,
-          "line": 26
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not load user information",
-        "end": {
-          "column": 3,
-          "line": 33
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.userInfoRequestFailed",
-        "start": {
-          "column": 25,
-          "line": 30
-        }
-      },
-      {
-        "defaultMessage": "!!!Try again",
-        "end": {
-          "column": 3,
-          "line": 37
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.tryReloadUserInfoRequest",
-        "start": {
-          "column": 28,
-          "line": 34
-        }
-      },
-      {
-        "defaultMessage": "!!!Delete account",
-        "end": {
-          "column": 3,
-          "line": 41
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.deleteAccount",
-        "start": {
-          "column": 17,
-          "line": 38
-        }
-      },
-      {
-        "defaultMessage": "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.deleteInfo",
-        "start": {
-          "column": 14,
-          "line": 42
-        }
-      },
-      {
-        "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.deleteEmailSent",
-        "start": {
-          "column": 19,
-          "line": 47
-        }
-      },
-      {
-        "defaultMessage": "!!!Your Franz License:",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.yourLicense",
-        "start": {
-          "column": 15,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "Account is unavailable",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.accountUnavailable",
-        "start": {
-          "column": 22,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.accountUnavailableInfo",
-        "start": {
-          "column": 26,
-          "line": 60
-        }
-      }
-    ],
-    "path": "src/components/settings/account/AccountDashboard.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Available services",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.availableServices",
-        "start": {
-          "column": 21,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Your services",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.yourServices",
-        "start": {
-          "column": 16,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Your workspaces",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.yourWorkspaces",
-        "start": {
-          "column": 18,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Account",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.account",
-        "start": {
-          "column": 11,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Manage Team",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.team",
-        "start": {
-          "column": 8,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!About Ferdi",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.supportFerdi",
-        "start": {
-          "column": 16,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Logout",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.logout",
-        "start": {
-          "column": 10,
-          "line": 40
-        }
-      }
-    ],
-    "path": "src/components/settings/navigation/SettingsNavigation.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Available Services",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.headline",
-        "start": {
-          "column": 12,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Search service",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.searchService",
-        "start": {
-          "column": 17,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!All services",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.all",
-        "start": {
-          "column": 14,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Custom Services",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.custom",
-        "start": {
-          "column": 17,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.nothingFound",
-        "start": {
-          "column": 16,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!Service successfully added",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.servicesSuccessfulAddedInfo",
-        "start": {
-          "column": 31,
-          "line": 39
-        }
-      },
-      {
-        "defaultMessage": "!!!Missing a service?",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.missingService",
-        "start": {
-          "column": 18,
-          "line": 43
-        }
-      },
-      {
-        "defaultMessage": "!!!To add a custom service, copy the recipe folder into:",
-        "end": {
-          "column": 3,
-          "line": 50
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.customService.intro",
-        "start": {
-          "column": 21,
-          "line": 47
-        }
-      },
-      {
-        "defaultMessage": "!!!Open directory",
-        "end": {
-          "column": 3,
-          "line": 54
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.customService.openFolder",
-        "start": {
-          "column": 14,
-          "line": 51
-        }
-      },
-      {
-        "defaultMessage": "!!!Developer Documentation",
-        "end": {
-          "column": 3,
-          "line": 58
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.customService.openDevDocs",
-        "start": {
-          "column": 15,
-          "line": 55
-        }
-      },
-      {
-        "defaultMessage": "!!!Custom 3rd Party Recipes",
-        "end": {
-          "column": 3,
-          "line": 62
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.customService.headline.customRecipes",
-        "start": {
-          "column": 25,
-          "line": 59
-        }
-      },
-      {
-        "defaultMessage": "!!!Community 3rd Party Recipes",
-        "end": {
-          "column": 3,
-          "line": 66
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.customService.headline.communityRecipes",
-        "start": {
-          "column": 28,
-          "line": 63
-        }
-      },
-      {
-        "defaultMessage": "!!!Your Development Service Recipes",
-        "end": {
-          "column": 3,
-          "line": 70
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.customService.headline.devRecipes",
-        "start": {
-          "column": 22,
-          "line": 67
-        }
-      }
-    ],
-    "path": "src/components/settings/recipes/RecipesDashboard.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Save service",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.saveButton",
-        "start": {
-          "column": 15,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Delete Service",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.deleteButton",
-        "start": {
-          "column": 17,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Open darkmode.css",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.openDarkmodeCss",
-        "start": {
-          "column": 19,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Open user.css",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.openUserCss",
-        "start": {
-          "column": 15,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!Open user.js",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.openUserJs",
-        "start": {
-          "column": 14,
-          "line": 39
-        }
-      },
-      {
-        "defaultMessage": "!!!Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.recipeFileInfo",
-        "start": {
-          "column": 18,
-          "line": 43
-        }
-      },
-      {
-        "defaultMessage": "!!!Available services",
-        "end": {
-          "column": 3,
-          "line": 50
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.availableServices",
-        "start": {
-          "column": 21,
-          "line": 47
-        }
-      },
-      {
-        "defaultMessage": "!!!Your services",
-        "end": {
-          "column": 3,
-          "line": 54
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.yourServices",
-        "start": {
-          "column": 16,
-          "line": 51
-        }
-      },
-      {
-        "defaultMessage": "!!!Add {name}",
-        "end": {
-          "column": 3,
-          "line": 58
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.addServiceHeadline",
-        "start": {
-          "column": 22,
-          "line": 55
-        }
-      },
-      {
-        "defaultMessage": "!!!Edit {name}",
-        "end": {
-          "column": 3,
-          "line": 62
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.editServiceHeadline",
-        "start": {
-          "column": 23,
-          "line": 59
-        }
-      },
-      {
-        "defaultMessage": "!!!Hosted",
-        "end": {
-          "column": 3,
-          "line": 66
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.tabHosted",
-        "start": {
-          "column": 13,
-          "line": 63
-        }
-      },
-      {
-        "defaultMessage": "!!!Self hosted ⭐️",
-        "end": {
-          "column": 3,
-          "line": 70
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.tabOnPremise",
-        "start": {
-          "column": 16,
-          "line": 67
-        }
-      },
-      {
-        "defaultMessage": "!!!Use the hosted {name} service.",
-        "end": {
-          "column": 3,
-          "line": 74
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.useHostedService",
-        "start": {
-          "column": 20,
-          "line": 71
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not validate custom {name} server.",
-        "end": {
-          "column": 3,
-          "line": 78
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.customUrlValidationError",
-        "start": {
-          "column": 28,
-          "line": 75
-        }
-      },
-      {
-        "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
-        "end": {
-          "column": 3,
-          "line": 82
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.indirectMessageInfo",
-        "start": {
-          "column": 23,
-          "line": 79
-        }
-      },
-      {
-        "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
-        "end": {
-          "column": 3,
-          "line": 86
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.isMutedInfo",
-        "start": {
-          "column": 15,
-          "line": 83
-        }
-      },
-      {
-        "defaultMessage": "!!!When enabled, a service will be shut down after a period of time to save system resources.",
-        "end": {
-          "column": 3,
-          "line": 90
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.isHibernatedEnabledInfo",
-        "start": {
-          "column": 28,
-          "line": 87
-        }
-      },
-      {
-        "defaultMessage": "!!!Notifications",
-        "end": {
-          "column": 3,
-          "line": 94
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.headlineNotifications",
-        "start": {
-          "column": 25,
-          "line": 91
-        }
-      },
-      {
-        "defaultMessage": "!!!Unread message badges",
-        "end": {
-          "column": 3,
-          "line": 98
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.headlineBadges",
-        "start": {
-          "column": 18,
-          "line": 95
-        }
-      },
-      {
-        "defaultMessage": "!!!General",
-        "end": {
-          "column": 3,
-          "line": 102
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.headlineGeneral",
-        "start": {
-          "column": 19,
-          "line": 99
-        }
-      },
-      {
-        "defaultMessage": "!!!Dark Reader Settings",
-        "end": {
-          "column": 3,
-          "line": 106
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.headlineDarkReaderSettings",
-        "start": {
-          "column": 30,
-          "line": 103
-        }
-      },
-      {
-        "defaultMessage": "!!!Delete",
-        "end": {
-          "column": 3,
-          "line": 110
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.iconDelete",
-        "start": {
-          "column": 14,
-          "line": 107
-        }
-      },
-      {
-        "defaultMessage": "!!!Drop your image, or click here",
-        "end": {
-          "column": 3,
-          "line": 114
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.iconUpload",
-        "start": {
-          "column": 14,
-          "line": 111
-        }
-      },
-      {
-        "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
-        "end": {
-          "column": 3,
-          "line": 118
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.proxy.headline",
-        "start": {
-          "column": 17,
-          "line": 115
-        }
-      },
-      {
-        "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
-        "end": {
-          "column": 3,
-          "line": 122
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.proxy.restartInfo",
-        "start": {
-          "column": 20,
-          "line": 119
-        }
-      },
-      {
-        "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
-        "end": {
-          "column": 3,
-          "line": 126
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.proxy.info",
-        "start": {
-          "column": 13,
-          "line": 123
-        }
-      }
-    ],
-    "path": "src/components/settings/services/EditServiceForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Error",
-        "end": {
-          "column": 3,
-          "line": 13
-        },
-        "file": "src/components/settings/services/ServiceError.js",
-        "id": "settings.service.error.headline",
-        "start": {
-          "column": 12,
-          "line": 10
-        }
-      },
-      {
-        "defaultMessage": "!!!Back to services",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/components/settings/services/ServiceError.js",
-        "id": "settings.service.error.goBack",
-        "start": {
-          "column": 10,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!!Available services",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/settings/services/ServiceError.js",
-        "id": "settings.service.form.availableServices",
-        "start": {
-          "column": 21,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not load service recipe.",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/settings/services/ServiceError.js",
-        "id": "settings.service.error.message",
-        "start": {
-          "column": 16,
-          "line": 22
-        }
-      }
-    ],
-    "path": "src/components/settings/services/ServiceError.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Service is disabled",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/settings/services/ServiceItem.js",
-        "id": "settings.services.tooltip.isDisabled",
-        "start": {
-          "column": 21,
-          "line": 11
-        }
-      },
-      {
-        "defaultMessage": "!!!Notifications are disabled",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/settings/services/ServiceItem.js",
-        "id": "settings.services.tooltip.notificationsDisabled",
-        "start": {
-          "column": 32,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!All sounds are muted",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/settings/services/ServiceItem.js",
-        "id": "settings.services.tooltip.isMuted",
-        "start": {
-          "column": 18,
-          "line": 19
-        }
-      }
-    ],
-    "path": "src/components/settings/services/ServiceItem.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Your services",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.services.headline",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Search service",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.searchService",
-        "start": {
-          "column": 17,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Start by adding a service.",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.services.noServicesAdded",
-        "start": {
-          "column": 19,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.recipes.nothingFound",
-        "start": {
-          "column": 18,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Discover services",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.services.discoverServices",
-        "start": {
-          "column": 20,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not load your services",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.services.servicesRequestFailed",
-        "start": {
-          "column": 25,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!Try again",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.account.tryReloadServices",
-        "start": {
-          "column": 21,
-          "line": 39
-        }
-      },
-      {
-        "defaultMessage": "!!!Your changes have been saved",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.services.updatedInfo",
-        "start": {
-          "column": 15,
-          "line": 43
-        }
-      },
-      {
-        "defaultMessage": "!!!Service has been deleted",
-        "end": {
-          "column": 3,
-          "line": 50
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.services.deletedInfo",
-        "start": {
-          "column": 15,
-          "line": 47
-        }
-      }
-    ],
-    "path": "src/components/settings/services/ServicesDashboard.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!General",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headlineGeneral",
-        "start": {
-          "column": 19,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.sentryInfo",
-        "start": {
-          "column": 14,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.hibernateInfo",
-        "start": {
-          "column": 17,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.inactivityLockInfo",
-        "start": {
-          "column": 22,
-          "line": 33
-        }
-      },
-      {
-        "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
-        "end": {
-          "column": 3,
-          "line": 40
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.todoServerInfo",
-        "start": {
-          "column": 18,
-          "line": 37
-        }
-      },
-      {
-        "defaultMessage": "!!!Password",
-        "end": {
-          "column": 3,
-          "line": 44
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.lockedPassword",
-        "start": {
-          "column": 18,
-          "line": 41
-        }
-      },
-      {
-        "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
-        "end": {
-          "column": 3,
-          "line": 48
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.lockedPasswordInfo",
-        "start": {
-          "column": 22,
-          "line": 45
-        }
-      },
-      {
-        "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
-        "end": {
-          "column": 3,
-          "line": 52
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.lockInfo",
-        "start": {
-          "column": 12,
-          "line": 49
-        }
-      },
-      {
-        "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-        "end": {
-          "column": 3,
-          "line": 56
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.scheduledDNDTimeInfo",
-        "start": {
-          "column": 24,
-          "line": 53
-        }
-      },
-      {
-        "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
-        "end": {
-          "column": 3,
-          "line": 60
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.scheduledDNDInfo",
-        "start": {
-          "column": 20,
-          "line": 57
-        }
-      },
-      {
-        "defaultMessage": "!!!Language",
-        "end": {
-          "column": 3,
-          "line": 64
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headlineLanguage",
-        "start": {
-          "column": 20,
-          "line": 61
-        }
-      },
-      {
-        "defaultMessage": "!!!Updates",
-        "end": {
-          "column": 3,
-          "line": 68
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headlineUpdates",
-        "start": {
-          "column": 19,
-          "line": 65
-        }
-      },
-      {
-        "defaultMessage": "!!!Appearance",
-        "end": {
-          "column": 3,
-          "line": 72
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headlineAppearance",
-        "start": {
-          "column": 22,
-          "line": 69
-        }
-      },
-      {
-        "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
-        "end": {
-          "column": 3,
-          "line": 76
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.universalDarkModeInfo",
-        "start": {
-          "column": 25,
-          "line": 73
-        }
-      },
-      {
-        "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
-        "end": {
-          "column": 3,
-          "line": 80
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.accentColorInfo",
-        "start": {
-          "column": 19,
-          "line": 77
-        }
-      },
-      {
-        "defaultMessage": "!!!Privacy",
-        "end": {
-          "column": 3,
-          "line": 84
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headlinePrivacy",
-        "start": {
-          "column": 19,
-          "line": 81
-        }
-      },
-      {
-        "defaultMessage": "!!!Advanced",
-        "end": {
-          "column": 3,
-          "line": 88
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headlineAdvanced",
-        "start": {
-          "column": 20,
-          "line": 85
-        }
-      },
-      {
-        "defaultMessage": "!!!Help us to translate Ferdi into your language.",
-        "end": {
-          "column": 3,
-          "line": 92
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.translationHelp",
-        "start": {
-          "column": 19,
-          "line": 89
-        }
-      },
-      {
-        "defaultMessage": "!!!Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
-        "end": {
-          "column": 3,
-          "line": 96
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.spellCheckerLanguageInfo",
-        "start": {
-          "column": 28,
-          "line": 93
-        }
-      },
-      {
-        "defaultMessage": "!!!Cache",
-        "end": {
-          "column": 3,
-          "line": 100
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.subheadlineCache",
-        "start": {
-          "column": 20,
-          "line": 97
-        }
-      },
-      {
-        "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
-        "end": {
-          "column": 3,
-          "line": 104
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.cacheInfo",
-        "start": {
-          "column": 13,
-          "line": 101
-        }
-      },
-      {
-        "defaultMessage": "!!!Couldn't clear all cache",
-        "end": {
-          "column": 3,
-          "line": 108
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.cacheNotCleared",
-        "start": {
-          "column": 19,
-          "line": 105
-        }
-      },
-      {
-        "defaultMessage": "!!!Clear cache",
-        "end": {
-          "column": 3,
-          "line": 112
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.buttonClearAllCache",
-        "start": {
-          "column": 23,
-          "line": 109
-        }
-      },
-      {
-        "defaultMessage": "!!!Ferdi Profile",
-        "end": {
-          "column": 3,
-          "line": 116
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.subheadlineFerdiProfile",
-        "start": {
-          "column": 27,
-          "line": 113
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Profile folder",
-        "end": {
-          "column": 3,
-          "line": 120
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.buttonOpenFerdiProfileFolder",
-        "start": {
-          "column": 32,
-          "line": 117
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Service Recipes folder",
-        "end": {
-          "column": 3,
-          "line": 124
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.buttonOpenFerdiServiceRecipesFolder",
-        "start": {
-          "column": 39,
-          "line": 121
-        }
-      },
-      {
-        "defaultMessage": "!!!Check for updates",
-        "end": {
-          "column": 3,
-          "line": 128
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.buttonSearchForUpdate",
-        "start": {
-          "column": 25,
-          "line": 125
-        }
-      },
-      {
-        "defaultMessage": "!!!Restart & install update",
-        "end": {
-          "column": 3,
-          "line": 132
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.buttonInstallUpdate",
-        "start": {
-          "column": 23,
-          "line": 129
-        }
-      },
-      {
-        "defaultMessage": "!!!Is searching for update",
-        "end": {
-          "column": 3,
-          "line": 136
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.updateStatusSearching",
-        "start": {
-          "column": 25,
-          "line": 133
-        }
-      },
-      {
-        "defaultMessage": "!!!Update available, downloading...",
-        "end": {
-          "column": 3,
-          "line": 140
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.updateStatusAvailable",
-        "start": {
-          "column": 25,
-          "line": 137
-        }
-      },
-      {
-        "defaultMessage": "!!!You are using the latest version of Ferdi",
-        "end": {
-          "column": 3,
-          "line": 144
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.updateStatusUpToDate",
-        "start": {
-          "column": 24,
-          "line": 141
-        }
-      },
-      {
-        "defaultMessage": "!!!Current version:",
-        "end": {
-          "column": 3,
-          "line": 148
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.currentVersion",
-        "start": {
-          "column": 18,
-          "line": 145
-        }
-      },
-      {
-        "defaultMessage": "!!!Changes require restart",
-        "end": {
-          "column": 3,
-          "line": 152
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.restartRequired",
-        "start": {
-          "column": 22,
-          "line": 149
-        }
-      },
-      {
-        "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
-        "end": {
-          "column": 3,
-          "line": 156
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.languageDisclaimer",
-        "start": {
-          "column": 22,
-          "line": 153
-        }
-      }
-    ],
-    "path": "src/components/settings/settings/EditSettingsForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Close settings",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/settings/SettingsLayout.js",
-        "id": "settings.app.closeSettings",
-        "start": {
-          "column": 17,
-          "line": 11
-        }
-      }
-    ],
-    "path": "src/components/settings/SettingsLayout.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!About Ferdi",
-        "end": {
-          "column": 3,
-          "line": 10
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.headline",
-        "start": {
-          "column": 12,
-          "line": 7
-        }
-      },
-      {
-        "defaultMessage": "!!!Do you like Ferdi?",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.title",
-        "start": {
-          "column": 9,
-          "line": 11
-        }
-      },
-      {
-        "defaultMessage": "!!!<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.aboutIntro",
-        "start": {
-          "column": 14,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Full list of contributor",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textListContributors",
-        "start": {
-          "column": 24,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!here",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textListContributorsHere",
-        "start": {
-          "column": 28,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!The development of Ferdi is done by volunteers. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textVolunteers",
-        "start": {
-          "column": 18,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Support is always welcome. You can find a list of the help we need",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textSupportWelcome",
-        "start": {
-          "column": 22,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!here",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textSupportWelcomeHere",
-        "start": {
-          "column": 26,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textExpenses",
-        "start": {
-          "column": 16,
-          "line": 39
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Collective",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textOpenCollective",
-        "start": {
-          "column": 22,
-          "line": 43
-        }
-      },
-      {
-        "defaultMessage": "!!!If you feel like supporting Ferdi development with a donation, you can do so on both,",
-        "end": {
-          "column": 3,
-          "line": 50
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textDonation",
-        "start": {
-          "column": 16,
-          "line": 47
-        }
-      },
-      {
-        "defaultMessage": "!!!and",
-        "end": {
-          "column": 3,
-          "line": 54
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textDonationAnd",
-        "start": {
-          "column": 19,
-          "line": 51
-        }
-      },
-      {
-        "defaultMessage": "!!!GitHub Sponsors",
-        "end": {
-          "column": 3,
-          "line": 58
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textGitHubSponsors",
-        "start": {
-          "column": 22,
-          "line": 55
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Survey",
-        "end": {
-          "column": 3,
-          "line": 62
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.openSurvey",
-        "start": {
-          "column": 14,
-          "line": 59
-        }
-      },
-      {
-        "defaultMessage": "!!!Do you want to help us improve Ferdi?",
-        "end": {
-          "column": 3,
-          "line": 66
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.bannerText",
-        "start": {
-          "column": 14,
-          "line": 63
-        }
-      }
-    ],
-    "path": "src/components/settings/supportFerdi/SupportFerdiDashboard.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Team",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.headline",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz Team Management",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.contentHeadline",
-        "start": {
-          "column": 19,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Your are currently using Franz Servers, which is why you have access to Team Management.",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.intro",
-        "start": {
-          "column": 9,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.copy",
-        "start": {
-          "column": 8,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Manage your Team on meetfranz.com",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.manageAction",
-        "start": {
-          "column": 16,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Teams are unavailable",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.teamsUnavailable",
-        "start": {
-          "column": 20,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.teamsUnavailableInfo",
-        "start": {
-          "column": 24,
-          "line": 39
-        }
-      }
-    ],
-    "path": "src/components/settings/team/TeamDashboard.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Account",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/settings/user/EditUserForm.js",
-        "id": "settings.account.headline",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Update Profile",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/settings/user/EditUserForm.js",
-        "id": "settings.account.headlineProfile",
-        "start": {
-          "column": 19,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Account Information",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/settings/user/EditUserForm.js",
-        "id": "settings.account.headlineAccount",
-        "start": {
-          "column": 19,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Change Password",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/user/EditUserForm.js",
-        "id": "settings.account.headlinePassword",
-        "start": {
-          "column": 20,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Your changes have been saved",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/settings/user/EditUserForm.js",
-        "id": "settings.account.successInfo",
-        "start": {
-          "column": 15,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Update profile",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/user/EditUserForm.js",
-        "id": "settings.account.buttonSave",
-        "start": {
-          "column": 14,
-          "line": 35
-        }
-      }
-    ],
-    "path": "src/components/settings/user/EditUserForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Choose from more than 70 Services",
-        "end": {
-          "column": 3,
-          "line": 11
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.recipes",
-        "start": {
-          "column": 20,
-          "line": 8
-        }
-      },
-      {
-        "defaultMessage": "!!!Account Synchronisation",
-        "end": {
-          "column": 3,
-          "line": 15
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.accountSync",
-        "start": {
-          "column": 15,
-          "line": 12
-        }
-      },
-      {
-        "defaultMessage": "!!!Desktop Notifications",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.desktopNotifications",
-        "start": {
-          "column": 24,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Add unlimited services",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.unlimitedServices",
-        "start": {
-          "column": 21,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Spellchecker support",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.spellchecker",
-        "start": {
-          "column": 16,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Workspaces",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.workspaces",
-        "start": {
-          "column": 14,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Add Custom Websites",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.customWebsites",
-        "start": {
-          "column": 18,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!On-premise & other Hosted Services",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.onPremise",
-        "start": {
-          "column": 13,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Install 3rd party services",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.thirdPartyServices",
-        "start": {
-          "column": 22,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Service Proxies",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.serviceProxies",
-        "start": {
-          "column": 18,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Team Management",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.teamManagement",
-        "start": {
-          "column": 18,
-          "line": 48
-        }
-      }
-    ],
-    "path": "src/components/ui/FeatureList.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Hide",
-        "end": {
-          "column": 3,
-          "line": 15
-        },
-        "file": "src/components/ui/InfoBar.js",
-        "id": "infobar.hide",
-        "start": {
-          "column": 8,
-          "line": 12
-        }
-      }
-    ],
-    "path": "src/components/ui/InfoBar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Dismiss",
-        "end": {
-          "column": 3,
-          "line": 12
-        },
-        "file": "src/components/ui/Infobox.js",
-        "id": "infobox.dismiss",
-        "start": {
-          "column": 11,
-          "line": 9
-        }
-      }
-    ],
-    "path": "src/components/ui/Infobox.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Password toggle",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/ui/Input.js",
-        "id": "settings.app.form.passwordToggle",
-        "start": {
-          "column": 18,
-          "line": 11
-        }
-      }
-    ],
-    "path": "src/components/ui/Input.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Loading {service}",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/ui/WebviewLoader/index.js",
-        "id": "service.webviewLoader.loading",
-        "start": {
-          "column": 11,
-          "line": 11
-        }
-      }
-    ],
-    "path": "src/components/ui/WebviewLoader/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Something went wrong.",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/util/ErrorBoundary/index.js",
-        "id": "app.errorHandler.headline",
-        "start": {
-          "column": 12,
-          "line": 11
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/util/ErrorBoundary/index.js",
-        "id": "app.errorHandler.action",
-        "start": {
-          "column": 10,
-          "line": 15
-        }
-      }
-    ],
-    "path": "src/components/util/ErrorBoundary/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Name",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.name",
-        "start": {
-          "column": 8,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable service",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableService",
-        "start": {
-          "column": 17,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable hibernation",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableHibernation",
-        "start": {
-          "column": 21,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Notifications",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableNotification",
-        "start": {
-          "column": 22,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Show unread message badges",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableBadge",
-        "start": {
-          "column": 15,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable audio",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableAudio",
-        "start": {
-          "column": 15,
-          "line": 48
-        }
-      },
-      {
-        "defaultMessage": "!!!Team",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.team",
-        "start": {
-          "column": 8,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "!!!Service URL",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.customUrl",
-        "start": {
-          "column": 13,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "!!!Show message badge for all new messages",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.indirectMessages",
-        "start": {
-          "column": 20,
-          "line": 60
-        }
-      },
-      {
-        "defaultMessage": "!!!Custom icon",
-        "end": {
-          "column": 3,
-          "line": 67
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.icon",
-        "start": {
-          "column": 8,
-          "line": 64
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Dark Mode",
-        "end": {
-          "column": 3,
-          "line": 71
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableDarkMode",
-        "start": {
-          "column": 18,
-          "line": 68
-        }
-      },
-      {
-        "defaultMessage": "!!!Dark Reader Brightness",
-        "end": {
-          "column": 3,
-          "line": 75
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.darkReaderBrightness",
-        "start": {
-          "column": 24,
-          "line": 72
-        }
-      },
-      {
-        "defaultMessage": "!!!Dark Reader Contrast",
-        "end": {
-          "column": 3,
-          "line": 79
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.darkReaderContrast",
-        "start": {
-          "column": 22,
-          "line": 76
-        }
-      },
-      {
-        "defaultMessage": "!!!Dark Reader Sepia",
-        "end": {
-          "column": 3,
-          "line": 83
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.darkReaderSepia",
-        "start": {
-          "column": 19,
-          "line": 80
-        }
-      },
-      {
-        "defaultMessage": "!!!Use Proxy",
-        "end": {
-          "column": 3,
-          "line": 87
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.proxy.isEnabled",
-        "start": {
-          "column": 15,
-          "line": 84
-        }
-      },
-      {
-        "defaultMessage": "!!!Proxy Host/IP",
-        "end": {
-          "column": 3,
-          "line": 91
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.proxy.host",
-        "start": {
-          "column": 13,
-          "line": 88
-        }
-      },
-      {
-        "defaultMessage": "!!!Port",
-        "end": {
-          "column": 3,
-          "line": 95
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.proxy.port",
-        "start": {
-          "column": 13,
-          "line": 92
-        }
-      },
-      {
-        "defaultMessage": "!!!User",
-        "end": {
-          "column": 3,
-          "line": 99
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.proxy.user",
-        "start": {
-          "column": 13,
-          "line": 96
-        }
-      },
-      {
-        "defaultMessage": "!!!Password",
-        "end": {
-          "column": 3,
-          "line": 103
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.proxy.password",
-        "start": {
-          "column": 17,
-          "line": 100
-        }
-      }
-    ],
-    "path": "src/containers/settings/EditServiceScreen.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Launch Ferdi on start",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.autoLaunchOnStart",
-        "start": {
-          "column": 21,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Open in background",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.autoLaunchInBackground",
-        "start": {
-          "column": 26,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Keep Ferdi in background when closing the window",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.runInBackground",
-        "start": {
-          "column": 19,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Start minimized",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.startMinimized",
-        "start": {
-          "column": 18,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Confirm when quitting Ferdi",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.confirmOnQuit",
-        "start": {
-          "column": 17,
-          "line": 48
-        }
-      },
-      {
-        "defaultMessage": "!!!Always show Ferdi in System Tray",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableSystemTray",
-        "start": {
-          "column": 20,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "!!!Always show Ferdi in Menu Bar",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableMenuBar",
-        "start": {
-          "column": 17,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload Ferdi after system resume",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.reloadAfterResume",
-        "start": {
-          "column": 21,
-          "line": 60
-        }
-      },
-      {
-        "defaultMessage": "!!!Minimize Ferdi to system tray",
-        "end": {
-          "column": 3,
-          "line": 67
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.minimizeToSystemTray",
-        "start": {
-          "column": 24,
-          "line": 64
-        }
-      },
-      {
-        "defaultMessage": "!!!Close Ferdi to system tray",
-        "end": {
-          "column": 3,
-          "line": 71
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.closeToSystemTray",
-        "start": {
-          "column": 21,
-          "line": 68
-        }
-      },
-      {
-        "defaultMessage": "!!!Don't show message content in notifications",
-        "end": {
-          "column": 3,
-          "line": 75
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.privateNotifications",
-        "start": {
-          "column": 24,
-          "line": 72
-        }
-      },
-      {
-        "defaultMessage": "!!!Don't show notifications for clipboard events",
-        "end": {
-          "column": 3,
-          "line": 79
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.clipboardNotifications",
-        "start": {
-          "column": 26,
-          "line": 76
-        }
-      },
-      {
-        "defaultMessage": "!!!Notify TaskBar/Dock on new message",
-        "end": {
-          "column": 3,
-          "line": 83
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.notifyTaskBarOnMessage",
-        "start": {
-          "column": 26,
-          "line": 80
-        }
-      },
-      {
-        "defaultMessage": "!!!Navigation bar behaviour",
-        "end": {
-          "column": 3,
-          "line": 87
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.navigationBarBehaviour",
-        "start": {
-          "column": 26,
-          "line": 84
-        }
-      },
-      {
-        "defaultMessage": "!!!Search engine",
-        "end": {
-          "column": 3,
-          "line": 91
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.searchEngine",
-        "start": {
-          "column": 16,
-          "line": 88
-        }
-      },
-      {
-        "defaultMessage": "!!!Send telemetry data",
-        "end": {
-          "column": 3,
-          "line": 95
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.sentry",
-        "start": {
-          "column": 10,
-          "line": 92
-        }
-      },
-      {
-        "defaultMessage": "!!!Keep services in hibernation on startup",
-        "end": {
-          "column": 3,
-          "line": 99
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.hibernateOnStartup",
-        "start": {
-          "column": 22,
-          "line": 96
-        }
-      },
-      {
-        "defaultMessage": "!!!Hibernation strategy",
-        "end": {
-          "column": 3,
-          "line": 103
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.hibernationStrategy",
-        "start": {
-          "column": 23,
-          "line": 100
-        }
-      },
-      {
-        "defaultMessage": "!!!Wake up strategy",
-        "end": {
-          "column": 3,
-          "line": 107
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.wakeUpStrategy",
-        "start": {
-          "column": 18,
-          "line": 104
-        }
-      },
-      {
-        "defaultMessage": "!!!Todo Server",
-        "end": {
-          "column": 3,
-          "line": 111
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.predefinedTodoServer",
-        "start": {
-          "column": 24,
-          "line": 108
-        }
-      },
-      {
-        "defaultMessage": "!!!Custom TodoServer",
-        "end": {
-          "column": 3,
-          "line": 115
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.customTodoServer",
-        "start": {
-          "column": 20,
-          "line": 112
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Password Lock",
-        "end": {
-          "column": 3,
-          "line": 119
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableLock",
-        "start": {
-          "column": 14,
-          "line": 116
-        }
-      },
-      {
-        "defaultMessage": "!!!Password",
-        "end": {
-          "column": 3,
-          "line": 123
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.lockPassword",
-        "start": {
-          "column": 16,
-          "line": 120
-        }
-      },
-      {
-        "defaultMessage": "!!!Allow using Touch ID to unlock",
-        "end": {
-          "column": 3,
-          "line": 127
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.useTouchIdToUnlock",
-        "start": {
-          "column": 22,
-          "line": 124
-        }
-      },
-      {
-        "defaultMessage": "!!!Lock after inactivity",
-        "end": {
-          "column": 3,
-          "line": 131
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.inactivityLock",
-        "start": {
-          "column": 18,
-          "line": 128
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
-        "end": {
-          "column": 3,
-          "line": 135
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.scheduledDNDEnabled",
-        "start": {
-          "column": 23,
-          "line": 132
-        }
-      },
-      {
-        "defaultMessage": "!!!From",
-        "end": {
-          "column": 3,
-          "line": 139
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.scheduledDNDStart",
-        "start": {
-          "column": 21,
-          "line": 136
-        }
-      },
-      {
-        "defaultMessage": "!!!To",
-        "end": {
-          "column": 3,
-          "line": 143
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.scheduledDNDEnd",
-        "start": {
-          "column": 19,
-          "line": 140
-        }
-      },
-      {
-        "defaultMessage": "!!!Language",
-        "end": {
-          "column": 3,
-          "line": 147
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.language",
-        "start": {
-          "column": 12,
-          "line": 144
-        }
-      },
-      {
-        "defaultMessage": "!!!Dark Mode",
-        "end": {
-          "column": 3,
-          "line": 151
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.darkMode",
-        "start": {
-          "column": 12,
-          "line": 148
-        }
-      },
-      {
-        "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
-        "end": {
-          "column": 3,
-          "line": 155
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.adaptableDarkMode",
-        "start": {
-          "column": 21,
-          "line": 152
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable universal Dark Mode",
-        "end": {
-          "column": 3,
-          "line": 159
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.universalDarkMode",
-        "start": {
-          "column": 21,
-          "line": 156
-        }
-      },
-      {
-        "defaultMessage": "!!!Sidebar width",
-        "end": {
-          "column": 3,
-          "line": 163
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.serviceRibbonWidth",
-        "start": {
-          "column": 22,
-          "line": 160
-        }
-      },
-      {
-        "defaultMessage": "!!!Service icon size",
-        "end": {
-          "column": 3,
-          "line": 167
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.iconSize",
-        "start": {
-          "column": 12,
-          "line": 164
-        }
-      },
-      {
-        "defaultMessage": "!!!Use horizontal style",
-        "end": {
-          "column": 3,
-          "line": 171
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.useVerticalStyle",
-        "start": {
-          "column": 20,
-          "line": 168
-        }
-      },
-      {
-        "defaultMessage": "!!!Always show workspace drawer",
-        "end": {
-          "column": 3,
-          "line": 175
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.alwaysShowWorkspaces",
-        "start": {
-          "column": 24,
-          "line": 172
-        }
-      },
-      {
-        "defaultMessage": "!!!Accent color",
-        "end": {
-          "column": 3,
-          "line": 179
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.accentColor",
-        "start": {
-          "column": 15,
-          "line": 176
-        }
-      },
-      {
-        "defaultMessage": "!!!Display disabled services tabs",
-        "end": {
-          "column": 3,
-          "line": 183
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.showDisabledServices",
-        "start": {
-          "column": 24,
-          "line": 180
-        }
-      },
-      {
-        "defaultMessage": "!!!Show unread message badge when notifications are disabled",
-        "end": {
-          "column": 3,
-          "line": 187
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.showMessagesBadgesWhenMuted",
-        "start": {
-          "column": 29,
-          "line": 184
-        }
-      },
-      {
-        "defaultMessage": "!!!Show draggable area on window",
-        "end": {
-          "column": 3,
-          "line": 191
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.showDragArea",
-        "start": {
-          "column": 16,
-          "line": 188
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable spell checking",
-        "end": {
-          "column": 3,
-          "line": 195
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableSpellchecking",
-        "start": {
-          "column": 23,
-          "line": 192
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable GPU Acceleration",
-        "end": {
-          "column": 3,
-          "line": 199
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableGPUAcceleration",
-        "start": {
-          "column": 25,
-          "line": 196
-        }
-      },
-      {
-        "defaultMessage": "!!!Include beta versions",
-        "end": {
-          "column": 3,
-          "line": 203
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.beta",
-        "start": {
-          "column": 8,
-          "line": 200
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable updates",
-        "end": {
-          "column": 3,
-          "line": 207
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.automaticUpdates",
-        "start": {
-          "column": 20,
-          "line": 204
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Franz Todos",
-        "end": {
-          "column": 3,
-          "line": 211
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableTodos",
-        "start": {
-          "column": 15,
-          "line": 208
-        }
-      },
-      {
-        "defaultMessage": "!!!Keep all workspaces loaded",
-        "end": {
-          "column": 3,
-          "line": 215
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.keepAllWorkspacesLoaded",
-        "start": {
-          "column": 27,
-          "line": 212
-        }
-      }
-    ],
-    "path": "src/containers/settings/EditSettingsScreen.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Firstname",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.firstname",
-        "start": {
-          "column": 13,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!!Lastname",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.lastname",
-        "start": {
-          "column": 12,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Email",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.email",
-        "start": {
-          "column": 9,
-          "line": 22
-        }
-      },
-      {
-        "defaultMessage": "!!!Account type",
-        "end": {
-          "column": 3,
-          "line": 29
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.accountType.label",
-        "start": {
-          "column": 20,
-          "line": 26
-        }
-      },
-      {
-        "defaultMessage": "!!!Individual",
-        "end": {
-          "column": 3,
-          "line": 33
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.accountType.individual",
-        "start": {
-          "column": 25,
-          "line": 30
-        }
-      },
-      {
-        "defaultMessage": "!!!Non-Profit",
-        "end": {
-          "column": 3,
-          "line": 37
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.accountType.non-profit",
-        "start": {
-          "column": 24,
-          "line": 34
-        }
-      },
-      {
-        "defaultMessage": "!!!Company",
-        "end": {
-          "column": 3,
-          "line": 41
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.accountType.company",
-        "start": {
-          "column": 22,
-          "line": 38
-        }
-      },
-      {
-        "defaultMessage": "!!!Current password",
-        "end": {
-          "column": 3,
-          "line": 45
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.currentPassword",
-        "start": {
-          "column": 19,
-          "line": 42
-        }
-      },
-      {
-        "defaultMessage": "!!!New password",
-        "end": {
-          "column": 3,
-          "line": 49
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.newPassword",
-        "start": {
-          "column": 15,
-          "line": 46
-        }
-      }
-    ],
-    "path": "src/containers/settings/EditUserScreen.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Sign In",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/features/basicAuth/Component.js",
-        "id": "feature.basicAuth.signIn",
-        "start": {
-          "column": 10,
-          "line": 24
-        }
-      }
-    ],
-    "path": "src/features/basicAuth/Component.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Publish debugging information",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/features/debugger/Component.js",
-        "id": "feature.debugger.title",
-        "start": {
-          "column": 9,
-          "line": 16
-        }
-      }
-    ],
-    "path": "src/features/debugger/Component.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Nightly Builds",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/nightlyBuilds/Component.js",
-        "id": "feature.nightlyBuilds.title",
-        "start": {
-          "column": 9,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/nightlyBuilds/Component.js",
-        "id": "feature.nightlyBuilds.info",
-        "start": {
-          "column": 8,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Activate",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/nightlyBuilds/Component.js",
-        "id": "feature.nightlyBuilds.activate",
-        "start": {
-          "column": 12,
-          "line": 25
-        }
-      }
-    ],
-    "path": "src/features/nightlyBuilds/Component.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Publish debug information",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.title",
-        "start": {
-          "column": 9,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.info",
-        "start": {
-          "column": 8,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.error",
-        "start": {
-          "column": 9,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Privacy policy",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.privacy",
-        "start": {
-          "column": 11,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Terms of service",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.terms",
-        "start": {
-          "column": 9,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!Accept and publish",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.publish",
-        "start": {
-          "column": 11,
-          "line": 39
-        }
-      },
-      {
-        "defaultMessage": "!!!Your debug log was published and is now availible at",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.published",
-        "start": {
-          "column": 13,
-          "line": 43
-        }
-      }
-    ],
-    "path": "src/features/publishDebugInfo/Component.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!QuickSwitch",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/quickSwitch/Component.js",
-        "id": "feature.quickSwitch.title",
-        "start": {
-          "column": 9,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Search...",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/quickSwitch/Component.js",
-        "id": "feature.quickSwitch.search",
-        "start": {
-          "column": 10,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/quickSwitch/Component.js",
-        "id": "feature.quickSwitch.info",
-        "start": {
-          "column": 8,
-          "line": 25
-        }
-      }
-    ],
-    "path": "src/features/quickSwitch/Component.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Home",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/features/recipeConnectionLost/components/WebControls.js",
-        "id": "webControls.goHome",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Open in Browser",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/recipeConnectionLost/components/WebControls.js",
-        "id": "webControls.openInBrowser",
-        "start": {
-          "column": 17,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Back",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/recipeConnectionLost/components/WebControls.js",
-        "id": "webControls.back",
-        "start": {
-          "column": 8,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Forward",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/recipeConnectionLost/components/WebControls.js",
-        "id": "webControls.forward",
-        "start": {
-          "column": 11,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/features/recipeConnectionLost/components/WebControls.js",
-        "id": "webControls.reload",
-        "start": {
-          "column": 10,
-          "line": 29
-        }
-      }
-    ],
-    "path": "src/features/recipeConnectionLost/components/WebControls.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Home",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/webControls/components/WebControls.js",
-        "id": "webControls.goHome",
-        "start": {
-          "column": 10,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Open in Browser",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/webControls/components/WebControls.js",
-        "id": "webControls.openInBrowser",
-        "start": {
-          "column": 17,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Back",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/webControls/components/WebControls.js",
-        "id": "webControls.back",
-        "start": {
-          "column": 8,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Forward",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/features/webControls/components/WebControls.js",
-        "id": "webControls.forward",
-        "start": {
-          "column": 11,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/features/webControls/components/WebControls.js",
-        "id": "webControls.reload",
-        "start": {
-          "column": 10,
-          "line": 33
-        }
-      }
-    ],
-    "path": "src/features/webControls/components/WebControls.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Create workspace",
-        "end": {
-          "column": 3,
-          "line": 15
-        },
-        "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
-        "id": "settings.workspace.add.form.submitButton",
-        "start": {
-          "column": 16,
-          "line": 12
-        }
-      },
-      {
-        "defaultMessage": "!!!Name",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
-        "id": "settings.workspace.add.form.name",
-        "start": {
-          "column": 8,
-          "line": 16
-        }
-      }
-    ],
-    "path": "src/features/workspaces/components/CreateWorkspaceForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Delete workspace",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.buttonDelete",
-        "start": {
-          "column": 16,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Save workspace",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.buttonSave",
-        "start": {
-          "column": 14,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Name",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.name",
-        "start": {
-          "column": 8,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Your workspaces",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.yourWorkspaces",
-        "start": {
-          "column": 18,
-          "line": 33
-        }
-      },
-      {
-        "defaultMessage": "!!!Keep this workspace loaded*",
-        "end": {
-          "column": 3,
-          "line": 40
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.keepLoaded",
-        "start": {
-          "column": 14,
-          "line": 37
-        }
-      },
-      {
-        "defaultMessage": "!!!*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
-        "end": {
-          "column": 3,
-          "line": 45
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.keepLoadedInfo",
-        "start": {
-          "column": 18,
-          "line": 41
-        }
-      },
-      {
-        "defaultMessage": "!!!Services in this Workspace",
-        "end": {
-          "column": 3,
-          "line": 49
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.servicesInWorkspaceHeadline",
-        "start": {
-          "column": 31,
-          "line": 46
-        }
-      },
-      {
-        "defaultMessage": "!!!Start by adding a service.",
-        "end": {
-          "column": 3,
-          "line": 53
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.services.noServicesAdded",
-        "start": {
-          "column": 19,
-          "line": 50
-        }
-      },
-      {
-        "defaultMessage": "!!!Discover services",
-        "end": {
-          "column": 3,
-          "line": 57
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.services.discoverServices",
-        "start": {
-          "column": 20,
-          "line": 54
-        }
-      }
-    ],
-    "path": "src/features/workspaces/components/EditWorkspaceForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Workspaces",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.headline",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!All services",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.allServices",
-        "start": {
-          "column": 15,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Workspaces settings",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.workspacesSettingsTooltip",
-        "start": {
-          "column": 29,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Info about workspace feature",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.workspaceFeatureInfo",
-        "start": {
-          "column": 24,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!add new workspace",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.addNewWorkspaceLabel",
-        "start": {
-          "column": 24,
-          "line": 31
-        }
-      }
-    ],
-    "path": "src/features/workspaces/components/WorkspaceDrawer.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!No services added yet",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
-        "id": "workspaceDrawer.item.noServicesAddedYet",
-        "start": {
-          "column": 22,
-          "line": 11
-        }
-      },
-      {
-        "defaultMessage": "!!!edit",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
-        "id": "workspaceDrawer.item.contextMenuEdit",
-        "start": {
-          "column": 19,
-          "line": 15
-        }
-      }
-    ],
-    "path": "src/features/workspaces/components/WorkspaceDrawerItem.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Your workspaces",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.headline",
-        "start": {
-          "column": 12,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!You haven't created any workspaces yet.",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.noWorkspacesAdded",
-        "start": {
-          "column": 19,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not load your workspaces",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.workspacesRequestFailed",
-        "start": {
-          "column": 27,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Try again",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.tryReloadWorkspaces",
-        "start": {
-          "column": 23,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Your changes have been saved",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.updatedInfo",
-        "start": {
-          "column": 15,
-          "line": 33
-        }
-      },
-      {
-        "defaultMessage": "!!!Workspace has been deleted",
-        "end": {
-          "column": 3,
-          "line": 40
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.deletedInfo",
-        "start": {
-          "column": 15,
-          "line": 37
-        }
-      },
-      {
-        "defaultMessage": "!!!Info about workspace feature",
-        "end": {
-          "column": 3,
-          "line": 44
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.workspaceFeatureInfo",
-        "start": {
-          "column": 24,
-          "line": 41
-        }
-      },
-      {
-        "defaultMessage": "!!!Less is More: Introducing Ferdi Workspaces",
-        "end": {
-          "column": 3,
-          "line": 48
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.workspaceFeatureHeadline",
-        "start": {
-          "column": 28,
-          "line": 45
-        }
-      }
-    ],
-    "path": "src/features/workspaces/components/WorkspacesDashboard.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Switching to",
-        "end": {
-          "column": 3,
-          "line": 15
-        },
-        "file": "src/features/workspaces/components/WorkspaceSwitchingIndicator.js",
-        "id": "workspaces.switchingIndicator.switchingTo",
-        "start": {
-          "column": 15,
-          "line": 12
-        }
-      }
-    ],
-    "path": "src/features/workspaces/components/WorkspaceSwitchingIndicator.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Field is required",
-        "end": {
-          "column": 3,
-          "line": 8
-        },
-        "file": "src/helpers/validation-helpers.js",
-        "id": "validation.required",
-        "start": {
-          "column": 12,
-          "line": 5
-        }
-      },
-      {
-        "defaultMessage": "!!!Email not valid",
-        "end": {
-          "column": 3,
-          "line": 12
-        },
-        "file": "src/helpers/validation-helpers.js",
-        "id": "validation.email",
-        "start": {
-          "column": 9,
-          "line": 9
-        }
-      },
-      {
-        "defaultMessage": "!!!Not a valid URL",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/helpers/validation-helpers.js",
-        "id": "validation.url",
-        "start": {
-          "column": 7,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Too few characters",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/helpers/validation-helpers.js",
-        "id": "validation.minLength",
-        "start": {
-          "column": 13,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!At least one is required",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/helpers/validation-helpers.js",
-        "id": "validation.oneRequired",
-        "start": {
-          "column": 15,
-          "line": 21
-        }
-      }
-    ],
-    "path": "src/helpers/validation-helpers.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Can't connect to Ferdi Online Services",
-        "end": {
-          "column": 3,
-          "line": 7
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.api.unhealthy",
-        "start": {
-          "column": 16,
-          "line": 4
-        }
-      },
-      {
-        "defaultMessage": "!!!You are not connected to the internet.",
-        "end": {
-          "column": 3,
-          "line": 11
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.notConnectedToTheInternet",
-        "start": {
-          "column": 29,
-          "line": 8
-        }
-      },
-      {
-        "defaultMessage": "!!!Spell checking language",
-        "end": {
-          "column": 3,
-          "line": 15
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.spellchecking.language",
-        "start": {
-          "column": 24,
-          "line": 12
-        }
-      },
-      {
-        "defaultMessage": "!!!Use System Default ({default})",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.spellchecker.useDefault",
-        "start": {
-          "column": 29,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Detect language automatically",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.spellchecking.autodetect",
-        "start": {
-          "column": 34,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Automatic",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.spellchecking.autodetect.short",
-        "start": {
-          "column": 39,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!User Agent",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.userAgentPref",
-        "start": {
-          "column": 17,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.userAgentHelp",
-        "start": {
-          "column": 17,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Yes",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.yes",
-        "start": {
-          "column": 7,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!No",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.no",
-        "start": {
-          "column": 6,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Ok",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.ok",
-        "start": {
-          "column": 6,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Cancel",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.cancel",
-        "start": {
-          "column": 10,
-          "line": 48
-        }
-      },
-      {
-        "defaultMessage": "!!!Save",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.save",
-        "start": {
-          "column": 8,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "!!!Submit",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.submit",
-        "start": {
-          "column": 10,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "!!!Quit",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.quit",
-        "start": {
-          "column": 8,
-          "line": 60
-        }
-      },
-      {
-        "defaultMessage": "!!!Do you really want to quit Ferdi?",
-        "end": {
-          "column": 3,
-          "line": 68
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.quitConfirmation",
-        "start": {
-          "column": 20,
-          "line": 64
-        }
-      },
-      {
-        "defaultMessage": "!!!Settings",
-        "end": {
-          "column": 3,
-          "line": 72
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.settings",
-        "start": {
-          "column": 12,
-          "line": 69
-        }
-      },
-      {
-        "defaultMessage": "!!!Edit",
-        "end": {
-          "column": 3,
-          "line": 76
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.edit",
-        "start": {
-          "column": 8,
-          "line": 73
-        }
-      }
-    ],
-    "path": "src/i18n/globalMessages.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Edit",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit",
-        "start": {
-          "column": 8,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Undo",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.undo",
-        "start": {
-          "column": 8,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Redo",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.redo",
-        "start": {
-          "column": 8,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Cut",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.cut",
-        "start": {
-          "column": 7,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Copy",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.copy",
-        "start": {
-          "column": 8,
-          "line": 48
-        }
-      },
-      {
-        "defaultMessage": "!!!Paste",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.paste",
-        "start": {
-          "column": 9,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "!!!Paste And Match Style",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.pasteAndMatchStyle",
-        "start": {
-          "column": 22,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "!!!Delete",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.delete",
-        "start": {
-          "column": 10,
-          "line": 60
-        }
-      },
-      {
-        "defaultMessage": "!!!Select All",
-        "end": {
-          "column": 3,
-          "line": 67
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.selectAll",
-        "start": {
-          "column": 13,
-          "line": 64
-        }
-      },
-      {
-        "defaultMessage": "!!!Find in Page",
-        "end": {
-          "column": 3,
-          "line": 71
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.findInPage",
-        "start": {
-          "column": 14,
-          "line": 68
-        }
-      },
-      {
-        "defaultMessage": "!!!Speech",
-        "end": {
-          "column": 3,
-          "line": 75
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.speech",
-        "start": {
-          "column": 10,
-          "line": 72
-        }
-      },
-      {
-        "defaultMessage": "!!!Start Speaking",
-        "end": {
-          "column": 3,
-          "line": 79
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.startSpeaking",
-        "start": {
-          "column": 17,
-          "line": 76
-        }
-      },
-      {
-        "defaultMessage": "!!!Stop Speaking",
-        "end": {
-          "column": 3,
-          "line": 83
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.stopSpeaking",
-        "start": {
-          "column": 16,
-          "line": 80
-        }
-      },
-      {
-        "defaultMessage": "!!!Start Dictation",
-        "end": {
-          "column": 3,
-          "line": 87
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.startDictation",
-        "start": {
-          "column": 18,
-          "line": 84
-        }
-      },
-      {
-        "defaultMessage": "!!!Emoji & Symbols",
-        "end": {
-          "column": 3,
-          "line": 91
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.emojiSymbols",
-        "start": {
-          "column": 16,
-          "line": 88
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Quick Switch",
-        "end": {
-          "column": 3,
-          "line": 95
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.openQuickSwitch",
-        "start": {
-          "column": 19,
-          "line": 92
-        }
-      },
-      {
-        "defaultMessage": "!!!Back",
-        "end": {
-          "column": 3,
-          "line": 99
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.back",
-        "start": {
-          "column": 8,
-          "line": 96
-        }
-      },
-      {
-        "defaultMessage": "!!!Forward",
-        "end": {
-          "column": 3,
-          "line": 103
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.forward",
-        "start": {
-          "column": 11,
-          "line": 100
-        }
-      },
-      {
-        "defaultMessage": "!!!Actual Size",
-        "end": {
-          "column": 3,
-          "line": 107
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.resetZoom",
-        "start": {
-          "column": 13,
-          "line": 104
-        }
-      },
-      {
-        "defaultMessage": "!!!Zoom In",
-        "end": {
-          "column": 3,
-          "line": 111
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.zoomIn",
-        "start": {
-          "column": 10,
-          "line": 108
-        }
-      },
-      {
-        "defaultMessage": "!!!Zoom Out",
-        "end": {
-          "column": 3,
-          "line": 115
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.zoomOut",
-        "start": {
-          "column": 11,
-          "line": 112
-        }
-      },
-      {
-        "defaultMessage": "!!!Toggle Full Screen",
-        "end": {
-          "column": 3,
-          "line": 119
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.toggleFullScreen",
-        "start": {
-          "column": 20,
-          "line": 116
-        }
-      },
-      {
-        "defaultMessage": "!!!Toggle Dark Mode",
-        "end": {
-          "column": 3,
-          "line": 123
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.toggleDarkMode",
-        "start": {
-          "column": 18,
-          "line": 120
-        }
-      },
-      {
-        "defaultMessage": "!!!Toggle Developer Tools",
-        "end": {
-          "column": 3,
-          "line": 127
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.toggleDevTools",
-        "start": {
-          "column": 18,
-          "line": 124
-        }
-      },
-      {
-        "defaultMessage": "!!!Toggle Todos Developer Tools",
-        "end": {
-          "column": 3,
-          "line": 131
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.toggleTodosDevTools",
-        "start": {
-          "column": 23,
-          "line": 128
-        }
-      },
-      {
-        "defaultMessage": "!!!Toggle Service Developer Tools",
-        "end": {
-          "column": 3,
-          "line": 135
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.toggleServiceDevTools",
-        "start": {
-          "column": 25,
-          "line": 132
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload Service",
-        "end": {
-          "column": 3,
-          "line": 139
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.reloadService",
-        "start": {
-          "column": 17,
-          "line": 136
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload Ferdi",
-        "end": {
-          "column": 3,
-          "line": 143
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.reloadFerdi",
-        "start": {
-          "column": 15,
-          "line": 140
-        }
-      },
-      {
-        "defaultMessage": "!!!Lock Ferdi",
-        "end": {
-          "column": 3,
-          "line": 147
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.lockFerdi",
-        "start": {
-          "column": 13,
-          "line": 144
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload ToDos",
-        "end": {
-          "column": 3,
-          "line": 151
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.reloadTodos",
-        "start": {
-          "column": 15,
-          "line": 148
-        }
-      },
-      {
-        "defaultMessage": "!!!Minimize",
-        "end": {
-          "column": 3,
-          "line": 155
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.window.minimize",
-        "start": {
-          "column": 12,
-          "line": 152
-        }
-      },
-      {
-        "defaultMessage": "!!!Close",
-        "end": {
-          "column": 3,
-          "line": 159
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.window.close",
-        "start": {
-          "column": 9,
-          "line": 156
-        }
-      },
-      {
-        "defaultMessage": "!!!Learn More",
-        "end": {
-          "column": 3,
-          "line": 163
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.learnMore",
-        "start": {
-          "column": 13,
-          "line": 160
-        }
-      },
-      {
-        "defaultMessage": "!!!Changelog",
-        "end": {
-          "column": 3,
-          "line": 167
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.changelog",
-        "start": {
-          "column": 13,
-          "line": 164
-        }
-      },
-      {
-        "defaultMessage": "!!!Import/Export Configuration Data",
-        "end": {
-          "column": 3,
-          "line": 171
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.importExportData",
-        "start": {
-          "column": 20,
-          "line": 168
-        }
-      },
-      {
-        "defaultMessage": "!!!Support",
-        "end": {
-          "column": 3,
-          "line": 175
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.support",
-        "start": {
-          "column": 11,
-          "line": 172
-        }
-      },
-      {
-        "defaultMessage": "!!!Copy Debug Information",
-        "end": {
-          "column": 3,
-          "line": 179
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.debugInfo",
-        "start": {
-          "column": 13,
-          "line": 176
-        }
-      },
-      {
-        "defaultMessage": "!!!Publish Debug Information",
-        "end": {
-          "column": 3,
-          "line": 183
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.publishDebugInfo",
-        "start": {
-          "column": 20,
-          "line": 180
-        }
-      },
-      {
-        "defaultMessage": "!!!Ferdi Debug Information",
-        "end": {
-          "column": 3,
-          "line": 187
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.debugInfoCopiedHeadline",
-        "start": {
-          "column": 27,
-          "line": 184
-        }
-      },
-      {
-        "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
-        "end": {
-          "column": 3,
-          "line": 192
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.debugInfoCopiedBody",
-        "start": {
-          "column": 23,
-          "line": 188
-        }
-      },
-      {
-        "defaultMessage": "!!!Unlock with Touch ID",
-        "end": {
-          "column": 3,
-          "line": 196
-        },
-        "file": "src/lib/Menu.js",
-        "id": "locked.touchId",
-        "start": {
-          "column": 11,
-          "line": 193
-        }
-      },
-      {
-        "defaultMessage": "!!!unlock via Touch ID",
-        "end": {
-          "column": 3,
-          "line": 200
-        },
-        "file": "src/lib/Menu.js",
-        "id": "locked.touchIdPrompt",
-        "start": {
-          "column": 17,
-          "line": 197
-        }
-      },
-      {
-        "defaultMessage": "!!!Terms of Service",
-        "end": {
-          "column": 3,
-          "line": 204
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.tos",
-        "start": {
-          "column": 7,
-          "line": 201
-        }
-      },
-      {
-        "defaultMessage": "!!!Privacy Statement",
-        "end": {
-          "column": 3,
-          "line": 208
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.privacy",
-        "start": {
-          "column": 11,
-          "line": 205
-        }
-      },
-      {
-        "defaultMessage": "!!!File",
-        "end": {
-          "column": 3,
-          "line": 212
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.file",
-        "start": {
-          "column": 8,
-          "line": 209
-        }
-      },
-      {
-        "defaultMessage": "!!!View",
-        "end": {
-          "column": 3,
-          "line": 216
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view",
-        "start": {
-          "column": 8,
-          "line": 213
-        }
-      },
-      {
-        "defaultMessage": "!!!Services",
-        "end": {
-          "column": 3,
-          "line": 220
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.services",
-        "start": {
-          "column": 12,
-          "line": 217
-        }
-      },
-      {
-        "defaultMessage": "!!!Window",
-        "end": {
-          "column": 3,
-          "line": 224
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.window",
-        "start": {
-          "column": 10,
-          "line": 221
-        }
-      },
-      {
-        "defaultMessage": "!!!Help",
-        "end": {
-          "column": 3,
-          "line": 228
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help",
-        "start": {
-          "column": 8,
-          "line": 225
-        }
-      },
-      {
-        "defaultMessage": "!!!About Ferdi",
-        "end": {
-          "column": 3,
-          "line": 232
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.about",
-        "start": {
-          "column": 9,
-          "line": 229
-        }
-      },
-      {
-        "defaultMessage": "!!!Check for updates",
-        "end": {
-          "column": 3,
-          "line": 236
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.checkForUpdates",
-        "start": {
-          "column": 19,
-          "line": 233
-        }
-      },
-      {
-        "defaultMessage": "!!!Hide",
-        "end": {
-          "column": 3,
-          "line": 240
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.hide",
-        "start": {
-          "column": 8,
-          "line": 237
-        }
-      },
-      {
-        "defaultMessage": "!!!Hide Others",
-        "end": {
-          "column": 3,
-          "line": 244
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.hideOthers",
-        "start": {
-          "column": 14,
-          "line": 241
-        }
-      },
-      {
-        "defaultMessage": "!!!Unhide",
-        "end": {
-          "column": 3,
-          "line": 248
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.unhide",
-        "start": {
-          "column": 10,
-          "line": 245
-        }
-      },
-      {
-        "defaultMessage": "!!!Auto-hide menu bar",
-        "end": {
-          "column": 3,
-          "line": 252
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.autohideMenuBar",
-        "start": {
-          "column": 19,
-          "line": 249
-        }
-      },
-      {
-        "defaultMessage": "!!!Add New Service...",
-        "end": {
-          "column": 3,
-          "line": 256
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.services.addNewService",
-        "start": {
-          "column": 17,
-          "line": 253
-        }
-      },
-      {
-        "defaultMessage": "!!!Add New Workspace...",
-        "end": {
-          "column": 3,
-          "line": 260
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.workspaces.addNewWorkspace",
-        "start": {
-          "column": 19,
-          "line": 257
-        }
-      },
-      {
-        "defaultMessage": "!!!Open workspace drawer",
-        "end": {
-          "column": 3,
-          "line": 264
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.workspaces.openWorkspaceDrawer",
-        "start": {
-          "column": 23,
-          "line": 261
-        }
-      },
-      {
-        "defaultMessage": "!!!Close workspace drawer",
-        "end": {
-          "column": 3,
-          "line": 268
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.workspaces.closeWorkspaceDrawer",
-        "start": {
-          "column": 24,
-          "line": 265
-        }
-      },
-      {
-        "defaultMessage": "!!!Activate next service...",
-        "end": {
-          "column": 3,
-          "line": 272
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.services.setNextServiceActive",
-        "start": {
-          "column": 23,
-          "line": 269
-        }
-      },
-      {
-        "defaultMessage": "!!!Activate previous service...",
-        "end": {
-          "column": 3,
-          "line": 276
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.services.activatePreviousService",
-        "start": {
-          "column": 27,
-          "line": 273
-        }
-      },
-      {
-        "defaultMessage": "!!!Disable notifications & audio",
-        "end": {
-          "column": 3,
-          "line": 280
-        },
-        "file": "src/lib/Menu.js",
-        "id": "sidebar.muteApp",
-        "start": {
-          "column": 11,
-          "line": 277
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable notifications & audio",
-        "end": {
-          "column": 3,
-          "line": 284
-        },
-        "file": "src/lib/Menu.js",
-        "id": "sidebar.unmuteApp",
-        "start": {
-          "column": 13,
-          "line": 281
-        }
-      },
-      {
-        "defaultMessage": "!!!Workspaces",
-        "end": {
-          "column": 3,
-          "line": 288
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.workspaces",
-        "start": {
-          "column": 14,
-          "line": 285
-        }
-      },
-      {
-        "defaultMessage": "!!!Default",
-        "end": {
-          "column": 3,
-          "line": 292
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.workspaces.defaultWorkspace",
-        "start": {
-          "column": 20,
-          "line": 289
-        }
-      },
-      {
-        "defaultMessage": "!!!Todos",
-        "end": {
-          "column": 3,
-          "line": 296
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.todos",
-        "start": {
-          "column": 9,
-          "line": 293
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Todos drawer",
-        "end": {
-          "column": 3,
-          "line": 300
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.Todoss.openTodosDrawer",
-        "start": {
-          "column": 19,
-          "line": 297
-        }
-      },
-      {
-        "defaultMessage": "!!!Close Todos drawer",
-        "end": {
-          "column": 3,
-          "line": 304
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.Todoss.closeTodosDrawer",
-        "start": {
-          "column": 20,
-          "line": 301
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Todos",
-        "end": {
-          "column": 3,
-          "line": 308
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.todos.enableTodos",
-        "start": {
-          "column": 15,
-          "line": 305
-        }
-      },
-      {
-        "defaultMessage": "!!!Home",
-        "end": {
-          "column": 3,
-          "line": 312
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.services.goHome",
-        "start": {
-          "column": 17,
-          "line": 309
-        }
-      }
-    ],
-    "path": "src/lib/Menu.json"
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index be9bbb961..158022419 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -1,6 +1,6 @@
 {
   "app.errorHandler.action": "Reload",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
   "changeserver.customServerLabel": "Custom server",
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
@@ -10,7 +10,6 @@
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publish debugging information",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
@@ -24,7 +23,7 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.api.unhealthy": "Can't connect to Ferdi Online Services",
   "global.cancel": "Cancel",
   "global.edit": "Edit",
   "global.no": "No",
@@ -45,9 +44,9 @@
   "import.headline": "Import your Ferdi 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
   "import.skip.label": "I want to add services manually",
-  "import.submit.label": "Import services",
+  "import.submit.label": "Import {count} services",
   "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "What is new?",
+  "infobar.buttonChangelog": "Changelog",
   "infobar.buttonInstallUpdate": "Restart & install update",
   "infobar.buttonReloadServices": "Reload services",
   "infobar.hide": "Hide",
@@ -75,7 +74,7 @@
   "login.email.label": "Email address",
   "login.headline": "Sign in",
   "login.invalidCredentials": "Email or password not valid",
-  "login.link.password": "Reset password",
+  "login.link.password": "Forgot password",
   "login.link.signup": "Create a free account",
   "login.password.label": "Password",
   "login.serverLogout": "Your session expired, please login again.",
@@ -117,10 +116,10 @@
   "menu.help.support": "Support",
   "menu.help.tos": "Terms of Service",
   "menu.services": "Services",
-  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.activatePreviousService": "Activate previous service...",
+  "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Home",
-  "menu.services.setNextServiceActive": "Activate next service",
+  "menu.services.setNextServiceActive": "Activate next service...",
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "View",
@@ -145,14 +144,14 @@
   "menu.workspaces": "Workspaces",
   "menu.workspaces.addNewWorkspace": "Add New Workspace...",
   "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
-  "menu.workspaces.defaultWorkspace": "All services",
+  "menu.workspaces.defaultWorkspace": "Default",
   "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
   "password.email.label": "Email address",
-  "password.headline": "Reset password",
+  "password.headline": "Forgot password",
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
-  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Please check your email",
+  "password.noUser": "No user affiliated with that email address",
+  "password.successInfo": "Your new password was sent to your email address",
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
@@ -173,7 +172,7 @@
   "service.errorHandler.action": "Reload {name}",
   "service.errorHandler.editAction": "Edit {name}",
   "service.errorHandler.headline": "Oh no!",
-  "service.errorHandler.message": "Error",
+  "service.errorHandler.message": "Error:",
   "service.errorHandler.text": "{name} has failed to load.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
@@ -181,7 +180,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Welcome to Ferdi",
-  "settings.account.account.editButton": "Edit account",
+  "settings.account.account.editButton": "Edit Account",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
@@ -189,16 +188,16 @@
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
   "settings.account.deleteInfo": "If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
   "settings.account.headline": "Account",
-  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Change password",
-  "settings.account.headlineProfile": "Update profile",
+  "settings.account.headlineAccount": "Account Information",
+  "settings.account.headlineDangerZone": "!!Danger Zone",
+  "settings.account.headlineInvoices": "!!Invoices",
+  "settings.account.headlinePassword": "Change Password",
+  "settings.account.headlineProfile": "Update Profile",
   "settings.account.successInfo": "Your changes have been saved",
   "settings.account.tryReloadServices": "Try again",
   "settings.account.tryReloadUserInfoRequest": "Try again",
   "settings.account.userInfoRequestFailed": "Could not load user information",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Clear cache",
   "settings.app.buttonInstallUpdate": "Restart & install update",
@@ -219,13 +218,13 @@
   "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
   "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
-  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.customTodoServer": "Custom TodoServer",
+  "settings.app.form.darkMode": "Dark Mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -253,7 +252,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
-  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
+  "settings.app.form.useTouchIdToUnlock": "Allow using Touch ID to unlock",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Advanced",
@@ -265,9 +264,9 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
   "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
+  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected. Using Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
-  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
+  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember. If you loose this password, you will have to reinstall Ferdi.",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
@@ -275,7 +274,7 @@
   "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
+  "settings.app.todoServerInfo": "This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
@@ -294,12 +293,12 @@
   "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
   "settings.recipes.customService.headline.customRecipes": "Custom 3rd Party Recipes",
   "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the recipe folder into:",
   "settings.recipes.customService.openDevDocs": "Developer Documentation",
-  "settings.recipes.customService.openFolder": "Open folder",
-  "settings.recipes.headline": "Available services",
+  "settings.recipes.customService.openFolder": "Open directory",
+  "settings.recipes.headline": "Available Services",
   "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
+  "settings.recipes.nothingFound": "Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
   "settings.searchService": "Search service",
   "settings.service.error.goBack": "Back to services",
@@ -307,18 +306,18 @@
   "settings.service.error.message": "Could not load service recipe.",
   "settings.service.form.addServiceHeadline": "Add {name}",
   "settings.service.form.availableServices": "Available services",
-  "settings.service.form.customUrl": "Custom server",
+  "settings.service.form.customUrl": "Service URL",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.deleteButton": "Delete Service",
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
   "settings.service.form.enableHibernation": "Enable hibernation",
-  "settings.service.form.enableNotification": "Enable notifications",
+  "settings.service.form.enableNotification": "Enable Notifications",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.headlineBadges": "Unread message badges",
   "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
@@ -337,12 +336,12 @@
   "settings.service.form.openUserJs": "Open user.js",
   "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 Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
-  "settings.service.form.proxy.password": "Password (optional)",
+  "settings.service.form.proxy.password": "Password",
   "settings.service.form.proxy.port": "Port",
   "settings.service.form.proxy.restartInfo": "Please restart Ferdi after changing proxy Settings.",
-  "settings.service.form.proxy.user": "User (optional)",
+  "settings.service.form.proxy.user": "User",
   "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
   "settings.service.form.saveButton": "Save service",
   "settings.service.form.tabHosted": "Hosted",
@@ -362,12 +361,12 @@
   "settings.supportFerdi.aboutIntro": "<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>",
   "settings.supportFerdi.bannerText": "Do you want to help us improve Ferdi?",
   "settings.supportFerdi.headline": "About Ferdi",
-  "settings.supportFerdi.openSurvey": "Open survey",
+  "settings.supportFerdi.openSurvey": "Open Survey",
   "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,",
   "settings.supportFerdi.textDonationAnd": "and",
   "settings.supportFerdi.textExpenses": "While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our",
   "settings.supportFerdi.textGitHubSponsors": "GitHub Sponsors",
-  "settings.supportFerdi.textListContributors": "Full list of contributors",
+  "settings.supportFerdi.textListContributors": "Full list of contributor",
   "settings.supportFerdi.textListContributorsHere": "here",
   "settings.supportFerdi.textOpenCollective": "Open Collective",
   "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
@@ -377,7 +376,7 @@
   "settings.team.contentHeadline": "Franz Team Management",
   "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
   "settings.team.headline": "Team",
-  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "Your are currently using Franz Servers, which is why you have access to Team Management.",
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
@@ -387,8 +386,8 @@
   "settings.user.form.accountType.non-profit": "Non-Profit",
   "settings.user.form.currentPassword": "Current password",
   "settings.user.form.email": "Email",
-  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Last Name",
+  "settings.user.form.firstname": "Firstname",
+  "settings.user.form.lastname": "Lastname",
   "settings.user.form.newPassword": "New password",
   "settings.workspace.add.form.name": "Name",
   "settings.workspace.add.form.submitButton": "Create workspace",
@@ -405,7 +404,7 @@
   "settings.workspaces.tryReloadWorkspaces": "Try again",
   "settings.workspaces.updatedInfo": "Your changes have been saved",
   "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+  "settings.workspaces.workspaceFeatureInfo": "Info about workspace feature",
   "settings.workspaces.workspacesRequestFailed": "Could not load your workspaces",
   "setupAssistant.headline": "Let's get started",
   "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
@@ -420,9 +419,9 @@
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
-  "signup.firstname.label": "First Name",
+  "signup.firstname.label": "Firstname",
   "signup.headline": "Sign up",
-  "signup.lastname.label": "Last Name",
+  "signup.lastname.label": "Lastname",
   "signup.legal.info": "By creating a Ferdi account you accept the",
   "signup.legal.privacy": "Privacy Statement",
   "signup.legal.terms": "Terms of service",
@@ -430,23 +429,23 @@
   "signup.password.label": "Password",
   "signup.submit.label": "Create account",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Delete service",
+  "tabs.item.deleteService": "Delete Service",
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
-  "tabs.item.disableService": "Disable service",
+  "tabs.item.disableService": "Disable Service",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
-  "tabs.item.enableService": "Enable service",
-  "tabs.item.hibernateService": "Hibernate service",
+  "tabs.item.enableService": "Enable Service",
+  "tabs.item.hibernateService": "Hibernate Service",
   "tabs.item.reload": "Reload",
-  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} should be at least {length} characters long",
+  "tabs.item.wakeUpService": "Wake Up Service",
+  "validation.email": "Email not valid",
+  "validation.minLength": "Too few characters",
   "validation.oneRequired": "At least one is required",
-  "validation.required": "{field} is required",
-  "validation.url": "{field} is not a valid URL",
+  "validation.required": "Field is required",
+  "validation.url": "Not a valid URL",
   "webControls.back": "Back",
   "webControls.forward": "Forward",
   "webControls.goHome": "Home",
@@ -454,12 +453,12 @@
   "webControls.reload": "Reload",
   "welcome.loginButton": "Login to your account",
   "welcome.signupButton": "Create a free account",
-  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
+  "workspaceDrawer.addNewWorkspaceLabel": "add new workspace",
   "workspaceDrawer.allServices": "All services",
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
+  "workspaceDrawer.workspaceFeatureInfo": "Info about workspace feature",
+  "workspaceDrawer.workspacesSettingsTooltip": "Workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
 }
diff --git a/src/i18n/manage-translations.js b/src/i18n/manage-translations.js
deleted file mode 100644
index ee64c9c09..000000000
--- a/src/i18n/manage-translations.js
+++ /dev/null
@@ -1,9 +0,0 @@
-require('@babel/register');
-const manageTranslations = require('react-intl-translations-manager').default;
-
-manageTranslations({
-  messagesDirectory: 'src/i18n/messages',
-  translationsDirectory: 'src/i18n/locales',
-  singleMessagesFile: true,
-  languages: ['en-US'],
-});
diff --git a/src/i18n/messages/src/components/AppUpdateInfoBar.json b/src/i18n/messages/src/components/AppUpdateInfoBar.json
deleted file mode 100644
index b99eaff67..000000000
--- a/src/i18n/messages/src/components/AppUpdateInfoBar.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "infobar.updateAvailable",
-    "defaultMessage": "!!!A new update for Ferdi is available.",
-    "file": "src/components/AppUpdateInfoBar.js",
-    "start": {
-      "line": 10,
-      "column": 19
-    },
-    "end": {
-      "line": 13,
-      "column": 3
-    }
-  },
-  {
-    "id": "infobar.buttonChangelog",
-    "defaultMessage": "!!!Changelog",
-    "file": "src/components/AppUpdateInfoBar.js",
-    "start": {
-      "line": 14,
-      "column": 13
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "infobar.buttonInstallUpdate",
-    "defaultMessage": "!!!Restart & install update",
-    "file": "src/components/AppUpdateInfoBar.js",
-    "start": {
-      "line": 18,
-      "column": 23
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/ChangeServer.json b/src/i18n/messages/src/components/auth/ChangeServer.json
deleted file mode 100644
index 87e0b5857..000000000
--- a/src/i18n/messages/src/components/auth/ChangeServer.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "changeserver.headline",
-    "defaultMessage": "!!!Change server",
-    "file": "src/components/auth/ChangeServer.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "changeserver.label",
-    "defaultMessage": "!!!Server",
-    "file": "src/components/auth/ChangeServer.js",
-    "start": {
-      "line": 19,
-      "column": 9
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "changeserver.warning",
-    "defaultMessage": "!!!Extra settings offered by Ferdi will not be saved",
-    "file": "src/components/auth/ChangeServer.js",
-    "start": {
-      "line": 23,
-      "column": 11
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "changeserver.customServerLabel",
-    "defaultMessage": "!!!Custom server",
-    "file": "src/components/auth/ChangeServer.js",
-    "start": {
-      "line": 27,
-      "column": 21
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "changeserver.urlError",
-    "defaultMessage": "!!!Enter a valid URL",
-    "file": "src/components/auth/ChangeServer.js",
-    "start": {
-      "line": 31,
-      "column": 12
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Import.json b/src/i18n/messages/src/components/auth/Import.json
deleted file mode 100644
index 98ae2e61f..000000000
--- a/src/i18n/messages/src/components/auth/Import.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "import.headline",
-    "defaultMessage": "!!!Import your Ferdi 4 services",
-    "file": "src/components/auth/Import.js",
-    "start": {
-      "line": 13,
-      "column": 12
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "import.notSupportedHeadline",
-    "defaultMessage": "!!!Services not yet supported in Ferdi 5",
-    "file": "src/components/auth/Import.js",
-    "start": {
-      "line": 17,
-      "column": 24
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "import.submit.label",
-    "defaultMessage": "!!!Import {count} services",
-    "file": "src/components/auth/Import.js",
-    "start": {
-      "line": 21,
-      "column": 21
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "import.skip.label",
-    "defaultMessage": "!!!I want to add services manually",
-    "file": "src/components/auth/Import.js",
-    "start": {
-      "line": 25,
-      "column": 19
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Invite.json b/src/i18n/messages/src/components/auth/Invite.json
deleted file mode 100644
index 57c9bddcf..000000000
--- a/src/i18n/messages/src/components/auth/Invite.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "settings.invite.headline",
-    "defaultMessage": "!!!Invite Friends",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 16,
-      "column": 20
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.headline.friends",
-    "defaultMessage": "!!!Invite 3 of your friends or colleagues",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 20,
-      "column": 12
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.name.label",
-    "defaultMessage": "!!!Name",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 24,
-      "column": 13
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.email.label",
-    "defaultMessage": "!!!Email address",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 28,
-      "column": 14
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.submit.label",
-    "defaultMessage": "!!!Send invites",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 32,
-      "column": 21
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.skip.label",
-    "defaultMessage": "!!!I want to do this later",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 36,
-      "column": 19
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.successInfo",
-    "defaultMessage": "!!!Invitations sent successfully",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 40,
-      "column": 21
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Locked.json b/src/i18n/messages/src/components/auth/Locked.json
deleted file mode 100644
index a871d6fc8..000000000
--- a/src/i18n/messages/src/components/auth/Locked.json
+++ /dev/null
@@ -1,106 +0,0 @@
-[
-  {
-    "id": "locked.headline",
-    "defaultMessage": "!!!Locked",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 16,
-      "column": 12
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.info",
-    "defaultMessage": "!!!Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 20,
-      "column": 8
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.touchId",
-    "defaultMessage": "!!!Unlock with Touch ID",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 24,
-      "column": 11
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.touchIdPrompt",
-    "defaultMessage": "!!!unlock via Touch ID",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 28,
-      "column": 17
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.password.label",
-    "defaultMessage": "!!!Password",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 32,
-      "column": 17
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.submit.label",
-    "defaultMessage": "!!!Unlock",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 36,
-      "column": 21
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.unlockWithPassword",
-    "defaultMessage": "!!!Unlock with Password",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 40,
-      "column": 22
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.invalidCredentials",
-    "defaultMessage": "!!!Password invalid",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 44,
-      "column": 22
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Login.json b/src/i18n/messages/src/components/auth/Login.json
deleted file mode 100644
index 275b04478..000000000
--- a/src/i18n/messages/src/components/auth/Login.json
+++ /dev/null
@@ -1,171 +0,0 @@
-[
-  {
-    "id": "login.headline",
-    "defaultMessage": "!!!Sign in",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 20,
-      "column": 12
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.email.label",
-    "defaultMessage": "!!!Email address",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 24,
-      "column": 14
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.password.label",
-    "defaultMessage": "!!!Password",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 28,
-      "column": 17
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.submit.label",
-    "defaultMessage": "!!!Sign in",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 32,
-      "column": 21
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.invalidCredentials",
-    "defaultMessage": "!!!Email or password not valid",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 36,
-      "column": 22
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.customServerQuestion",
-    "defaultMessage": "!!!Using a Franz account to log in?",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 40,
-      "column": 24
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.customServerSuggestion",
-    "defaultMessage": "!!!Try importing your Franz account into Ferdi",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 44,
-      "column": 26
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.tokenExpired",
-    "defaultMessage": "!!!Your session expired, please login again.",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 48,
-      "column": 16
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.serverLogout",
-    "defaultMessage": "!!!Your session expired, please login again.",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 52,
-      "column": 16
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.link.signup",
-    "defaultMessage": "!!!Create a free account",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 56,
-      "column": 14
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.changeServer",
-    "defaultMessage": "!!!Change server",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 60,
-      "column": 16
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.serverless",
-    "defaultMessage": "!!!Use Ferdi without an Account",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 64,
-      "column": 14
-    },
-    "end": {
-      "line": 67,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.link.password",
-    "defaultMessage": "!!!Forgot password",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 68,
-      "column": 16
-    },
-    "end": {
-      "line": 71,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Password.json b/src/i18n/messages/src/components/auth/Password.json
deleted file mode 100644
index 336ba42ef..000000000
--- a/src/i18n/messages/src/components/auth/Password.json
+++ /dev/null
@@ -1,80 +0,0 @@
-[
-  {
-    "id": "password.headline",
-    "defaultMessage": "!!!Forgot password",
-    "file": "src/components/auth/Password.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "password.email.label",
-    "defaultMessage": "!!!Email address",
-    "file": "src/components/auth/Password.js",
-    "start": {
-      "line": 19,
-      "column": 14
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "password.successInfo",
-    "defaultMessage": "!!!Your new password was sent to your email address",
-    "file": "src/components/auth/Password.js",
-    "start": {
-      "line": 23,
-      "column": 15
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "password.noUser",
-    "defaultMessage": "!!!No user affiliated with that email address",
-    "file": "src/components/auth/Password.js",
-    "start": {
-      "line": 27,
-      "column": 10
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "password.link.signup",
-    "defaultMessage": "!!!Create a free account",
-    "file": "src/components/auth/Password.js",
-    "start": {
-      "line": 31,
-      "column": 14
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "password.link.login",
-    "defaultMessage": "!!!Sign in to your account",
-    "file": "src/components/auth/Password.js",
-    "start": {
-      "line": 35,
-      "column": 13
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/ServiceAssistant.json b/src/i18n/messages/src/components/auth/ServiceAssistant.json
deleted file mode 100644
index 9170fc183..000000000
--- a/src/i18n/messages/src/components/auth/ServiceAssistant.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "settings.invite.headline",
-    "defaultMessage": "!!!Invite Friends",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 16,
-      "column": 20
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.headline.friends",
-    "defaultMessage": "!!!Invite 3 of your friends or colleagues",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 20,
-      "column": 12
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.name.label",
-    "defaultMessage": "!!!Name",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 24,
-      "column": 13
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.email.label",
-    "defaultMessage": "!!!Email address",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 28,
-      "column": 14
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.submit.label",
-    "defaultMessage": "!!!Send invites",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 32,
-      "column": 21
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.skip.label",
-    "defaultMessage": "!!!I want to do this later",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 36,
-      "column": 19
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.successInfo",
-    "defaultMessage": "!!!Invitations sent successfully",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 40,
-      "column": 21
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/SetupAssistant.json b/src/i18n/messages/src/components/auth/SetupAssistant.json
deleted file mode 100644
index 108adab26..000000000
--- a/src/i18n/messages/src/components/auth/SetupAssistant.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "setupAssistant.headline",
-    "defaultMessage": "!!!Let's get started",
-    "file": "src/components/auth/SetupAssistant.js",
-    "start": {
-      "line": 20,
-      "column": 12
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "setupAssistant.subheadline",
-    "defaultMessage": "!!!Choose from our most used services and get back on top of your messaging now.",
-    "file": "src/components/auth/SetupAssistant.js",
-    "start": {
-      "line": 24,
-      "column": 15
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "setupAssistant.submit.label",
-    "defaultMessage": "!!!Let's go",
-    "file": "src/components/auth/SetupAssistant.js",
-    "start": {
-      "line": 29,
-      "column": 21
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.successInfo",
-    "defaultMessage": "!!!Invitations sent successfully",
-    "file": "src/components/auth/SetupAssistant.js",
-    "start": {
-      "line": 33,
-      "column": 21
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Signup.json b/src/i18n/messages/src/components/auth/Signup.json
deleted file mode 100644
index 4a32628ef..000000000
--- a/src/i18n/messages/src/components/auth/Signup.json
+++ /dev/null
@@ -1,171 +0,0 @@
-[
-  {
-    "id": "signup.headline",
-    "defaultMessage": "!!!Sign up",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 20,
-      "column": 12
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.firstname.label",
-    "defaultMessage": "!!!Firstname",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 24,
-      "column": 18
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.lastname.label",
-    "defaultMessage": "!!!Lastname",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 28,
-      "column": 17
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.email.label",
-    "defaultMessage": "!!!Email address",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 32,
-      "column": 14
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.password.label",
-    "defaultMessage": "!!!Password",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 40,
-      "column": 17
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.legal.info",
-    "defaultMessage": "!!!By creating a Ferdi account you accept the",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 44,
-      "column": 13
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.legal.terms",
-    "defaultMessage": "!!!Terms of service",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 48,
-      "column": 9
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.legal.privacy",
-    "defaultMessage": "!!!Privacy Statement",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 52,
-      "column": 11
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.submit.label",
-    "defaultMessage": "!!!Create account",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 56,
-      "column": 21
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.link.login",
-    "defaultMessage": "!!!Already have an account, sign in?",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 60,
-      "column": 13
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.changeServer",
-    "defaultMessage": "!!!Change server",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 64,
-      "column": 16
-    },
-    "end": {
-      "line": 67,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.serverless",
-    "defaultMessage": "!!!Use Ferdi without an Account",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 68,
-      "column": 14
-    },
-    "end": {
-      "line": 71,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.emailDuplicate",
-    "defaultMessage": "!!!A user with that email address already exists",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 72,
-      "column": 18
-    },
-    "end": {
-      "line": 75,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Welcome.json b/src/i18n/messages/src/components/auth/Welcome.json
deleted file mode 100644
index 3f0c1e5c2..000000000
--- a/src/i18n/messages/src/components/auth/Welcome.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "welcome.signupButton",
-    "defaultMessage": "!!!Create a free account",
-    "file": "src/components/auth/Welcome.js",
-    "start": {
-      "line": 11,
-      "column": 16
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  },
-  {
-    "id": "welcome.loginButton",
-    "defaultMessage": "!!!Login to your account",
-    "file": "src/components/auth/Welcome.js",
-    "start": {
-      "line": 15,
-      "column": 15
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.serverless",
-    "defaultMessage": "!!!Use Ferdi without an Account",
-    "file": "src/components/auth/Welcome.js",
-    "start": {
-      "line": 19,
-      "column": 14
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/layout/AppLayout.json b/src/i18n/messages/src/components/layout/AppLayout.json
deleted file mode 100644
index 807490a4f..000000000
--- a/src/i18n/messages/src/components/layout/AppLayout.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "infobar.servicesUpdated",
-    "defaultMessage": "!!!Your services have been updated.",
-    "file": "src/components/layout/AppLayout.js",
-    "start": {
-      "line": 28,
-      "column": 19
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "infobar.buttonReloadServices",
-    "defaultMessage": "!!!Reload services",
-    "file": "src/components/layout/AppLayout.js",
-    "start": {
-      "line": 32,
-      "column": 24
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "infobar.requiredRequestsFailed",
-    "defaultMessage": "!!!Could not load services and user information",
-    "file": "src/components/layout/AppLayout.js",
-    "start": {
-      "line": 36,
-      "column": 26
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "infobar.authRequestFailed",
-    "defaultMessage": "!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-    "file": "src/components/layout/AppLayout.js",
-    "start": {
-      "line": 40,
-      "column": 21
-    },
-    "end": {
-      "line": 44,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/layout/Sidebar.json b/src/i18n/messages/src/components/layout/Sidebar.json
deleted file mode 100644
index 9bc435f12..000000000
--- a/src/i18n/messages/src/components/layout/Sidebar.json
+++ /dev/null
@@ -1,106 +0,0 @@
-[
-  {
-    "id": "sidebar.addNewService",
-    "defaultMessage": "!!!Add new service",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 18,
-      "column": 17
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.muteApp",
-    "defaultMessage": "!!!Disable notifications & audio",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 22,
-      "column": 8
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.unmuteApp",
-    "defaultMessage": "!!!Enable notifications & audio",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 26,
-      "column": 10
-    },
-    "end": {
-      "line": 29,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.openWorkspaceDrawer",
-    "defaultMessage": "!!!Open workspace drawer",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 30,
-      "column": 23
-    },
-    "end": {
-      "line": 33,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.closeWorkspaceDrawer",
-    "defaultMessage": "!!!Close workspace drawer",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 34,
-      "column": 24
-    },
-    "end": {
-      "line": 37,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.openTodosDrawer",
-    "defaultMessage": "!!!Open Ferdi Todos",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 38,
-      "column": 19
-    },
-    "end": {
-      "line": 41,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.closeTodosDrawer",
-    "defaultMessage": "!!!Close Ferdi Todos",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 42,
-      "column": 20
-    },
-    "end": {
-      "line": 45,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.lockFerdi",
-    "defaultMessage": "!!!Lock Ferdi",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 46,
-      "column": 13
-    },
-    "end": {
-      "line": 49,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ConnectionBanner.json b/src/i18n/messages/src/components/services/content/ConnectionBanner.json
deleted file mode 100644
index 1047c28b5..000000000
--- a/src/i18n/messages/src/components/services/content/ConnectionBanner.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "webControls.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/components/services/content/ConnectionBanner.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.openInBrowser",
-    "defaultMessage": "!!!Open in Browser",
-    "file": "src/components/services/content/ConnectionBanner.js",
-    "start": {
-      "line": 17,
-      "column": 17
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.back",
-    "defaultMessage": "!!!Back",
-    "file": "src/components/services/content/ConnectionBanner.js",
-    "start": {
-      "line": 21,
-      "column": 8
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.forward",
-    "defaultMessage": "!!!Forward",
-    "file": "src/components/services/content/ConnectionBanner.js",
-    "start": {
-      "line": 25,
-      "column": 11
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.reload",
-    "defaultMessage": "!!!Reload",
-    "file": "src/components/services/content/ConnectionBanner.js",
-    "start": {
-      "line": 29,
-      "column": 10
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ConnectionLost.json b/src/i18n/messages/src/components/services/content/ConnectionLost.json
deleted file mode 100644
index ee3f7a4ba..000000000
--- a/src/i18n/messages/src/components/services/content/ConnectionLost.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "webControls.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/components/services/content/ConnectionLost.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.openInBrowser",
-    "defaultMessage": "!!!Open in Browser",
-    "file": "src/components/services/content/ConnectionLost.js",
-    "start": {
-      "line": 17,
-      "column": 17
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.back",
-    "defaultMessage": "!!!Back",
-    "file": "src/components/services/content/ConnectionLost.js",
-    "start": {
-      "line": 21,
-      "column": 8
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.forward",
-    "defaultMessage": "!!!Forward",
-    "file": "src/components/services/content/ConnectionLost.js",
-    "start": {
-      "line": 25,
-      "column": 11
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.reload",
-    "defaultMessage": "!!!Reload",
-    "file": "src/components/services/content/ConnectionLost.js",
-    "start": {
-      "line": 29,
-      "column": 10
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json b/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json
deleted file mode 100644
index 6805b4d67..000000000
--- a/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "connectionLostBanner.message",
-    "defaultMessage": "!!!Oh no! Ferdi lost the connection to {name}.",
-    "file": "src/components/services/content/ConnectionLostBanner.js",
-    "start": {
-      "line": 13,
-      "column": 8
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "connectionLostBanner.informationLink",
-    "defaultMessage": "!!!What happened?",
-    "file": "src/components/services/content/ConnectionLostBanner.js",
-    "start": {
-      "line": 17,
-      "column": 19
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "connectionLostBanner.cta",
-    "defaultMessage": "!!!Reload Service",
-    "file": "src/components/services/content/ConnectionLostBanner.js",
-    "start": {
-      "line": 21,
-      "column": 7
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json b/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json
deleted file mode 100644
index c8fe802df..000000000
--- a/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "service.errorHandler.headline",
-    "defaultMessage": "!!!Oh no!",
-    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-    "start": {
-      "line": 12,
-      "column": 12
-    },
-    "end": {
-      "line": 15,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.errorHandler.text",
-    "defaultMessage": "!!!{name} has failed to load.",
-    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-    "start": {
-      "line": 16,
-      "column": 8
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.errorHandler.action",
-    "defaultMessage": "!!!Reload {name}",
-    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-    "start": {
-      "line": 20,
-      "column": 10
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.errorHandler.editAction",
-    "defaultMessage": "!!!Edit {name}",
-    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-    "start": {
-      "line": 24,
-      "column": 14
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.errorHandler.message",
-    "defaultMessage": "!!!Error:",
-    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-    "start": {
-      "line": 28,
-      "column": 16
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ServiceDisabled.json b/src/i18n/messages/src/components/services/content/ServiceDisabled.json
deleted file mode 100644
index 8bfad28c7..000000000
--- a/src/i18n/messages/src/components/services/content/ServiceDisabled.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "id": "service.disabledHandler.headline",
-    "defaultMessage": "!!!{name} is disabled",
-    "file": "src/components/services/content/ServiceDisabled.js",
-    "start": {
-      "line": 9,
-      "column": 12
-    },
-    "end": {
-      "line": 12,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.disabledHandler.action",
-    "defaultMessage": "!!!Enable {name}",
-    "file": "src/components/services/content/ServiceDisabled.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/Services.json b/src/i18n/messages/src/components/services/content/Services.json
deleted file mode 100644
index 304c93f3c..000000000
--- a/src/i18n/messages/src/components/services/content/Services.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "services.welcome",
-    "defaultMessage": "!!!Welcome to Ferdi",
-    "file": "src/components/services/content/Services.js",
-    "start": {
-      "line": 15,
-      "column": 11
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.getStarted",
-    "defaultMessage": "!!!Get started",
-    "file": "src/components/services/content/Services.js",
-    "start": {
-      "line": 19,
-      "column": 14
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.login",
-    "defaultMessage": "!!!Please login to use Ferdi.",
-    "file": "src/components/services/content/Services.js",
-    "start": {
-      "line": 23,
-      "column": 9
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.serverless",
-    "defaultMessage": "!!!Use Ferdi without an Account",
-    "file": "src/components/services/content/Services.js",
-    "start": {
-      "line": 27,
-      "column": 14
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.serverInfo",
-    "defaultMessage": "!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
-    "file": "src/components/services/content/Services.js",
-    "start": {
-      "line": 31,
-      "column": 14
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/WebControls.json b/src/i18n/messages/src/components/services/content/WebControls.json
deleted file mode 100644
index 5af5143d0..000000000
--- a/src/i18n/messages/src/components/services/content/WebControls.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "webControls.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/components/services/content/WebControls.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.openInBrowser",
-    "defaultMessage": "!!!Open in Browser",
-    "file": "src/components/services/content/WebControls.js",
-    "start": {
-      "line": 17,
-      "column": 17
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.back",
-    "defaultMessage": "!!!Back",
-    "file": "src/components/services/content/WebControls.js",
-    "start": {
-      "line": 21,
-      "column": 8
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.forward",
-    "defaultMessage": "!!!Forward",
-    "file": "src/components/services/content/WebControls.js",
-    "start": {
-      "line": 25,
-      "column": 11
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.reload",
-    "defaultMessage": "!!!Reload",
-    "file": "src/components/services/content/WebControls.js",
-    "start": {
-      "line": 29,
-      "column": 10
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/WebviewCrashHandler.json b/src/i18n/messages/src/components/services/content/WebviewCrashHandler.json
deleted file mode 100644
index c3d6c41a5..000000000
--- a/src/i18n/messages/src/components/services/content/WebviewCrashHandler.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "service.crashHandler.headline",
-    "defaultMessage": "!!!Oh no!",
-    "file": "src/components/services/content/WebviewCrashHandler.js",
-    "start": {
-      "line": 10,
-      "column": 12
-    },
-    "end": {
-      "line": 13,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.crashHandler.text",
-    "defaultMessage": "!!!{name} has caused an error.",
-    "file": "src/components/services/content/WebviewCrashHandler.js",
-    "start": {
-      "line": 14,
-      "column": 8
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.crashHandler.action",
-    "defaultMessage": "!!!Reload {name}",
-    "file": "src/components/services/content/WebviewCrashHandler.js",
-    "start": {
-      "line": 18,
-      "column": 10
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.crashHandler.autoReload",
-    "defaultMessage": "!!!Trying to automatically restore {name} in {seconds} seconds",
-    "file": "src/components/services/content/WebviewCrashHandler.js",
-    "start": {
-      "line": 22,
-      "column": 14
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/tabs/TabItem.json b/src/i18n/messages/src/components/services/tabs/TabItem.json
deleted file mode 100644
index de854f1e1..000000000
--- a/src/i18n/messages/src/components/services/tabs/TabItem.json
+++ /dev/null
@@ -1,171 +0,0 @@
-[
-  {
-    "id": "tabs.item.reload",
-    "defaultMessage": "!!!Reload",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 21,
-      "column": 10
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.disableNotifications",
-    "defaultMessage": "!!!Disable notifications",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 25,
-      "column": 24
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.enableNotification",
-    "defaultMessage": "!!!Enable notifications",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 29,
-      "column": 23
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.disableAudio",
-    "defaultMessage": "!!!Disable audio",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 33,
-      "column": 16
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.enableAudio",
-    "defaultMessage": "!!!Enable audio",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 37,
-      "column": 15
-    },
-    "end": {
-      "line": 40,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.enableDarkMode",
-    "defaultMessage": "!!!Enable Dark mode",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 41,
-      "column": 18
-    },
-    "end": {
-      "line": 44,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.disableDarkMode",
-    "defaultMessage": "!!!Disable Dark mode",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 45,
-      "column": 19
-    },
-    "end": {
-      "line": 48,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.disableService",
-    "defaultMessage": "!!!Disable Service",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 49,
-      "column": 18
-    },
-    "end": {
-      "line": 52,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.enableService",
-    "defaultMessage": "!!!Enable Service",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 53,
-      "column": 17
-    },
-    "end": {
-      "line": 56,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.hibernateService",
-    "defaultMessage": "!!!Hibernate Service",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 57,
-      "column": 20
-    },
-    "end": {
-      "line": 60,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.wakeUpService",
-    "defaultMessage": "!!!Wake Up Service",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 61,
-      "column": 17
-    },
-    "end": {
-      "line": 64,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.deleteService",
-    "defaultMessage": "!!!Delete Service",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 65,
-      "column": 17
-    },
-    "end": {
-      "line": 68,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.confirmDeleteService",
-    "defaultMessage": "!!!Do you really want to delete the {serviceName} service?",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 69,
-      "column": 24
-    },
-    "end": {
-      "line": 73,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/SettingsLayout.json b/src/i18n/messages/src/components/settings/SettingsLayout.json
deleted file mode 100644
index 99337a315..000000000
--- a/src/i18n/messages/src/components/settings/SettingsLayout.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "settings.app.closeSettings",
-    "defaultMessage": "!!!Close settings",
-    "file": "src/components/settings/SettingsLayout.js",
-    "start": {
-      "line": 11,
-      "column": 17
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/account/AccountDashboard.json b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
deleted file mode 100644
index b0cc2dcc7..000000000
--- a/src/i18n/messages/src/components/settings/account/AccountDashboard.json
+++ /dev/null
@@ -1,158 +0,0 @@
-[
-  {
-    "id": "settings.account.headline",
-    "defaultMessage": "!!!Account",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 14,
-      "column": 12
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineDangerZone",
-    "defaultMessage": "!!Danger Zone",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 18,
-      "column": 22
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.account.editButton",
-    "defaultMessage": "!!!Edit Account",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 22,
-      "column": 21
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineInvoices",
-    "defaultMessage": "!!Invoices",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 26,
-      "column": 18
-    },
-    "end": {
-      "line": 29,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.userInfoRequestFailed",
-    "defaultMessage": "!!!Could not load user information",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 30,
-      "column": 25
-    },
-    "end": {
-      "line": 33,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.tryReloadUserInfoRequest",
-    "defaultMessage": "!!!Try again",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 34,
-      "column": 28
-    },
-    "end": {
-      "line": 37,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.deleteAccount",
-    "defaultMessage": "!!!Delete account",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 38,
-      "column": 17
-    },
-    "end": {
-      "line": 41,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.deleteInfo",
-    "defaultMessage": "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 42,
-      "column": 14
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.deleteEmailSent",
-    "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 47,
-      "column": 19
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.yourLicense",
-    "defaultMessage": "!!!Your Franz License:",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 52,
-      "column": 15
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.accountUnavailable",
-    "defaultMessage": "Account is unavailable",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 56,
-      "column": 22
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.accountUnavailableInfo",
-    "defaultMessage": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 60,
-      "column": 26
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
deleted file mode 100644
index 2029ad7af..000000000
--- a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "settings.navigation.availableServices",
-    "defaultMessage": "!!!Available services",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 16,
-      "column": 21
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.yourServices",
-    "defaultMessage": "!!!Your services",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 20,
-      "column": 16
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.yourWorkspaces",
-    "defaultMessage": "!!!Your workspaces",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 24,
-      "column": 18
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.account",
-    "defaultMessage": "!!!Account",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 28,
-      "column": 11
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.team",
-    "defaultMessage": "!!!Manage Team",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 32,
-      "column": 8
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.supportFerdi",
-    "defaultMessage": "!!!About Ferdi",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 36,
-      "column": 16
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.logout",
-    "defaultMessage": "!!!Logout",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 40,
-      "column": 10
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json b/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
deleted file mode 100644
index 7ab2916f5..000000000
--- a/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
+++ /dev/null
@@ -1,171 +0,0 @@
-[
-  {
-    "id": "settings.recipes.headline",
-    "defaultMessage": "!!!Available Services",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 19,
-      "column": 12
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.searchService",
-    "defaultMessage": "!!!Search service",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 23,
-      "column": 17
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.all",
-    "defaultMessage": "!!!All services",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 27,
-      "column": 14
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.custom",
-    "defaultMessage": "!!!Custom Services",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 31,
-      "column": 17
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.nothingFound",
-    "defaultMessage": "!!!Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 35,
-      "column": 16
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.servicesSuccessfulAddedInfo",
-    "defaultMessage": "!!!Service successfully added",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 39,
-      "column": 31
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.missingService",
-    "defaultMessage": "!!!Missing a service?",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 43,
-      "column": 18
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.customService.intro",
-    "defaultMessage": "!!!To add a custom service, copy the recipe folder into:",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 47,
-      "column": 21
-    },
-    "end": {
-      "line": 50,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.customService.openFolder",
-    "defaultMessage": "!!!Open directory",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 51,
-      "column": 14
-    },
-    "end": {
-      "line": 54,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.customService.openDevDocs",
-    "defaultMessage": "!!!Developer Documentation",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 55,
-      "column": 15
-    },
-    "end": {
-      "line": 58,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.customService.headline.customRecipes",
-    "defaultMessage": "!!!Custom 3rd Party Recipes",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 59,
-      "column": 25
-    },
-    "end": {
-      "line": 62,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.customService.headline.communityRecipes",
-    "defaultMessage": "!!!Community 3rd Party Recipes",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 63,
-      "column": 28
-    },
-    "end": {
-      "line": 66,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.customService.headline.devRecipes",
-    "defaultMessage": "!!!Your Development Service Recipes",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 67,
-      "column": 22
-    },
-    "end": {
-      "line": 70,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/EditServiceForm.json b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
deleted file mode 100644
index d7830f198..000000000
--- a/src/i18n/messages/src/components/settings/services/EditServiceForm.json
+++ /dev/null
@@ -1,340 +0,0 @@
-[
-  {
-    "id": "settings.service.form.saveButton",
-    "defaultMessage": "!!!Save service",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 23,
-      "column": 15
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.deleteButton",
-    "defaultMessage": "!!!Delete Service",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 27,
-      "column": 17
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.openDarkmodeCss",
-    "defaultMessage": "!!!Open darkmode.css",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 31,
-      "column": 19
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.openUserCss",
-    "defaultMessage": "!!!Open user.css",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 35,
-      "column": 15
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.openUserJs",
-    "defaultMessage": "!!!Open user.js",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 39,
-      "column": 14
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.recipeFileInfo",
-    "defaultMessage": "!!!Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 43,
-      "column": 18
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.availableServices",
-    "defaultMessage": "!!!Available services",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 47,
-      "column": 21
-    },
-    "end": {
-      "line": 50,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.yourServices",
-    "defaultMessage": "!!!Your services",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 51,
-      "column": 16
-    },
-    "end": {
-      "line": 54,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.addServiceHeadline",
-    "defaultMessage": "!!!Add {name}",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 55,
-      "column": 22
-    },
-    "end": {
-      "line": 58,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.editServiceHeadline",
-    "defaultMessage": "!!!Edit {name}",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 59,
-      "column": 23
-    },
-    "end": {
-      "line": 62,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.tabHosted",
-    "defaultMessage": "!!!Hosted",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 63,
-      "column": 13
-    },
-    "end": {
-      "line": 66,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.tabOnPremise",
-    "defaultMessage": "!!!Self hosted ⭐️",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 67,
-      "column": 16
-    },
-    "end": {
-      "line": 70,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.useHostedService",
-    "defaultMessage": "!!!Use the hosted {name} service.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 71,
-      "column": 20
-    },
-    "end": {
-      "line": 74,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.customUrlValidationError",
-    "defaultMessage": "!!!Could not validate custom {name} server.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 75,
-      "column": 28
-    },
-    "end": {
-      "line": 78,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.indirectMessageInfo",
-    "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 79,
-      "column": 23
-    },
-    "end": {
-      "line": 82,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.isMutedInfo",
-    "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 83,
-      "column": 15
-    },
-    "end": {
-      "line": 86,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.isHibernatedEnabledInfo",
-    "defaultMessage": "!!!When enabled, a service will be shut down after a period of time to save system resources.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 87,
-      "column": 28
-    },
-    "end": {
-      "line": 90,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.headlineNotifications",
-    "defaultMessage": "!!!Notifications",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 91,
-      "column": 25
-    },
-    "end": {
-      "line": 94,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.headlineBadges",
-    "defaultMessage": "!!!Unread message badges",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 95,
-      "column": 18
-    },
-    "end": {
-      "line": 98,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.headlineGeneral",
-    "defaultMessage": "!!!General",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 99,
-      "column": 19
-    },
-    "end": {
-      "line": 102,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.headlineDarkReaderSettings",
-    "defaultMessage": "!!!Dark Reader Settings",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 103,
-      "column": 30
-    },
-    "end": {
-      "line": 106,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.iconDelete",
-    "defaultMessage": "!!!Delete",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 107,
-      "column": 14
-    },
-    "end": {
-      "line": 110,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.iconUpload",
-    "defaultMessage": "!!!Drop your image, or click here",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 111,
-      "column": 14
-    },
-    "end": {
-      "line": 114,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.headline",
-    "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 115,
-      "column": 17
-    },
-    "end": {
-      "line": 118,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.restartInfo",
-    "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 119,
-      "column": 20
-    },
-    "end": {
-      "line": 122,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.info",
-    "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 123,
-      "column": 13
-    },
-    "end": {
-      "line": 126,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/ServiceError.json b/src/i18n/messages/src/components/settings/services/ServiceError.json
deleted file mode 100644
index 648fc5b3e..000000000
--- a/src/i18n/messages/src/components/settings/services/ServiceError.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "settings.service.error.headline",
-    "defaultMessage": "!!!Error",
-    "file": "src/components/settings/services/ServiceError.js",
-    "start": {
-      "line": 10,
-      "column": 12
-    },
-    "end": {
-      "line": 13,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.error.goBack",
-    "defaultMessage": "!!!Back to services",
-    "file": "src/components/settings/services/ServiceError.js",
-    "start": {
-      "line": 14,
-      "column": 10
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.availableServices",
-    "defaultMessage": "!!!Available services",
-    "file": "src/components/settings/services/ServiceError.js",
-    "start": {
-      "line": 18,
-      "column": 21
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.error.message",
-    "defaultMessage": "!!!Could not load service recipe.",
-    "file": "src/components/settings/services/ServiceError.js",
-    "start": {
-      "line": 22,
-      "column": 16
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/ServiceItem.json b/src/i18n/messages/src/components/settings/services/ServiceItem.json
deleted file mode 100644
index ffea8b9e1..000000000
--- a/src/i18n/messages/src/components/settings/services/ServiceItem.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "settings.services.tooltip.isDisabled",
-    "defaultMessage": "!!!Service is disabled",
-    "file": "src/components/settings/services/ServiceItem.js",
-    "start": {
-      "line": 11,
-      "column": 21
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.tooltip.notificationsDisabled",
-    "defaultMessage": "!!!Notifications are disabled",
-    "file": "src/components/settings/services/ServiceItem.js",
-    "start": {
-      "line": 15,
-      "column": 32
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.tooltip.isMuted",
-    "defaultMessage": "!!!All sounds are muted",
-    "file": "src/components/settings/services/ServiceItem.js",
-    "start": {
-      "line": 19,
-      "column": 18
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/ServicesDashboard.json b/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
deleted file mode 100644
index 7e7c5d67e..000000000
--- a/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
+++ /dev/null
@@ -1,119 +0,0 @@
-[
-  {
-    "id": "settings.services.headline",
-    "defaultMessage": "!!!Your services",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.searchService",
-    "defaultMessage": "!!!Search service",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 19,
-      "column": 17
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.noServicesAdded",
-    "defaultMessage": "!!!Start by adding a service.",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 23,
-      "column": 19
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.nothingFound",
-    "defaultMessage": "!!!Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 27,
-      "column": 18
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.discoverServices",
-    "defaultMessage": "!!!Discover services",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 31,
-      "column": 20
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.servicesRequestFailed",
-    "defaultMessage": "!!!Could not load your services",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 35,
-      "column": 25
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.tryReloadServices",
-    "defaultMessage": "!!!Try again",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 39,
-      "column": 21
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.updatedInfo",
-    "defaultMessage": "!!!Your changes have been saved",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 43,
-      "column": 15
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.deletedInfo",
-    "defaultMessage": "!!!Service has been deleted",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 47,
-      "column": 15
-    },
-    "end": {
-      "line": 50,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
deleted file mode 100644
index c281ebff3..000000000
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ /dev/null
@@ -1,444 +0,0 @@
-[
-  {
-    "id": "settings.app.headlineGeneral",
-    "defaultMessage": "!!!General",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 21,
-      "column": 19
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.sentryInfo",
-    "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 25,
-      "column": 14
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.hibernateInfo",
-    "defaultMessage": "!!!By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 29,
-      "column": 17
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.inactivityLockInfo",
-    "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 33,
-      "column": 22
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.todoServerInfo",
-    "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 37,
-      "column": 18
-    },
-    "end": {
-      "line": 40,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.lockedPassword",
-    "defaultMessage": "!!!Password",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 41,
-      "column": 18
-    },
-    "end": {
-      "line": 44,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.lockedPasswordInfo",
-    "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 45,
-      "column": 22
-    },
-    "end": {
-      "line": 48,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.lockInfo",
-    "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 49,
-      "column": 12
-    },
-    "end": {
-      "line": 52,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.scheduledDNDTimeInfo",
-    "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 53,
-      "column": 24
-    },
-    "end": {
-      "line": 56,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.scheduledDNDInfo",
-    "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 57,
-      "column": 20
-    },
-    "end": {
-      "line": 60,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.headlineLanguage",
-    "defaultMessage": "!!!Language",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 61,
-      "column": 20
-    },
-    "end": {
-      "line": 64,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.headlineUpdates",
-    "defaultMessage": "!!!Updates",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 65,
-      "column": 19
-    },
-    "end": {
-      "line": 68,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.headlineAppearance",
-    "defaultMessage": "!!!Appearance",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 69,
-      "column": 22
-    },
-    "end": {
-      "line": 72,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.universalDarkModeInfo",
-    "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 73,
-      "column": 25
-    },
-    "end": {
-      "line": 76,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.accentColorInfo",
-    "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 77,
-      "column": 19
-    },
-    "end": {
-      "line": 80,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.headlinePrivacy",
-    "defaultMessage": "!!!Privacy",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 81,
-      "column": 19
-    },
-    "end": {
-      "line": 84,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.headlineAdvanced",
-    "defaultMessage": "!!!Advanced",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 85,
-      "column": 20
-    },
-    "end": {
-      "line": 88,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.translationHelp",
-    "defaultMessage": "!!!Help us to translate Ferdi into your language.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 89,
-      "column": 19
-    },
-    "end": {
-      "line": 92,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.spellCheckerLanguageInfo",
-    "defaultMessage": "!!!Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 93,
-      "column": 28
-    },
-    "end": {
-      "line": 96,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.subheadlineCache",
-    "defaultMessage": "!!!Cache",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 97,
-      "column": 20
-    },
-    "end": {
-      "line": 100,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.cacheInfo",
-    "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 101,
-      "column": 13
-    },
-    "end": {
-      "line": 104,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.cacheNotCleared",
-    "defaultMessage": "!!!Couldn't clear all cache",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 105,
-      "column": 19
-    },
-    "end": {
-      "line": 108,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.buttonClearAllCache",
-    "defaultMessage": "!!!Clear cache",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 109,
-      "column": 23
-    },
-    "end": {
-      "line": 112,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.subheadlineFerdiProfile",
-    "defaultMessage": "!!!Ferdi Profile",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 113,
-      "column": 27
-    },
-    "end": {
-      "line": 116,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.buttonOpenFerdiProfileFolder",
-    "defaultMessage": "!!!Open Profile folder",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 117,
-      "column": 32
-    },
-    "end": {
-      "line": 120,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.buttonOpenFerdiServiceRecipesFolder",
-    "defaultMessage": "!!!Open Service Recipes folder",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 121,
-      "column": 39
-    },
-    "end": {
-      "line": 124,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.buttonSearchForUpdate",
-    "defaultMessage": "!!!Check for updates",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 125,
-      "column": 25
-    },
-    "end": {
-      "line": 128,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.buttonInstallUpdate",
-    "defaultMessage": "!!!Restart & install update",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 129,
-      "column": 23
-    },
-    "end": {
-      "line": 132,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.updateStatusSearching",
-    "defaultMessage": "!!!Is searching for update",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 133,
-      "column": 25
-    },
-    "end": {
-      "line": 136,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.updateStatusAvailable",
-    "defaultMessage": "!!!Update available, downloading...",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 137,
-      "column": 25
-    },
-    "end": {
-      "line": 140,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.updateStatusUpToDate",
-    "defaultMessage": "!!!You are using the latest version of Ferdi",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 141,
-      "column": 24
-    },
-    "end": {
-      "line": 144,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.currentVersion",
-    "defaultMessage": "!!!Current version:",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 145,
-      "column": 18
-    },
-    "end": {
-      "line": 148,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.restartRequired",
-    "defaultMessage": "!!!Changes require restart",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 149,
-      "column": 22
-    },
-    "end": {
-      "line": 152,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.languageDisclaimer",
-    "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 153,
-      "column": 22
-    },
-    "end": {
-      "line": 156,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/supportFerdi/SupportFerdiDashboard.json b/src/i18n/messages/src/components/settings/supportFerdi/SupportFerdiDashboard.json
deleted file mode 100644
index e63c2801f..000000000
--- a/src/i18n/messages/src/components/settings/supportFerdi/SupportFerdiDashboard.json
+++ /dev/null
@@ -1,197 +0,0 @@
-[
-  {
-    "id": "settings.supportFerdi.headline",
-    "defaultMessage": "!!!About Ferdi",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 7,
-      "column": 12
-    },
-    "end": {
-      "line": 10,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.title",
-    "defaultMessage": "!!!Do you like Ferdi?",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 11,
-      "column": 9
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.aboutIntro",
-    "defaultMessage": "!!!<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 15,
-      "column": 14
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textListContributors",
-    "defaultMessage": "!!!Full list of contributor",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 19,
-      "column": 24
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textListContributorsHere",
-    "defaultMessage": "!!!here",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 23,
-      "column": 28
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textVolunteers",
-    "defaultMessage": "!!!The development of Ferdi is done by volunteers. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 27,
-      "column": 18
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textSupportWelcome",
-    "defaultMessage": "!!!Support is always welcome. You can find a list of the help we need",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 31,
-      "column": 22
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textSupportWelcomeHere",
-    "defaultMessage": "!!!here",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 35,
-      "column": 26
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textExpenses",
-    "defaultMessage": "!!!While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 39,
-      "column": 16
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textOpenCollective",
-    "defaultMessage": "!!!Open Collective",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 43,
-      "column": 22
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textDonation",
-    "defaultMessage": "!!!If you feel like supporting Ferdi development with a donation, you can do so on both,",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 47,
-      "column": 16
-    },
-    "end": {
-      "line": 50,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textDonationAnd",
-    "defaultMessage": "!!!and",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 51,
-      "column": 19
-    },
-    "end": {
-      "line": 54,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textGitHubSponsors",
-    "defaultMessage": "!!!GitHub Sponsors",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 55,
-      "column": 22
-    },
-    "end": {
-      "line": 58,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.openSurvey",
-    "defaultMessage": "!!!Open Survey",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 59,
-      "column": 14
-    },
-    "end": {
-      "line": 62,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.bannerText",
-    "defaultMessage": "!!!Do you want to help us improve Ferdi?",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 63,
-      "column": 14
-    },
-    "end": {
-      "line": 66,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/team/TeamDashboard.json b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
deleted file mode 100644
index ac42ad98a..000000000
--- a/src/i18n/messages/src/components/settings/team/TeamDashboard.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "settings.team.headline",
-    "defaultMessage": "!!!Team",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.contentHeadline",
-    "defaultMessage": "!!!Franz Team Management",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 19,
-      "column": 19
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.intro",
-    "defaultMessage": "!!!Your are currently using Franz Servers, which is why you have access to Team Management.",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 23,
-      "column": 9
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.copy",
-    "defaultMessage": "!!!Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 27,
-      "column": 8
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.manageAction",
-    "defaultMessage": "!!!Manage your Team on meetfranz.com",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 31,
-      "column": 16
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.teamsUnavailable",
-    "defaultMessage": "!!!Teams are unavailable",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 35,
-      "column": 20
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.teamsUnavailableInfo",
-    "defaultMessage": "!!!Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 39,
-      "column": 24
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/user/EditUserForm.json b/src/i18n/messages/src/components/settings/user/EditUserForm.json
deleted file mode 100644
index 3a59f8681..000000000
--- a/src/i18n/messages/src/components/settings/user/EditUserForm.json
+++ /dev/null
@@ -1,80 +0,0 @@
-[
-  {
-    "id": "settings.account.headline",
-    "defaultMessage": "!!!Account",
-    "file": "src/components/settings/user/EditUserForm.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineProfile",
-    "defaultMessage": "!!!Update Profile",
-    "file": "src/components/settings/user/EditUserForm.js",
-    "start": {
-      "line": 19,
-      "column": 19
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineAccount",
-    "defaultMessage": "!!!Account Information",
-    "file": "src/components/settings/user/EditUserForm.js",
-    "start": {
-      "line": 23,
-      "column": 19
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlinePassword",
-    "defaultMessage": "!!!Change Password",
-    "file": "src/components/settings/user/EditUserForm.js",
-    "start": {
-      "line": 27,
-      "column": 20
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.successInfo",
-    "defaultMessage": "!!!Your changes have been saved",
-    "file": "src/components/settings/user/EditUserForm.js",
-    "start": {
-      "line": 31,
-      "column": 15
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.buttonSave",
-    "defaultMessage": "!!!Update profile",
-    "file": "src/components/settings/user/EditUserForm.js",
-    "start": {
-      "line": 35,
-      "column": 14
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/FeatureList.json b/src/i18n/messages/src/components/ui/FeatureList.json
deleted file mode 100644
index eb4bc483b..000000000
--- a/src/i18n/messages/src/components/ui/FeatureList.json
+++ /dev/null
@@ -1,145 +0,0 @@
-[
-  {
-    "id": "pricing.features.recipes",
-    "defaultMessage": "!!!Choose from more than 70 Services",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 8,
-      "column": 20
-    },
-    "end": {
-      "line": 11,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.accountSync",
-    "defaultMessage": "!!!Account Synchronisation",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 12,
-      "column": 15
-    },
-    "end": {
-      "line": 15,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.desktopNotifications",
-    "defaultMessage": "!!!Desktop Notifications",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 16,
-      "column": 24
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.unlimitedServices",
-    "defaultMessage": "!!!Add unlimited services",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 20,
-      "column": 21
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.spellchecker",
-    "defaultMessage": "!!!Spellchecker support",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 24,
-      "column": 16
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.workspaces",
-    "defaultMessage": "!!!Workspaces",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 28,
-      "column": 14
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.customWebsites",
-    "defaultMessage": "!!!Add Custom Websites",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 32,
-      "column": 18
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.onPremise",
-    "defaultMessage": "!!!On-premise & other Hosted Services",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 36,
-      "column": 13
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.thirdPartyServices",
-    "defaultMessage": "!!!Install 3rd party services",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 40,
-      "column": 22
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.serviceProxies",
-    "defaultMessage": "!!!Service Proxies",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 44,
-      "column": 18
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.teamManagement",
-    "defaultMessage": "!!!Team Management",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 48,
-      "column": 18
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/InfoBar.json b/src/i18n/messages/src/components/ui/InfoBar.json
deleted file mode 100644
index a6a629c71..000000000
--- a/src/i18n/messages/src/components/ui/InfoBar.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "infobar.hide",
-    "defaultMessage": "!!!Hide",
-    "file": "src/components/ui/InfoBar.js",
-    "start": {
-      "line": 12,
-      "column": 8
-    },
-    "end": {
-      "line": 15,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/Infobox.json b/src/i18n/messages/src/components/ui/Infobox.json
deleted file mode 100644
index 296c2ad3e..000000000
--- a/src/i18n/messages/src/components/ui/Infobox.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "infobox.dismiss",
-    "defaultMessage": "!!!Dismiss",
-    "file": "src/components/ui/Infobox.js",
-    "start": {
-      "line": 9,
-      "column": 11
-    },
-    "end": {
-      "line": 12,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/Input.json b/src/i18n/messages/src/components/ui/Input.json
deleted file mode 100644
index 6240badfb..000000000
--- a/src/i18n/messages/src/components/ui/Input.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "settings.app.form.passwordToggle",
-    "defaultMessage": "!!!Password toggle",
-    "file": "src/components/ui/Input.js",
-    "start": {
-      "line": 11,
-      "column": 18
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/WebviewLoader/index.json b/src/i18n/messages/src/components/ui/WebviewLoader/index.json
deleted file mode 100644
index 9caabef25..000000000
--- a/src/i18n/messages/src/components/ui/WebviewLoader/index.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "service.webviewLoader.loading",
-    "defaultMessage": "!!!Loading {service}",
-    "file": "src/components/ui/WebviewLoader/index.js",
-    "start": {
-      "line": 11,
-      "column": 11
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/util/ErrorBoundary/index.json b/src/i18n/messages/src/components/util/ErrorBoundary/index.json
deleted file mode 100644
index 43c323031..000000000
--- a/src/i18n/messages/src/components/util/ErrorBoundary/index.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "id": "app.errorHandler.headline",
-    "defaultMessage": "!!!Something went wrong.",
-    "file": "src/components/util/ErrorBoundary/index.js",
-    "start": {
-      "line": 11,
-      "column": 12
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  },
-  {
-    "id": "app.errorHandler.action",
-    "defaultMessage": "!!!Reload",
-    "file": "src/components/util/ErrorBoundary/index.js",
-    "start": {
-      "line": 15,
-      "column": 10
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditServiceScreen.json b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
deleted file mode 100644
index 6744a9ff3..000000000
--- a/src/i18n/messages/src/containers/settings/EditServiceScreen.json
+++ /dev/null
@@ -1,249 +0,0 @@
-[
-  {
-    "id": "settings.service.form.name",
-    "defaultMessage": "!!!Name",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 28,
-      "column": 8
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.enableService",
-    "defaultMessage": "!!!Enable service",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 32,
-      "column": 17
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.enableHibernation",
-    "defaultMessage": "!!!Enable hibernation",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 36,
-      "column": 21
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.enableNotification",
-    "defaultMessage": "!!!Enable Notifications",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 40,
-      "column": 22
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.enableBadge",
-    "defaultMessage": "!!!Show unread message badges",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 44,
-      "column": 15
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.enableAudio",
-    "defaultMessage": "!!!Enable audio",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 48,
-      "column": 15
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.team",
-    "defaultMessage": "!!!Team",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 52,
-      "column": 8
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.customUrl",
-    "defaultMessage": "!!!Service URL",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 56,
-      "column": 13
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.indirectMessages",
-    "defaultMessage": "!!!Show message badge for all new messages",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 60,
-      "column": 20
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.icon",
-    "defaultMessage": "!!!Custom icon",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 64,
-      "column": 8
-    },
-    "end": {
-      "line": 67,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.enableDarkMode",
-    "defaultMessage": "!!!Enable Dark Mode",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 68,
-      "column": 18
-    },
-    "end": {
-      "line": 71,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.darkReaderBrightness",
-    "defaultMessage": "!!!Dark Reader Brightness",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 72,
-      "column": 24
-    },
-    "end": {
-      "line": 75,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.darkReaderContrast",
-    "defaultMessage": "!!!Dark Reader Contrast",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 76,
-      "column": 22
-    },
-    "end": {
-      "line": 79,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.darkReaderSepia",
-    "defaultMessage": "!!!Dark Reader Sepia",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 80,
-      "column": 19
-    },
-    "end": {
-      "line": 83,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.isEnabled",
-    "defaultMessage": "!!!Use Proxy",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 84,
-      "column": 15
-    },
-    "end": {
-      "line": 87,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.host",
-    "defaultMessage": "!!!Proxy Host/IP",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 88,
-      "column": 13
-    },
-    "end": {
-      "line": 91,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.port",
-    "defaultMessage": "!!!Port",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 92,
-      "column": 13
-    },
-    "end": {
-      "line": 95,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.user",
-    "defaultMessage": "!!!User",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 96,
-      "column": 13
-    },
-    "end": {
-      "line": 99,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.password",
-    "defaultMessage": "!!!Password",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 100,
-      "column": 17
-    },
-    "end": {
-      "line": 103,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
deleted file mode 100644
index b0087e5dd..000000000
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ /dev/null
@@ -1,600 +0,0 @@
-[
-  {
-    "id": "settings.app.form.autoLaunchOnStart",
-    "defaultMessage": "!!!Launch Ferdi on start",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 32,
-      "column": 21
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.autoLaunchInBackground",
-    "defaultMessage": "!!!Open in background",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 36,
-      "column": 26
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.runInBackground",
-    "defaultMessage": "!!!Keep Ferdi in background when closing the window",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 40,
-      "column": 19
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.startMinimized",
-    "defaultMessage": "!!!Start minimized",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 44,
-      "column": 18
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.confirmOnQuit",
-    "defaultMessage": "!!!Confirm when quitting Ferdi",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 48,
-      "column": 17
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableSystemTray",
-    "defaultMessage": "!!!Always show Ferdi in System Tray",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 52,
-      "column": 20
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableMenuBar",
-    "defaultMessage": "!!!Always show Ferdi in Menu Bar",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 56,
-      "column": 17
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.reloadAfterResume",
-    "defaultMessage": "!!!Reload Ferdi after system resume",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 60,
-      "column": 21
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.minimizeToSystemTray",
-    "defaultMessage": "!!!Minimize Ferdi to system tray",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 64,
-      "column": 24
-    },
-    "end": {
-      "line": 67,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.closeToSystemTray",
-    "defaultMessage": "!!!Close Ferdi to system tray",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 68,
-      "column": 21
-    },
-    "end": {
-      "line": 71,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.privateNotifications",
-    "defaultMessage": "!!!Don't show message content in notifications",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 72,
-      "column": 24
-    },
-    "end": {
-      "line": 75,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.clipboardNotifications",
-    "defaultMessage": "!!!Don't show notifications for clipboard events",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 76,
-      "column": 26
-    },
-    "end": {
-      "line": 79,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.notifyTaskBarOnMessage",
-    "defaultMessage": "!!!Notify TaskBar/Dock on new message",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 80,
-      "column": 26
-    },
-    "end": {
-      "line": 83,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.navigationBarBehaviour",
-    "defaultMessage": "!!!Navigation bar behaviour",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 84,
-      "column": 26
-    },
-    "end": {
-      "line": 87,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.searchEngine",
-    "defaultMessage": "!!!Search engine",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 88,
-      "column": 16
-    },
-    "end": {
-      "line": 91,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.sentry",
-    "defaultMessage": "!!!Send telemetry data",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 92,
-      "column": 10
-    },
-    "end": {
-      "line": 95,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.hibernateOnStartup",
-    "defaultMessage": "!!!Keep services in hibernation on startup",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 96,
-      "column": 22
-    },
-    "end": {
-      "line": 99,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.hibernationStrategy",
-    "defaultMessage": "!!!Hibernation strategy",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 100,
-      "column": 23
-    },
-    "end": {
-      "line": 103,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.wakeUpStrategy",
-    "defaultMessage": "!!!Wake up strategy",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 104,
-      "column": 18
-    },
-    "end": {
-      "line": 107,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.predefinedTodoServer",
-    "defaultMessage": "!!!Todo Server",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 108,
-      "column": 24
-    },
-    "end": {
-      "line": 111,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.customTodoServer",
-    "defaultMessage": "!!!Custom TodoServer",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 112,
-      "column": 20
-    },
-    "end": {
-      "line": 115,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableLock",
-    "defaultMessage": "!!!Enable Password Lock",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 116,
-      "column": 14
-    },
-    "end": {
-      "line": 119,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.lockPassword",
-    "defaultMessage": "!!!Password",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 120,
-      "column": 16
-    },
-    "end": {
-      "line": 123,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.useTouchIdToUnlock",
-    "defaultMessage": "!!!Allow using Touch ID to unlock",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 124,
-      "column": 22
-    },
-    "end": {
-      "line": 127,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.inactivityLock",
-    "defaultMessage": "!!!Lock after inactivity",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 128,
-      "column": 18
-    },
-    "end": {
-      "line": 131,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.scheduledDNDEnabled",
-    "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 132,
-      "column": 23
-    },
-    "end": {
-      "line": 135,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.scheduledDNDStart",
-    "defaultMessage": "!!!From",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 136,
-      "column": 21
-    },
-    "end": {
-      "line": 139,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.scheduledDNDEnd",
-    "defaultMessage": "!!!To",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 140,
-      "column": 19
-    },
-    "end": {
-      "line": 143,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.language",
-    "defaultMessage": "!!!Language",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 144,
-      "column": 12
-    },
-    "end": {
-      "line": 147,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.darkMode",
-    "defaultMessage": "!!!Dark Mode",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 148,
-      "column": 12
-    },
-    "end": {
-      "line": 151,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.adaptableDarkMode",
-    "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 152,
-      "column": 21
-    },
-    "end": {
-      "line": 155,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.universalDarkMode",
-    "defaultMessage": "!!!Enable universal Dark Mode",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 156,
-      "column": 21
-    },
-    "end": {
-      "line": 159,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.serviceRibbonWidth",
-    "defaultMessage": "!!!Sidebar width",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 160,
-      "column": 22
-    },
-    "end": {
-      "line": 163,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.iconSize",
-    "defaultMessage": "!!!Service icon size",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 164,
-      "column": 12
-    },
-    "end": {
-      "line": 167,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.useVerticalStyle",
-    "defaultMessage": "!!!Use horizontal style",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 168,
-      "column": 20
-    },
-    "end": {
-      "line": 171,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.alwaysShowWorkspaces",
-    "defaultMessage": "!!!Always show workspace drawer",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 172,
-      "column": 24
-    },
-    "end": {
-      "line": 175,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.accentColor",
-    "defaultMessage": "!!!Accent color",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 176,
-      "column": 15
-    },
-    "end": {
-      "line": 179,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.showDisabledServices",
-    "defaultMessage": "!!!Display disabled services tabs",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 180,
-      "column": 24
-    },
-    "end": {
-      "line": 183,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.showMessagesBadgesWhenMuted",
-    "defaultMessage": "!!!Show unread message badge when notifications are disabled",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 184,
-      "column": 29
-    },
-    "end": {
-      "line": 187,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.showDragArea",
-    "defaultMessage": "!!!Show draggable area on window",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 188,
-      "column": 16
-    },
-    "end": {
-      "line": 191,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableSpellchecking",
-    "defaultMessage": "!!!Enable spell checking",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 192,
-      "column": 23
-    },
-    "end": {
-      "line": 195,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableGPUAcceleration",
-    "defaultMessage": "!!!Enable GPU Acceleration",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 196,
-      "column": 25
-    },
-    "end": {
-      "line": 199,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.beta",
-    "defaultMessage": "!!!Include beta versions",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 200,
-      "column": 8
-    },
-    "end": {
-      "line": 203,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.automaticUpdates",
-    "defaultMessage": "!!!Enable updates",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 204,
-      "column": 20
-    },
-    "end": {
-      "line": 207,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableTodos",
-    "defaultMessage": "!!!Enable Franz Todos",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 208,
-      "column": 15
-    },
-    "end": {
-      "line": 211,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.keepAllWorkspacesLoaded",
-    "defaultMessage": "!!!Keep all workspaces loaded",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 212,
-      "column": 27
-    },
-    "end": {
-      "line": 215,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditUserScreen.json b/src/i18n/messages/src/containers/settings/EditUserScreen.json
deleted file mode 100644
index 70ff29945..000000000
--- a/src/i18n/messages/src/containers/settings/EditUserScreen.json
+++ /dev/null
@@ -1,119 +0,0 @@
-[
-  {
-    "id": "settings.user.form.firstname",
-    "defaultMessage": "!!!Firstname",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 14,
-      "column": 13
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.lastname",
-    "defaultMessage": "!!!Lastname",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 18,
-      "column": 12
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.email",
-    "defaultMessage": "!!!Email",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 22,
-      "column": 9
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.accountType.label",
-    "defaultMessage": "!!!Account type",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 26,
-      "column": 20
-    },
-    "end": {
-      "line": 29,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.accountType.individual",
-    "defaultMessage": "!!!Individual",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 30,
-      "column": 25
-    },
-    "end": {
-      "line": 33,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.accountType.non-profit",
-    "defaultMessage": "!!!Non-Profit",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 34,
-      "column": 24
-    },
-    "end": {
-      "line": 37,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.accountType.company",
-    "defaultMessage": "!!!Company",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 38,
-      "column": 22
-    },
-    "end": {
-      "line": 41,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.currentPassword",
-    "defaultMessage": "!!!Current password",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 42,
-      "column": 19
-    },
-    "end": {
-      "line": 45,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.newPassword",
-    "defaultMessage": "!!!New password",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 46,
-      "column": 15
-    },
-    "end": {
-      "line": 49,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/basicAuth/Component.json b/src/i18n/messages/src/features/basicAuth/Component.json
deleted file mode 100644
index fea1b0838..000000000
--- a/src/i18n/messages/src/features/basicAuth/Component.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "feature.basicAuth.signIn",
-    "defaultMessage": "!!!Sign In",
-    "file": "src/features/basicAuth/Component.js",
-    "start": {
-      "line": 24,
-      "column": 10
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/debugger/Component.json b/src/i18n/messages/src/features/debugger/Component.json
deleted file mode 100644
index 86a5a05f4..000000000
--- a/src/i18n/messages/src/features/debugger/Component.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "feature.debugger.title",
-    "defaultMessage": "!!!Publish debugging information",
-    "file": "src/features/debugger/Component.js",
-    "start": {
-      "line": 16,
-      "column": 9
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/nightlyBuilds/Component.json b/src/i18n/messages/src/features/nightlyBuilds/Component.json
deleted file mode 100644
index 0b2eab354..000000000
--- a/src/i18n/messages/src/features/nightlyBuilds/Component.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "feature.nightlyBuilds.title",
-    "defaultMessage": "!!!Nightly Builds",
-    "file": "src/features/nightlyBuilds/Component.js",
-    "start": {
-      "line": 17,
-      "column": 9
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.nightlyBuilds.info",
-    "defaultMessage": "!!!Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
-    "file": "src/features/nightlyBuilds/Component.js",
-    "start": {
-      "line": 21,
-      "column": 8
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.nightlyBuilds.activate",
-    "defaultMessage": "!!!Activate",
-    "file": "src/features/nightlyBuilds/Component.js",
-    "start": {
-      "line": 25,
-      "column": 12
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/publishDebugInfo/Component.json b/src/i18n/messages/src/features/publishDebugInfo/Component.json
deleted file mode 100644
index 4d07a4794..000000000
--- a/src/i18n/messages/src/features/publishDebugInfo/Component.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "feature.publishDebugInfo.title",
-    "defaultMessage": "!!!Publish debug information",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 19,
-      "column": 9
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.publishDebugInfo.info",
-    "defaultMessage": "!!!Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 23,
-      "column": 8
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.publishDebugInfo.error",
-    "defaultMessage": "!!!There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 27,
-      "column": 9
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.publishDebugInfo.privacy",
-    "defaultMessage": "!!!Privacy policy",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 31,
-      "column": 11
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.publishDebugInfo.terms",
-    "defaultMessage": "!!!Terms of service",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 35,
-      "column": 9
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.publishDebugInfo.publish",
-    "defaultMessage": "!!!Accept and publish",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 39,
-      "column": 11
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.publishDebugInfo.published",
-    "defaultMessage": "!!!Your debug log was published and is now availible at",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 43,
-      "column": 13
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/quickSwitch/Component.json b/src/i18n/messages/src/features/quickSwitch/Component.json
deleted file mode 100644
index e112bedc1..000000000
--- a/src/i18n/messages/src/features/quickSwitch/Component.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "feature.quickSwitch.title",
-    "defaultMessage": "!!!QuickSwitch",
-    "file": "src/features/quickSwitch/Component.js",
-    "start": {
-      "line": 17,
-      "column": 9
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.quickSwitch.search",
-    "defaultMessage": "!!!Search...",
-    "file": "src/features/quickSwitch/Component.js",
-    "start": {
-      "line": 21,
-      "column": 10
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.quickSwitch.info",
-    "defaultMessage": "!!!Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
-    "file": "src/features/quickSwitch/Component.js",
-    "start": {
-      "line": 25,
-      "column": 8
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/recipeConnectionLost/components/WebControls.json b/src/i18n/messages/src/features/recipeConnectionLost/components/WebControls.json
deleted file mode 100644
index f3bcaf345..000000000
--- a/src/i18n/messages/src/features/recipeConnectionLost/components/WebControls.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "webControls.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/features/recipeConnectionLost/components/WebControls.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.openInBrowser",
-    "defaultMessage": "!!!Open in Browser",
-    "file": "src/features/recipeConnectionLost/components/WebControls.js",
-    "start": {
-      "line": 17,
-      "column": 17
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.back",
-    "defaultMessage": "!!!Back",
-    "file": "src/features/recipeConnectionLost/components/WebControls.js",
-    "start": {
-      "line": 21,
-      "column": 8
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.forward",
-    "defaultMessage": "!!!Forward",
-    "file": "src/features/recipeConnectionLost/components/WebControls.js",
-    "start": {
-      "line": 25,
-      "column": 11
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.reload",
-    "defaultMessage": "!!!Reload",
-    "file": "src/features/recipeConnectionLost/components/WebControls.js",
-    "start": {
-      "line": 29,
-      "column": 10
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/webControls/components/WebControls.json b/src/i18n/messages/src/features/webControls/components/WebControls.json
deleted file mode 100644
index 7676ec0b1..000000000
--- a/src/i18n/messages/src/features/webControls/components/WebControls.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "webControls.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/features/webControls/components/WebControls.js",
-    "start": {
-      "line": 17,
-      "column": 10
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.openInBrowser",
-    "defaultMessage": "!!!Open in Browser",
-    "file": "src/features/webControls/components/WebControls.js",
-    "start": {
-      "line": 21,
-      "column": 17
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.back",
-    "defaultMessage": "!!!Back",
-    "file": "src/features/webControls/components/WebControls.js",
-    "start": {
-      "line": 25,
-      "column": 8
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.forward",
-    "defaultMessage": "!!!Forward",
-    "file": "src/features/webControls/components/WebControls.js",
-    "start": {
-      "line": 29,
-      "column": 11
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.reload",
-    "defaultMessage": "!!!Reload",
-    "file": "src/features/webControls/components/WebControls.js",
-    "start": {
-      "line": 33,
-      "column": 10
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json
deleted file mode 100644
index 1aabfb520..000000000
--- a/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "id": "settings.workspace.add.form.submitButton",
-    "defaultMessage": "!!!Create workspace",
-    "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
-    "start": {
-      "line": 12,
-      "column": 16
-    },
-    "end": {
-      "line": 15,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.add.form.name",
-    "defaultMessage": "!!!Name",
-    "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
-    "start": {
-      "line": 16,
-      "column": 8
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
deleted file mode 100644
index 804e30070..000000000
--- a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
+++ /dev/null
@@ -1,119 +0,0 @@
-[
-  {
-    "id": "settings.workspace.form.buttonDelete",
-    "defaultMessage": "!!!Delete workspace",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 21,
-      "column": 16
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.form.buttonSave",
-    "defaultMessage": "!!!Save workspace",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 25,
-      "column": 14
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.form.name",
-    "defaultMessage": "!!!Name",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 29,
-      "column": 8
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.form.yourWorkspaces",
-    "defaultMessage": "!!!Your workspaces",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 33,
-      "column": 18
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.form.keepLoaded",
-    "defaultMessage": "!!!Keep this workspace loaded*",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 37,
-      "column": 14
-    },
-    "end": {
-      "line": 40,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.form.keepLoadedInfo",
-    "defaultMessage": "!!!*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 41,
-      "column": 18
-    },
-    "end": {
-      "line": 45,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.form.servicesInWorkspaceHeadline",
-    "defaultMessage": "!!!Services in this Workspace",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 46,
-      "column": 31
-    },
-    "end": {
-      "line": 49,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.noServicesAdded",
-    "defaultMessage": "!!!Start by adding a service.",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 50,
-      "column": 19
-    },
-    "end": {
-      "line": 53,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.discoverServices",
-    "defaultMessage": "!!!Discover services",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 54,
-      "column": 20
-    },
-    "end": {
-      "line": 57,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
deleted file mode 100644
index 431f12710..000000000
--- a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "workspaceDrawer.headline",
-    "defaultMessage": "!!!Workspaces",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.allServices",
-    "defaultMessage": "!!!All services",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 19,
-      "column": 15
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.workspacesSettingsTooltip",
-    "defaultMessage": "!!!Workspaces settings",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 23,
-      "column": 29
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.workspaceFeatureInfo",
-    "defaultMessage": "!!!Info about workspace feature",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 27,
-      "column": 24
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.addNewWorkspaceLabel",
-    "defaultMessage": "!!!add new workspace",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 31,
-      "column": 24
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawerItem.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawerItem.json
deleted file mode 100644
index 737dee59b..000000000
--- a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawerItem.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "id": "workspaceDrawer.item.noServicesAddedYet",
-    "defaultMessage": "!!!No services added yet",
-    "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
-    "start": {
-      "line": 11,
-      "column": 22
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.item.contextMenuEdit",
-    "defaultMessage": "!!!edit",
-    "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
-    "start": {
-      "line": 15,
-      "column": 19
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceSwitchingIndicator.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceSwitchingIndicator.json
deleted file mode 100644
index 4f3e6d55c..000000000
--- a/src/i18n/messages/src/features/workspaces/components/WorkspaceSwitchingIndicator.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "workspaces.switchingIndicator.switchingTo",
-    "defaultMessage": "!!!Switching to",
-    "file": "src/features/workspaces/components/WorkspaceSwitchingIndicator.js",
-    "start": {
-      "line": 12,
-      "column": 15
-    },
-    "end": {
-      "line": 15,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
deleted file mode 100644
index 39c9c30fb..000000000
--- a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
+++ /dev/null
@@ -1,106 +0,0 @@
-[
-  {
-    "id": "settings.workspaces.headline",
-    "defaultMessage": "!!!Your workspaces",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 17,
-      "column": 12
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.noWorkspacesAdded",
-    "defaultMessage": "!!!You haven't created any workspaces yet.",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 21,
-      "column": 19
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.workspacesRequestFailed",
-    "defaultMessage": "!!!Could not load your workspaces",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 25,
-      "column": 27
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.tryReloadWorkspaces",
-    "defaultMessage": "!!!Try again",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 29,
-      "column": 23
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.updatedInfo",
-    "defaultMessage": "!!!Your changes have been saved",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 33,
-      "column": 15
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.deletedInfo",
-    "defaultMessage": "!!!Workspace has been deleted",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 37,
-      "column": 15
-    },
-    "end": {
-      "line": 40,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.workspaceFeatureInfo",
-    "defaultMessage": "!!!Info about workspace feature",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 41,
-      "column": 24
-    },
-    "end": {
-      "line": 44,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.workspaceFeatureHeadline",
-    "defaultMessage": "!!!Less is More: Introducing Ferdi Workspaces",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 45,
-      "column": 28
-    },
-    "end": {
-      "line": 48,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/helpers/validation-helpers.json b/src/i18n/messages/src/helpers/validation-helpers.json
deleted file mode 100644
index 6be1d33e9..000000000
--- a/src/i18n/messages/src/helpers/validation-helpers.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "validation.required",
-    "defaultMessage": "!!!Field is required",
-    "file": "src/helpers/validation-helpers.js",
-    "start": {
-      "line": 5,
-      "column": 12
-    },
-    "end": {
-      "line": 8,
-      "column": 3
-    }
-  },
-  {
-    "id": "validation.email",
-    "defaultMessage": "!!!Email not valid",
-    "file": "src/helpers/validation-helpers.js",
-    "start": {
-      "line": 9,
-      "column": 9
-    },
-    "end": {
-      "line": 12,
-      "column": 3
-    }
-  },
-  {
-    "id": "validation.url",
-    "defaultMessage": "!!!Not a valid URL",
-    "file": "src/helpers/validation-helpers.js",
-    "start": {
-      "line": 13,
-      "column": 7
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "validation.minLength",
-    "defaultMessage": "!!!Too few characters",
-    "file": "src/helpers/validation-helpers.js",
-    "start": {
-      "line": 17,
-      "column": 13
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "validation.oneRequired",
-    "defaultMessage": "!!!At least one is required",
-    "file": "src/helpers/validation-helpers.js",
-    "start": {
-      "line": 21,
-      "column": 15
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/i18n/globalMessages.json b/src/i18n/messages/src/i18n/globalMessages.json
deleted file mode 100644
index bc1ec7397..000000000
--- a/src/i18n/messages/src/i18n/globalMessages.json
+++ /dev/null
@@ -1,236 +0,0 @@
-[
-  {
-    "id": "global.api.unhealthy",
-    "defaultMessage": "!!!Can't connect to Ferdi Online Services",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 4,
-      "column": 16
-    },
-    "end": {
-      "line": 7,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.notConnectedToTheInternet",
-    "defaultMessage": "!!!You are not connected to the internet.",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 8,
-      "column": 29
-    },
-    "end": {
-      "line": 11,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.spellchecking.language",
-    "defaultMessage": "!!!Spell checking language",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 12,
-      "column": 24
-    },
-    "end": {
-      "line": 15,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.spellchecker.useDefault",
-    "defaultMessage": "!!!Use System Default ({default})",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 16,
-      "column": 29
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.spellchecking.autodetect",
-    "defaultMessage": "!!!Detect language automatically",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 20,
-      "column": 34
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.spellchecking.autodetect.short",
-    "defaultMessage": "!!!Automatic",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 24,
-      "column": 39
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.userAgentPref",
-    "defaultMessage": "!!!User Agent",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 28,
-      "column": 17
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.userAgentHelp",
-    "defaultMessage": "!!!Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 32,
-      "column": 17
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.yes",
-    "defaultMessage": "!!!Yes",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 36,
-      "column": 7
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.no",
-    "defaultMessage": "!!!No",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 40,
-      "column": 6
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.ok",
-    "defaultMessage": "!!!Ok",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 44,
-      "column": 6
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.cancel",
-    "defaultMessage": "!!!Cancel",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 48,
-      "column": 10
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.save",
-    "defaultMessage": "!!!Save",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 52,
-      "column": 8
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.submit",
-    "defaultMessage": "!!!Submit",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 56,
-      "column": 10
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.quit",
-    "defaultMessage": "!!!Quit",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 60,
-      "column": 8
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.quitConfirmation",
-    "defaultMessage": "!!!Do you really want to quit Ferdi?",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 64,
-      "column": 20
-    },
-    "end": {
-      "line": 68,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.settings",
-    "defaultMessage": "!!!Settings",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 69,
-      "column": 12
-    },
-    "end": {
-      "line": 72,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.edit",
-    "defaultMessage": "!!!Edit",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 73,
-      "column": 8
-    },
-    "end": {
-      "line": 76,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
deleted file mode 100644
index 35f2e3b7b..000000000
--- a/src/i18n/messages/src/lib/Menu.json
+++ /dev/null
@@ -1,912 +0,0 @@
-[
-  {
-    "id": "menu.edit",
-    "defaultMessage": "!!!Edit",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 32,
-      "column": 8
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.undo",
-    "defaultMessage": "!!!Undo",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 36,
-      "column": 8
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.redo",
-    "defaultMessage": "!!!Redo",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 40,
-      "column": 8
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.cut",
-    "defaultMessage": "!!!Cut",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 44,
-      "column": 7
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.copy",
-    "defaultMessage": "!!!Copy",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 48,
-      "column": 8
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.paste",
-    "defaultMessage": "!!!Paste",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 52,
-      "column": 9
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.pasteAndMatchStyle",
-    "defaultMessage": "!!!Paste And Match Style",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 56,
-      "column": 22
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.delete",
-    "defaultMessage": "!!!Delete",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 60,
-      "column": 10
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.selectAll",
-    "defaultMessage": "!!!Select All",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 64,
-      "column": 13
-    },
-    "end": {
-      "line": 67,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.findInPage",
-    "defaultMessage": "!!!Find in Page",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 68,
-      "column": 14
-    },
-    "end": {
-      "line": 71,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.speech",
-    "defaultMessage": "!!!Speech",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 72,
-      "column": 10
-    },
-    "end": {
-      "line": 75,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.startSpeaking",
-    "defaultMessage": "!!!Start Speaking",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 76,
-      "column": 17
-    },
-    "end": {
-      "line": 79,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.stopSpeaking",
-    "defaultMessage": "!!!Stop Speaking",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 80,
-      "column": 16
-    },
-    "end": {
-      "line": 83,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.startDictation",
-    "defaultMessage": "!!!Start Dictation",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 84,
-      "column": 18
-    },
-    "end": {
-      "line": 87,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.emojiSymbols",
-    "defaultMessage": "!!!Emoji & Symbols",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 88,
-      "column": 16
-    },
-    "end": {
-      "line": 91,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.openQuickSwitch",
-    "defaultMessage": "!!!Open Quick Switch",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 92,
-      "column": 19
-    },
-    "end": {
-      "line": 95,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.back",
-    "defaultMessage": "!!!Back",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 96,
-      "column": 8
-    },
-    "end": {
-      "line": 99,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.forward",
-    "defaultMessage": "!!!Forward",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 100,
-      "column": 11
-    },
-    "end": {
-      "line": 103,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.resetZoom",
-    "defaultMessage": "!!!Actual Size",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 104,
-      "column": 13
-    },
-    "end": {
-      "line": 107,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.zoomIn",
-    "defaultMessage": "!!!Zoom In",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 108,
-      "column": 10
-    },
-    "end": {
-      "line": 111,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.zoomOut",
-    "defaultMessage": "!!!Zoom Out",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 112,
-      "column": 11
-    },
-    "end": {
-      "line": 115,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.toggleFullScreen",
-    "defaultMessage": "!!!Toggle Full Screen",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 116,
-      "column": 20
-    },
-    "end": {
-      "line": 119,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.toggleDarkMode",
-    "defaultMessage": "!!!Toggle Dark Mode",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 120,
-      "column": 18
-    },
-    "end": {
-      "line": 123,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.toggleDevTools",
-    "defaultMessage": "!!!Toggle Developer Tools",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 124,
-      "column": 18
-    },
-    "end": {
-      "line": 127,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.toggleTodosDevTools",
-    "defaultMessage": "!!!Toggle Todos Developer Tools",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 128,
-      "column": 23
-    },
-    "end": {
-      "line": 131,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.toggleServiceDevTools",
-    "defaultMessage": "!!!Toggle Service Developer Tools",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 132,
-      "column": 25
-    },
-    "end": {
-      "line": 135,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.reloadService",
-    "defaultMessage": "!!!Reload Service",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 136,
-      "column": 17
-    },
-    "end": {
-      "line": 139,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.reloadFerdi",
-    "defaultMessage": "!!!Reload Ferdi",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 140,
-      "column": 15
-    },
-    "end": {
-      "line": 143,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.lockFerdi",
-    "defaultMessage": "!!!Lock Ferdi",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 144,
-      "column": 13
-    },
-    "end": {
-      "line": 147,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.reloadTodos",
-    "defaultMessage": "!!!Reload ToDos",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 148,
-      "column": 15
-    },
-    "end": {
-      "line": 151,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.window.minimize",
-    "defaultMessage": "!!!Minimize",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 152,
-      "column": 12
-    },
-    "end": {
-      "line": 155,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.window.close",
-    "defaultMessage": "!!!Close",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 156,
-      "column": 9
-    },
-    "end": {
-      "line": 159,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.learnMore",
-    "defaultMessage": "!!!Learn More",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 160,
-      "column": 13
-    },
-    "end": {
-      "line": 163,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.changelog",
-    "defaultMessage": "!!!Changelog",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 164,
-      "column": 13
-    },
-    "end": {
-      "line": 167,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.importExportData",
-    "defaultMessage": "!!!Import/Export Configuration Data",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 168,
-      "column": 20
-    },
-    "end": {
-      "line": 171,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.support",
-    "defaultMessage": "!!!Support",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 172,
-      "column": 11
-    },
-    "end": {
-      "line": 175,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.debugInfo",
-    "defaultMessage": "!!!Copy Debug Information",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 176,
-      "column": 13
-    },
-    "end": {
-      "line": 179,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.publishDebugInfo",
-    "defaultMessage": "!!!Publish Debug Information",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 180,
-      "column": 20
-    },
-    "end": {
-      "line": 183,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.debugInfoCopiedHeadline",
-    "defaultMessage": "!!!Ferdi Debug Information",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 184,
-      "column": 27
-    },
-    "end": {
-      "line": 187,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.debugInfoCopiedBody",
-    "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 188,
-      "column": 23
-    },
-    "end": {
-      "line": 192,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.touchId",
-    "defaultMessage": "!!!Unlock with Touch ID",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 193,
-      "column": 11
-    },
-    "end": {
-      "line": 196,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.touchIdPrompt",
-    "defaultMessage": "!!!unlock via Touch ID",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 197,
-      "column": 17
-    },
-    "end": {
-      "line": 200,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.tos",
-    "defaultMessage": "!!!Terms of Service",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 201,
-      "column": 7
-    },
-    "end": {
-      "line": 204,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.privacy",
-    "defaultMessage": "!!!Privacy Statement",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 205,
-      "column": 11
-    },
-    "end": {
-      "line": 208,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.file",
-    "defaultMessage": "!!!File",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 209,
-      "column": 8
-    },
-    "end": {
-      "line": 212,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view",
-    "defaultMessage": "!!!View",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 213,
-      "column": 8
-    },
-    "end": {
-      "line": 216,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.services",
-    "defaultMessage": "!!!Services",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 217,
-      "column": 12
-    },
-    "end": {
-      "line": 220,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.window",
-    "defaultMessage": "!!!Window",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 221,
-      "column": 10
-    },
-    "end": {
-      "line": 224,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help",
-    "defaultMessage": "!!!Help",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 225,
-      "column": 8
-    },
-    "end": {
-      "line": 228,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.about",
-    "defaultMessage": "!!!About Ferdi",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 229,
-      "column": 9
-    },
-    "end": {
-      "line": 232,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.checkForUpdates",
-    "defaultMessage": "!!!Check for updates",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 233,
-      "column": 19
-    },
-    "end": {
-      "line": 236,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.hide",
-    "defaultMessage": "!!!Hide",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 237,
-      "column": 8
-    },
-    "end": {
-      "line": 240,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.hideOthers",
-    "defaultMessage": "!!!Hide Others",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 241,
-      "column": 14
-    },
-    "end": {
-      "line": 244,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.unhide",
-    "defaultMessage": "!!!Unhide",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 245,
-      "column": 10
-    },
-    "end": {
-      "line": 248,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.autohideMenuBar",
-    "defaultMessage": "!!!Auto-hide menu bar",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 249,
-      "column": 19
-    },
-    "end": {
-      "line": 252,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.services.addNewService",
-    "defaultMessage": "!!!Add New Service...",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 253,
-      "column": 17
-    },
-    "end": {
-      "line": 256,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.workspaces.addNewWorkspace",
-    "defaultMessage": "!!!Add New Workspace...",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 257,
-      "column": 19
-    },
-    "end": {
-      "line": 260,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.workspaces.openWorkspaceDrawer",
-    "defaultMessage": "!!!Open workspace drawer",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 261,
-      "column": 23
-    },
-    "end": {
-      "line": 264,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.workspaces.closeWorkspaceDrawer",
-    "defaultMessage": "!!!Close workspace drawer",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 265,
-      "column": 24
-    },
-    "end": {
-      "line": 268,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.services.setNextServiceActive",
-    "defaultMessage": "!!!Activate next service...",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 269,
-      "column": 23
-    },
-    "end": {
-      "line": 272,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.services.activatePreviousService",
-    "defaultMessage": "!!!Activate previous service...",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 273,
-      "column": 27
-    },
-    "end": {
-      "line": 276,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.muteApp",
-    "defaultMessage": "!!!Disable notifications & audio",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 277,
-      "column": 11
-    },
-    "end": {
-      "line": 280,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.unmuteApp",
-    "defaultMessage": "!!!Enable notifications & audio",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 281,
-      "column": 13
-    },
-    "end": {
-      "line": 284,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.workspaces",
-    "defaultMessage": "!!!Workspaces",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 285,
-      "column": 14
-    },
-    "end": {
-      "line": 288,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.workspaces.defaultWorkspace",
-    "defaultMessage": "!!!Default",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 289,
-      "column": 20
-    },
-    "end": {
-      "line": 292,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.todos",
-    "defaultMessage": "!!!Todos",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 293,
-      "column": 9
-    },
-    "end": {
-      "line": 296,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.Todoss.openTodosDrawer",
-    "defaultMessage": "!!!Open Todos drawer",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 297,
-      "column": 19
-    },
-    "end": {
-      "line": 300,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.Todoss.closeTodosDrawer",
-    "defaultMessage": "!!!Close Todos drawer",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 301,
-      "column": 20
-    },
-    "end": {
-      "line": 304,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.todos.enableTodos",
-    "defaultMessage": "!!!Enable Todos",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 305,
-      "column": 15
-    },
-    "end": {
-      "line": 308,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.services.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 309,
-      "column": 17
-    },
-    "end": {
-      "line": 312,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 5dae56544..d7f3dbecf 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -31,284 +31,283 @@ import globalMessages from '../i18n/globalMessages';
 const menuItems = defineMessages({
   edit: {
     id: 'menu.edit',
-    defaultMessage: '!!!Edit',
+    defaultMessage: 'Edit',
   },
   undo: {
     id: 'menu.edit.undo',
-    defaultMessage: '!!!Undo',
+    defaultMessage: 'Undo',
   },
   redo: {
     id: 'menu.edit.redo',
-    defaultMessage: '!!!Redo',
+    defaultMessage: 'Redo',
   },
   cut: {
     id: 'menu.edit.cut',
-    defaultMessage: '!!!Cut',
+    defaultMessage: 'Cut',
   },
   copy: {
     id: 'menu.edit.copy',
-    defaultMessage: '!!!Copy',
+    defaultMessage: 'Copy',
   },
   paste: {
     id: 'menu.edit.paste',
-    defaultMessage: '!!!Paste',
+    defaultMessage: 'Paste',
   },
   pasteAndMatchStyle: {
     id: 'menu.edit.pasteAndMatchStyle',
-    defaultMessage: '!!!Paste And Match Style',
+    defaultMessage: 'Paste And Match Style',
   },
   delete: {
     id: 'menu.edit.delete',
-    defaultMessage: '!!!Delete',
+    defaultMessage: 'Delete',
   },
   selectAll: {
     id: 'menu.edit.selectAll',
-    defaultMessage: '!!!Select All',
+    defaultMessage: 'Select All',
   },
   findInPage: {
     id: 'menu.edit.findInPage',
-    defaultMessage: '!!!Find in Page',
+    defaultMessage: 'Find in Page',
   },
   speech: {
     id: 'menu.edit.speech',
-    defaultMessage: '!!!Speech',
+    defaultMessage: 'Speech',
   },
   startSpeaking: {
     id: 'menu.edit.startSpeaking',
-    defaultMessage: '!!!Start Speaking',
+    defaultMessage: 'Start Speaking',
   },
   stopSpeaking: {
     id: 'menu.edit.stopSpeaking',
-    defaultMessage: '!!!Stop Speaking',
+    defaultMessage: 'Stop Speaking',
   },
   startDictation: {
     id: 'menu.edit.startDictation',
-    defaultMessage: '!!!Start Dictation',
+    defaultMessage: 'Start Dictation',
   },
   emojiSymbols: {
     id: 'menu.edit.emojiSymbols',
-    defaultMessage: '!!!Emoji & Symbols',
+    defaultMessage: 'Emoji & Symbols',
   },
   openQuickSwitch: {
     id: 'menu.view.openQuickSwitch',
-    defaultMessage: '!!!Open Quick Switch',
+    defaultMessage: 'Open Quick Switch',
   },
   back: {
     id: 'menu.view.back',
-    defaultMessage: '!!!Back',
+    defaultMessage: 'Back',
   },
   forward: {
     id: 'menu.view.forward',
-    defaultMessage: '!!!Forward',
+    defaultMessage: 'Forward',
   },
   resetZoom: {
     id: 'menu.view.resetZoom',
-    defaultMessage: '!!!Actual Size',
+    defaultMessage: 'Actual Size',
   },
   zoomIn: {
     id: 'menu.view.zoomIn',
-    defaultMessage: '!!!Zoom In',
+    defaultMessage: 'Zoom In',
   },
   zoomOut: {
     id: 'menu.view.zoomOut',
-    defaultMessage: '!!!Zoom Out',
+    defaultMessage: 'Zoom Out',
   },
   toggleFullScreen: {
     id: 'menu.view.toggleFullScreen',
-    defaultMessage: '!!!Toggle Full Screen',
+    defaultMessage: 'Toggle Full Screen',
   },
   toggleDarkMode: {
     id: 'menu.view.toggleDarkMode',
-    defaultMessage: '!!!Toggle Dark Mode',
+    defaultMessage: 'Toggle Dark Mode',
   },
   toggleDevTools: {
     id: 'menu.view.toggleDevTools',
-    defaultMessage: '!!!Toggle Developer Tools',
+    defaultMessage: 'Toggle Developer Tools',
   },
   toggleTodosDevTools: {
     id: 'menu.view.toggleTodosDevTools',
-    defaultMessage: '!!!Toggle Todos Developer Tools',
+    defaultMessage: 'Toggle Todos Developer Tools',
   },
   toggleServiceDevTools: {
     id: 'menu.view.toggleServiceDevTools',
-    defaultMessage: '!!!Toggle Service Developer Tools',
+    defaultMessage: 'Toggle Service Developer Tools',
   },
   reloadService: {
     id: 'menu.view.reloadService',
-    defaultMessage: '!!!Reload Service',
+    defaultMessage: 'Reload Service',
   },
   reloadFerdi: {
     id: 'menu.view.reloadFerdi',
-    defaultMessage: '!!!Reload Ferdi',
+    defaultMessage: 'Reload Ferdi',
   },
   lockFerdi: {
     id: 'menu.view.lockFerdi',
-    defaultMessage: '!!!Lock Ferdi',
+    defaultMessage: 'Lock Ferdi',
   },
   reloadTodos: {
     id: 'menu.view.reloadTodos',
-    defaultMessage: '!!!Reload ToDos',
+    defaultMessage: 'Reload ToDos',
   },
   minimize: {
     id: 'menu.window.minimize',
-    defaultMessage: '!!!Minimize',
+    defaultMessage: 'Minimize',
   },
   close: {
     id: 'menu.window.close',
-    defaultMessage: '!!!Close',
+    defaultMessage: 'Close',
   },
   learnMore: {
     id: 'menu.help.learnMore',
-    defaultMessage: '!!!Learn More',
+    defaultMessage: 'Learn More',
   },
   changelog: {
     id: 'menu.help.changelog',
-    defaultMessage: '!!!Changelog',
+    defaultMessage: 'Changelog',
   },
   importExportData: {
     id: 'menu.help.importExportData',
-    defaultMessage: '!!!Import/Export Configuration Data',
+    defaultMessage: 'Import/Export Configuration Data',
   },
   support: {
     id: 'menu.help.support',
-    defaultMessage: '!!!Support',
+    defaultMessage: 'Support',
   },
   debugInfo: {
     id: 'menu.help.debugInfo',
-    defaultMessage: '!!!Copy Debug Information',
+    defaultMessage: 'Copy Debug Information',
   },
   publishDebugInfo: {
     id: 'menu.help.publishDebugInfo',
-    defaultMessage: '!!!Publish Debug Information',
+    defaultMessage: 'Publish Debug Information',
   },
   debugInfoCopiedHeadline: {
     id: 'menu.help.debugInfoCopiedHeadline',
-    defaultMessage: '!!!Ferdi Debug Information',
+    defaultMessage: 'Ferdi Debug Information',
   },
   debugInfoCopiedBody: {
     id: 'menu.help.debugInfoCopiedBody',
-    defaultMessage:
-      '!!!Your Debug Information has been copied to your clipboard.',
+    defaultMessage: 'Your Debug Information has been copied to your clipboard.',
   },
   touchId: {
     id: 'locked.touchId',
-    defaultMessage: '!!!Unlock with Touch ID',
+    defaultMessage: 'Unlock with Touch ID',
   },
   touchIdPrompt: {
     id: 'locked.touchIdPrompt',
-    defaultMessage: '!!!unlock via Touch ID',
+    defaultMessage: 'unlock via Touch ID',
   },
   tos: {
     id: 'menu.help.tos',
-    defaultMessage: '!!!Terms of Service',
+    defaultMessage: 'Terms of Service',
   },
   privacy: {
     id: 'menu.help.privacy',
-    defaultMessage: '!!!Privacy Statement',
+    defaultMessage: 'Privacy Statement',
   },
   file: {
     id: 'menu.file',
-    defaultMessage: '!!!File',
+    defaultMessage: 'File',
   },
   view: {
     id: 'menu.view',
-    defaultMessage: '!!!View',
+    defaultMessage: 'View',
   },
   services: {
     id: 'menu.services',
-    defaultMessage: '!!!Services',
+    defaultMessage: 'Services',
   },
   window: {
     id: 'menu.window',
-    defaultMessage: '!!!Window',
+    defaultMessage: 'Window',
   },
   help: {
     id: 'menu.help',
-    defaultMessage: '!!!Help',
+    defaultMessage: 'Help',
   },
   about: {
     id: 'menu.app.about',
-    defaultMessage: '!!!About Ferdi',
+    defaultMessage: 'About Ferdi',
   },
   checkForUpdates: {
     id: 'menu.app.checkForUpdates',
-    defaultMessage: '!!!Check for updates',
+    defaultMessage: 'Check for updates',
   },
   hide: {
     id: 'menu.app.hide',
-    defaultMessage: '!!!Hide',
+    defaultMessage: 'Hide',
   },
   hideOthers: {
     id: 'menu.app.hideOthers',
-    defaultMessage: '!!!Hide Others',
+    defaultMessage: 'Hide Others',
   },
   unhide: {
     id: 'menu.app.unhide',
-    defaultMessage: '!!!Unhide',
+    defaultMessage: 'Unhide',
   },
   autohideMenuBar: {
     id: 'menu.app.autohideMenuBar',
-    defaultMessage: '!!!Auto-hide menu bar',
+    defaultMessage: 'Auto-hide menu bar',
   },
   addNewService: {
     id: 'menu.services.addNewService',
-    defaultMessage: '!!!Add New Service...',
+    defaultMessage: 'Add New Service...',
   },
   addNewWorkspace: {
     id: 'menu.workspaces.addNewWorkspace',
-    defaultMessage: '!!!Add New Workspace...',
+    defaultMessage: 'Add New Workspace...',
   },
   openWorkspaceDrawer: {
     id: 'menu.workspaces.openWorkspaceDrawer',
-    defaultMessage: '!!!Open workspace drawer',
+    defaultMessage: 'Open workspace drawer',
   },
   closeWorkspaceDrawer: {
     id: 'menu.workspaces.closeWorkspaceDrawer',
-    defaultMessage: '!!!Close workspace drawer',
+    defaultMessage: 'Close workspace drawer',
   },
   activateNextService: {
     id: 'menu.services.setNextServiceActive',
-    defaultMessage: '!!!Activate next service...',
+    defaultMessage: 'Activate next service...',
   },
   activatePreviousService: {
     id: 'menu.services.activatePreviousService',
-    defaultMessage: '!!!Activate previous service...',
+    defaultMessage: 'Activate previous service...',
   },
   muteApp: {
     id: 'sidebar.muteApp',
-    defaultMessage: '!!!Disable notifications & audio',
+    defaultMessage: 'Disable notifications & audio',
   },
   unmuteApp: {
     id: 'sidebar.unmuteApp',
-    defaultMessage: '!!!Enable notifications & audio',
+    defaultMessage: 'Enable notifications & audio',
   },
   workspaces: {
     id: 'menu.workspaces',
-    defaultMessage: '!!!Workspaces',
+    defaultMessage: 'Workspaces',
   },
   defaultWorkspace: {
     id: 'menu.workspaces.defaultWorkspace',
-    defaultMessage: '!!!Default',
+    defaultMessage: 'Default',
   },
   todos: {
     id: 'menu.todos',
-    defaultMessage: '!!!Todos',
+    defaultMessage: 'Todos',
   },
   openTodosDrawer: {
     id: 'menu.Todoss.openTodosDrawer',
-    defaultMessage: '!!!Open Todos drawer',
+    defaultMessage: 'Open Todos drawer',
   },
   closeTodosDrawer: {
     id: 'menu.Todoss.closeTodosDrawer',
-    defaultMessage: '!!!Close Todos drawer',
+    defaultMessage: 'Close Todos drawer',
   },
   enableTodos: {
     id: 'menu.todos.enableTodos',
-    defaultMessage: '!!!Enable Todos',
+    defaultMessage: 'Enable Todos',
   },
   serviceGoHome: {
     id: 'menu.services.goHome',
-    defaultMessage: '!!!Home',
+    defaultMessage: 'Home',
   },
 });
 
@@ -557,7 +556,7 @@ const _titleBarTemplateFactory = (intl, locked) => [
   },
 ];
 
-export default class FranzMenu {
+class FranzMenu {
   @observable currentTemplate = [];
 
   constructor(stores, actions) {
@@ -1126,3 +1125,5 @@ export default class FranzMenu {
     return name;
   }
 }
+
+export default FranzMenu;
diff --git a/src/routes.js b/src/routes.js
index 4d32a59e0..502ea86f5 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -30,7 +30,6 @@ import { WORKSPACES_ROUTES } from './features/workspaces/constants';
 
 import SettingsStore from './stores/SettingsStore';
 
-export default
 @inject('stores', 'actions')
 @observer
 class Routes extends Component {
@@ -95,3 +94,5 @@ Routes.wrappedComponent.propTypes = {
   }).isRequired,
   history: PropTypes.any.isRequired,
 };
+
+export default Routes;