diff --git a/doc/source/conf.py b/doc/source/conf.py
index 1eb9aec..32914cc 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -23,6 +23,8 @@
 import subprocess
 # import sys
 
+import openstackdocstheme
+
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -37,7 +39,7 @@ import subprocess
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['oslosphinx']
+extensions = []
 
 
 # Add any paths that contain templates here, relative to this directory.
@@ -54,7 +56,6 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'I18n Contributor Guide'
-bug_tag = u'i18n-contributor-guide'
 
 copyright = u'2015, OpenStack contributors'
 
@@ -78,8 +79,12 @@ giturl = u'https://git.openstack.org/cgit/openstack/i18n/tree/doc/source'
 git_cmd = ["/usr/bin/git", "rev-parse", "HEAD"]
 gitsha = subprocess.Popen(
     git_cmd, stdout=subprocess.PIPE).communicate()[0].strip('\n')
-html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
-                "giturl": giturl}
+html_context = {
+    "bug_project": 'openstack-i18n',
+    "bug_tag": u'i18n-contributor-guide',
+    "gitsha": gitsha,
+    "giturl": giturl,
+}
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -127,6 +132,7 @@ pygments_style = 'sphinx'
 # Sphinx are currently 'default' and 'sphinxdoc'.
 # html_theme_path = ["."]
 # html_theme = '_theme'
+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
@@ -135,6 +141,7 @@ pygments_style = 'sphinx'
 
 # Add any paths that contain custom themes here, relative to this directory.
 # html_theme_path = ['_theme']
+html_theme_path = [openstackdocstheme.get_html_theme_path()]
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
diff --git a/test-requirements.txt b/test-requirements.txt
index d30c13f..1cc2ecb 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,3 +7,4 @@ hacking<0.11,>=0.10.2 # Apache-2.0
 Babel!=2.4.0,>=2.3.4 # BSD
 sphinx!=1.6.1,>=1.5.1 # BSD
 oslosphinx>=4.7.0 # Apache-2.0
+openstackdocstheme>=1.5.0 # Apache-2.0