diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 30f93d131..c82b6767c 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -2,6 +2,11 @@
   "name": "Cloudron",
   "version": "0.0.1",
   "dependencies": {
+    "JSONStream": {
+      "version": "0.10.0",
+      "from": "JSONStream@0.10.0",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz"
+    },
     "abbrev": {
       "version": "1.0.7",
       "from": "abbrev@>=1.0.0 <2.0.0",
@@ -125,9 +130,9 @@
       "resolved": "https://registry.npmjs.org/autoprefixer-core/-/autoprefixer-core-5.2.1.tgz"
     },
     "aws-sdk": {
-      "version": "2.2.5",
+      "version": "2.2.9",
       "from": "aws-sdk@>=2.1.46 <3.0.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.2.5.tgz"
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.2.9.tgz"
     },
     "aws-sign2": {
       "version": "0.5.0",
@@ -175,9 +180,9 @@
       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
     },
     "bluebird": {
-      "version": "2.10.1",
+      "version": "2.10.2",
       "from": "bluebird@>=2.9.30 <3.0.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.1.tgz"
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz"
     },
     "body-parser": {
       "version": "1.14.1",
@@ -239,9 +244,14 @@
       }
     },
     "buildmail": {
-      "version": "1.2.5",
-      "from": "buildmail@>=1.2.5 <2.0.0",
-      "resolved": "https://registry.npmjs.org/buildmail/-/buildmail-1.2.5.tgz"
+      "version": "2.0.0",
+      "from": "buildmail@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/buildmail/-/buildmail-2.0.0.tgz"
+    },
+    "builtin-modules": {
+      "version": "1.1.0",
+      "from": "builtin-modules@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
     },
     "bunyan": {
       "version": "0.22.1",
@@ -264,9 +274,9 @@
       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz"
     },
     "caniuse-db": {
-      "version": "1.0.30000330",
+      "version": "1.0.30000339",
       "from": "caniuse-db@>=1.0.30000214 <2.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000330.tgz"
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000339.tgz"
     },
     "caseless": {
       "version": "0.11.0",
@@ -316,9 +326,8 @@
       "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
     },
     "cloudron-manifestformat": {
-      "version": "1.7.0",
-      "from": "cloudron-manifestformat@>=1.7.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/cloudron-manifestformat/-/cloudron-manifestformat-1.7.0.tgz",
+      "version": "1.9.0",
+      "from": "cloudron-manifestformat@>=1.9.0 <2.0.0",
       "dependencies": {
         "safetydance": {
           "version": "0.0.15",
@@ -578,16 +587,9 @@
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"
     },
     "defaults": {
-      "version": "1.0.2",
+      "version": "1.0.3",
       "from": "defaults@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz",
-      "dependencies": {
-        "clone": {
-          "version": "0.1.19",
-          "from": "clone@>=0.1.5 <0.2.0",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz"
-        }
-      }
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"
     },
     "delayed-stream": {
       "version": "0.0.5",
@@ -653,7 +655,7 @@
     },
     "duplexer2": {
       "version": "0.0.2",
-      "from": "duplexer2@>=0.0.2 <0.1.0",
+      "from": "duplexer2@0.0.2",
       "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
       "dependencies": {
         "readable-stream": {
@@ -710,6 +712,11 @@
       "from": "entities@>=1.1.1 <1.2.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
     },
+    "error-ex": {
+      "version": "1.2.0",
+      "from": "error-ex@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.2.0.tgz"
+    },
     "es6-promise": {
       "version": "2.3.0",
       "from": "es6-promise@>=2.3.0 <2.4.0",
@@ -726,9 +733,9 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
     },
     "escodegen": {
-      "version": "1.6.1",
-      "from": "escodegen@>=1.6.0 <1.7.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.6.1.tgz",
+      "version": "1.7.0",
+      "from": "escodegen@>=1.7.0 <1.8.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.7.0.tgz",
       "dependencies": {
         "esprima": {
           "version": "1.2.5",
@@ -736,9 +743,9 @@
           "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz"
         },
         "source-map": {
-          "version": "0.1.43",
-          "from": "source-map@>=0.1.40 <0.2.0",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"
+          "version": "0.2.0",
+          "from": "source-map@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"
         }
       }
     },
@@ -753,9 +760,9 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"
     },
     "esutils": {
-      "version": "1.1.6",
-      "from": "esutils@>=1.1.6 <2.0.0",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz"
+      "version": "2.0.2",
+      "from": "esutils@>=2.0.2 <3.0.0",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"
     },
     "etag": {
       "version": "1.7.0",
@@ -880,6 +887,11 @@
       "from": "find-index@>=0.1.1 <0.2.0",
       "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
     },
+    "find-up": {
+      "version": "1.0.0",
+      "from": "find-up@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.0.0.tgz"
+    },
     "findup-sync": {
       "version": "0.3.0",
       "from": "findup-sync@>=0.3.0 <0.4.0",
@@ -977,9 +989,9 @@
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz"
     },
     "gaze": {
-      "version": "0.5.1",
+      "version": "0.5.2",
       "from": "gaze@>=0.5.1 <0.6.0",
-      "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz"
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz"
     },
     "generate-function": {
       "version": "2.0.0",
@@ -1020,6 +1032,16 @@
           "version": "2.0.10",
           "from": "minimatch@>=2.0.1 <3.0.0",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"
+        },
+        "readable-stream": {
+          "version": "1.0.33",
+          "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"
+        },
+        "through2": {
+          "version": "0.6.5",
+          "from": "through2@>=0.6.1 <0.7.0",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"
         }
       }
     },
@@ -1121,11 +1143,6 @@
           "version": "3.0.0",
           "from": "strip-ansi@>=3.0.0 <4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
-        },
-        "through2": {
-          "version": "2.0.0",
-          "from": "through2@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz"
         }
       }
     },
