diff --git a/.gitmodules b/.gitmodules
index c7f9376..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule "gojs"]
-	path = gojs
-	url = git@github.com:citizenlogistics/go.js.git
-[submodule "basetheme"]
-	path = basetheme
-	url = git@github.com:citizenlogistics/basetheme.git
diff --git a/Makefile b/Makefile
index 4b162ec..a22a2b7 100644
--- a/Makefile
+++ b/Makefile
@@ -8,14 +8,14 @@ auto: uncompressed
 open: uncompressed
 	open -a WebKit BUILD/index.html
 
-BUILD/base.css: BUILD basetheme/css/*
-	cd basetheme; make css
-	cp basetheme/BUILD/base.css BUILD/
-	cp basetheme/i/* i/
-
-BUILD/base.js: BUILD basetheme/gcjs/*.js basetheme/gojs/*.js basetheme/js/*
-	cd basetheme; make js
-	cp basetheme/BUILD/base.js BUILD/
+BUILD/base.css: BUILD ../basetheme/css/*
+	cd ../basetheme; make css
+	cp ../basetheme/BUILD/base.css BUILD/
+	cp ../basetheme/i/* i/
+
+BUILD/base.js: BUILD ../basetheme/gcjs/*.js ../basetheme/gojs/*.js ../basetheme/js/*
+	cd ../basetheme; make js
+	cp ../basetheme/BUILD/base.js BUILD/
 
 BUILD:
 	mkdir -p BUILD
diff --git a/basetheme b/basetheme
deleted file mode 160000
index def7ce4..0000000
--- a/basetheme
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit def7ce473e72c1e7d160c62b7944b4b207f6c39a