diff --git a/plugins/layouts/radix_bartlett/radix-bartlett.html.twig b/plugins/layouts/radix_bartlett/radix-bartlett.html.twig
index 575fd1c..3dcc2f6 100644
--- a/plugins/layouts/radix_bartlett/radix-bartlett.html.twig
+++ b/plugins/layouts/radix_bartlett/radix-bartlett.html.twig
@@ -9,14 +9,27 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+  set container_classes = [
+    'panel-display',
+    'bartlett',
+    'clearfix'
+  ]
+%}
+{% if classes %}
+  {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+  {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display bartlett clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
-  <div class="container-fluid">
+<div{{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
+  <div class="container-fluid layout">
     <div class="row">
 
       <!-- Sidebar -->
       <div class="col-md-4 radix-layouts-sidebar panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.sidebar.addClass('panel-panel-inner') }}>
           {{ content.sidebar }}
         </div>
       </div>
@@ -24,17 +37,17 @@
       <div class="col-md-8 panel-panel">
         <div class="row">
           <div class="col-md-12 radix-layouts-contentheader panel-panel">
-            <div class="panel-panel-inner">
+            <div {{ region_attributes.contentheader.addClass('panel-panel-inner') }}>
               {{ content.contentheader }}
             </div>
           </div>
           <div class="col-md-6 radix-layouts-contentcolumn1 panel-panel">
-            <div class="panel-panel-inner">
+            <div {{ region_attributes.contentcolumn1.addClass('panel-panel-inner') }}>
               {{ content.contentcolumn1 }}
             </div>
           </div>
           <div class="col-md-6 radix-layouts-contentcolumn2 panel-panel">
-            <div class="panel-panel-inner">
+            <div {{ region_attributes.contentcolumn2.addClass('panel-panel-inner') }}>
               {{ content.contentcolumn2 }}
             </div>
           </div>
diff --git a/plugins/layouts/radix_bartlett_flipped/radix-bartlett-flipped.html.twig b/plugins/layouts/radix_bartlett_flipped/radix-bartlett-flipped.html.twig
index 07400b9..69de900 100644
--- a/plugins/layouts/radix_bartlett_flipped/radix-bartlett-flipped.html.twig
+++ b/plugins/layouts/radix_bartlett_flipped/radix-bartlett-flipped.html.twig
@@ -9,25 +9,38 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'bartlett-flipped',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display bartlett-flipped clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
   <div class="container-fluid">
     <div class="row">
 
       <div class="col-md-8 panel-panel">
         <div class="row">
           <div class="col-md-12 radix-layouts-contentheader panel-panel">
-            <div class="panel-panel-inner">
+            <div {{ region_attributes.contentheader.addClass('panel-panel-inner') }}>
               {{ content.contentheader }}
             </div>
           </div>
           <div class="col-md-6 radix-layouts-contentcolumn1 panel-panel">
-            <div class="panel-panel-inner">
+            <div {{ region_attributes.contentcolumn1.addClass('panel-panel-inner') }}>
               {{ content.contentcolumn1 }}
             </div>
           </div>
           <div class="col-md-6 radix-layouts-contentcolumn2 panel-panel">
-            <div class="panel-panel-inner">
+            <div {{ region_attributes.contentcolumn2.addClass('panel-panel-inner') }}>
               {{ content.contentcolumn2 }}
             </div>
           </div>
@@ -36,7 +49,7 @@
 
       <!-- Sidebar -->
       <div class="col-md-4 radix-layouts-sidebar panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.sidebar.addClass('panel-panel-inner') }}>
           {{ content.sidebar }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_boxton/radix-boxton.html.twig b/plugins/layouts/radix_boxton/radix-boxton.html.twig
index 6aa4020..86f599e 100755
--- a/plugins/layouts/radix_boxton/radix-boxton.html.twig
+++ b/plugins/layouts/radix_boxton/radix-boxton.html.twig
@@ -9,13 +9,26 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'boxton',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display boxton clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-12 radix-layouts-content panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.contentmain.addClass('panel-panel-inner') }}>
           {{ content.contentmain }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_brenham/radix-brenham.html.twig b/plugins/layouts/radix_brenham/radix-brenham.html.twig
index 8d65700..b466c7c 100644
--- a/plugins/layouts/radix_brenham/radix-brenham.html.twig
+++ b/plugins/layouts/radix_brenham/radix-brenham.html.twig
@@ -9,13 +9,26 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'brenham',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display brenham clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-12 radix-layouts-header panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.header.addClass('panel-panel-inner') }}>
           {{ content.header }}
         </div>
       </div>
@@ -23,12 +36,12 @@
 
     <div class="row">
       <div class="col-md-4 radix-layouts-sidebar panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.sidebar.addClass('panel-panel-inner') }}>
           {{ content.sidebar }}
         </div>
       </div>
       <div class="col-md-8 radix-layouts-content panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.contentmain.addClass('panel-panel-inner') }}>
           {{ content.contentmain }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_brenham_flipped/radix-brenham-flipped.html.twig b/plugins/layouts/radix_brenham_flipped/radix-brenham-flipped.html.twig
index 2b2485b..89fbd43 100644
--- a/plugins/layouts/radix_brenham_flipped/radix-brenham-flipped.html.twig
+++ b/plugins/layouts/radix_brenham_flipped/radix-brenham-flipped.html.twig
@@ -9,13 +9,27 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'brenham-flipped',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display brenham-flipped clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-12 radix-layouts-header panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.header.addClass('panel-panel-inner') }}>
           {{ content.header }}
         </div>
       </div>
@@ -23,12 +37,12 @@
 
     <div class="row">
       <div class="col-md-8 radix-layouts-content panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.contentmain.addClass('panel-panel-inner') }}>
           {{ content.contentmain }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-sidebar panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.sidebar.addClass('panel-panel-inner') }}>
           {{ content.sidebar }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_brown/radix-brown.html.twig b/plugins/layouts/radix_brown/radix-brown.html.twig
index e99d234..6eb3c8a 100755
--- a/plugins/layouts/radix_brown/radix-brown.html.twig
+++ b/plugins/layouts/radix_brown/radix-brown.html.twig
@@ -9,19 +9,31 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'brown',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display brown clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
-
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-8 radix-layouts-slider panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.slider.addClass('panel-panel-inner') }}>
           {{ content.slider }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-slidergutter panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.slidergutter.addClass('panel-panel-inner') }}>
           {{ content.slidergutter }}
         </div>
       </div>
