diff --git a/docs/source/conf.py b/docs/source/conf.py
index 58c72db57f..6a8787abcc 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -91,7 +91,7 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'sphinx_rtd_theme'
 
 # 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
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 49f500a3a7..5d748145d0 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -8,10 +8,9 @@ Welcome to the CS-Studio/Phoebus Documentation!
 
 .. image:: splash.png
 
-User Documentation:
-
 .. toctree::
    :maxdepth: 1
+   :caption: User Documentation
 
    intro
    running
@@ -24,10 +23,9 @@ User Documentation:
    services
    services_architecture
 
-Developer Documentation:
-
 .. toctree::
    :maxdepth: 1
+   :caption: Developer Documentation
 
    develop
    phoebus_product
@@ -41,11 +39,3 @@ Developer Documentation:
    trouble_shooting
    eclipse_debugging
    gui_testing
-
-Appendix
-========
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
-