diff --git a/source/layouts/has_both_sidebars.haml b/source/layouts/has_both_sidebars.haml
index 4d8e4bc..79d4baa 100644
--- a/source/layouts/has_both_sidebars.haml
+++ b/source/layouts/has_both_sidebars.haml
@@ -5,13 +5,13 @@
         = yield_content :navigation
 
       .sl-l-medium-holy-grail__main
-        .sl-l-x-large-holy-grail
-          .sl-l-x-large-holy-grail__body
-            - has_contents = current_page.data.table_of_contents ? 'sl-l-x-large-holy-grail__complementary--contents' : ''
-            %aside.sl-l-x-large-holy-grail__complementary(role='complementary'){class: has_contents}
+        .sl-l-large-holy-grail
+          .sl-l-large-holy-grail__body
+            - has_contents = current_page.data.table_of_contents ? 'sl-l-large-holy-grail__complementary--contents' : ''
+            %aside.sl-l-large-holy-grail__complementary(role='complementary'){class: has_contents}
               = yield_content :complementary
 
-            .sl-l-x-large-holy-grail__main
+            .sl-l-large-holy-grail__main
               - container = current_page.data.no_container ? '' : 'sl-l-container sl-l-container--small'
               %div{class: container}
                 - if current_page.data.introduction
diff --git a/source/layouts/has_complementary.haml b/source/layouts/has_complementary.haml
index b6d5a34..1d82015 100644
--- a/source/layouts/has_complementary.haml
+++ b/source/layouts/has_complementary.haml
@@ -1,7 +1,7 @@
 = wrap_layout :layout do
-  .sl-l-holy-grail
-    .sl-l-holy-grail__body
-      .sl-l-holy-grail__main
+  .sl-l-large-holy-grail
+    .sl-l-large-holy-grail__body
+      .sl-l-large-holy-grail__main
         - container = current_page.data.no_container ? '' : 'sl-l-container sl-l-container--small'
         %div{class: container}
           - if current_page.data.introduction
@@ -11,5 +11,5 @@
 
           =yield
 
-      %aside.sl-l-holy-grail__complementary(role='complementary')
+      %aside.sl-l-large-holy-grail__complementary(role='complementary')
         = yield_content :complementary
diff --git a/source/layouts/has_navigation.haml b/source/layouts/has_navigation.haml
index 4957ffe..ea7b9bb 100644
--- a/source/layouts/has_navigation.haml
+++ b/source/layouts/has_navigation.haml
@@ -1,10 +1,10 @@
 = wrap_layout :layout do
-  .sl-l-holy-grail
-    .sl-l-holy-grail__body
-      %nav.sl-l-holy-grail__navigation(role='navigation')
+  .sl-l-medium-holy-grail
+    .sl-l-medium-holy-grail__body
+      %nav.sl-l-medium-holy-grail__navigation(role='navigation')
         = yield_content :navigation
 
-      .sl-l-holy-grail__main
+      .sl-l-medium-holy-grail__main
         - container = current_page.data.no_container ? '' : 'sl-l-container sl-l-container--small'
         %div{class: container}
           - if current_page.data.introduction