diff --git a/docs/src/api/doc-files/th-background.png b/docs/src/api/doc-files/th-background.png
new file mode 100644
index 00000000..72d65e77
Binary files /dev/null and b/docs/src/api/doc-files/th-background.png differ
diff --git a/docs/src/api/stylesheet.css b/docs/src/api/stylesheet.css
deleted file mode 100644
index 98e5237c..00000000
--- a/docs/src/api/stylesheet.css
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Spring-specific Javadoc style sheet rules */
-
-#overviewBody {
-
-}
-
-.code {
- border: 1px solid black;
- background-color: #F4F4F4;
- padding: 5px;
-}
-
-/* Vanilla Javadoc style sheet rules */
-
-body {
- font-family: Arial;
- background-color: white;
- font-size: 10pt;
-}
-
-td { font-size: 10pt; font-family: Arial }/* Javadoc style sheet */
-
-/* Define colors, fonts and other style attributes here to override the defaults */
-
-/* Page background color */
-body { background-color: #FFFFFF }
-
-/* Headings */
-h1 { font-size: 145% }
-
-/* Table colors */
-.TableHeadingColor { background: #CCCCFF } /* Dark mauve */
-.TableSubHeadingColor { background: #EEEEFF } /* Light mauve */
-.TableRowColor { background: #FFFFFF } /* White */
-
-/* Font used in left-hand frame lists */
-.FrameTitleFont { font-size: 100%; font-family: Helvetica, Arial, sans-serif }
-.FrameHeadingFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif }
-.FrameItemFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif }
-
-/* Navigation bar fonts and colors */
-.NavBarCell1 { background-color:#EEEEFF;} /* Light mauve */
-.NavBarCell1Rev { background-color:#00008B;} /* Dark Blue */
-.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;}
-.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}
-
-.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
diff --git a/docs/src/reference/docbkx/reference/testing.xml b/docs/src/reference/docbkx/reference/testing.xml
deleted file mode 100644
index 127d76e8..00000000
--- a/docs/src/reference/docbkx/reference/testing.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- Bootstrapping GemFire through the Spring container
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/docs/src/reference/docbkx/appendix/appendix-schema.xml b/docs/src/reference/docbook/appendix/appendix-schema.xml
similarity index 100%
rename from docs/src/reference/docbkx/appendix/appendix-schema.xml
rename to docs/src/reference/docbook/appendix/appendix-schema.xml
diff --git a/docs/src/reference/docbkx/index.xml b/docs/src/reference/docbook/index.xml
similarity index 94%
rename from docs/src/reference/docbkx/index.xml
rename to docs/src/reference/docbook/index.xml
index e40da18e..c7b55414 100644
--- a/docs/src/reference/docbkx/index.xml
+++ b/docs/src/reference/docbook/index.xml
@@ -25,7 +25,6 @@
-
@@ -34,18 +33,21 @@
+
Reference Documentation
+
+
Appendices
+ -->
diff --git a/docs/src/reference/docbkx/introduction/introduction.xml b/docs/src/reference/docbook/introduction/introduction.xml
similarity index 100%
rename from docs/src/reference/docbkx/introduction/introduction.xml
rename to docs/src/reference/docbook/introduction/introduction.xml
diff --git a/docs/src/reference/docbkx/introduction/requirements.xml b/docs/src/reference/docbook/introduction/requirements.xml
similarity index 100%
rename from docs/src/reference/docbkx/introduction/requirements.xml
rename to docs/src/reference/docbook/introduction/requirements.xml
diff --git a/docs/src/reference/docbkx/links.xml b/docs/src/reference/docbook/links.xml
similarity index 100%
rename from docs/src/reference/docbkx/links.xml
rename to docs/src/reference/docbook/links.xml
diff --git a/docs/src/reference/docbkx/preface.xml b/docs/src/reference/docbook/preface.xml
similarity index 100%
rename from docs/src/reference/docbkx/preface.xml
rename to docs/src/reference/docbook/preface.xml
diff --git a/docs/src/reference/docbkx/reference/bootstrap.xml b/docs/src/reference/docbook/reference/bootstrap.xml
similarity index 99%
rename from docs/src/reference/docbkx/reference/bootstrap.xml
rename to docs/src/reference/docbook/reference/bootstrap.xml
index 4825e426..4f93e434 100644
--- a/docs/src/reference/docbkx/reference/bootstrap.xml
+++ b/docs/src/reference/docbook/reference/bootstrap.xml
@@ -39,7 +39,6 @@
]]>
-
Spring GemFire namespace prefix. Any name can do but through out the reference documentation, the gfe will be used.
@@ -81,7 +80,6 @@
]]>
-
The default namespace declaration for this XML file points to the Spring GemFire namespace.
diff --git a/docs/src/reference/docbkx/reference/data.xml b/docs/src/reference/docbook/reference/data.xml
similarity index 100%
rename from docs/src/reference/docbkx/reference/data.xml
rename to docs/src/reference/docbook/reference/data.xml
diff --git a/docs/src/reference/docbkx/reference/introduction.xml b/docs/src/reference/docbook/reference/introduction.xml
similarity index 100%
rename from docs/src/reference/docbkx/reference/introduction.xml
rename to docs/src/reference/docbook/reference/introduction.xml
diff --git a/docs/src/reference/docbkx/reference/samples.xml b/docs/src/reference/docbook/reference/samples.xml
similarity index 100%
rename from docs/src/reference/docbkx/reference/samples.xml
rename to docs/src/reference/docbook/reference/samples.xml
diff --git a/docs/src/reference/docbkx/reference/serialization.xml b/docs/src/reference/docbook/reference/serialization.xml
similarity index 100%
rename from docs/src/reference/docbkx/reference/serialization.xml
rename to docs/src/reference/docbook/reference/serialization.xml
diff --git a/docs/src/reference/resources/xsl/html.xsl b/docs/src/reference/resources/xsl/html.xsl
index 7aa724d4..2b0f8d6e 100644
--- a/docs/src/reference/resources/xsl/html.xsl
+++ b/docs/src/reference/resources/xsl/html.xsl
@@ -94,7 +94,7 @@