diff --git a/src/patterns/01-core/mixins/_uw-mixins.scss b/src/patterns/01-core/mixins/_uw-mixins.scss
index ffd832bf894d0d48b783b9630e0803272aa53328..3b1506b123c666eab5e4303f23863cb5ff7d2a22 100644
--- a/src/patterns/01-core/mixins/_uw-mixins.scss
+++ b/src/patterns/01-core/mixins/_uw-mixins.scss
@@ -19,7 +19,7 @@ $test-color-12: var(--green-5);
   word-wrap: break-word;
 }
 
-@mixin uw-contained-width($value:$max-width) {
+@mixin uw-contained-width($value:var(--layout-max-width)) {
   margin-left: auto;
   margin-right: auto;
   max-width: $value;
diff --git a/src/patterns/03-layouts/_index.scss b/src/patterns/03-layouts/_index.scss
index 2cb5f83adba372bf3c84da2c8d018db962fcca48..4897734f56be7a870aa84be4707da495d6d2a874 100644
--- a/src/patterns/03-layouts/_index.scss
+++ b/src/patterns/03-layouts/_index.scss
@@ -1,12 +1,19 @@
 // @file
 // Styles layouts
-@use '../01-core' as *;
+
 @use 'content/content' as *;
 @use 'footer/footer' as *;
 @use 'grid/grid' as *;
 @use 'header/header' as *;
 @use 'region/region' as *;
-@use 'layout/layout-base' as *;
 @use 'layout/layout' as *;
+@use 'layout/layout-base' as *;
+@use 'layout/layout--1-col/layout--1-col' as *;
+@use 'layout/layout--2-col/layout--2-col' as *;
+@use 'layout/layout--3-col/layout--3-col' as *;
+@use 'layout/layout--4-col/layout--4-col' as *;
+@use 'layout/layout--5-col/layout--5-col' as *;
+@use 'layout/layout--inverted-l-left/layout--inverted-l-left' as *;
+@use 'layout/layout--inverted-l-right/layout--inverted-l-right' as *;
 @use 'site-container/site-container' as *;
 @use 'site-footer/site-footer' as *;
diff --git a/src/patterns/03-layouts/layout/_layout-base.scss b/src/patterns/03-layouts/layout/_layout-base.scss
index 3225dc88220a138993855ba1662c12eca17e02a2..fb1c1d311f40c5101d1b7cc2616aa319f7135df1 100644
--- a/src/patterns/03-layouts/layout/_layout-base.scss
+++ b/src/patterns/03-layouts/layout/_layout-base.scss
@@ -1,11 +1,4 @@
 @use '../../01-core' as *;
-@use '../../03-layouts/layout/layout--1-col/layout--1-col' as *;
-@use '../../03-layouts/layout/layout--2-col/layout--2-col' as *;
-@use '../../03-layouts/layout/layout--3-col/layout--3-col' as *;
-@use '../../03-layouts/layout/layout--4-col/layout--4-col' as *;
-@use '../../03-layouts/layout/layout--5-col/layout--5-col' as *;
-@use '../../03-layouts/layout/layout--inverted-l-left/layout--inverted-l-left' as *;
-@use '../../03-layouts/layout/layout--inverted-l-right/layout--inverted-l-right' as *;
 
 .layout__region {
 
diff --git a/src/patterns/03-layouts/layout/_layout.twig b/src/patterns/03-layouts/layout/_layout.twig
index b442c69b7a5499547d27fccfb7e34f8c683f985c..fa8f0035f24a2478da0578615977b0856ce285e2 100644
--- a/src/patterns/03-layouts/layout/_layout.twig
+++ b/src/patterns/03-layouts/layout/_layout.twig
@@ -1,5 +1,3 @@
-{{ attach_library('uw_wcms_ohana/layout') }}
-
 {% set section_names = {
   1: 'first',
   2: 'second',
diff --git a/src/patterns/global.scss b/src/patterns/global.scss
index 05b97748884d190377aa09f0d2cb83af4c22546a..7948a5159541eac76ef218f99a4de51e9cbbacc2 100644
--- a/src/patterns/global.scss
+++ b/src/patterns/global.scss
@@ -5,3 +5,4 @@
 @use '01-core/props' as *;
 @use '01-core/utilities' as *;
 @use '01-core/elements' as *;
+@use '03-layouts' as *;