diff --git a/agaric/templates/layout/node--full.html.twig b/agaric/templates/layout/node--full.html.twig
index d27c621..7f300dd 100644
--- a/agaric/templates/layout/node--full.html.twig
+++ b/agaric/templates/layout/node--full.html.twig
@@ -71,6 +71,8 @@
  */
 #}
 
+<article{{ attributes.addClass(classes) }}">
+
 {% set title_paragraph_index = null %}
 {% set has_title_paragraph = false %}
 {% if content.field_body_paragraph %}
@@ -85,13 +87,13 @@
 
 {% if not has_title_paragraph %}
   {% set headerbg = 'light' %}
-  {% set classes = [ 'hero', 'hero-' ~ node.bundle|replace({"_": "-"}) ] %}
+  {% set title_classes = [ 'hero', 'hero-' ~ node.bundle|replace({"_": "-"}) ] %}
   {% if node.bundle != 'blog' %}
-    {% set classes = classes|merge(['is-dark']) %}
+    {% set title_classes = title_classes|merge(['is-dark']) %}
     {% set headerbg = 'dark' %}
   {% endif %}
   {# Header hero region #}
-  <section{{ attributes.addClass(classes) }} data-headerbg="{{ headerbg }}">
+  <section{{ create_attribute().addClass(title_classes) }} data-headerbg="{{ headerbg }}">
     <div class="hero-body">
       <div class="container">
         <div class="titlebar">
@@ -113,6 +115,8 @@
   </section>
 {% endif %}
 
+<div class="e-content">
+
 {% set bust_out = false %}
 {% set walls_up = false %}
 
@@ -150,6 +154,9 @@
 </section>
 {% endif %}
 
+</div>{# end e-content div #}
+</article>{# end h-entry article #}
+
 {% if content.comment %}
   {{ content.comment }}
 {% endif %}