diff --git a/api-guide/source/conf.py b/api-guide/source/conf.py
index e8a10c9ff..80c402da3 100644
--- a/api-guide/source/conf.py
+++ b/api-guide/source/conf.py
@@ -46,9 +46,10 @@ source_suffix = '.rst'
 master_doc = 'index'
 # General information about the project.
 project = u'Key Manager API Guide'
-bug_tag = u'api-guide'
-repository_name = 'openstack/barbican'
-bug_project = 'barbican'
+openstackdocs_bug_tag = u'api-guide'
+openstackdocs_repo_name = 'openstack/barbican'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'barbican'
 
 copyright = u'2016, OpenStack contributors'
 
@@ -83,7 +84,7 @@ exclude_patterns = []
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 3a67f2db8..05329aa36 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,8 +2,8 @@ sphinx>=2.0.0,!=2.1.0 # BSD
 sphinxcontrib-httpdomain>=1.3.0 # BSD
 sphinxcontrib-blockdiag>=1.5.4 # BSD
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
-reno>=2.5.0 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
 os-api-ref>=1.5.0 # Apache-2.0
-openstackdocstheme>=2.0.0 # Apache-2.0
+openstackdocstheme>=2.2.1 # Apache-2.0
 castellan >= 0.17 # Apache-2.0
 pykmip>=0.7.0 # Apache 2.0 License
diff --git a/doc/source/conf.py b/doc/source/conf.py
index e6a7adabf..faab65f24 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -51,9 +51,11 @@ master_doc = 'index'
 # General information about the project.
 project = u'Barbican'
 copyright = u'2014, OpenStack Foundation'
-repository_name = 'openstack/barbican'
-bug_project = 'barbican'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/barbican'
+openstackdocs_pdf_link = True
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'barbican'
+openstackdocs_bug_tag = ''
 
 # Add any paths that contain "extra" files, such as .htaccess or
 # robots.txt.
@@ -67,7 +69,7 @@ add_function_parentheses = True
 add_module_names = True
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # -- Options for HTML output --------------------------------------------------
 
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index dbf48d56c..eb84d9d46 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -56,9 +56,10 @@ master_doc = 'index'
 # General information about the project.
 project = u'Barbican Release Notes'
 copyright = u'2015, Barbican Developers'
-repository_name = 'openstack/barbican'
-bug_project = 'barbican'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/barbican'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'barbican'
+openstackdocs_bug_tag = ''
 
 # Release notes are version independent.
 # The short X.Y version.
@@ -96,7 +97,7 @@ exclude_patterns = []
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []