diff --git a/src/moin/templates/itemviews.html b/src/moin/templates/itemviews.html
index 6a57a4759..3d9f94ae1 100644
--- a/src/moin/templates/itemviews.html
+++ b/src/moin/templates/itemviews.html
@@ -7,13 +7,12 @@
     Comment and Transclusion links may be hidden by Javascript if item lacks content.
 #}
 
-{% set item = item %}
-{% set not_trash =  not item_is_deleted if item_is_deleted is defined else True %}
-{% set icon_classes = theme_supp.get_endpoint_iconmap() %}
+{%- set item = item -%}
+{%- set not_trash =  not item_is_deleted if item_is_deleted is defined else True -%}
+{%- set icon_classes = theme_supp.get_endpoint_iconmap() -%}
 
 {%- macro a_label(icon_class, label) %}
-    <i class="{{ icon_class }}"></i>
-    <span>{{ label }}</span>
+                <i class="{{ icon_class }}"></i><span>{{ label }}</span>
 {%- endmacro %}
 
 <ul class="moin-itemviews panel">
@@ -107,7 +106,7 @@
             </li>
         {%- endif %}
 
-        {% if endpoint == 'special.transclusions' and not_trash -%}
+        {%- if endpoint == 'special.transclusions' and not_trash %}
             <li class="moin-transclusions-button">
                 <a class="moin-transclusions-tooltip" href="#" title="{{ title }}">{{ a_label(icon_class, label) }}</a>
             </li>
@@ -120,11 +119,11 @@
                     {%- set supp_name = '%s/%s' % (fqname, sub_item_name) %}
                     {%- if not_trash and (storage.has_item(supp_name) or user.may.write(supp_name)) %}
                         {% set title = _('Discuss contents of this item') %}
-                        <li>
-                            <a class="moin-subitem-discuss" href="{{ url_for('frontend.show_item', item_name = supp_name) }}"
-                                title="{{ title }}" rel="nofollow">{{ a_label(icon_class, _(sub_item_name)) }}
-                            </a>
-                        </li>
+            <li>
+                 <a class="moin-subitem-discuss" href="{{ url_for('frontend.show_item', item_name = supp_name) }}"
+                     title="{{ title }}" rel="nofollow">{{ a_label(icon_class, _(sub_item_name)) }}
+                 </a>
+            </li>
                     {%- endif %}
                 {%- endif %}
             {%- endfor %}
diff --git a/src/moin/templates/show.html b/src/moin/templates/show.html
index 5c48effd1..086e7bc98 100644
--- a/src/moin/templates/show.html
+++ b/src/moin/templates/show.html
@@ -2,7 +2,7 @@
 
 {% import "utils.html" as utils with context %}
 {% import "snippets.html" as snippets with context %}
-{% import "itemviews.html" as itemviews with context %}
+{% import theme("itemviews.html") as itemviews with context %}
 
 {% set footer_meta = snippets.footer_meta() %}
 
diff --git a/src/moin/themes/focus/templates/itemviews.html b/src/moin/themes/focus/templates/itemviews.html
index 518f444d9..0c55fac14 100644
--- a/src/moin/themes/focus/templates/itemviews.html
+++ b/src/moin/themes/focus/templates/itemviews.html
@@ -17,146 +17,148 @@
     <span>{{ label }}</span>
 {%- endmacro %}
 
-<div class="moin-itemviews panel">
-    {%- for endpoint, label, title, check_exists in cfg.item_views if not endpoint in cfg.endpoints_excluded %}
-        {% set icon_class = icon_classes[endpoint] %}
-            {%- if  may.write and not_trash %}
-                {%- if current_path.startswith("/+")
-                    and endpoint == 'frontend.show_item'
+<div id="top-bar">
+    <div class="moin-itemviews panel">
+        {%- for endpoint, label, title, check_exists in cfg.item_views if not endpoint in cfg.endpoints_excluded %}
+            {% set icon_class = icon_classes[endpoint] %}
+                {%- if  may.write and not_trash %}
+                    {%- if current_path.startswith("/+")
+                        and endpoint == 'frontend.show_item'
+                    %}
+                        <div>
+                            <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
+                        </div>
+                    {%- elif not current_path.startswith("/+")
+                        and endpoint == 'frontend.modify_item' %}
+                        <div>
+                            <a class="moin-modify-button" href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
+                        </div>
+                    {%- endif %}
+                {%- endif %}
+        {%- endfor %}
+        <div id="top-bar-menu">
+            <input id="top-bar-menu-switch" type="checkbox" />
+            <div id="top-bar-menu-label">
+                <label for="top-bar-menu-switch">
+                    <span>{{ _('More') }}</span>
+                    <i class="fa fa-caret-down"></i>
+                </label>
+            </div>
+            <div id="top-bar-menu-content">
+                {%- for endpoint, label, title, check_exists in cfg.item_views if not endpoint in cfg.endpoints_excluded %}
+                {% set icon_class = icon_classes[endpoint] %}
+                {%- if  may.write
+                    and not_trash
+                    and endpoint == 'frontend.modify_item'
+                    and current_path.startswith("/+")
+                    and not current_path.startswith("/+modify/")
                 %}
                     <div>
-                        <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
+                        <a class="moin-modify-button" href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
                     </div>
-                {%- elif not current_path.startswith("/+")
-                    and endpoint == 'frontend.modify_item' %}
+                {%- endif %}
+                {%- if endpoint in [
+                    'frontend.show_item_meta',
+                    'frontend.history',
+                    'frontend.download_item',
+                ] %}
                     <div>
-                        <a class="moin-modify-button" href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
+                        <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
                     </div>
                 {%- endif %}
-            {%- endif %}
-    {%- endfor %}
-    <div id="top-bar-menu">
-        <input id="top-bar-menu-switch" type="checkbox" />
-        <div id="top-bar-menu-label">
-            <label for="top-bar-menu-switch">
-                <span>{{ _('More') }}</span>
-                <i class="fa fa-caret-down"></i>
-            </label>
-        </div>
-        <div id="top-bar-menu-content">
-            {%- for endpoint, label, title, check_exists in cfg.item_views if not endpoint in cfg.endpoints_excluded %}
-            {% set icon_class = icon_classes[endpoint] %}
-            {%- if  may.write
-                and not_trash
-                and endpoint == 'frontend.modify_item'
-                and current_path.startswith("/+")
-                and not current_path.startswith("/+modify/")
-            %}
-                <div>
-                    <a class="moin-modify-button" href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                </div>
-            {%- endif %}
-            {%- if endpoint in [
-                'frontend.show_item_meta',
-                'frontend.history',
-                'frontend.download_item',
-            ] %}
-                <div>
-                    <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                </div>
-            {%- endif %}
 
-            {%- if not_trash and endpoint in [
-                'frontend.index',
-                'frontend.refs',
-                'frontend.sitemap',
-                'frontend.similar_names',
-                'frontend.copy_item',
-            ] %}
-                <div>
-                    <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                </div>
-            {%- endif %}
+                {%- if not_trash and endpoint in [
+                    'frontend.index',
+                    'frontend.refs',
+                    'frontend.sitemap',
+                    'frontend.similar_names',
+                    'frontend.copy_item',
+                ] %}
+                    <div>
+                        <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
+                    </div>
+                {%- endif %}
 
-            {%- if endpoint == 'frontend.highlight_item' and item and ('text' in item.contenttype or 'docbook' in item.contenttype) %}
-                <div>
-                    <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                </div>
-            {%- endif %}
+                {%- if endpoint == 'frontend.highlight_item' and item and ('text' in item.contenttype or 'docbook' in item.contenttype) %}
+                    <div>
+                        <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
+                    </div>
+                {%- endif %}
 
-            {%- if endpoint in [
-                'frontend.rename_item', 'frontend.delete_item',
-            ] and may.write and not_trash %}
-                <div>
-                    <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                </div>
-            {%- endif %}
+                {%- if endpoint in [
+                    'frontend.rename_item', 'frontend.delete_item',
+                ] and may.write and not_trash %}
+                    <div>
+                        <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
+                    </div>
+                {%- endif %}
 
-            {%- if endpoint in [
-                'frontend.convert_item',
-            ] and may.write and item and theme_supp.is_markup_or_text(item.contenttype) and not_trash %}
-                <div>
-                    <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                </div>
-            {%- endif %}
+                {%- if endpoint in [
+                    'frontend.convert_item',
+                ] and may.write and item and theme_supp.is_markup_or_text(item.contenttype) and not_trash %}
+                    <div>
+                        <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
+                    </div>
+                {%- endif %}
 
-            {%- if endpoint == 'frontend.destroy_item' and may.destroy %}
-                <div>
-                    <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                </div>
-            {%- endif %}
+                {%- if endpoint == 'frontend.destroy_item' and may.destroy %}
+                    <div>
+                        <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
+                    </div>
+                {%- endif %}
 
-            {%- if endpoint == 'frontend.quicklink_item' and user.valid and not_trash %}
-                <div>
-                    <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">
-                        {%- if user.is_quicklinked_to([fqname]) %}
-                            {{ a_label(icon_class, _('Remove Link')) }}
-                        {%- else %}
-                            {{ a_label(icon_class, _('Add Link')) }}
-                        {%- endif %}
-                    </a>
-                </div>
-            {%- endif %}
+                {%- if endpoint == 'frontend.quicklink_item' and user.valid and not_trash %}
+                    <div>
+                        <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">
+                            {%- if user.is_quicklinked_to([fqname]) %}
+                                {{ a_label(icon_class, _('Remove Link')) }}
+                            {%- else %}
+                                {{ a_label(icon_class, _('Add Link')) }}
+                            {%- endif %}
+                        </a>
+                    </div>
+                {%- endif %}
 
-            {%- if endpoint == 'frontend.subscribe_item' and user.valid and not_trash %}
-                <div>
-                    <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">
-                        {%- if user.is_subscribed_to(item) %}
-                            {{ a_label(icon_class, _('Unsubscribe')) }}
-                        {%- else %}
-                            {{ a_label(icon_class, _('Subscribe')) }}
-                        {%- endif %}
-                    </a>
-                </div>
-            {%- endif %}
+                {%- if endpoint == 'frontend.subscribe_item' and user.valid and not_trash %}
+                    <div>
+                        <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">
+                            {%- if user.is_subscribed_to(item) %}
+                                {{ a_label(icon_class, _('Unsubscribe')) }}
+                            {%- else %}
+                                {{ a_label(icon_class, _('Subscribe')) }}
+                            {%- endif %}
+                        </a>
+                    </div>
+                {%- endif %}
 
-            {%- if endpoint == 'special.comments' and not_trash %}
-                <div class="moin-toggle-comments-button">
-                    <a class="moin-toggle-comments-tooltip" href="#" title="{{ title }}">{{ a_label(icon_class, label) }}</a>
-                </div>
-            {%- endif %}
+                {%- if endpoint == 'special.comments' and not_trash %}
+                    <div class="moin-toggle-comments-button">
+                        <a class="moin-toggle-comments-tooltip" href="#" title="{{ title }}">{{ a_label(icon_class, label) }}</a>
+                    </div>
+                {%- endif %}
 
-            {% if endpoint == 'special.transclusions' and not_trash -%}
-                <div class="moin-transclusions-button">
-                    <a class="moin-transclusions-tooltip" href="#" title="{{ title }}">{{ a_label(icon_class, label) }}</a>
-                </div>
-            {%- endif %}
+                {% if endpoint == 'special.transclusions' and not_trash -%}
+                    <div class="moin-transclusions-button">
+                        <a class="moin-transclusions-tooltip" href="#" title="{{ title }}">{{ a_label(icon_class, label) }}</a>
+                    </div>
+                {%- endif %}
 
-            {%- if endpoint == 'special.supplementation' and fqname %}
-                {%- for sub_item_name in cfg.supplementation_item_names %}
-                    {%- set current_sub = item_name.rsplit('/', 1)[-1] %}
-                    {%- if not current_sub in cfg.supplementation_item_names %}
-                        {%- set supp_name = '%s/%s/%s' % (fqname.namespace, item_name, sub_item_name) %}
-                        {%- if not_trash and (storage.has_item(supp_name) or user.may.write(supp_name)) %}
-                            {% set title = _('Discuss contents of this item') %}
-                            <div>
-                                <a class="moin-subitem-discuss" href="{{ url_for('frontend.show_item', item_name=supp_name) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, _(sub_item_name)) }}</a>
-                            </div>
+                {%- if endpoint == 'special.supplementation' and fqname %}
+                    {%- for sub_item_name in cfg.supplementation_item_names %}
+                        {%- set current_sub = item_name.rsplit('/', 1)[-1] %}
+                        {%- if not current_sub in cfg.supplementation_item_names %}
+                            {%- set supp_name = '%s/%s/%s' % (fqname.namespace, item_name, sub_item_name) %}
+                            {%- if not_trash and (storage.has_item(supp_name) or user.may.write(supp_name)) %}
+                                {% set title = _('Discuss contents of this item') %}
+                                <div>
+                                    <a class="moin-subitem-discuss" href="{{ url_for('frontend.show_item', item_name=supp_name) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, _(sub_item_name)) }}</a>
+                                </div>
+                            {%- endif %}
                         {%- endif %}
-                    {%- endif %}
+                    {%- endfor %}
+                {%- endif %}
                 {%- endfor %}
-            {%- endif %}
-            {%- endfor %}
+            </div>
         </div>
     </div>
 </div>
diff --git a/src/moin/themes/focus/templates/show.html b/src/moin/themes/focus/templates/show.html
deleted file mode 100644
index e152a2c22..000000000
--- a/src/moin/themes/focus/templates/show.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{% extends theme("layout.html") %}
-
-{% import "utils.html" as utils with context %}
-{% import "snippets.html" as snippets with context %}
-{% import theme("itemviews.html") as itemviews with context %}
-
-{% set footer_meta = snippets.footer_meta() %}
-
-{% block head_links %}
-    {{ super() }}
-    <link rel="alternate" title="{{ item_name }} changes" href="{{ url_for('feed.atom', item_name=item_name) }}" type="application/atom+xml">
-    {# universal edit button support #}
-    {%- if may.write and 'frontend.modify_item' not in cfg.endpoints_excluded -%}
-        <link rel="alternate" type="application/wiki" title="{{ _('Modify') }}" href="{{ url_for('frontend.modify_item', item_name=item_name) }}">
-    {%- endif %}
-{% endblock %}
-
-{% block header_itemviews %}
-    <div id="top-bar">
-        {{ itemviews }}
-    </div>
-{% endblock %}
-
-{% block content %}
-    {% block headline %}
-        {% if item.meta['summary'] %}
-            {% block item_summary %}
-                <div class="moin-summary">
-                    {{ _('Summary: {summary}').format(summary=item.meta['summary']) }}
-                </div>
-            {% endblock %}
-        {% endif %}
-        {{ utils.rev_navigation(rev_navigation_ids_dates, fqname, view='frontend.show_item', item=item) }}
-    {% endblock %}
-
-    {% block content_data %}
-        {% if data_rendered %}
-            <div id="moin-content-data">
-                {{ data_rendered }}
-            </div>
-        {% endif %}
-    {% endblock %}
-{% endblock %}
-
-{% block footer_hr %}{% endblock %}
-
-{% block footer_meta %}
-    {{ footer_meta }}
-{% endblock %}
-
-{% block options_for_javascript %}
-    {%- if item_name and user.edit_on_doubleclick and may.write and data_rendered and not form -%}
-        <br id="moin-edit-on-doubleclick">
-    {%- endif %}
-    {%- if user.show_comments -%}
-        <br id="moin-show-comments">
-    {%- endif %}
-{% endblock %}