diff --git a/css/Makefile b/css/Makefile
index 8ab0e76..f8812b8 100644
--- a/css/Makefile
+++ b/css/Makefile
@@ -1,19 +1,33 @@
-OBJS = \
-	less/**/*.less \
-	less/plex.css
+lessc := node_modules/.bin/lessc
+lightserver := node_modules/.bin/light-server
 
-.PHONY: all dev build clean
+NPM != command -v npm 2> /dev/null
+PLEX = less/plex.css
+HACKER = less/hacker/*.less $(PLEX)
+DRACULA = less/dracula/*.less $(PLEX)
 
-all:
-	make build
+.PHONY: build dev clean
 
-dev: $(OBJS) Makefile
+# First target is default
+build: hacker.css dracula.css
+
+dev: build
+	$(lightserver) -s . -p 9000 -w "index.html, **/*.less \# make" -o
+
+hacker.css: node_modules $(HACKER)
+	$(lessc) less/hacker.less hacker.css --clean-css="--s1 --advanced --compatibility=ie8"
+
+dracula.css: node_modules $(DRACULA)
+	$(lessc) less/dracula.less dracula.css --clean-css="--s1 --advanced --compatibility=ie8"
+
+node_modules: package.json package-lock.json Makefile
+ifndef NPM
+	$(error Missing dependency 'npm'. Please install and try again.)
+endif
 	npm install
-	npm run dev
-
-build: $(OBJS) Makefile
-	npm install
-	npm run build
+	touch node_modules # fixes watch bug if you manually ran npm install
 
 clean:
-	rm -rf node_modules; rm dracula.css hacker.css; touch Makefile; make
+	rm -rf node_modules
+	rm dracula.css 
+	rm hacker.css
diff --git a/css/dracula.html b/css/dracula.html
index c28c775..af82547 100644
--- a/css/dracula.html
+++ b/css/dracula.html
@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <title>tilde theme</title>
-    <link href="/css/dracula.css" rel="stylesheet">
+    <link href="dracula.css" rel="stylesheet">
 
     <style>
         .tall-row {
diff --git a/css/index.html b/css/index.html
index b419647..ca3e38c 100644
--- a/css/index.html
+++ b/css/index.html
@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <title>tilde theme</title>
-    <link href="/css/hacker.css" rel="stylesheet">
+    <link href="hacker.css" rel="stylesheet">
 
     <style>
         .tall-row {
diff --git a/css/package-lock.json b/css/package-lock.json
index 9c742fe..6ced133 100644
--- a/css/package-lock.json
+++ b/css/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "tildeteam-css",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
diff --git a/css/package.json b/css/package.json
index fb22a86..a73b306 100755
--- a/css/package.json
+++ b/css/package.json
@@ -1,20 +1,14 @@
 {
     "name": "tildeteam-css",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "a fork of brobin's h4x0r bootstrap theme, used by tilde.team",
     "author": "Ben Harris <ben@tilde.team>",
-    "scripts": {
-        "build": "npm run build-hacker & npm run build-dracula",
-        "build-hacker": "lessc less/hacker.less hacker.css --clean-css=\"--s1 --advanced --compatibility=ie8\"",
-        "build-dracula": "lessc less/dracula.less dracula.css --clean-css=\"--s1 --advanced --compatibility=ie8\"",
-        "dev": "npm run build && light-server -s . -p 9000 -w \"index.html, **/*.less # npm run build\" -o"
-    },
     "repository": {
         "type": "git",
-        "url": "https://tildegit.org/team/css"
+        "url": "https://tildegit.org/team/site/src/branch/master/css"
     },
     "bugs": {
-        "url": "https://tildegit.org/team/css/issues"
+        "url": "https://tildegit.org/team/site/issues"
     },
     "dependencies": {
         "bootstrap": "3.3.7",