diff --git a/templates/article_pages/entity-print--node--journal-article--pdf.html.twig b/templates/article_pages/entity-print--node--journal-article--pdf.html.twig
deleted file mode 100644
index 6a4d1a2..0000000
--- a/templates/article_pages/entity-print--node--journal-article--pdf.html.twig
+++ /dev/null
@@ -1,61 +0,0 @@
-{#{{ kint(node) }}#}
-{% set toc = drupal_entity('block', 'tableofcontents', check_access=false) %}
-{% set tabs = drupal_block('local_tasks_block') %}
-{#{{dump(toc|render|striptags|trim)}}#}
-{%
- set classes = [
- 'node',
- 'node--type-' ~ node.bundle|clean_class,
- node.isPromoted() ? 'node--promoted',
- node.isSticky() ? 'node--sticky',
- not node.isPublished() ? 'node--unpublished',
- view_mode ? 'node--view-mode-' ~ view_mode|clean_class,
- 'clearfix',
- ]
-%}
-{{ attach_library('classy/node') }}
-{{ attach_library('magazineplus/node') }}
-
- {#main banner#}
-
-
-
-
-
-
-
- {#admin tabs#}
-
- {% block node_side %}
- {% endblock %}
-
-
-
- {% if toc is not empty %}
- {{ toc }}
- {% endif %}
- {#start of article #}
-
-
- {{ tabs }}
- {% block header_top %}
- {% endblock %}
-
-
-
- {#main content#}
- {% block content %}
- {{ content|without( 'field_article_highlight_image', 'field_authors_and_affiliations' )}}
- {% endblock %}
- {% block content_bottom %}
- {% endblock %}
-
-
-
-
-
-
-
-
-
-
diff --git a/templates/article_pages/entity-print--node--journal-article.html.twig b/templates/article_pages/entity-print--node--journal-article.html.twig
deleted file mode 100644
index 6a4d1a2..0000000
--- a/templates/article_pages/entity-print--node--journal-article.html.twig
+++ /dev/null
@@ -1,61 +0,0 @@
-{#{{ kint(node) }}#}
-{% set toc = drupal_entity('block', 'tableofcontents', check_access=false) %}
-{% set tabs = drupal_block('local_tasks_block') %}
-{#{{dump(toc|render|striptags|trim)}}#}
-{%
- set classes = [
- 'node',
- 'node--type-' ~ node.bundle|clean_class,
- node.isPromoted() ? 'node--promoted',
- node.isSticky() ? 'node--sticky',
- not node.isPublished() ? 'node--unpublished',
- view_mode ? 'node--view-mode-' ~ view_mode|clean_class,
- 'clearfix',
- ]
-%}
-{{ attach_library('classy/node') }}
-{{ attach_library('magazineplus/node') }}
-
- {#main banner#}
-
-
-
-
-
-
-
- {#admin tabs#}
-
- {% block node_side %}
- {% endblock %}
-
-
-
- {% if toc is not empty %}
- {{ toc }}
- {% endif %}
- {#start of article #}
-
-
- {{ tabs }}
- {% block header_top %}
- {% endblock %}
-
-
-
- {#main content#}
- {% block content %}
- {{ content|without( 'field_article_highlight_image', 'field_authors_and_affiliations' )}}
- {% endblock %}
- {% block content_bottom %}
- {% endblock %}
-
-
-
-
-
-
-
-
-
-
diff --git a/templates/article_pages/entity-print--node--journal-article--full.html.twig b/templates/article_pages/entity-print--node--journal-article.html.twig.old
similarity index 100%
rename from templates/article_pages/entity-print--node--journal-article--full.html.twig
rename to templates/article_pages/entity-print--node--journal-article.html.twig.old
diff --git a/templates/article_pages/entity-print.html.twig b/templates/article_pages/entity-print.html.twig
new file mode 100644
index 0000000..58f5a03
--- /dev/null
+++ b/templates/article_pages/entity-print.html.twig
@@ -0,0 +1,12 @@
+
+
+
+ {{ title }}
+ {{ entity_print_css }}
+
+
+
+ {{ content }}
+
+
+
diff --git a/templates/article_pages/node--journal-article--pdf.html.twig b/templates/article_pages/node--journal-article--pdf.html.twig
index d614e36..dcdb543 100644
--- a/templates/article_pages/node--journal-article--pdf.html.twig
+++ b/templates/article_pages/node--journal-article--pdf.html.twig
@@ -17,7 +17,6 @@
{{ attach_library('magazineplus/node') }}
{#main banner#}
- {% include '@lmmi_journal/article_pages/article--hero.html.twig' %}
@@ -32,9 +31,6 @@
- {% if toc is not empty %}
- {{ toc }}
- {% endif %}
{#start of article #}
@@ -46,6 +42,9 @@
{#main content#}
{% block content %}
+
+ {{ label }}
+
{{ content|without( 'field_article_highlight_image', 'field_authors_and_affiliations' )}}
{% endblock %}
{% block content_bottom %}