diff --git a/docs/source/_static/header-line.gif b/docs/source/_static/header-line.gif
new file mode 100644
index 000000000..3601730e0
Binary files /dev/null and b/docs/source/_static/header-line.gif differ
diff --git a/docs/source/_static/header_bg.jpg b/docs/source/_static/header_bg.jpg
new file mode 100644
index 000000000..f788c41c2
Binary files /dev/null and b/docs/source/_static/header_bg.jpg differ
diff --git a/docs/source/_static/openstack_logo.png b/docs/source/_static/openstack_logo.png
new file mode 100644
index 000000000..146faec5c
Binary files /dev/null and b/docs/source/_static/openstack_logo.png differ
diff --git a/docs/source/_static/tweaks.css b/docs/source/_static/tweaks.css
index 16cd6e76e..8ed4c9dbf 100644
--- a/docs/source/_static/tweaks.css
+++ b/docs/source/_static/tweaks.css
@@ -1,65 +1,93 @@
-ul.todo_list {
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
+body {
+  background: #fff url(../_static/header_bg.jpg) top left no-repeat;
 }
 
-ul.todo_list li {
-    display: block;
-    margin: 0;
-    padding: 7px 0;
-    border-top: 1px solid #eee;
+#header {
+  width: 950px;
+  margin: 0 auto;
+  height: 102px;
 }
 
-ul.todo_list li p {
-    display: inline;
+#header h1#logo {
+  background: url(../_static/openstack_logo.png) top left no-repeat;
+  display: block;
+  float: left;
+  text-indent: -9999px;
+  width: 175px;
+  height: 55px;
 }
 
-ul.todo_list li p.link {
-    font-weight: bold;
+#navigation {
+  background: url(../_static/header-line.gif) repeat-x 0 bottom;
+  display: block;
+  float: left;
+  margin: 27px 0 0 25px;
+  padding: 0;
 }
 
-ul.todo_list li p.details {
-    font-style: italic;
+#navigation li{
+  float: left;
+  display: block;
+  margin-right: 25px;
 }
 
-ul.todo_list li {
+#navigation li a {
+  display: block;
+  font-weight: normal;
+  text-decoration: none;
+  background-position: 50% 0;
+  padding: 20px 0 5px;
+  color: #353535;
+  font-size: 14px;
 }
 
-div.admonition {
-    border: 1px solid #8F1000;
+#navigation li a.current, #navigation li a.section {
+  border-bottom: 3px solid #cf2f19;
+  color: #cf2f19;
 }
 
-div.admonition p.admonition-title {
-    background-color: #8F1000;
-    border-bottom: 1px solid #8E8E8E;
+div.related {
+  background-color: #cde2f8;
+  border: 1px solid #b0d3f8;
 }
 
-a {
-	color: #CF2F19;
+div.related a {
+  color: #4078ba;
+  text-shadow: none;
 }
 
-div.related ul li a {
-	color: #CF2F19;
+div.sphinxsidebarwrapper {
+  padding-top: 0;
 }
 
-div.sphinxsidebar h4 {
-	background-color:#8E8E8E;
-	border:1px solid #255E6E;
-	color:white;
-	font-size:1em;
-	margin:1em 0 0.5em;
-	padding:0.1em 0 0.1em 0.5em;
+pre {
+  color: #555;
 }
 
-em {
-    font-style: normal;
+div.documentwrapper h1, div.documentwrapper h2, div.documentwrapper h3, div.documentwrapper h4, div.documentwrapper h5, div.documentwrapper h6 {
+  font-family: 'PT Sans', sans-serif !important;
+  color: #264D69;
+  border-bottom: 1px dotted #C5E2EA;
+  padding: 0;
+  background: none;
+  padding-bottom: 5px;
 }
 
-table.docutils {
-	font-size: 11px;
+div.documentwrapper h3 {
+  color: #CF2F19;
 }
 
-a tt {
-	color:#CF2F19;
+a.headerlink {
+  color: #fff !important;
+  margin-left: 5px;
+  background: #CF2F19 !important;
+}
+
+div.body {
+  margin-top: -25px;
+}
+
+div.document {
+  width: 960px;
+  margin: 0 auto;
 }
\ No newline at end of file
diff --git a/docs/source/_theme/layout.html b/docs/source/_theme/layout.html
index e3eb54b71..750b78221 100644
--- a/docs/source/_theme/layout.html
+++ b/docs/source/_theme/layout.html
@@ -1,19 +1,6 @@
-{% extends "sphinxdoc/layout.html" %}
+{% extends "basic/layout.html" %}
 {% set css_files = css_files + ['_static/tweaks.css'] %}
 {% set script_files = script_files + ['_static/jquery.tweet.js'] %}
-{% block extrahead %}
-    <script type='text/javascript'>
-        $(document).ready(function(){
-            $("#twitter_feed").tweet({
-                username: "openstack",
-                query: "from:openstack",
-                avatar_size: 32,
-                count: 10,
-                loading_text: "loading tweets..."
-            });
-        });
-    </script>
-{% endblock %}
 
 {%- macro sidebar() %}
       {%- if not embedded %}{% if not theme_nosidebar|tobool %}
@@ -72,15 +59,25 @@
           </div>
           <script type="text/javascript">$('#searchbox').show(0);</script>
           {%- endif %}
-
-          {%- if pagename == "index" %}
-                <h3>{{ _('Twitter Feed') }}</h3>
-                <div id="twitter_feed" class='twitter_feed'></div>
-          {%- endif %}
-
-
           {%- endblock %}
         </div>
       </div>
       {%- endif %}{% endif %}
 {%- endmacro %}
+
+{% block relbar1 %}{% endblock relbar1 %}
+
+{% block header %}
+  <div id="header">
+    <h1 id="logo"><a href="http://www.openstack.org/">OpenStack</a></h1>
+    <ul id="navigation">
+      <li><a href="http://www.openstack.org/" title="Go to the Home page" class="link">Home</a></li>
+      <li><a href="http://www.openstack.org/projects/" title="Go to the OpenStack Projects page">Projects</a></li>
+      <li><a href="http://www.openstack.org/user-stories/" title="Go to the User Stories page" class="link">User Stories</a></li>
+      <li><a href="http://www.openstack.org/community/" title="Go to the Community page" class="link">Community</a></li>
+      <li><a href="http://www.openstack.org/blog/" title="Go to the OpenStack Blog">Blog</a></li>
+      <li><a href="http://wiki.openstack.org/" title="Go to the OpenStack Wiki">Wiki</a></li>
+      <li><a href="http://docs.openstack.org/" title="Go to OpenStack Documentation" class="current">Documentation</a></li>
+    </ul>
+  </div>
+{% endblock %}
\ No newline at end of file
diff --git a/docs/source/_theme/nature.css_t b/docs/source/_theme/nature.css_t
new file mode 100644
index 000000000..a98bd4209
--- /dev/null
+++ b/docs/source/_theme/nature.css_t
@@ -0,0 +1,245 @@
+/*
+ * nature.css_t
+ * ~~~~~~~~~~~~
+ *
+ * Sphinx stylesheet -- nature theme.
+ *
+ * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+ 
+@import url("basic.css");
+ 
+/* -- page layout ----------------------------------------------------------- */
+ 
+body {
+    font-family: Arial, sans-serif;
+    font-size: 100%;
+    background-color: #111;
+    color: #555;
+    margin: 0;
+    padding: 0;
+}
+
+div.documentwrapper {
+    float: left;
+    width: 100%;
+}
+
+div.bodywrapper {
+    margin: 0 0 0 {{ theme_sidebarwidth|toint }}px;
+}
+
+hr {
+    border: 1px solid #B1B4B6;
+}
+ 
+div.document {
+    background-color: #eee;
+}
+ 
+div.body {
+    background-color: #ffffff;
+    color: #3E4349;
+    padding: 0 30px 30px 30px;
+    font-size: 0.9em;
+}
+ 
+div.footer {
+    color: #555;
+    width: 100%;
+    padding: 13px 0;
+    text-align: center;
+    font-size: 75%;
+}
+ 
+div.footer a {
+    color: #444;
+    text-decoration: underline;
+}
+ 
+div.related {
+    background-color: #6BA81E;
+    line-height: 32px;
+    color: #fff;
+    text-shadow: 0px 1px 0 #444;
+    font-size: 0.9em;
+}
+ 
+div.related a {
+    color: #E2F3CC;
+}
+ 
+div.sphinxsidebar {
+    font-size: 0.75em;
+    line-height: 1.5em;
+}
+
+div.sphinxsidebarwrapper{
+    padding: 20px 0;
+}
+ 
+div.sphinxsidebar h3,
+div.sphinxsidebar h4 {
+    font-family: Arial, sans-serif;
+    color: #222;
+    font-size: 1.2em;
+    font-weight: normal;
+    margin: 0;
+    padding: 5px 10px;
+    background-color: #ddd;
+    text-shadow: 1px 1px 0 white
+}
+
+div.sphinxsidebar h4{
+    font-size: 1.1em;
+}
+ 
+div.sphinxsidebar h3 a {
+    color: #444;
+}
+ 
+ 
+div.sphinxsidebar p {
+    color: #888;
+    padding: 5px 20px;
+}
+ 
+div.sphinxsidebar p.topless {
+}
+ 
+div.sphinxsidebar ul {
+    margin: 10px 20px;
+    padding: 0;
+    color: #000;
+}
+ 
+div.sphinxsidebar a {
+    color: #444;
+}
+ 
+div.sphinxsidebar input {
+    border: 1px solid #ccc;
+    font-family: sans-serif;
+    font-size: 1em;
+}
+
+div.sphinxsidebar input[type=text]{
+    margin-left: 20px;
+}
+ 
+/* -- body styles ----------------------------------------------------------- */
+ 
+a {
+    color: #005B81;
+    text-decoration: none;
+}
+ 
+a:hover {
+    color: #E32E00;
+    text-decoration: underline;
+}
+ 
+div.body h1,
+div.body h2,
+div.body h3,
+div.body h4,
+div.body h5,
+div.body h6 {
+    font-family: Arial, sans-serif;
+    background-color: #BED4EB;
+    font-weight: normal;
+    color: #212224;
+    margin: 30px 0px 10px 0px;
+    padding: 5px 0 5px 10px;
+    text-shadow: 0px 1px 0 white
+}
+ 
+div.body h1 { border-top: 20px solid white; margin-top: 0; font-size: 200%; }
+div.body h2 { font-size: 150%; background-color: #C8D5E3; }
+div.body h3 { font-size: 120%; background-color: #D8DEE3; }
+div.body h4 { font-size: 110%; background-color: #D8DEE3; }
+div.body h5 { font-size: 100%; background-color: #D8DEE3; }
+div.body h6 { font-size: 100%; background-color: #D8DEE3; }
+ 
+a.headerlink {
+    color: #c60f0f;
+    font-size: 0.8em;
+    padding: 0 4px 0 4px;
+    text-decoration: none;
+}
+ 
+a.headerlink:hover {
+    background-color: #c60f0f;
+    color: white;
+}
+ 
+div.body p, div.body dd, div.body li {
+    line-height: 1.5em;
+}
+ 
+div.admonition p.admonition-title + p {
+    display: inline;
+}
+
+div.highlight{
+    background-color: white;
+}
+
+div.note {
+    background-color: #eee;
+    border: 1px solid #ccc;
+}
+ 
+div.seealso {
+    background-color: #ffc;
+    border: 1px solid #ff6;
+}
+ 
+div.topic {
+    background-color: #eee;
+}
+ 
+div.warning {
+    background-color: #ffe4e4;
+    border: 1px solid #f66;
+}
+ 
+p.admonition-title {
+    display: inline;
+}
+ 
+p.admonition-title:after {
+    content: ":";
+}
+ 
+pre {
+    padding: 10px;
+    background-color: White;
+    color: #222;
+    line-height: 1.2em;
+    border: 1px solid #C6C9CB;
+    font-size: 1.1em;
+    margin: 1.5em 0 1.5em 0;
+    -webkit-box-shadow: 1px 1px 1px #d8d8d8;
+    -moz-box-shadow: 1px 1px 1px #d8d8d8;
+}
+ 
+tt {
+    background-color: #ecf0f3;
+    color: #222;
+    /* padding: 1px 2px; */
+    font-size: 1.1em;
+    font-family: monospace;
+}
+
+.viewcode-back {
+    font-family: Arial, sans-serif;
+}
+
+div.viewcode-block:target {
+    background-color: #f4debf;
+    border-top: 1px solid #ac9;
+    border-bottom: 1px solid #ac9;
+}
diff --git a/docs/source/_theme/theme.conf b/docs/source/_theme/theme.conf
index e039fe01f..1cc400446 100644
--- a/docs/source/_theme/theme.conf
+++ b/docs/source/_theme/theme.conf
@@ -1,5 +1,4 @@
 [theme]
-inherit = sphinxdoc
-stylesheet = sphinxdoc.css
-pygments_style = friendly
-
+inherit = basic
+stylesheet = nature.css
+pygments_style = tango
diff --git a/docs/source/conf.py b/docs/source/conf.py
index ac7402f4d..9d2093065 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -216,7 +216,10 @@ html_theme = '_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
 # documentation.
-#html_theme_options = {}
+html_theme_options = {
+    "nosidebar": "false",
+    "sidebarwidth": "500px"
+}
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []