diff --git a/src/core/create_assets.js b/src/core/create_assets.js
index 438e5f2..9b31f51 100644
--- a/src/core/create_assets.js
+++ b/src/core/create_assets.js
@@ -57,7 +57,7 @@ export default function create_assets({ src, dest, dev, client_info, server_info
 function generate_service_worker({ chunk_files, src }) {
 	const assets = glob.sync('**', { cwd: 'assets', nodir: true });
 
-	const routes = create_routes({ src }); // TODO refactor
+	const routes = create_routes({ src });
 
 	const route_code = `[${
 		routes
diff --git a/src/middleware/create_watcher.js b/src/middleware/create_watcher.js
index 0b65998..cbd4477 100644
--- a/src/middleware/create_watcher.js
+++ b/src/middleware/create_watcher.js
@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import chalk from 'chalk';
-import { create_assets, create_routes, create_app } from 'sapper/core.js';
+import { create_app, create_assets, create_routes, create_templates } from 'sapper/core.js';
 import { dest } from '../config.js';
 
 function deferred() {
@@ -70,11 +70,6 @@ export default function create_watcher({ compilers, dev, entry, src, onroutes })
 		watcher.on('add', callback);
 		watcher.on('change', callback);
 		watcher.on('unlink', callback);
-
-		// watch('templates/**.html', () => {
-		// 	create_templates();
-		// 	// TODO reload current page?
-		// });
 	}
 
 	watch_files('routes/**/*.+(html|js|mjs)', () => {
@@ -88,6 +83,11 @@ export default function create_watcher({ compilers, dev, entry, src, onroutes })
 		create_app({ dev, entry, src });
 	});
 
+	watch_files('templates/**.html', () => {
+		create_templates();
+		// TODO reload current page?
+	});
+
 	const watcher = {
 		ready: invalidate(),
 		client: watch_compiler('client'),