diff --git a/sphinx/environment.py b/sphinx/environment.py
index 1b9042691..5b166812a 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -1374,7 +1374,7 @@ class BuildEnvironment:
                             'iscurrent' not in subnode.parent):
                             subnode.parent.remove(subnode)
                         else:
-                            # recurse on visible children  
+                            # recurse on visible children
                             _toctree_prune(subnode, depth+1, maxdepth)
 
         def _toctree_add_classes(node, depth):
diff --git a/sphinx/themes/agogo/layout.html b/sphinx/themes/agogo/layout.html
index 7f3a24870..fde19dbc7 100644
--- a/sphinx/themes/agogo/layout.html
+++ b/sphinx/themes/agogo/layout.html
@@ -8,7 +8,7 @@
     :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 #}
-{% extends "basic/layout.html" %}
+{%- extends "basic/layout.html" %}
 
 {% block header %}
     <div class="header-wrapper">
diff --git a/sphinx/themes/basic/defindex.html b/sphinx/themes/basic/defindex.html
index 4c57b53df..1ae9630de 100644
--- a/sphinx/themes/basic/defindex.html
+++ b/sphinx/themes/basic/defindex.html
@@ -7,7 +7,7 @@
     :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 #}
-{% extends "layout.html" %}
+{%- extends "layout.html" %}
 {% set title = _('Overview') %}
 {% block body %}
   <h1>{{ docstitle|e }}</h1>
diff --git a/sphinx/themes/basic/domainindex.html b/sphinx/themes/basic/domainindex.html
index cbb9cba5d..7f99da618 100644
--- a/sphinx/themes/basic/domainindex.html
+++ b/sphinx/themes/basic/domainindex.html
@@ -7,7 +7,7 @@
     :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 #}
-{% extends "layout.html" %}
+{%- extends "layout.html" %}
 {% set title = indextitle %}
 {% block extrahead %}
 {{ super() }}
diff --git a/sphinx/themes/basic/genindex-single.html b/sphinx/themes/basic/genindex-single.html
index 0efdcee99..e79212516 100644
--- a/sphinx/themes/basic/genindex-single.html
+++ b/sphinx/themes/basic/genindex-single.html
@@ -28,7 +28,7 @@
   </dt>
 {% endmacro %}
 
-{% extends "layout.html" %}
+{%- extends "layout.html" %}
 {% set title = _('Index') %}
 {% block body %}
 
diff --git a/sphinx/themes/basic/genindex-split.html b/sphinx/themes/basic/genindex-split.html
index e2fcf04cf..20c180687 100644
--- a/sphinx/themes/basic/genindex-split.html
+++ b/sphinx/themes/basic/genindex-split.html
@@ -7,7 +7,7 @@
     :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 #}
-{% extends "layout.html" %}
+{%- extends "layout.html" %}
 {% set title = _('Index') %}
 {% block body %}
 
diff --git a/sphinx/themes/basic/genindex.html b/sphinx/themes/basic/genindex.html
index 3ba162bf6..dd2c96d8e 100644
--- a/sphinx/themes/basic/genindex.html
+++ b/sphinx/themes/basic/genindex.html
@@ -28,7 +28,7 @@
   </dt>
 {% endmacro %}
 
-{% extends "layout.html" %}
+{%- extends "layout.html" %}
 {% set title = _('Index') %}
 {% block body %}
 
diff --git a/sphinx/themes/basic/page.html b/sphinx/themes/basic/page.html
index f7de22b67..185c6c85a 100644
--- a/sphinx/themes/basic/page.html
+++ b/sphinx/themes/basic/page.html
@@ -7,7 +7,7 @@
     :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 #}
-{% extends "layout.html" %}
+{%- extends "layout.html" %}
 {% block body %}
   {{ body }}
 {% endblock %}
diff --git a/sphinx/themes/basic/search.html b/sphinx/themes/basic/search.html
index 2d926a41b..011c23929 100644
--- a/sphinx/themes/basic/search.html
+++ b/sphinx/themes/basic/search.html
@@ -7,7 +7,7 @@
     :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 #}
