Merge branch 'develop' into feature/service-limit

78 files changed, 1471 insertions, 794 deletions

diff --git a/.travis.yml b/.travis.yml
index 3be759099..c7e2c714c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ cache: npm
 notifications:
   email: false
   slack:
-    secure: NjEDG+6YvJvFNwRT8t8XyVR145m+Pb1pmYgdBeuhqtJbMAr0IOb0lLLW9ixKEsL1NU+0R58QGiG9qqY+lLnMNpDYjzluFo0gQtl2NJrULT4xUFDSu65XTwoutKyvj+hoCsHiwrSrO2dHTx3ZK2vsSueg+8jM/xss7dTLA6BcTYl14wTOU37PqFQZk9JYR+Dfq1Jjhy/mq4BiAsb/1clNIulkjmRjSm6R0XT4ZsZZfj0ifXhL4cLGsUv2n+iePiX6bLwZPFjXV1COYTBafbCu17gw3nRMdNMMTDLbwrXXdJZFS/EjFOPgOhwF7CkZ3kSpB2ZIcAJxG7iAUl5j+jHBXc5dafRbjzE4oYve1vPexLoV3NjV76uANUFkcli6eHYD0uJoUJGBRbRGWp+8Bbw9EcBsn4s3vbf5XqHX3S46zvGgqX+LyhyMJQtEG/iv+9XOsOql18ryyejij0z1K7DxpI0gLV1ATZCphY1Fyz1yZDGlYN4ej/Rl2P1Q3yXilweJRF7Ts04w4U9iuP1u598/w++CKSu4q4EeEuqT/hIeFQUKUkwCEsO4xa39vhLPaxKrG9UEUH8OXN+NPZyTAK/LKuIX7C56O1kwvWNMWlPmTcvsq2RghvNTwgSGUIO0EKZKrQYAEG3Y/veSt5CgZoNzLgc/6Xj+g7daxUo9heLy26A=
+    secure: GMiD9uhGUNkJbasOMvfUmQx/SKG8wd/MC4IPtiZZnlLkiN6eJQnV3p9OeMaiSCcq19gQ65z898h55PXwFX5pFqmGMQF0zdA3VXlVh7wrUU/Z8cYxCBaZTIOgNwtrteT9V9easV/5BuUGLHVgAFYEhS5tJDu2GU4UKdm6mko4YyxKHdsCsvkRpv+zpFF1a+G2ZUwWHDhTZsBJbx7SW7xzPKYI+vq+bNnbyC6p0kpeTehf29A8CoIgQlDctzk4aOHkj35WHIiKS5yzr/nb8oY/B6vCdfFHCrCkZxQrxPEagyYTfEusWwQRJ4rvwt8dgBO1A3ckO+AC1MEAYRYHgQMI5K86tcQ7/su5iOhu9NDbZ/BfriaTDlrurKMWPhZ/RVnFUT4tn7XVVcMxz6/FYFDYIDSHEn5E20a7qV1ixF7XKoJU6eOfo3qZ7euxiZIbDbHBH+Y2ZmzUGfrQ7DFlefMEM/6Laa0jNGOSvfc6mvk1x63bVTT5KfYEX4ztXnBY77haG4/h5bIHyNDzLsZ5vxXbvmHZb6ToMVn9UT6HS0sZQ/B4bghJbdZuOrPFlz8UNRpwoBS4HpLUndhYCo0ppxd3yCd5gqEhIJzEiJNoMq+LA9/iheLbWlJVdjP2WRQ2/m9VCSxnivTdNhnp6lSATiXAgq2WN2LGhTSGtXgqtcYGXhk=
 
 deploy:
   provider: s3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7a93f2b3..e1fe2ab45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,32 @@
+# [5.2.0-beta.2](https://github.com/meetfranz/franz/compare/v5.2.0-beta.1...v5.2.0-beta.2) (2019-06-12)
+
+
+### Bug Fixes
+
+* **Recipes:** Fix recipe install when directly accessing recipe ([eba50bc](https://github.com/meetfranz/franz/commit/eba50bc))
+
+
+
+# [5.2.0-beta.1](https://github.com/meetfranz/franz/compare/v5.1.0...v5.2.0-beta.1) (2019-06-11)
+
+
+### Bug Fixes
+
+* **Workspaces:** Service reordering within workspaces ([17f3a22](https://github.com/meetfranz/franz/commit/17f3a22))
+* **Proxy:** Fix issue with proxy authentication ([b9e5b23](https://github.com/meetfranz/franz/commit/b9e5b23))
+* **Announcements:** Fixes issue with rendering announcements in workspaces ([1e38ec5](https://github.com/meetfranz/franz/commit/1e38ec5))
+* **Windows:** Add Workspaces menu & fix Window menu ([92a61d4](https://github.com/meetfranz/franz/commit/92a61d4))
+* **Windows:** Replace tray icon with high-res version ([a5eb399](https://github.com/meetfranz/franz/commit/a5eb399))
+* **App:** Improved email validation ([dd8ddcc](https://github.com/meetfranz/franz/commit/dd8ddcc)) ([@Snuggle](https://github.com/Snuggle))
+
+
+### General
+
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+* **App:** Update electron to 5.0.2 ([5828062](https://github.com/meetfranz/franz/commit/5828062))
+
+
+
 # [5.1.0](https://github.com/meetfranz/franz/compare/v5.1.0...v5.1.0-beta.1) (2019-04-16)
 
 ### Features
diff --git a/appveyor.yml b/appveyor.yml
index 77c25df7e..1dd0dbd92 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,6 +5,7 @@ environment:
     secure: NEYFWgUIAB//y2GR4AJOaegwuNjkxyNsdDf5A40dYovebTUsnIB5k4GCbU3I6JKW9iwH2ldU7Z+QawfyFerNgw==
   CSC_KEY_PASSWORD:
     secure: t8ypNTPKTmvRfd3hHA4aMOtC5KOFqOw3AsKhpU7140Q=
+  APPVEYOR_CACHE_SKIP_RESTORE: true
 
 version: 5.0.1.{build}
 
@@ -25,7 +26,7 @@ build_script:
 notifications:
   - provider: Slack
     incoming_webhook:
-      secure: 2NnhP/L7Jk9PDE0JvdNnYVBnmDHFRWHmTQBQ1492ZQ5O0Ok/97FAbk/FbGZVEalli8xcaPkVu3jiOD7IPVvHLKUrmyvficRgmL+qf4lhD1s=
+      secure: 2NnhP/L7Jk9PDE0JvdNnYVBnmDHFRWHmTQBQ1492ZQ7TpD2xQ/cXi3+G1Spr8zN5O8H+MQi4oMn3Ih2w0e8ZkHgQw138jvK/OfZO+FlF/mI=
 
 artifacts:
   - path: out\*.exe
diff --git a/package-lock.json b/package-lock.json
index cd43fcda6..77575ad56 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "franz",
-  "version": "5.0.1",
+  "version": "5.2.0-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -932,12 +932,19 @@
       }
     },
     "@babel/polyfill": {
-      "version": "7.2.5",
-      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.2.5.tgz",
-      "integrity": "sha512-8Y/t3MWThtMLYr0YNC/Q76tqN1w30+b0uQMeFUYauG2UGTR19zyUtFrAzT23zNtBxPp+LbE5E/nwV/q/r3y6ug==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.4.tgz",
+      "integrity": "sha512-WlthFLfhQQhh+A2Gn5NSFl0Huxz36x86Jn+E9OW7ibK8edKPq+KLy4apM1yDpQ8kJOVi1OVjpP4vSDLdrI04dg==",
       "requires": {
-        "core-js": "^2.5.7",
-        "regenerator-runtime": "^0.12.0"
+        "core-js": "^2.6.5",
+        "regenerator-runtime": "^0.13.2"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz",
+          "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A=="
+        }
       }
     },
     "@babel/preset-env": {
@@ -1020,11 +1027,11 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.1.tgz",
-      "integrity": "sha512-7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA==",
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz",
+      "integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==",
       "requires": {
-        "regenerator-runtime": "^0.12.0"
+        "regenerator-runtime": "^0.13.2"
       }
     },
     "@babel/template": {
@@ -2169,6 +2176,15 @@
         "@meetfranz/theme": "^1.0.13",
         "react-html-attributes": "^1.4.3",
         "react-loader": "^2.4.5"
+      },
+      "dependencies": {
+        "@meetfranz/theme": {
+          "version": "1.0.13",
+          "bundled": true,
+          "requires": {
+            "color": "^3.1.0"
+          }
+        }
       }
     },
     "@meetfranz/theme": {
@@ -2184,6 +2200,15 @@
         "@mdi/react": "^1.1.0",
         "@meetfranz/theme": "^1.0.13",
         "react-loader": "^2.4.5"
+      },
+      "dependencies": {
+        "@meetfranz/theme": {
+          "version": "1.0.13",
+          "bundled": true,
+          "requires": {
+            "color": "^3.1.0"
+          }
+        }
       }
     },
     "@mrmlnc/readdir-enhanced": {
@@ -2830,52 +2855,67 @@
       }
     },
     "app-builder-bin": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.6.1.tgz",
-      "integrity": "sha512-W0l85O+s6lOaziWqAhszPfwiG0s15FvMBP9j9i/bknsMccUkwN60u4Cy7yYtf6akCUDuJenLqpTX4/xvkq1egw==",
+      "version": "2.6.6",
+      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.6.6.tgz",
+      "integrity": "sha512-G0Ee6xkbxV+fvM/7xXWIgSDjWAD4E/d/aNbxerq/TVsCyBIau/0VPmrEqBMyZv0NbTwLDW5aF/yHG+0ZEY77kA==",
       "dev": true
     },
     "app-builder-lib": {
-      "version": "20.38.4",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.38.4.tgz",
-      "integrity": "sha512-JbuAJQBndcCW6BJVIb2tPjM5wiuIjz2LUlbyVxNIawM2wFKUBV9kr0N3RNBJFxcrCEuA9oprMUCoymJdrMUVfA==",
+      "version": "20.40.2",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.40.2.tgz",
+      "integrity": "sha512-SAbfua8+L3pFbQp3QFpKV0PzHJPJqepROeX/FPrfdL02zxlw+BVOe6KfC3+UV6XUombWvVPG+SwG956vfIx/Cw==",
       "dev": true,
       "requires": {
         "7zip-bin": "~4.1.0",
-        "app-builder-bin": "2.6.1",
+        "app-builder-bin": "2.6.6",
         "async-exit-hook": "^2.0.1",
-        "bluebird-lst": "^1.0.6",
-        "builder-util": "9.6.1",
-        "builder-util-runtime": "8.1.0",
+        "bluebird-lst": "^1.0.7",
+        "builder-util": "9.7.1",
+        "builder-util-runtime": "8.2.1",
         "chromium-pickle-js": "^0.2.0",
-        "debug": "^4.1.0",
+        "debug": "^4.1.1",
         "ejs": "^2.6.1",
         "electron-osx-sign": "0.4.11",
-        "electron-publish": "20.38.3",
-        "fs-extra-p": "^7.0.0",
+        "electron-publish": "20.40.0",
+        "fs-extra-p": "^7.0.1",
         "hosted-git-info": "^2.7.1",
         "is-ci": "^2.0.0",
-        "isbinaryfile": "^3.0.3",
-        "js-yaml": "^3.12.0",
-        "lazy-val": "^1.0.3",
+        "isbinaryfile": "^4.0.0",
+        "js-yaml": "^3.13.0",
+        "lazy-val": "^1.0.4",
         "minimatch": "^3.0.4",
-        "normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
         "plist": "^3.0.1",
-        "read-config-file": "3.2.0",
+        "read-config-file": "3.2.2",
         "sanitize-filename": "^1.6.1",
-        "semver": "^5.6.0",
+        "semver": "^6.0.0",
         "temp-file": "^3.3.2"
       },
       "dependencies": {
+        "bluebird": {
+          "version": "3.5.4",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
+          "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==",
+          "dev": true
+        },
+        "bluebird-lst": {
+          "version": "1.0.8",
+          "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.8.tgz",
+          "integrity": "sha512-InUDOaBaIjIobOa3O4YRAbFgff907uTJZXW0m0rhk3zhVZ4GvsmdCLEAKC1CTWTtUWCM8iWTTfFX9N/xQR/etw==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.4"
+          }
+        },
         "builder-util-runtime": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.1.0.tgz",
-          "integrity": "sha512-s1mlJ28mv+56Iebh6c9aXjVe11O3Z0cDTwAGeB0PCcUzHA37fDxGgS8ZGoYNMZP+rBHj21d/od1wuYofTVLaQg==",
+          "version": "8.2.1",
+          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.1.tgz",
+          "integrity": "sha512-2TkeTcI9bDlK5azRZSJJNxhAgW1DK+JY3jHK0UWPxgJcan4GZSVDNNO3sXntNxrp+JAdPHMF14rzNd/G53lvqw==",
           "dev": true,
           "requires": {
-            "bluebird-lst": "^1.0.6",
-            "debug": "^4.1.0",
-            "fs-extra-p": "^7.0.0",
+            "bluebird-lst": "^1.0.7",
+            "debug": "^4.1.1",
+            "fs-extra-p": "^7.0.1",
             "sax": "^1.2.4"
           }
         },
@@ -2888,10 +2928,36 @@
             "ms": "^2.1.1"
           }
         },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+        "fs-extra-p": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-7.0.1.tgz",
+          "integrity": "sha512-yhd2OV0HnHt2oitlp+X9hl2ReX4X/7kQeL7/72qzPHTZj5eUPGzAKOvEglU02Fa1OeG2rSy/aKB4WGVaLiF8tw==",
+          "dev": true,
+          "requires": {
+            "bluebird-lst": "^1.0.7",
+            "fs-extra": "^7.0.1"
+          }
+        },
+        "js-yaml": {
+          "version": "3.13.1",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+          "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+          "dev": true,
+          "requires": {
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
+          }
+        },
+        "lazy-val": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.4.tgz",
+          "integrity": "sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.0.tgz",
+          "integrity": "sha512-kCqEOOHoBcFs/2Ccuk4Xarm/KiWRSLEX9CAZF8xkJ6ZPlIoTZ8V5f7J16vYLJqDbR7KrxTJpR2lqjIEm2Qx9cQ==",
           "dev": true
         }
       }
@@ -3688,9 +3754,9 @@
       "dev": true
     },
     "bindings": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.4.0.tgz",
-      "integrity": "sha512-7znEVX22Djn+nYjxCWKDne0RRloa9XfYa84yk3s+HkE3LpDYZmhArYr9O9huBoHY3/oXispx5LorIX7Sl2CgSQ==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
       "requires": {
         "file-uri-to-path": "1.0.0"
       }
@@ -4068,25 +4134,52 @@
       "dev": true
     },
     "builder-util": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-9.6.1.tgz",
-      "integrity": "sha512-8MljKTjeV+A+LLVexuWEV3EpWbiUcsHHrB4Bg2qNo/3dC+vTo6g/27+W3Ij7Ij1UTobSkNBstFieWijXJCco9A==",
+      "version": "9.7.1",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-9.7.1.tgz",
+      "integrity": "sha512-txpzYIeuHFjrOQWPTJDvhJYisIVGJdSG9ppccE+y7agT0YNhBlVHGnd8+HgFTajYE34xzB5zf1/zxiiDqSKSpA==",
       "dev": true,
       "requires": {
         "7zip-bin": "~4.1.0",
-        "app-builder-bin": "2.6.1",
-        "bluebird-lst": "^1.0.6",
-        "builder-util-runtime": "^8.1.0",
-        "chalk": "^2.4.1",
-        "debug": "^4.1.0",
-        "fs-extra-p": "^7.0.0",
+        "app-builder-bin": "2.6.6",
+        "bluebird-lst": "^1.0.7",
+        "builder-util-runtime": "^8.2.1",
+        "chalk": "^2.4.2",
+        "debug": "^4.1.1",
+        "fs-extra-p": "^7.0.1",
         "is-ci": "^2.0.0",
-        "js-yaml": "^3.12.0",
-        "source-map-support": "^0.5.9",
-        "stat-mode": "^0.2.2",
+        "js-yaml": "^3.13.0",
+        "source-map-support": "^0.5.11",
+        "stat-mode": "^0.3.0",
         "temp-file": "^3.3.2"
       },
       "dependencies": {
+        "bluebird": {
+          "version": "3.5.4",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
+          "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==",
+          "dev": true
+        },
+        "bluebird-lst": {
+          "version": "1.0.8",
+          "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.8.tgz",
+          "integrity": "sha512-InUDOaBaIjIobOa3O4YRAbFgff907uTJZXW0m0rhk3zhVZ4GvsmdCLEAKC1CTWTtUWCM8iWTTfFX9N/xQR/etw==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.4"
+          }
+        },
+        "builder-util-runtime": {
+          "version": "8.2.2",
+          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.2.tgz",
+          "integrity": "sha512-Z0NKlpa5VQBMVXAcZH9n4dx+CY5Ckyv7a0Yr/is1h5hwCWaJbQ2JN9PGT7g6YzE5gM3FyrgGDB4DTyJlLcRKNw==",
+          "dev": true,
+          "requires": {
+            "bluebird-lst": "^1.0.7",
+            "debug": "^4.1.1",
+            "fs-extra-p": "^7.0.1",
+            "sax": "^1.2.4"
+          }
+        },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -4096,11 +4189,35 @@
             "ms": "^2.1.1"
           }
         },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
+        "fs-extra-p": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-7.0.1.tgz",
+          "integrity": "sha512-yhd2OV0HnHt2oitlp+X9hl2ReX4X/7kQeL7/72qzPHTZj5eUPGzAKOvEglU02Fa1OeG2rSy/aKB4WGVaLiF8tw==",
+          "dev": true,
+          "requires": {
+            "bluebird-lst": "^1.0.7",
+            "fs-extra": "^7.0.1"
+          }
+        },
+        "js-yaml": {
+          "version": "3.13.1",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+          "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+          "dev": true,
+          "requires": {
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
+          }
+        },
+        "source-map-support": {
+          "version": "0.5.12",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
+          "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
+          }
         }
       }
     },
@@ -4503,9 +4620,9 @@
       }
     },
     "cli-spinners": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz",
-      "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.1.0.tgz",
+      "integrity": "sha512-8B00fJOEh1HPrx4fo5eW16XmE1PcL1tGpGrxy63CXGP9nHdPBN63X75hA1zhvQuhVztJWLqV58Roj2qlNM7cAA==",
       "dev": true
     },
     "cli-table3": {
@@ -5969,19 +6086,56 @@
       }
     },
     "dmg-builder": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.5.3.tgz",
-      "integrity": "sha512-ZNl4GFBg6rdFplnuoK56iftxh/qgM7rXJUxgl21eK4WsjxgQwtQ0REZo+pDSL4OzVeyOO8MMNWSNQcCsBLiDyA==",
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.6.1.tgz",
+      "integrity": "sha512-aIbpQG3es+gHTFtsBQE4fmSYVM60yewxJZsN6FhkAmAmNaoO45bEQNJZsRX0YE49+imiSC92mJmFAEP6iKE0Tg==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "~20.38.3",
-        "bluebird-lst": "^1.0.6",
-        "builder-util": "~9.6.0",
-        "fs-extra-p": "^7.0.0",
+        "app-builder-lib": "~20.40.0",
+        "bluebird-lst": "^1.0.7",
+        "builder-util": "~9.7.1",
+        "fs-extra-p": "^7.0.1",
         "iconv-lite": "^0.4.24",
-        "js-yaml": "^3.12.0",
+        "js-yaml": "^3.13.0",
         "parse-color": "^1.0.0",
         "sanitize-filename": "^1.6.1"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.5.4",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
+          "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==",
+          "dev": true
+        },
+        "bluebird-lst": {
+          "version": "1.0.8",
+          "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.8.tgz",
+          "integrity": "sha512-InUDOaBaIjIobOa3O4YRAbFgff907uTJZXW0m0rhk3zhVZ4GvsmdCLEAKC1CTWTtUWCM8iWTTfFX9N/xQR/etw==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.4"
+          }
+        },
+        "fs-extra-p": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-7.0.1.tgz",
+          "integrity": "sha512-yhd2OV0HnHt2oitlp+X9hl2ReX4X/7kQeL7/72qzPHTZj5eUPGzAKOvEglU02Fa1OeG2rSy/aKB4WGVaLiF8tw==",
+          "dev": true,
+          "requires": {
+            "bluebird-lst": "^1.0.7",
+            "fs-extra": "^7.0.1"
+          }
+        },
+        "js-yaml": {
+          "version": "3.13.1",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+          "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+          "dev": true,
+          "requires": {
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
+          }
+        }
       }
     },
     "dns-equal": {
@@ -6649,9 +6803,9 @@
       "dev": true
     },
     "electron": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-4.1.4.tgz",
-      "integrity": "sha512-MelOjntJvd33izEjR6H4N/Uii7y535z/b2BuYXJGLNSHL6o1IlyhUQmfiT87kWABayERgeuYERgvsyf956OOFw==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-5.0.2.tgz",
+      "integrity": "sha512-bUHKQhyuOen/q8iHTkrnzqB9CAwBDI+vHbeu21kpq2bqAD+t25yfrmUEcYHaPL4fZOAhk6nnRqskF6/Xd+aZxg==",
       "dev": true,
       "requires": {
         "@types/node": "^10.12.18",
@@ -6668,38 +6822,70 @@
       }
     },
     "electron-builder": {
-      "version": "20.38.4",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.38.4.tgz",
-      "integrity": "sha512-WHOr3Rz2wktxV5TqmRL6woO9/wrIZeRfJPSEXOhgfgLskE5Sp2Aer0zAF7lHNqXuG6JhU+0I9IYFAxa73MTs9w==",
+      "version": "20.40.2",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.40.2.tgz",
+      "integrity": "sha512-hnnBzyLXna+WpmT4MIoWVdRli43q09yqKOgzPJj0KrOoJZ7TIoY1aYSPvSg8VL5rSuTgdAWGL4rYd9zcq3YXMQ==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "20.38.4",
-        "bluebird-lst": "^1.0.6",
-        "builder-util": "9.6.1",
-        "builder-util-runtime": "8.1.0",
-        "chalk": "^2.4.1",
-        "dmg-builder": "6.5.3",
-        "fs-extra-p": "^7.0.0",
+        "app-builder-lib": "20.40.2",
+        "bluebird-lst": "^1.0.7",
+        "builder-util": "9.7.1",
+        "builder-util-runtime": "8.2.1",
+        "chalk": "^2.4.2",
+        "dmg-builder": "6.6.1",
+        "fs-extra-p": "^7.0.1",
         "is-ci": "^2.0.0",
-        "lazy-val": "^1.0.3",
-        "read-config-file": "3.2.0",
+        "lazy-val": "^1.0.4",
+        "read-config-file": "3.2.2",
         "sanitize-filename": "^1.6.1",
         "update-notifier": "^2.5.0",
-        "yargs": "^12.0.5"
+        "yargs": "^13.2.2"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "bluebird": {
+          "version": "3.5.4",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
+          "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==",
+          "dev": true
+        },
+        "bluebird-lst": {
+          "version": "1.0.8",
+          "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.8.tgz",
+          "integrity": "sha512-InUDOaBaIjIobOa3O4YRAbFgff907uTJZXW0m0rhk3zhVZ4GvsmdCLEAKC1CTWTtUWCM8iWTTfFX9N/xQR/etw==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.4"
+          }
+        },
         "builder-util-runtime": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.1.0.tgz",