@@ -31,17 +43,17 @@
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-4 radix-layouts-column1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column1.addClass('panel-panel-inner') }}>
           {{ content.column1 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-column2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column2.addClass('panel-panel-inner') }}>
           {{ content.column2 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-column3 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column3.addClass('panel-panel-inner') }}>
           {{ content.column3 }}
         </div>
       </div>
@@ -51,17 +63,17 @@
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-4 radix-layouts-footercolumn1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.footercolumn1.addClass('panel-panel-inner') }}>
           {{ content.footercolumn1 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-footercolumn2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.footercolumn2.addClass('panel-panel-inner') }}>
           {{ content.footercolumn2 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-footercolumn3 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.footercolumn3.addClass('panel-panel-inner') }}>
           {{ content.footercolumn3 }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_bryant/radix-bryant.html.twig b/plugins/layouts/radix_bryant/radix-bryant.html.twig
index 46338ca..de3bcea 100755
--- a/plugins/layouts/radix_bryant/radix-bryant.html.twig
+++ b/plugins/layouts/radix_bryant/radix-bryant.html.twig
@@ -9,18 +9,31 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'bryant',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display bryant clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-3 radix-layouts-sidebar panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.sidebar.addClass('panel-panel-inner') }}>
           {{ content.sidebar }}
         </div>
       </div>
       <div class="col-md-9 radix-layouts-content panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.contentmain.addClass('panel-panel-inner') }}>
           {{ content.contentmain }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_bryant_flipped/radix-bryant-flipped.html.twig b/plugins/layouts/radix_bryant_flipped/radix-bryant-flipped.html.twig
index 580205a..29cf11f 100755
--- a/plugins/layouts/radix_bryant_flipped/radix-bryant-flipped.html.twig
+++ b/plugins/layouts/radix_bryant_flipped/radix-bryant-flipped.html.twig
@@ -9,18 +9,31 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'bryant-flipped',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display bryant-flipped clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-9 radix-layouts-content panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.contentmain.addClass('panel-panel-inner') }}>
 		  {{ content.contentmain }}
         </div>
       </div>
       <div class="col-md-3 radix-layouts-sidebar panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.sidebar.addClass('panel-panel-inner') }}>
 		  {{ content.sidebar }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_burr/radix-burr.html.twig b/plugins/layouts/radix_burr/radix-burr.html.twig
index 8ee39f1..9e0ad21 100755
--- a/plugins/layouts/radix_burr/radix-burr.html.twig
+++ b/plugins/layouts/radix_burr/radix-burr.html.twig
@@ -9,17 +9,31 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
-<div class="panel-display burr clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+{%
+    set container_classes = [
+    'panel-display',
+    'burr',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
+
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-4 radix-layouts-sidebar panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.sidebar.addClass('panel-panel-inner') }}>
           {{ content.sidebar }}
         </div>
       </div>
       <div class="col-md-8 radix-layouts-content panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.contentmain.addClass('panel-panel-inner') }}>
           {{ content.contentmain }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_burr_flipped/radix-burr-flipped.html.twig b/plugins/layouts/radix_burr_flipped/radix-burr-flipped.html.twig
index 641c897..5e707b4 100755
--- a/plugins/layouts/radix_burr_flipped/radix-burr-flipped.html.twig
+++ b/plugins/layouts/radix_burr_flipped/radix-burr-flipped.html.twig
@@ -9,18 +9,31 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'burr-flipped',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display burr-flipped clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
   
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-8 radix-layouts-content panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.contentmain.addClass('panel-panel-inner') }}>
           {{ content.contentmain }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-sidebar panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.sidebar.addClass('panel-panel-inner') }}>
           {{ content.sidebar }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_geary/radix-geary.html.twig b/plugins/layouts/radix_geary/radix-geary.html.twig
index 095553f..80c881e 100755
--- a/plugins/layouts/radix_geary/radix-geary.html.twig
+++ b/plugins/layouts/radix_geary/radix-geary.html.twig
@@ -9,13 +9,26 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'geary',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display geary clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-12 radix-layouts-header panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.header.addClass('panel-panel-inner') }}>
           {{ content.header }}
         </div>
       </div>
