diff --git a/layouts/layout--uw-1-col.html.twig b/layouts/layout--uw-1-col.html.twig
index 7293cf12f683dbcc101d4b3a992b68615b192f58..da581e5a2424ed13eac83a9170f7af807506c605 100644
--- a/layouts/layout--uw-1-col.html.twig
+++ b/layouts/layout--uw-1-col.html.twig
@@ -1,16 +1,13 @@
 {%
   set classes = [
-  'uw-section-spacing--default',
-  'uw-section-separator--none',
-  'uw-column-separator--none',
   'layout',
   'layout--uw-1-col',
   settings.column_class,
 ]
 %}
 
-<section{{ attributes.addClass(classes) }}>
-  <div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
-      {{ content.first }}
-  </div>
-</section>
+{% include '@layouts/layout/layout--1-col/layout--1-col.twig' with {
+  'classes': classes,
+  'content': content
+} %}
+
diff --git a/layouts/layout--uw-2-col.html.twig b/layouts/layout--uw-2-col.html.twig
index 599e1e46a60c7264919b34a8ab1158d3b49d6706..df321871bd87a3dd1fa085c23eefe03e28d59e49 100644
--- a/layouts/layout--uw-2-col.html.twig
+++ b/layouts/layout--uw-2-col.html.twig
@@ -1,8 +1,5 @@
 {%
   set classes = [
-  'uw-section-spacing--default',
-  'uw-section-separator--none',
-  'uw-column-separator--none',
   'layout',
   'layout--uw-2-col',
   settings.column_class,
diff --git a/layouts/layout--uw-3-col.html.twig b/layouts/layout--uw-3-col.html.twig
index d6488cb278019307a5cc393a61424e56ead808f7..280ecd8eb655fcc338ad15b0ee64f8fba4915ec9 100644
--- a/layouts/layout--uw-3-col.html.twig
+++ b/layouts/layout--uw-3-col.html.twig
@@ -1,8 +1,5 @@
 {%
   set classes = [
-  'uw-section-spacing--default',
-  'uw-section-separator--none',
-  'uw-column-separator--none',
   'layout',
   'layout--uw-3-col',
   settings.column_class,
diff --git a/layouts/layout--uw-4-col.html.twig b/layouts/layout--uw-4-col.html.twig
index b3b9ab1d9f304541365281138646b730ed0c12f8..d099378cc3ee970a3da485af78f4287f8df2e75c 100644
--- a/layouts/layout--uw-4-col.html.twig
+++ b/layouts/layout--uw-4-col.html.twig
@@ -1,8 +1,5 @@
 {%
   set classes = [
-  'uw-section-spacing--default',
-  'uw-section-separator--none',
-  'uw-column-separator--none',
   'layout',
   'layout--uw-4-col',
   settings.column_class,
diff --git a/layouts/layout--uw-5-col.html.twig b/layouts/layout--uw-5-col.html.twig
index bcd94f69d3f9384ce31ff5ab754eb9f438efaabc..15bee1a9a7f90bb5bb5ab032984b9a2c4567c5ef 100644
--- a/layouts/layout--uw-5-col.html.twig
+++ b/layouts/layout--uw-5-col.html.twig
@@ -1,8 +1,5 @@
 {%
   set classes = [
-  'uw-section-spacing--default',
-  'uw-section-separator--none',
-  'uw-column-separator--none',
   'layout',
   'layout--uw-5-col',
   settings.column_class,
diff --git a/layouts/layout--uw-inverted-l-left.html.twig b/layouts/layout--uw-inverted-l-left.html.twig
index b1f74199ad5b44562a110525800dbd54e15b1d3d..c833aea50ffd31a5460cebcf97f3e61e4e2d2f68 100644
--- a/layouts/layout--uw-inverted-l-left.html.twig
+++ b/layouts/layout--uw-inverted-l-left.html.twig
@@ -1,8 +1,5 @@
 {%
   set classes = [
-  'uw-section-spacing--default',
-  'uw-section-separator--none',
-  'uw-column-separator--none',
   'layout',
   'layout--uw-inverted-l-left',
   settings.column_class,
diff --git a/layouts/layout--uw-inverted-l-right.html.twig b/layouts/layout--uw-inverted-l-right.html.twig
index 323bfec9d43f1b97f47b13e9a790c6c6bdec32cb..0bfd50c54286b78ced24bf0585f2df40d441e172 100644
--- a/layouts/layout--uw-inverted-l-right.html.twig
+++ b/layouts/layout--uw-inverted-l-right.html.twig
@@ -1,8 +1,5 @@
 {%
   set classes = [
-  'uw-section-spacing--default',
-  'uw-section-separator--none',
-  'uw-column-separator--none',
   'layout',
   'layout--uw-inverted-l-right',
   settings.column_class,
diff --git a/uw_cfg_common.module b/uw_cfg_common.module
index a0cabd3ab0d7e217d1d2746146408ef1db5124a1..ddd33b38f1f0bd8a29943c8519ef946b1c5985ee 100644
--- a/uw_cfg_common.module
+++ b/uw_cfg_common.module
@@ -1841,6 +1841,28 @@ function uw_cfg_common_field_widget_single_element_link_default_form_alter(array
   $element['uri']['#element_validate'][] = '_uw_cfg_common_uw_link_validator';
 }
 
+/**
+ * Implements template_preprocess_layout.
+ */
+function uw_cfg_common_preprocess_layout(&$variables) {
+
+  // Classes to check for.
+  $classes['uw-section-spacing'] = 'uw-section-spacing--default';
+  $classes['uw-section-separator'] = 'uw-section-separator--none';
+  $classes['uw-column-separator'] = 'uw-column-separator--none';
+
+  // Step through each of the classes and see if we need to
+  // add it to the layout.
+  foreach ($classes as $needle => $class) {
+
+    // If there is no class for section spacing, add it
+    // to the layout classes.
+    if (empty(preg_grep('/' . $needle . '/i', $variables['attributes']['class']))) {
+      $variables['attributes']['class'][] = $class;
+    }
+  }
+}
+
 /**
  * Link uri field validation function.
  */