diff --git a/doc/_static/broxygen-extra.css b/doc/_static/broxygen-extra.css
index dd56416783..d873e286bc 100644
--- a/doc/_static/broxygen-extra.css
+++ b/doc/_static/broxygen-extra.css
@@ -1,3 +1,15 @@
 .highlight {
     background-color: #ffffff;
 }
+
+h1 {
+    font-weight: bold;
+    font-size: 32px;
+	line-height:32px;
+    text-align: center;
+    padding-top: 3px;
+    margin-bottom: 30px;
+    font-family: Palatino,'Palatino Linotype',Georgia,serif;;
+    color: #000;
+    border-bottom: 0px;
+}
diff --git a/doc/_static/logo-bro.png b/doc/_static/logo-bro.png
new file mode 100644
index 0000000000..96cc5d443c
Binary files /dev/null and b/doc/_static/logo-bro.png differ
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
index 8edeeb07b6..cb6181361d 100644
--- a/doc/_templates/layout.html
+++ b/doc/_templates/layout.html
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block header %}
-<iframe src="http://www.bro-ids.org/frames/header.html" width="100%" height="100px" frameborder="0" marginheight="0" scrolling="no" marginwidth="0">
+<iframe src="http://www.bro-ids.org/frames/header-no-logo.html" width="100%" height="100px" frameborder="0" marginheight="0" scrolling="no" marginwidth="0">
 </iframe>
 {% endblock %}
 
@@ -17,15 +17,82 @@
 {% block relbar1 %}{% endblock %}
 
 {% block content %}
-<div id="bro-main" class="clearfix">
-    <div class="container_12">
-        {{ super() }}
-    </div>
-</div>
+
+        <div id="bro-main" class="clearfix">
+            <div class="container_12">
+
+                <div class="grid_9">
+
+                    <div>
+                         {{ relbar() }}
+                    </div>
+
+                    <div class="body">
+                        {% block body %}
+                        {% endblock %}
+                    </div>
+                </div>
+
+                <!-- Sidebar -->
+                <div class="grid_3 omega">
+
+                    <div>
+                        <img id="logo" src="{{pathto('_static/logo-bro.png', 1)}}" alt="Logo" />
+                    </div>
+                    <br />
+
+
+                    <div class="widget sidebar-toc">
+                        <h3 class="widgettitle">
+                            Table of Contents
+                        </h3>
+                        <p>
+                            <ul>{{toc}}</ul>
+                        </p>
+                    </div>
+
+                    {% if next %}
+                    <div class="widget">
+                        <h3 class="widgettitle">
+                            Next Page
+                        </h3>
+                        <p>
+                            <a href="{{ next.link|e }}">{{ next.title }}</a>
+                        </p>
+                    </div>
+                    {% endif %}
+
+                    {% if prev %}
+                    <div class="widget">
+                        <h3 class="widgettitle">
+                            Previous Page
+                        </h3>
+                        <p>
+                            <a href="{{ prev.link|e }}">{{ prev.title }}</a>
+                        </p>
+                    </div>
+                    {% endif %}
+
+                </div>
+            </div>
+
+            <div class="container_12">
+                <div class="grid_12 alpha omega">
+                    <div class="center">
+                        <small>
+                            Copyright {{ copyright }}.
+                            Last updated on {{ last_updated }}.
+                            Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> {{ sphinx_version }}.
+                        </small>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+
 {% endblock %}
 
 {% block footer %}
-{{ super() }}
 <iframe src="http://www.bro-ids.org/frames/footer.html" width="100%" height="420px" frameborder="0" marginheight="0" scrolling="no" marginwidth="0">
 </iframe>
 {% endblock %}
diff --git a/doc/conf.py.in b/doc/conf.py.in
index 8844370a07..8959c0b2c9 100644
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -90,44 +90,20 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'basic'
 
 html_last_updated_fmt = '%B %d, %Y'
 
 # 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 = {
-"rightsidebar": "true",
-"stickysidebar": "false",
-"externalrefs": "false",
-"footerbgcolor": "#333",
-"footertextcolor": "#ddd",
-"sidebarbgcolor": "#ffffff",
-#"sidebarbtncolor": "",
-"sidebartextcolor": "#333",
-"sidebarlinkcolor": "#2a85a7",
-"relbarbgcolor": "#ffffff",
-"relbartextcolor": "#333",
-"relbarlinkcolor": "#2a85a7",
-"bgcolor": "#ffffff",
-"textcolor": "#333",
-"linkcolor": "#2a85a7",
-"visitedlinkcolor": "#2a85a7",
-"headbgcolor": "#f0f0f0",
-"headtextcolor": "#000",
-"headlinkcolor": "#2a85a7",
-"codebgcolor": "#FFFAE2",
-#"codetextcolor": "",
-"bodyfont": "Arial, Helvetica, sans-serif",
-"headfont": "Palatino,'Palatino Linotype',Georgia,serif",
-}
+html_theme_options = { }
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []
 
 # The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
+# "<project> v<release> Documentation".
 #html_title = None
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
diff --git a/doc/index.rst b/doc/index.rst
index ad503af50b..a5af2a4f8d 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -1,9 +1,11 @@
 .. Bro documentation master file
 
+=================
 Bro Documentation
 =================
 
-Documentation for version: |version|
+Guides
+------
 
 .. toctree::
    :maxdepth: 1