@@ -1172,9 +1189,9 @@
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
     },
     "has-unicode": {
-      "version": "1.0.0",
+      "version": "1.0.1",
       "from": "has-unicode@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz"
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
     },
     "hat": {
       "version": "0.0.3",
@@ -1191,6 +1208,11 @@
       "from": "hoek@>=2.0.0 <3.0.0",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
     },
+    "hosted-git-info": {
+      "version": "2.1.4",
+      "from": "hosted-git-info@>=2.0.2 <3.0.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+    },
     "http-errors": {
       "version": "1.3.1",
       "from": "http-errors@>=1.3.1 <1.4.0",
@@ -1208,32 +1230,15 @@
         }
       }
     },
-    "hyperquest": {
-      "version": "1.2.0",
-      "from": "hyperquest@>=1.2.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/hyperquest/-/hyperquest-1.2.0.tgz"
-    },
     "iconv-lite": {
       "version": "0.4.12",
       "from": "iconv-lite@0.4.12",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.12.tgz"
     },
     "indent-string": {
-      "version": "1.2.2",
-      "from": "indent-string@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.2.tgz",
-      "dependencies": {
-        "get-stdin": {
-          "version": "4.0.1",
-          "from": "get-stdin@>=4.0.1 <5.0.0",
-          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "from": "minimist@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
-        }
-      }
+      "version": "2.1.0",
+      "from": "indent-string@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"
     },
     "inflight": {
       "version": "1.0.4",
@@ -1275,6 +1280,11 @@
       "from": "is-buffer@>=1.0.2 <2.0.0",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
     },
+    "is-builtin-module": {
+      "version": "1.0.0",
+      "from": "is-builtin-module@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"
+    },
     "is-finite": {
       "version": "1.0.1",
       "from": "is-finite@>=1.0.0 <2.0.0",
@@ -1358,14 +1368,14 @@
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz"
     },
     "js-yaml": {
-      "version": "3.4.2",
+      "version": "3.4.3",
       "from": "js-yaml@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.4.2.tgz",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.4.3.tgz",
       "dependencies": {
         "esprima": {
-          "version": "2.2.0",
-          "from": "esprima@>=2.2.0 <2.3.0",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.2.0.tgz"
+          "version": "2.6.0",
+          "from": "esprima@>=2.6.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.6.0.tgz"
         }
       }
     },
