diff --git a/conf.py b/conf.py
index 4d57c7c6e4e..004bdb5dcef 100644
--- a/conf.py
+++ b/conf.py
@@ -71,6 +71,8 @@
         'djangotoolbox' : ('http://djangotoolbox.readthedocs.org/en/latest/', '../../../build/djangotoolbox.inv'),
 }
 
+language = 'en'
+
 languages = [
     ("ar", "Arabic"),
     ("cn", "Chinese"),
@@ -126,15 +128,16 @@
     'version': version,
     'version_selector': meta['version_selector'],
     'stable': meta['stable'],
+    'language':'en'
 }
 
 html_sidebars = {
     '**': ['pagenav.html'],
 }
-html_sidebars['**'].append('intrasites.html')
+html_sidebars['**'].append('wikisidebar.html')
+#html_sidebars['**'].append('intrasites.html')
 html_sidebars['**'].append('formats.html')
 # html_sidebars['**'].append('translations.html')
-html_sidebars['**'].append('wikisidebar.html')
 
 # -- Options for LaTeX output --------------------------------------------------
 
diff --git a/themes/mongodb/layout.html b/themes/mongodb/layout.html
index 0c8f173bf2f..30b8428de07 100644
--- a/themes/mongodb/layout.html
+++ b/themes/mongodb/layout.html
@@ -9,7 +9,7 @@
   {%- set titlesuffix = " — "|safe + docstitle|e + " " + release|e %}
 {%- else %}
   {%- set titlesuffix = "" %}
-{%- endif %}
+{%- endif -%}
 
 {%- macro githublink() -%}
 <a href="https://github.com/mongodb/{{theme_repo_name}}/blob/{{theme_branch}}/source/{{pagename}}.txt" target="_blank" title="Edit {{pagename}}.txt on github">Edit this Page</a>
@@ -18,43 +18,65 @@
 {%- macro jiralink() -%}
 https://jira.mongodb.org/secure/CreateIssueDetails!init.jspa?pid=10380&issuetype=4&priority=4&summary=Comment+on%3a+%22{{ pagename | escape }}%2Etxt%22
 {%- endmacro -%}
+{%- set reldelim1 = reldelim1 is not defined and '' or reldelim1 %}
+{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %}
+{%- macro relbar() %}
+    <div class="bc">
+{#      <h3>{{ _('Navigation') }}</h3> #}
+      <ul>
+{#        {%- for rellink in rellinks %}
+        <li class="jr" {% if loop.first %}style="margin-right: 10px"{% endif %}>
+          <a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}"
+             {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
+          {%- if not loop.first %}{{ reldelim2 }}{% endif %}</li>
+        {%- endfor %}
+#}        {%- block rootrellink %}
+{#        <li><a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a>{{ reldelim1 }}</li> #}
+        {%- endblock %}
+        {%- for parent in parents %}
+          <li><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }}</a>{{ reldelim1 }}</li>
+        {%- endfor %}
+        {%- block relbaritems %} {% endblock %}
+      </ul>
+    </div>
+{%- endmacro %}
 
 {%- macro sidebar() %}
-      {%- if render_sidebar %}
-      <div class="sphinxsidebar">
-        <div class="sphinxsidebarwrapper">
-          {%- if sidebars != None %}
-            {%- for sidebartemplate in sidebars %}
-            {%- include sidebartemplate %}
-            {%- endfor %}
-          {%- endif %}
-        </div>
-      </div>
-      {%- endif %}
-{%- endmacro %}
+{%- if render_sidebar %}
+<div class="sphinxsidebar">
+<div class="sphinxsidebarwrapper">
+{%- if sidebars != None %}
+{%- for sidebartemplate in sidebars %}
+{%- include sidebartemplate %}
+{%- endfor %}
+{%- endif %}
+</div>
+</div>
+{%- endif %}
+{%- endmacro -%}
 
 {%- macro script() %}
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '{{ url_root }}',
-        VERSION:     '{{ version|e }}',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
-        HAS_SOURCE:  {{ has_source|lower }},
-      };
-    </script>
-    {%- for scriptfile in script_files %}
-    <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
-    {%- endfor %}
-{%- endmacro %}
+<script type="text/javascript">
+var DOCUMENTATION_OPTIONS = {
+	URL_ROOT:    '{{ url_root }}',
+	VERSION:     '{{ version|e }}',
+	COLLAPSE_INDEX: false,
+	FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
+	HAS_SOURCE:  {{ has_source|lower }},
+	};
+</script>
+{%- for scriptfile in script_files %}
+<script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
+{%- endfor %}
+{%- endmacro -%}
 
 {%- macro css() %}
-    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
-    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
-    {%- for cssfile in css_files %}
-    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-    {%- endfor %}
-{%- endmacro %}
+<link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
+<link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
+{%- for cssfile in css_files %}
+<link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
+{%- endfor %}
+{%- endmacro -%}
 
 {%- macro render_nextprev() %}
 <div id="btnv">
