diff --git a/src/patterns/03-layouts/content/content.twig b/src/patterns/03-layouts/content/content.twig
index 6bc42415799419ba9e1d044a7c09066976b3f4f9..0086385ebb42e2f4fc8f966cee47bf4dd2ea2e85 100644
--- a/src/patterns/03-layouts/content/content.twig
+++ b/src/patterns/03-layouts/content/content.twig
@@ -1,8 +1,11 @@
{% set main_classes = 'uw-main' %}
+<!-- Button for show and hide of admin -->
<button class="uw-show-hide" id="revision-show-hide" title="Show/hide revision elements">±</button>
+<!-- end -->
{% for class in classes %}
{% set main_classes = main_classes ~ ' ' ~ class %}
{% endfor %}
+
<main id="main" class="{{ main_classes }}" role="main" tabindex="-1">
{% block content %}
Main content
diff --git a/src/patterns/03-layouts/footer/footer.twig b/src/patterns/03-layouts/footer/footer.twig
index b11bfaa3c91c250e4260b65462591c01db5ebe12..141a903069a47e0ff67f5a5100a042de5d708fe5 100644
--- a/src/patterns/03-layouts/footer/footer.twig
+++ b/src/patterns/03-layouts/footer/footer.twig
@@ -1,7 +1,14 @@
<footer class="uw-footer"{% if branding_level == 'full' %} role="contentinfo"{% endif %}>
<div class="uw-site-footer__block">
{% block content %}
-
+ {% include "@layouts/site-footer/site-footer.twig" with {
+ body: "The standard Lorem Ipsum passage, used since the 1500s<br /><br />Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
+ site_name: "Faculty of Environment",
+ logo_link: "https://uwaterloo.ca/",
+ logo_url: "/uw_wcms_gesso/source/images/logos/uwaterloo-logo.svg",
+ logo_alt_text: "Faculty of Environment",
+ facebook: "https://www.facebook.com/University.Waterloo"
+ } %}
{% endblock %}
</div>
<div class="uw-footer__wrapper">
diff --git a/src/patterns/03-layouts/layout/_layout.scss b/src/patterns/03-layouts/layout/_layout.scss
index 447689f26dfb7338e4687186f4109b0a0ff545e9..8916c64ed16c852b2060aaa0be08b2617bf50b1e 100644
--- a/src/patterns/03-layouts/layout/_layout.scss
+++ b/src/patterns/03-layouts/layout/_layout.scss
@@ -1,4 +1,5 @@
@use '../../01-core' as *;
+
.layout {
@include layout-constrain;
diff --git a/src/patterns/03-layouts/layout/_layout.twig b/src/patterns/03-layouts/layout/_layout.twig
index fa8f0035f24a2478da0578615977b0856ce285e2..b442c69b7a5499547d27fccfb7e34f8c683f985c 100644
--- a/src/patterns/03-layouts/layout/_layout.twig
+++ b/src/patterns/03-layouts/layout/_layout.twig
@@ -1,3 +1,5 @@
+{{ attach_library('uw_wcms_ohana/layout') }}
+
{% set section_names = {
1: 'first',
2: 'second',
diff --git a/src/patterns/03-layouts/layout/layout--1-col/layout--1-col.twig b/src/patterns/03-layouts/layout/layout--1-col/layout--1-col.twig
index 838de14dc00de4bdf481675fa5c00ae8ffaba63f..cdff77ed5eca906e9a713e550ecf340dbaa07f65 100644
--- a/src/patterns/03-layouts/layout/layout--1-col/layout--1-col.twig
+++ b/src/patterns/03-layouts/layout/layout--1-col/layout--1-col.twig
@@ -18,4 +18,4 @@
num_of_blocks: num_of_blocks,
} %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/src/patterns/03-layouts/layout/layout--2-col/layout--2-col.twig b/src/patterns/03-layouts/layout/layout--2-col/layout--2-col.twig
index 708ac519428d5a508a3fefbbc0cdaa9c2529a6ad..43ab88b4ea5b56055815d90d02f891dcb44c2d07 100644
--- a/src/patterns/03-layouts/layout/layout--2-col/layout--2-col.twig
+++ b/src/patterns/03-layouts/layout/layout--2-col/layout--2-col.twig
@@ -18,4 +18,4 @@
num_of_blocks: num_of_blocks,
} %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/src/patterns/03-layouts/layout/layout--3-col/layout--3-col.twig b/src/patterns/03-layouts/layout/layout--3-col/layout--3-col.twig
index 94919c41522527d562e1d2bc59226417a1f281bd..1da7dbf1d203641ec11f96a73f4bdb009cde34d4 100644
--- a/src/patterns/03-layouts/layout/layout--3-col/layout--3-col.twig
+++ b/src/patterns/03-layouts/layout/layout--3-col/layout--3-col.twig
@@ -18,4 +18,4 @@
num_of_blocks: num_of_blocks,
} %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/src/patterns/03-layouts/layout/layout--4-col/layout--4-col.twig b/src/patterns/03-layouts/layout/layout--4-col/layout--4-col.twig
index 9c2a605bde37f60b19ef47df69d1c90e99463825..698f9b156fc9102de0d0324290f91597940107f0 100644
--- a/src/patterns/03-layouts/layout/layout--4-col/layout--4-col.twig
+++ b/src/patterns/03-layouts/layout/layout--4-col/layout--4-col.twig
@@ -18,4 +18,4 @@
num_of_blocks: num_of_blocks,
} %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/src/patterns/03-layouts/layout/layout--5-col/layout--5-col.twig b/src/patterns/03-layouts/layout/layout--5-col/layout--5-col.twig
index 8d53188672aadad759c57bfd943bc12fe653a8b8..f5e6862c7dfd4fa68290ffec663df39aa98ebf9a 100644
--- a/src/patterns/03-layouts/layout/layout--5-col/layout--5-col.twig
+++ b/src/patterns/03-layouts/layout/layout--5-col/layout--5-col.twig
@@ -18,4 +18,4 @@
num_of_blocks: num_of_blocks,
} %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/src/patterns/03-layouts/layout/layout--inverted-l-left/layout--inverted-l-left.twig b/src/patterns/03-layouts/layout/layout--inverted-l-left/layout--inverted-l-left.twig
index 0ce52523c768d6540e8c007a429d2b3b2050f858..491f9312e1c4d7aa131470ca3c35ed900cbcb823 100644
--- a/src/patterns/03-layouts/layout/layout--inverted-l-left/layout--inverted-l-left.twig
+++ b/src/patterns/03-layouts/layout/layout--inverted-l-left/layout--inverted-l-left.twig
@@ -20,4 +20,4 @@
inverted_l_left: 1,
} %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/src/patterns/03-layouts/layout/layout--inverted-l-right/layout--inverted-l-right.twig b/src/patterns/03-layouts/layout/layout--inverted-l-right/layout--inverted-l-right.twig
index e869a26bbb48041aae73a87ea5c92dc7095d9677..81dc64a007bd73e4421223c7d26765bec1646944 100644
--- a/src/patterns/03-layouts/layout/layout--inverted-l-right/layout--inverted-l-right.twig
+++ b/src/patterns/03-layouts/layout/layout--inverted-l-right/layout--inverted-l-right.twig
@@ -20,4 +20,4 @@
inverted_l_right: 1,
} %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/src/patterns/03-layouts/region/region.twig b/src/patterns/03-layouts/region/region.twig
index 5ba6da56574b5941e158e412c32c9f137691cf38..d853dbc6cf19efe07020c5ed9d66153a3e7afcff 100644
--- a/src/patterns/03-layouts/region/region.twig
+++ b/src/patterns/03-layouts/region/region.twig
@@ -1,5 +1,3 @@
-{{ attach_library('ohana/region')}}
-
<section class="l-{{ region_name ?: 'region' }}">
{% if constrain %}
<div class="l-constrain {{ constrain }}">
diff --git a/src/patterns/04-components/color-bar/_color-bar.scss b/src/patterns/04-components/color-bar/_color-bar.scss
index e1fbd81782ba8abb6440d3f483ed9772c459b665..88800fbb4ccb9aab06c308647ac1760b01dc15c5 100644
--- a/src/patterns/04-components/color-bar/_color-bar.scss
+++ b/src/patterns/04-components/color-bar/_color-bar.scss
@@ -1,6 +1,6 @@
$defaults: 'uw-gold';
$faculties: 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat', 'org-sci', 'org-school', 'org-stp', 'org-cgc', 'org-stj', 'org-ren';
-$lvls: 'lvl1', 'lvl2', 'lvl3', 'lvl4';
+$lvls: '--color1', 'lvl2', 'lvl3', 'lvl4';
@each $default in $defaults {
@each $lvl in $lvls {
diff --git a/src/patterns/global.scss b/src/patterns/global.scss
index 7948a5159541eac76ef218f99a4de51e9cbbacc2..05b97748884d190377aa09f0d2cb83af4c22546a 100644
--- a/src/patterns/global.scss
+++ b/src/patterns/global.scss
@@ -5,4 +5,3 @@
@use '01-core/props' as *;
@use '01-core/utilities' as *;
@use '01-core/elements' as *;
-@use '03-layouts' as *;
diff --git a/uw_wcms_ohana.libraries.yml b/uw_wcms_ohana.libraries.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d941d3a2044b65dd0281b78cce350f07d2e59116
--- /dev/null
+++ b/uw_wcms_ohana.libraries.yml
@@ -0,0 +1,22 @@
+name: 'WCMS Ohana'
+description: 'Provides stylings to WCMS'
+type: module
+core_version_requirement: '^8 || ^9'
+components:
+ namespaces:
+ core:
+ - src/patterns/01-core
+ base:
+ - src/patterns/02-base
+ layouts:
+ - src/patterns/03-layouts
+ components:
+ - src/patterns/04-components
+ composites:
+ - src/patterns/05-composites
+ templates:
+ - src/patterns/06-templates
+ pages:
+ - src/patterns/06-pages
+dependencies:
+ - components:components