diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..4539794
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "docs/_themes"]
+	path = docs/_themes
+	url = git://github.com/Pylons/pylons_sphinx_theme.git
diff --git a/docs/.gitignore b/docs/.gitignore
index 92dedcb..69fa449 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,2 +1 @@
 _build/
-_themes/
diff --git a/docs/Makefile b/docs/Makefile
index 3d706d1..c0694bb 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -25,7 +25,7 @@ help:
 clean:
 	-rm -rf _build/*
 
-html: _themes/
+html: _themes
 	mkdir -p _build/html _build/doctrees
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
 	@echo
@@ -85,4 +85,4 @@ epub:
 	@echo "Build finished. The epub file is in _build/epub."
 
 _themes:
-	git clone git://github.com/Pylons/pylons_sphinx_theme.git _themes
+	cd ..; git submodule update --init; cd docs
diff --git a/docs/_themes b/docs/_themes
new file mode 160000
index 0000000..03e5e5a
--- /dev/null
+++ b/docs/_themes
@@ -0,0 +1 @@
+Subproject commit 03e5e5aaaeddc4c9aea887478c7e7b379a127b6f
diff --git a/docs/conf.py b/docs/conf.py
index 0d9202f..5af6928 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -93,7 +93,8 @@ pygments_style = 'sphinx'
 
 sys.path.append(os.path.abspath('_themes'))
 html_theme_path = ['_themes']
-html_theme = 'pylons'
+html_theme = 'pyramid'
+html_theme_options = dict(github_url='https://github.com/Pylons/colander')
 
 # The style sheet to use for HTML and HTML Help pages. A file of that name
 # must exist either in Sphinx' static/ path, or in one of the custom paths