@@ -70,80 +92,112 @@
 {%- endif %}
 </ul>
 </div>
-{% endmacro -%}
-
+{%- endmacro -%}
+{% if theme_language == '' %}
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    {%- block htmltitle %}
-    <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
-    {%- endblock %}
-
-    <link rel="shortcut icon" href="http://media.mongodb.org/favicon.ico" />
-    <meta name="robots" content="index" />
-    <meta http-equiv="Content-Type" content="text/html; charset={{ encoding }}" />
-    <meta name="release" content="{{theme_release}}"/>
-
-    {%- if pagename == 'index' %}
-    <link rel="canonical" href="http://docs.mongodb.org/{{theme_project}}/" />
-    {%- else %}
-    <link rel="canonical" href="http://docs.mongodb.org/{{ theme_project }}/{{pagename}}" />
-    {%- endif %}
+{%- else -%}
+<html xmlns="http://www.w3.org/1999/xhtml" lang="{{theme_language}}">
+{%- endif %}
+<head>
+{%- block htmltitle %}
+<title>{{ title|striptags|e }}{{ titlesuffix }}</title>
+{%- endblock -%}
+<link rel="shortcut icon" href="http://media.mongodb.org/favicon.ico" />
+<meta name="robots" content="index" />
+<meta http-equiv="Content-Type" content="text/html; charset={{ encoding }}" />
+<meta name="release" content="{{release}}"/>
+<meta name="DC.Source" content="https://github.com/mongodb/{{theme_repo_name}}/blob/{{theme_branch}}/source/{{pagename}}.txt"/>
+{%- if pagename == 'index' %}
+<link rel="canonical" href="http://docs.mongodb.org/{{theme_project}}/" />
+{%- else %}
+<link rel="canonical" href="http://docs.mongodb.org/{{ theme_project }}/{{pagename}}" />
+{%- endif -%}
 
-    {{ metatags }}
-    {{ css() }}
+{{ metatags }}
+{{ css() }}
 
-    {%- if not embedded %}
-      {{ script() }}
+{%- if not embedded %}
+{{ script() }}
 
-      {%- block googlecse_opensearch %}
-      <link rel="search" type="application/opensearchdescription+xml" href="http://docs.mongodb.org/osd.xml" title="MongoDB Help"/>
-      {%- endblock -%}
+{%- block googlecse_opensearch %}
+<link rel="search" type="application/opensearchdescription+xml" href="http://docs.mongodb.org/osd.xml" title="MongoDB Help"/>
+{%- endblock -%}
 
-      {%- if favicon %}
-      <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
-      {%- endif %}
-    {%- endif %}
+{%- if favicon %}
+<link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
+{%- endif %}
+{%- endif %}
 
 {%- block linktags %}
 {%- include "linktags.html" %}
-{%- endblock %}
+{%- endblock -%}
 
-{%- block extrahead %}{% endblock %}
+{%- block extrahead %}{% endblock -%}
 {%- block sitesearch %}
 <script>
-  (function() {
+(function() {
     var cx = '017213726194841070573:WMX6838984';
     var gcse = document.createElement('script'); gcse.type = 'text/javascript'; gcse.async = true;
     gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
         '//www.google.com/cse/cse.js?cx=' + cx;
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(gcse, s);
-  })();
+})();
 </script>
+{%- endblock -%}
+</head>
+<body>
+{%- block header %}
+<div id="header-db" class="spread">
+<div class="split">
+<div id="logo">
+<div><a href="{{ pathto('index') }}"><img class="logo" src="http://media.mongodb.org/logo-mongodb.png" alt="MongoDB Logo"/></a></div>
+</div>
+</div>
+</div>
+{%- endblock -%}
+
+{%- block content %}
+{%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}
+<div class="document">
+{%- block document %}
+<div class="documentwrapper">
+{%- if render_sidebar %}
+<div class="bodywrapper">
+{%- endif %}
+<div class="body">
+{{ relbar() }}
+<div id="cse-results"><gcse:searchresults linkTarget="_top"></gcse:searchresults></div>
+{% block body %} {% endblock %}
+{{- render_nextprev() -}}
+</div>
+{%- if render_sidebar %}
+</div>
+{%- endif %}
+</div>
 {%- endblock %}
-  </head>
-  <body>
 
-{%- block header %}
+{%- block sidebar2 %}{{ sidebar() }}{% endblock %}
+<div class="clearer"></div>
+</div>
+{%- endblock %}
+{%- block commnav -%}
 <div id="top-right">
