Index: lldb/docs/CMakeLists.txt
===================================================================
--- lldb/docs/CMakeLists.txt
+++ lldb/docs/CMakeLists.txt
@@ -58,6 +58,11 @@
   if (SPHINX_FOUND)
     if (${SPHINX_OUTPUT_HTML})
       add_sphinx_target(html lldb)
+      # Sphinx does not reliably update the custom CSS files, so force
+      # a clean rebuild of the documentation every time.
+      add_custom_target(clean-lldb-html COMMAND "${CMAKE_COMMAND}" -E
+        remove_directory ${CMAKE_CURRENT_BINARY_DIR}/html)
+      add_dependencies(docs-lldb-html clean-lldb-html)
     endif()
   endif()
 endif()
Index: lldb/docs/_static/lldb.css
===================================================================
--- lldb/docs/_static/lldb.css
+++ lldb/docs/_static/lldb.css
@@ -1,3 +1,11 @@
+div.document {
+  width: 90%;
+}
+
+div.body {
+  max-width: 90%;
+}
+
 table.mapping {
   width: 100%;
 }
@@ -9,14 +17,14 @@
 
 table.mapping td.hed {
   background: #606060;
-  color: white;
+  color: #fefefe;
   text-align: left;
-  border-bottom: 2px #fff solid;
+  border-bottom: 2px #fefefe solid;
   font-weight: bold;
 }
 
 table.mapping td.header {
-  background: #eee;
+  background: #eeeeee;
 }
 
 table.mapping td.content {
@@ -24,3 +32,41 @@
   padding-bottom: 15px;
 }
 
+div.sphinxsidebar h4,
+div.sphinxsidebar p, div.sphinxsidebar p a {
+  font: bold 12px Helvetica, Verdana, sans-serif;
+  color: #fefefe;
+  background: #606060; 
+  margin-bottom: 0;
+  text-transform: uppercase;
+  padding: 7px 0 7px 7px;
+}
+
+div.sphinxsidebar a.reference {
+    text-decoration: none;
+    border-bottom: 1px solid #fefefe;
+}
+
+div.sphinxsidebar li {
+  margin-left: 0px;
+  padding-left: 0px;
+}
+
+div.sphinxsidebar ul {
+    margin: 0px;
+}
+
+div.sphinxsidebar ul,
+div.sphinxsidebar ul a {
+  font: normal 10px Helvetica, Verdana, sans-serif;
+  background: #e9e9e9;
+  display: block;
+  padding: 5px 0;
+  line-height: 17px;
+  border-bottom: 1px solid #fefefe;
+}
+
+div.sphinxsidebar h3 {
+  /* Hide Navigation. */
+  display: none;
+}
Index: lldb/docs/conf.py
===================================================================
--- lldb/docs/conf.py
+++ lldb/docs/conf.py
@@ -92,12 +92,14 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'haiku'
+html_theme = 'alabaster'
 
 # 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
 # documentation.
-#html_theme_options = {}
+html_theme_options = {
+    'font_size': '11pt'
+}
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []
Index: lldb/docs/index.rst
===================================================================
--- lldb/docs/index.rst
+++ lldb/docs/index.rst
@@ -16,12 +16,10 @@
 `LLVM License <http://llvm.org/docs/DeveloperPolicy.html#copyright-license-and-patents>`__,
 an open source "BSD-style" license.
 
-
-Goals & Status
-==============
-
 .. toctree::
+   :hidden:
    :maxdepth: 1
+   :caption: Goals & Status
 
    status/about
    status/goals
@@ -29,11 +27,10 @@
    status/status
    status/projects
 
-Use & Extension
-===============
-
 .. toctree::
+   :hidden:
    :maxdepth: 1
+   :caption: Use & Extension
 
    use/tutorial
    use/map
@@ -47,11 +44,10 @@
    use/troubleshooting
    use/architecture
 
-Resources
-=========
-
 .. toctree::
+   :hidden:
    :maxdepth: 1
+   :caption: Resources
 
    resources/download
    resources/source
@@ -60,16 +56,20 @@
    resources/bots
    resources/sbapi
 
-API Documentation
-=================
+.. toctree::
+   :hidden:
+   :maxdepth: 1
+   :caption: API Documentation
 
-* `Public Python API Reference <https://lldb.llvm.org/python_reference/index.html>`_
-* `Public C++ API Reference <https://lldb.llvm.org/cpp_reference/namespacelldb.html>`_
-* `Private C++ Reference <https://lldb.llvm.org/cpp_reference/index.html>`_
+   Public Python API Reference <https://lldb.llvm.org/python_reference/index.html>
+   Public C++ API Reference <https://lldb.llvm.org/cpp_reference/namespacelldb.html>
+   Private C++ Reference <https://lldb.llvm.org/cpp_reference/index.html>
 
-External Links
-==============
+.. toctree::
+   :hidden:
+   :maxdepth: 1
+   :caption: External Links
 
-* `Source Code <http://llvm.org/viewvc/llvm-project/lldb/trunk/>`_
-* `Code Reviews <https://reviews.llvm.org>`_
-* `Bug Reports <https://bugs.llvm.org/>`_
+   Source Code <http://llvm.org/viewvc/llvm-project/lldb/trunk/>
+   Code Reviews <https://reviews.llvm.org>
+   Bug Reports <https://bugs.llvm.org/>