diff --git a/doc/conf.py b/doc/conf.py
index 66590a8..50957bf 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -269,5 +269,19 @@ texinfo_documents = [
 #texinfo_no_detailmenu = False
 
 
-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None}
+# -- Options for intersphinx extension ----------------------------------------
+
+intersphinx_mapping = {
+    'python': ('http://docs.python.org/3/', None)
+}
+
+
+# -- Custom theme options -----------------------------------------------------
+
+# Override variables in on readthedocs.org
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
+if not on_rtd:  # only import and set the theme if we're building docs locally
+    import sphinx_rtd_theme
+    html_theme = 'sphinx_rtd_theme'
+    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
diff --git a/setup.py b/setup.py
index a29e516..12ec1c4 100644
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@ setup(
 
     keywords='graphviz dot graphs visualization',
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
+        'Development Status :: 4 - Beta',
         'Intended Audience :: Science/Research',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',