diff --git a/package-lock.json b/package-lock.json
index dc71869..4ffdf0a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,14 +14,8 @@
     },
     "acorn": {
       "version": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-      "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo="
-    },
-    "acorn-globals": {
-      "version": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.0.0.tgz",
-      "integrity": "sha1-GmTdj6dhKIWUYgZJUm4mJZF6VsY=",
-      "requires": {
-        "acorn": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"
-      }
+      "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
+      "dev": true
     },
     "acorn-jsx": {
       "version": "3.0.1",
@@ -59,10 +53,6 @@
       "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=",
       "dev": true
     },
-    "amdefine": {
-      "version": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
-    },
     "ansi-escapes": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz",
@@ -139,14 +129,6 @@
       "version": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
       "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
     },
-    "asap": {
-      "version": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz",
-      "integrity": "sha1-UidltQw1EEkOUtfc/ghe+bqWlY8="
-    },
-    "async": {
-      "version": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-      "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E="
-    },
     "async-each": {
       "version": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
       "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0="
@@ -272,13 +254,6 @@
         "supports-color": "2.0.0"
       }
     },
-    "character-parser": {
-      "version": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz",
-      "integrity": "sha1-x84o821LzZdE5f/CxfzeHHMmH8A=",
-      "requires": {
-        "is-regex": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.3.tgz"
-      }
-    },
     "chokidar": {
       "version": "https://registry.npmjs.org/chokidar/-/chokidar-1.6.1.tgz",
       "integrity": "sha1-L0RHq16W5Q+z14n9kNTHLg5McMI=",
@@ -300,14 +275,6 @@
       "integrity": "sha1-vos2rvzN6LPKeqLWr8B6NyQsDS0=",
       "dev": true
     },
-    "clean-css": {
-      "version": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.24.tgz",
-      "integrity": "sha1-ifWl6do3rgI5T+BJpBOIq75yw7U=",
-      "requires": {
-        "commander": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
-        "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
-      }
-    },
     "cli-cursor": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
@@ -353,13 +320,6 @@
       "version": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
       "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM="
     },
-    "commander": {
-      "version": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
-      "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
-      "requires": {
-        "graceful-readlink": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
-      }
-    },
     "component-bind": {
       "version": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
       "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
@@ -409,14 +369,6 @@
         }
       }
     },
-    "constantinople": {
-      "version": "https://registry.npmjs.org/constantinople/-/constantinople-3.1.0.tgz",
-      "integrity": "sha1-dWnKqKo/jVk11i4fqW+fcCzYHHk=",
-      "requires": {
-        "acorn": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-        "is-expression": "https://registry.npmjs.org/is-expression/-/is-expression-2.1.0.tgz"
-      }
-    },
     "content-disposition": {
       "version": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz",
       "integrity": "sha1-h0dsamfI2qh+Muh2Ft+IO6f7Bxs="
@@ -516,10 +468,6 @@
         "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
       }
     },
-    "doctypes": {
-      "version": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz",
-      "integrity": "sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk="
-    },
     "dont-sniff-mimetype": {
       "version": "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.0.0.tgz",
       "integrity": "sha1-WTKJDcn04vGeXrAqIAJuXl78j1g="
@@ -1908,10 +1856,6 @@
       "version": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
-    "graceful-readlink": {
-      "version": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
-    },
     "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
@@ -2156,14 +2100,6 @@
         "is-primitive": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"
       }
     },
-    "is-expression": {
-      "version": "https://registry.npmjs.org/is-expression/-/is-expression-2.1.0.tgz",
-      "integrity": "sha1-kb6dR968/vB3l36XIr5tz7RGXvA=",
-      "requires": {
-        "acorn": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-        "object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
-      }
-    },
     "is-extendable": {
       "version": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
@@ -2225,11 +2161,8 @@
     },
     "is-promise": {
       "version": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
-    },
-    "is-regex": {
-      "version": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.3.tgz",
-      "integrity": "sha1-DVUYK9358v3ieCIK7Dp1ZCyQhjc="
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
     },
     "is-resolvable": {
       "version": "1.0.0",
@@ -2261,10 +2194,6 @@
         "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
       }
     },
-    "js-stringify": {
-      "version": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz",
-      "integrity": "sha1-Fzb939lyTyijaCrcYjCufk6Weds="
-    },
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
@@ -2312,14 +2241,6 @@
       "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
       "dev": true
     },
-    "jstransformer": {
-      "version": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz",
-      "integrity": "sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=",
-      "requires": {
-        "is-promise": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-        "promise": "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz"
-      }
-    },
     "kind-of": {
       "version": "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz",
       "integrity": "sha1-R11pil5J/15T0U4+cyQp3Iv0z0c=",
@@ -2527,7 +2448,8 @@
     },
     "object-assign": {
       "version": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
     },
     "object-component": {
       "version": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
@@ -2760,13 +2682,6 @@
       "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
       "dev": true
     },