@@ -23,17 +36,17 @@
     
     <div class="row">
       <div class="col-md-4 radix-layouts-column1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column1.addClass('panel-panel-inner') }}>
           {{ content.column1 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-column2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column2.addClass('panel-panel-inner') }}>
           {{ content.column2 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-column3 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column3.addClass('panel-panel-inner') }}>
           {{ content.column3 }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_harris/radix-harris.html.twig b/plugins/layouts/radix_harris/radix-harris.html.twig
index aa4c095..81de292 100755
--- a/plugins/layouts/radix_harris/radix-harris.html.twig
+++ b/plugins/layouts/radix_harris/radix-harris.html.twig
@@ -9,13 +9,26 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'harris',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display harris clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-12 radix-layouts-header panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.header.addClass('panel-panel-inner') }}>
           {{ content.header }}
         </div>
       </div>
@@ -23,17 +36,17 @@
     
     <div class="row">
       <div class="col-md-3 radix-layouts-column1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column1.addClass('panel-panel-inner') }}>
           {{ content.column1 }}
         </div>
       </div>
       <div class="col-md-6 radix-layouts-content panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.contentmain.addClass('panel-panel-inner') }}>
           {{ content.contentmain }}
         </div>
       </div>
       <div class="col-md-3 radix-layouts-column2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column2.addClass('panel-panel-inner') }}>
           {{ content.column2 }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_hewston/radix-hewston.html.twig b/plugins/layouts/radix_hewston/radix-hewston.html.twig
index 82ceb60..f9850ae 100644
--- a/plugins/layouts/radix_hewston/radix-hewston.html.twig
+++ b/plugins/layouts/radix_hewston/radix-hewston.html.twig
@@ -9,18 +9,31 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'hewston',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display hewston clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-8 radix-layouts-slider panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.slider.addClass('panel-panel-inner') }}>
           {{ content.slider }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-slidergutter panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.slidergutter.addClass('panel-panel-inner') }}>
           {{ content.slidergutter }}
         </div>
       </div>
@@ -28,17 +41,17 @@
     
     <div class="row">
       <div class="col-md-4 radix-layouts-column1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column1.addClass('panel-panel-inner') }}>
           {{ content.column1 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-column2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column2.addClass('panel-panel-inner') }}>
           {{ content.column2 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-column3 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column3.addClass('panel-panel-inner') }}>
           {{ content.column3 }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_hewston_flipped/radix-hewston-flipped.html.twig b/plugins/layouts/radix_hewston_flipped/radix-hewston-flipped.html.twig
index 2bc0c03..ceed3e4 100644
--- a/plugins/layouts/radix_hewston_flipped/radix-hewston-flipped.html.twig
+++ b/plugins/layouts/radix_hewston_flipped/radix-hewston-flipped.html.twig
@@ -9,18 +9,31 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'hewston-flipped',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display hewston-flipped clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-4 radix-layouts-slidergutter panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.slidergutter.addClass('panel-panel-inner') }}>
           {{ content.slidergutter }}
         </div>
       </div>
       <div class="col-md-8 radix-layouts-slider panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.slider.addClass('panel-panel-inner') }}>
           {{ content.slider }}
         </div>
       </div>