-          "integrity": "sha512-s1mlJ28mv+56Iebh6c9aXjVe11O3Z0cDTwAGeB0PCcUzHA37fDxGgS8ZGoYNMZP+rBHj21d/od1wuYofTVLaQg==",
+          "version": "8.2.1",
+          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.1.tgz",
+          "integrity": "sha512-2TkeTcI9bDlK5azRZSJJNxhAgW1DK+JY3jHK0UWPxgJcan4GZSVDNNO3sXntNxrp+JAdPHMF14rzNd/G53lvqw==",
           "dev": true,
           "requires": {
-            "bluebird-lst": "^1.0.6",
-            "debug": "^4.1.0",
-            "fs-extra-p": "^7.0.0",
+            "bluebird-lst": "^1.0.7",
+            "debug": "^4.1.1",
+            "fs-extra-p": "^7.0.1",
             "sax": "^1.2.4"
           }
         },
+        "cliui": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "dev": true,
+          "requires": {
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
+          }
+        },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -6709,11 +6895,93 @@
             "ms": "^2.1.1"
           }
         },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+        "fs-extra-p": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-7.0.1.tgz",
+          "integrity": "sha512-yhd2OV0HnHt2oitlp+X9hl2ReX4X/7kQeL7/72qzPHTZj5eUPGzAKOvEglU02Fa1OeG2rSy/aKB4WGVaLiF8tw==",
+          "dev": true,
+          "requires": {
+            "bluebird-lst": "^1.0.7",
+            "fs-extra": "^7.0.1"
+          }
+        },
+        "get-caller-file": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+          "dev": true
+        },
+        "lazy-val": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.4.tgz",
+          "integrity": "sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==",
+          "dev": true
+        },
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
           "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
+          }
+        },
+        "yargs": {
+          "version": "13.2.4",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
+          "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
+          "dev": true,
+          "requires": {
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "os-locale": "^3.1.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "13.1.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.0.tgz",
+          "integrity": "sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
         }
       }
     },
@@ -6775,14 +7043,12 @@
       }
     },
     "electron-hunspell": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/electron-hunspell/-/electron-hunspell-0.1.1.tgz",
-      "integrity": "sha512-B3nOQqHexIX+8bz72FZkNk+iFBrdqS9DpV2SaH+t7T9SLbONBVBRLJ2Jj2ytXFUzvw81q7vz2dfxPCddh/E3ww==",
+      "version": "1.0.0-beta.7",
+      "resolved": "https://registry.npmjs.org/electron-hunspell/-/electron-hunspell-1.0.0-beta.7.tgz",
+      "integrity": "sha512-BByCXqU8sZbuzyoxKcBYjycp8ORiqjeYZd2OT8RNjVW+XGPmZkHewXUu4tUa1IXW6ij6IqojV5kr+xhYKLN1DA==",
       "requires": {
-        "hunspell-asm": "1.0.2",
-        "lodash": "^4.17.11",
-        "tslib": "1.9.3",
-        "unixify": "1.0.0"
+        "hunspell-asm": "^2.0.0",
+        "tslib": "1.9.3"
       }
     },
     "electron-is-dev": {
@@ -6802,21 +7068,92 @@
         "isbinaryfile": "^3.0.2",
         "minimist": "^1.2.0",
         "plist": "^3.0.1"
+      },
+      "dependencies": {
+        "isbinaryfile": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
+          "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
+          "dev": true,
+          "requires": {
+            "buffer-alloc": "^1.2.0"
+          }
+        }
       }
     },
     "electron-publish": {
-      "version": "20.38.3",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.38.3.tgz",
-      "integrity": "sha512-Qomq253NT5DfjUZgFSx6p+gheU5YhM6zZ67fTtBZvwyk0v8HwxNXfa8fZT7h+1c3BwEmjusTbmjZRNW/XZBXFA==",
+      "version": "20.40.0",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.40.0.tgz",
+      "integrity": "sha512-mkjtsIgftRszuT/8do8TszmddokDnu254OyTeL8nE780o/A8t68oXHZzvlTJ4AQ8uBOYrA87JDO/BFCWjnVArA==",
       "dev": true,
       "requires": {
-        "bluebird-lst": "^1.0.6",
-        "builder-util": "~9.6.0",
-        "builder-util-runtime": "^8.1.0",
-        "chalk": "^2.4.1",
-        "fs-extra-p": "^7.0.0",
-        "lazy-val": "^1.0.3",
-        "mime": "^2.4.0"
+        "bluebird-lst": "^1.0.7",
+        "builder-util": "~9.7.1",
+        "builder-util-runtime": "^8.2.1",
+        "chalk": "^2.4.2",
+        "fs-extra-p": "^7.0.1",
+        "lazy-val": "^1.0.4",
+        "mime": "^2.4.1"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.5.4",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
+          "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==",
+          "dev": true
+        },
+        "bluebird-lst": {
+          "version": "1.0.8",
+          "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.8.tgz",
+          "integrity": "sha512-InUDOaBaIjIobOa3O4YRAbFgff907uTJZXW0m0rhk3zhVZ4GvsmdCLEAKC1CTWTtUWCM8iWTTfFX9N/xQR/etw==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.4"
+          }
+        },
+        "builder-util-runtime": {
+          "version": "8.2.2",
+          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.2.tgz",
+          "integrity": "sha512-Z0NKlpa5VQBMVXAcZH9n4dx+CY5Ckyv7a0Yr/is1h5hwCWaJbQ2JN9PGT7g6YzE5gM3FyrgGDB4DTyJlLcRKNw==",
+          "dev": true,
+          "requires": {
+            "bluebird-lst": "^1.0.7",
+            "debug": "^4.1.1",
+            "fs-extra-p": "^7.0.1",
+            "sax": "^1.2.4"
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "fs-extra-p": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-7.0.1.tgz",
+          "integrity": "sha512-yhd2OV0HnHt2oitlp+X9hl2ReX4X/7kQeL7/72qzPHTZj5eUPGzAKOvEglU02Fa1OeG2rSy/aKB4WGVaLiF8tw==",
+          "dev": true,
+          "requires": {
+            "bluebird-lst": "^1.0.7",
+            "fs-extra": "^7.0.1"
+          }
+        },
+        "lazy-val": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.4.tgz",
+          "integrity": "sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==",
+          "dev": true
+        },
+        "mime": {
+          "version": "2.4.3",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz",
+          "integrity": "sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==",
+          "dev": true
+        }
       }
     },
     "electron-react-titlebar": {
@@ -6853,12 +7190,6 @@
           "requires": {
             "ms": "^2.1.1"
           }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
         }
       }
     },
@@ -11048,14 +11379,34 @@
       }
     },
     "hunspell-asm": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hunspell-asm/-/hunspell-asm-1.0.2.tgz",
-      "integrity": "sha512-UTLBvc0yZiIcHl9qrgxnFTZbX3zF4CprzEY+u+N0iXlUKZnUJRIgvgppTdgiQTsucm5b0aN/rHsgXz2q/0kBRA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hunspell-asm/-/hunspell-asm-2.0.0.tgz",
+      "integrity": "sha512-FMIUBpy+bRREFAvC63RcYEK9U6+FdlEojGSVsvMTpuZ2CekYyUBwEfG4+ExIQOQyEN0U6f1MoVgrFqvgPNSA2g==",
       "requires": {
-        "emscripten-wasm-loader": "^1.0.0",
-        "nanoid": "^1.0.2",
-        "tslib": "^1.9.0",
+        "emscripten-wasm-loader": "^2.2.3",
+        "nanoid": "^2.0.1",
+        "tslib": "^1.9.3",
         "unixify": "^1.0.0"
+      },
+      "dependencies": {
+        "emscripten-wasm-loader": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmjs.org/emscripten-wasm-loader/-/emscripten-wasm-loader-2.2.3.tgz",
+          "integrity": "sha512-//gI0afvtVnY7smttrPOW/BM+pTJLmdIcXAQV3fgRdQ0o6wm2vdSI0kjLYVOeo/rbtRsGgVuMLu6fT+O//EfaA==",
+          "requires": {
+            "getroot": "^1.0.0",
+            "nanoid": "^1.3.4",
+            "tslib": "^1.9.3",
+            "unixify": "^1.0.0"
+          },
+          "dependencies": {
+            "nanoid": {
+              "version": "1.3.4",
+              "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-1.3.4.tgz",
+              "integrity": "sha512-4ug4BsuHxiVHoRUe1ud6rUFT3WUMmjXt1W0quL0CviZQANdan7D8kqN5/maw53hmAApY/jfzMRkC57BNNs60ZQ=="
+            }
+          }
+        }
       }
     },
     "husky": {
@@ -11768,13 +12119,10 @@
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
     "isbinaryfile": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
-      "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
-      "dev": true,
-      "requires": {
-        "buffer-alloc": "^1.2.0"
-      }
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.0.tgz",
+      "integrity": "sha512-RBtmso6l2mCaEsUvXngMTIjg3oheXo0MgYzzfT6sk44RYggPnm9fT+cQJAmzRnJIxPHXg9FZglqDJGW28dvcqA==",
+      "dev": true
     },
     "isexe": {
       "version": "2.0.0",
@@ -13394,12 +13742,19 @@
       }
     },
     "macos-notification-state": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/macos-notification-state/-/macos-notification-state-1.2.0.tgz",
-      "integrity": "sha512-80nPI5sFOMopZw5yt9tdaRAKd6gtTKdjuAIdQ5cMdA5ZtkC7jZH0yzBjeM3O4g+tt/GgLA2fORKwACje5dyGgA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/macos-notification-state/-/macos-notification-state-1.3.1.tgz",
+      "integrity": "sha512-Zd4fezXN4WaXw0fJnO3dr8Eg72AKI4C+g0Jnm5KcX8o7WWvIMV9rzsl8mtuOL8FT+QPYv1xiaLpElqhXubf3Yw==",
       "requires": {
         "bindings": "^1.4.0",
-        "nan": "^2.12.1"
+        "nan": "^2.13.2"
+      },
+      "dependencies": {
+        "nan": {
+          "version": "2.14.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+          "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
+        }
       }
     },
     "macos-release": {
@@ -14030,9 +14385,9 @@
       "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw=="
     },
     "nanoid": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-1.3.4.tgz",
-      "integrity": "sha512-4ug4BsuHxiVHoRUe1ud6rUFT3WUMmjXt1W0quL0CviZQANdan7D8kqN5/maw53hmAApY/jfzMRkC57BNNs60ZQ=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.0.3.tgz",
+      "integrity": "sha512-NbaoqdhIYmY6FXDRB4eYtDVC9Z9eCbn8TyaiC16LNKtpPv/aqa0tOPD8y6gNE4yUNnaZ7LLhYtXOev/6+cBtfw=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -14111,9 +14466,9 @@
       }
     },
     "node-abi": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.7.1.tgz",
-      "integrity": "sha512-OV8Bq1OrPh6z+Y4dqwo05HqrRL9YNF7QVMRfq1/pguwKLG+q9UB/Lk0x5qXjO23JjJg+/jqCHSTaG1P3tfKfuw==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.8.0.tgz",
+      "integrity": "sha512-1/aa2clS0pue0HjckL62CsbhWWU35HARvBDXcJtYKbYR7LnIutmpxmXbuDMV9kEviD2lP/wACOgWmmwljghHyQ==",
       "dev": true,
       "requires": {
         "semver": "^5.4.1"
@@ -15197,32 +15552,32 @@
       "dev": true
     },
     "ora": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-3.1.0.tgz",
-      "integrity": "sha512-vRBPaNCclUi8pUxRF/G8+5qEQkc6EgzKK1G2ZNJUIGu088Un5qIxFXeDgymvPRM9nmrcUOGzQgS1Vmtz+NtlMw==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz",
+      "integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.2",
         "cli-cursor": "^2.1.0",
-        "cli-spinners": "^1.3.1",
+        "cli-spinners": "^2.0.0",
         "log-symbols": "^2.2.0",
-        "strip-ansi": "^5.0.0",
+        "strip-ansi": "^5.2.0",
         "wcwidth": "^1.0.1"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-          "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
         "strip-ansi": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-          "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.0.0"
+            "ansi-regex": "^4.1.0"
           }
         }
       }
@@ -16618,27 +16973,70 @@
       }
     },
     "read-config-file": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.2.0.tgz",
-      "integrity": "sha512-i1QRc5jy4sHm9YBGb6ArA5SU1mDrc5wu2mnm3r9gPnm+LVZhBGbpTCKqAXyvV4TJHnBR3Yaaww+9b3DyRZcfww==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.2.2.tgz",
+      "integrity": "sha512-PuFpMgZF01VB0ydH1dfitAxCP/fh+qnfbA9cYNIPoxPbz0SMngsrafCtaHDWfER7MwlDz4fmrNBhPkakxxFpTg==",
       "dev": true,
       "requires": {
-        "ajv": "^6.5.5",
-        "ajv-keywords": "^3.2.0",
-        "bluebird-lst": "^1.0.6",
-        "dotenv": "^6.1.0",
+        "ajv": "^6.9.2",
+        "ajv-keywords": "^3.4.0",
+        "bluebird-lst": "^1.0.7",
+        "dotenv": "^6.2.0",
         "dotenv-expand": "^4.2.0",
-        "fs-extra-p": "^7.0.0",
-        "js-yaml": "^3.12.0",
+        "fs-extra-p": "^7.0.1",
+        "js-yaml": "^3.12.1",
         "json5": "^2.1.0",
-        "lazy-val": "^1.0.3"
+        "lazy-val": "^1.0.4"
       },
       "dependencies": {
+        "ajv": {
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "bluebird": {
+          "version": "3.5.4",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
+          "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==",
+          "dev": true
+        },
+        "bluebird-lst": {
+          "version": "1.0.8",
+          "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.8.tgz",
+          "integrity": "sha512-InUDOaBaIjIobOa3O4YRAbFgff907uTJZXW0m0rhk3zhVZ4GvsmdCLEAKC1CTWTtUWCM8iWTTfFX9N/xQR/etw==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.4"
+          }
+        },
         "dotenv": {
           "version": "6.2.0",
           "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
           "integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
           "dev": true
+        },
+        "fs-extra-p": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-7.0.1.tgz",
+          "integrity": "sha512-yhd2OV0HnHt2oitlp+X9hl2ReX4X/7kQeL7/72qzPHTZj5eUPGzAKOvEglU02Fa1OeG2rSy/aKB4WGVaLiF8tw==",
+          "dev": true,
+          "requires": {
+            "bluebird-lst": "^1.0.7",
+            "fs-extra": "^7.0.1"
+          }
+        },
+        "lazy-val": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.4.tgz",
+          "integrity": "sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==",
+          "dev": true
         }
       }
     },
@@ -16862,9 +17260,9 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
-      "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
+      "version": "0.13.2",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
+      "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA=="
     },
     "regenerator-transform": {
       "version": "0.13.3",
@@ -16931,9 +17329,9 @@
       }
     },
     "registry-auth-token": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
-      "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
+      "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
       "dev": true,
       "requires": {
         "rc": "^1.1.6",
@@ -18545,9 +18943,9 @@
       "dev": true
     },
     "stat-mode": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
-      "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.3.0.tgz",
+      "integrity": "sha512-QjMLR0A3WwFY2aZdV0okfFEJB5TRjkggXZjxP3A1RsWsNHNu3YPv8btmtc6iCFZ0Rul3FE93OYogvhOUClU+ng==",
       "dev": true
     },
     "static-extend": {
@@ -20016,6 +20414,11 @@
         "builtins": "^1.0.3"
       }
     },
+    "validator": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-11.0.0.tgz",
+      "integrity": "sha512-+wnGLYqaKV2++nUv60uGzUJyJQwYVOin6pn1tgEiFCeCQO60yeu3Og9/yPccbBX574kxIcEJicogkzx6s6eyag=="
+    },
     "value-or-function": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
@@ -20698,12 +21101,19 @@
       "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY="
     },
     "windows-notification-state": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/windows-notification-state/-/windows-notification-state-1.3.0.tgz",
-      "integrity": "sha1-n3J3guysjZIKQI8QJr5vjgj9kC4=",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/windows-notification-state/-/windows-notification-state-1.3.3.tgz",
+      "integrity": "sha512-MVcI09Kjjpd7XkTzp6iG9q+5rIj98r4js1GAIQd3XeCEuyQi+TG3lB3d1RYToZrf28qPkNFO/ChXjvc8ZF/hAQ==",
       "requires": {
-        "bindings": "^1.2.1",
-        "nan": "^2.4.0"
+        "bindings": "^1.5.0",
+        "nan": "^2.14.0"
+      },
+      "dependencies": {
+        "nan": {
+          "version": "2.14.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+          "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
+        }
       }
     },
     "windows-quiet-hours": {
diff --git a/package.json b/package.json
index c1a8c310f..9060c32db 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "franz",
   "productName": "Franz",
   "appId": "com.meetfranz.franz",
-  "version": "5.1.0",
+  "version": "5.2.0-beta.2",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "adlk x franz - Stefan Malzner",
   "main": "index.js",
@@ -34,9 +34,9 @@
   "author": "Stefan Malzner <stefan@adlk.io>",
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/polyfill": "^7.0.0",
-    "@babel/runtime": "^7.0.0",
-    "@meetfranz/electron-notification-state": "^1.0.0",
+    "@babel/polyfill": "7.4.4",
+    "@babel/runtime": "7.4.5",
+    "@meetfranz/electron-notification-state": "1.0.0",
     "@meetfranz/forms": "file:packages/forms",
     "@meetfranz/theme": "file:packages/theme",
     "@meetfranz/ui": "file:packages/ui",
@@ -47,7 +47,7 @@
     "du": "^0.1.0",
     "electron-dl": "1.12.0",
     "electron-fetch": "1.3.0",
-    "electron-hunspell": "0.1.1",
+    "electron-hunspell": "1.0.0-beta.7",
     "electron-is-dev": "1.0.1",
     "electron-react-titlebar": "0.8.1",
     "electron-updater": "4.0.6",
@@ -86,6 +86,7 @@
     "smoothscroll-polyfill": "^0.3.4",
     "tar": "^4.0.2",
     "uuid": "^3.0.1",
+    "validator": "11.0.0",
     "ws": "6.2.1"
   },
   "devDependencies": {
@@ -117,8 +118,8 @@
     "cross-env": "^5.0.5",
     "cz-conventional-changelog": "2.1.0",
     "dotenv": "^4.0.0",
-    "electron": "4.1.4",
-    "electron-builder": "20.38.4",
+    "electron": "5.0.2",
+    "electron-builder": "20.40.2",
     "electron-rebuild": "1.8.4",
     "eslint": "5.10.0",
     "eslint-config-airbnb": "17.1.0",
diff --git a/packages/forms/package.json b/packages/forms/package.json
index 0ac9a846f..d50f4c756 100644
--- a/packages/forms/package.json
+++ b/packages/forms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meetfranz/forms",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "React form components for Franz",
   "main": "lib/index.js",
   "scripts": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@mdi/js": "^3.3.92",
     "@mdi/react": "^1.1.0",
-    "@meetfranz/theme": "^1.0.13",
+    "@meetfranz/theme": "^1.0.14",
     "react-html-attributes": "^1.4.3",
     "react-loader": "^2.4.5"
   },
@@ -35,5 +35,5 @@
     "react-dom": "16.7.0",
     "react-jss": "^8.6.1"
   },
-  "gitHead": "e9b9079dc921e85961954727a7b2a8eabe5b9798"
+  "gitHead": "9f2ab40b7602bc3df26ebb093b484b9917768f69"
 }
