diff --git a/doc/theming.rst b/doc/theming.rst
index 6c650e4a6..e4a6b9a54 100644
--- a/doc/theming.rst
+++ b/doc/theming.rst
@@ -162,6 +162,8 @@ These themes are:
     headings.
   - **headerlinkcolor** (CSS color): Color for the backreference link in
     headings.
+  - **textalign** (CSS *text-align* value): Text alignment for the body, default
+    is ``justify``.
 
 * **nature** -- A greenish theme.  There are currently no options beyond
   *nosidebar*.
diff --git a/sphinx/themes/agogo/static/agogo.css_t b/sphinx/themes/agogo/static/agogo.css_t
index 4dd03d922..cfe216124 100644
--- a/sphinx/themes/agogo/static/agogo.css_t
+++ b/sphinx/themes/agogo/static/agogo.css_t
@@ -39,10 +39,13 @@ div.header-wrapper {
 
 /* Default body styles */
 a {
-  text-decoration: none;
   color: {{ theme_linkcolor }};
 }
 
+div.bodywrapper a, div.footer a {
+  text-decoration: underline;
+}
+
 .clearer {
   clear: both;
 }
@@ -99,7 +102,21 @@ dt:hover > a.headerlink {
   visibility: visible;
 }
 
+img {
+  border: 0;
+}
 
+div.admonition {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  padding: 2px 7px 1px 7px;
+  border-left: 0.2em solid black;
+}
+
+p.admonition-title {
+  margin: 0px 10px 5px 0px;
+  font-weight: bold;
+}
 
 /* Header */
 
@@ -152,7 +169,7 @@ div.document {
 
 div.body {
   padding-right: 2em;
-  text-align: justify;
+  text-align: {{ theme_textalign }};
 }
 
 div.document ul {
@@ -217,6 +234,14 @@ div.sidebar {
   font-size: .9em;
 }
 
+div.sidebar a, div.header a {
+  text-decoration: none;
+}
+
+div.sidebar a:hover, div.header a:hover {
+  text-decoration: underline;
+}
+
 div.sidebar h3 {
   color: #2e3436;
   text-transform: uppercase;
@@ -241,6 +266,14 @@ div.sidebar li.toctree-l1 a {
 div.sidebar li.toctree-l2 a {
   background-color: transparent;
   border: none;
+  margin-left: 1em;
+  border-bottom: 1px solid #dddddd;
+}
+
+div.sidebar li.toctree-l3 a {
+  background-color: transparent;
+  border: none;
+  margin-left: 2em;
   border-bottom: 1px solid #dddddd;
 }
 
diff --git a/sphinx/themes/agogo/theme.conf b/sphinx/themes/agogo/theme.conf
index 9cdac5d7a..3fc88580f 100644
--- a/sphinx/themes/agogo/theme.conf
+++ b/sphinx/themes/agogo/theme.conf
@@ -15,4 +15,5 @@ footerbg = url(bgfooter.png) top left repeat-x
 linkcolor = #ce5c00
 headercolor1 = #204a87
 headercolor2 = #3465a4
-headerlinkcolor = #fcaf3e
\ No newline at end of file
+headerlinkcolor = #fcaf3e
+textalign = justify
\ No newline at end of file