@@ -28,17 +41,17 @@
     
     <div class="row">
       <div class="col-md-4 radix-layouts-column1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column1.addClass('panel-panel-inner') }}>
           {{ content.column1 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-column2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column2.addClass('panel-panel-inner') }}>
           {{ content.column2 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-column3 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column3.addClass('panel-panel-inner') }}>
           {{ content.column3 }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_mccoppin/radix-mccoppin.html.twig b/plugins/layouts/radix_mccoppin/radix-mccoppin.html.twig
index 9e048ca..deefa40 100644
--- a/plugins/layouts/radix_mccoppin/radix-mccoppin.html.twig
+++ b/plugins/layouts/radix_mccoppin/radix-mccoppin.html.twig
@@ -9,23 +9,36 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'mccoppin',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display mccoppin clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-4 radix-layouts-column1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column1.addClass('panel-panel-inner') }}>
           {{ content.column1 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-column2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column2.addClass('panel-panel-inner') }}>
           {{ content.column2 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-column3 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column3.addClass('panel-panel-inner') }}>
           {{ content.column3 }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_moscone/radix-moscone.html.twig b/plugins/layouts/radix_moscone/radix-moscone.html.twig
index f96b631..5e41e79 100755
--- a/plugins/layouts/radix_moscone/radix-moscone.html.twig
+++ b/plugins/layouts/radix_moscone/radix-moscone.html.twig
@@ -9,13 +9,26 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'moscone',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display moscone clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-12 radix-layouts-header panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.header.addClass('panel-panel-inner') }}>
           {{ content.header }}
         </div>
       </div>
@@ -23,12 +36,12 @@
     
     <div class="row">
       <div class="col-md-4 radix-layouts-sidebar panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.sidebar.addClass('panel-panel-inner') }}>
           {{ content.sidebar }}
         </div>
       </div>
       <div class="col-md-8 radix-layouts-content panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.contentmain.addClass('panel-panel-inner') }}>
           {{ content.contentmain }}
         </div>
       </div>
@@ -36,7 +49,7 @@
     
     <div class="row">
       <div class="col-md-12 radix-layouts-footer panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.footer.addClass('panel-panel-inner') }}>
           {{ content.footer }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_moscone_flipped/radix-moscone-flipped.html.twig b/plugins/layouts/radix_moscone_flipped/radix-moscone-flipped.html.twig
index 1d79ffe..309a592 100755
--- a/plugins/layouts/radix_moscone_flipped/radix-moscone-flipped.html.twig
+++ b/plugins/layouts/radix_moscone_flipped/radix-moscone-flipped.html.twig
@@ -9,13 +9,26 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'moscone-flipped',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display moscone-flipped clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-12 radix-layouts-header panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.header.addClass('panel-panel-inner') }}>
           {{ content.header }}
         </div>
       </div>
@@ -23,12 +36,12 @@
     
     <div class="row">
       <div class="col-md-8 radix-layouts-content panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.contentmain.addClass('panel-panel-inner') }}>
           {{ content.contentmain }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-sidebar panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.sidebar.addClass('panel-panel-inner') }}>
           {{ content.sidebar }}
         </div>
       </div>
@@ -36,7 +49,7 @@
     
     <div class="row">
       <div class="col-md-12 radix-layouts-footer panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.footer.addClass('panel-panel-inner') }}>
           {{ content.footer }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_phelan/radix-phelan.html.twig b/plugins/layouts/radix_phelan/radix-phelan.html.twig
index cb916f5..545aa15 100644
--- a/plugins/layouts/radix_phelan/radix-phelan.html.twig
+++ b/plugins/layouts/radix_phelan/radix-phelan.html.twig
@@ -9,18 +9,31 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'phelan',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display phelan clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-6 radix-layouts-column1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column1.addClass('panel-panel-inner') }}>
           {{ content.column1 }}
         </div>
       </div>
       <div class="col-md-6 radix-layouts-column2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column2.addClass('panel-panel-inner') }}>
           {{ content.column2 }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_pond/radix-pond.html.twig b/plugins/layouts/radix_pond/radix-pond.html.twig
index 733cd72..9d3f14f 100644
--- a/plugins/layouts/radix_pond/radix-pond.html.twig
+++ b/plugins/layouts/radix_pond/radix-pond.html.twig
@@ -9,13 +9,26 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'pond',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display pond clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-12 radix-layouts-header panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.header.addClass('panel-panel-inner') }}>
           {{ content.header }}
         </div>
       </div>
@@ -23,17 +36,17 @@
 
     <div class="row">
       <div class="col-md-4 radix-layouts-column1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column1.addClass('panel-panel-inner') }}>
           {{ content.column1 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-column2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column2.addClass('panel-panel-inner') }}>
           {{ content.column2 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-column3 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column3.addClass('panel-panel-inner') }}>
           {{ content.column3 }}
         </div>
       </div>
@@ -41,17 +54,17 @@
 
     <div class="row">
       <div class="col-md-4 radix-layouts-secondarycolumn1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.secondarycolumn1.addClass('panel-panel-inner') }}>
           {{ content.secondarycolumn1 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-secondarycolumn2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.secondarycolumn2.addClass('panel-panel-inner') }}>
           {{ content.secondarycolumn2 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-secondarycolumn3 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.secondarycolumn3.addClass('panel-panel-inner') }}>
           {{ content.secondarycolumn3 }}
         </div>
       </div>