diff --git a/packages/forms/src/button/index.tsx b/packages/forms/src/button/index.tsx
index 6959cde73..9faedc8f1 100644
--- a/packages/forms/src/button/index.tsx
+++ b/packages/forms/src/button/index.tsx
@@ -44,7 +44,7 @@ const styles = (theme: Theme) => ({
     width: (props: IProps) => (props.stretch ? '100%' : 'auto') as CSS.WidthProperty<string>,
     fontSize: theme.uiFontSize,
     textDecoration: 'none',
-    height: theme.buttonHeight,
+    // height: theme.buttonHeight,
 
     '&:hover': {
       opacity: 0.8,
@@ -129,8 +129,7 @@ const styles = (theme: Theme) => ({
     position: (props: IProps): CSS.PositionProperty => props.stretch ? 'absolute' : 'inherit',
   },
   icon: {
-    marginLeft: -5,
-    marginRight: 10,
+    margin: [1, 10, 0, -5],
   },
 });
 
@@ -142,7 +141,6 @@ class ButtonComponent extends Component<IProps> {
     buttonType: 'primary' as ButtonType,
     stretch: false,
     busy: false,
-    // target: '_self'
   };
 
   state = {
@@ -220,7 +218,7 @@ class ButtonComponent extends Component<IProps> {
           {icon && (
             <Icon
               path={icon}
-              size={1}
+              size={0.8}
               className={classes.icon}
             />
           )}
diff --git a/packages/forms/src/input/index.tsx b/packages/forms/src/input/index.tsx
index a2d7c62d5..b96dbc12d 100644
--- a/packages/forms/src/input/index.tsx
+++ b/packages/forms/src/input/index.tsx
@@ -83,7 +83,7 @@ class InputComponent extends Component<IProps, IState> {
   }
 
   onInputKeyPress(e: React.KeyboardEvent) {
-    if (e.key === "Enter") {
+    if (e.key === 'Enter') {
       const { onEnterKey } = this.props;
       onEnterKey && onEnterKey();
     }
@@ -114,6 +114,7 @@ class InputComponent extends Component<IProps, IState> {
       max,
       step,
       required,
+      noMargin,
     } = this.props;
 
     const {
@@ -127,6 +128,7 @@ class InputComponent extends Component<IProps, IState> {
       <Wrapper
         className={className}
         identifier="franz-input"
+        noMargin={noMargin}
       >
         <Label
           title={label}
diff --git a/packages/forms/src/typings/generic.ts b/packages/forms/src/typings/generic.ts
index 9688ce2c7..29136dfed 100644
--- a/packages/forms/src/typings/generic.ts
+++ b/packages/forms/src/typings/generic.ts
@@ -6,6 +6,7 @@ export interface IFormField {
   label?: string;
   error?: string;
   required?: boolean;
+  noMargin?: boolean;
 }
 
 export interface IWithStyle {
diff --git a/packages/forms/src/wrapper/index.tsx b/packages/forms/src/wrapper/index.tsx
index d9c61381d..cf179bc5e 100644
--- a/packages/forms/src/wrapper/index.tsx
+++ b/packages/forms/src/wrapper/index.tsx
@@ -3,14 +3,19 @@ import React, { Component } from 'react';
 import injectStyle from 'react-jss';
 import { IWithStyle } from '../typings/generic';
 
-import styles from './styles';
-
 interface IProps extends IWithStyle {
   children: React.ReactNode;
   className?: string;
   identifier: string;
+  noMargin?: boolean;
 }
 
+const styles = {
+  container: {
+    marginBottom: (props: IProps) => props.noMargin ? 0 : 20,
+  },
+};
+
 class WrapperComponent extends Component<IProps> {
   render() {
     const {
diff --git a/packages/forms/src/wrapper/styles.ts b/packages/forms/src/wrapper/styles.ts
deleted file mode 100644
index 72306b252..000000000
--- a/packages/forms/src/wrapper/styles.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
-  container: {
-    marginBottom: 20,
-  },
-};
diff --git a/packages/theme/package.json b/packages/theme/package.json
index 642904089..fa12c8a30 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meetfranz/theme",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "Theme configuration for Franz",
   "author": "Stefan Malzner <stefan@adlk.io>",
   "homepage": "https://github.com/meetfranz/franz",
@@ -25,5 +25,5 @@
   "dependencies": {
     "color": "^3.1.0"
   },
-  "gitHead": "e9b9079dc921e85961954727a7b2a8eabe5b9798"
+  "gitHead": "9f2ab40b7602bc3df26ebb093b484b9917768f69"
 }
diff --git a/packages/theme/src/themes/dark/index.ts b/packages/theme/src/themes/dark/index.ts
index d48dbf916..bd9f001e8 100644
--- a/packages/theme/src/themes/dark/index.ts
+++ b/packages/theme/src/themes/dark/index.ts
@@ -113,7 +113,7 @@ export const workspaces = merge({}, defaultStyles.workspaces, {
 });
 
 // Announcements
-export const announcements = merge({}, defaultStyles.workspaces, {
+export const announcements = merge({}, defaultStyles.announcements, {
   spotlight: {
     background: legacyStyles.darkThemeGrayDark,
   },
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 514b2cc7c..a851ed9cf 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meetfranz/ui",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "React UI components for Franz",
   "main": "lib/index.js",
   "scripts": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@mdi/js": "^3.3.92",
     "@mdi/react": "^1.1.0",
-    "@meetfranz/theme": "^1.0.13",
+    "@meetfranz/theme": "^1.0.14",
     "react-loader": "^2.4.5"
   },
   "peerDependencies": {
@@ -34,5 +34,5 @@
     "react-dom": "16.7.0",
     "react-jss": "^8.6.1"
   },
-  "gitHead": "e9b9079dc921e85961954727a7b2a8eabe5b9798"
+  "gitHead": "9f2ab40b7602bc3df26ebb093b484b9917768f69"
 }
diff --git a/src/actions/service.js b/src/actions/service.js
index ce62560a9..68c62d594 100644
--- a/src/actions/service.js
+++ b/src/actions/service.js
@@ -4,6 +4,7 @@ import ServiceModel from '../models/Service';
 export default {
   setActive: {
     serviceId: PropTypes.string.isRequired,
+    keepActiveRoute: PropTypes.bool,
   },
   blurActive: {},
   setActiveNext: {},
diff --git a/src/app.js b/src/app.js
index f6092bf60..cb3e37c64 100644
--- a/src/app.js
+++ b/src/app.js
@@ -43,6 +43,8 @@ import SubscriptionPopupScreen from './containers/subscription/SubscriptionPopup
 import WorkspacesScreen from './features/workspaces/containers/WorkspacesScreen';
 import EditWorkspaceScreen from './features/workspaces/containers/EditWorkspaceScreen';
 import { WORKSPACES_ROUTES } from './features/workspaces';
+import AnnouncementScreen from './features/announcements/components/AnnouncementScreen';
+import { ANNOUNCEMENTS_ROUTES } from './features/announcements';
 
 // Add Polyfills
 smoothScroll.polyfill();
@@ -73,6 +75,7 @@ window.addEventListener('load', () => {
           <I18N>
             <Router history={history}>
               <Route path="/" component={AppLayoutContainer}>
+                <Route path={ANNOUNCEMENTS_ROUTES.TARGET} component={AnnouncementScreen} />
                 <Route path="/settings" component={SettingsWindow}>
                   <IndexRedirect to="/settings/recipes" />
                   <Route path="/settings/recipes" component={RecipesScreen} />
diff --git a/src/assets/images/tray/win32/tray-unread.ico b/src/assets/images/tray/win32/tray-unread.ico
index a59428cfb..507845120 100644
--- a/src/assets/images/tray/win32/tray-unread.ico
+++ b/src/assets/images/tray/win32/tray-unread.ico
diff --git a/src/assets/images/tray/win32/tray-unread@2x.ico b/src/assets/images/tray/win32/tray-unread@2x.ico
deleted file mode 100644
index f6fe65093..000000000
--- a/src/assets/images/tray/win32/tray-unread@2x.ico
+++ /dev/null
diff --git a/src/assets/images/tray/win32/tray.ico b/src/assets/images/tray/win32/tray.ico
index d3aa25d68..1f0057a8c 100644
--- a/src/assets/images/tray/win32/tray.ico
+++ b/src/assets/images/tray/win32/tray.ico
diff --git a/src/assets/images/tray/win32/tray@2x.ico b/src/assets/images/tray/win32/tray@2x.ico
deleted file mode 100644
index c1b7a73a5..000000000
--- a/src/assets/images/tray/win32/tray@2x.ico
+++ /dev/null
diff --git a/src/components/AppUpdateInfoBar.js b/src/components/AppUpdateInfoBar.js
new file mode 100644
index 000000000..4fb3a8b71
--- /dev/null
+++ b/src/components/AppUpdateInfoBar.js
@@ -0,0 +1,66 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { defineMessages, intlShape } from 'react-intl';
+
+import { announcementActions } from '../features/announcements/actions';
+import InfoBar from './ui/InfoBar';
+
+const messages = defineMessages({
+  updateAvailable: {
+    id: 'infobar.updateAvailable',
+    defaultMessage: '!!!A new update for Franz is available.',
+  },
+  changelog: {
+    id: 'infobar.buttonChangelog',
+    defaultMessage: '!!!Changelog',
+  },
+  buttonInstallUpdate: {
+    id: 'infobar.buttonInstallUpdate',
+    defaultMessage: '!!!Restart & install update',
+  },
+});
+
+class AppUpdateInfoBar extends Component {
+  static propTypes = {
+    onInstallUpdate: PropTypes.func.isRequired,
+    nextAppReleaseVersion: PropTypes.string,
+  };
+
+  static defaultProps = {
+    nextAppReleaseVersion: null,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  render() {
+    const { intl } = this.context;
+    const {
+      onInstallUpdate,
+      nextAppReleaseVersion,
+    } = this.props;
+
+    return (
+      <InfoBar
+        type="primary"
+        ctaLabel={intl.formatMessage(messages.buttonInstallUpdate)}
+        onClick={onInstallUpdate}
+        sticky
+      >
+        <span className="mdi mdi-information" />
+        {intl.formatMessage(messages.updateAvailable)}
+        {' '}
+        <button
+          className="info-bar__inline-button"
+          type="button"
+          onClick={() => announcementActions.show({ targetVersion: nextAppReleaseVersion })}
+        >
+          <u>{intl.formatMessage(messages.changelog)}</u>
+        </button>
+      </InfoBar>
+    );
+  }
+}
+
+export default AppUpdateInfoBar;
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js
index ac8fdbe5b..3d43d4e5c 100644
--- a/src/components/auth/AuthLayout.js
+++ b/src/components/auth/AuthLayout.js
@@ -11,6 +11,7 @@ import { oneOrManyChildElements, globalError as globalErrorPropType } from '../.
 import globalMessages from '../../i18n/globalMessages';
 
 import { isWindows } from '../../environment';
+import AppUpdateInfoBar from '../AppUpdateInfoBar';
 
 export default @observer class AuthLayout extends Component {
   static propTypes = {
@@ -22,6 +23,13 @@ export default @observer class AuthLayout extends Component {
     isHealthCheckLoading: PropTypes.bool.isRequired,
     isFullScreen: PropTypes.bool.isRequired,
     darkMode: PropTypes.bool.isRequired,
+    nextAppReleaseVersion: PropTypes.string,
+    installAppUpdate: PropTypes.func.isRequired,
+    appUpdateIsDownloaded: PropTypes.bool.isRequired,
+  };
+
+  static defaultProps = {
+    nextAppReleaseVersion: null,
   };
 
   static contextTypes = {
@@ -38,6 +46,9 @@ export default @observer class AuthLayout extends Component {
       isHealthCheckLoading,
       isFullScreen,
       darkMode,
+      nextAppReleaseVersion,
+      installAppUpdate,
+      appUpdateIsDownloaded,
     } = this.props;
     const { intl } = this.context;
 
@@ -53,6 +64,12 @@ export default @observer class AuthLayout extends Component {
               {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
             </InfoBar>
           )}
+          {appUpdateIsDownloaded && (
+            <AppUpdateInfoBar
+              nextAppReleaseVersion={nextAppReleaseVersion}
+              onInstallUpdate={installAppUpdate}
+            />
+          )}
           {isOnline && !isAPIHealthy && (
             <InfoBar
               type="danger"
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index d5febfaf4..499bc097a 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -14,10 +14,9 @@ import ErrorBoundary from '../util/ErrorBoundary';
 // import globalMessages from '../../i18n/globalMessages';
 
 import { isWindows } from '../../environment';
-import AnnouncementScreen from '../../features/announcements/components/AnnouncementScreen';
 import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator';
 import { workspaceStore } from '../../features/workspaces';
-import { announcementActions } from '../../features/announcements/actions';
+import AppUpdateInfoBar from '../AppUpdateInfoBar';
 
 function createMarkup(HTMLString) {
   return { __html: HTMLString };
@@ -28,22 +27,10 @@ const messages = defineMessages({
     id: 'infobar.servicesUpdated',
     defaultMessage: '!!!Your services have been updated.',
   },
-  updateAvailable: {
-    id: 'infobar.updateAvailable',
-    defaultMessage: '!!!A new update for Franz is available.',
-  },
   buttonReloadServices: {
     id: 'infobar.buttonReloadServices',
     defaultMessage: '!!!Reload services',
   },
-  changelog: {
-    id: 'infobar.buttonChangelog',
-    defaultMessage: '!!!Changelog',
-  },
-  buttonInstallUpdate: {
-    id: 'infobar.buttonInstallUpdate',
-    defaultMessage: '!!!Restart & install update',
-  },
   requiredRequestsFailed: {
     id: 'infobar.requiredRequestsFailed',
     defaultMessage: '!!!Could not load services and user information',
@@ -83,7 +70,6 @@ class AppLayout extends Component {
     areRequiredRequestsLoading: PropTypes.bool.isRequired,
     darkMode: PropTypes.bool.isRequired,
     isDelayAppScreenVisible: PropTypes.bool.isRequired,
-    isAnnouncementVisible: PropTypes.bool.isRequired,
   };
 
   static defaultProps = {
@@ -117,7 +103,6 @@ class AppLayout extends Component {
       areRequiredRequestsLoading,
       darkMode,
       isDelayAppScreenVisible,
-      isAnnouncementVisible,
     } = this.props;
 
     const { intl } = this.context;
@@ -176,33 +161,19 @@ class AppLayout extends Component {
                   </InfoBar>
                 )}
                 {appUpdateIsDownloaded && (
-                  <InfoBar
-                    type="primary"
-                    ctaLabel={intl.formatMessage(messages.buttonInstallUpdate)}
-                    onClick={installAppUpdate}
-                    sticky
-                  >
-                    <span className="mdi mdi-information" />
-                    {intl.formatMessage(messages.updateAvailable)}
-                    {' '}
-                    <button
-                      className="info-bar__inline-button"
-                      type="button"
-                      onClick={() => announcementActions.show({ targetVersion: nextAppReleaseVersion })}
-                    >
-                      <u>{intl.formatMessage(messages.changelog)}</u>
-                    </button>
-                  </InfoBar>
+                  <AppUpdateInfoBar
+                    nextAppReleaseVersion={nextAppReleaseVersion}
+                    onInstallUpdate={installAppUpdate}
+                  />
                 )}
                 {isDelayAppScreenVisible && (<DelayApp />)}
                 <BasicAuth />
                 <ShareFranz />
-                {isAnnouncementVisible && (<AnnouncementScreen />)}
                 {services}
+                {children}
               </div>
             </div>
           </div>
-          {children}
         </div>
       </ErrorBoundary>
     );
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js
index e63f40c06..1f9c1ea61 100644
--- a/src/containers/auth/AuthLayoutContainer.js
+++ b/src/containers/auth/AuthLayoutContainer.js
@@ -51,6 +51,9 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer
           isHealthCheckLoading={app.healthCheckRequest.isExecuting}
           isFullScreen={app.isFullScreen}
           darkMode={app.isSystemDarkModeEnabled}
+          installAppUpdate={actions.app.installUpdate}
+          nextAppReleaseVersion={app.nextAppReleaseVersion}
+          appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED}
         >
           {children}
         </AuthLayout>
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index d2891a6a4..d290a6094 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -23,7 +23,6 @@ import { state as delayAppState } from '../../features/delayApp';
 import { workspaceActions } from '../../features/workspaces/actions';
 import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer';
 import { workspaceStore } from '../../features/workspaces';
-import { announcementsStore } from '../../features/announcements';
 
 export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component {
   static defaultProps = {
@@ -151,7 +150,6 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
           areRequiredRequestsLoading={requests.areRequiredRequestsLoading}
           darkMode={settings.all.app.darkMode}
           isDelayAppScreenVisible={delayAppState.isDelayAppScreenVisible}
-          isAnnouncementVisible={announcementsStore.isAnnouncementVisible}
         >
           {React.Children.count(children) > 0 ? children : null}
         </AppLayout>
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index b3f967353..66076504f 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -27,7 +27,6 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend
     const { actions, stores } = this.props;
 
     const url = `${WEBSITE}${route}?authToken=${stores.user.authToken}&utm_source=app&utm_medium=account_dashboard`;
-    console.log(url);
 
     actions.app.openExternalUrl({ url });
   }
diff --git a/src/containers/subscription/SubscriptionFormScreen.js b/src/containers/subscription/SubscriptionFormScreen.js
index cb67ee7f2..aa1166f5e 100644
--- a/src/containers/subscription/SubscriptionFormScreen.js
+++ b/src/containers/subscription/SubscriptionFormScreen.js
@@ -56,6 +56,7 @@ export default @inject('stores', 'actions') @observer class SubscriptionFormScre
           minWidth: 600,
           webPreferences: {
             nodeIntegration: true,
+            webviewTag: true,
           },
         });
         paymentWindow.loadURL(`file://${__dirname}/../../index.html#/payment/${encodeURIComponent(hostedPage.url)}`);
diff --git a/src/containers/subscription/SubscriptionPopupScreen.js b/src/containers/subscription/SubscriptionPopupScreen.js
index 6641f236d..f76d6c5a6 100644
--- a/src/containers/subscription/SubscriptionPopupScreen.js
+++ b/src/containers/subscription/SubscriptionPopupScreen.js
@@ -13,7 +13,7 @@ export default @inject('stores', 'actions') @observer class SubscriptionPopupScr
   completeCheck(event) {
     const { url } = event;
 
-    if (url.includes('recurly') && url.includes('confirmation')) {
+    if ((url.includes('recurly') && url.includes('confirmation')) || (url.includes('meetfranz') && url.includes('success'))) {
       this.setState({
         complete: true,
       });
diff --git a/src/dev-app-update.yml b/src/dev-app-update.yml
new file mode 100644
index 000000000..8ddca71e3
--- /dev/null
+++ b/src/dev-app-update.yml
@@ -0,0 +1,3 @@
+owner: meetfranz
+repo: franz
+provider: github
diff --git a/src/features/announcements/components/AnnouncementScreen.js b/src/features/announcements/components/AnnouncementScreen.js
index dfce6cdd5..e7c5fe395 100644
--- a/src/features/announcements/components/AnnouncementScreen.js
+++ b/src/features/announcements/components/AnnouncementScreen.js
@@ -268,7 +268,7 @@ class AnnouncementScreen extends Component {
           <div className={classes.changelog}>
             <h1 className={classes.headline}>
               {intl.formatMessage(messages.headline, {
-                version: announcementsStore.currentVersion,
+                version: announcementsStore.targetVersion,
               })}
             </h1>
             <div
diff --git a/src/features/announcements/index.js b/src/features/announcements/index.js
index 4658b976f..f14e7c9a5 100644
--- a/src/features/announcements/index.js
+++ b/src/features/announcements/index.js
@@ -7,6 +7,10 @@ export const GA_CATEGORY_ANNOUNCEMENTS = 'Announcements';
 
 export const announcementsStore = new AnnouncementsStore();
 
+export const ANNOUNCEMENTS_ROUTES = {
+  TARGET: '/announcements/:id',
+};
+
 export default function initAnnouncements(stores, actions) {
   // const { features } = stores;
 
diff --git a/src/features/announcements/store.js b/src/features/announcements/store.js
index 7ecc0e346..de7ed2596 100644
--- a/src/features/announcements/store.js
+++ b/src/features/announcements/store.js
@@ -2,18 +2,19 @@ import {
   action,
   computed,
   observable,
-  reaction,
 } from 'mobx';
 import semver from 'semver';
 import localStorage from 'mobx-localstorage';
 
 import { FeatureStore } from '../utils/FeatureStore';
-import { GA_CATEGORY_ANNOUNCEMENTS } from '.';
+import { ANNOUNCEMENTS_ROUTES, GA_CATEGORY_ANNOUNCEMENTS } from '.';
 import { getAnnouncementRequest, getChangelogRequest, getCurrentVersionRequest } from './api';
 import { announcementActions } from './actions';
 import { createActionBindings } from '../utils/ActionBinding';
 import { createReactions } from '../../stores/lib/Reaction';
 import { gaEvent } from '../../lib/analytics';
+import { matchRoute } from '../../helpers/routing-helpers';
+import { DEFAULT_APP_SETTINGS } from '../../config';
 
 const LOCAL_STORAGE_KEY = 'announcements';
 
@@ -22,8 +23,6 @@ const debug = require('debug')('Franz:feature:announcements:store');
 export class AnnouncementsStore extends FeatureStore {
   @observable targetVersion = null;
 
-  @observable isAnnouncementVisible = false;
-
   @observable isFeatureActive = false;
 
   @computed get changelog() {
@@ -31,7 +30,15 @@ export class AnnouncementsStore extends FeatureStore {
   }
 
   @computed get announcement() {
-    return getAnnouncementRequest.result;
+    if (!this.stores || !getAnnouncementRequest.result) return null;
+    const { locale } = this.stores.app;
+    const announcement = getAnnouncementRequest.result;
+    // User locale
+    if (announcement[locale]) return announcement[locale];
+    // Default locale
+    if (announcement[DEFAULT_APP_SETTINGS.fallbackLocale]) return announcement[DEFAULT_APP_SETTINGS.fallbackLocale];
+    // No locales specified
+    return announcement;
   }
 
   @computed get areNewsAvailable() {
@@ -67,8 +74,9 @@ export class AnnouncementsStore extends FeatureStore {
     ]));
 
     this._reactions = createReactions([
-      this._fetchAnnouncements,
+      this._showAnnouncementOnRouteMatch,
       this._showAnnouncementToUsersWhoUpdatedApp,
+      this._fetchAnnouncements,
     ]);
     this._registerReactions(this._reactions);
     this.isFeatureActive = true;
@@ -78,7 +86,6 @@ export class AnnouncementsStore extends FeatureStore {
     super.stop();
     debug('AnnouncementsStore::stop');
     this.isFeatureActive = false;
-    this.isAnnouncementVisible = false;
   }
 
   // ======= HELPERS ======= //
@@ -93,39 +100,29 @@ export class AnnouncementsStore extends FeatureStore {
   // ======= ACTIONS ======= //
 
   @action _showAnnouncement = ({ targetVersion } = {}) => {
-    if (!this.areNewsAvailable) return;
+    const { router } = this.stores;
     this.targetVersion = targetVersion || this.currentVersion;
-    this.isAnnouncementVisible = true;
-    this.actions.service.blurActive();
     this._updateSettings({
       lastSeenAnnouncementVersion: this.currentVersion,
     });
-    const dispose = reaction(
-      () => this.stores.services.active,
-      () => {
-        this._hideAnnouncement();
-        dispose();
-      },
-    );
-
+    const targetRoute = `/announcements/${this.targetVersion}`;
+    if (router.location.pathname !== targetRoute) {
+      this.stores.router.push(targetRoute);
+    }
     gaEvent(GA_CATEGORY_ANNOUNCEMENTS, 'show');
   };
 
-  @action _hideAnnouncement() {
-    this.isAnnouncementVisible = false;
-  }
-
   // ======= REACTIONS ========
 
   _showAnnouncementToUsersWhoUpdatedApp = () => {
     const { announcement, isNewUser } = this;
-    // Check if there is an announcement and on't show announcements to new users
+    // Check if there is an announcement and don't show announcements to new users
     if (!announcement || isNewUser) return;
 
     // Check if the user has already used current version (= has seen the announcement)
     const { currentVersion, lastSeenAnnouncementVersion } = this;
     if (semver.gt(currentVersion, lastSeenAnnouncementVersion || '0.0.0')) {
-      debug(`${currentVersion} < ${lastSeenAnnouncementVersion}: announcement is shown`);
+      debug(`${currentVersion} > ${lastSeenAnnouncementVersion}: announcement is shown`);
       this._showAnnouncement();
     }
   };
@@ -133,12 +130,16 @@ export class AnnouncementsStore extends FeatureStore {
   _fetchAnnouncements = () => {
     const targetVersion = this.targetVersion || this.currentVersion;
     if (!targetVersion) return;
-    getChangelogRequest.execute(targetVersion);
-    // We only fetch announcements for current / older versions
-    if (targetVersion <= this.currentVersion) {
-      getAnnouncementRequest.execute(targetVersion);
-    } else {
-      getAnnouncementRequest.reset();
+    getChangelogRequest.reset().execute(targetVersion);
+    getAnnouncementRequest.reset().execute(targetVersion);
+  };
+
+  _showAnnouncementOnRouteMatch = () => {
+    const { router } = this.stores;
+    const match = matchRoute(ANNOUNCEMENTS_ROUTES.TARGET, router.location.pathname);
+    if (match) {
+      const targetVersion = match.id;
+      this._showAnnouncement({ targetVersion });
     }
   }
 }
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index e11513d1f..07b16ff23 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -57,6 +57,10 @@ export default class WorkspacesStore extends FeatureStore {
     return !this.isPremiumUpgradeRequired;
   }
 
+  @computed get isAnyWorkspaceActive() {
+    return !!this.activeWorkspace;
+  }
+
   // ========== PRIVATE PROPERTIES ========= //
 
   _wasDrawerOpenBeforeSettingsRoute = null;
@@ -229,6 +233,14 @@ export default class WorkspacesStore extends FeatureStore {
     this.actions.ui.openSettings({ path: 'workspaces' });
   };
 
+  @action reorderServicesOfActiveWorkspace = async ({ oldIndex, newIndex }) => {
+    const { activeWorkspace } = this;
+    const { services } = activeWorkspace;
+    // Move services from the old to the new position
+    services.splice(newIndex, 0, services.splice(oldIndex, 1)[0]);
+    await updateWorkspaceRequest.execute(activeWorkspace);
+  };
+
   // Reactions
 
   _setFeatureEnabledReaction = () => {
@@ -255,13 +267,15 @@ export default class WorkspacesStore extends FeatureStore {
   _setActiveServiceOnWorkspaceSwitchReaction = () => {
     if (!this.isFeatureActive) return;
     if (this.activeWorkspace) {
-      const services = this.stores.services.allDisplayed;
-      const activeService = services.find(s => s.isActive);
+      const activeService = this.stores.services.active;
       const workspaceServices = this.getWorkspaceServices(this.activeWorkspace);
       if (workspaceServices.length <= 0) return;
       const isActiveServiceInWorkspace = workspaceServices.includes(activeService);
       if (!isActiveServiceInWorkspace) {
-        this.actions.service.setActive({ serviceId: workspaceServices[0].id });
+        this.actions.service.setActive({
+          serviceId: workspaceServices[0].id,
+          keepActiveRoute: true,
+        });
       }
     }
   };
@@ -298,17 +312,16 @@ export default class WorkspacesStore extends FeatureStore {
 
   _cleanupInvalidServiceReferences = () => {
     const { services } = this.stores;
-    let invalidServiceReferencesExist = false;
+    const { allServicesRequest } = services;
+    const servicesHaveBeenLoaded = allServicesRequest.wasExecuted && !allServicesRequest.isError;
+    // Loop through all workspaces and remove invalid service ids (locally)
     this.workspaces.forEach((workspace) => {
       workspace.services.forEach((serviceId) => {
-        if (!services.one(serviceId)) {
-          invalidServiceReferencesExist = true;
+        if (servicesHaveBeenLoaded && !services.one(serviceId)) {
+          workspace.services.remove(serviceId);
         }
       });
     });
-    if (invalidServiceReferencesExist) {
-      getUserWorkspacesRequest.execute();
-    }
   };
 
   _stopPremiumActionsAndReactions = () => {
diff --git a/src/helpers/validation-helpers.js b/src/helpers/validation-helpers.js
index 2f762437d..ab2376b1b 100644
--- a/src/helpers/validation-helpers.js
+++ b/src/helpers/validation-helpers.js
@@ -1,4 +1,5 @@
 import { defineMessages } from 'react-intl';
+import isEmail from 'validator/lib/isEmail';
 
 const messages = defineMessages({
   required: {
@@ -30,14 +31,7 @@ export function required({ field }) {
 
 export function email({ field }) {
   const value = field.value.trim();
-  let isValid = false;
-
-  if (value !== '') {
-    isValid = Boolean(value.match(/[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,63}/i));
-  } else {
-    isValid = true;
-  }
-
+  const isValid = isEmail(value);
   return [isValid, window.franz.intl.formatMessage(messages.email, { field: field.label })];
 }
 
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index b2aaaa070..50d2223dd 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -7,16 +7,16 @@
    "feature.delayApp.text" : "Franz continuarà en {seconds} segons",
    "feature.shareFranz.action.email" : "Envia com a correu",
    "feature.shareFranz.action.facebook" : "Compartir en Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
-   "feature.shareFranz.headline" : "Franz is better together!",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.action.twitter" : "Compartir a Twitter",
+   "feature.shareFranz.headline" : "Junts millorem Franz!",
+   "feature.shareFranz.shareText.email" : "He afegit {count} serveis a Franz! Obtén l'aplicació gratuïta per a Whatsapp, Messenger, Slack, Skype a www,meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "He afegit {count} serveis a Franz! Obtén l'aplicació gratuïta  de Whatsapp, Messenger, Slack, Skype i altres a www.meetfranz.com\/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Digues als teus amics i col·legues l'increïble que és Franz i ajuda'ns a còrrer la veu ",
    "global.api.unhealthy" : "No es pot connectar amb els serveis en línia de Franz",
    "global.notConnectedToTheInternet" : "No esteu connectat a Internet.",
    "global.spellchecker.useDefault" : "Utilitzar el predeterminat del sistema ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect" : "Detectar l'idioma automàticament",
+   "global.spellchecking.autodetect.short" : "Automàtic",
    "global.spellchecking.language" : "Corrector ortogràfic",
    "import.headline" : "Importa els teus serveis Franz 4",
    "import.notSupportedHeadline" : "Serveis que encara no s'admeten a Franz 5",
@@ -44,7 +44,8 @@
    "login.submit.label" : "Accedir",
    "login.tokenExpired" : "La teva sessió ha caducat, torna a iniciar la sessió.",
    "menu.app.about" : "Sobre Franz",
-   "menu.app.announcement" : "What's new?",
+   "menu.app.announcement" : "Què hi ha de nou?",
+   "menu.app.checkForUpdates" : "Comprova si hi ha actualitzacions",
    "menu.app.hide" : "Amaga",
    "menu.app.hideOthers" : "Amaga altres",
    "menu.app.quit" : "Surt",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index aadfeffbc..809c5d5a8 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -1,7 +1,7 @@
 {
    "app.errorHandler.action" : "Obnovit",
    "app.errorHandler.headline" : "Něco se pokazilo",
-   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "feature.announcements.changelog.headline" : "Změny ve Franz {version}",
    "feature.delayApp.action" : "Podpoř Franz a získej Supporter licenci",
    "feature.delayApp.headline" : "Kup si Franz Supporter licenci a nebudeš už muset čekat",
    "feature.delayApp.text" : "Franz bude pokračovat v {seconds} sekundách.",
@@ -9,7 +9,7 @@
    "feature.shareFranz.action.facebook" : "Sdílet na Facebooku",
    "feature.shareFranz.action.twitter" : "Sdílet na Twitteru",
    "feature.shareFranz.headline" : "Franz is better together!",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.email" : "Přidali jsme {count} služeb do Franze. Získejte zdarma aplikace pro WhatsApp, Messenger, SLack, Skype a další na www.meetfranz.com",
    "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
    "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Nemůžeme připojit Franz k online službám",
@@ -45,6 +45,7 @@
    "login.tokenExpired" : "Sezení vypršelo, prosím přihlaste se znovu",
    "menu.app.about" : "O aplikaci",
    "menu.app.announcement" : "What's new?",
+   "menu.app.checkForUpdates" : "Zkontrolovat aktualizace",
    "menu.app.hide" : "Skrýt",
    "menu.app.hideOthers" : "Skryt ostatní",
    "menu.app.quit" : "Ukončit",
@@ -139,7 +140,7 @@
    "settings.account.manageSubscription.label" : "Spravovat vaše předplatné",
    "settings.account.successInfo" : "Vaše změny byly uloženy",
    "settings.account.tryReloadServices" : "Zkusit opět",
-   "settings.account.tryReloadUserInfoRequest" : "Zkusit opět",
+   "settings.account.tryReloadUserInfoRequest" : "Zkusit znovu",
    "settings.account.userInfoRequestFailed" : "Nelze načíst informace o uživateli.",
    "settings.app.buttonClearAllCache" : "Vyprázdnit mezipaměti",
    "settings.app.buttonInstallUpdate" : "Restartovat a nainstalovat aktualizace",
@@ -262,7 +263,7 @@
    "settings.workspaces.deletedInfo" : "Workspace has been deleted",
    "settings.workspaces.headline" : "Your workspaces",
    "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
-   "settings.workspaces.tryReloadWorkspaces" : "Zkusit opět",
+   "settings.workspaces.tryReloadWorkspaces" : "Zkusit znovu",
    "settings.workspaces.updatedInfo" : "Vaše změny byly uloženy",
    "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
    "settings.workspaces.workspaceFeatureInfo" : "Franz 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.",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index bd5193177..4d06e17e4 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -9,10 +9,10 @@
    "feature.shareFranz.action.facebook" : "Auf Facebook teilen",
    "feature.shareFranz.action.twitter" : "Auf Twitter teilen",
    "feature.shareFranz.headline" : "Gemeinsam ist Franz noch besser!",
-   "feature.shareFranz.shareText.email" : "Ich verwende Franz! Hol dir jetzt die kostenlose App für WhatsApp, Messenger, Slack, Skype und viele mehr auf www.meetfranz.com",
+   "feature.shareFranz.shareText.email" : "Ich habe {count} Services zu Franz hinzugefügt! Hol dir jetzt die kostenlose App für WhatsApp, Messenger, Slack, Skype und viele mehr auf www.meetfranz.com",
    "feature.shareFranz.shareText.twitter" : "Ich habe {count} Services zu Franz hinzugefügt! Hol dir die kostenlose App für WhatsApp, Messenger, Slack, Skype und viele mehr auf www.meetfranz.com \/cc @FranzMessenger",
    "feature.shareFranz.text" : "Bitte erzähle deinen Freunden und Kolleginnen, warum du Franz toll findest.",
-   "global.api.unhealthy" : "Verbindung zum Franz Online Service fehlgeschlagen",
+   "global.api.unhealthy" : "Verbindung zum Franz-Online-Service fehlgeschlagen",
    "global.notConnectedToTheInternet" : "Du bist nicht mit dem Internet verbunden.",
    "global.spellchecker.useDefault" : "Standard benutzen ({default})",
    "global.spellchecking.autodetect" : "Sprache automatisch erkennen",
@@ -45,6 +45,7 @@
    "login.tokenExpired" : "Deine Sitzung ist abgelaufen, bitte melde Dich erneut an.",
    "menu.app.about" : "Über Franz",
    "menu.app.announcement" : "Was ist neu?",
+   "menu.app.checkForUpdates" : "Nach Updates suchen",
    "menu.app.hide" : "Ausblenden",
    "menu.app.hideOthers" : "Andere ausblenden",
    "menu.app.quit" : "Beenden",
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 9980274d3..a5572bd32 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -2,6 +2,50 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "!!!A new update for Franz is available.",
+        "end": {
+          "column": 3,
+          "line": 12
+        },
+        "file": "src/components/AppUpdateInfoBar.js",
+        "id": "infobar.updateAvailable",
+        "start": {
+          "column": 19,
+          "line": 9
+        }
+      },
+      {
+        "defaultMessage": "!!!Changelog",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/AppUpdateInfoBar.js",
+        "id": "infobar.buttonChangelog",
+        "start": {
+          "column": 13,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Restart & install update",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/components/AppUpdateInfoBar.js",
+        "id": "infobar.buttonInstallUpdate",
+        "start": {
+          "column": 23,
+          "line": 17
+        }
+      }
+    ],
+    "path": "src/components/AppUpdateInfoBar.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "!!!Import your Franz 4 services",
         "end": {
           "column": 3,
@@ -625,78 +669,39 @@
         "defaultMessage": "!!!Your services have been updated.",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 29
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.servicesUpdated",
         "start": {
           "column": 19,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!A new update for Franz is available.",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/layout/AppLayout.js",
-        "id": "infobar.updateAvailable",
-        "start": {
-          "column": 19,
-          "line": 31
+          "line": 26
         }
       },
       {
         "defaultMessage": "!!!Reload services",
         "end": {
           "column": 3,
-          "line": 38
+          "line": 33
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.buttonReloadServices",
         "start": {
           "column": 24,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!Changelog",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/components/layout/AppLayout.js",
-        "id": "infobar.buttonChangelog",
-        "start": {
-          "column": 13,
-          "line": 39
-        }
-      },
-      {
-        "defaultMessage": "!!!Restart & install update",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/components/layout/AppLayout.js",
-        "id": "infobar.buttonInstallUpdate",
-        "start": {
-          "column": 23,
-          "line": 43
+          "line": 30
         }
       },
       {
         "defaultMessage": "!!!Could not load services and user information",
         "end": {
           "column": 3,
-          "line": 50
+          "line": 37
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.requiredRequestsFailed",
         "start": {
           "column": 26,
-          "line": 47
+          "line": 34
         }
       }
     ],
@@ -3808,65 +3813,65 @@
         "defaultMessage": "!!!Field is required",
         "end": {
           "column": 3,
-          "line": 7
+          "line": 8
         },
         "file": "src/helpers/validation-helpers.js",
         "id": "validation.required",
         "start": {
           "column": 12,
-          "line": 4
+          "line": 5
         }
       },
       {
         "defaultMessage": "!!!Email not valid",
         "end": {
           "column": 3,
-          "line": 11
+          "line": 12
         },
         "file": "src/helpers/validation-helpers.js",
         "id": "validation.email",
         "start": {
           "column": 9,
-          "line": 8
+          "line": 9
         }
       },
       {
         "defaultMessage": "!!!Not a valid URL",
         "end": {
           "column": 3,
-          "line": 15
+          "line": 16
         },
         "file": "src/helpers/validation-helpers.js",
         "id": "validation.url",
         "start": {
           "column": 7,
-          "line": 12
+          "line": 13
         }
       },
       {
         "defaultMessage": "!!!Too few characters",
         "end": {
           "column": 3,
-          "line": 19
+          "line": 20
         },
         "file": "src/helpers/validation-helpers.js",
         "id": "validation.minLength",
         "start": {
           "column": 13,
-          "line": 16
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!At least one is required",
         "end": {
           "column": 3,
-          "line": 23
+          "line": 24
         },
         "file": "src/helpers/validation-helpers.js",
         "id": "validation.oneRequired",
         "start": {
           "column": 15,
-          "line": 20
+          "line": 21
         }
       }
     ],
@@ -4465,185 +4470,198 @@
         }
       },
       {
-        "defaultMessage": "!!!Hide",
+        "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
           "line": 174
         },
         "file": "src/lib/Menu.js",
+        "id": "menu.app.checkForUpdates",
+        "start": {
+          "column": 19,
+          "line": 171
+        }
+      },
+      {
+        "defaultMessage": "!!!Hide",
+        "end": {
+          "column": 3,
+          "line": 178
+        },
+        "file": "src/lib/Menu.js",
         "id": "menu.app.hide",
         "start": {
           "column": 8,
-          "line": 171
+          "line": 175
         }
       },
       {
         "defaultMessage": "!!!Hide Others",
         "end": {
           "column": 3,
-          "line": 178
+          "line": 182
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hideOthers",
         "start": {
           "column": 14,
-          "line": 175
+          "line": 179
         }
       },
       {
         "defaultMessage": "!!!Unhide",
         "end": {
           "column": 3,
-          "line": 182
+          "line": 186
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.unhide",
         "start": {
           "column": 10,
-          "line": 179
+          "line": 183
         }
       },
       {
         "defaultMessage": "!!!Quit",
         "end": {
           "column": 3,
-          "line": 186
+          "line": 190
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.quit",
         "start": {
           "column": 8,
-          "line": 183
+          "line": 187
         }
       },
       {
         "defaultMessage": "!!!Add New Service...",
         "end": {
           "column": 3,
-          "line": 190
+          "line": 194
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.addNewService",
         "start": {
           "column": 17,
-          "line": 187
+          "line": 191
         }
       },
       {
         "defaultMessage": "!!!Add New Workspace...",
         "end": {
           "column": 3,
-          "line": 194
+          "line": 198
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.addNewWorkspace",
         "start": {
           "column": 19,
-          "line": 191
+          "line": 195
         }
       },
       {
         "defaultMessage": "!!!Open workspace drawer",
         "end": {
           "column": 3,
-          "line": 198
+          "line": 202
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.openWorkspaceDrawer",
         "start": {
           "column": 23,
-          "line": 195
+          "line": 199
         }
       },
       {
         "defaultMessage": "!!!Close workspace drawer",
         "end": {
           "column": 3,
-          "line": 202
+          "line": 206
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.closeWorkspaceDrawer",
         "start": {
           "column": 24,
-          "line": 199
+          "line": 203
         }
       },
       {
         "defaultMessage": "!!!Activate next service...",
         "end": {
           "column": 3,
-          "line": 206
+          "line": 210
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.setNextServiceActive",
         "start": {
           "column": 23,
-          "line": 203
+          "line": 207
         }
       },
       {
         "defaultMessage": "!!!Activate previous service...",
         "end": {
           "column": 3,
-          "line": 210
+          "line": 214
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.activatePreviousService",
         "start": {
           "column": 27,
-          "line": 207
+          "line": 211
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 214
+          "line": 218
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 11,
-          "line": 211
+          "line": 215
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 218
+          "line": 222
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 13,
-          "line": 215
+          "line": 219
         }
       },
       {
         "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 222
+          "line": 226
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces",
         "start": {
           "column": 14,
-          "line": 219
+          "line": 223
         }
       },
       {
         "defaultMessage": "!!!Default",
         "end": {
           "column": 3,
-          "line": 226
+          "line": 230
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.defaultWorkspace",
         "start": {
           "column": 20,
-          "line": 223
+          "line": 227
         }
       }
     ],
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 0ff4b5abb..a083964d4 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -45,6 +45,7 @@
    "login.tokenExpired" : "Η συνεδρία σας έληξε, συνδεθείτε ξανά.",
    "menu.app.about" : "Σχετικά με το Franz",
    "menu.app.announcement" : "What's new?",
+   "menu.app.checkForUpdates" : "Έλεγχος για ενημερώσεις",
    "menu.app.hide" : "Απόκρυψη",
    "menu.app.hideOthers" : "Απόκρυψη των άλλων",
    "menu.app.quit" : "Έξοδος",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 1bc8fd2bf..a821dbe39 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -46,6 +46,7 @@
   "login.tokenExpired": "Your session expired, please login again.",
   "menu.app.about": "About Franz",
   "menu.app.announcement": "What's new?",
+  "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
   "menu.app.quit": "Quit",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 4167a5c7d..27f4c7d88 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1,7 +1,7 @@
 {
    "app.errorHandler.action" : "Recargar",
    "app.errorHandler.headline" : "Ha surgido un error",
-   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "feature.announcements.changelog.headline" : "Cambios en Franz {version}",
    "feature.delayApp.action" : "Consigue una Licencia de Soporte de Franz",
    "feature.delayApp.headline" : "Por favor, compra una Licencia de Soporte de Franz para saltar la espera",
    "feature.delayApp.text" : "Franz continuará en {seconds} segundos.",
@@ -10,7 +10,7 @@
    "feature.shareFranz.action.twitter" : "Compartir en Twitter",
    "feature.shareFranz.headline" : "¡Juntos mejoramos Franz!",
    "feature.shareFranz.shareText.email" : "¡He añadido {count} servicios a Franz! Obtén la aplicación gratuita para WhatsApp, Messenger, Slack, Skype en www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.shareText.twitter" : "He agregado {count} servicios a Franz! Obtené la aplicación gratuita de WhatsApp, Messenger, Slack, Skype y co en www.meetfranz.com\/cc @FranzMessenger",
    "feature.shareFranz.text" : "Dile a tus amigos y colegas lo asombroso que es Franz y ayúdanos a correr la voz.",
    "global.api.unhealthy" : "No es posible conectarse a los servicios en línea de Franz.",
    "global.notConnectedToTheInternet" : "No estás conectado a Internet",
@@ -44,7 +44,8 @@
    "login.submit.label" : "Iniciar sesión",
    "login.tokenExpired" : "Tu sesión ha expirado, por favor inicia sesión de nuevo.",
    "menu.app.about" : "Sobre Franz",
-   "menu.app.announcement" : "What's new?",
+   "menu.app.announcement" : "¿Qué hay de nuevo?",
+   "menu.app.checkForUpdates" : "Comprobar actualizaciones",
    "menu.app.hide" : "Ocultar",
    "menu.app.hideOthers" : "Ocultar otros",
    "menu.app.quit" : "Salir",
@@ -89,9 +90,9 @@
    "menu.window" : "Ventana",
    "menu.window.close" : "Cerrar",
    "menu.window.minimize" : "Minimizar",
-   "menu.workspaces" : "Workspaces",
-   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
-   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces" : "Espacios de trabajo",
+   "menu.workspaces.addNewWorkspace" : "Añadir nuevo espacio de trabajo...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Cerrar cajón de espacio de trabajo",
    "menu.workspaces.defaultWorkspace" : "Todos los servicios",
    "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "Dirección de correo electrónico",
@@ -117,7 +118,7 @@
    "service.errorHandler.headline" : "¡Oh, no!",
    "service.errorHandler.message" : "Error",
    "service.errorHandler.text" : "{name} ha fallado la carga",
-   "service.webviewLoader.loading" : "Loading",
+   "service.webviewLoader.loading" : "Cargando",
    "services.getStarted" : "Primeros pasos",
    "services.welcome" : "Bienvenido a Franz",
    "settings.account.account.editButton" : "Editar cuenta",
@@ -177,9 +178,9 @@
    "settings.navigation.inviteFriends" : "Invita a tus amigos",
    "settings.navigation.logout" : "Cerrar sesión",
    "settings.navigation.settings" : "Configuración",
-   "settings.navigation.team" : "Manage Team",
+   "settings.navigation.team" : "Gestionar equipo",
    "settings.navigation.yourServices" : "Tus servicios",
-   "settings.navigation.yourWorkspaces" : "Your workspaces",
+   "settings.navigation.yourWorkspaces" : "Tus espacios de trabajo",
    "settings.recipes.all" : "Todos los servicios",
    "settings.recipes.dev" : "Desarrollo",
    "settings.recipes.headline" : "Servicios disponibles",
@@ -242,7 +243,7 @@
    "settings.team.headline" : "Equipo",
    "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
    "settings.team.manageAction" : "Manage your Team on meetfranz.com",
-   "settings.team.upgradeAction" : "Upgrade your Account",
+   "settings.team.upgradeAction" : "Actualiza tu cuenta",
    "settings.user.form.accountType.company" : "Empresa",
    "settings.user.form.accountType.individual" : "Individual",
    "settings.user.form.accountType.label" : "Tipo de cuenta",
@@ -254,21 +255,21 @@
    "settings.user.form.newPassword" : "Nueva contraseña",
    "settings.workspace.add.form.name" : "Nombre",
    "settings.workspace.add.form.submitButton" : "Create workspace",
-   "settings.workspace.form.buttonDelete" : "Delete workspace",
-   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.buttonDelete" : "Eliminar espacio de trabajo",
+   "settings.workspace.form.buttonSave" : "Guardar espacio de trabajo",
    "settings.workspace.form.name" : "Nombre",
-   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
-   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Servicios en este espacio de trabajo",
+   "settings.workspace.form.yourWorkspaces" : "Tus espacios de trabajo",
    "settings.workspaces.deletedInfo" : "Workspace has been deleted",
-   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.headline" : "Tus espacios de trabajo",
    "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
-   "settings.workspaces.tryReloadWorkspaces" : "Try again",
+   "settings.workspaces.tryReloadWorkspaces" : "Inténtalo de nuevo",
    "settings.workspaces.updatedInfo" : "Tus cambios han sido guardados",
    "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
    "settings.workspaces.workspaceFeatureInfo" : "Franz 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.workspacesRequestFailed" : "Could not load your workspaces",
    "sidebar.addNewService" : "Añadir nuevo servicio",
-   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
+   "sidebar.closeWorkspaceDrawer" : "Cerrar cajón de espacio de trabajo",
    "sidebar.muteApp" : "Desactivar notificaciones y sonido",
    "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Configuración",
@@ -319,7 +320,7 @@
    "welcome.signupButton" : "Crear una cuenta gratuita",
    "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
    "workspaceDrawer.allServices" : "Todos los servicios",
-   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.headline" : "Espacios de trabajo",
    "workspaceDrawer.item.contextMenuEdit" : "edit",
    "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
    "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 2bd5326c0..90072f2b7 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -45,6 +45,7 @@
    "login.tokenExpired" : "Votre session a expiré, veuillez vous reconnecter.",
    "menu.app.about" : "À propos de Franz",
    "menu.app.announcement" : "Quoi de neuf? ",
+   "menu.app.checkForUpdates" : "Vérifier les mises à jour",
    "menu.app.hide" : "Masquer",
    "menu.app.hideOthers" : "Masquer les autres",
    "menu.app.quit" : "Quitter",
@@ -238,7 +239,7 @@
    "settings.services.tooltip.notificationsDisabled" : "Notifications désactivées.",
    "settings.services.updatedInfo" : "Vos modifications ont été enregistrées",
    "settings.team.contentHeadline" : "Franz pour les équipes",
-   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.copy" : "Franz for Teams t'offre la possibilité d'inviter des collègues dans ton équipe de travail en leur envoyant des invitations par courrier électronique et en gérant leurs abonnements dans les préférences de ton compte. Ne perds pas de temps à les gérer individuellement les factures multiples et les différents cycles de facturation - il suffit d'une seule équipe de travail pour gérer tout ça!",
    "settings.team.headline" : "Équipe de travail",
    "settings.team.intro" : "Tu peux désormais gérer les abonnements Premium pour autant de collègues, amis ou membres de famille que tu souhaites, à partir d'un seul et même compte.",
    "settings.team.manageAction" : "Gère ton équipe sur meetfranz.com",
@@ -257,20 +258,20 @@
    "settings.workspace.form.buttonDelete" : "Effacer l'espace de travail",
    "settings.workspace.form.buttonSave" : "Sauvegarder l'espace de travail",
    "settings.workspace.form.name" : "Nom",
-   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
-   "settings.workspace.form.yourWorkspaces" : "Tes espaces de travail",
-   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services dans cet Espace de travail",
+   "settings.workspace.form.yourWorkspaces" : "Vos espaces de travail",
+   "settings.workspaces.deletedInfo" : "L'espace de travail a été supprimé",
    "settings.workspaces.headline" : "Vos espaces de travails",
-   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.noWorkspacesAdded" : "Vous n'avez pas encore ajouté d'espace de travail.",
    "settings.workspaces.tryReloadWorkspaces" : "Réessayer",
    "settings.workspaces.updatedInfo" : "Vos modifications ont été enregistrées",
-   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
-   "settings.workspaces.workspaceFeatureInfo" : "Franz 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.workspacesRequestFailed" : "Could not load your workspaces",
+   "settings.workspaces.workspaceFeatureHeadline" : "Présentation des Espaces de travail de Franz",
+   "settings.workspaces.workspaceFeatureInfo" : "Les Espaces de travail de Franz vous permettant de rester concentré sur ce qui est important. Créez différents groupes de services et naviguez facilement entre eux à n'importe quel moment. Vous décidez de quels services vous avez besoin, où et quand, ainsi nous pouvons vous aider à rester concentré sur votre travail - ou à le quitter dès que vous le souhaitez.",
+   "settings.workspaces.workspacesRequestFailed" : "Impossible de charger vos espaces de travail",
    "sidebar.addNewService" : "Ajouter un nouveau service",
-   "sidebar.closeWorkspaceDrawer" : "Ouvrir l'espace de travail",
+   "sidebar.closeWorkspaceDrawer" : "Fermer l'espace de travail",
    "sidebar.muteApp" : "Désactiver les notifications et les sons",
-   "sidebar.openWorkspaceDrawer" : "Fermer l'espace de travail",
+   "sidebar.openWorkspaceDrawer" : "Ouvrir l'espace de travail",
    "sidebar.settings" : "Paramètres",
    "sidebar.unmuteApp" : "Activer les notifications et les sons",
    "signup.company.label" : "Entreprise",
@@ -292,7 +293,7 @@
    "subscription.features.onpremise.mattermost" : "Ajouter des services auto-hébergés comme Mattermost",
    "subscription.features.proxy" : "Support proxy pour les services",
    "subscription.features.spellchecker" : "Prise en charge du correcteur orthographique",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
+   "subscription.features.workspaces" : "Organisez vos services en espaces de travail",
    "subscription.includedFeatures" : "Le compte payant Supporter Premium Franz inclut",
    "subscription.paymentSessionError" : "Initialisation du paiement impossible",
    "subscription.submit.label" : "Je souhaite aider au développement de Franz",
@@ -317,15 +318,15 @@
    "validation.url" : "{field} n'est pas une URL valide",
    "welcome.loginButton" : "Se connecter sur son compte",
    "welcome.signupButton" : "Créer un compte gratuit",
-   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Ajouté un nouvel espace de travail",
    "workspaceDrawer.allServices" : "Tous les services",
    "workspaceDrawer.headline" : "Espace de travail",
-   "workspaceDrawer.item.contextMenuEdit" : "edit",
-   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
-   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
-   "workspaceDrawer.proFeatureBadge" : "Premium feature",
-   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
-   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz 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",
-   "workspaces.switchingIndicator.switchingTo" : "Switching to"
+   "workspaceDrawer.item.contextMenuEdit" : "Modifier",
+   "workspaceDrawer.item.noServicesAddedYet" : "Aucun services ajoutés pour l'instant",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Créez votre premier espace de travail",
+   "workspaceDrawer.proFeatureBadge" : "Fonctionnalité premium",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Réactivez votre compte premium",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Les Espaces de travail de Franz vous permettant de rester concentré sur ce qui est important. Créez différents groupes de services et naviguez facilement entre eux à n'importe quel moment.<\/p><p>Vous décidez de quels services vous avez besoin, où et quand, ainsi nous pouvons vous aider à rester concentré sur votre travail - ou à le quitter dès que vous le souhaitez.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Editer les paramètres de l'espace de travail",
+   "workspaces.switchingIndicator.switchingTo" : "Changement vers"
 }
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 3f1e827fb..97a39d2e6 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -45,6 +45,7 @@
    "login.tokenExpired" : "D'éag do sheisiún, logáil isteach arís le do thoil.",
    "menu.app.about" : "Faoi Franz",
    "menu.app.announcement" : "What's new?",
+   "menu.app.checkForUpdates" : "Cuardaigh le nuashonruithe",
    "menu.app.hide" : "Cuir Franz i bhfolach",
    "menu.app.hideOthers" : "Folaigh feidhmchláir eile",
    "menu.app.quit" : "Scoir",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 468238166..d48c8bdac 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -45,6 +45,7 @@
    "login.tokenExpired" : "Vaša sesija je istekla, prijavite se ponovo.",
    "menu.app.about" : "O aplikaciji",
    "menu.app.announcement" : "What's new?",
+   "menu.app.checkForUpdates" : "Potraži ažuriranja",
    "menu.app.hide" : "Hide",
    "menu.app.hideOthers" : "Hide Others",
    "menu.app.quit" : "Quit",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index b28dcb17a..701568b1c 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -1,13 +1,13 @@
 {
    "app.errorHandler.action" : "Újratöltés",
    "app.errorHandler.headline" : "Valami nem jött össze",
-   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "feature.announcements.changelog.headline" : "Franz {version} változásai",
    "feature.delayApp.action" : "Szerezz egy Franz Támogatói Liszencet",
    "feature.delayApp.headline" : "Kérjük vásárolj egy Franc Támogatói Liszencet a várakozás átugrásához",
    "feature.delayApp.text" : "A Franz továbblép {seconds} másodperc múlva.",
-   "feature.shareFranz.action.email" : "Send as email",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.action.email" : "Küldés email-ben",
+   "feature.shareFranz.action.facebook" : "Megosztás Facebook-on",
+   "feature.shareFranz.action.twitter" : "Megosztás Twitter-en",
    "feature.shareFranz.headline" : "Franz is better together!",
    "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
    "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
@@ -15,8 +15,8 @@
    "global.api.unhealthy" : "Nem lehet csatlakozni a Franz online szolgáltatáshoz",
    "global.notConnectedToTheInternet" : "Nincs hálózati kapcsolat.",
    "global.spellchecker.useDefault" : "Rendszer alapbeállítás használata ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect" : "Automatikus nyelvdetektálás",
+   "global.spellchecking.autodetect.short" : "Automatikus",
    "global.spellchecking.language" : "Helyesírás-ellenőrző nyelve",
    "import.headline" : "Importáld szolgáltatásaidat a Franz 4-ből",
    "import.notSupportedHeadline" : "Még nem támogatott szolgáltatások a Franz 5-ben",
@@ -45,6 +45,7 @@
    "login.tokenExpired" : "A munkamenet lejárt, kérlek lépj be újra.",
    "menu.app.about" : "Névjegy",
    "menu.app.announcement" : "What's new?",
+   "menu.app.checkForUpdates" : "Frissítések keresése",
    "menu.app.hide" : "Elrejt",
    "menu.app.hideOthers" : "Többi elrejtése",
    "menu.app.quit" : "Kilépés",
@@ -72,9 +73,9 @@
    "menu.help.support" : "Támogatás",
    "menu.help.tos" : "Felhasználói feltételek",
    "menu.services" : "Szolgáltatások",
-   "menu.services.activatePreviousService" : "Activate previous service",
+   "menu.services.activatePreviousService" : "Előző szolgáltatás",
    "menu.services.addNewService" : "Új szolgáltatás hozzáadása...",
-   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.services.setNextServiceActive" : "Következő szolgáltatás",
    "menu.view" : "Nézet",
    "menu.view.enterFullScreen" : "Kilépés a teljes képernyős módból",
    "menu.view.exitFullScreen" : "Kilépés a teljes képernyős módból",
@@ -164,7 +165,7 @@
    "settings.app.headlineGeneral" : "Általános",
    "settings.app.headlineLanguage" : "Nyelv",
    "settings.app.headlineUpdates" : "Frissítések",
-   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
+   "settings.app.languageDisclaimer" : "A hivatalos fordítások angol és német nyelven elérhetőek. Minden más nyelv közösségi fordításon alapul.",
    "settings.app.restartRequired" : "Újraindítást igénylő módosítás",
    "settings.app.subheadlineCache" : "Gyorsítótár",
    "settings.app.translationHelp" : "Segíts nekünk a Franz-ot lefordítani a nyelvedre.",
@@ -321,7 +322,7 @@
    "workspaceDrawer.allServices" : "Összes szolgáltatás",
    "workspaceDrawer.headline" : "Munkaterületek",
    "workspaceDrawer.item.contextMenuEdit" : "szerkeszt",
-   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.item.noServicesAddedYet" : "Még nincsenek hozzáadott szolgáltatások",
    "workspaceDrawer.premiumCtaButtonLabel" : "Készítsd el az első munkaterületedet",
    "workspaceDrawer.proFeatureBadge" : "Prémium funkció",
    "workspaceDrawer.reactivatePremiumAccountLabel" : "Prémium fiók reaktiválása",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index e7a46e5e9..819aca177 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -45,6 +45,7 @@
    "login.tokenExpired" : "Sesi Anda telah kedaluwarsa, silakan masuk kembali.",
    "menu.app.about" : "Tentang Franz",
    "menu.app.announcement" : "Yang baru",
+   "menu.app.checkForUpdates" : "Periksa versi baru",
    "menu.app.hide" : "Sembunyikan",
    "menu.app.hideOthers" : "Sembunyikan Lainnya",
    "menu.app.quit" : "Keluar",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index c12641e36..7bda822bb 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -1,17 +1,17 @@
 {
    "app.errorHandler.action" : "Ricarica",
    "app.errorHandler.headline" : "Qualcosa è andato storto",
-   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "feature.announcements.changelog.headline" : "Modifiche in Franz {Version}",
    "feature.delayApp.action" : "Ricevi una Licenza Supporter di Franz",
    "feature.delayApp.headline" : "Per favore, compra una Licenza Supporter di Franz per saltare l'attesa",
-   "feature.delayApp.text" : "Franz continuerà a funzionare tra {seconds} secondi.",
+   "feature.delayApp.text" : "Franz continuerà tra {seconds} secondi.",
    "feature.shareFranz.action.email" : "Manda come email",
    "feature.shareFranz.action.facebook" : "Condividi su Facebook",
    "feature.shareFranz.action.twitter" : "Condividi su Twitter",
    "feature.shareFranz.headline" : "Franze è migliore insieme!",
    "feature.shareFranz.shareText.email" : "Ho aggiunto {count} nuovi servizi a Franz! Scarica ora l'app gratuita per WhatsApp, Messenger, Slack, Skype e altri all'indirizzo www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
-   "feature.shareFranz.text" : "Condividi con i tuoi amici e colleghi quanto Franz è fantastico e aiutaci a diffondere la parola.",
+   "feature.shareFranz.shareText.twitter" : "Ho aggiunto {count} nuovi servizi a Franz! Scarica ora l’app gratuita per WhatsApp, Messenger, Slack, Skype e altri all’indirizzo www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Di’ ai tuoi amici e colleghi quanto Franz è fantastico e aiutaci a diffondere la parola.",
    "global.api.unhealthy" : "Impossibile connettersi ai servizi online di Franz",
    "global.notConnectedToTheInternet" : "Non sei connesso a Internet.",
    "global.spellchecker.useDefault" : "Usa le impostazioni predefinite di sistema ({default})",
@@ -44,7 +44,8 @@
    "login.submit.label" : "Accedi",
    "login.tokenExpired" : "La tua sessione è scaduta, per favore accedi di nuovo.",
    "menu.app.about" : "Info su Franz",
-   "menu.app.announcement" : "What's new?",
+   "menu.app.announcement" : "Cosa c'è di nuovo?",
+   "menu.app.checkForUpdates" : "Controlla aggiornamenti",
    "menu.app.hide" : "Nascondi",
    "menu.app.hideOthers" : "Nascondi altri",
    "menu.app.quit" : "Esci",
@@ -90,10 +91,10 @@
    "menu.window.close" : "Chiudi",
    "menu.window.minimize" : "Minimizza",
    "menu.workspaces" : "Workspaces",
-   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
-   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.addNewWorkspace" : "Aggiungi un Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Chiudi il menu dei workspace",
    "menu.workspaces.defaultWorkspace" : "Tutti i servizi",
-   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
+   "menu.workspaces.openWorkspaceDrawer" : "Apri il menu dei workspace",
    "password.email.label" : "Indirizzo email",
    "password.headline" : "Reimposta password",
    "password.link.login" : "Accedi al tuo account",
@@ -117,7 +118,7 @@
    "service.errorHandler.headline" : "Oh no!",
    "service.errorHandler.message" : "Errore",
    "service.errorHandler.text" : "{name} non si è caricato correttamente.",
-   "service.webviewLoader.loading" : "Loading",
+   "service.webviewLoader.loading" : "Caricamento",
    "services.getStarted" : "Iniziamo",
    "services.welcome" : "Benvenuto su Franz",
    "settings.account.account.editButton" : "Modifica account",
@@ -164,7 +165,7 @@
    "settings.app.headlineGeneral" : "Generale",
    "settings.app.headlineLanguage" : "Lingua",
    "settings.app.headlineUpdates" : "Aggiornamenti",
-   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
+   "settings.app.languageDisclaimer" : "Le traduzioni ufficiali sono in Inglese e Tedesco. Tutte le altre lingue sono tradotte dalla community.",
    "settings.app.restartRequired" : "Le modifiche richiedono un riavvio",
    "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Aiutaci a tradurre Franz nella tua lingua.",
@@ -177,9 +178,9 @@
    "settings.navigation.inviteFriends" : "Invita Amici",
    "settings.navigation.logout" : "Esci",
    "settings.navigation.settings" : "Impostazioni",
-   "settings.navigation.team" : "Manage Team",
+   "settings.navigation.team" : "Gestisci il Team",
    "settings.navigation.yourServices" : "I tuoi servizi",
-   "settings.navigation.yourWorkspaces" : "Your workspaces",
+   "settings.navigation.yourWorkspaces" : "I tuoi workspaces",
    "settings.recipes.all" : "Tutti i servizi",
    "settings.recipes.dev" : "Sviluppo",
    "settings.recipes.headline" : "Servizi disponibili",
@@ -237,12 +238,12 @@
    "settings.services.tooltip.isMuted" : "Tutti i suoni sono disattivati",
    "settings.services.tooltip.notificationsDisabled" : "Le notifiche sono disattivate",
    "settings.services.updatedInfo" : "Le tue modifiche sono state salvate",
-   "settings.team.contentHeadline" : "Franz for Teams",
-   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
-   "settings.team.headline" : "Gruppo",
-   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
-   "settings.team.upgradeAction" : "Upgrade your Account",
+   "settings.team.contentHeadline" : "Franz per i Teams",
+   "settings.team.copy" : "Franz per i Teams ti da la possibilità di invitare collaboratori al tuo team, invitandoli per email e gestendo la loro iscrizione all'interno delle preferenze del tuo account. Non perdere tempo impostando le iscrizioni di un singolo collaboratore individualmente, dimenticati di fatture multiple e cicli differenti di fatturazione - un team per comandarli tutti!",
+   "settings.team.headline" : "Team",
+   "settings.team.intro" : "Tu e il tuo team usate Franz? Ora puoi gestire le sottoscrizioni Premium per tutti i colleghi, amici e famigliari che vuoi, tutto da un singolo account.",
+   "settings.team.manageAction" : "Gestisci il tuo Team su meetfranz.com",
+   "settings.team.upgradeAction" : "Aggiorna il tuo Account",
    "settings.user.form.accountType.company" : "Società",
    "settings.user.form.accountType.individual" : "Individuale",
    "settings.user.form.accountType.label" : "Tipo di account",
@@ -253,24 +254,24 @@
    "settings.user.form.lastname" : "Cognome",
    "settings.user.form.newPassword" : "Nuova password",
    "settings.workspace.add.form.name" : "Nome",
-   "settings.workspace.add.form.submitButton" : "Create workspace",
-   "settings.workspace.form.buttonDelete" : "Delete workspace",
-   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.add.form.submitButton" : "Crea un workspace",
+   "settings.workspace.form.buttonDelete" : "Cancella un workspace",
+   "settings.workspace.form.buttonSave" : "Salva il workspace",
    "settings.workspace.form.name" : "Nome",
-   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
-   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
-   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
-   "settings.workspaces.headline" : "Your workspaces",
-   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
-   "settings.workspaces.tryReloadWorkspaces" : "Try again",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Servizi in questo Workspace",
+   "settings.workspace.form.yourWorkspaces" : "I tuoi workspaces",
+   "settings.workspaces.deletedInfo" : "Il Workspace è stato cancellato",
+   "settings.workspaces.headline" : "I tuoi workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "Non hai ancora aggiunto alcun workspace",
+   "settings.workspaces.tryReloadWorkspaces" : "Riprova nuovamente",
    "settings.workspaces.updatedInfo" : "Le tue modifiche sono state salvate",
-   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
-   "settings.workspaces.workspaceFeatureInfo" : "Franz 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.workspacesRequestFailed" : "Could not load your workspaces",
+   "settings.workspaces.workspaceFeatureHeadline" : "Meno è Meglio: I Workspaces di Franz",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces ti permette di concentrarti su ciò che è importante. Configura diversi insiemi di servizi e passa facilmente da uno all’altro quando vuoi. Decidi di quali servizi hai bisogno quando e dove, così che ti possiamo aiutare a dare sempre il massimo - o semplicemente staccare dal lavoro quando ne hai bisogno.",
+   "settings.workspaces.workspacesRequestFailed" : "Non è possibile caricare i tuoi workspaces",
    "sidebar.addNewService" : "Aggiungi un nuovo servizio",
-   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
+   "sidebar.closeWorkspaceDrawer" : "Chiudi il menu dei workspace",
    "sidebar.muteApp" : "Disattiva notifiche e audio",
-   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
+   "sidebar.openWorkspaceDrawer" : "Apri il menu dei workspace",
    "sidebar.settings" : "Impostazioni",
    "sidebar.unmuteApp" : "Attiva notifiche e audio",
    "signup.company.label" : "Società",
@@ -279,7 +280,7 @@
    "signup.firstname.label" : "Nome",
    "signup.headline" : "Iscriviti",
    "signup.lastname.label" : "Cognome",
-   "signup.legal.info" : "Creando un account di Franz stai accettando il ",
+   "signup.legal.info" : "Creando un account di Franz accetti i ",
    "signup.legal.privacy" : "Informativa sulla Privacy",
    "signup.legal.terms" : "Termini di Servizio",
    "signup.link.login" : "Hai già un account, vuoi accedere?",
@@ -292,7 +293,7 @@
    "subscription.features.onpremise.mattermost" : "Aggiungi servizi on-premise\/hosted come \"Mattermost\"",
    "subscription.features.proxy" : "Supporto proxy per i servizi",
    "subscription.features.spellchecker" : "Supporto per il correttore ortografico",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
+   "subscription.features.workspaces" : "Organizza i tuoi servizi in workspace",
    "subscription.includedFeatures" : "L'account a pagamento Franz Premium Supporter include",
    "subscription.paymentSessionError" : "Impossibile inizializzare il modulo per il pagamento",
    "subscription.submit.label" : "Voglio supportare lo sviluppo di Franz",
@@ -317,15 +318,15 @@
    "validation.url" : "{field} non è un URL valido",
    "welcome.loginButton" : "Accedi al tuo account",
    "welcome.signupButton" : "Crea un account gratuito",
-   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Aggiungi un nuovo workspace",
    "workspaceDrawer.allServices" : "Tutti i servizi",
-   "workspaceDrawer.headline" : "Workspaces",
-   "workspaceDrawer.item.contextMenuEdit" : "edit",
-   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
-   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
-   "workspaceDrawer.proFeatureBadge" : "Premium feature",
-   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
-   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz 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",
-   "workspaces.switchingIndicator.switchingTo" : "Switching to"
+   "workspaceDrawer.headline" : "Workspace",
+   "workspaceDrawer.item.contextMenuEdit" : "Modifica",
+   "workspaceDrawer.item.noServicesAddedYet" : "Nessun servizio aggiunto",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Crea il tuo primo workspace",
+   "workspaceDrawer.proFeatureBadge" : "Funzionalità premium",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Riattiva l’account premium",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces ti permette di concentrarti su ciò che è importante. Configura diversi insiemi di servizi e passa facilmente da uno all’altro quando vuoi.<\/p><p>Decidi di quali servizi hai bisogno quando e dove, così che ti possiamo aiutare a dare sempre il massimo - o semplicemente staccare dal lavoro quando ne hai bisogno.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Modifica le impostazioni dei workspace",
+   "workspaces.switchingIndicator.switchingTo" : "Passa a "
 }
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index cf7e9ab78..f9989ff7e 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -45,6 +45,7 @@
    "login.tokenExpired" : "セッションの期限が切れました。ログインし直して下さい。",
    "menu.app.about" : "バージョン情報",
    "menu.app.announcement" : "What's new?",
+   "menu.app.checkForUpdates" : "更新の確認",
    "menu.app.hide" : "隠す",
    "menu.app.hideOthers" : "他を隠す",
    "menu.app.quit" : "終了",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index af224c115..5193ac8cf 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -45,6 +45,7 @@
    "login.tokenExpired" : "თქვენს სესიას ვადა გაუვიდა, შედით ანგარიშში ხელახლა.",
    "menu.app.about" : "Franz-ის შესახებ",
    "menu.app.announcement" : "What's new?",
+   "menu.app.checkForUpdates" : "განახლებების შემოწმება",
    "menu.app.hide" : "Hide",
    "menu.app.hideOthers" : "სხვების დამალვა",
    "menu.app.quit" : "გამოსვლა",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 2854fcb09..1eda8856f 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -45,6 +45,7 @@
    "login.tokenExpired" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
    "menu.app.about" : "Over Franz",
    "menu.app.announcement" : "What's new?",
+   "menu.app.checkForUpdates" : "Controleer op updates",
    "menu.app.hide" : "Verbergen",
    "menu.app.hideOthers" : "Andere Verbergen",
    "menu.app.quit" : "Afsluiten",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 03d4474c1..fdb96a7db 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -1,22 +1,22 @@
 {
    "app.errorHandler.action" : "Herladen",
    "app.errorHandler.headline" : "Er ging iets mis",
-   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "feature.announcements.changelog.headline" : "Wijzigingen in Franz {version}",
    "feature.delayApp.action" : "Sponsor Franz",
    "feature.delayApp.headline" : "Sponsor Franz om wachten over te slaan",
    "feature.delayApp.text" : "Franz gaat over {seconds} seconden verder.",
-   "feature.shareFranz.action.email" : "Send as email",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
-   "feature.shareFranz.headline" : "Franz is better together!",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.action.email" : "Verstuur als e-mail",
+   "feature.shareFranz.action.facebook" : "Deel op Facebook",
+   "feature.shareFranz.action.twitter" : "Deel op Twitter",
+   "feature.shareFranz.headline" : "Franz is leuker samen!",
+   "feature.shareFranz.shareText.email" : "Ik heb {count} diensten toegevoegd aan Franz! Download de gratis app voor Whatsapp, Messenger, Slack, Skype en co op www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "Ik heb {count} diensten toegevoegd aan Franz! Download de gratis app voor Whatsapp, Messenger, Slack, Skype en co op www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Vertel je vrienden en collega's hoe geweldig Franz is en help ons om bekender te worden",
    "global.api.unhealthy" : "Kan geen verbinding maken met de Franz-services",
    "global.notConnectedToTheInternet" : "U bent niet verbonden met het internet.",
    "global.spellchecker.useDefault" : "Gebruik systeemstandaard ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect" : "Taal automatisch herkennen",
+   "global.spellchecking.autodetect.short" : "Automatisch",
    "global.spellchecking.language" : "Spelling checken",
    "import.headline" : "Importeer uw Franz 4-services",
    "import.notSupportedHeadline" : "Services die nog niet ondersteund worden in Franz 5",
@@ -44,7 +44,8 @@
    "login.submit.label" : "Inloggen",
    "login.tokenExpired" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
    "menu.app.about" : "Over Franz",
-   "menu.app.announcement" : "What's new?",
+   "menu.app.announcement" : "Wat is nieuw?",
+   "menu.app.checkForUpdates" : "Controleer op updates",
    "menu.app.hide" : "Verbergen",
    "menu.app.hideOthers" : "Andere verbergen",
    "menu.app.quit" : "Afsluiten",
@@ -72,9 +73,9 @@
    "menu.help.support" : "Ondersteuning",
    "menu.help.tos" : "Servicevoorwaarden",
    "menu.services" : "Diensten",
-   "menu.services.activatePreviousService" : "Activate previous service",
+   "menu.services.activatePreviousService" : "Activeer vorige dienst",
    "menu.services.addNewService" : "Nieuwe dienst toevoegen",
-   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.services.setNextServiceActive" : "Activeer volgende dienst",
    "menu.view" : "Weergave",
    "menu.view.enterFullScreen" : "Gebruik volledig scherm",
    "menu.view.exitFullScreen" : "Volledig scherm verlaten",
@@ -89,11 +90,11 @@
    "menu.window" : "Venster",
    "menu.window.close" : "Sluiten",
    "menu.window.minimize" : "Minimaliseren",
-   "menu.workspaces" : "Workspaces",
-   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
-   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces" : "Werkruimtes",
+   "menu.workspaces.addNewWorkspace" : "Voeg nieuwe werkruimte toe...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Werkruimtepagina sluiten",
    "menu.workspaces.defaultWorkspace" : "Alle services",
-   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
+   "menu.workspaces.openWorkspaceDrawer" : "Werkruimtepagina openen",
    "password.email.label" : "E-mailadres",
    "password.headline" : "Wachtwoord vergeten",
    "password.link.login" : "Log in op je account",
@@ -117,7 +118,7 @@
    "service.errorHandler.headline" : "Oh nee!",
    "service.errorHandler.message" : "Fout",
    "service.errorHandler.text" : "{name} kon niet geladen worden.",
-   "service.webviewLoader.loading" : "Loading",
+   "service.webviewLoader.loading" : "Aan het laden",
    "services.getStarted" : "Begin",
    "services.welcome" : "Welkom bij Franz",
    "settings.account.account.editButton" : "Bewerk account",
@@ -237,7 +238,7 @@
    "settings.services.tooltip.isMuted" : "Alle geluiden zijn uitgeschakeld",
    "settings.services.tooltip.notificationsDisabled" : "Meldingen zijn uitgeschakeld",
    "settings.services.updatedInfo" : "Je wijzigingen zijn opgeslagen",
-   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.contentHeadline" : "Franz voor groepen",
    "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
    "settings.team.headline" : "Team",
    "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
@@ -258,9 +259,9 @@
    "settings.workspace.form.buttonSave" : "Save workspace",
    "settings.workspace.form.name" : "Naam",
    "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
-   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
-   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
-   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspace.form.yourWorkspaces" : "Jouw werkruimtes",
+   "settings.workspaces.deletedInfo" : "Werkruimte is verwijderd",
+   "settings.workspaces.headline" : "Jouw werkplaatsen",
    "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
    "settings.workspaces.tryReloadWorkspaces" : "Probeer opnieuw",
    "settings.workspaces.updatedInfo" : "Je wijzigingen zijn opgeslagen",
@@ -268,9 +269,9 @@
    "settings.workspaces.workspaceFeatureInfo" : "Franz 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.workspacesRequestFailed" : "Could not load your workspaces",
    "sidebar.addNewService" : "Voeg service toe",
-   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
+   "sidebar.closeWorkspaceDrawer" : "Werkruimtepagina sluiten",
    "sidebar.muteApp" : "Schakel berichten & geluid uit",
-   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
+   "sidebar.openWorkspaceDrawer" : "Werkruimtepagina openen",
    "sidebar.settings" : "Instellingen",
    "sidebar.unmuteApp" : "Berichten & geluid inschakelen",
    "signup.company.label" : "Bedrijf",
@@ -319,12 +320,12 @@
    "welcome.signupButton" : "Maak een gratis account",
    "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
    "workspaceDrawer.allServices" : "Alle services",
-   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.headline" : "Werkruimtes",
    "workspaceDrawer.item.contextMenuEdit" : "edit",
    "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
-   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Maak je eerste werkruimte",
    "workspaceDrawer.proFeatureBadge" : "Premium feature",
-   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Heractiveer premium account",
    "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz 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",
    "workspaces.switchingIndicator.switchingTo" : "Switching to"
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 591b13145..a5d1ea377 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -5,7 +5,7 @@
    "feature.delayApp.action" : "Uzyskaj licencję Franz Supporter",
    "feature.delayApp.headline" : "Aby nie czekać kup licencję Franz Supporter",
    "feature.delayApp.text" : "Franz będzie kontynuował za {seconds} sekund.",
-   "feature.shareFranz.action.email" : "Wyślij nam maila",
+   "feature.shareFranz.action.email" : "Wyślij jako email",
    "feature.shareFranz.action.facebook" : "Udostępnij na Facebooku",
    "feature.shareFranz.action.twitter" : "Udostępnij na Twitterze",
    "feature.shareFranz.headline" : "Franz jest lepszy, gdy tworzymy go razem!",
@@ -45,6 +45,7 @@
    "login.tokenExpired" : "Twoja sesja wygasła, zaloguj się ponownie.",
    "menu.app.about" : "O Franz",
    "menu.app.announcement" : "Co słychać?",
+   "menu.app.checkForUpdates" : "Sprawdź aktualizacje",
    "menu.app.hide" : "Ukryj",
    "menu.app.hideOthers" : "Ukryj pozostałe",
    "menu.app.quit" : "Zakończ",
@@ -89,11 +90,11 @@
    "menu.window" : "Okno",
    "menu.window.close" : "Zamknij",
    "menu.window.minimize" : "Zminimalizuj",
-   "menu.workspaces" : "Workspaces",
-   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
-   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces" : "Obszary robocze",
+   "menu.workspaces.addNewWorkspace" : "Dodaj nowy obszar roboczy...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Zamknij edytor obszaru roboczego",
    "menu.workspaces.defaultWorkspace" : "Wszystkie usługi",
-   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
+   "menu.workspaces.openWorkspaceDrawer" : "Otwórz edytor obszaru roboczego",
    "password.email.label" : "Adres email",
    "password.headline" : "Przypomnij hasło",
    "password.link.login" : "Zaloguj się na swoje konto",
@@ -117,7 +118,7 @@
    "service.errorHandler.headline" : "O nie!",
    "service.errorHandler.message" : "Błąd",
    "service.errorHandler.text" : "Nie udało się załadować {name}.",
-   "service.webviewLoader.loading" : "Loading",
+   "service.webviewLoader.loading" : "Ładowanie",
    "services.getStarted" : "Zacznij",
    "services.welcome" : "Witaj w programie Franz",
    "settings.account.account.editButton" : "Modyfikuj konta",
@@ -164,7 +165,7 @@
    "settings.app.headlineGeneral" : "Ogólne",
    "settings.app.headlineLanguage" : "Język",
    "settings.app.headlineUpdates" : "Aktualizacje",
-   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
+   "settings.app.languageDisclaimer" : "Oficjalnymi językami są Angielski i Niemiecki. Inne języki są tłumaczone przez społeczność Franz.",
    "settings.app.restartRequired" : "Zmiany. wymagają ponownego uruchomienia",
    "settings.app.subheadlineCache" : "Pamięć podręczna",
    "settings.app.translationHelp" : "Pomóż nam tłumaczyć Franz na Twój język.",
@@ -177,9 +178,9 @@
    "settings.navigation.inviteFriends" : "Zaproś znajomych",
    "settings.navigation.logout" : "Wyloguj",
    "settings.navigation.settings" : "Ustawienia",
-   "settings.navigation.team" : "Manage Team",
+   "settings.navigation.team" : "Zarządzaj Zespołem",
    "settings.navigation.yourServices" : "Twoje usługi",
-   "settings.navigation.yourWorkspaces" : "Your workspaces",
+   "settings.navigation.yourWorkspaces" : "Twoje obszary robocze",
    "settings.recipes.all" : "Wszystkie usługi",
    "settings.recipes.dev" : "Rozwojowe",
    "settings.recipes.headline" : "Dostępne usługi",
@@ -232,17 +233,17 @@
    "settings.services.discoverServices" : "Przeglądaj usługi",
    "settings.services.headline" : "Twoje usługi",
    "settings.services.noServicesAdded" : "Nie dodałeś jeszcze żadnych usług.",
-   "settings.services.servicesRequestFailed" : "Could not load your services",
+   "settings.services.servicesRequestFailed" : "Nie udało się załadować twoich usług",
    "settings.services.tooltip.isDisabled" : "Usługa jest nieaktywna",
    "settings.services.tooltip.isMuted" : "Wszystkie dźwięki są wyciszone",
    "settings.services.tooltip.notificationsDisabled" : "Powiadomienia są nieaktywne",
    "settings.services.updatedInfo" : "Zmiany zostały zapisane",
-   "settings.team.contentHeadline" : "Franz for Teams",
-   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.contentHeadline" : "Zespoły Franz",
+   "settings.team.copy" : "Franz umożliwia zespołom opcję zapraszania pracowników do zespołu wysyłając im maila z zaproszeniem i pozwala zarządzać ich subskrypcją w ustawieniach konta. Nie trać czasu na ustawianie subskrypcji dla każdego zespołu osobno, zapomnij o wielu fakturach i różnych cyklicznych opłatach - jeden zespół do zarządzania wszystkim!",
    "settings.team.headline" : "Zespół",
-   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
-   "settings.team.upgradeAction" : "Upgrade your Account",
+   "settings.team.intro" : "Czy Ty i zesół używacie programu Franz? Możesz teraz zarządzać subskrypcją Premium dla tylu kolegów, przyjaciół lub rodziny ilu chcesz, wszystko w obrębie jednego konta.",
+   "settings.team.manageAction" : "Zarządzaj zespołem na meetfranz.com",
+   "settings.team.upgradeAction" : "Ulepsz swoje konto",
    "settings.user.form.accountType.company" : "Firma",
    "settings.user.form.accountType.individual" : "Prywatne",
    "settings.user.form.accountType.label" : "Typ konta",
@@ -252,25 +253,25 @@
    "settings.user.form.firstname" : "Imię",
    "settings.user.form.lastname" : "Nazwisko",
    "settings.user.form.newPassword" : "Nowe hasło",
-   "settings.workspace.add.form.name" : "Name",
-   "settings.workspace.add.form.submitButton" : "Create workspace",
-   "settings.workspace.form.buttonDelete" : "Delete workspace",
-   "settings.workspace.form.buttonSave" : "Save workspace",
-   "settings.workspace.form.name" : "Name",
-   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
-   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
-   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
-   "settings.workspaces.headline" : "Your workspaces",
-   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspace.add.form.name" : "Imię",
+   "settings.workspace.add.form.submitButton" : "Stwórz obszar roboczy",
+   "settings.workspace.form.buttonDelete" : "Usuń obszar roboczy",
+   "settings.workspace.form.buttonSave" : "Zapisz obszar roboczy",
+   "settings.workspace.form.name" : "Imię",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Usługi w obszarze roboczym",
+   "settings.workspace.form.yourWorkspaces" : "Twoje obszary robocze",
+   "settings.workspaces.deletedInfo" : "Obszar roboczy został skasowany",
+   "settings.workspaces.headline" : "Twoje obszary robocze",
+   "settings.workspaces.noWorkspacesAdded" : "Nie dodałeś jeszcze żadnego obszaru roboczego.",
    "settings.workspaces.tryReloadWorkspaces" : "Spróbuj ponownie",
-   "settings.workspaces.updatedInfo" : "Your changes have been saved",
-   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
-   "settings.workspaces.workspaceFeatureInfo" : "Franz 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.workspacesRequestFailed" : "Could not load your workspaces",
+   "settings.workspaces.updatedInfo" : "Twoje zmiany zostały zapisane",
+   "settings.workspaces.workspaceFeatureHeadline" : "Mniej znaczy więcej: Wprowadzenie do obszarów roboczych Franz",
+   "settings.workspaces.workspaceFeatureInfo" : "Obszary robocze programu Franz pozawala Ci na skupieniu się na tym co ważne w danym momencie. Ustaw różne zestawy usług i przełączaj się między nimi w łatwiejszy sposób w dowolnym momencie. Decyduj, które usługi potrzebujesz  , więc pomagamy Ci pozostawać na szczycie gry - lub łatwiej wyłączyć się z pracy kiedy tego potrzebujesz.",
+   "settings.workspaces.workspacesRequestFailed" : "Nie można załadować obszaru roboczego",
    "sidebar.addNewService" : "Dodaj kolejną usługę",
-   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
+   "sidebar.closeWorkspaceDrawer" : "Zamknij edycję obszaru roboczego",
    "sidebar.muteApp" : "Wyłącz powiadomienia i dźwięki",
-   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
+   "sidebar.openWorkspaceDrawer" : "Otwórz edycję obszaru roboczego",
    "sidebar.settings" : "Ustawienia",
    "sidebar.unmuteApp" : "Włącz powiadomienia i dźwięki",
    "signup.company.label" : "Firma",
@@ -292,7 +293,7 @@
    "subscription.features.onpremise.mattermost" : "Dodaj prywatnie hostowane usługi takie jak Mattermost",
    "subscription.features.proxy" : "Obsługa proxy dla usług",
    "subscription.features.spellchecker" : "Wsparcie dla sprawdzania pisowni",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
+   "subscription.features.workspaces" : "Zarządzaj usługami w obszarach roboczych",
    "subscription.includedFeatures" : "Płatne konto Franz Premium obejmuje",
    "subscription.paymentSessionError" : "Nie można wczytać formularza płatności\"",
    "subscription.submit.label" : "Chcę wspierać rozwój aplikacji Franz",
@@ -312,20 +313,20 @@
    "tabs.item.reload" : "Przeładuj",
    "validation.email" : "Pole {field} nie jest poprawne",
    "validation.minLength" : "Pole {field} powinno składać się z co najmniej {length} znaków",
-   "validation.oneRequired" : "At least one is required",
+   "validation.oneRequired" : "Przynajmniej jeden jest wymagany",
    "validation.required" : "Pole {field} jest wymagane",
    "validation.url" : "Pole {field} nie jest poprawnym ciągiem URL.",
    "welcome.loginButton" : "Zaloguj się na swoje konto",
    "welcome.signupButton" : "Stwórz darmowe konto",
-   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Dodaj nowy obszar roboczy",
    "workspaceDrawer.allServices" : "Wszystkie usługi",
-   "workspaceDrawer.headline" : "Workspaces",
-   "workspaceDrawer.item.contextMenuEdit" : "edit",
-   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
-   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
-   "workspaceDrawer.proFeatureBadge" : "Premium feature",
-   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
-   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz 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",
-   "workspaces.switchingIndicator.switchingTo" : "Switching to"
+   "workspaceDrawer.headline" : "Obszary robocze",
+   "workspaceDrawer.item.contextMenuEdit" : "Edycja",
+   "workspaceDrawer.item.noServicesAddedYet" : "Żadne usługi nie zostały jeszcze dodane",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Stwórz pierwszy obszar roboczy",
+   "workspaceDrawer.proFeatureBadge" : "Funkcje Premium",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Aktywuj ponownie konto premium",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Obszary robocze programu Franz pozawala Ci na skupieniu się na tym co ważne w danym momencie. Ustaw różne zestawy usług i przełączaj się między nimi w łatwiejszy sposób w dowolnym momencie. <\/p><p>Decyduj, które usługi potrzebujesz  , więc pomagamy Ci pozostawać na szczycie gry - lub łatwiej wyłączyć się z pracy kiedy tego potrzebujesz.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edytuj ustawienia obszaru roboczego",
+   "workspaces.switchingIndicator.switchingTo" : "Przełącz do"
 }
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 4ad2fac08..27fd796a4 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -1,7 +1,7 @@
 {
-   "app.errorHandler.action" : "Recarregar",
+   "app.errorHandler.action" : "Atualizar",
    "app.errorHandler.headline" : "Alguma coisa deu errado",
-   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "feature.announcements.changelog.headline" : "Mudanças no Franz {version}",
    "feature.delayApp.action" : "Adquira uma licença Franz Supporter",
    "feature.delayApp.headline" : "Por favor, adquira uma licença Franz Supporter para pular o tempo de espera",
    "feature.delayApp.text" : "Franz continuará em {seconds} segundos.",
@@ -10,7 +10,7 @@
    "feature.shareFranz.action.twitter" : "Compartilhar no Twitter",
    "feature.shareFranz.headline" : "Franz é melhor em grupo!",
    "feature.shareFranz.shareText.email" : "Eu adicionei {count} serviços ao Franz! Adquira o aplicativo gratuito para WhatsApp, Messenger, Slack, Skype e mais em www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.shareText.twitter" : "Eu adicionei uma contagem de serviços para o Franz! Baixe gratuitamente o aplicativo para WhatsApp, Messenger, Slack, Skype e outros em www.meetfranz.com \/cc @FranzMessenger",
    "feature.shareFranz.text" : "Conte aos seus amigos e colegas o quão incrível Franz é e nos ajude a espalhar a mensagem.  ",
    "global.api.unhealthy" : "Não foi possível conectar-se aos serviços on-line do Franz.",
    "global.notConnectedToTheInternet" : "Você não está conectado à internet",
@@ -44,7 +44,8 @@
    "login.submit.label" : "Entrar",
    "login.tokenExpired" : "Sua sessão expirou, faça o login novamente.",
    "menu.app.about" : "Sobre Franz",
-   "menu.app.announcement" : "What's new?",
+   "menu.app.announcement" : "Quais as novidades?",
+   "menu.app.checkForUpdates" : "Verificar se há atualizações",
    "menu.app.hide" : "Ocultar",
    "menu.app.hideOthers" : "Ocultar Outros",
    "menu.app.quit" : "Sair",
@@ -89,11 +90,11 @@
    "menu.window" : "Modo Janela",
    "menu.window.close" : "Fechar",
    "menu.window.minimize" : "Minimizar",
-   "menu.workspaces" : "Workspaces",
-   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
-   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces" : "Áreas de trabalho",
+   "menu.workspaces.addNewWorkspace" : "Adicionar nova área de trabalho...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Fechar menu da área de trabalho",
    "menu.workspaces.defaultWorkspace" : "Todos os serviços",
-   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
+   "menu.workspaces.openWorkspaceDrawer" : "Abrir o menu da área de trabalho",
    "password.email.label" : "E-mail",
    "password.headline" : "Trocar senha",
    "password.link.login" : "Fazer login na sua conta",
@@ -117,7 +118,7 @@
    "service.errorHandler.headline" : "Ah, não!",
    "service.errorHandler.message" : "Erro",
    "service.errorHandler.text" : "{name} não pôde ser carregado.",
-   "service.webviewLoader.loading" : "Loading",
+   "service.webviewLoader.loading" : "Carregando",
    "services.getStarted" : "Iniciar",
    "services.welcome" : "Bem-vindo ao Franz!",
    "settings.account.account.editButton" : "Editar conta",
@@ -164,9 +165,9 @@
    "settings.app.headlineGeneral" : "Geral",
    "settings.app.headlineLanguage" : "Idioma",
    "settings.app.headlineUpdates" : "Atualizações",
-   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
-   "settings.app.restartRequired" : "As atualizações exigem reiniciar o sistema",
-   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.languageDisclaimer" : "As traduções oficiais são em inglês e alemão. As demais traduções são baseadas na ajuda da comunidade.",
+   "settings.app.restartRequired" : "As mudanças exigem reiniciar o sistema",
+   "settings.app.subheadlineCache" : "memória cache",
    "settings.app.translationHelp" : "Ajude-nos a traduzir o Franz para seu idioma.",
    "settings.app.updateStatusAvailable" : "Atualização disponível, baixando...",
    "settings.app.updateStatusSearching" : "Buscando atualizações",
@@ -177,9 +178,9 @@
    "settings.navigation.inviteFriends" : "Convidar Amigos",
    "settings.navigation.logout" : "Sair",
    "settings.navigation.settings" : "Ajustes",
-   "settings.navigation.team" : "Manage Team",
+   "settings.navigation.team" : "Administrar a equipe",
    "settings.navigation.yourServices" : "Seus serviços",
-   "settings.navigation.yourWorkspaces" : "Your workspaces",
+   "settings.navigation.yourWorkspaces" : "Suas áreas de trabalho",
    "settings.recipes.all" : "Todos os serviços",
    "settings.recipes.dev" : "Desenvolvimento",
    "settings.recipes.headline" : "Serviços disponíveis",
@@ -237,12 +238,12 @@
    "settings.services.tooltip.isMuted" : "Sem som",
    "settings.services.tooltip.notificationsDisabled" : "Notificações desativadas",
    "settings.services.updatedInfo" : "Suas mudanças foram gravadas",
-   "settings.team.contentHeadline" : "Franz for Teams",
-   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.contentHeadline" : "Franz para Equipes",
+   "settings.team.copy" : "\"Franz para Equipes\" possui a opção de convidar ajudantes para a sua equipe através de mensagens por e-mail e gerenciar as inscrições deles em suas preferências de conta. Não perca tempo configurando as inscrições para membro da equipe individualmente, esqueça as múltiplas faturas e tempos de pagamento. Uma regra universal para todos os membros da equipe.",
    "settings.team.headline" : "Equipe",
-   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
-   "settings.team.upgradeAction" : "Upgrade your Account",
+   "settings.team.intro" : "Você e sua equipe usam Franz? Você pode agora administrar as inscrições pagas de todos os seus colegas, amigos e membros da família que você quiser, tudo isso em uma única conta.",
+   "settings.team.manageAction" : "Gerencie sua Equipe no meetfranz.com",
+   "settings.team.upgradeAction" : "Atualize a sua conta para versão paga",
    "settings.user.form.accountType.company" : "Empresa",
    "settings.user.form.accountType.individual" : "Pessoal",
    "settings.user.form.accountType.label" : "Tipo de conta",
@@ -253,24 +254,24 @@
    "settings.user.form.lastname" : "Sobrenome",
    "settings.user.form.newPassword" : "Nova senha",
    "settings.workspace.add.form.name" : "Nome",
-   "settings.workspace.add.form.submitButton" : "Create workspace",
-   "settings.workspace.form.buttonDelete" : "Delete workspace",
-   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.add.form.submitButton" : "Criar workspace",
+   "settings.workspace.form.buttonDelete" : "Apagar workspace",
+   "settings.workspace.form.buttonSave" : "Salvar workspace",
    "settings.workspace.form.name" : "Nome",
-   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
-   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
-   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
-   "settings.workspaces.headline" : "Your workspaces",
-   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
-   "settings.workspaces.tryReloadWorkspaces" : "Try again",
-   "settings.workspaces.updatedInfo" : "Your changes have been saved",
-   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
-   "settings.workspaces.workspaceFeatureInfo" : "Franz 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.workspacesRequestFailed" : "Could not load your workspaces",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Serviços neste Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Seus workspaces",
+   "settings.workspaces.deletedInfo" : "Área de trabalho deletada",
+   "settings.workspaces.headline" : "Suas Áreas de Trabalho",
+   "settings.workspaces.noWorkspacesAdded" : "Você não possui nenhuma área de trabalho adicionadas anteriormente.",
+   "settings.workspaces.tryReloadWorkspaces" : "Tente de novo",
+   "settings.workspaces.updatedInfo" : "Suas mudanças foram salvas",
+   "settings.workspaces.workspaceFeatureHeadline" : "Menos é Mais: Introduzindo Workspaces do Franz",
+   "settings.workspaces.workspaceFeatureInfo" : "As áreas de trabalho do Franz permite você focar no que realmente é importante agora. Configure diferentes conjuntos de serviços e alterne entre eles facilmente em qualquer momento. Você decide quais serviços você precisa e onde deseja colocá-los, então nós podemos te ajudar a aumentar a produtividade de suas tarefas. Ou facilmente deletar os aplicativos que você nunca irá precisar.",
+   "settings.workspaces.workspacesRequestFailed" : "Não foi possível carregar suas áreas de trabalho",
    "sidebar.addNewService" : "Adicionar novo serviço",
-   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
+   "sidebar.closeWorkspaceDrawer" : "Fechar o menu da área de trabalho",
    "sidebar.muteApp" : "Desativar notificações e áudio",
-   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
+   "sidebar.openWorkspaceDrawer" : "Abrir menu da área de trabalho",
    "sidebar.settings" : "Ajustes",
    "sidebar.unmuteApp" : "Ativar notificações e áudio",
    "signup.company.label" : "Empresa",
@@ -292,7 +293,7 @@
    "subscription.features.onpremise.mattermost" : "Adicionar serviços locais\/hospedados como o Mattermost",
    "subscription.features.proxy" : "Suporte de proxy para serviços",
    "subscription.features.spellchecker" : "Suporte para corretor ortográfico",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
+   "subscription.features.workspaces" : "Organize seus serviços em áreas de trabalho",
    "subscription.includedFeatures" : "A conta Apoiador Franz Premium inclui",
    "subscription.paymentSessionError" : "Não foi possível abrir o formulário de pagamento",
    "subscription.submit.label" : "Eu quero apoiar o desenvolvimento do Franz",
@@ -317,15 +318,15 @@
    "validation.url" : "{campo} essa URL não é válida",
    "welcome.loginButton" : "Entrar na sua conta",
    "welcome.signupButton" : "Criar uma conta grátis",
-   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Adicionar uma nova área de trabalho",
    "workspaceDrawer.allServices" : "Todos os serviços",
-   "workspaceDrawer.headline" : "Workspaces",
-   "workspaceDrawer.item.contextMenuEdit" : "edit",
-   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
-   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
-   "workspaceDrawer.proFeatureBadge" : "Premium feature",
-   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
-   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz 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",
-   "workspaces.switchingIndicator.switchingTo" : "Switching to"
+   "workspaceDrawer.headline" : "Áreas de Trabalho",
+   "workspaceDrawer.item.contextMenuEdit" : "editar",
+   "workspaceDrawer.item.noServicesAddedYet" : "Nenhum serviço adicionado anteriormente",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Crie sua primeira área de trabalho",
+   "workspaceDrawer.proFeatureBadge" : "Vantagem paga oferecida aos assinantes",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reative sua conta paga",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>As áreas de trabalho do Franz te ajuda a focar no que realmente é importante agora. Configure diferente cenários para serviços e mude entre eles facilmente em qualquer momento. <\/p><p>Você decide quais serviços precisa e onde deseja posicioná-los, e então nós iremos te ajudar em aumentar a sua produtividade. Você pode desligar os serviços que não são úteis para você.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Editar configurações das áreas de trabalho",
+   "workspaces.switchingIndicator.switchingTo" : "Mudando para"
 }
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 302284ab8..668db12a2 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -15,7 +15,7 @@
    "global.api.unhealthy" : "Não foi possível estabelecer ligação aos serviços do Franz",
    "global.notConnectedToTheInternet" : "Não estás ligado à Internet",
    "global.spellchecker.useDefault" : "Utilizar o Sistema por Omissão ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect" : "Detectar a lingua automaticamente",
    "global.spellchecking.autodetect.short" : "Automatic",
    "global.spellchecking.language" : "Linguagem para correção ortográfica",
    "import.headline" : "Importa os teus serviços do Franz",
@@ -44,7 +44,8 @@
    "login.submit.label" : "Iniciar sessão",
    "login.tokenExpired" : "A sua sessão expirou, inicie sessão novamente.",
    "menu.app.about" : "Sobre o Franz",
-   "menu.app.announcement" : "What's new?",
+   "menu.app.announcement" : "O que há de novo?",
+   "menu.app.checkForUpdates" : "Procurar atualizações",
    "menu.app.hide" : "Ocultar",
    "menu.app.hideOthers" : "Ocultar Outros",
    "menu.app.quit" : "Sair",
@@ -72,9 +73,9 @@
    "menu.help.support" : "Suporte",
    "menu.help.tos" : "Termos do Serviço",
    "menu.services" : "Serviços",
-   "menu.services.activatePreviousService" : "Activate previous service",
+   "menu.services.activatePreviousService" : "Activar o serviço anterior",
    "menu.services.addNewService" : "Adicionar Novo Serviço...",
-   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.services.setNextServiceActive" : "Activar o próximo serviço",
    "menu.view" : "Ver",
    "menu.view.enterFullScreen" : "Ativar Modo de Ecrã Completo",
    "menu.view.exitFullScreen" : "Sair do Modo de Ecrã Completo",
@@ -89,11 +90,11 @@
    "menu.window" : "Janela",
    "menu.window.close" : "Fechar",
    "menu.window.minimize" : "Minimizar",
-   "menu.workspaces" : "Workspaces",
-   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
-   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces" : "Espaços de trabalho",
+   "menu.workspaces.addNewWorkspace" : "Adicionar novo Espaço de trabalho",
+   "menu.workspaces.closeWorkspaceDrawer" : "Fechar a janela do Espaço de trabalho",
    "menu.workspaces.defaultWorkspace" : "Todos os serviços",
-   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
+   "menu.workspaces.openWorkspaceDrawer" : "Abrir a janela do Espaço de trabalho",
    "password.email.label" : "Endereço de e-mail",
    "password.headline" : "Repor a minha palavra-passe",
    "password.link.login" : "Iniciar sessão",
@@ -117,7 +118,7 @@
    "service.errorHandler.headline" : "Oh não!",
    "service.errorHandler.message" : "Erro",
    "service.errorHandler.text" : "{name} falhou o carregamento",
-   "service.webviewLoader.loading" : "Loading",
+   "service.webviewLoader.loading" : "A ler",
    "services.getStarted" : "Vamos começar",
    "services.welcome" : "Bem-vindo ao Franz",
    "settings.account.account.editButton" : "Editar conta",
@@ -177,9 +178,9 @@
    "settings.navigation.inviteFriends" : "Convide Amigos",
    "settings.navigation.logout" : "Terminar sessão",
    "settings.navigation.settings" : "Definições",
-   "settings.navigation.team" : "Manage Team",
+   "settings.navigation.team" : "Gerir a equipa",
    "settings.navigation.yourServices" : "Os seus serviços",
-   "settings.navigation.yourWorkspaces" : "Your workspaces",
+   "settings.navigation.yourWorkspaces" : "Os teus Espaços de trabalho",
    "settings.recipes.all" : "Todos os serviços",
    "settings.recipes.dev" : "Desenvolvimento",
    "settings.recipes.headline" : "Serviços disponíveis",
@@ -232,17 +233,17 @@
    "settings.services.discoverServices" : "Descobrir serviços",
    "settings.services.headline" : "Os seus serviços",
    "settings.services.noServicesAdded" : "Ainda não adicionou nenhum serviço.",
-   "settings.services.servicesRequestFailed" : "Could not load your services",
+   "settings.services.servicesRequestFailed" : "Não foi possível ler os teus serviços",
    "settings.services.tooltip.isDisabled" : "O serviço está desativado",
    "settings.services.tooltip.isMuted" : "Todos os sons estão silenciados",
    "settings.services.tooltip.notificationsDisabled" : "As notificações estão desativadas",
    "settings.services.updatedInfo" : "As alterações foram guardadas",
-   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.contentHeadline" : "Franz para equipas",
    "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
    "settings.team.headline" : "Equipa",
    "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
-   "settings.team.upgradeAction" : "Upgrade your Account",
+   "settings.team.manageAction" : "Gerir a tua Equipa em meetfranz.com",
+   "settings.team.upgradeAction" : "Actualiza a tua conta",
    "settings.user.form.accountType.company" : "Empresa",
    "settings.user.form.accountType.individual" : "Indivíduo",
    "settings.user.form.accountType.label" : "Tipo de conta",
@@ -253,24 +254,24 @@
    "settings.user.form.lastname" : "Último Nome",
    "settings.user.form.newPassword" : "Nova palavra-passe",
    "settings.workspace.add.form.name" : "Nome",
-   "settings.workspace.add.form.submitButton" : "Create workspace",
-   "settings.workspace.form.buttonDelete" : "Delete workspace",
-   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.add.form.submitButton" : "Criar um Espaço de trabalho",
+   "settings.workspace.form.buttonDelete" : "Apagar um Espaço de trabalho",
+   "settings.workspace.form.buttonSave" : "Gravar um Espaço de trabalho",
    "settings.workspace.form.name" : "Nome",
    "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
-   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
-   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
-   "settings.workspaces.headline" : "Your workspaces",
-   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspace.form.yourWorkspaces" : "Os teus Espaços de trabalho",
+   "settings.workspaces.deletedInfo" : "O Espaço de trabalho foi apagado",
+   "settings.workspaces.headline" : "Os teus Espaços de trabalho",
+   "settings.workspaces.noWorkspacesAdded" : "Ainda não adicionou nenhum Espaço de trabalho",
    "settings.workspaces.tryReloadWorkspaces" : "Tentar novamente",
-   "settings.workspaces.updatedInfo" : "Your changes have been saved",
-   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.updatedInfo" : "As suas alterações foram gravadas",
+   "settings.workspaces.workspaceFeatureHeadline" : "Menos é Mais: Introduzindo os Espaço de trabalho Franz",
    "settings.workspaces.workspaceFeatureInfo" : "Franz 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.workspacesRequestFailed" : "Could not load your workspaces",
    "sidebar.addNewService" : "Adicionar um novo serviço",
-   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
+   "sidebar.closeWorkspaceDrawer" : "Fechar a janela do Espaço de trabalho",
    "sidebar.muteApp" : "Desativar notificações e áudio",
-   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
+   "sidebar.openWorkspaceDrawer" : "Abrir a janela do Espaço de trabalho",
    "sidebar.settings" : "Definições",
    "sidebar.unmuteApp" : "Ativar notificações e áudio",
    "signup.company.label" : "Empresa",
@@ -319,7 +320,7 @@
    "welcome.signupButton" : "Criar uma conta gratuita",
    "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
    "workspaceDrawer.allServices" : "Todos os serviços",
-   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.headline" : "Espaços de trabalho",
    "workspaceDrawer.item.contextMenuEdit" : "edit",
    "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
    "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 97ad98361..4d20d5745 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -45,6 +45,7 @@
    "login.tokenExpired" : "Сессия устарела, пожалуйста, войдите снова.",
    "menu.app.about" : "О Franz",
    "menu.app.announcement" : "Что нового?",
+   "menu.app.checkForUpdates" : "Проверить обновления",
    "menu.app.hide" : "Скрыть",
    "menu.app.hideOthers" : "Скрыть остальные",
    "menu.app.quit" : "Выйти",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 7af29ef1c..3b051e975 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -1,23 +1,23 @@
 {
    "app.errorHandler.action" : "Obnoviť",
-   "app.errorHandler.headline" : "Something went wrong",
-   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
+   "app.errorHandler.headline" : "Niečo sa pokazilo",
+   "feature.announcements.changelog.headline" : "Zmeny vo Franz {version}",
+   "feature.delayApp.action" : "Získajte licenciu pre Franz podporu",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
-   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
-   "feature.shareFranz.action.email" : "Send as email",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.delayApp.text" : "Franz bude pokračovať v {seconds} seundách.",
+   "feature.shareFranz.action.email" : "Odoslať ako e-mail",
+   "feature.shareFranz.action.facebook" : "Zdielať na Facebook-u",
+   "feature.shareFranz.action.twitter" : "Zdieľať na Twitter-i",
    "feature.shareFranz.headline" : "Franz is better together!",
    "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
    "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
    "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Nedá sa pripojiť k online službám Franz",
    "global.notConnectedToTheInternet" : "Nie ste pripojení k internetu.",
-   "global.spellchecker.useDefault" : "Use System Default ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
-   "global.spellchecking.autodetect.short" : "Automatic",
-   "global.spellchecking.language" : "Spell checking language",
+   "global.spellchecker.useDefault" : "Použiť predvolené nastavenie systému ({default})",
+   "global.spellchecking.autodetect" : "Automaticky rozpoznať jazyk",
+   "global.spellchecking.autodetect.short" : "Automatický",
+   "global.spellchecking.language" : "Jazyk kontroly pravopisu",
    "import.headline" : "Importovať vaše služby z Franz 4",
    "import.notSupportedHeadline" : "Služby zatiaľ nie sú podporované vo verzii Franz 5",
    "import.skip.label" : "Chcem pridať služby ručne",
@@ -44,7 +44,8 @@
    "login.submit.label" : "Prihlásiť sa",
    "login.tokenExpired" : "Vaša relácia vypršala, prihláste sa prosím znovu.",
    "menu.app.about" : "O aplikácii",
-   "menu.app.announcement" : "What's new?",
+   "menu.app.announcement" : "Čo je nové?",
+   "menu.app.checkForUpdates" : "Skontrolovať aktualizácie",
    "menu.app.hide" : "Skryť",
    "menu.app.hideOthers" : "Skryť ostatné",
    "menu.app.quit" : "Ukončiť",
@@ -72,9 +73,9 @@
    "menu.help.support" : "Podpora",
    "menu.help.tos" : "Podmienky použitia",
    "menu.services" : "Služby",
-   "menu.services.activatePreviousService" : "Activate previous service",
+   "menu.services.activatePreviousService" : "Aktivovať predchádzajúcu službu",
    "menu.services.addNewService" : "Pridať novú službu...",
-   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.services.setNextServiceActive" : "Aktivujte ďalšiu službu",
    "menu.view" : "Zobraziť",
    "menu.view.enterFullScreen" : "Na celú obrazovku",
    "menu.view.exitFullScreen" : "Ukončiť režim na celú obrazovku",
@@ -89,8 +90,8 @@
    "menu.window" : "Okno",
    "menu.window.close" : "Zatvoriť",
    "menu.window.minimize" : "Minimalizovať",
-   "menu.workspaces" : "Workspaces",
-   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces" : "Pracovný priestor",
+   "menu.workspaces.addNewWorkspace" : "Pridať nový pracovný priestor ...",
    "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
    "menu.workspaces.defaultWorkspace" : "Všetky služby",
    "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
@@ -101,7 +102,7 @@
    "password.noUser" : "Používateľ s touto e-mailovou adresou nebol nájdený",
    "password.submit.label" : "Odoslať",
    "password.successInfo" : "Skontrolujte prosím váš e-mail",
-   "premiumFeature.button.upgradeAccount" : "Upgrade account",
+   "premiumFeature.button.upgradeAccount" : "Upgradovať účet",
    "pricing.headline" : "Podporiť Franz",
    "pricing.link.skipPayment" : "Nechcem podporiť vývoj aplikácie Franz.",
    "pricing.submit.label" : "Chcem podporiť vývoj aplikácie Franz",
@@ -117,7 +118,7 @@
    "service.errorHandler.headline" : "Ale nie!",
    "service.errorHandler.message" : "Chyba",
    "service.errorHandler.text" : "{name} has failed to load.",
-   "service.webviewLoader.loading" : "Loading",
+   "service.webviewLoader.loading" : "Načítava",
    "services.getStarted" : "Začíname",
    "services.welcome" : "Vítajte v aplikácii Franz",
    "settings.account.account.editButton" : "Upraviť účet",
@@ -149,7 +150,7 @@
    "settings.app.form.autoLaunchInBackground" : "Otvoriť na pozadí",
    "settings.app.form.autoLaunchOnStart" : "Spustiť Franz pri štarte",
    "settings.app.form.beta" : "Vrátane beta verzií",
-   "settings.app.form.darkMode" : "Join the Dark Side",
+   "settings.app.form.darkMode" : "Spustiť Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Zapnúť GPU zrýchlenie",
    "settings.app.form.enableSpellchecking" : "Zapnúť kontrolu pravopisu",
    "settings.app.form.enableSystemTray" : "Zobrazovať Franz v systémovej lište",
@@ -164,7 +165,7 @@
    "settings.app.headlineGeneral" : "Všeobecné",
    "settings.app.headlineLanguage" : "Jazyk",
    "settings.app.headlineUpdates" : "Aktualizácie",
-   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
+   "settings.app.languageDisclaimer" : "Oficiálne preklady sú angličtina a nemčina. Všetky ostatné jazyky sú preklady založené na komunite.",
    "settings.app.restartRequired" : "Zmeny vyžadujú reštart",
    "settings.app.subheadlineCache" : "Vyrovnávacia pamäť",
    "settings.app.translationHelp" : "Pomôžte nám preložiť Franz do svojho jazyka.",
@@ -177,9 +178,9 @@
    "settings.navigation.inviteFriends" : "Pozvať priateľov",
    "settings.navigation.logout" : "Odhlásiť sa",
    "settings.navigation.settings" : "Nastavenia",
-   "settings.navigation.team" : "Manage Team",
+   "settings.navigation.team" : "Spravovať tím",
    "settings.navigation.yourServices" : "Vaše služby",
-   "settings.navigation.yourWorkspaces" : "Your workspaces",
+   "settings.navigation.yourWorkspaces" : "Tvoje pracovné priestory",
    "settings.recipes.all" : "Všetky služby",
    "settings.recipes.dev" : "Vývoj",
    "settings.recipes.headline" : "Dostupné služby",
@@ -201,7 +202,7 @@
    "settings.service.form.editServiceHeadline" : "Upraviť {name}",
    "settings.service.form.enableAudio" : "Zapnúť zvuk",
    "settings.service.form.enableBadge" : "Zobraziť symboly neprečítaných správ",
-   "settings.service.form.enableDarkMode" : "Enable Dark Mode",
+   "settings.service.form.enableDarkMode" : "Zapnúť Dark Mode",
    "settings.service.form.enableNotification" : "Povoliť oznámenia",
    "settings.service.form.enableService" : "Povoliť službu",
    "settings.service.form.headlineBadges" : "Symboly neprečítaných správ",
@@ -216,12 +217,12 @@
    "settings.service.form.name" : "Meno",
    "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Settings",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy settings will not synced with the Franz servers.",
-   "settings.service.form.proxy.isEnabled" : "Use Proxy",
-   "settings.service.form.proxy.password" : "Password (optional)",
+   "settings.service.form.proxy.info" : "Nastavenia servera proxy sa nebudú synchronizovať so servermi Franz.",
+   "settings.service.form.proxy.isEnabled" : "Použiť Proxy",
+   "settings.service.form.proxy.password" : "Heslo (voliteľné)",
    "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
-   "settings.service.form.proxy.user" : "User (optional)",
+   "settings.service.form.proxy.restartInfo" : "Po zmene nastavení servera proxy reštartujte Franz.",
+   "settings.service.form.proxy.user" : "Používateľ (voliteľné)",
    "settings.service.form.saveButton" : "Uložiť službu",
    "settings.service.form.tabHosted" : "Hostované",
    "settings.service.form.tabOnPremise" : "Vlastné hostovanie ⭐️",
@@ -232,17 +233,17 @@
    "settings.services.discoverServices" : "Preskúmať služby",
    "settings.services.headline" : "Vaše služby",
    "settings.services.noServicesAdded" : "Doposiaľ ste nepridali žiadne služby.",
-   "settings.services.servicesRequestFailed" : "Could not load your services",
+   "settings.services.servicesRequestFailed" : "Nepodarilo sa načítať vaše služby",
    "settings.services.tooltip.isDisabled" : "Služba je vypnutá",
    "settings.services.tooltip.isMuted" : "Všetky zvuky sú stíšené",
    "settings.services.tooltip.notificationsDisabled" : "Oznámenia sú vypnuté",
    "settings.services.updatedInfo" : "Vaše zmeny boli uložené",
-   "settings.team.contentHeadline" : "Franz for Teams",
-   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.contentHeadline" : "Franz pre tímy",
+   "settings.team.copy" : "Franz for Teams vám dáva možnosť pozvať spolupracovníkov do vášho tímu odoslaním e-mailových pozvánok a spravovaním ich odberov v preferenciách vášho účtu. Nestrácajte čas vytváraním predplatného pre každého člena tímu jednotlivo, zabudnite na viac faktúr a rôzne fakturačné cykly - jeden tím bude pre všetkých!",
    "settings.team.headline" : "Tím",
-   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
-   "settings.team.upgradeAction" : "Upgrade your Account",
+   "settings.team.intro" : "Vy a váš tím používate Franz? Teraz môžete spravovať prémiové predplatné pre toľko kolegov, priateľov alebo rodinných príslušníkov, koľko chcete, všetko z jedného účtu.",
+   "settings.team.manageAction" : "Spravujte svoj tím na adrese meetfranz.com",
+   "settings.team.upgradeAction" : "Vylepšite svoj účet",
    "settings.user.form.accountType.company" : "Spoločnosť",
    "settings.user.form.accountType.individual" : "Osoba",
    "settings.user.form.accountType.label" : "Typ účtu",
@@ -253,18 +254,18 @@
    "settings.user.form.lastname" : "Priezvisko",
    "settings.user.form.newPassword" : "Nové heslo",
    "settings.workspace.add.form.name" : "Meno",
-   "settings.workspace.add.form.submitButton" : "Create workspace",
-   "settings.workspace.form.buttonDelete" : "Delete workspace",
-   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.add.form.submitButton" : "Vytvoriť pracovný priestor",
+   "settings.workspace.form.buttonDelete" : "Vymazať pracovný priestor",
+   "settings.workspace.form.buttonSave" : "Uložiť pracovný priestor",
    "settings.workspace.form.name" : "Meno",
-   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
-   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
-   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
-   "settings.workspaces.headline" : "Your workspaces",
-   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Služby v tomto pracovnom priestore",
+   "settings.workspace.form.yourWorkspaces" : "Tvoje pracovné priestory",
+   "settings.workspaces.deletedInfo" : "Pracovný priestor bol odstránený",
+   "settings.workspaces.headline" : "Tvoje pracovné priestory",
+   "settings.workspaces.noWorkspacesAdded" : "Zatiaľ si nepridal žiadne pracovné priestory.",
    "settings.workspaces.tryReloadWorkspaces" : "Skúsiť znova",
    "settings.workspaces.updatedInfo" : "Vaše zmeny boli uložené",
-   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureHeadline" : "Menej je viac: Predstavenie Franz Pracovné priestory",
    "settings.workspaces.workspaceFeatureInfo" : "Franz 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.workspacesRequestFailed" : "Could not load your workspaces",
    "sidebar.addNewService" : "Pridať novú službu",
@@ -319,7 +320,7 @@
    "welcome.signupButton" : "Vytvoriť účet zdarma",
    "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
    "workspaceDrawer.allServices" : "Všetky služby",
-   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.headline" : "Pracovný priestor",
    "workspaceDrawer.item.contextMenuEdit" : "edit",
    "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
    "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index e5962566b..6ba059af8 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -45,6 +45,7 @@
    "login.tokenExpired" : "Vaša sesija je istekla, prijavite se ponovo.",
    "menu.app.about" : "O Francu",
    "menu.app.announcement" : "What's new?",
+   "menu.app.checkForUpdates" : "Potraži ažuriranja",
    "menu.app.hide" : "Sakrij",
    "menu.app.hideOthers" : "Sakrij ostale",
    "menu.app.quit" : "Izađi",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 69c5ede37..d8200b4f3 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -45,6 +45,7 @@
    "login.tokenExpired" : "Oturum zaman aşımına uğradı, lütfen tekrar giriş yapın.",
    "menu.app.about" : "Franz Hakkında",
    "menu.app.announcement" : "What's new?",
+   "menu.app.checkForUpdates" : "Güncellemeleri kontrol et",
    "menu.app.hide" : "Gizle",
    "menu.app.hideOthers" : "Diğerlerini Gizle",
    "menu.app.quit" : "Çıkış",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 113665f5f..8d68590fb 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -45,6 +45,7 @@
    "login.tokenExpired" : "Ваша сесія закінчилась, будь ласка, увійдіть знову.",
    "menu.app.about" : "Про Franz",
    "menu.app.announcement" : "What's new?",
+   "menu.app.checkForUpdates" : "Перевірити наявність оновлень",
    "menu.app.hide" : "Приховати",
    "menu.app.hideOthers" : "Приховати інші",
    "menu.app.quit" : "Вийти",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index 34bd2158c..aa6247063 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -45,6 +45,7 @@
    "login.tokenExpired" : "您的登入已過期，請重新登入。",
    "menu.app.about" : "關於 Franz",
    "menu.app.announcement" : "What's new?",
+   "menu.app.checkForUpdates" : "檢查更新",
    "menu.app.hide" : "隱藏",
    "menu.app.hideOthers" : "隱藏其他",
    "menu.app.quit" : "結束",
diff --git a/src/i18n/messages/src/components/AppUpdateInfoBar.json b/src/i18n/messages/src/components/AppUpdateInfoBar.json
new file mode 100644
index 000000000..c4c2d0cae
--- /dev/null
+++ b/src/i18n/messages/src/components/AppUpdateInfoBar.json
@@ -0,0 +1,41 @@
+[
+  {
+    "id": "infobar.updateAvailable",
+    "defaultMessage": "!!!A new update for Franz is available.",
+    "file": "src/components/AppUpdateInfoBar.js",
+    "start": {
+      "line": 9,
+      "column": 19
+    },
+    "end": {
+      "line": 12,
+      "column": 3
+    }
+  },
+  {
+    "id": "infobar.buttonChangelog",
+    "defaultMessage": "!!!Changelog",
+    "file": "src/components/AppUpdateInfoBar.js",
+    "start": {
+      "line": 13,
+      "column": 13
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "infobar.buttonInstallUpdate",
+    "defaultMessage": "!!!Restart & install update",
+    "file": "src/components/AppUpdateInfoBar.js",
+    "start": {
+      "line": 17,
+      "column": 23
+    },
+    "end": {
+      "line": 20,
+      "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
index 26b8ce040..190c5dff7 100644
--- a/src/i18n/messages/src/components/layout/AppLayout.json
+++ b/src/i18n/messages/src/components/layout/AppLayout.json
@@ -4,24 +4,11 @@
     "defaultMessage": "!!!Your services have been updated.",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 27,
+      "line": 26,
       "column": 19
     },
     "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "infobar.updateAvailable",
-    "defaultMessage": "!!!A new update for Franz is available.",
-    "file": "src/components/layout/AppLayout.js",
-    "start": {
-      "line": 31,
-      "column": 19
-    },
-    "end": {
-      "line": 34,
+      "line": 29,
       "column": 3
     }
   },
@@ -30,37 +17,11 @@
     "defaultMessage": "!!!Reload services",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 35,
+      "line": 30,
       "column": 24
     },
     "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "infobar.buttonChangelog",
-    "defaultMessage": "!!!Changelog",
-    "file": "src/components/layout/AppLayout.js",
-    "start": {
-      "line": 39,
-      "column": 13
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  },
-  {
-    "id": "infobar.buttonInstallUpdate",
-    "defaultMessage": "!!!Restart & install update",
-    "file": "src/components/layout/AppLayout.js",
-    "start": {
-      "line": 43,
-      "column": 23
-    },
-    "end": {
-      "line": 46,
+      "line": 33,
       "column": 3
     }
   },
@@ -69,11 +30,11 @@
     "defaultMessage": "!!!Could not load services and user information",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 47,
+      "line": 34,
       "column": 26
     },
     "end": {
-      "line": 50,
+      "line": 37,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/helpers/validation-helpers.json b/src/i18n/messages/src/helpers/validation-helpers.json
index 86bfe1500..6be1d33e9 100644
--- a/src/i18n/messages/src/helpers/validation-helpers.json
+++ b/src/i18n/messages/src/helpers/validation-helpers.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Field is required",
     "file": "src/helpers/validation-helpers.js",
     "start": {
-      "line": 4,
+      "line": 5,
       "column": 12
     },
     "end": {
-      "line": 7,
+      "line": 8,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Email not valid",
     "file": "src/helpers/validation-helpers.js",
     "start": {
-      "line": 8,
+      "line": 9,
       "column": 9
     },
     "end": {
-      "line": 11,
+      "line": 12,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Not a valid URL",
     "file": "src/helpers/validation-helpers.js",
     "start": {
-      "line": 12,
+      "line": 13,
       "column": 7
     },
     "end": {
-      "line": 15,
+      "line": 16,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Too few characters",
     "file": "src/helpers/validation-helpers.js",
     "start": {
-      "line": 16,
+      "line": 17,
       "column": 13
     },
     "end": {
-      "line": 19,
+      "line": 20,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!At least one is required",
     "file": "src/helpers/validation-helpers.js",
     "start": {
-      "line": 20,
+      "line": 21,
       "column": 15
     },
     "end": {
-      "line": 23,
+      "line": 24,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index 2adf5b787..daafb0900 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -507,15 +507,28 @@
     }
   },
   {
+    "id": "menu.app.checkForUpdates",
+    "defaultMessage": "!!!Check for updates",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 171,
+      "column": 19
+    },
+    "end": {
+      "line": 174,
+      "column": 3
+    }
+  },
+  {
     "id": "menu.app.hide",
     "defaultMessage": "!!!Hide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 171,
+      "line": 175,
       "column": 8
     },
     "end": {
-      "line": 174,
+      "line": 178,
       "column": 3
     }
   },
@@ -524,11 +537,11 @@
     "defaultMessage": "!!!Hide Others",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 175,
+      "line": 179,
       "column": 14
     },
     "end": {
-      "line": 178,
+      "line": 182,
       "column": 3
     }
   },
@@ -537,11 +550,11 @@
     "defaultMessage": "!!!Unhide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 179,
+      "line": 183,
       "column": 10
     },
     "end": {
-      "line": 182,
+      "line": 186,
       "column": 3
     }
   },
@@ -550,11 +563,11 @@
     "defaultMessage": "!!!Quit",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 183,
+      "line": 187,
       "column": 8
     },
     "end": {
-      "line": 186,
+      "line": 190,
       "column": 3
     }
   },
@@ -563,11 +576,11 @@
     "defaultMessage": "!!!Add New Service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 187,
+      "line": 191,
       "column": 17
     },
     "end": {
-      "line": 190,
+      "line": 194,
       "column": 3
     }
   },
@@ -576,11 +589,11 @@
     "defaultMessage": "!!!Add New Workspace...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 191,
+      "line": 195,
       "column": 19
     },
     "end": {
-      "line": 194,
+      "line": 198,
       "column": 3
     }
   },
@@ -589,11 +602,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 195,
+      "line": 199,
       "column": 23
     },
     "end": {
-      "line": 198,
+      "line": 202,
       "column": 3
     }
   },
@@ -602,11 +615,11 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 199,
+      "line": 203,
       "column": 24
     },
     "end": {
-      "line": 202,
+      "line": 206,
       "column": 3
     }
   },
@@ -615,11 +628,11 @@
     "defaultMessage": "!!!Activate next service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 203,
+      "line": 207,
       "column": 23
     },
     "end": {
-      "line": 206,
+      "line": 210,
       "column": 3
     }
   },
@@ -628,11 +641,11 @@
     "defaultMessage": "!!!Activate previous service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 207,
+      "line": 211,
       "column": 27
     },
     "end": {
-      "line": 210,
+      "line": 214,
       "column": 3
     }
   },
@@ -641,11 +654,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 211,
+      "line": 215,
       "column": 11
     },
     "end": {
-      "line": 214,
+      "line": 218,
       "column": 3
     }
   },
@@ -654,11 +667,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 215,
+      "line": 219,
       "column": 13
     },
     "end": {
-      "line": 218,
+      "line": 222,
       "column": 3
     }
   },
@@ -667,11 +680,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 219,
+      "line": 223,
       "column": 14
     },
     "end": {
-      "line": 222,
+      "line": 226,
       "column": 3
     }
   },
@@ -680,11 +693,11 @@
     "defaultMessage": "!!!Default",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 223,
+      "line": 227,
       "column": 20
     },
     "end": {
-      "line": 226,
+      "line": 230,
       "column": 3
     }
   }
diff --git a/src/index.html b/src/index.html
index 5ce7f6a96..bf15e2d4e 100644
--- a/src/index.html
+++ b/src/index.html
@@ -17,7 +17,7 @@
     if (isDevMode) {
       const debugging = require('debug');
       debugging.enable(process.env.DEBUG);
-      
+
       const debug = debugging('Index');
 
       document.querySelector('body').classList.add('isDevMode');
@@ -36,7 +36,7 @@
           window._onLiveReloadFileChanged = (file) => {
             if (!file.path.includes('/build/webview/') && !file.path.includes('/build/index.js') && !file.path.includes('/build/electron/')) {
               originalReloadBehaviour(file);
-            } else {              
+            } else {
               if (file.path.includes('/build/webview/')) {
                 debug('Livereload: Reloading all webvies');
                 const webviews = document.querySelectorAll('webview').forEach(webview => webview.reload());
diff --git a/src/index.js b/src/index.js
index 3fe996aa7..55592c328 100644
--- a/src/index.js
+++ b/src/index.js
@@ -180,6 +180,7 @@ const createWindow = () => {
     backgroundColor: !settings.get('darkMode') ? '#3498db' : '#1E1E1E',
     webPreferences: {
       nodeIntegration: true,
+      webviewTag: true,
     },
   });
 
@@ -353,18 +354,26 @@ app.on('ready', () => {
 // TODO: rewrite to handle multiple login calls
 const noop = () => null;
 let authCallback = noop;
+
 app.on('login', (event, webContents, request, authInfo, callback) => {
   authCallback = callback;
   debug('browser login event', authInfo);
   event.preventDefault();
+
   if (authInfo.isProxy && authInfo.scheme === 'basic') {
+    debug('Sending service echo ping');
     webContents.send('get-service-id');
 
     ipcMain.once('service-id', (e, id) => {
       debug('Received service id', id);
 
       const ps = proxySettings.get(id);
-      callback(ps.user, ps.password);
+      if (ps) {
+        debug('Sending proxy auth callback for service', id);
+        callback(ps.user, ps.password);
+      } else {
+        debug('No proxy auth config found for', id);
+      }
     });
   } else if (authInfo.scheme === 'basic') {
     debug('basic auth handler', authInfo);
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index da2540274..e0dfd736e 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -168,6 +168,10 @@ const menuItems = defineMessages({
     id: 'menu.app.settings',
     defaultMessage: '!!!Settings',
   },
+  checkForUpdates: {
+    id: 'menu.app.checkForUpdates',
+    defaultMessage: '!!!Check for updates',
+  },
   hide: {
     id: 'menu.app.hide',
     defaultMessage: '!!!Hide',
@@ -500,6 +504,11 @@ const _titleBarTemplateFactory = intl => [
     submenu: [],
   },
   {
+    label: intl.formatMessage(menuItems.workspaces),
+    submenu: [],
+    visible: workspaceStore.isFeatureEnabled,
+  },
+  {
     label: intl.formatMessage(menuItems.window),
     submenu: [
       {
@@ -638,6 +647,12 @@ export default class FranzMenu {
           enabled: this.stores.user.isLoggedIn,
         },
         {
+          label: intl.formatMessage(menuItems.checkForUpdates),
+          click: () => {
+            this.actions.app.checkForUpdates();
+          },
+        },
+        {
           type: 'separator',
         },
         {
diff --git a/src/models/Service.js b/src/models/Service.js
index 8a2a8d3d8..88bce3360 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -116,6 +116,7 @@ export default class Service {
 
   @computed get shareWithWebview() {
     return {
+      id: this.id,
       spellcheckerLanguage: this.spellcheckerLanguage,
       isDarkModeEnabled: this.isDarkModeEnabled,
     };
@@ -183,7 +184,9 @@ export default class Service {
       options,
     }));
 
-    this.webview.addEventListener('did-start-loading', () => {
+    this.webview.addEventListener('did-start-loading', (event) => {
+      debug('Did start load', this.name, event);
+
       this.hasCrashed = false;
       this.isLoading = true;
       this.isError = false;
diff --git a/src/stores/GlobalErrorStore.js b/src/stores/GlobalErrorStore.js
index 90bf751c3..7a85c2daa 100644
--- a/src/stores/GlobalErrorStore.js
+++ b/src/stores/GlobalErrorStore.js
@@ -18,8 +18,11 @@ export default class GlobalErrorStore extends Store {
       this.error = request.error;
 
       if (request.error.json) {
-        this.response = await request.error.json();
-
+        try {
+          this.response = await request.error.json();
+        } catch (error) {
+          this.response = {};
+        }
         if (this.error.status === 401) {
           this.actions.user.logout({ serverLogout: true });
         }
diff --git a/src/stores/NewsStore.js b/src/stores/NewsStore.js
index 6984425df..86e092592 100644
--- a/src/stores/NewsStore.js
+++ b/src/stores/NewsStore.js
@@ -16,6 +16,7 @@ export default class NewsStore extends Store {
 
     // Register action handlers
     this.actions.news.hide.listen(this._hide.bind(this));
+    this.actions.user.logout.listen(this._resetNewsRequest.bind(this));
   }
 
   setup() {
@@ -40,4 +41,15 @@ export default class NewsStore extends Store {
       remove(result, n => n.id === newsId);
     });
   }
+
+  /**
+   * Reset the news request when current user logs out so that when another user
+   * logs in again without an app restart, the request will be fetched again and
+   * the news will be shown to the user.
+   *
+   * @private
+   */
+  _resetNewsRequest() {
+    this.latestNewsRequest.reset();
+  }
 }
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index ab64bf79c..d51192078 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -20,6 +20,11 @@ export default class RecipesStore extends Store {
     // Register action handlers
     this.actions.recipe.install.listen(this._install.bind(this));
     this.actions.recipe.update.listen(this._update.bind(this));
+
+    // Reactions
+    this.registerReactions([
+      this._checkIfRecipeIsInstalled.bind(this),
+    ]);
   }
 
   setup() {
@@ -99,4 +104,26 @@ export default class RecipesStore extends Store {
       syncUpdate(0);
     }
   }
+
+  async _checkIfRecipeIsInstalled() {
+    const { router } = this.stores;
+
+    const match = matchRoute('/settings/services/add/:id', router.location.pathname);
+    if (match) {
+      const recipeId = match.id;
+
+      if (!this.stores.recipes.isInstalled(recipeId)) {
+        router.push('/settings/recipes');
+        debug(`Recipe ${recipeId} is not installed, trying to install it`);
+
+        const recipe = await this.installRecipeRequest.execute(recipeId)._promise;
+        if (recipe) {
+          await this.allRecipesRequest.invalidate({ immediately: true })._promise;
+          router.push(`/settings/services/add/${recipeId}`);
+        } else {
+          router.push('/settings/recipes');
+        }
+      }
+    }
+  }
 }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 349de2c9b..ee47bf6db 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -149,18 +149,7 @@ export default class ServicesStore extends Store {
   }
 
   async _showAddServiceInterface({ recipeId }) {
-    const recipesStore = this.stores.recipes;
-
-    if (recipesStore.isInstalled(recipeId)) {
-      debug(`Recipe ${recipeId} is installed`);
-      this._redirectToAddServiceRoute(recipeId);
-    } else {
-      debug(`Recipe ${recipeId} is not installed`);
-      // We access the RecipeStore action directly
-      // returns Promise instead of action
-      await this.stores.recipes._install({ recipeId });
-      this._redirectToAddServiceRoute(recipeId);
-    }
+    this.stores.router.push(`/settings/services/add/${recipeId}`);
   }
 
   // Actions
@@ -294,7 +283,8 @@ export default class ServicesStore extends Store {
     gaEvent('Service', 'clear cache');
   }
 
-  @action _setActive({ serviceId }) {
+  @action _setActive({ serviceId, keepActiveRoute }) {
+    if (!keepActiveRoute) this.stores.router.push('/');
     const service = this.one(serviceId);
 
     this.all.forEach((s, index) => {
@@ -520,7 +510,16 @@ export default class ServicesStore extends Store {
     this.actions.ui.toggleServiceUpdatedInfoBar({ visible: false });
   }
 
-  @action _reorder({ oldIndex, newIndex }) {
+  @action _reorder(params) {
+    const { workspaces } = this.stores;
+    if (workspaces.isAnyWorkspaceActive) {
+      workspaces.reorderServicesOfActiveWorkspace(params);
+    } else {
+      this._reorderService(params);
+    }
+  }
+
+  @action _reorderService({ oldIndex, newIndex }) {
     const showDisabledServices = this.stores.settings.all.app.showDisabledServices;
     const oldEnabledSortIndex = showDisabledServices ? oldIndex : this.all.indexOf(this.enabled[oldIndex]);
     const newEnabledSortIndex = showDisabledServices ? newIndex : this.all.indexOf(this.enabled[newIndex]);
@@ -683,11 +682,6 @@ export default class ServicesStore extends Store {
   }
 
   // Helper
-  _redirectToAddServiceRoute(recipeId) {
-    const route = `/settings/services/add/${recipeId}`;
-    this.stores.router.push(route);
-  }
-
   _initializeServiceRecipeInWebview(serviceId) {
     const service = this.one(serviceId);
 
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 31555dd5c..b5423af3b 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -329,8 +329,7 @@ export default class UserStore extends Store {
         authToken,
       });
     } catch (err) {
-      console.error('AccessToken Invalid');
-
+      this._logout();
       return false;
     }
   }
diff --git a/src/webview/contextMenu.js b/src/webview/contextMenu.js
index a4a6ab899..967e8e667 100644
--- a/src/webview/contextMenu.js
+++ b/src/webview/contextMenu.js
@@ -280,12 +280,13 @@ const buildMenuTpl = (props, suggestions, isSpellcheckEnabled, defaultSpellcheck
 };
 
 export default function contextMenu(spellcheckProvider, isSpellcheckEnabled, getDefaultSpellcheckerLanguage, getSpellcheckerLanguage) {
-  webContents.on('context-menu', (e, props) => {
+  webContents.on('context-menu', async (e, props) => {
     e.preventDefault();
 
     let suggestions = [];
     if (spellcheckProvider && props.misspelledWord) {
-      suggestions = spellcheckProvider.getSuggestion(props.misspelledWord);
+      debug('Mispelled word', props.misspelledWord);
+      suggestions = await spellcheckProvider.getSuggestion(props.misspelledWord);
 
       debug('Suggestions', suggestions);
     }
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 1e5d74b1f..c223b73de 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -127,6 +127,7 @@ class RecipeController {
   }
 
   serviceIdEcho(event) {
+    debug('Received a service echo ping');
     event.sender.send('service-id', this.settings.service.id);
   }
 
@@ -137,8 +138,6 @@ class RecipeController {
     window.addEventListener('keyup', debounce((e) => {
       const element = e.target;
 
-      console.log(element);
-
       if (!element) return;
 
       let value = '';
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index 9158b3b94..417d1ea1a 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -1,6 +1,8 @@
 import { webFrame } from 'electron';
-import { SpellCheckerProvider } from 'electron-hunspell';
+import { attachSpellCheckProvider, SpellCheckerProvider } from 'electron-hunspell';
+import { ENVIRONMENT } from 'hunspell-asm';
 import path from 'path';
+import { readFileSync } from 'fs';
 
 import { DICTIONARY_PATH } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
@@ -10,11 +12,12 @@ const debug = require('debug')('Franz:spellchecker');
 let provider;
 let currentDict;
 let _isEnabled = false;
+let attached;
 
 async function loadDictionary(locale) {
   try {
     const fileLocation = path.join(DICTIONARY_PATH, `hunspell-dict-${locale}/${locale}`);
-    await provider.loadDictionary(locale, `${fileLocation}.dic`, `${fileLocation}.aff`);
+    await provider.loadDictionary(locale, readFileSync(`${fileLocation}.dic`), readFileSync(`${fileLocation}.aff`));
     debug('Loaded dictionary', locale, 'from', fileLocation);
   } catch (err) {
     console.error('Could not load dictionary', err);
@@ -41,7 +44,7 @@ export async function switchDict(locale) {
       provider.unloadDictionary(locale);
     }
     loadDictionary(locale);
-    provider.switchDictionary(locale);
+    attached.switchLanguage(locale);
 
     debug('Switched dictionary to', locale);
 
@@ -58,12 +61,14 @@ export default async function initialize(languageCode = 'en-us') {
     const locale = languageCode.toLowerCase();
 
     debug('Init spellchecker');
-    await provider.initialize();
-    // await loadDictionaries();
+    await provider.initialize({ environment: ENVIRONMENT.NODE });
+
+    debug('Attaching spellcheck provider');
+    attached = await attachSpellCheckProvider(provider);
 
     debug('Available spellchecker dictionaries', provider.availableDictionaries);
 
-    switchDict(locale);
+    attached.switchLanguage(locale);
 
     return provider;
   } catch (err) {
diff --git a/uidev/src/app.tsx b/uidev/src/app.tsx
index 870911c2f..cef22e7a7 100644
--- a/uidev/src/app.tsx
+++ b/uidev/src/app.tsx
@@ -2,7 +2,7 @@ import CSS from 'csstype';
 import { Classes } from 'jss';
 import { observer } from 'mobx-react';
 import DevTools from 'mobx-react-devtools';
-import React, { Component } from 'react';
+import React from 'react';
 import injectSheet from 'react-jss';
 
 import { WithTheme } from './withTheme';
diff --git a/uidev/src/stories/button.stories.tsx b/uidev/src/stories/button.stories.tsx
index c8e9bcbf3..f7537895c 100644
--- a/uidev/src/stories/button.stories.tsx
+++ b/uidev/src/stories/button.stories.tsx
@@ -1,8 +1,11 @@
 import { observable } from 'mobx';
 import { observer } from 'mobx-react';
 import React from 'react';
+import injectSheet from 'react-jss';
 
-import { Button } from '@meetfranz/forms';
+import { Button, Input } from '@meetfranz/forms';
+import { classes } from 'istanbul-lib-coverage';
+import { Classes } from 'jss';
 import { storiesOf } from '../stores/stories';
 
 const defaultProps = {
@@ -13,6 +16,17 @@ const defaultProps = {
   disabled: false,
 };
 
+const styles = {
+  combinedElements: {
+    display: 'flex',
+    justifyContent: 'space-between',
+  },
+  input: {
+    flex: 1,
+    marginRight: 20,
+  },
+};
+
 const createStore = (args?: any) => {
   return observable(Object.assign({}, defaultProps, args));
 };
@@ -99,4 +113,26 @@ storiesOf('Button')
         e.preventDefault();
         alert('Click event');
       },
-    })} />));
+    })}/>
+  ))
+  .add('Long multi-line button', () => (
+    <WithStoreButton store={createStore({
+      label: 'But there is something that I must say to my people, who stand on the warm threshold which leads into the palace of justice: In the process of gaining our rightful place, we must not be guilty of wrongful deeds. Let us not seek to satisfy our thirst for freedom by drinking from the cup of bitterness and hatred. We must forever conduct our struggle on the high plane of dignity and discipline. We must not allow our creative protest to degenerate into physical violence. Again and again, we must rise to the majestic heights of meeting physical force with soul force.',
+    })} />
+  ))
+  .add('Button with Input', injectSheet(styles)(observer(({ classes }: { classes: Classes }) => (
+      <div className={classes.combinedElements}>
+        <Input showLabel={false} className={classes.input} noMargin />
+        <WithStoreButton store={createStore({})} />
+      </div>
+    )),
+  ))
+  .add('Icon Button with Input', injectSheet(styles)(observer(({ classes }: { classes: Classes }) => (
+      <div className={classes.combinedElements}>
+        <Input showLabel={false} className={classes.input} noMargin />
+        <WithStoreButton store={createStore({
+          icon: 'mdiInformation',
+        })} />
+      </div>
+    )),
+  ));