diff --git a/doc/Makefile b/doc/Makefile
index 872213f48..2540aeef5 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -16,6 +16,7 @@ ALLSPHINXOPTS   = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
 	@echo "  html      to make standalone HTML files"
+	@echo "  htmlall   to force make all standalone HTML files"
 	@echo "  dirhtml   to make HTML files named index.html in directories"
 	@echo "  pickle    to make pickle files"
 	@echo "  json      to make JSON files"
@@ -34,6 +35,11 @@ html:
 	@echo
 	@echo "Build finished. The HTML pages are in _build/html."
 
+htmlall:
+	$(SPHINXBUILD) -a -b html $(ALLSPHINXOPTS) _build/html
+	@echo
+	@echo "Build finished. The HTML pages are in _build/html."
+
 dirhtml:
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) _build/dirhtml
 	@echo
diff --git a/doc/style.css b/doc/_templates/pylib/static/style.css_t
similarity index 99%
rename from doc/style.css
rename to doc/_templates/pylib/static/style.css_t
index 3653dd1c1..6ed0ae9e8 100644
--- a/doc/style.css
+++ b/doc/_templates/pylib/static/style.css_t
@@ -1,5 +1,7 @@
+@import url("basic.css");
+
 body,body.editor,body.body {
-    font: 110% "Times New Roman", Arial, Verdana, Helvetica, serif;
+    font: 110% Verdana, Helvetica, Arial, serif;
     background: White;
     color: Black;
 }
diff --git a/doc/_templates/pylib/theme.conf b/doc/_templates/pylib/theme.conf
new file mode 100644
index 000000000..d38308fd5
--- /dev/null
+++ b/doc/_templates/pylib/theme.conf
@@ -0,0 +1,9 @@
+[theme]
+inherit = default
+stylesheet = style.css
+pygments_style = sphinx
+
+[options]
+rightsidebar = false
+stickysidebar = false
+
diff --git a/doc/conf.py b/doc/conf.py
index 175ccef86..185474f9d 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -92,7 +92,7 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'default'
+html_theme = 'pylib'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -100,7 +100,7 @@ html_theme = 'default'
 #html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+html_theme_path = ['_templates']
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".