diff --git a/package.json b/package.json
index 6d3671d..a6d7b54 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
 	"version": "4.2.0",
 	"description": "A blazing fast & offline web playground",
 	"scripts": {
-		"start": "npm run -s dev",
+		"start": "concurrently --kill-others \"gulp start-preview-server\" \"npm run -s dev\"",
 		"build": "preact build --template src/index.html --prerender false",
 		"dev": "preact watch --template src/index.html",
 		"serve-website": "cd packages/website; npm start",
@@ -41,6 +41,7 @@
 		"babel-eslint": "^7.2.3",
 		"babel-minify": "^0.2.0",
 		"babel-plugin-macros": "^2.6.1",
+		"concurrently": "^7.0.0",
 		"eslint": "^4.9.0",
 		"eslint-config-prettier": "^2.3.0",
 		"eslint-config-synacor": "^2.0.2",
diff --git a/src/components/Modal.jsx b/src/components/Modal.jsx
index 24af499..5bf2087 100644
--- a/src/components/Modal.jsx
+++ b/src/components/Modal.jsx
@@ -31,7 +31,7 @@ const Modal = ({
 	useEffect(() => {
 		window.addEventListener('keydown', onKeyDownHandler);
 		return () => {
-			window.removeEventListener('keydown', this.onKeyDownHandler.bind(this));
+			window.removeEventListener('keydown', onKeyDownHandler.bind(this));
 			if (focusGrabberRef.current) {
 				focusGrabberRef.current.remove();
 				focusGrabberRef.current = null;
diff --git a/src/components/app.jsx b/src/components/app.jsx
index 0d4599c..ff86dd2 100644
--- a/src/components/app.jsx
+++ b/src/components/app.jsx
@@ -66,7 +66,6 @@ import {
 	SHOW_KEYBOARD_SHORTCUTS_EVENT
 } from '../commands';
 import { commandPaletteService } from '../commandPaletteService';
-import './../style.css';
 
 import { I18nProvider } from '@lingui/react';
 
diff --git a/src/detached-window.js b/src/detached-window.js
index 1253967..c2d21f5 100644
--- a/src/detached-window.js
+++ b/src/detached-window.js
@@ -9,7 +9,7 @@ window.addEventListener('message', e => {
 			frame.contentDocument.close();
 		}, 10);
 	}
-	if (e.data && e.data.url && e.data.url.match(/preview\.html/)) {
+	if (e.data && e.data.url && e.data.url.match(/index\.html/)) {
 		document.querySelector('iframe').src = e.data.url;
 	}
 
diff --git a/src/index.html b/src/index.html
index e39d1f3..0d955a3 100644
--- a/src/index.html
+++ b/src/index.html
@@ -35,25 +35,12 @@
 			}
 		</style>
 
-		<!-- build:css vendor.css -->
-		<link rel="stylesheet" href="lib/codemirror/lib/codemirror.css" />
-		<link rel="stylesheet" href="lib/codemirror/addon/hint/show-hint.css" />
-		<link rel="stylesheet" href="lib/codemirror/addon/fold/foldgutter.css" />
-		<link rel="stylesheet" href="lib/codemirror/addon/dialog/dialog.css" />
-		<link rel="stylesheet" href="lib/hint.min.css" />
-		<link rel="stylesheet" href="lib/inlet.css" />
-		<!-- endbuild -->
-
 		<link
 			rel="stylesheet"
 			id="editorThemeLinkTag"
 			href="lib/codemirror/theme/monokai.css"
 		/>
 
-		<!-- build:css style.css -->
-		<link rel="stylesheet" href="style.css" />
-		<!-- endbuild -->
-
 		<style id="fontStyleTemplate" type="template">
 			@font-face {
 				font-family: 'fontname';
diff --git a/src/index.js b/src/index.js
index 7e9bd88..9262bd4 100644
--- a/src/index.js
+++ b/src/index.js
@@ -6,5 +6,6 @@ import './lib/codemirror/addon/fold/foldgutter.css';
 import './lib/codemirror/addon/dialog/dialog.css';
 import './lib/hint.min.css';
 import './lib/inlet.css';
+import './style.css';
 
 export default App;