diff --git a/css/styles.css b/css/styles.css
index 8cd2e20a5f19f40100cbe25718537138f0e8bed2..5f74117aa82dc2a2a92083751fc7741067bdbb07 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -8568,6 +8568,10 @@ html:not(.js) .uw-tabcontent[role="tabpanel"][hidden] {
   font-family: Typ1451-Medium,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Oxygen-Sans", Ubuntu, Cantarell, "Fira Sans", Droid Sans, sans-serif;
 }
 
+.uw-tablinks.active {
+  border-bottom: 0.4rem solid #4e4e4e;
+}
+
 .tag-list {
   list-style-type: none;
   margin: 0;
diff --git a/source/_annotations/annotations.js b/source/_annotations/annotations.js
index 1eeb1f86d383788d117c64362f649e0707cbe0a4..b56a99f556777b3c61a827fd6e359bea1816ed62 100644
--- a/source/_annotations/annotations.js
+++ b/source/_annotations/annotations.js
@@ -1,3 +1,7 @@
+/**
+ * @file
+ */
+
 var comments = {
 "comments" : [
     {
diff --git a/source/_patterns/04-components/expand-collapse/expand-collapse.js b/source/_patterns/04-components/expand-collapse/expand-collapse.js
index 46574e92431b96cde1d54e6eec98884c70c8f91e..920e80b45e2fc1c8d87d21efd436938bee9eb156 100644
--- a/source/_patterns/04-components/expand-collapse/expand-collapse.js
+++ b/source/_patterns/04-components/expand-collapse/expand-collapse.js
@@ -1,3 +1,7 @@
+/**
+ * @file
+ */
+
 (function ($, Drupal) {
   Drupal.behaviors.expandcollapse = {
     attach: function (context, settings) {
diff --git a/source/_patterns/04-components/facts-and-figures/facts-and-figures.js b/source/_patterns/04-components/facts-and-figures/facts-and-figures.js
index ec17231e65f4612e70180a6e79948b928ddc2551..e9194ec763b382bb466584ab815711c8c2585420 100644
--- a/source/_patterns/04-components/facts-and-figures/facts-and-figures.js
+++ b/source/_patterns/04-components/facts-and-figures/facts-and-figures.js
@@ -1,3 +1,7 @@
+/**
+ * @file
+ */
+
 (function ($, Drupal) {
   Drupal.behaviors.factfigure = {
     attach: function (context, settings) {
diff --git a/source/_patterns/04-components/image-gallery/image-gallery.js b/source/_patterns/04-components/image-gallery/image-gallery.js
index ac98c317afee19d30061ad366368ad9fd34aeae4..58e6536d357b4417bac8aa9532dd51cb63e6459d 100644
--- a/source/_patterns/04-components/image-gallery/image-gallery.js
+++ b/source/_patterns/04-components/image-gallery/image-gallery.js
@@ -1,3 +1,7 @@
+/**
+ * @file
+ */
+
 (function ($, Drupal) {
   Drupal.behaviors.imagegallery = {
     attach: function (context, settings) {
diff --git a/source/_patterns/04-components/menu/menu--horizontal/menu--horizontal.js b/source/_patterns/04-components/menu/menu--horizontal/menu--horizontal.js
index ec05b402ba1f05b2489962dc60e813cfed0aac47..8fbd1f43b928d22287dc1c282215910839753c4f 100644
--- a/source/_patterns/04-components/menu/menu--horizontal/menu--horizontal.js
+++ b/source/_patterns/04-components/menu/menu--horizontal/menu--horizontal.js
@@ -1,12 +1,16 @@
+/**
+ * @file
+ */
+
 (function ($, Drupal) {
     Drupal.behaviors.menuhorizontal = {
         attach: function (context, settings) {
-            // uw-horizontal-nav
+            // uw-horizontal-nav.
             $(document).ready(function () {
 
                 // Have to add the run this code only once, so that multiple
                 // loads of the menu are not shown when logged in.
-                $(document, context).once('menuhorizontal').each( function () {
+                $(document, context).once('menuhorizontal').each(function () {
 
                     const toggle = document.querySelector(".uw-navigation-button");
                     const navHeader = document.querySelector(".uw-header__navigation");
@@ -22,7 +26,8 @@
                             navHeader.classList.remove('open');
                             navHeader.classList.add('close');
                             $('html').removeClass('no-scroll');
-                        } else {
+                        }
+else {
                             this.classList.add('active');
                             this.setAttribute('aria-expanded', 'true');
                             navHeader.classList.remove('close');
@@ -49,31 +54,33 @@
 
                                     this.setAttribute('aria-expanded', 'false');
                                 }
-                                // If hamburger
+                                // If hamburger.
                                 if (screenWidth <= 767) {
-                                    // Look at parents and reset the menus
+                                    // Look at parents and reset the menus.
                                     if (parent.classList.contains('uw-horizontal-nav--secondary')) {
                                         $('.uw-horizontal-nav--main').css('display', 'block');
                                     }
                                 }
-                            } else if ($('.submenu-active')) {
+                            }
+else if ($('.submenu-active')) {
 
-                                // Get elements with .submnenu-active than close them,
+                                // Get elements with .submnenu-active than close them,.
                                 $('.submenu-active').removeClass('submenu-active').attr('aria-expanded', 'false');
 
-                                // and open this one.
+                                // And open this one.
                                 this.classList.add("submenu-active");
                                 this.setAttribute('aria-expanded', 'true');
 
-                                // If hamburger
+                                // If hamburger.
                                 if (screenWidth <= 767) {
-                                    // Look at parents and hide other menus if not secondary and open
+                                    // Look at parents and hide other menus if not secondary and open.
                                     if (parent.classList.contains('uw-horizontal-nav--secondary')) {
                                         $('.uw-horizontal-nav--main').css('display', 'none');
                                         $('.uw-horizontal-nav--secondary').css('display', 'block');
                                     }
                                 }
-                            } else {
+                            }
+else {
                                 this.classList.add('submenu-active');
                                 this.setAttribute('aria-expanded', 'true');
                             }
@@ -107,7 +114,7 @@
                             }
 
                             // Space bar keypress to open close menu
-                            // keyCode to be deprecated find way to use key
+                            // keyCode to be deprecated find way to use key.
                         });
                         item.addEventListener('keypress', function (e) {
                             if (e.keyCode == 32) {
@@ -120,11 +127,11 @@
                     document.addEventListener("click", closeSubmenu, false);
 
                     // If Toggle on page Add event listeners on the menu toggle button.
-                    if (toggle){
+                    if (toggle) {
                         toggle.addEventListener("click", toggleMenu, false);
                     }
 
-                    // apply timeout to the to event firing
+                    // Apply timeout to the to event firing
                     // so it fires at end of event.
                     function debouncer(func) {
                         var timeoutID,
@@ -142,17 +149,19 @@
                     // Check the width of the screen and
                     // force the button click if wider that 767px.
                     function menuCheckWidth() {
-                        // Set screenWidth var
+                        // Set screenWidth var.
                         var screenWidth = $(window).width();
                         navHeader.classList.add('close');
                         if (screenWidth > 767) {
                             if ($('html').hasClass('no-scroll')) {
                                 toggle.click();
                                 $('.uw-horizontal-nav').css('display', 'block');
-                            } else {
+                            }
+else {
                                 $('.uw-header__navigation').addClass('open');
                             }
-                        } else {
+                        }
+else {
                             if ($('.uw-header__navigation').hasClass('open')) {
                                 $('.uw-header__navigation').removeClass('open');
                                 $('.uw-header__navigation').addClass('close');
diff --git a/source/_patterns/04-components/multi-type-list/multi-type-list.js b/source/_patterns/04-components/multi-type-list/multi-type-list.js
index 3b50ddfdac568a3b44db40d191ebb4a849b4d92f..002ca5e319d408535c4765d610c18fd2f77a124b 100644
--- a/source/_patterns/04-components/multi-type-list/multi-type-list.js
+++ b/source/_patterns/04-components/multi-type-list/multi-type-list.js
@@ -1,3 +1,7 @@
+/**
+ * @file
+ */
+
 (function ($, Drupal) {
   Drupal.behaviors.multitypelist = {
     attach: function (context, settings) {
@@ -10,28 +14,29 @@
           return;
         }
 
-        // Add a click event handler to each tab
+        // Add a click event handler to each tab.
         tabs.forEach(tab => {
           tab.addEventListener("click", changeTabs);
         });
 
-        // Enable arrow navigation between tabs in the tab list
+        // Enable arrow navigation between tabs in the tab list.
         let tabFocus = 0;
 
         tabList.addEventListener("keydown", e => {
-          // Move right
+          // Move right.
           if (e.keyCode === 39 || e.keyCode === 37) {
             tabs[tabFocus].setAttribute("tabindex", -1);
             if (e.keyCode === 39) {
               tabFocus++;
-              // If we're at the end, go to the start
+              // If we're at the end, go to the start.
               if (tabFocus >= tabs.length) {
                 tabFocus = 0;
               }
-              // Move left
-            } else if (e.keyCode === 37) {
+              // Move left.
+            }
+else if (e.keyCode === 37) {
               tabFocus--;
-              // If we're at the start, move to the end
+              // If we're at the start, move to the end.
               if (tabFocus < 0) {
                 tabFocus = tabs.length - 1;
               }
@@ -48,20 +53,20 @@
         const parent = target.parentNode;
         const grandparent = parent.parentNode;
 
-        // Remove all current selected tabs
+        // Remove all current selected tabs.
         parent
             .querySelectorAll('[aria-selected="true"]')
             .forEach(t => t.setAttribute("aria-selected", false));
 
-        // Set this tab as selected
+        // Set this tab as selected.
         target.setAttribute("aria-selected", true);
 
-        // Hide all tab panels
+        // Hide all tab panels.
         grandparent
             .querySelectorAll('[role="tabpanel"]')
             .forEach(p => p.setAttribute("hidden", true));
 
-        // Show the selected panel
+        // Show the selected panel.
         grandparent.parentNode
             .querySelector(`#${target.getAttribute("aria-controls")}`)
             .removeAttribute("hidden");
diff --git a/source/_patterns/04-components/multi-type-list/multi-type-list.twig b/source/_patterns/04-components/multi-type-list/multi-type-list.twig
index e10610cac429a01b0dba534f27aa080a72638c50..308242d48f4b23805dfa9a794f97f4d65cfc4959 100644
--- a/source/_patterns/04-components/multi-type-list/multi-type-list.twig
+++ b/source/_patterns/04-components/multi-type-list/multi-type-list.twig
@@ -3,8 +3,14 @@
   {% set content_list = content_list|merge([type]) %}
 {% endfor %}
 
-{% embed '@components/tabs/tabs.twig' with {
-  'content_list': content_list
+{% set button_modifier_classes -%}
+  button  button--large  {{ modifier_classes }}
+{%- endset %}
+
+{% embed '@components/tabs/_tabs.twig' with {
+  'tab_type': 'content',
+  'content_list': content_list,
+  'button_modifier_classes': button_modifier_classes,
 } %}
 
   {% for type, list in lists %}
diff --git a/source/_patterns/04-components/multi-type-list/multi-type-list.yml b/source/_patterns/04-components/multi-type-list/multi-type-list.yml
index 0b3828e19df5a87a0bd07ad75c751df06ed9eb86..70f5844dd5458a805c9601ecf7a04beff4f959e8 100644
--- a/source/_patterns/04-components/multi-type-list/multi-type-list.yml
+++ b/source/_patterns/04-components/multi-type-list/multi-type-list.yml
@@ -3,7 +3,8 @@ lists:
     -
       title: 'Blog Teaser title 1'
       url: '#'
-      date: 'Friday, September 18, 2020'
+      date: 
+        - 'Friday, September 18, 2020'
       author_name: 'Author Lastname'
       author_link: '#'
       tags:
@@ -38,7 +39,8 @@ lists:
     -
       title: 'Blog Teaser title 2'
       url: '#'
-      date: 'Friday, September 18, 2020'
+      date: 
+        - 'Friday, September 18, 2020'
       author_name: 'Author Lastname'
       author_link: '#'
       tags:
@@ -73,7 +75,8 @@ lists:
     -
       title: 'Blog Teaser title 3'
       url: '#'
-      date: 'Friday, September 18, 2020'
+      date: 
+        - 'Friday, September 18, 2020'
       author_name: 'Author Lastname'
       author_link: '#'
       tags:
@@ -109,7 +112,8 @@ lists:
     -
       title: 'News Teaser title 1'
       url: '#'
-      date: 'Sep. 18, 2020'
+      date: 
+        - 'Sep. 18, 2020'
       sources:
         - srcset: '../../../../source/images/president/president_xlarge.jpg'
           media: 'all and (min-width: 63.19rem)'
@@ -133,7 +137,8 @@ lists:
     -
       title: 'News Teaser title 2'
       url: '#'
-      date: 'Sep. 18, 2020'
+      date: 
+        - 'Sep. 18, 2020'
       sources:
         - srcset: '../../../../source/images/president/president_xlarge.jpg'
           media: 'all and (min-width: 63.19rem)'
@@ -157,7 +162,8 @@ lists:
     -
       title: 'News Teaser title 3'
       url: '#'
-      date: 'Sep. 18, 2020'
+      date: 
+        - 'Sep. 18, 2020'
       sources:
         - srcset: '../../../../source/images/president/president_xlarge.jpg'
           media: 'all and (min-width: 63.19rem)'
@@ -182,7 +188,8 @@ lists:
     -
       title: 'Event Teaser title 1'
       url: '#'
-      date: 'Friday, September 18, 2020 - 4:20 PM'
+      date: 
+        -  'Friday, September 18, 2020 2:20- 4:20 PM  EDT'
       sources:
         - srcset: '../../../../source/images/president/president_xlarge.jpg'
           media: 'all and (min-width: 63.19rem)'
@@ -206,7 +213,8 @@ lists:
     -
       title: 'Event Teaser title 2'
       url: '#'
-      date: 'Friday, September 18, 2020 - 4:20 PM'
+      date: 
+        -  'Friday, September 18, 2020 2:20- 4:20 PM  EDT'
       sources:
         - srcset: '../../../../source/images/president/president_xlarge.jpg'
           media: 'all and (min-width: 63.19rem)'
@@ -230,7 +238,8 @@ lists:
     -
       title: 'Event Teaser title 3'
       url: '#'
-      date: 'Friday, September 18, 2020 - 4:20 PM'
+      date: 
+        -  'Friday, September 18, 2020 2:20- 4:20 PM  EDT'
       sources:
         - srcset: '../../../../source/images/president/president_xlarge.jpg'
           media: 'all and (min-width: 63.19rem)'
diff --git a/source/_patterns/04-components/search/search--wcms-header/search--wcms-header.js b/source/_patterns/04-components/search/search--wcms-header/search--wcms-header.js
index 484f526919e0f7e76d6eaf8dba0af8274549e8fb..760dcbf6be95d2bcc9a0289bb1817b1ad4228c03 100644
--- a/source/_patterns/04-components/search/search--wcms-header/search--wcms-header.js
+++ b/source/_patterns/04-components/search/search--wcms-header/search--wcms-header.js
@@ -1,3 +1,7 @@
+/**
+ * @file
+ */
+
 (function ($, document, Drupal) {
     Drupal.behaviors.wcmsheadersearchbar = {
         attach: function (context, settings) {
diff --git a/source/_patterns/04-components/search/search--wcms-headerbar/search--wcms-headerbar.js b/source/_patterns/04-components/search/search--wcms-headerbar/search--wcms-headerbar.js
index b8335d14cb39b5b536efe18807bfc10e588760ea..2f1474be79b7508283831779e17fd7723319a416 100644
--- a/source/_patterns/04-components/search/search--wcms-headerbar/search--wcms-headerbar.js
+++ b/source/_patterns/04-components/search/search--wcms-headerbar/search--wcms-headerbar.js
@@ -1,3 +1,7 @@
+/**
+ * @file
+ */
+
 (function ($, document, Drupal) {
     Drupal.behaviors.wcmsheadersearch = {
         attach: function (context, settings) {
@@ -19,9 +23,9 @@
                             }, timeout);
                     };
                 }
-                // Check the width of the screen and
+                // Check the width of the screen and.
                 function checkWidth() {
-                    // Set screenWidth var
+                    // Set screenWidth var.
                     var screenWidth = $(window).width();
 
                     if ($('.uw-header__masthead').hasClass('open')) {
diff --git a/source/_patterns/04-components/tabs/_tabs.scss b/source/_patterns/04-components/tabs/_tabs.scss
index fa58e2db7e15181ebbaf309740e37f72d8aafec5..f9e3ab91d73987bc0f4dd145028e3f13a73fc7a7 100644
--- a/source/_patterns/04-components/tabs/_tabs.scss
+++ b/source/_patterns/04-components/tabs/_tabs.scss
@@ -4,6 +4,7 @@
 .uw-tabs{
   margin:gesso-spacing(sm) auto;
   width: 100%;
+
   .hide-js{
     display:none;
     html:not(.js) &{
@@ -14,19 +15,22 @@
     }
   }
 }
-//buttons wrapper
 
+//buttons wrapper
 .uw-tab {
   display:flex;
+
   html:not(.js) &{
     display:none;
   }
 }
-//button
+
+// button
 .uw-tablinks {
   border-bottom: 0.4rem solid #fff;
   margin:0 0 0 0.15rem;
   max-width: inherit;
+
   &[aria-selected="true"] {
     background: $button-background-color-hover;
     border-bottom: 0.4rem solid $button-text-color-hover;
@@ -35,6 +39,7 @@
       border-bottom: 0.4rem solid #ddd;
     }
   }
+
   &:hover{
     border-bottom: 0.4rem solid #fff;
   }
@@ -48,32 +53,39 @@
   &[hidden] {
     display:none;
   }
-
 }
-html:not(.js) .uw-tabcontent[role="tabpanel"][hidden]{
 
+html:not(.js) .uw-tabcontent[role="tabpanel"][hidden]{
   display: flex;
 }
 
 .uw-tabcontent[role="tabpanel"] .card{
   width:100%;
+
   @include small{
     flex-grow: 1;
     width: 45%;
   }
+
   @include large{
     width: 32%;
   }
 }
+
 // lineup the top of the date with the title in blog teaser
 .uw-tabcontent[role="tabpanel"] .card.teaser--blog .card__title{
   margin-top:0;
 }
 
-
-
 .block-local-tasks-block{
   nav nav ul li a {
     font-family: gesso-font-family(systemmedium);
   }
 }
+
+.uw-tablinks {
+  &.active {
+    border-bottom: 0.4rem solid #4e4e4e;
+
+  }
+}
diff --git a/source/_patterns/04-components/tabs/_tabs.twig b/source/_patterns/04-components/tabs/_tabs.twig
new file mode 100644
index 0000000000000000000000000000000000000000..5b48c8907667dacd7580a654bc4c3e10d481d7e1
--- /dev/null
+++ b/source/_patterns/04-components/tabs/_tabs.twig
@@ -0,0 +1,43 @@
+<div class="uw-tabs">
+
+  <div class="uw-tab" role="tablist" aria-label="Multi-tab-list">
+    {% for type in content_list %}
+      {% if tab_type == "link" %}
+        <a href="{{ type.url }}" class="uw-tablinks {{ button_modifier_classes }} {% if type.active %}active{% endif %} %}">{{ type.text }}</a>
+      {% else %}
+        <button role="tab" class="uw-tablinks {{ button_modifier_classes }} "   {% if loop.index == 1 %} aria-selected="true"  {% else %} aria-selected="false" {%  endif %} aria-controls="{{ type }}" id="tab-{{ loop.index }}" tabindex="0">{{ type }}</button>
+      {% endif %}
+    {% endfor %}
+  </div>
+
+  {% if tab_type == "content" %}
+    {% for type in content_list %}
+      <h2 class="hide-js"> {{ type }}</h2>
+      <div id="{{ type }}" class="uw-tabcontent" role="tabpanel" tabindex="0" aria-labelledby="tab-{{ loop.index }}" {% if loop.index > 1 %} hidden {%  endif %} >
+
+        {% if loop.index == 1 %}
+          {% block content_area_1 %}
+            Content area 1
+          {% endblock %}
+        {% elseif loop.index == 2 %}
+          {% block content_area_2 %}
+            Content area 2
+          {% endblock %}
+        {% elseif loop.index == 3 %}
+          {% block content_area_3 %}
+            Content area 3
+          {% endblock %}
+        {% elseif loop.index == 4 %}
+          {% block content_area_4 %}
+            Content area 4
+          {% endblock %}
+        {% elseif loop.index == 5 %}
+          {% block content_area_5 %}
+            Content area 5
+          {% endblock %}
+        {% endif %}
+
+      </div>
+    {% endfor %}
+  {% endif %}
+</div>
\ No newline at end of file
diff --git a/source/_patterns/04-components/tabs/tabs--content/tabs--content.twig b/source/_patterns/04-components/tabs/tabs--content/tabs--content.twig
new file mode 100644
index 0000000000000000000000000000000000000000..070e6207c654028378c2bccdae05ecccd4ec5d9a
--- /dev/null
+++ b/source/_patterns/04-components/tabs/tabs--content/tabs--content.twig
@@ -0,0 +1,9 @@
+{% set button_modifier_classes -%}
+  button  button--large  {{ modifier_classes }}
+{%- endset %}
+
+{% include "@components/tabs/_tabs.twig" with {
+  tab_type: 'content',
+  content_list: content_list,
+  button_modifier_classes: button_modifier_classes,
+} %}
\ No newline at end of file
diff --git a/source/_patterns/04-components/tabs/tabs--content/tabs--content.yml b/source/_patterns/04-components/tabs/tabs--content/tabs--content.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f69e8f1a1bb78dec0610705677040dfa4070ce3e
--- /dev/null
+++ b/source/_patterns/04-components/tabs/tabs--content/tabs--content.yml
@@ -0,0 +1,6 @@
+---
+modifier_classes: ''
+content_list:
+  - Tab1
+  - Tab2
+  - Tab3
diff --git a/source/_patterns/04-components/tabs/tabs--link/tabs--link.twig b/source/_patterns/04-components/tabs/tabs--link/tabs--link.twig
new file mode 100644
index 0000000000000000000000000000000000000000..882626b19eab9a41424ee170e7f0cd3ce0d45aa4
--- /dev/null
+++ b/source/_patterns/04-components/tabs/tabs--link/tabs--link.twig
@@ -0,0 +1,9 @@
+{% set button_modifier_classes -%}
+  button  button--large  {{ modifier_classes }}
+{%- endset %}
+
+{% include "@components/tabs/_tabs.twig" with {
+  tab_type: 'link',
+  content_list: content_list,
+  button_modifier_classes: button_modifier_classes,
+} %}
diff --git a/source/_patterns/04-components/tabs/tabs--link/tabs--link.yml b/source/_patterns/04-components/tabs/tabs--link/tabs--link.yml
new file mode 100644
index 0000000000000000000000000000000000000000..cf8331556d0c4e8be8eb8c80341977087af77135
--- /dev/null
+++ b/source/_patterns/04-components/tabs/tabs--link/tabs--link.yml
@@ -0,0 +1,16 @@
+---
+modifier_classes: ''
+content_list:
+  -
+    url: 'https://google.ca'
+    text: 'Link1'
+  -
+    url: 'https://google.ca'
+    text: 'Link2'
+    active: 1
+  -
+    url: 'https://google.ca'
+    text: 'Link3'
+  -
+    url: 'https://google.ca'
+    text: 'Link4'
diff --git a/source/_patterns/04-components/tabs/tabs.twig b/source/_patterns/04-components/tabs/tabs.twig
deleted file mode 100644
index 0adb7c9dc0b6c60378e0fdedd56cff325171a2e7..0000000000000000000000000000000000000000
--- a/source/_patterns/04-components/tabs/tabs.twig
+++ /dev/null
@@ -1,50 +0,0 @@
-{% set button_modifier_classes -%}
-  button  button--large  {{ modifier_classes }}
-{%- endset %}
-
-{%  if is_demo %}
-
-    {% set content_list = [] %}
-    {% for type, list in lists %}
-        {% set content_list = content_list|merge([type]) %}
-    {% endfor %}
-{%  endif %}
-
-
-<div class="uw-tabs">
-
-  <div class="uw-tab" role="tablist" aria-label="Multi-tab-list">
-    {% for type in content_list %}
-      <button role="tab" class="uw-tablinks {{ button_modifier_classes }} "   {% if loop.index == 1 %} aria-selected="true"  {% else %} aria-selected="false" {%  endif %} aria-controls="{{ type }}" id="tab-{{ loop.index }}" tabindex="0">{{ type }}</button>
-    {% endfor %}
-  </div>
-
-  {% for type in content_list %}
-    <h2 class="hide-js"> {{ type }}</h2>
-    <div id="{{ type }}" class="uw-tabcontent" role="tabpanel" tabindex="0" aria-labelledby="tab-{{ loop.index }}" {% if loop.index > 1 %} hidden {%  endif %} >
-
-      {% if loop.index == 1 %}
-        {% block content_area_1 %}
-          Content area 1
-        {% endblock %}
-      {% elseif loop.index == 2 %}
-        {% block content_area_2 %}
-          Content area 2
-        {% endblock %}
-      {% elseif loop.index == 3 %}
-        {% block content_area_3 %}
-          Content area 3
-        {% endblock %}
-      {% elseif loop.index == 4 %}
-        {% block content_area_4 %}
-          Content area 4
-        {% endblock %}
-      {% elseif loop.index == 5 %}
-        {% block content_area_5 %}
-          Content area 5
-        {% endblock %}
-      {% endif %}
-
-    </div>
-  {% endfor %}
-</div>
\ No newline at end of file
diff --git a/source/_patterns/04-components/teaser/teaser--blog/teaser--blog.yml b/source/_patterns/04-components/teaser/teaser--blog/teaser--blog.yml
index a33d2cded24beb7e231a28d13d1b5175099e535f..fd5ee3fda8d5ce275a4950113f382cbe9cc91af9 100644
--- a/source/_patterns/04-components/teaser/teaser--blog/teaser--blog.yml
+++ b/source/_patterns/04-components/teaser/teaser--blog/teaser--blog.yml
@@ -1,7 +1,8 @@
 ---
 title: 'Blog Teaser title'
 url: '#'
-date: 'Friday, September 18, 2020'
+date: 
+  - 'Friday, September 18, 2020'
 author_name: 'Author Lastname'
 author_link: '#'
 tags:
diff --git a/source/_patterns/04-components/teaser/teaser--event/teaser--event.twig b/source/_patterns/04-components/teaser/teaser--event/teaser--event.twig
index 724599fdc5ee0ea8077c70cba495062d498d5eef..82aa5b2911cde28189b667e4e8f2d6275dde4c92 100644
--- a/source/_patterns/04-components/teaser/teaser--event/teaser--event.twig
+++ b/source/_patterns/04-components/teaser/teaser--event/teaser--event.twig
@@ -4,14 +4,14 @@
 
 {% include "@components/teaser/teaser.twig" with {
   modifier_classes: teaser_modifier_classes,
-  title: events.title,
-  url: events.url,
-  date: events.date.0,
+  title: title,
+  url: url,
+  date: date.0,
   date_format: 'long-datetime',
-  sources: events.sources,
-  img_element: events.img_element,
-  alt: events.alt,
+  sources: sources,
+  img_element: img_element,
+  alt: alt,
   show_hover: false,
-  content: events.content,
+  content: content,
   header_level: '2',
 } %}
\ No newline at end of file
diff --git a/source/_patterns/04-components/teaser/teaser--event/teaser--event.yml b/source/_patterns/04-components/teaser/teaser--event/teaser--event.yml
index 119e698deeb3e0059500ec7212cf2a7bfb52ac82..3c49ef090d92a6e922c1e16a36386c6d3ef27915 100644
--- a/source/_patterns/04-components/teaser/teaser--event/teaser--event.yml
+++ b/source/_patterns/04-components/teaser/teaser--event/teaser--event.yml
@@ -1,7 +1,8 @@
 ---
 title: 'Event Teaser title'
 url: '#'
-date: 'Friday, September 18, 2020 - 4:20 PM'
+date: 
+  - 'Friday, September 18, 2020 - 4:20 PM'
 sources:
   - srcset: '../../../../source/images/president/president_xlarge.jpg'
     media: 'all and (min-width: 63.19rem)'
diff --git a/source/_patterns/04-components/teaser/teaser--news/teaser--news.yml b/source/_patterns/04-components/teaser/teaser--news/teaser--news.yml
index e4e94d844c589b3bd9201a804379f38b5512818d..85b7d7ec67857b1f259dcc7ff9d4ece939264f0a 100644
--- a/source/_patterns/04-components/teaser/teaser--news/teaser--news.yml
+++ b/source/_patterns/04-components/teaser/teaser--news/teaser--news.yml
@@ -1,7 +1,8 @@
 ---
 title: 'News Teaser title'
 url: '#'
-date: 'Sep. 18, 2020'
+date:
+  - 'Sep. 18, 2020'
 sources:
   - srcset: '../../../../source/images/president/president_xlarge.jpg'
     media: 'all and (min-width: 63.19rem)'
diff --git a/source/_patterns/04-components/whos-online/whos-online.js b/source/_patterns/04-components/whos-online/whos-online.js
index f80a6d0f1641b340557d52aa6d252f03a7f95083..c78471611dabab0dfe933d3b8c8b829ddbcc4ac1 100644
--- a/source/_patterns/04-components/whos-online/whos-online.js
+++ b/source/_patterns/04-components/whos-online/whos-online.js
@@ -1,3 +1,7 @@
+/**
+ * @file
+ */
+
 (function ($) {
   Drupal.behaviors.responsive_menu_combined = {
     attach: function (context, settings) {
@@ -18,7 +22,8 @@
           $list.hide();
           $('span:first-child',this).html('&#9656;');
           $(this).attr('aria-expanded', 'false');
-        } else {
+        }
+else {
           $list.show();
           $('span:first-child',this).html('&#9662;');
           $(this).attr('aria-expanded', 'true');
diff --git a/source/_patterns/07-ckeditor/js/ckeditor.js b/source/_patterns/07-ckeditor/js/ckeditor.js
index df0ce1f2d681fbdfa55d0794dbaea9d1192e97ce..ca0703d8671e85ed2d80841e665ba07e14f2b351 100644
--- a/source/_patterns/07-ckeditor/js/ckeditor.js
+++ b/source/_patterns/07-ckeditor/js/ckeditor.js
@@ -1,6 +1,8 @@
 /**
- * Ckeditor Modal
+ * @file
+ * Ckeditor Modal.
  */
+
 (function ($, Drupal) {
   if ($.ui && $.ui.dialog) {
     orig_allowInteraction = $.ui.dialog.prototype._allowInteraction;