diff --git a/docco.js b/docco.js
index b0ee5060..3bdec557 100644
--- a/docco.js
+++ b/docco.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.1.0
+// Generated by CoffeeScript 2.3.1
 (function() {
   // Docco
   // =====
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..f6a88fde
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,62 @@
+{
+  "name": "docco",
+  "version": "0.8.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "coffeescript": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.3.1.tgz",
+      "integrity": "sha512-DNJmSPMyiz+OjWYyuDXNBcFutDjP2TS2owsZ8YvT65hA8c5IdHWIBqdA3Yf/XHoK23d/f1HqLjQbEJJZJoeV1w==",
+      "dev": true
+    },
+    "commander": {
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
+      "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew=="
+    },
+    "fs-extra": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
+      "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+    },
+    "highlight.js": {
+      "version": "9.12.0",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz",
+      "integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4="
+    },
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "marked": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz",
+      "integrity": "sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw=="
+    },
+    "underscore": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+      "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
+    },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+    }
+  }
+}
diff --git a/package.json b/package.json
index b2f2a335..60f0969c 100644
--- a/package.json
+++ b/package.json
@@ -1,26 +1,38 @@
 {
-  "name":         "docco",
-  "description":  "The Quick and Dirty Literate Programming Documentation Generator",
-  "keywords":     ["documentation", "docs", "generator", "literate", "coffeescript"],
-  "author":       "Jeremy Ashkenas",
-  "version":      "0.8.0",
-  "license":      "MIT",
+  "name": "docco",
+  "description": "The Quick and Dirty Literate Programming Documentation Generator",
+  "keywords": [
+    "documentation",
+    "docs",
+    "generator",
+    "literate",
+    "coffeescript"
+  ],
+  "scripts": {
+    "build": "cake build && cake doc"
+  },
+  "author": "Jeremy Ashkenas",
+  "version": "0.8.0",
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/jashkenas/docco.git"
   },
   "engines": {
-    "node":       ">=0.2.0"
+    "node": ">=0.2.0"
   },
   "dependencies": {
-    "commander":  ">= 0.5.2",
-    "marked":     ">= 0.2.7",
-    "fs-extra":   ">= 0.6.0",
-    "underscore": ">= 1.0.0",
-    "highlight.js": ">= 8.0.x"
+    "commander": "^2.16.0",
+    "fs-extra": "^6.0.1",
+    "highlight.js": "^9.12.0",
+    "marked": "^0.4.0",
+    "underscore": "^1.9.1"
   },
-  "main" :        "./docco",
+  "main": "./docco",
   "bin": {
-    "docco":      "./bin/docco"
+    "docco": "./bin/docco"
+  },
+  "devDependencies": {
+    "coffeescript": "^2.3.1"
   }
 }
diff --git a/resources/classic/docco.css b/resources/classic/docco.css
index ef5c27d8..d0c3607d 100644
--- a/resources/classic/docco.css
+++ b/resources/classic/docco.css
@@ -8,7 +8,7 @@ body {
   margin: 0; padding: 0;
   height:100%;
 }
-#container { min-height: 100%; }
+.container { min-height: 100%; }
 
 a {
   color: #261a3b;
@@ -166,7 +166,7 @@ ul.sections > li > div {
 
 /*----------------------  (> 481px) ---------------------*/
 @media only screen and (min-width: 481px) {
-  #container {
+  .container {
     position: relative;
   }
   body {
@@ -200,7 +200,7 @@ ul.sections > li > div {
 
 
 
-  #background {
+  .background {
     position: absolute;
     top: 0; bottom: 0;
     width: 350px;
@@ -275,7 +275,7 @@ ul.sections > li > div {
 /*---------------------- (> 1025px) ---------------------*/
 @media only screen and (min-width: 1025px) {
 
-  #background {
+  .background {
     width: 525px;
   }
   ul.sections > li > div.annotation {
diff --git a/resources/classic/docco.jst b/resources/classic/docco.jst
index ad137b13..9c53e8b6 100644
--- a/resources/classic/docco.jst
+++ b/resources/classic/docco.jst
@@ -8,8 +8,8 @@
   <link rel="stylesheet" media="all" href="<%= css %>" />
 </head>
 <body>
-  <div id="container">
-    <div id="background"></div>
+  <div class="container">
+    <div class="background"></div>
     <% if (sources.length > 1) { %>
       <ul id="jump_to">
         <li>
@@ -29,7 +29,7 @@
     <% } %>
     <ul class="sections">
         <% if (!hasTitle) { %>
-          <li id="title">
+          <li class="title">
               <div class="annotation">
                   <h1><%= title %></h1>
               </div>
diff --git a/resources/parallel/docco.css b/resources/parallel/docco.css
index b60f6fa3..a365a0dd 100644
--- a/resources/parallel/docco.css
+++ b/resources/parallel/docco.css
@@ -40,7 +40,7 @@ body {
   margin: 0; padding: 0;
   height:100%;
 }
-#container { min-height: 100%; }
+.container { min-height: 100%; }
 
 a {
   color: #000;
@@ -248,7 +248,7 @@ ul.sections > li > div {
 
 /*----------------------  (> 481px) ---------------------*/
 @media only screen and (min-width: 481px) {
-  #container {
+  .container {
     position: relative;
   }
   body {
@@ -286,7 +286,7 @@ ul.sections > li > div {
 
 
 
-  #background {
+  .background {
     position: absolute;
     top: 0; bottom: 0;
     width: 350px;
@@ -365,7 +365,7 @@ ul.sections > li > div {
     line-height: 24px;
   }
 
-  #background {
+  .background {
     width: 525px;
   }
   ul.sections > li > div.annotation {
diff --git a/resources/parallel/docco.jst b/resources/parallel/docco.jst
index d4375522..17a442ff 100644
--- a/resources/parallel/docco.jst
+++ b/resources/parallel/docco.jst
@@ -8,8 +8,8 @@
   <link rel="stylesheet" media="all" href="<%= css %>" />
 </head>
 <body>
-  <div id="container">
-    <div id="background"></div>
+  <div class="container">
+    <div class="background"></div>
     <% if (sources.length > 1) { %>
       <ul id="jump_to">
         <li>
@@ -31,7 +31,7 @@
     <% } %>
     <ul class="sections">
         <% if (!hasTitle) { %>
-          <li id="title">
+          <li class="title">
               <div class="annotation">
                   <h1><%= title %></h1>
               </div>