-    "promise": {
-      "version": "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz",
-      "integrity": "sha1-SJZUxpJha4qlWwck+oCbt9tJxb8=",
-      "requires": {
-        "asap": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz"
-      }
-    },
     "proxy-addr": {
       "version": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.3.tgz",
       "integrity": "sha1-3JdQL1ci6IhGez+iKXp7H/R98HQ=",
@@ -2780,122 +2695,6 @@
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
     },
-    "pug": {
-      "version": "https://registry.npmjs.org/pug/-/pug-2.0.0-beta6.tgz",
-      "integrity": "sha1-nq0uWeVApGfvw3h8ywPkV0ul+uk=",
-      "requires": {
-        "pug-code-gen": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-1.1.0.tgz",
-        "pug-filters": "https://registry.npmjs.org/pug-filters/-/pug-filters-1.2.4.tgz",
-        "pug-lexer": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-2.3.0.tgz",
-        "pug-linker": "https://registry.npmjs.org/pug-linker/-/pug-linker-1.0.1.tgz",
-        "pug-load": "https://registry.npmjs.org/pug-load/-/pug-load-2.0.3.tgz",
-        "pug-parser": "https://registry.npmjs.org/pug-parser/-/pug-parser-2.0.1.tgz",
-        "pug-runtime": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.2.tgz",
-        "pug-strip-comments": "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.1.tgz"
-      }
-    },
-    "pug-attrs": {
-      "version": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.1.tgz",
-      "integrity": "sha1-i13XwzBzDAn2Ipnga1j9DrxOv9U=",
-      "requires": {
-        "constantinople": "https://registry.npmjs.org/constantinople/-/constantinople-3.1.0.tgz",
-        "js-stringify": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz",
-        "pug-runtime": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.2.tgz"
-      }
-    },
-    "pug-code-gen": {
-      "version": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-1.1.0.tgz",
-      "integrity": "sha1-9jim1XkhhVNqSiuzy3O49Fi9wB8=",
-      "requires": {
-        "constantinople": "https://registry.npmjs.org/constantinople/-/constantinople-3.1.0.tgz",
-        "doctypes": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz",
-        "js-stringify": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz",
-        "pug-attrs": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.1.tgz",
-        "pug-error": "https://registry.npmjs.org/pug-error/-/pug-error-1.3.1.tgz",
-        "pug-runtime": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.2.tgz",
-        "void-elements": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-        "with": "https://registry.npmjs.org/with/-/with-5.1.1.tgz"
-      }
-    },
-    "pug-error": {
-      "version": "https://registry.npmjs.org/pug-error/-/pug-error-1.3.1.tgz",
-      "integrity": "sha1-YWJ0JcP4swexw4sQoLbVyOGjWB8="
-    },
-    "pug-filters": {
-      "version": "https://registry.npmjs.org/pug-filters/-/pug-filters-1.2.4.tgz",
-      "integrity": "sha1-kthSRyx0UIVyoNmwyR+dy5rgWDk=",
-      "requires": {
-        "clean-css": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.24.tgz",
-        "constantinople": "https://registry.npmjs.org/constantinople/-/constantinople-3.1.0.tgz",
-        "jstransformer": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz",
-        "pug-error": "https://registry.npmjs.org/pug-error/-/pug-error-1.3.1.tgz",
-        "pug-walk": "https://registry.npmjs.org/pug-walk/-/pug-walk-1.0.0.tgz",
-        "resolve": "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz",
-        "uglify-js": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"
-      }
-    },
-    "pug-lexer": {
-      "version": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-2.3.0.tgz",
-      "integrity": "sha1-uEGsTNjSdQEoHg+ciPtCQyl6/zo=",
-      "requires": {
-        "character-parser": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz",
-        "is-expression": "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz",
-        "pug-error": "https://registry.npmjs.org/pug-error/-/pug-error-1.3.1.tgz"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz",
-          "integrity": "sha1-F6jWp6bE71OLgU7Jq6wneSk78wo="
-        },
-        "is-expression": {
-          "version": "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz",
-          "integrity": "sha1-Oayqa+f9HzRx3ELHQW5hwkMXrJ8=",
-          "requires": {
-            "acorn": "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz",
-            "object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
-          }
-        }
-      }
-    },
-    "pug-linker": {
-      "version": "https://registry.npmjs.org/pug-linker/-/pug-linker-1.0.1.tgz",
-      "integrity": "sha1-1tp5uRDmg9MxNWcWgEfrr+2S0VM=",
-      "requires": {
-        "pug-error": "https://registry.npmjs.org/pug-error/-/pug-error-1.3.1.tgz",
-        "pug-walk": "https://registry.npmjs.org/pug-walk/-/pug-walk-1.0.0.tgz"
-      }
-    },
-    "pug-load": {
-      "version": "https://registry.npmjs.org/pug-load/-/pug-load-2.0.3.tgz",
-      "integrity": "sha1-/oz4OPecmhJJeFd01Suh1+pD3zc=",
-      "requires": {
-        "object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-        "pug-walk": "https://registry.npmjs.org/pug-walk/-/pug-walk-1.0.0.tgz"
-      }
-    },
-    "pug-parser": {
-      "version": "https://registry.npmjs.org/pug-parser/-/pug-parser-2.0.1.tgz",
-      "integrity": "sha1-3Cxbu3dwR+mDWc1gaGD3X0v8FUE=",
-      "requires": {
-        "pug-error": "https://registry.npmjs.org/pug-error/-/pug-error-1.3.1.tgz",
-        "token-stream": "https://registry.npmjs.org/token-stream/-/token-stream-0.0.1.tgz"
-      }
-    },
-    "pug-runtime": {
-      "version": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.2.tgz",
-      "integrity": "sha1-lzMavOM5pUNiVKf5sL1lvhFmXCE="
-    },
-    "pug-strip-comments": {
-      "version": "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.1.tgz",
-      "integrity": "sha1-iWlZIaNPz1aFXUMCtCZoa0Jrr9E=",
-      "requires": {
-        "pug-error": "https://registry.npmjs.org/pug-error/-/pug-error-1.3.1.tgz"
-      }
-    },
-    "pug-walk": {
-      "version": "https://registry.npmjs.org/pug-walk/-/pug-walk-1.0.0.tgz",
-      "integrity": "sha1-f0rhRWpPGP7uQKDXCLdcHFHS5OQ="
-    },
     "qs": {
       "version": "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz",
       "integrity": "sha1-O3hIwDwt7OaalSKw+ujEEm10Xzs="
@@ -2994,10 +2793,6 @@
         "resolve-from": "1.0.1"
       }
     },