@@ -59,7 +72,7 @@
 
     <div class="row">
       <div class="col-md-12 radix-layouts-footer panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.footer.addClass('panel-panel-inner') }}>
           {{ content.footer }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_rolph/radix-rolph.html.twig b/plugins/layouts/radix_rolph/radix-rolph.html.twig
index a9a1a5a..e1d62eb 100644
--- a/plugins/layouts/radix_rolph/radix-rolph.html.twig
+++ b/plugins/layouts/radix_rolph/radix-rolph.html.twig
@@ -9,13 +9,26 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'rolph',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display rolph clearfix {% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-12 radix-layouts-header panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.header.addClass('panel-panel-inner') }}>
           {{ content.header }}
         </div>
       </div>
@@ -23,22 +36,22 @@
 
     <div class="row">
       <div class="col-md-3 radix-layouts-quarter1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.quarter1.addClass('panel-panel-inner') }}>
           {{ content.quarter1 }}
         </div>
       </div>
       <div class="col-md-3 radix-layouts-quarter2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.quarter2.addClass('panel-panel-inner') }}>
           {{ content.quarter2 }}
         </div>
       </div>
       <div class="col-md-3 radix-layouts-quarter3 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.quarter3.addClass('panel-panel-inner') }}>
           {{ content.quarter3 }}
         </div>
       </div>
       <div class="col-md-3 radix-layouts-quarter4 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.quarter4.addClass('panel-panel-inner') }}>
           {{ content.quarter4 }}
         </div>
       </div>
@@ -46,7 +59,7 @@
 
     <div class="row">
       <div class="col-md-12 radix-layouts-footer panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.footer.addClass('panel-panel-inner') }}>
           {{ content.footer }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_sanderson/radix-sanderson.html.twig b/plugins/layouts/radix_sanderson/radix-sanderson.html.twig
index 4f0b2e5..1b0c260 100644
--- a/plugins/layouts/radix_sanderson/radix-sanderson.html.twig
+++ b/plugins/layouts/radix_sanderson/radix-sanderson.html.twig
@@ -9,18 +9,31 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'sanderson',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display sanderson clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-6 radix-layouts-column1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column1.addClass('panel-panel-inner') }}>
           {{ content.column1 }}
         </div>
       </div>
       <div class="col-md-6 radix-layouts-column2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column2.addClass('panel-panel-inner') }}>
           {{ content.column2 }}
         </div>
       </div>
@@ -28,17 +41,17 @@
     
     <div class="row">
       <div class="col-md-4 radix-layouts-secondarycolumn1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.secondarycolumn1.addClass('panel-panel-inner') }}>
           {{ content.secondarycolumn1 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-secondarycolumn2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.secondarycolumn2.addClass('panel-panel-inner') }}>
           {{ content.secondarycolumn2 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-secondarycolumn3 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.secondarycolumn3.addClass('panel-panel-inner') }}>
           {{ content.secondarycolumn3 }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_sanderson_flipped/radix-sanderson-flipped.html.twig b/plugins/layouts/radix_sanderson_flipped/radix-sanderson-flipped.html.twig
index 9f916c9..f1519c3 100644
--- a/plugins/layouts/radix_sanderson_flipped/radix-sanderson-flipped.html.twig
+++ b/plugins/layouts/radix_sanderson_flipped/radix-sanderson-flipped.html.twig
@@ -9,23 +9,36 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'sanderson-flipped',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display sanderson-flipped clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-4 radix-layouts-column1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column1.addClass('panel-panel-inner') }}>
           {{ content.column1 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-column2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column2.addClass('panel-panel-inner') }}>
           {{ content.column2 }}
         </div>
       </div>
       <div class="col-md-4 radix-layouts-column3 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column3.addClass('panel-panel-inner') }}>
           {{ content.column3 }}
         </div>
       </div>
@@ -33,12 +46,12 @@
 
     <div class="row">
       <div class="col-md-6 radix-layouts-secondarycolumn1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.secondarycolumn1.addClass('panel-panel-inner') }}>
           {{ content.secondarycolumn1 }}
         </div>
       </div>
       <div class="col-md-6 radix-layouts-secondarycolumn2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.secondarycolumn2.addClass('panel-panel-inner') }}>
           {{ content.secondarycolumn2 }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_selby/radix-selby.html.twig b/plugins/layouts/radix_selby/radix-selby.html.twig
index 3a1bde0..5557ff3 100644
--- a/plugins/layouts/radix_selby/radix-selby.html.twig
+++ b/plugins/layouts/radix_selby/radix-selby.html.twig
@@ -9,33 +9,54 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'selby',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display selby clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-4 radix-layouts-sidebar panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.sidebar.addClass('panel-panel-inner') }}>
           {{ content.sidebar }}
         </div>
       </div>
       <div class="col-md-8 panel-panel">
         <div class="row">
           <div class="col-md-12 radix-layouts-contentheader panel-panel">