@@ -1399,11 +1409,6 @@
       "from": "jsonpointer@2.0.0",
       "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
     },
-    "JSONStream": {
-      "version": "0.10.0",
-      "from": "JSONStream@0.10.0",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz"
-    },
     "jsprim": {
       "version": "0.3.0",
       "from": "jsprim@0.3.0",
@@ -1452,9 +1457,16 @@
       "resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz"
     },
     "libmime": {
-      "version": "1.1.0",
-      "from": "libmime@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/libmime/-/libmime-1.1.0.tgz"
+      "version": "1.2.0",
+      "from": "libmime@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/libmime/-/libmime-1.2.0.tgz",
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.4.13",
+          "from": "iconv-lite@>=0.4.13 <0.5.0",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"
+        }
+      }
     },
     "libqp": {
       "version": "1.1.0",
@@ -1478,6 +1490,18 @@
       "from": "linkify-it@>=1.2.0 <1.3.0",
       "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.0.tgz"
     },
+    "load-json-file": {
+      "version": "1.0.1",
+      "from": "load-json-file@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.0.1.tgz",
+      "dependencies": {
+        "graceful-fs": {
+          "version": "4.1.2",
+          "from": "graceful-fs@>=4.1.2 <5.0.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+        }
+      }
+    },
     "lodash": {
       "version": "3.8.0",
       "from": "lodash@>=3.8.0 <3.9.0",
@@ -1593,15 +1617,20 @@
       "from": "longest@>=1.0.1 <2.0.0",
       "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
     },
+    "loud-rejection": {
+      "version": "1.0.0",
+      "from": "loud-rejection@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.0.0.tgz"
+    },
     "lru-cache": {
       "version": "2.7.0",
       "from": "lru-cache@>=2.0.0 <3.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
     },
     "mailcomposer": {
-      "version": "1.1.0",
-      "from": "mailcomposer@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/mailcomposer/-/mailcomposer-1.1.0.tgz"
+      "version": "2.0.0",
+      "from": "mailcomposer@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/mailcomposer/-/mailcomposer-2.0.0.tgz"
     },
     "map-obj": {
       "version": "1.0.1",
@@ -1629,14 +1658,19 @@
       "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz"
     },
     "meow": {
-      "version": "3.3.0",
+      "version": "3.4.2",
       "from": "meow@*",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.4.2.tgz",
       "dependencies": {
         "minimist": {
           "version": "1.2.0",
-          "from": "minimist@>=1.1.0 <2.0.0",
+          "from": "minimist@>=1.1.3 <2.0.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
+        },
+        "object-assign": {
+          "version": "4.0.1",
+          "from": "object-assign@>=4.0.1 <5.0.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
         }
       }
     },
@@ -1766,6 +1800,11 @@
       "from": "native-dns-packet@>=0.1.1 <0.2.0",
       "resolved": "http://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz"
     },
+    "needle": {
+      "version": "0.10.0",
+      "from": "needle@>=0.10.0 <0.11.0",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-0.10.0.tgz"
+    },
     "negotiator": {
       "version": "0.5.3",
       "from": "negotiator@0.5.3",
@@ -1824,9 +1863,9 @@
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
         },
         "nan": {
-          "version": "2.0.9",
+          "version": "2.1.0",
           "from": "nan@>=2.0.8 <3.0.0",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz"
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"
         },
         "strip-ansi": {
           "version": "3.0.0",
@@ -1841,14 +1880,14 @@
       "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
     },
     "nodemailer": {
-      "version": "1.5.0",
+      "version": "1.8.0",
       "from": "nodemailer@>=1.3.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-1.5.0.tgz"
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-1.8.0.tgz"
     },
     "nodemailer-direct-transport": {
-      "version": "1.0.2",
+      "version": "1.1.0",
       "from": "nodemailer-direct-transport@>=1.0.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-1.0.2.tgz"
+      "resolved": "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-1.1.0.tgz"
     },
     "nodemailer-smtp-transport": {
       "version": "1.0.3",
@@ -1877,6 +1916,11 @@
       "from": "nopt@2.1.1",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.1.1.tgz"
     },