-        <div class="user-right">
-                <ul id="header-menu-bar" class="ajs-menu-bar">
-                <li class="normal"><a target="_blank" href="http://groups.google.com/group/mongodb-user">Forums</a></li>
-                <li class="normal"><a target="_blank" href="http://blog.mongodb.org/">Blog</a></li>
-                <li class="normal"><a href="http://www.mongodb.org/downloads">Download</a></li>
-                <li class="normal"><a href="http://docs.mongodb.org/ecosystem/drivers/">Drivers</a></li>
-                <li class="normal"><a href="http://www.10gen.com/events">Events</a></li>
-                <li class="normal last"><a class="last" href="http://docs.mongodb.org/manual/meta/translation">Translations</a></li>
-                </ul>
-        </div>
+<div class="user-right">
+<ul id="header-menu-bar" class="ajs-menu-bar">
+<li class="normal"><a target="_blank" href="http://groups.google.com/group/mongodb-user">Forums</a></li>
+<li class="normal"><a target="_blank" href="http://blog.mongodb.org/">Blog</a></li>
+<li class="normal"><a href="http://www.mongodb.org/downloads">Download</a></li>
+<li class="normal"><a href="http://docs.mongodb.org/ecosystem/drivers/">Drivers</a></li>
+<li class="normal"><a href="http://www.10gen.com/events">Events</a></li>
+<li class="normal last"><a class="last" href="http://docs.mongodb.org/manual/meta/translation">Translations</a></li>
+</ul>
 </div>
-<div id="header-db" class="spread">
-        <div class="split">
-                <div id="logo">
-                        <div><a href="{{ pathto('index') }}"><img class="logo" src="http://media.mongodb.org/logo-mongodb.png" alt="MongoDB Logo"/></a></div>
-                </div>
-        </div>
-
+</div>
+{%- endblock -%}
+{%- block searchbox %}
 <div class="search-db"><gcse:searchbox></gcse:searchbox></div>
+{%- endblock %}
+{%- block subnav %}
 {%- if theme_project != 'about' %}
 <div id="etp">
 <ul>
@@ -153,42 +207,13 @@
 </ul>
 </div>
 {%- endif %}
-</div>
-{%- endblock %}
-
-{%- block content %}
-  {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}
-    <div class="document">
-  {%- block document %}
-      <div class="documentwrapper">
-      {%- if render_sidebar %}
-        <div class="bodywrapper">
-      {%- endif %}
-          <div class="body">
-            <div id="cse-results"><gcse:searchresults linkTarget="_top"></gcse:searchresults></div>
-            {% block body %} {% endblock %}
-            {{- render_nextprev() -}}
-          </div>
-      {%- if render_sidebar %}
-        </div>
-      {%- endif %}
-      </div>
-  {%- endblock %}
-
-  {%- block sidebar2 %}{{ sidebar() }}{% endblock %}
-      <div class="clearer"></div>
-    </div>
-{%- endblock %}
-
+{%- endblock -%}
 {%- block footer %}
-  <div class="footer">
-    <p>
-       {% trans copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }} {% endtrans %}
-       MongoDB&reg;, Mongo&reg;, and the leaf logo are registered trademarks of 10gen, Inc.
-    </p>
-  </div>
+<div class="footer">
+<p>{% trans copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }} {% endtrans %}
+MongoDB&reg;, Mongo&reg;, and the leaf logo are registered trademarks of 10gen, Inc.</p>
+</div>
 {%- endblock %}
-
 {%- block analytics %}
 {%- include "analytics.html" %}
 {%- endblock %}
diff --git a/themes/mongodb/pagenav.html b/themes/mongodb/pagenav.html
index ad4c9be242f..2c317e45126 100644
--- a/themes/mongodb/pagenav.html
+++ b/themes/mongodb/pagenav.html
@@ -7,4 +7,4 @@ <h3><a href="{{ pathto(master_doc) }}">{{ shorttitle }}</a>
 {# the following span is replaced by the javascript in versionnav.html #}
 <h4 id="vnd">Version: <span id="vn">{{version}}</span></h4>
 {% endif %}
-{{ toctree(maxdepth=-1) }}
+{{ toctree(maxdepth=1,titles_only=1) }}
diff --git a/themes/mongodb/static/mongodb-docs.css_t b/themes/mongodb/static/mongodb-docs.css_t
index c504e97c385..0ab9a512b75 100644
--- a/themes/mongodb/static/mongodb-docs.css_t
+++ b/themes/mongodb/static/mongodb-docs.css_t
@@ -45,7 +45,7 @@ div.body {
 div.body > div#cse-results + div.section { margin:0 1.5em; }
 div.body > div#cse-results + span.target + div.section { margin:0 1.5em; }
 div.body > div#cse-results + span.target + span.target+ div.section { margin:0 1.5em; }
-
+div.body > div#cse-results {margin:0;padding:0;margin-left:24px;height:auto;}
 div.footer {
     color:white;
     width:auto;
@@ -109,7 +109,7 @@ div.sphinxsidebar h3 {
     padding: 0px 0 0 10px;
 }
 
-div.sphinxsidebar h3 a { color: #444; }
+div.sphinxsidebar h3 a { color: black; }
 
 div.sphinxsidebar p {
     color: #333333;
@@ -138,7 +138,7 @@ div.sphinxsidebar ul {
     color: #000;
 }
 
-div.sphinxsidebar a { color: #444; }
+div.sphinxsidebar a { color: black; }
 
 div.sphinxsidebar input {
     border: 1px solid #ccc;
@@ -176,7 +176,7 @@ div.body h1, div.body h2, div.body h3, div.body h4, div.body h5, div.body h6 {
 }
 
 div.body h1 {
-    border-top: 5px solid white;
+    border-top: none;
     margin-top: 0;
     font-size: 200%;
 }
@@ -378,34 +378,38 @@ div#mongodb ul.simple {
     list-style:circle;
 }
 
+/*
 div.sphinxsidebar li.toctree-l1 a.reference {
     font-size: 1.2em;
-    color: #444;
+    color: black;
     line-height: 1.5em;
 }
+*/
+/*
 div.sphinxsidebar ul.current li.toctree-l1 a {
     font-size: 1.2em;
-    color: #444;
+    color: black;
     line-height: 1.5em;
 }
+*/
 div.sphinxsidebar ul.current li.toctree-l2 a {
     font-size: 1.1em;
-    color: #646464;
+    color: black;
     line-height: 1.5em;
 }
 div.sphinxsidebar ul.current li.toctree-l3 a {
     font-size: 1.0em;
-    color: #848484;
+    color: black;
     line-height: 1.5em;
 }
 div.sphinxsidebar ul.current li.toctree-l4 a {
     font-size: .95em;
-    color: #7b7b7b;
+    color: black;
     line-height: 1.5em;
 }
 div.sphinxsidebar ul.current li.toctree-l5 a {
     font-size: .9em;
-    color: #a3a3a3;
+    color: black;
     line-height: 1.5em;
 }
 div.related li.right {
@@ -413,6 +417,7 @@ div.related li.right {
     margin-right: 5px;
     margin-top: 85px;
 }
+
 div.sphinxsidebar tt.literal .pre {
     font-weight: normal;
 }
@@ -835,3 +840,25 @@ div.admonition-example pre { background-color: #FBFBFB; }
 
 li p.first { margin-bottom: 0em; }
 h4#vnd {padding:0;margin:0;line-height:1.5;padding-left:10px;}
+
+div.sphinxsidebarwrapper {padding-top:0.5em;}
+div.sphinxsidebarwrapper ul {margin:0;padding:0;margin-left:10px;}
+div.sphinxsidebarwrapper ul li {font-size:1.0em;font-family:Helvetica,Arial,Sans-serif;line-height:1.5;}
+div.sphinxsidebarwrapper ul li a:active,
+div.sphinxsidebarwrapper ul li a:focus,
+div.sphinxsidebarwrapper ul li a:hover {font-weight:900;}
+div.sphinxsidebarwrapper ul li a tt span {font-family:Helvetica,Arial,sans-serif;font-size:inherit;color:black;}
+div.sphinxsidebarwrapper ul li a:active tt span, div.sphinxsidebarwrapper ul li a:hover tt span, div.sphinxsidebarwrapper ul li a:focus tt span {font-weight:900}
+div.sphinxsidebarwrapper ul.current li.current a tt span {font-weight:900;}
+div.sphinxsidebar ul.current li.current tt.literal .pre {font-weight:900;}
+div.sphinxsidebar a:active tt.literal .pre,
+div.sphinxsidebar a:focus tt.literal .pre,
+div.sphinxsidebar a:hover tt.literal .pre {font-weight:900;}
+div.body div.bc {padding-top:0.5em; margin-left:24px; background:white;color:black;}
+div.body div.bc li.jr {float: right;display:none;}
+div.body div.bc ul {padding:0;margin:0}
+div.body div.bc ul li {list-style: none;font-size:0.8em;display:inline;color:black;}
+div.body div.bc ul li a {color:black;}
+div.bc ul li:after {content:"›"}
+div.sphinxsidebarwrapper h3 {line-height:2.0;margin:0;padding:0}
+div.sphinxsidebarwrapper h3:first-child {line-height:1.0;margin:0;padding:0}
diff --git a/themes/mongodb/theme.conf b/themes/mongodb/theme.conf
index b265a82d156..9f8cf31bf81 100644
--- a/themes/mongodb/theme.conf
+++ b/themes/mongodb/theme.conf
@@ -17,3 +17,4 @@ version = VERSION
 version_selector = VERSION_SELECTOR
 latest = LATEST
 stable = STABLE
+language = LANGUAGE