diff --git a/source/_patterns/00-atoms/_attributes.twig b/source/_patterns/00-atoms/_attributes.twig
deleted file mode 100644
index b673abfb..00000000
--- a/source/_patterns/00-atoms/_attributes.twig
+++ /dev/null
@@ -1,11 +0,0 @@
-{%- for name, value in attributes|default({}) if value is not same as(false) -%}
-
-  {{- ' ' ~ name -}}
-
-  {%- if value is iterable -%}
-    ="{{ value|join(' ') }}"
-  {%- elseif value is not same as(true) -%}
-    ="{{ value }}"
-  {%- endif -%}
-
-{%- endfor -%}
diff --git a/source/_patterns/00-atoms/_html.twig b/source/_patterns/00-atoms/_html.twig
new file mode 100644
index 00000000..0bd85aa9
--- /dev/null
+++ b/source/_patterns/00-atoms/_html.twig
@@ -0,0 +1,37 @@
+{%- macro content(content) -%}
+
+  {%- import _self as html -%}
+
+  {%- if content.template is defined -%}
+
+    {%- include content.template with content.arguments|default({}) only -%}
+
+  {%- elseif content is iterable -%}
+
+    {%- for node in content -%}
+      {{- html.content(node) -}}
+    {%- endfor -%}
+
+  {%- else -%}
+
+    {{- content -}}
+
+  {%- endif -%}
+
+{%- endmacro content -%}
+
+{%- macro attributes(attributes) -%}
+
+  {%- for name, value in attributes|default({}) if value is not same as(false) -%}
+
+    {{- ' ' ~ name -}}
+
+    {%- if value is iterable -%}
+      ="{{ value|join(' ') }}"
+    {%- elseif value is not same as(true) -%}
+      ="{{ value }}"
+    {%- endif -%}
+
+  {%- endfor -%}
+
+{%- endmacro attributes -%}
diff --git a/source/_patterns/00-atoms/_text.twig b/source/_patterns/00-atoms/_text.twig
deleted file mode 100644
index c87ac139..00000000
--- a/source/_patterns/00-atoms/_text.twig
+++ /dev/null
@@ -1,17 +0,0 @@
-{%- if nodes is iterable -%}
-
-  {%- for node in nodes -%}
-
-    {%- if node.template is defined -%}
-      {%- include node.template with node.arguments only -%}
-    {%- else -%}
-      {{- node -}}
-    {%- endif -%}
-
-  {%- endfor -%}
-
-{%- else -%}
-
-  {{- nodes -}}
-
-{%- endif -%}
diff --git a/source/_patterns/00-atoms/block/heading/heading.twig b/source/_patterns/00-atoms/block/heading/heading.twig
index 9866ed66..a0e188cd 100644
--- a/source/_patterns/00-atoms/block/heading/heading.twig
+++ b/source/_patterns/00-atoms/block/heading/heading.twig
@@ -1,6 +1,8 @@
+{%- import 'atoms-html' as html -%}
+
 {%- set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['heading']) }) -%}
 
-<h{{ level|default(1) }} {%- include 'atoms-attributes' %}>
+<h{{ level|default(1) }} {{- html.attributes(attributes) }}>
 
   {%- if text.text is not defined -%}
     {%- set text = {text: text} -%}
diff --git a/source/_patterns/00-atoms/block/paragraph/paragraph.twig b/source/_patterns/00-atoms/block/paragraph/paragraph.twig
index f70acfba..86799482 100644
--- a/source/_patterns/00-atoms/block/paragraph/paragraph.twig
+++ b/source/_patterns/00-atoms/block/paragraph/paragraph.twig
@@ -1,7 +1,9 @@
+{%- import 'atoms-html' as html -%}
+
 {%- set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['paragraph']) }) -%}
 
-<p {%- include 'atoms-attributes' -%}>
+<p {{- html.attributes(attributes) }}>
 