+    "normalize-package-data": {
+      "version": "2.3.4",
+      "from": "normalize-package-data@>=2.3.4 <3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.4.tgz"
+    },
     "npmconf": {
       "version": "2.1.2",
       "from": "npmconf@>=2.1.2 <3.0.0",
@@ -2001,6 +2045,11 @@
       "from": "parse-database-url@>=0.2.2 <0.3.0",
       "resolved": "http://registry.npmjs.org/parse-database-url/-/parse-database-url-0.2.2.tgz"
     },
+    "parse-json": {
+      "version": "2.2.0",
+      "from": "parse-json@>=2.2.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"
+    },
     "parseurl": {
       "version": "1.3.0",
       "from": "parseurl@>=1.3.0 <1.4.0",
@@ -2058,6 +2107,11 @@
       "from": "path-array@>=1.0.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz"
     },
+    "path-exists": {
+      "version": "2.0.0",
+      "from": "path-exists@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.0.0.tgz"
+    },
     "path-is-absolute": {
       "version": "1.0.0",
       "from": "path-is-absolute@>=1.0.0 <2.0.0",
@@ -2073,6 +2127,18 @@
       "from": "path-to-regexp@0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
     },
+    "path-type": {
+      "version": "1.0.0",
+      "from": "path-type@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.0.0.tgz",
+      "dependencies": {
+        "graceful-fs": {
+          "version": "4.1.2",
+          "from": "graceful-fs@>=4.1.2 <5.0.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+        }
+      }
+    },
     "pause": {
       "version": "0.0.1",
       "from": "pause@0.0.1",
@@ -2110,6 +2176,21 @@
         }
       }
     },
+    "pify": {
+      "version": "2.2.0",
+      "from": "pify@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.2.0.tgz"
+    },
+    "pinkie": {
+      "version": "1.0.0",
+      "from": "pinkie@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+    },
+    "pinkie-promise": {
+      "version": "1.0.0",
+      "from": "pinkie-promise@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz"
+    },
     "pkginfo": {
       "version": "0.3.0",
       "from": "pkginfo@>=0.3.0 <0.4.0",
@@ -2187,6 +2268,16 @@
       "from": "raw-body@>=2.1.4 <2.2.0",
       "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.4.tgz"
     },
+    "read-pkg": {
+      "version": "1.1.0",
+      "from": "read-pkg@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"
+    },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "from": "read-pkg-up@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"
+    },
     "readable-stream": {
       "version": "2.0.2",
       "from": "readable-stream@latest",
@@ -2197,6 +2288,11 @@
       "from": "rechoir@>=0.6.0 <0.7.0",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"
     },
+    "redent": {
+      "version": "1.0.0",
+      "from": "redent@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"
+    },
     "reduce-component": {
       "version": "1.0.1",
       "from": "reduce-component@1.0.1",
@@ -2208,9 +2304,9 @@
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
     },
     "repeating": {
-      "version": "1.1.3",
-      "from": "repeating@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"
+      "version": "2.0.0",
+      "from": "repeating@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz"
     },
     "replace-ext": {
       "version": "0.0.1",
@@ -2362,7 +2458,7 @@
     },
     "smtp-connection": {
       "version": "1.3.1",
-      "from": "smtp-connection@>=1.2.0 <2.0.0",
+      "from": "smtp-connection@>=1.3.1 <2.0.0",
       "resolved": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-1.3.1.tgz"
     },
     "sntp": {
@@ -2380,6 +2476,26 @@
       "from": "spawn-sync@>=1.0.13 <2.0.0",
       "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.13.tgz"
     },
+    "spdx-correct": {
+      "version": "1.0.1",
+      "from": "spdx-correct@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz"
+    },
+    "spdx-exceptions": {
+      "version": "1.0.3",
+      "from": "spdx-exceptions@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.3.tgz"
+    },
+    "spdx-expression-parse": {
+      "version": "1.0.0",
+      "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz"
+    },
+    "spdx-license-ids": {
+      "version": "1.0.2",
+      "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+    },
     "split": {
       "version": "1.0.0",
       "from": "split@>=1.0.0 <2.0.0",
@@ -3153,9 +3269,21 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"
     },
     "strip-bom": {
-      "version": "1.0.0",
-      "from": "strip-bom@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz"
+      "version": "2.0.0",
+      "from": "strip-bom@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"
+    },
+    "strip-indent": {
+      "version": "1.0.1",
+      "from": "strip-indent@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "dependencies": {
+        "get-stdin": {
+          "version": "4.0.1",
+          "from": "get-stdin@>=4.0.1 <5.0.0",
+          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+        }
+      }
     },
     "superagent": {
       "version": "0.21.0",
@@ -3234,26 +3362,24 @@
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
     },
     "through2": {
-      "version": "0.6.5",
-      "from": "through2@>=0.6.3 <0.7.0",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "dependencies": {
-        "readable-stream": {
-          "version": "1.0.33",
-          "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"
-        }
-      }
+      "version": "2.0.0",
+      "from": "through2@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz"
     },
     "tildify": {
-      "version": "1.1.1",
+      "version": "1.1.2",
       "from": "tildify@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.1.1.tgz"
+      "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.1.2.tgz"
     },
     "tough-cookie": {
-      "version": "2.0.0",
+      "version": "2.2.0",
       "from": "tough-cookie@>=0.12.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
+    },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "from": "trim-newlines@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
     },
     "tunnel-agent": {
       "version": "0.4.1",
@@ -3373,9 +3499,9 @@
       "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz"
     },
     "util-deprecate": {
-      "version": "1.0.1",
+      "version": "1.0.2",
       "from": "util-deprecate@>=1.0.1 <1.1.0",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
     },
     "utils-merge": {
       "version": "1.0.0",
@@ -3392,6 +3518,11 @@
       "from": "valid-url@>=1.0.9 <2.0.0",
       "resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz"
     },
+    "validate-npm-package-license": {
+      "version": "3.0.1",
+      "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"
+    },
     "validator": {
       "version": "3.43.0",
       "from": "validator@>=3.30.0 <4.0.0",
@@ -3432,6 +3563,21 @@
           "from": "clone@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
         },
+        "readable-stream": {
+          "version": "1.0.33",
+          "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"
+        },
+        "strip-bom": {
+          "version": "1.0.0",
+          "from": "strip-bom@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz"
+        },
+        "through2": {
+          "version": "0.6.5",
+          "from": "through2@>=0.6.1 <0.7.0",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"
+        },
         "vinyl": {
           "version": "0.4.6",
           "from": "vinyl@>=0.4.0 <0.5.0",
@@ -3457,9 +3603,9 @@
       "resolved": "http://registry.npmjs.org/when/-/when-2.0.1.tgz"
     },
     "which": {
-      "version": "1.1.2",
+      "version": "1.2.0",
       "from": "which@>=1.1.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.1.2.tgz"
+      "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz"
     },
     "window-size": {
       "version": "0.1.2",
@@ -3510,7 +3656,7 @@
     },
     "xtend": {
       "version": "4.0.0",
-      "from": "xtend@>=4.0.0 <4.1.0-0",
+      "from": "xtend@>=4.0.0 <4.1.0",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
     },
     "y18n": {
@@ -3519,9 +3665,9 @@
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.0.tgz"
     },
     "yargs": {
-      "version": "3.26.0",
+      "version": "3.27.0",
       "from": "yargs@>=3.15.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.26.0.tgz"
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.27.0.tgz"
     }
   }
 }
diff --git a/package.json b/package.json
index 00077aabb..b7ca57784 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "async": "^1.2.1",
     "aws-sdk": "^2.1.46",
     "body-parser": "^1.13.1",
-    "cloudron-manifestformat": "^1.7.0",
+    "cloudron-manifestformat": "^1.9.0",
     "connect-ensure-login": "^0.1.1",
     "connect-lastmile": "0.0.13",
     "connect-timeout": "^1.5.0",