-            {{ content.contentheader }}
+            <div {{ region_attributes.contentheader.addClass('panel-panel-inner') }}>
+              {{ content.contentheader }}
+            </div>
           </div>
         </div>
         <div class="row">
           <div class="col-md-6 radix-layouts-contentcolumn1 panel-panel">
-            {{ content.contentcolumn1 }}
+            <div {{ region_attributes.contentheader.addClass('panel-panel-inner') }}>
+                {{ content.contentcolumn1 }}
+            </div>
           </div>
           <div class="col-md-6 radix-layouts-contentcolumn2 panel-panel">
-            {{ content.contentcolumn2 }}
+            <div {{ region_attributes.contentheader.addClass('panel-panel-inner') }}>
+                {{ content.contentcolumn2 }}
+            </div>
           </div>
         </div>
         <div class="row">
           <div class="col-md-12 radix-layouts-contentfooter panel-panel">
-            {{ content.contentfooter }}
+            <div {{ region_attributes.contentheader.addClass('panel-panel-inner') }}>
+                {{ content.contentfooter }}
+            </div>
           </div>
         </div>
       </div>
diff --git a/plugins/layouts/radix_selby_flipped/radix-selby-flipped.html.twig b/plugins/layouts/radix_selby_flipped/radix-selby-flipped.html.twig
index 3ba00b8..56dc150 100644
--- a/plugins/layouts/radix_selby_flipped/radix-selby-flipped.html.twig
+++ b/plugins/layouts/radix_selby_flipped/radix-selby-flipped.html.twig
@@ -9,33 +9,54 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'selby-flipped',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display selby-flipped clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-8 panel-panel">
         <div class="row">
           <div class="col-md-12 radix-layouts-contentheader panel-panel">
-            {{ content.contentheader }}
+            <div {{ region_attributes.contentheader.addClass('panel-panel-inner') }}>
+              {{ content.contentheader }}
+            </div>
           </div>
         </div>
         <div class="row">
           <div class="col-md-6 radix-layouts-contentcolumn1 panel-panel">
-            {{ content.contentcolumn1 }}
+            <div {{ region_attributes.contentheader.addClass('panel-panel-inner') }}>
+                {{ content.contentcolumn1 }}
+            </div>
           </div>
           <div class="col-md-6 radix-layouts-contentcolumn2 panel-panel">
-            {{ content.contentcolumn2 }}
+            <div {{ region_attributes.contentheader.addClass('panel-panel-inner') }}>
+                {{ content.contentcolumn2 }}
+            </div>
           </div>
         </div>
         <div class="row">
           <div class="col-md-12 radix-layouts-contentfooter panel-panel">
-            {{ content.contentfooter }}
+            <div {{ region_attributes.contentheader.addClass('panel-panel-inner') }}>
+                {{ content.contentfooter }}
+            </div>
           </div>
         </div>
       </div>
       <div class="col-md-4 radix-layouts-sidebar panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.sidebar.addClass('panel-panel-inner') }}>
           {{ content.sidebar }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_sutro/radix-sutro.html.twig b/plugins/layouts/radix_sutro/radix-sutro.html.twig
index 0742f6a..2cc480d 100755
--- a/plugins/layouts/radix_sutro/radix-sutro.html.twig
+++ b/plugins/layouts/radix_sutro/radix-sutro.html.twig
@@ -9,13 +9,26 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'sutro',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display sutro clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-12 radix-layouts-header panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.header.addClass('panel-panel-inner') }}>
           {{ content.header }}
         </div>
       </div>
@@ -23,12 +36,12 @@
     
     <div class="row">
       <div class="col-md-6 radix-layouts-column1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column1.addClass('panel-panel-inner') }}>
           {{ content.column1 }}
         </div>
       </div>
       <div class="col-md-6 radix-layouts-column2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column2.addClass('panel-panel-inner') }}>
           {{ content.column2 }}
         </div>
       </div>
@@ -36,7 +49,7 @@
     
     <div class="row">
       <div class="col-md-12 radix-layouts-footer panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.footer.addClass('panel-panel-inner') }}>
           {{ content.footer }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_sutro_double/radix-sutro-double.html.twig b/plugins/layouts/radix_sutro_double/radix-sutro-double.html.twig
index bacfd2d..140c529 100644
--- a/plugins/layouts/radix_sutro_double/radix-sutro-double.html.twig
+++ b/plugins/layouts/radix_sutro_double/radix-sutro-double.html.twig
@@ -9,13 +9,26 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'sutro-double',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display sutro-double clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-12 radix-layouts-header panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.header.addClass('panel-panel-inner') }}>
           {{ content.header }}
         </div>
       </div>