-  {%- include 'atoms-text' with {nodes: text} -%}
+  {{- html.content(text) -}}
 
 </p>
diff --git a/source/_patterns/00-atoms/inline/bold/bold.twig b/source/_patterns/00-atoms/inline/bold/bold.twig
index f6d6bec1..fa81a533 100644
--- a/source/_patterns/00-atoms/inline/bold/bold.twig
+++ b/source/_patterns/00-atoms/inline/bold/bold.twig
@@ -1,8 +1,10 @@
+{%- import 'atoms-html' as html -%}
+
 {% spaceless %}
 
-  <b {%- include 'atoms-attributes' %}>
+  <b {{- html.attributes(attributes|default({})) }}>
 
-    {%- include 'atoms-text' with {nodes: text} only -%}
+    {{- html.content(text) -}}
 
   </b>
 
diff --git a/source/_patterns/00-atoms/inline/italic/italic.twig b/source/_patterns/00-atoms/inline/italic/italic.twig
index 64416ecd..6efc7b02 100644
--- a/source/_patterns/00-atoms/inline/italic/italic.twig
+++ b/source/_patterns/00-atoms/inline/italic/italic.twig
@@ -1,8 +1,10 @@
+{%- import 'atoms-html' as html -%}
+
 {% spaceless %}
 
-  <i {%- include 'atoms-attributes' %}>
+  <i {{- html.attributes(attributes|default({})) }}>
 
-    {%- include 'atoms-text' with {nodes: text} only -%}
+    {{- html.content(text) -}}
 
   </i>
 
diff --git a/source/_patterns/00-atoms/inline/link/link.twig b/source/_patterns/00-atoms/inline/link/link.twig
index aa203e67..5c0c22e1 100644
--- a/source/_patterns/00-atoms/inline/link/link.twig
+++ b/source/_patterns/00-atoms/inline/link/link.twig
@@ -1,11 +1,13 @@
+{%- import 'atoms-html' as html -%}
+
 {% spaceless %}
 
   {%- if attributes|default({}).href is defined -%}
-    <a {%- include 'atoms-attributes' %}>{%- include 'atoms-text' with {nodes: text} only -%}</a>
+    <a {{- html.attributes(attributes) }}>{{- html.content(text) -}}</a>
   {%- elseif attributes|default({})|length -%}
-    <span {%- include 'atoms-attributes' %}>{%- include 'atoms-text' with {nodes: text} only -%}</span>
+    <span {{- html.attributes(attributes) }}>{{- html.content(text) -}}</span>
   {%- else -%}
-    {%- include 'atoms-text' with {nodes: text} only -%}
+    {{- html.content(text) -}}
   {%- endif -%}
 
 {% endspaceless %}
diff --git a/source/_patterns/00-atoms/inline/sub/sub.twig b/source/_patterns/00-atoms/inline/sub/sub.twig
index ed64afa3..903ba097 100644
--- a/source/_patterns/00-atoms/inline/sub/sub.twig
+++ b/source/_patterns/00-atoms/inline/sub/sub.twig
@@ -1,8 +1,10 @@
+{%- import 'atoms-html' as html -%}
+
 {% spaceless %}
 
-  <sub {%- include 'atoms-attributes' %}>
+  <sub {{- html.attributes(attributes|default({})) }}>
 
-    {%- include 'atoms-text' with {nodes: text} only -%}
+    {{- html.content(text) -}}
 
   </sub>
 
diff --git a/source/_patterns/00-atoms/inline/sup/sup.twig b/source/_patterns/00-atoms/inline/sup/sup.twig
index 227c6dfa..1b3fcfd0 100644
--- a/source/_patterns/00-atoms/inline/sup/sup.twig
+++ b/source/_patterns/00-atoms/inline/sup/sup.twig
@@ -1,8 +1,10 @@
+{%- import 'atoms-html' as html -%}
+
 {% spaceless %}
 
