diff --git a/package-lock.json b/package-lock.json
index 89d63fe..74fedfb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -809,14 +809,6 @@
         "q": "1.5.1"
       }
     },
-    "code-frame": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/code-frame/-/code-frame-5.0.0.tgz",
-      "integrity": "sha1-QAMHB+xG4dmdXlLcnzV/ytkNmT0=",
-      "requires": {
-        "left-pad": "1.2.0"
-      }
-    },
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -1562,11 +1554,6 @@
         "tapable": "0.2.8"
       }
     },
-    "ensure-posix-path": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/ensure-posix-path/-/ensure-posix-path-1.0.2.tgz",
-      "integrity": "sha1-pls+QtC3HPxYXrd0+ZQ8jZuRsMI="
-    },
     "entities": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
@@ -3926,11 +3913,6 @@
         "invert-kv": "1.0.0"
       }
     },
-    "left-pad": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.2.0.tgz",
-      "integrity": "sha1-0wpzxrggHY99jnlWupYWCHpo4O4="
-    },
     "load-json-file": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
@@ -3957,11 +3939,6 @@
         "json5": "0.5.1"
       }
     },
-    "locate-character": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/locate-character/-/locate-character-2.0.5.tgz",
-      "integrity": "sha512-n2GmejDXtOPBAZdIiEFy5dJ5N38xBCXLNOtw2WpB9kGh6pnrEuKlwYI+Tkpofc4wDtVXHtoAOJaMRlYG/oYaxg=="
-    },
     "locate-path": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@ -4169,14 +4146,6 @@
       "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.0.tgz",
       "integrity": "sha1-lhftZHu76o9F0ZUm2jPexwYG30I="
     },
-    "matcher-collection": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz",
-      "integrity": "sha512-nUCmzKipcJEwYsBVAFh5P+d7JBuhJaW1xs85Hara9xuMLqtCVUrW6DSC0JVIkluxEH2W45nPBM/wjHtBXa/tYA==",
-      "requires": {
-        "minimatch": "3.0.4"
-      }
-    },
     "math-expression-evaluator": {
       "version": "1.2.17",
       "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
@@ -5883,11 +5852,6 @@
       "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
       "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
     },
-    "querystringify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz",
-      "integrity": "sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs="
-    },
     "quick-lru": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
@@ -6194,11 +6158,6 @@
       "resolved": "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz",
       "integrity": "sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4="
     },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
-    },
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -6247,35 +6206,16 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
       "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
     },
-    "sander": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/sander/-/sander-0.6.0.tgz",
-      "integrity": "sha1-rxYkzX+2362Y6+9WUxn5IAeNqSU=",
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.2"
-      }
-    },
     "sapper": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/sapper/-/sapper-0.5.0.tgz",
-      "integrity": "sha512-kVxbGp9eYwbj9JHrp1jucf0rGexEKkgGJkTd6ttkPMrUQOlbSYjlV5+J+yV3EhCyVWYfAIN5dWJa7K/FkGmKSA==",
+      "version": "github:nolanlawson/sapper#6f6c17aa0763bf1c9e1f268ff2e220551803992d",
       "requires": {
         "chalk": "2.3.0",
-        "cheerio": "1.0.0-rc.2",
         "chokidar": "1.7.0",
-        "code-frame": "5.0.0",
         "escape-html": "1.0.3",
-        "locate-character": "2.0.5",
         "mkdirp": "0.5.1",
         "relative": "3.0.2",
         "require-relative": "0.8.7",
         "rimraf": "2.6.2",
-        "sander": "0.6.0",
-        "serialize-javascript": "1.4.0",
-        "url-parse": "1.2.0",
-        "walk-sync": "0.3.2",
         "webpack": "3.10.0",
         "webpack-hot-middleware": "2.21.0"
       },
@@ -7697,15 +7637,6 @@
         }
       }
     },
-    "url-parse": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.2.0.tgz",
-      "integrity": "sha512-DT1XbYAfmQP65M/mE6OALxmXzZ/z1+e5zk2TcSKe/KiYbNGZxgtttzC0mR/sjopbpOXcbniq7eIKmocJnUWlEw==",
-      "requires": {
-        "querystringify": "1.0.0",
-        "requires-port": "1.0.0"
-      }
-    },
     "url-search-params": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/url-search-params/-/url-search-params-0.10.0.tgz",
@@ -7878,15 +7809,6 @@
         "indexof": "0.0.1"
       }
     },
-    "walk-sync": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.2.tgz",
-      "integrity": "sha512-FMB5VqpLqOCcqrzA9okZFc0wq0Qbmdm396qJxvQZhDpyu0W95G9JCmp74tx7iyYnyOcBtUuKJsgIKAqjozvmmQ==",
-      "requires": {
-        "ensure-posix-path": "1.0.2",
-        "matcher-collection": "1.0.5"
-      }
-    },
     "watchpack": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz",
diff --git a/package.json b/package.json
index 3115a70..a172d4e 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "quick-lru": "^1.1.0",
     "requestidlecallback": "^0.3.0",
     "rimraf": "^2.6.2",
-    "sapper": "0.5.0",
+    "sapper": "nolanlawson/sapper#fix-style-loader-built",
     "serve-static": "^1.13.1",
     "style-loader": "^0.19.1",
     "svelte": "^1.54.0",
diff --git a/templates/2xx.html b/templates/2xx.html
index 86b875c..8d4fc82 100644
--- a/templates/2xx.html
+++ b/templates/2xx.html
@@ -93,6 +93,6 @@ body.offline,body.theme-hotpants.offline,body.theme-majesty.offline,body.theme-o
 	<!-- Sapper creates a <script> tag containing `templates/main.js`
 	     and anything else it needs to hydrate the app and
 	     initialise the router -->
-  %sapper.scripts%
+  <script src='%sapper.main%'></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/templates/4xx.html b/templates/4xx.html
index fd0dfd7..f5af597 100644
--- a/templates/4xx.html
+++ b/templates/4xx.html
@@ -41,6 +41,6 @@
 	<h1>%sapper.title%</h1>
 	<p>Could not %sapper.method% %sapper.url%</p>
 
-  %sapper.scripts%
+  <script src='%sapper.main%'></script>
 </body>
 </html>
\ No newline at end of file