-{% extends "layout.html" %}
+{%- extends "layout.html" %}
 {% set title = _('Search') %}
 {% set script_files = script_files + ['_static/searchtools.js'] %}
 {% block extrahead %}
diff --git a/sphinx/themes/default/layout.html b/sphinx/themes/default/layout.html
index 0cc0df10e..d237f5ed9 100644
--- a/sphinx/themes/default/layout.html
+++ b/sphinx/themes/default/layout.html
@@ -7,7 +7,7 @@
     :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 #}
-{% extends "basic/layout.html" %}
+{%- extends "basic/layout.html" %}
 
 {% if theme_collapsiblesidebar|tobool %}
 {% set script_files = script_files + ['_static/sidebar.js'] %}
diff --git a/sphinx/themes/epub/epub-cover.html b/sphinx/themes/epub/epub-cover.html
index f0289f602..5872fb7f1 100644
--- a/sphinx/themes/epub/epub-cover.html
+++ b/sphinx/themes/epub/epub-cover.html
@@ -7,7 +7,7 @@
     :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 #}
-{% extends "layout.html" %}
+{%- extends "layout.html" %}
 {%- block header %}{% endblock %}
 {%- block rootrellink %}{% endblock %}
 {%- block relbaritems %}{% endblock %}
diff --git a/sphinx/themes/epub/layout.html b/sphinx/themes/epub/layout.html
index 789aa90b3..c2e2e0fd5 100644
--- a/sphinx/themes/epub/layout.html
+++ b/sphinx/themes/epub/layout.html
@@ -7,7 +7,7 @@
     :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 #}
-{% extends "basic/layout.html" %}
+{%- extends "basic/layout.html" %}
 
 {# add only basic navigation links #}
 {% block sidebar1 %}{% endblock %}
diff --git a/sphinx/themes/haiku/layout.html b/sphinx/themes/haiku/layout.html
index 9411e4483..edbda50b2 100644
--- a/sphinx/themes/haiku/layout.html
+++ b/sphinx/themes/haiku/layout.html
@@ -7,7 +7,7 @@
     :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 #}
-{% extends "basic/layout.html" %}
+{%- extends "basic/layout.html" %}
 {% set script_files = script_files + ['_static/theme_extras.js'] %}
 {% set css_files = css_files + ['_static/print.css'] %}
 
diff --git a/sphinx/themes/pyramid/layout.html b/sphinx/themes/pyramid/layout.html
index 1887361ee..8780ceaef 100644
--- a/sphinx/themes/pyramid/layout.html
+++ b/sphinx/themes/pyramid/layout.html
@@ -1,4 +1,4 @@
-{% extends "basic/layout.html" %}
+{%- extends "basic/layout.html" %}
 
 {%- block extrahead %}
 <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
diff --git a/sphinx/themes/scrolls/layout.html b/sphinx/themes/scrolls/layout.html
index 13e46015c..97f7ca1db 100644
--- a/sphinx/themes/scrolls/layout.html
+++ b/sphinx/themes/scrolls/layout.html
@@ -8,7 +8,7 @@
     :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 #}
-{% extends "basic/layout.html" %}
+{%- extends "basic/layout.html" %}
 {% set script_files = script_files + ['_static/theme_extras.js'] %}
 {% set css_files = css_files + ['_static/print.css'] %}
 {# do not display relbars #}
diff --git a/sphinx/themes/sphinxdoc/layout.html b/sphinx/themes/sphinxdoc/layout.html
index 05a99f9bf..4ffeb6ed2 100644
--- a/sphinx/themes/sphinxdoc/layout.html
+++ b/sphinx/themes/sphinxdoc/layout.html
@@ -7,7 +7,7 @@
     :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 #}
-{% extends "basic/layout.html" %}
+{%- extends "basic/layout.html" %}
 
 {# put the sidebar before the body #}
 {% block sidebar1 %}{{ sidebar() }}{% endblock %}