-    "resolve": {
-      "version": "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz",
-      "integrity": "sha1-lYnD8vYUnRQXpAvswWY9tuxrwmw="
-    },
     "resolve-from": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
@@ -3226,13 +3021,6 @@
         }
       }
     },
-    "source-map": {
-      "version": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-      "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-      "requires": {
-        "amdefine": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"
-      }
-    },
     "spdx-correct": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
@@ -3370,10 +3158,6 @@
       "version": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
       "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
     },
-    "token-stream": {
-      "version": "https://registry.npmjs.org/token-stream/-/token-stream-0.0.1.tgz",
-      "integrity": "sha1-zu78cXp2xDFvEm0LnbqlXX598Bo="
-    },
     "tryit": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
@@ -3403,26 +3187,6 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
-    "uglify-js": {
-      "version": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
-      "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=",
-      "requires": {
-        "async": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-        "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-        "uglify-to-browserify": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-        "yargs": "8.0.2"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
-        }
-      }
-    },
-    "uglify-to-browserify": {
-      "version": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc="
-    },
     "ultron": {
       "version": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
       "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po="
@@ -3459,10 +3223,6 @@
       "version": "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz",
       "integrity": "sha1-4eWv+70WrnaN0mdDlLmtMCJlMUA="
     },
-    "void-elements": {
-      "version": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w="
-    },
     "which": {
       "version": "1.2.14",
       "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
@@ -3476,14 +3236,6 @@
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
     },
-    "with": {
-      "version": "https://registry.npmjs.org/with/-/with-5.1.1.tgz",
-      "integrity": "sha1-+k2qktrzLE6pTtRTyB8EaGtXXf4=",
-      "requires": {
-        "acorn": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-        "acorn-globals": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.0.0.tgz"
-      }
-    },
     "wrap-ansi": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
diff --git a/package.json b/package.json
index 96deea6..cf92086 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   },
   "main": "bin/index.js",
   "scripts": {
-    "demo-folder": "cd test/demo-folder && node ../../bin 'Demo folder' --test"
+    "demo-folder": "cd test/demo-folder && node ../../bin 'Demo folder' --open false"
   },
   "repository": {
     "type": "git",
@@ -31,7 +31,6 @@
     "mime": "^1.3.4",
     "minimatch": "^3.0.3",
     "opener": "^1.4.2",
-    "pug": "^2.0.0-beta4",
     "slug": "^0.9.1",
     "socket.io": "^1.4.6",
     "socket.io-client": "^1.4.6",