diff --git a/docs/Makefile b/docs/Makefile
index 90e84f77..ea880501 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -6,7 +6,7 @@ SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 SPHINXPROJ    = ReadtheDocsSphinxTheme
 SOURCEDIR     = .
-BUILDDIR      = _build
+BUILDDIR      = build
 
 # Put it first so that "make" without argument is like "make help".
 help:
diff --git a/docs/demo/api.rst b/docs/demo/api.rst
index aa1834ff..b49bc248 100644
--- a/docs/demo/api.rst
+++ b/docs/demo/api.rst
@@ -10,6 +10,11 @@
     :private-members:
     :special-members:
 
+Generated Index
+===============
+
+Part of the sphinx build process in generate and index file: :ref:`genindex`.
+
 
 Optional parameter args
 =======================
diff --git a/docs/demo/index.rst b/docs/demo/index.rst
deleted file mode 100644
index 1c85869f..00000000
--- a/docs/demo/index.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-Read the Docs Theme Demo
-************************
-
-These documents are used to test and stress test the Read the Docs Theme.
-
-:Last Reviewed: 2017-3-15
-
-Contents
-========
-
-.. toctree::
-    :maxdepth: 3
-    :numbered:
-    :caption: Syntax Constructs
-
-    structure
-    demo
-    lists_tables
-    api
-
-.. toctree::
-    :maxdepth: 3
-    :numbered:
-    :caption: This is an incredibly long caption for a long menu
-
-    long
-
-You can also read the :ref:`genindex`
diff --git a/docs/index.rst b/docs/index.rst
index b71ca49d..ad690c1e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,10 +1,7 @@
 .. include:: ../README.rst
 
-Content
-=======
-
 .. toctree::
-   :caption: Theme
+   :caption: Theme Documentation
    :maxdepth: 2
 
    installing
@@ -12,8 +9,20 @@ Content
    changelog
    contributing
 
-.. toctree::
-   :caption: Demo
-   :maxdepth: 2
 
-   demo/index
+.. toctree::
+    :maxdepth: 2
+    :numbered:
+    :caption: Demo Documents
+
+    demo/structure
+    demo/demo
+    demo/lists_tables
+    demo/api
+
+.. toctree::
+    :maxdepth: 3
+    :numbered:
+    :caption: This is an incredibly long caption for a long menu
+
+    demo/long
diff --git a/docs/make.bat b/docs/make.bat
index 7283b7d1..bc934aa6 100644
--- a/docs/make.bat
+++ b/docs/make.bat
@@ -10,7 +10,7 @@ if "%SPHINXBUILD%" == "" (
 set SPHINXOPTS=
 set SPHINXBUILD=sphinx-build
 set SOURCEDIR=.
-set BUILDDIR=_build
+set BUILDDIR=build
 set SPHINXPROJ=ReadtheDocsSphinxTheme
 
 if "%1" == "" goto help