-  <sup {%- include 'atoms-attributes' %}>
+  <sup {{- html.attributes(attributes|default({})) }}>
 
-    {%- include 'atoms-text' with {nodes: text} only -%}
+    {{- html.content(text) -}}
 
   </sup>
 
diff --git a/source/_patterns/00-atoms/inline/time/time.twig b/source/_patterns/00-atoms/inline/time/time.twig
index b2684243..8be890a9 100644
--- a/source/_patterns/00-atoms/inline/time/time.twig
+++ b/source/_patterns/00-atoms/inline/time/time.twig
@@ -1,8 +1,10 @@
+{%- import 'atoms-html' as html -%}
+
 {% spaceless %}
 
-  <time {%- include 'atoms-attributes' %}>
+  <time {{- html.attributes(attributes|default({})) }}>
 
-    {%- include 'atoms-text' with {nodes: text} only -%}
+    {{- html.content(text) -}}
 
   </time>
 
diff --git a/source/_patterns/00-atoms/text.yaml b/source/_patterns/00-atoms/text.yaml
deleted file mode 100644
index 0b644f05..00000000
--- a/source/_patterns/00-atoms/text.yaml
+++ /dev/null
@@ -1 +0,0 @@
-nodes: Fake value
diff --git a/source/_patterns/01-molecules/content-meta/content-meta.twig b/source/_patterns/01-molecules/content-meta/content-meta.twig
index 33f78b45..9d372b0d 100644
--- a/source/_patterns/01-molecules/content-meta/content-meta.twig
+++ b/source/_patterns/01-molecules/content-meta/content-meta.twig
@@ -1,15 +1,16 @@
-{%- set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['content-meta']) }) -%}
+{%- import 'atoms-html' as html -%}
 
-<ul {%- include('atoms-attributes') -%}>
+{%- set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['content-meta']) }) -%}
 
+<ul {{- html.attributes(attributes) }}>
   {%- for item in items -%}
 
-    {%- with item only -%}
+    {%- with item|merge({html: html}) only -%}
       {%- block item -%}
 
         {%- set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['content-meta__item']) }) -%}
 
-        <li {%- include('atoms-attributes') -%}>
+        <li {{- html.attributes(attributes) }}>
 
           {%- with content only -%}
             {%- block content -%}
diff --git a/source/_patterns/01-molecules/section/section.twig b/source/_patterns/01-molecules/section/section.twig
index 6ed5b944..463ab777 100644
--- a/source/_patterns/01-molecules/section/section.twig
+++ b/source/_patterns/01-molecules/section/section.twig
@@ -1,6 +1,8 @@
+{%- import 'atoms-html' as html -%}
+
 {%- set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['section']) }) -%}
 
-<section {%- include 'atoms-attributes' -%}>
+<section {{- html.attributes(attributes) }}>
 
   {%- with heading|default({}) only -%}
 
@@ -19,14 +21,14 @@
 
   {%- endwith -%}
 
-  {%- with {content: content} only -%}
+  {%- with {content: content, html: html} only -%}
 
     {%- block content -%}
 
       {%- set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['section__body']) }) -%}
 
-      <div {%- include 'atoms-attributes' -%}>
-        {%- include 'atoms-text' with {nodes: content} -%}
+      <div {{- html.attributes(attributes) }}>
+        {{- html.content(content) -}}
       </div>
 
     {%- endblock -%}
diff --git a/source/_patterns/01-molecules/tag-list/tag-list.twig b/source/_patterns/01-molecules/tag-list/tag-list.twig
index 573877b9..02e96fed 100644
--- a/source/_patterns/01-molecules/tag-list/tag-list.twig
+++ b/source/_patterns/01-molecules/tag-list/tag-list.twig
@@ -1,6 +1,8 @@
+{%- import 'atoms-html' as html -%}
+
 {%- set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['tag-list']) }) -%}
 