@@ -23,12 +36,12 @@
 
     <div class="row">
       <div class="col-md-6 radix-layouts-column1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column1.addClass('panel-panel-inner') }}>
           {{ content.column1 }}
         </div>
       </div>
       <div class="col-md-6 radix-layouts-column2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.column2.addClass('panel-panel-inner') }}>
           {{ content.column2 }}
         </div>
       </div>
@@ -36,7 +49,7 @@
 
     <div class="row">
       <div class="col-md-12 radix-layouts-middle panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.middle.addClass('panel-panel-inner') }}>
           {{ content.middle }}
         </div>
       </div>
@@ -44,12 +57,12 @@
 
     <div class="row">
       <div class="col-md-6 radix-layouts-secondcolumn1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.secondcolumn1.addClass('panel-panel-inner') }}>
           {{ content.secondcolumn1 }}
         </div>
       </div>
       <div class="col-md-6 radix-layouts-secondcolumn2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.secondcolumn2.addClass('panel-panel-inner') }}>
           {{ content.secondcolumn2 }}
         </div>
       </div>
@@ -57,7 +70,7 @@
 
     <div class="row">
       <div class="col-md-12 radix-layouts-footer panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.footer.addClass('panel-panel-inner') }}>
           {{ content.footer }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_taylor/radix-taylor.html.twig b/plugins/layouts/radix_taylor/radix-taylor.html.twig
index 9d6932e..5c5cfa3 100755
--- a/plugins/layouts/radix_taylor/radix-taylor.html.twig
+++ b/plugins/layouts/radix_taylor/radix-taylor.html.twig
@@ -9,13 +9,26 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'taylor',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display taylor clearfix {% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-12 radix-layouts-header panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.header.addClass('panel-panel-inner') }}>
           {{ content.header }}
         </div>
       </div>
@@ -23,17 +36,17 @@
 
     <div class="row">
       <div class="col-md-6 radix-layouts-half panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.half.addClass('panel-panel-inner') }}>
           {{ content.half }}
         </div>
       </div>
       <div class="col-md-3 radix-layouts-quarter1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.quarter1.addClass('panel-panel-inner') }}>
           {{ content.quarter1 }}
         </div>
       </div>
       <div class="col-md-3 radix-layouts-quarter2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.quarter2.addClass('panel-panel-inner') }}>
           {{ content.quarter2 }}
         </div>
       </div>
@@ -41,7 +54,7 @@
     
     <div class="row">
       <div class="col-md-12 radix-layouts-footer panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.footer.addClass('panel-panel-inner') }}>
           {{ content.footer }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_taylor_flipped/radix-taylor-flipped.html.twig b/plugins/layouts/radix_taylor_flipped/radix-taylor-flipped.html.twig
index c37b15d..37c2336 100755
--- a/plugins/layouts/radix_taylor_flipped/radix-taylor-flipped.html.twig
+++ b/plugins/layouts/radix_taylor_flipped/radix-taylor-flipped.html.twig
@@ -9,14 +9,27 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'taylor-flipped',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display taylor-flipped clearfix {% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     {% if content.header %}
       <div class="row">
         <div class="col-md-12 radix-layouts-header panel-panel">
-          <div class="panel-panel-inner">
+          <div {{ region_attributes.header.addClass('panel-panel-inner') }}>
             {{ content.header }}
           </div>
         </div>
@@ -25,17 +38,17 @@
 
     <div class="row">
       <div class="col-md-3 radix-layouts-quarter1 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.quarter1.addClass('panel-panel-inner') }}>
           {{ content.quarter1 }}
         </div>
       </div>
       <div class="col-md-3 radix-layouts-quarter2 panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.quarter2.addClass('panel-panel-inner') }}>
           {{ content.quarter2 }}
         </div>
       </div>
       <div class="col-md-6 radix-layouts-half panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.half.addClass('panel-panel-inner') }}>
           {{ content.half }}
         </div>
       </div>
@@ -44,7 +57,7 @@
     {% if content.footer %}
       <div class="row">
         <div class="col-md-12 radix-layouts-footer panel-panel">
-          <div class="panel-panel-inner">
+          <div {{ region_attributes.footer.addClass('panel-panel-inner') }}>
             {{ content.footer }}
           </div>
         </div>
diff --git a/plugins/layouts/radix_webb/radix-webb.html.twig b/plugins/layouts/radix_webb/radix-webb.html.twig
index d842f61..419bf4d 100755
--- a/plugins/layouts/radix_webb/radix-webb.html.twig
+++ b/plugins/layouts/radix_webb/radix-webb.html.twig
@@ -9,13 +9,26 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'webb',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display webb clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-12 radix-layouts-header panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.header.addClass('panel-panel-inner') }}>
           {{ content.header }}
         </div>
       </div>
