diff --git a/doc/conf.py b/doc/conf.py
index b972a2a..49a72d5 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -96,13 +96,22 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'agogo'
-html_theme_options = {
-    "pagewidth": "60em",
-    "documentwidth": "40em",
-}
+#html_theme = 'agogo'
+#html_theme_options = {
+#    "pagewidth": "60em",
+#    "documentwidth": "40em",
+#}
 
-html_style = 'wsme.css'
+#html_style = 'wsme.css'
+
+import cloud_sptheme as csp
+
+html_theme = 'cloud'
+html_theme_path = [csp.get_theme_dir()]
+
+html_theme_options = {
+    "roottarget": "index"
+}
 
 # 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
@@ -117,7 +126,7 @@ html_style = 'wsme.css'
 html_title = "WSME %s" % release
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
+#html_short_title = "WSME"
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
diff --git a/tox-tmpl.ini b/tox-tmpl.ini
index c12e24d..0e83741 100644
--- a/tox-tmpl.ini
+++ b/tox-tmpl.ini
@@ -178,6 +178,7 @@ commands=
 
 [testenv:doc]
 deps=
+    cloud_sptheme
     Sphinx
 
 changedir=
diff --git a/tox.ini b/tox.ini
index 2f407b2..0224e9b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -99,6 +99,7 @@ commands =
 
 [testenv:doc]
 deps = 
+	cloud_sptheme
 	Sphinx
 changedir = 
 	doc