-<div {%- include('atoms-attributes') -%}>
+<div {{- html.attributes(attributes) }}>
 
   {%- with title|default({}) only -%}
     {%- block title -%}
@@ -15,7 +17,7 @@
     {%- endblock title -%}
   {%- endwith -%}
 
-  {%- with list only -%}
+  {%- with list|merge({html: html}) only -%}
     {%- block list -%}
 
       {%- set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['tag-list__list']) }) -%}
@@ -24,16 +26,16 @@
         {%- set attributes = attributes|merge({class: attributes.class|merge(['tag-list__list--single-line']) }) -%}
       {%- endif -%}
 
-      <ul {%- include('atoms-attributes') -%}>
+      <ul {{- html.attributes(attributes) }}>
 
         {%- for item in items -%}
 
-          {%- with item only -%}
+          {%- with item|merge({html: html}) only -%}
             {%- block item -%}
 
               {%- set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['tag-list__item']) }) -%}
 
-              <li {%- include('atoms-attributes') -%}>
+              <li {{- html.attributes(attributes) }}>
 
                 {%- with content only -%}
                   {%- block content -%}
diff --git a/source/_patterns/01-molecules/teaser/teaser.twig b/source/_patterns/01-molecules/teaser/teaser.twig
index f308a69c..208207e0 100644
--- a/source/_patterns/01-molecules/teaser/teaser.twig
+++ b/source/_patterns/01-molecules/teaser/teaser.twig
@@ -1,12 +1,14 @@
+{%- import 'atoms-html' as html -%}
+
 {%- set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['teaser']) }) -%}
 
-<div {%- include 'atoms-attributes' -%}>
+<div {{- html.attributes(attributes) }}>
 
   {%- with {attributes: {class: []}} -%}
     {%- block header -%}
 
       {%- set attributes = attributes|merge({class: attributes.class|merge(['teaser__header']) }) -%}
-      <header {%- include 'atoms-attributes' -%}>
+      <header {{- html.attributes(attributes) }}>
 
         {%- with heading|merge({text: {attributes: {href: href}, text: heading.text} }) only -%}
           {%- block heading -%}
diff --git a/source/_patterns/02-organisms/content-header/content-header.twig b/source/_patterns/02-organisms/content-header/content-header.twig
index db181687..5a98775f 100644
--- a/source/_patterns/02-organisms/content-header/content-header.twig
+++ b/source/_patterns/02-organisms/content-header/content-header.twig
@@ -1,6 +1,8 @@
+{%- import 'atoms-html' as html -%}
+
 {%- set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['content-header']) }) -%}
 
-<header {%- include 'atoms-attributes' %}>
+<header {{- html.attributes(attributes) }}>
 
   {%- block body -%}
 
diff --git a/source/_patterns/02-organisms/item-tags/item-tags.twig b/source/_patterns/02-organisms/item-tags/item-tags.twig
index 741db1be..f063265a 100644
--- a/source/_patterns/02-organisms/item-tags/item-tags.twig
+++ b/source/_patterns/02-organisms/item-tags/item-tags.twig
@@ -1,6 +1,8 @@
+{%- import 'atoms-html' as html -%}
+
 {%- set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['item-tags']) }) -%}
 
-<div {%- include('atoms-attributes') -%}>
+<div {{- html.attributes(attributes) }}>
 
   {%- block body -%}
 
diff --git a/source/_patterns/02-organisms/teaser-list/teaser-list.twig b/source/_patterns/02-organisms/teaser-list/teaser-list.twig
index b4b88249..a86166af 100644
--- a/source/_patterns/02-organisms/teaser-list/teaser-list.twig
+++ b/source/_patterns/02-organisms/teaser-list/teaser-list.twig
@@ -1,3 +1,5 @@
+{%- import 'atoms-html' as html -%}
+
 {%- set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['teaser-list']) }) -%}
 
 {%- if title.text is defined -%}