@@ -23,26 +36,26 @@
 
     <div class="row">
       <div class="col-md-4 radix-layouts-sidebar panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.sidebar.addClass('panel-panel-inner') }}>
           {{ content.sidebar }}
         </div>
       </div>
       <div class="col-md-8 panel-panel">
         <div class="row">
           <div class="col-md-12 radix-layouts-contentheader panel-panel">
-            <div class="panel-panel-inner">
+            <div {{ region_attributes.contentheader.addClass('panel-panel-inner') }}>
               {{ content.contentheader }}
             </div>
           </div>
         </div>
         <div class="row">
           <div class="col-md-6 radix-layouts-contentcolumn1 panel-panel">
-            <div class="panel-panel-inner">
+            <div {{ region_attributes.contentcolumn1.addClass('panel-panel-inner') }}>
               {{ content.contentcolumn1 }}
             </div>
           </div>
           <div class="col-md-6 radix-layouts-contentcolumn2 panel-panel">
-            <div class="panel-panel-inner">
+            <div {{ region_attributes.contentcolumn2.addClass('panel-panel-inner') }}>
               {{ content.contentcolumn2 }}
             </div>
           </div>
diff --git a/plugins/layouts/radix_webb_flipped/radix-webb-flipped.html.twig b/plugins/layouts/radix_webb_flipped/radix-webb-flipped.html.twig
index a028232..893df87 100755
--- a/plugins/layouts/radix_webb_flipped/radix-webb-flipped.html.twig
+++ b/plugins/layouts/radix_webb_flipped/radix-webb-flipped.html.twig
@@ -9,13 +9,26 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'webb-flipped',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display webb-flipped clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-12 radix-layouts-header panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.header.addClass('panel-panel-inner') }}>
           {{ content.header }}
         </div>
       </div>
@@ -25,26 +38,26 @@
       <div class="col-md-8 panel-panel">
         <div class="row">
           <div class="col-md-12 radix-layouts-contentheader panel-panel">
-            <div class="panel-panel-inner">
+            <div {{ region_attributes.contentheader.addClass('panel-panel-inner') }}>
               {{ content.contentheader }}
             </div>
           </div>
         </div>
         <div class="row">
           <div class="col-md-6 radix-layouts-contentcolumn1 panel-panel">
-            <div class="panel-panel-inner">
+            <div {{ region_attributes.contentcolumn1.addClass('panel-panel-inner') }}>
               {{ content.contentcolumn1 }}
             </div>
           </div>
           <div class="col-md-6 radix-layouts-contentcolumn2 panel-panel">
-            <div class="panel-panel-inner">
+            <div {{ region_attributes.contentcolumn2.addClass('panel-panel-inner') }}>
               {{ content.contentcolumn2 }}
             </div>
           </div>
         </div>
       </div>
       <div class="col-md-4 radix-layouts-sidebar panel-panel">
-        <div class="panel-panel-inner">
+        <div {{ region_attributes.sidebar.addClass('panel-panel-inner') }}>
           {{ content.sidebar }}
         </div>
       </div>
diff --git a/plugins/layouts/radix_whelan/radix-whelan.html.twig b/plugins/layouts/radix_whelan/radix-whelan.html.twig
index 3be0178..43401f8 100755
--- a/plugins/layouts/radix_whelan/radix-whelan.html.twig
+++ b/plugins/layouts/radix_whelan/radix-whelan.html.twig
@@ -9,23 +9,36 @@
  * panel of the layout. This layout supports the following sections:
  */
 #}
+{%
+    set container_classes = [
+    'panel-display',
+    'whelan',
+    'clearfix'
+]
+%}
+{% if classes %}
+    {% set container_classes = container_classes|merge(classes) %}
+{% endif %}
+{% if class %}
+    {% set container_classes = container_classes|merge(class) %}
+{% endif %}
 
-<div class="panel-display whelan clearfix {% if classes %}{{ classes }}{% endif %}{% if class %}{{ class }}{% endif %}" {% if css_id %}{{ css_id }}{% endif %}>
+<div {{ attributes.addClass(container_classes) }}{% if css_id %}{{ css_id }}{% endif %}>
 
 <div class="container-fluid">
   <div class="row">
     <div class="col-md-3 radix-layouts-column1 panel-panel">
-      <div class="panel-panel-inner">
+      <div {{ region_attributes.column1.addClass('panel-panel-inner') }}>
         {{ content.column1 }}
       </div>
     </div>
     <div class="col-md-6 radix-layouts-content panel-panel">
-      <div class="panel-panel-inner">
+      <div {{ region_attributes.contentmain.addClass('panel-panel-inner') }}>
         {{ content.contentmain }}
       </div>
     </div>
     <div class="col-md-3 radix-layouts-column2 panel-panel">
-      <div class="panel-panel-inner">
+      <div {{ region_attributes.column2.addClass('panel-panel-inner') }}>
         {{ content.column2 }}
       </div>
     </div>