diff --git a/.gitignore b/.gitignore
index 4fa2f66..f3f48ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,5 @@ build/
 dist/
 colander/coverage.xml
 distribute*.gz
-venv
+venv/
+env*/
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 4539794..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "docs/_themes"]
-	path = docs/_themes
-	url = git://github.com/Pylons/pylons_sphinx_theme.git
diff --git a/docs/Makefile b/docs/Makefile
index c0694bb..bb381fc 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -2,7 +2,7 @@
 #
 
 # You can set these variables from the command line.
-SPHINXOPTS    =
+SPHINXOPTS    = -W
 SPHINXBUILD   = sphinx-build
 PAPER         =
 
@@ -25,7 +25,7 @@ help:
 clean:
 	-rm -rf _build/*
 
-html: _themes
+html:
 	mkdir -p _build/html _build/doctrees
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
 	@echo
@@ -47,7 +47,7 @@ pickle:
 
 web: pickle
 
-htmlhelp: _themes
+htmlhelp:
 	mkdir -p _build/htmlhelp _build/doctrees
 	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp
 	@echo
@@ -84,5 +84,3 @@ epub:
 	@echo
 	@echo "Build finished. The epub file is in _build/epub."
 
-_themes:
-	cd ..; git submodule update --init; cd docs
diff --git a/docs/_themes b/docs/_themes
deleted file mode 160000
index eed3341..0000000
--- a/docs/_themes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit eed33411e32c660ed4cb50c23fb694c19cc0baa4