diff --git a/doc/source/conf.py b/doc/source/conf.py
index 6d6a689..052129c 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -29,7 +29,7 @@ import os
 extensions = ['sphinx.ext.autodoc',
               'sphinx.ext.todo',
               'sphinx.ext.viewcode',
-              'oslosphinx'
+              'openstackdocstheme'
              ]
 
 todo_include_todos = True
@@ -91,7 +91,7 @@ man_pages = []
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'nature'
+html_theme = 'openstackdocs'
 
 # 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
@@ -265,3 +265,9 @@ epub_copyright = u'2014, Congress Contributors'
 
 # Allow duplicate toc entries.
 #epub_tocdup = True
+
+# -- Options for openstackdocstheme ---------------------------------------
+
+repository_name = 'openstack/congress-specs'
+bug_project = 'congress-specs'
+bug_tag = ''
diff --git a/requirements.txt b/requirements.txt
index ccb1f63..c470659 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,6 @@
-oslosphinx
+openstackdocstheme>=1.18.1 # Apache-2.0
 pbr>=0.6,!=0.7,<1.0
-sphinx>=1.1.2,!=1.2.0,<1.3
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
 stestr>=2.0.0
 testtools>=0.9.34
diff --git a/specs/stein/json-data-model.rst b/specs/stein/json-data-model.rst
index 4d9691c..130d4ce 100644
--- a/specs/stein/json-data-model.rst
+++ b/specs/stein/json-data-model.rst
@@ -252,7 +252,7 @@ Example 1
   - Congress-CloudState equivalent:
     ::
 
-     CREATE SCHEMA vm_host_down; 
+     CREATE SCHEMA vm_host_down;
 
 - Create policy rule (view) identifying those servers whose host is down.