@@ -6,7 +8,7 @@
   {%- set title = title|merge({_id: title_id}) -%}
 {%- endif -%}
 
-<div {%- include 'atoms-attributes' -%}>
+<div {{- html.attributes(attributes) }}>
 
   {%- with title|default({}) only -%}
     {%- block title -%}
@@ -21,23 +23,23 @@
     {%- endblock title -%}
   {%- endwith -%}
 
-  {%- with list only -%}
+  {%- with list|merge({html: html}) only -%}
     {%- block list -%}
 
       {%- if items|default([])|length -%}
 
         {%- set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['teaser-list__list']) }) -%}
 
-        <ol {%- include 'atoms-attributes' -%}>
+        <ol {{- html.attributes(attributes) }}>
 
           {%- for item in items -%}
 
-            {%- with item only -%}
+            {%- with item|merge({html: html}) only -%}
               {%- block item -%}
 
                 {%- set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['teaser-list__item']) }) -%}
 
-                <li {%- include 'atoms-attributes' -%}>
+                <li {{- html.attributes(attributes) }}>
 
                   {%- with content only -%}
                     {%- block content -%}
@@ -62,10 +64,10 @@
           {%- set empty = [{template: 'atoms-paragraph', arguments: {text: empty}}] -%}
         {%- endif -%}
 
-        {%- with {empty: empty} only -%}
+        {%- with {empty: empty, html: html} only -%}
           {%- block empty -%}
 
-            {%- include 'atoms-text' with {nodes: empty} only -%}
+            {{- html.content(empty) -}}
 
           {%- endblock empty -%}
         {%- endwith -%}
diff --git a/source/_patterns/03-templates/content-grid/content-grid.twig b/source/_patterns/03-templates/content-grid/content-grid.twig
index ff4bb3fb..f1d0dae3 100644
--- a/source/_patterns/03-templates/content-grid/content-grid.twig
+++ b/source/_patterns/03-templates/content-grid/content-grid.twig
@@ -1,3 +1,5 @@
+{%- import 'atoms-html' as html -%}
+
 {%- set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['content-grid']) }) -%}
 
 {%- set hasSecondary = false -%}
@@ -9,10 +11,10 @@
   {%- set attributes = attributes|merge({class: attributes.class|merge(['content-grid--has-secondary']) }) -%}
 {%- endif -%}
 
-<{{ element|default('div') }} {%- include 'atoms-attributes' %}>
+<{{ element|default('div') }} {{- html.attributes(attributes) }}>
 
   {%- for area in content -%}
-    {%- with area only -%}
+    {%- with area|merge({html: html}) only -%}
 
       {%- block item -%}
 
@@ -24,8 +26,8 @@
 
             {%- set attributes = attributes|merge({class: attributes.class|merge(['content-grid__item--' ~ area]) }) -%}
 
-            <div {%- include 'atoms-attributes' %}>
-              {%- include 'atoms-text' with {nodes: content} -%}
+            <div {{- html.attributes(attributes) }}>
+              {{- html.content(content) -}}
             </div>
 
           {%- endif -%}
diff --git a/source/_patterns/03-templates/page-grid/page-grid.twig b/source/_patterns/03-templates/page-grid/page-grid.twig
index fc75adba..32c24513 100644
--- a/source/_patterns/03-templates/page-grid/page-grid.twig
+++ b/source/_patterns/03-templates/page-grid/page-grid.twig
@@ -1,6 +1,8 @@
-{% set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['page-grid']) }) -%}
+{%- import 'atoms-html' as html -%}
 
-<div {%- include 'atoms-attributes' %}>
+{%- set attributes = attributes|default({})|merge({class: attributes.class|default([])|merge(['page-grid']) }) -%}
+
+<div {{- html.attributes(attributes) }}>
 
   {%- with start|default({}) only -%}
     {%- block start -%}