diff --git a/source/_patterns/04-components/contact/contact.twig b/source/_patterns/04-components/contact/contact.twig
index ccb62563a0e9278e034ac9694beeb16c79613cef..1e5c890651c4d8fd1e7522dfe8d2b53ac44c7604 100644
--- a/source/_patterns/04-components/contact/contact.twig
+++ b/source/_patterns/04-components/contact/contact.twig
@@ -4,16 +4,16 @@
   } %}
 
     {% block details_summary %}
-      {% if contact.title %}
+      {% if contact.header.title %}
         <h2 class="uw-contact__h2">
           <a href="{{ contact.url }}">
-            {{ contact.title }}
+            {{ contact.header.title }}
           </a>
         </h2>
       {% endif %}
-      {% if contact.position %}
+      {% if contact.header.position %}
         <span class="uw-contact__position">
-          {{ contact.position }}
+          {{ contact.header.position }}
         </span>
       {% endif %}
     {% endblock %}
@@ -21,79 +21,48 @@
       <div class="uw-contact__content">
         {%  if contact.image %}
           <div class="uw-contact__image">
-              <img src="{{ contact.image.uri }}" alt="{{ contact.title }}" />
-            </div>
+            <img src="{{ contact.image.uri }}" alt="{{ contact.header.title }}" />
+          </div>
         {% endif %}
-          <div class="uw-contact__info">
-          {% if contact.email or contact.phone %}
+        <div class="uw-contact__info">
+          {% if contact.footer.contact_info.email or contact.footer.contact_info.phone %}
             <div class="uw-contact__phone-email">
-              {% if contact.email %}
+
+              {% if contact.footer.contact_info.email %}
                 <div class="uw-contact__email">
-                  <a href="mailto:{{ contact.email }}">{{ contact.email }}</a>
+                  <a href="mailto:{{ contact.footer.contact_info.email }}">{{ contact.footer.contact_info.email }}</a>
                 </div>
               {% endif %}
-              {% if contact.phone %}
-              <div class="uw-contact__phone">
-                {{ contact.phone }}
-              </div>
-            {% endif %}
-          </div>
+
+              {% if contact.footer.contact_info.phone %}
+                <div class="uw-contact__phone">
+                  {{ contact.footer.contact_info.phone }}
+                </div>
+              {% endif %}
+            </div>
           {% endif %}
-          {% if contact.location %}
+
+          {% if contact.footer.contact_info.location %}
             <div class="uw-contact__location">
               <span class="uw-label">Location:</span>
-                {{ contact.location }}
+                {{ contact.footer.contact_info.location }}
             </div>
           {% endif %}
-          {% if contact.contact_for %}
-            <div class="uw-contact__contact-for">
-              <span class="uw-label">Contact for:</span>
-              {{ contact.contact_for }}
-            </div>
-          {% endif %}
-          {% if contact.link_profile %}
+
+          {% if contact.footer.links.profile %}
             <div class="uw-contact__profile">
               <span class="uw-label">Link to profile:</span>
-              <a href="{{ contact.link_profile.uri }}">
-                {% if contact.link_profile.title %}
-                  {{ contact.link_profile.title }}
+              <a href="{{ contact.footer.links.profile.uri }}">
+                {% if contact.footer.links.profile.title %}
+                  {{ contact.footer.links.profile.title }}
                 {% else %}
-                  {{ contact.title }}
-                {% endif %}
-              </a>
-            </div>
-          {% endif %}
-          {% if contact.groups %}
-            <div class="uw-contact__groups">
-              <span class="uw-label">Group(s):</span>
-              {% for group in contact.groups %}
-                {% if loop.index0 > 0 %}
-                  , {{ group.title }}
-                {% else %}
-                {{ group.title }}
-              {% endif %}
-            {% endfor %}
-          </div>
-          {% endif %}
-          {% if contact.personal_website %}
-            <div class="uw-contact__personal-website">
-              <strong>Link to personal website:</strong><br />
-              <a href="{{ contact.personal_website.uri }}">
-                {% if contact.personal_website.title %}
-                  {{ contact.personal_website.title }}
-                {% else %}
-                  {{ contact.title }}
+                  {{ contact.header.title }}
                 {% endif %}
               </a>
             </div>
           {% endif %}
         </div>
       </div>
-      {% if contact.additional_info %}
-        <div class="uw-contact__additional-info">
-          {{ contact.additional_info }}
-        </div>
-      {% endif %}
     {% endblock %}
   {% endembed %}
 </div>