From eaa5eb68ea54b840c93b9a3fb21efade8c4b5706 Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Thu, 24 Sep 2015 18:54:39 -0400
Subject: [PATCH] daily build 2

---
 .../ocio_landing_page/ocio_landing_page.info  |   1 +
 .../ocio_landing_page.strongarm.inc           |  58 +++++-
 ...s_settings.features.features_overrides.inc | 195 +++++++++++++++---
 .../ocio_panels_settings.features.inc         | 195 +++++++++++++++---
 .../ocio_panels_settings.info                 |  28 +--
 .../ocio_panels_settings.strongarm.inc        | 108 +++++-----
 .../ocio-default/ocio-default.layout.css      |   6 +-
 .../ocio-default.layout.no-query.css          |   6 +-
 .../css/ocio-omega-base.no-query.css          |   8 +-
 .../css/ocio-omega-base.styles.css            |   8 +-
 .../ocio_omega_base/sass/base/_forms.scss     |  10 +-
 .../sass/components/_search.scss              |   2 +
 .../ocio_seven/css/ocio_seven-node_forms.css  |   2 +-
 13 files changed, 483 insertions(+), 144 deletions(-)

diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.info b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.info
index fe7c3796..707cb891 100644
--- a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.info
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.info
@@ -20,6 +20,7 @@ dependencies[] = ocio_field_bases
 dependencies[] = options
 dependencies[] = panelizer
 dependencies[] = strongarm
+dependencies[] = text
 dependencies[] = uuid_features
 features[conditional_fields][] = node:ocio_landing_page
 features[context][] = landing-page-layout
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.strongarm.inc b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.strongarm.inc
index c00306c6..591a3c3a 100644
--- a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.strongarm.inc
@@ -209,14 +209,14 @@ function ocio_landing_page_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'panelizer_node:ocio_landing_page_allowed_layouts';
-  $strongarm->value = 'O:22:"panels_allowed_layouts":4:{s:9:"allow_new";b:1;s:11:"module_name";s:32:"panelizer_node:ocio_landing_page";s:23:"allowed_layout_settings";a:87:{s:15:"omega:ocio-full";b:0;s:18:"omega:ocio-default";b:0;s:10:"omega:hero";b:0;s:12:"omega:simple";b:0;s:16:"omega:off-canvas";b:0;s:12:"omega:divine";b:0;s:8:"flexible";b:0;s:14:"twocol_stacked";b:0;s:13:"twocol_bricks";b:0;s:6:"twocol";b:0;s:25:"threecol_33_34_33_stacked";b:0;s:17:"threecol_33_34_33";b:0;s:25:"threecol_25_50_25_stacked";b:0;s:17:"threecol_25_50_25";b:0;s:6:"onecol";b:0;s:6:"whelan";b:0;s:12:"webb_flipped";b:0;s:4:"webb";b:0;s:14:"taylor_flipped";b:0;s:6:"taylor";b:0;s:12:"sutro_double";b:0;s:5:"sutro";b:0;s:13:"selby_flipped";b:0;s:5:"selby";b:0;s:17:"sanderson_flipped";b:0;s:9:"sanderson";b:0;s:5:"rolph";b:0;s:4:"pond";b:0;s:6:"phelan";b:0;s:15:"moscone_flipped";b:0;s:7:"moscone";b:0;s:8:"mccoppin";b:0;s:15:"hewston_flipped";b:0;s:7:"hewston";b:0;s:6:"harris";b:0;s:5:"geary";b:0;s:12:"burr_flipped";b:0;s:4:"burr";b:0;s:22:"bryant_flipped_flipped";b:0;s:6:"bryant";b:0;s:5:"brown";b:0;s:15:"brenham_flipped";b:0;s:7:"brenham";b:0;s:6:"boxton";b:0;s:16:"bartlett_flipped";b:0;s:8:"bartlett";b:0;s:5:"naked";b:0;s:8:"mondrian";b:0;s:6:"grid-3";b:0;s:6:"grid-2";b:0;s:6:"golden";b:0;s:19:"ocio-omega-equalcol";b:1;s:19:"ocio-omega-threecol";b:1;s:25:"ocio-omega-twocol-flipped";b:1;s:17:"ocio-omega-twocol";b:1;s:12:"omega:ocio-3";b:0;s:12:"radix_whelan";b:0;s:18:"radix_webb_flipped";b:0;s:10:"radix_webb";b:0;s:20:"radix_taylor_flipped";b:0;s:12:"radix_taylor";b:0;s:18:"radix_sutro_double";b:0;s:11:"radix_sutro";b:0;s:19:"radix_selby_flipped";b:0;s:11:"radix_selby";b:0;s:23:"radix_sanderson_flipped";b:0;s:15:"radix_sanderson";b:0;s:11:"radix_rolph";b:0;s:10:"radix_pond";b:0;s:12:"radix_phelan";b:0;s:21:"radix_moscone_flipped";b:0;s:13:"radix_moscone";b:0;s:14:"radix_mccoppin";b:0;s:21:"radix_hewston_flipped";b:0;s:13:"radix_hewston";b:0;s:12:"radix_harris";b:0;s:11:"radix_geary";b:0;s:18:"radix_burr_flipped";b:0;s:10:"radix_burr";b:0;s:20:"radix_bryant_flipped";b:0;s:12:"radix_bryant";b:0;s:11:"radix_brown";b:0;s:21:"radix_brenham_flipped";b:0;s:13:"radix_brenham";b:0;s:12:"radix_boxton";b:0;s:22:"radix_bartlett_flipped";b:0;s:14:"radix_bartlett";b:0;}s:10:"form_state";N;}';
+  $strongarm->value = 'O:22:"panels_allowed_layouts":4:{s:9:"allow_new";b:1;s:11:"module_name";s:32:"panelizer_node:ocio_landing_page";s:23:"allowed_layout_settings";a:92:{s:15:"omega:ocio-full";b:0;s:18:"omega:ocio-default";b:0;s:10:"omega:hero";b:0;s:12:"omega:simple";b:0;s:16:"omega:off-canvas";b:0;s:12:"omega:divine";b:0;s:8:"flexible";b:0;s:14:"twocol_stacked";b:0;s:13:"twocol_bricks";b:0;s:6:"twocol";b:0;s:25:"threecol_33_34_33_stacked";b:0;s:17:"threecol_33_34_33";b:0;s:25:"threecol_25_50_25_stacked";b:0;s:17:"threecol_25_50_25";b:0;s:6:"onecol";b:0;s:6:"whelan";b:0;s:12:"webb_flipped";b:0;s:4:"webb";b:0;s:14:"taylor_flipped";b:0;s:6:"taylor";b:0;s:12:"sutro_double";b:0;s:5:"sutro";b:0;s:13:"selby_flipped";b:0;s:5:"selby";b:0;s:17:"sanderson_flipped";b:0;s:9:"sanderson";b:0;s:5:"rolph";b:0;s:4:"pond";b:0;s:6:"phelan";b:0;s:15:"moscone_flipped";b:0;s:7:"moscone";b:0;s:8:"mccoppin";b:0;s:15:"hewston_flipped";b:0;s:7:"hewston";b:0;s:6:"harris";b:0;s:5:"geary";b:0;s:12:"burr_flipped";b:0;s:4:"burr";b:0;s:22:"bryant_flipped_flipped";b:0;s:6:"bryant";b:0;s:5:"brown";b:0;s:15:"brenham_flipped";b:0;s:7:"brenham";b:0;s:6:"boxton";b:0;s:16:"bartlett_flipped";b:0;s:8:"bartlett";b:0;s:5:"naked";b:0;s:8:"mondrian";b:0;s:6:"grid-3";b:0;s:6:"grid-2";b:0;s:6:"golden";b:0;s:12:"omega:ocio-3";b:0;s:12:"radix_whelan";b:0;s:18:"radix_webb_flipped";b:0;s:10:"radix_webb";b:0;s:20:"radix_taylor_flipped";b:0;s:12:"radix_taylor";b:0;s:18:"radix_sutro_double";b:0;s:11:"radix_sutro";b:0;s:19:"radix_selby_flipped";b:0;s:11:"radix_selby";b:0;s:23:"radix_sanderson_flipped";b:0;s:15:"radix_sanderson";b:0;s:11:"radix_rolph";b:0;s:10:"radix_pond";b:0;s:12:"radix_phelan";b:0;s:21:"radix_moscone_flipped";b:0;s:13:"radix_moscone";b:0;s:14:"radix_mccoppin";b:0;s:21:"radix_hewston_flipped";b:0;s:13:"radix_hewston";b:0;s:12:"radix_harris";b:0;s:11:"radix_geary";b:0;s:18:"radix_burr_flipped";b:0;s:10:"radix_burr";b:0;s:20:"radix_bryant_flipped";b:0;s:12:"radix_bryant";b:0;s:11:"radix_brown";b:0;s:21:"radix_brenham_flipped";b:0;s:13:"radix_brenham";b:0;s:12:"radix_boxton";b:0;s:22:"radix_bartlett_flipped";b:0;s:14:"radix_bartlett";b:0;s:12:"omega:ocio-2";b:0;s:12:"omega:ocio-4";b:0;s:31:"ocio-omega-tiles-twocol-flipped";b:1;s:23:"ocio-omega-tiles-twocol";b:1;s:25:"ocio-omega-tiles-equalcol";b:1;s:20:"ocio-omega-fourtiles";b:1;s:20:"ocio-omega-flip-flop";b:1;s:14:"ocio-omega-dps";b:1;s:14:"ocio-omega-alx";b:1;}s:10:"form_state";N;}';
   $export['panelizer_node:ocio_landing_page_allowed_layouts'] = $strongarm;
 
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'panelizer_node:ocio_landing_page_allowed_layouts_default';
-  $strongarm->value = 1;
+  $strongarm->value = 0;
   $export['panelizer_node:ocio_landing_page_allowed_layouts_default'] = $strongarm;
 
   $strongarm = new stdClass();
@@ -272,6 +272,7 @@ function ocio_landing_page_strongarm() {
     'comment_links-comment_links' => 0,
     'file_content-file_content' => 0,
     'file_display-file_display' => 0,
+    'mm_widgets_live_pane-mm_widgets_live_pane' => 0,
     'content-content' => 0,
     'general_panes-general_panes' => 0,
     'general_widgets-general_widgets' => 0,
@@ -437,16 +438,26 @@ function ocio_landing_page_strongarm() {
     'token-menu:menu-link-count' => 'token-menu:menu-link-count',
     'token-menu:edit-url' => 'token-menu:edit-url',
     'token-node:book' => 0,
+    'token-node:field_admin_lock' => 0,
     'token-node:field_answer' => 0,
     'token-node:field_date' => 0,
+    'token-node:field_disable_breadcrumbs' => 0,
+    'token-node:field_disable_title' => 0,
     'token-node:field_ocio_link' => 0,
     'token-node:field_basic_image_image' => 0,
     'token-node:field_featured_summary' => 0,
+    'token-node:field_alternate_panel_rows' => 0,
+    'token-node:field_banner_image' => 0,
+    'token-node:field_banner_image_text' => 0,
+    'token-node:field_banner_image_text_color' => 0,
+    'token-node:field_banner_image_text_location' => 0,
+    'token-node:field_pre_footer_banner_image' => 0,
     'token-node:field_featured_image' => 0,
+    'token-node:field_display_in_view_panes' => 0,
     'token-file:field_file_description' => 0,
     'token-file:field_basic_image_caption' => 0,
     'token-user:name-raw' => 0,
-    'token-user:field_display_in_directory' => 0,
+    'token-user:field_display_on_contact_page' => 0,
     'token-user:field_display_in_leadership_list' => 0,
     'token-user:field_bio' => 0,
     'token-user:field_first_name' => 0,
@@ -460,8 +471,11 @@ function ocio_landing_page_strongarm() {
     'token-submission:completed_date' => 0,
     'token-submission:modified_date' => 0,
     'token-submission:edit-url' => 0,
+    'entity_form_field-fieldable_panels_pane:field_background_color' => 0,
     'entity_form_field-fieldable_panels_pane:field_tile_background_img' => 0,
     'entity_form_field-fieldable_panels_pane:field_tile_link' => 0,
+    'entity_form_field-fieldable_panels_pane:field_background_color_2' => 0,
+    'entity_form_field-fieldable_panels_pane:field_tile_image_style' => 0,
     'entity_form_field-fieldable_panels_pane:field_tile_text_area' => 0,
     'entity_form_field-fieldable_panels_pane:field_quick_links_links' => 0,
     'entity_form_field-fieldable_panels_pane:field_basic_file_file' => 0,
@@ -482,14 +496,24 @@ function ocio_landing_page_strongarm() {
     'entity_form_field-node:field_basic_image_image' => 0,
     'entity_form_field-node:field_featured_summary' => 0,
     'entity_form_field-node:field_ocio_link' => 0,
+    'entity_form_field-node:field_admin_lock' => 0,
+    'entity_form_field-node:field_alternate_panel_rows' => 0,
+    'entity_form_field-node:field_banner_image' => 0,
+    'entity_form_field-node:field_banner_image_text' => 0,
+    'entity_form_field-node:field_banner_image_text_color' => 0,
+    'entity_form_field-node:field_banner_image_text_location' => 0,
+    'entity_form_field-node:field_disable_breadcrumbs' => 0,
+    'entity_form_field-node:field_disable_title' => 0,
+    'entity_form_field-node:field_pre_footer_banner_image' => 0,
     'entity_form_field-node:field_tags' => 0,
+    'entity_form_field-node:field_display_in_view_panes' => 0,
     'entity_form_field-node:field_featured_image' => 0,
     'entity_form_field-file:field_file_image_alt_text' => 0,
     'entity_form_field-file:field_file_image_title_text' => 0,
     'entity_form_field-file:field_basic_image_caption' => 0,
     'entity_form_field-file:field_file_description' => 0,
     'entity_form_field-taxonomy_term:field_featured_image' => 0,
-    'entity_form_field-user:field_display_in_directory' => 0,
+    'entity_form_field-user:field_display_on_contact_page' => 0,
     'entity_form_field-user:field_display_in_leadership_list' => 0,
     'entity_form_field-user:field_bio' => 0,
     'entity_form_field-user:field_first_name' => 0,
@@ -499,8 +523,11 @@ function ocio_landing_page_strongarm() {
     'entity_form_field-user:field_room_and_building' => 0,
     'entity_form_field-user:field_street_address' => 0,
     'entity_form_field-user:field_user_photo' => 0,
+    'entity_field-fieldable_panels_pane:field_background_color' => 0,
     'entity_field-fieldable_panels_pane:field_tile_background_img' => 0,
     'entity_field-fieldable_panels_pane:field_tile_link' => 0,
+    'entity_field-fieldable_panels_pane:field_background_color_2' => 0,
+    'entity_field-fieldable_panels_pane:field_tile_image_style' => 0,
     'entity_field-fieldable_panels_pane:field_tile_text_area' => 0,
     'entity_field-fieldable_panels_pane:field_quick_links_links' => 0,
     'entity_field-fieldable_panels_pane:field_basic_file_file' => 0,
@@ -521,14 +548,24 @@ function ocio_landing_page_strongarm() {
     'entity_field-node:field_basic_image_image' => 0,
     'entity_field-node:field_featured_summary' => 0,
     'entity_field-node:field_ocio_link' => 0,
+    'entity_field-node:field_admin_lock' => 0,
+    'entity_field-node:field_alternate_panel_rows' => 0,
+    'entity_field-node:field_banner_image' => 0,
+    'entity_field-node:field_banner_image_text' => 0,
+    'entity_field-node:field_banner_image_text_color' => 0,
+    'entity_field-node:field_banner_image_text_location' => 0,
+    'entity_field-node:field_disable_breadcrumbs' => 0,
+    'entity_field-node:field_disable_title' => 0,
+    'entity_field-node:field_pre_footer_banner_image' => 0,
     'entity_field-node:field_tags' => 0,
+    'entity_field-node:field_display_in_view_panes' => 0,
     'entity_field-node:field_featured_image' => 0,
     'entity_field-file:field_file_image_alt_text' => 0,
     'entity_field-file:field_file_image_title_text' => 0,
     'entity_field-file:field_basic_image_caption' => 0,
     'entity_field-file:field_file_description' => 0,
     'entity_field-taxonomy_term:field_featured_image' => 0,
-    'entity_field-user:field_display_in_directory' => 0,
+    'entity_field-user:field_display_on_contact_page' => 0,
     'entity_field-user:field_display_in_leadership_list' => 0,
     'entity_field-user:field_bio' => 0,
     'entity_field-user:field_first_name' => 0,
@@ -544,9 +581,6 @@ function ocio_landing_page_strongarm() {
     'entity_field_extra-taxonomy_term:description' => 'entity_field_extra-taxonomy_term:description',
     'entity_field_extra-user:summary' => 0,
     'custom-custom' => 0,
-    'block-aggregator-category-1' => 0,
-    'block-aggregator-feed-1' => 0,
-    'block-aggregator-feed-2' => 0,
     'block-apachesolr_search-mlt-001' => 0,
     'block-apachesolr_search-sort' => 0,
     'block-calendar-calendar_legend' => 0,
@@ -554,6 +588,7 @@ function ocio_landing_page_strongarm() {
     'block-context_ui-devel' => 0,
     'block-menu-devel' => 0,
     'block-menu_block-custom-1' => 0,
+    'block-mm_widgets-mm_items' => 0,
     'block-node-syndicate' => 0,
     'block-node-recent' => 0,
     'block-search-form' => 0,
@@ -573,6 +608,8 @@ function ocio_landing_page_strongarm() {
     'block-user-new' => 0,
     'block-user-online' => 0,
     'block-workbench-block' => 0,
+    'block-ds_extras-ds_hero' => 0,
+    'block-ds_extras-ds_footer' => 0,
     'block-devel-execute_php' => 0,
     'block-devel-switch_user' => 0,
     'entity_view-file' => 'entity_view-file',
@@ -607,9 +644,12 @@ function ocio_landing_page_strongarm() {
     'views_panes-ocio_news_archive-titles_pane' => 'views_panes-ocio_news_archive-titles_pane',
     'views_panes-ocio_news_archive-teasers_pane' => 'views_panes-ocio_news_archive-teasers_pane',
     'views_panes-ocio_twitter-panel_pane_1' => 'views_panes-ocio_twitter-panel_pane_1',
+    'views_panes-leadership_listing-panel_pane_1' => 0,
+    'views_panes-ocio_news_archive-trio_pane' => 0,
     'views_panes-panopoly_taxonomy-taxonomy_content' => 0,
     'views_panes-panopoly_widgets_general_content-list_of_content' => 0,
     'views_panes-panopoly_widgets_general_content-piece_of_content' => 0,
+    'views_panes-user_contact-panel_pane_1' => 0,
   );
   $export['panelizer_node:ocio_landing_page_allowed_types'] = $strongarm;
 
@@ -617,7 +657,7 @@ function ocio_landing_page_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'panelizer_node:ocio_landing_page_allowed_types_default';
-  $strongarm->value = 1;
+  $strongarm->value = 0;
   $export['panelizer_node:ocio_landing_page_allowed_types_default'] = $strongarm;
 
   $strongarm = new stdClass();
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.features_overrides.inc b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.features_overrides.inc
index 83228f8d..2aad9b0e 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.features_overrides.inc
+++ b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.features_overrides.inc
@@ -40,19 +40,41 @@ function ocio_panels_settings_features_override_default_overrides() {
   $overrides["field_instance.fieldable_panels_pane-image-field_basic_image_image.widget|type"] = 'media_generic';
 
   // Exported overrides for: page_manager_handlers
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-1c073329-7f76-4b25-bdb5-ed6681a78019"] = (object) array(
-      'pid' => 'new-1c073329-7f76-4b25-bdb5-ed6681a78019',
-      'panel' => 'contentmain',
-      'type' => 'entity_form_field',
-      'subtype' => 'node:field_tags',
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-08dde41f-c835-4e3a-b0ef-28191ff0275d"] = (object) array(
+      'pid' => 'new-08dde41f-c835-4e3a-b0ef-28191ff0275d',
+      'panel' => 'sidebar',
+      'type' => 'node_form_author',
+      'subtype' => 'node_form_author',
       'shown' => TRUE,
       'access' => array(),
       'configuration' => array(
-        'label' => '',
-        'formatter' => '',
         'context' => 'argument_node_edit_1',
         'override_title' => 0,
         'override_title_text' => '',
+        'override_title_heading' => 'h2',
+      ),
+      'cache' => array(),
+      'style' => array(
+        'settings' => NULL,
+      ),
+      'css' => array(),
+      'extras' => array(),
+      'position' => 3,
+      'locks' => array(),
+      'uuid' => '08dde41f-c835-4e3a-b0ef-28191ff0275d',
+    );
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-13dff848-cce9-4135-9dcc-dab92cb83895"] = (object) array(
+      'pid' => 'new-13dff848-cce9-4135-9dcc-dab92cb83895',
+      'panel' => 'sidebar',
+      'type' => 'node_form_buttons',
+      'subtype' => 'node_form_buttons',
+      'shown' => TRUE,
+      'access' => array(),
+      'configuration' => array(
+        'context' => 'argument_node_edit_1',
+        'override_title' => 1,
+        'override_title_text' => '',
+        'override_title_heading' => 'h2',
       ),
       'cache' => array(),
       'style' => array(
@@ -62,13 +84,11 @@ function ocio_panels_settings_features_override_default_overrides() {
       'extras' => array(),
       'position' => 4,
       'locks' => array(),
-      'uuid' => '1c073329-7f76-4b25-bdb5-ed6681a78019',
+      'uuid' => '13dff848-cce9-4135-9dcc-dab92cb83895',
     );
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd|panel"] = 'contentmain';
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd|position"] = 3;
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-51126c95-cf51-4ad6-a27a-11e4260d8023|position"] = 0;
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-565b11a0-d67b-4d9f-843f-908988b830dd"] = (object) array(
-      'pid' => 'new-565b11a0-d67b-4d9f-843f-908988b830dd',
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd"]["DELETED"] = TRUE;
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-3dbe9a87-780b-4039-bb07-723f5c8bca58"] = (object) array(
+      'pid' => 'new-3dbe9a87-780b-4039-bb07-723f5c8bca58',
       'panel' => 'sidebar',
       'type' => 'node_form_log',
       'subtype' => 'node_form_log',
@@ -78,6 +98,82 @@ function ocio_panels_settings_features_override_default_overrides() {
         'context' => 'argument_node_edit_1',
         'override_title' => 1,
         'override_title_text' => '',
+        'override_title_heading' => 'h2',
+      ),
+      'cache' => array(),
+      'style' => array(
+        'settings' => NULL,
+      ),
+      'css' => array(),
+      'extras' => array(),
+      'position' => 5,
+      'locks' => array(),
+      'uuid' => '3dbe9a87-780b-4039-bb07-723f5c8bca58',
+    );
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-51126c95-cf51-4ad6-a27a-11e4260d8023"]["DELETED"] = TRUE;
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-5d180289-633a-4162-b192-a1314cce1e4c"] = (object) array(
+      'pid' => 'new-5d180289-633a-4162-b192-a1314cce1e4c',
+      'panel' => 'sidebar',
+      'type' => 'node_form_publishing',
+      'subtype' => 'node_form_publishing',
+      'shown' => TRUE,
+      'access' => array(),
+      'configuration' => array(
+        'context' => 'argument_node_edit_1',
+        'override_title' => 0,
+        'override_title_text' => '',
+        'override_title_heading' => 'h2',
+      ),
+      'cache' => array(),
+      'style' => array(
+        'settings' => NULL,
+      ),
+      'css' => array(),
+      'extras' => array(),
+      'position' => 2,
+      'locks' => array(),
+      'uuid' => '5d180289-633a-4162-b192-a1314cce1e4c',
+    );
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-6e4a98d8-3738-41b9-8c33-4b4c905c6834"]["DELETED"] = TRUE;
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-71e8c64f-55c3-40b6-ab0d-a93547057e44"] = (object) array(
+      'pid' => 'new-71e8c64f-55c3-40b6-ab0d-a93547057e44',
+      'panel' => 'sidebar',
+      'type' => 'node_form_menu',
+      'subtype' => 'node_form_menu',
+      'shown' => TRUE,
+      'access' => array(),
+      'configuration' => array(
+        'context' => 'argument_node_edit_1',
+        'override_title' => 0,
+        'override_title_text' => '',
+        'override_title_heading' => 'h2',
+      ),
+      'cache' => array(),
+      'style' => array(
+        'settings' => NULL,
+      ),
+      'css' => array(),
+      'extras' => array(),
+      'position' => 0,
+      'locks' => array(),
+      'uuid' => '71e8c64f-55c3-40b6-ab0d-a93547057e44',
+    );
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-9176b962-e64f-44a6-8ebe-e03ebf0f6c3d"]["DELETED"] = TRUE;
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-99f6c0bd-36fd-411b-9833-c0be0fab7548"]["DELETED"] = TRUE;
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-9f9a4a74-598e-4f4e-b924-0e5a20ec6637"] = (object) array(
+      'pid' => 'new-9f9a4a74-598e-4f4e-b924-0e5a20ec6637',
+      'panel' => 'contentmain',
+      'type' => 'entity_form_field',
+      'subtype' => 'node:field_tags',
+      'shown' => TRUE,
+      'access' => array(),
+      'configuration' => array(
+        'label' => '',
+        'formatter' => '',
+        'context' => 'argument_node_edit_1',
+        'override_title' => 0,
+        'override_title_text' => '',
+        'override_title_heading' => 'h2',
       ),
       'cache' => array(),
       'style' => array(
@@ -87,27 +183,64 @@ function ocio_panels_settings_features_override_default_overrides() {
       'extras' => array(),
       'position' => 4,
       'locks' => array(),
-      'uuid' => '565b11a0-d67b-4d9f-843f-908988b830dd',
+      'uuid' => '9f9a4a74-598e-4f4e-b924-0e5a20ec6637',
+    );
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-c0926cca-059c-4bb1-bccd-2838ec7a93f2"]["DELETED"] = TRUE;
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-d5114956-1a65-4500-9616-d9e7a386974c"] = (object) array(
+      'pid' => 'new-d5114956-1a65-4500-9616-d9e7a386974c',
+      'panel' => 'contentmain',
+      'type' => 'entity_form_field',
+      'subtype' => 'node:field_featured_image',
+      'shown' => TRUE,
+      'access' => array(),
+      'configuration' => array(
+        'label' => '',
+        'formatter' => '',
+        'context' => 'argument_node_edit_1',
+        'override_title' => 1,
+        'override_title_text' => 'Featured Image',
+        'override_title_heading' => 'h2',
+      ),
+      'cache' => array(),
+      'style' => array(
+        'settings' => NULL,
+      ),
+      'css' => array(),
+      'extras' => array(),
+      'position' => 3,
+      'locks' => array(),
+      'uuid' => 'd5114956-1a65-4500-9616-d9e7a386974c',
+    );
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-da419228-f10f-48ea-9972-7398d723c22c"] = (object) array(
+      'pid' => 'new-da419228-f10f-48ea-9972-7398d723c22c',
+      'panel' => 'sidebar',
+      'type' => 'panelizer_form_default',
+      'subtype' => 'panelizer_form_default',
+      'shown' => TRUE,
+      'access' => array(),
+      'configuration' => array(),
+      'cache' => array(),
+      'style' => array(
+        'settings' => NULL,
+      ),
+      'css' => array(),
+      'extras' => array(),
+      'position' => 1,
+      'locks' => array(),
+      'uuid' => 'da419228-f10f-48ea-9972-7398d723c22c',
     );
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-73569090-5f67-47b1-b6a5-634bc8104c2b|access|logic"] = 'or';
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-73569090-5f67-47b1-b6a5-634bc8104c2b|access|plugins"] = array();
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-9176b962-e64f-44a6-8ebe-e03ebf0f6c3d|position"] = 3;
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-99f6c0bd-36fd-411b-9833-c0be0fab7548|position"] = 1;
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c|access|logic"] = 'or';
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c|access|plugins"] = array();
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c|position"] = 2;
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|layout"] = 'ocio-omega-twocol-flipped';
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c"]["DELETED"] = TRUE;
   $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panel_settings|style_settings|footer"] = NULL;
   $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panel_settings|style_settings|header"] = NULL;
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|contentmain|3"] = 'new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd';
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|contentmain|4"] = 'new-1c073329-7f76-4b25-bdb5-ed6681a78019';
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|0"] = 'new-51126c95-cf51-4ad6-a27a-11e4260d8023';
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|1"] = 'new-99f6c0bd-36fd-411b-9833-c0be0fab7548';
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|2"] = 'new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c';
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|3"] = 'new-9176b962-e64f-44a6-8ebe-e03ebf0f6c3d';
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|4"] = 'new-6e4a98d8-3738-41b9-8c33-4b4c905c6834';
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|5"] = 'new-c0926cca-059c-4bb1-bccd-2838ec7a93f2';
-  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|6"] = 'new-565b11a0-d67b-4d9f-843f-908988b830dd';
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|contentmain|3"] = 'new-d5114956-1a65-4500-9616-d9e7a386974c';
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|contentmain|4"] = 'new-9f9a4a74-598e-4f4e-b924-0e5a20ec6637';
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|0"] = 'new-71e8c64f-55c3-40b6-ab0d-a93547057e44';
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|1"] = 'new-da419228-f10f-48ea-9972-7398d723c22c';
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|2"] = 'new-5d180289-633a-4162-b192-a1314cce1e4c';
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|3"] = 'new-08dde41f-c835-4e3a-b0ef-28191ff0275d';
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|4"] = 'new-13dff848-cce9-4135-9dcc-dab92cb83895';
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|5"] = 'new-3dbe9a87-780b-4039-bb07-723f5c8bca58';
+  $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|6"]["DELETED"] = TRUE;
   $overrides["page_manager_handlers.node_edit_panel_context.weight"] = -29;
 
  return $overrides;
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.inc b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.inc
index 93f0edff..b8e59a43 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.inc
+++ b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.inc
@@ -52,19 +52,41 @@ function ocio_panels_settings_field_default_field_instances_alter(&$data) {
  */
 function ocio_panels_settings_default_page_manager_handlers_alter(&$data) {
   if (isset($data['node_edit_panel_context'])) {
-    $data['node_edit_panel_context']->conf['display']->content['new-1c073329-7f76-4b25-bdb5-ed6681a78019'] = (object) array(
-          'pid' => 'new-1c073329-7f76-4b25-bdb5-ed6681a78019',
-          'panel' => 'contentmain',
-          'type' => 'entity_form_field',
-          'subtype' => 'node:field_tags',
+    $data['node_edit_panel_context']->conf['display']->content['new-08dde41f-c835-4e3a-b0ef-28191ff0275d'] = (object) array(
+          'pid' => 'new-08dde41f-c835-4e3a-b0ef-28191ff0275d',
+          'panel' => 'sidebar',
+          'type' => 'node_form_author',
+          'subtype' => 'node_form_author',
           'shown' => TRUE,
           'access' => array(),
           'configuration' => array(
-            'label' => '',
-            'formatter' => '',
             'context' => 'argument_node_edit_1',
             'override_title' => 0,
             'override_title_text' => '',
+            'override_title_heading' => 'h2',
+          ),
+          'cache' => array(),
+          'style' => array(
+            'settings' => NULL,
+          ),
+          'css' => array(),
+          'extras' => array(),
+          'position' => 3,
+          'locks' => array(),
+          'uuid' => '08dde41f-c835-4e3a-b0ef-28191ff0275d',
+        ); /* WAS: '' */
+    $data['node_edit_panel_context']->conf['display']->content['new-13dff848-cce9-4135-9dcc-dab92cb83895'] = (object) array(
+          'pid' => 'new-13dff848-cce9-4135-9dcc-dab92cb83895',
+          'panel' => 'sidebar',
+          'type' => 'node_form_buttons',
+          'subtype' => 'node_form_buttons',
+          'shown' => TRUE,
+          'access' => array(),
+          'configuration' => array(
+            'context' => 'argument_node_edit_1',
+            'override_title' => 1,
+            'override_title_text' => '',
+            'override_title_heading' => 'h2',
           ),
           'cache' => array(),
           'style' => array(
@@ -74,13 +96,10 @@ function ocio_panels_settings_default_page_manager_handlers_alter(&$data) {
           'extras' => array(),
           'position' => 4,
           'locks' => array(),
-          'uuid' => '1c073329-7f76-4b25-bdb5-ed6681a78019',
+          'uuid' => '13dff848-cce9-4135-9dcc-dab92cb83895',
         ); /* WAS: '' */
-    $data['node_edit_panel_context']->conf['display']->content['new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd']->panel = 'contentmain'; /* WAS: 'sidebar' */
-    $data['node_edit_panel_context']->conf['display']->content['new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd']->position = 3; /* WAS: 0 */
-    $data['node_edit_panel_context']->conf['display']->content['new-51126c95-cf51-4ad6-a27a-11e4260d8023']->position = 0; /* WAS: 1 */
-    $data['node_edit_panel_context']->conf['display']->content['new-565b11a0-d67b-4d9f-843f-908988b830dd'] = (object) array(
-          'pid' => 'new-565b11a0-d67b-4d9f-843f-908988b830dd',
+    $data['node_edit_panel_context']->conf['display']->content['new-3dbe9a87-780b-4039-bb07-723f5c8bca58'] = (object) array(
+          'pid' => 'new-3dbe9a87-780b-4039-bb07-723f5c8bca58',
           'panel' => 'sidebar',
           'type' => 'node_form_log',
           'subtype' => 'node_form_log',
@@ -90,6 +109,78 @@ function ocio_panels_settings_default_page_manager_handlers_alter(&$data) {
             'context' => 'argument_node_edit_1',
             'override_title' => 1,
             'override_title_text' => '',
+            'override_title_heading' => 'h2',
+          ),
+          'cache' => array(),
+          'style' => array(
+            'settings' => NULL,
+          ),
+          'css' => array(),
+          'extras' => array(),
+          'position' => 5,
+          'locks' => array(),
+          'uuid' => '3dbe9a87-780b-4039-bb07-723f5c8bca58',
+        ); /* WAS: '' */
+    $data['node_edit_panel_context']->conf['display']->content['new-5d180289-633a-4162-b192-a1314cce1e4c'] = (object) array(
+          'pid' => 'new-5d180289-633a-4162-b192-a1314cce1e4c',
+          'panel' => 'sidebar',
+          'type' => 'node_form_publishing',
+          'subtype' => 'node_form_publishing',
+          'shown' => TRUE,
+          'access' => array(),
+          'configuration' => array(
+            'context' => 'argument_node_edit_1',
+            'override_title' => 0,
+            'override_title_text' => '',
+            'override_title_heading' => 'h2',
+          ),
+          'cache' => array(),
+          'style' => array(
+            'settings' => NULL,
+          ),
+          'css' => array(),
+          'extras' => array(),
+          'position' => 2,
+          'locks' => array(),
+          'uuid' => '5d180289-633a-4162-b192-a1314cce1e4c',
+        ); /* WAS: '' */
+    $data['node_edit_panel_context']->conf['display']->content['new-71e8c64f-55c3-40b6-ab0d-a93547057e44'] = (object) array(
+          'pid' => 'new-71e8c64f-55c3-40b6-ab0d-a93547057e44',
+          'panel' => 'sidebar',
+          'type' => 'node_form_menu',
+          'subtype' => 'node_form_menu',
+          'shown' => TRUE,
+          'access' => array(),
+          'configuration' => array(
+            'context' => 'argument_node_edit_1',
+            'override_title' => 0,
+            'override_title_text' => '',
+            'override_title_heading' => 'h2',
+          ),
+          'cache' => array(),
+          'style' => array(
+            'settings' => NULL,
+          ),
+          'css' => array(),
+          'extras' => array(),
+          'position' => 0,
+          'locks' => array(),
+          'uuid' => '71e8c64f-55c3-40b6-ab0d-a93547057e44',
+        ); /* WAS: '' */
+    $data['node_edit_panel_context']->conf['display']->content['new-9f9a4a74-598e-4f4e-b924-0e5a20ec6637'] = (object) array(
+          'pid' => 'new-9f9a4a74-598e-4f4e-b924-0e5a20ec6637',
+          'panel' => 'contentmain',
+          'type' => 'entity_form_field',
+          'subtype' => 'node:field_tags',
+          'shown' => TRUE,
+          'access' => array(),
+          'configuration' => array(
+            'label' => '',
+            'formatter' => '',
+            'context' => 'argument_node_edit_1',
+            'override_title' => 0,
+            'override_title_text' => '',
+            'override_title_heading' => 'h2',
           ),
           'cache' => array(),
           'style' => array(
@@ -99,27 +190,69 @@ function ocio_panels_settings_default_page_manager_handlers_alter(&$data) {
           'extras' => array(),
           'position' => 4,
           'locks' => array(),
-          'uuid' => '565b11a0-d67b-4d9f-843f-908988b830dd',
+          'uuid' => '9f9a4a74-598e-4f4e-b924-0e5a20ec6637',
+        ); /* WAS: '' */
+    $data['node_edit_panel_context']->conf['display']->content['new-d5114956-1a65-4500-9616-d9e7a386974c'] = (object) array(
+          'pid' => 'new-d5114956-1a65-4500-9616-d9e7a386974c',
+          'panel' => 'contentmain',
+          'type' => 'entity_form_field',
+          'subtype' => 'node:field_featured_image',
+          'shown' => TRUE,
+          'access' => array(),
+          'configuration' => array(
+            'label' => '',
+            'formatter' => '',
+            'context' => 'argument_node_edit_1',
+            'override_title' => 1,
+            'override_title_text' => 'Featured Image',
+            'override_title_heading' => 'h2',
+          ),
+          'cache' => array(),
+          'style' => array(
+            'settings' => NULL,
+          ),
+          'css' => array(),
+          'extras' => array(),
+          'position' => 3,
+          'locks' => array(),
+          'uuid' => 'd5114956-1a65-4500-9616-d9e7a386974c',
+        ); /* WAS: '' */
+    $data['node_edit_panel_context']->conf['display']->content['new-da419228-f10f-48ea-9972-7398d723c22c'] = (object) array(
+          'pid' => 'new-da419228-f10f-48ea-9972-7398d723c22c',
+          'panel' => 'sidebar',
+          'type' => 'panelizer_form_default',
+          'subtype' => 'panelizer_form_default',
+          'shown' => TRUE,
+          'access' => array(),
+          'configuration' => array(),
+          'cache' => array(),
+          'style' => array(
+            'settings' => NULL,
+          ),
+          'css' => array(),
+          'extras' => array(),
+          'position' => 1,
+          'locks' => array(),
+          'uuid' => 'da419228-f10f-48ea-9972-7398d723c22c',
         ); /* WAS: '' */
-    $data['node_edit_panel_context']->conf['display']->content['new-73569090-5f67-47b1-b6a5-634bc8104c2b']->access['logic'] = 'or'; /* WAS: '' */
-    $data['node_edit_panel_context']->conf['display']->content['new-73569090-5f67-47b1-b6a5-634bc8104c2b']->access['plugins'] = array(); /* WAS: '' */
-    $data['node_edit_panel_context']->conf['display']->content['new-9176b962-e64f-44a6-8ebe-e03ebf0f6c3d']->position = 3; /* WAS: 4 */
-    $data['node_edit_panel_context']->conf['display']->content['new-99f6c0bd-36fd-411b-9833-c0be0fab7548']->position = 1; /* WAS: 2 */
-    $data['node_edit_panel_context']->conf['display']->content['new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c']->access['logic'] = 'or'; /* WAS: '' */
-    $data['node_edit_panel_context']->conf['display']->content['new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c']->access['plugins'] = array(); /* WAS: '' */
-    $data['node_edit_panel_context']->conf['display']->content['new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c']->position = 2; /* WAS: 3 */
-    $data['node_edit_panel_context']->conf['display']->layout = 'ocio-omega-twocol-flipped'; /* WAS: 'radix_burr_flipped' */
     $data['node_edit_panel_context']->conf['display']->panel_settings['style_settings']['footer'] = NULL; /* WAS: '' */
     $data['node_edit_panel_context']->conf['display']->panel_settings['style_settings']['header'] = NULL; /* WAS: '' */
-    $data['node_edit_panel_context']->conf['display']->panels['contentmain'][3] = 'new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd'; /* WAS: '' */
-    $data['node_edit_panel_context']->conf['display']->panels['contentmain'][4] = 'new-1c073329-7f76-4b25-bdb5-ed6681a78019'; /* WAS: '' */
-    $data['node_edit_panel_context']->conf['display']->panels['sidebar'][0] = 'new-51126c95-cf51-4ad6-a27a-11e4260d8023'; /* WAS: 'new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd' */
-    $data['node_edit_panel_context']->conf['display']->panels['sidebar'][1] = 'new-99f6c0bd-36fd-411b-9833-c0be0fab7548'; /* WAS: 'new-51126c95-cf51-4ad6-a27a-11e4260d8023' */
-    $data['node_edit_panel_context']->conf['display']->panels['sidebar'][2] = 'new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c'; /* WAS: 'new-99f6c0bd-36fd-411b-9833-c0be0fab7548' */
-    $data['node_edit_panel_context']->conf['display']->panels['sidebar'][3] = 'new-9176b962-e64f-44a6-8ebe-e03ebf0f6c3d'; /* WAS: 'new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c' */
-    $data['node_edit_panel_context']->conf['display']->panels['sidebar'][4] = 'new-6e4a98d8-3738-41b9-8c33-4b4c905c6834'; /* WAS: 'new-9176b962-e64f-44a6-8ebe-e03ebf0f6c3d' */
-    $data['node_edit_panel_context']->conf['display']->panels['sidebar'][5] = 'new-c0926cca-059c-4bb1-bccd-2838ec7a93f2'; /* WAS: 'new-6e4a98d8-3738-41b9-8c33-4b4c905c6834' */
-    $data['node_edit_panel_context']->conf['display']->panels['sidebar'][6] = 'new-565b11a0-d67b-4d9f-843f-908988b830dd'; /* WAS: 'new-c0926cca-059c-4bb1-bccd-2838ec7a93f2' */
+    $data['node_edit_panel_context']->conf['display']->panels['contentmain'][3] = 'new-d5114956-1a65-4500-9616-d9e7a386974c'; /* WAS: '' */
+    $data['node_edit_panel_context']->conf['display']->panels['contentmain'][4] = 'new-9f9a4a74-598e-4f4e-b924-0e5a20ec6637'; /* WAS: '' */
+    $data['node_edit_panel_context']->conf['display']->panels['sidebar'][0] = 'new-71e8c64f-55c3-40b6-ab0d-a93547057e44'; /* WAS: 'new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd' */
+    $data['node_edit_panel_context']->conf['display']->panels['sidebar'][1] = 'new-da419228-f10f-48ea-9972-7398d723c22c'; /* WAS: 'new-51126c95-cf51-4ad6-a27a-11e4260d8023' */
+    $data['node_edit_panel_context']->conf['display']->panels['sidebar'][2] = 'new-5d180289-633a-4162-b192-a1314cce1e4c'; /* WAS: 'new-99f6c0bd-36fd-411b-9833-c0be0fab7548' */
+    $data['node_edit_panel_context']->conf['display']->panels['sidebar'][3] = 'new-08dde41f-c835-4e3a-b0ef-28191ff0275d'; /* WAS: 'new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c' */
+    $data['node_edit_panel_context']->conf['display']->panels['sidebar'][4] = 'new-13dff848-cce9-4135-9dcc-dab92cb83895'; /* WAS: 'new-9176b962-e64f-44a6-8ebe-e03ebf0f6c3d' */
+    $data['node_edit_panel_context']->conf['display']->panels['sidebar'][5] = 'new-3dbe9a87-780b-4039-bb07-723f5c8bca58'; /* WAS: 'new-6e4a98d8-3738-41b9-8c33-4b4c905c6834' */
     $data['node_edit_panel_context']->weight = -29; /* WAS: 0 */
+    unset($data['node_edit_panel_context']->conf['display']->content['new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd']);
+    unset($data['node_edit_panel_context']->conf['display']->content['new-51126c95-cf51-4ad6-a27a-11e4260d8023']);
+    unset($data['node_edit_panel_context']->conf['display']->content['new-6e4a98d8-3738-41b9-8c33-4b4c905c6834']);
+    unset($data['node_edit_panel_context']->conf['display']->content['new-9176b962-e64f-44a6-8ebe-e03ebf0f6c3d']);
+    unset($data['node_edit_panel_context']->conf['display']->content['new-99f6c0bd-36fd-411b-9833-c0be0fab7548']);
+    unset($data['node_edit_panel_context']->conf['display']->content['new-c0926cca-059c-4bb1-bccd-2838ec7a93f2']);
+    unset($data['node_edit_panel_context']->conf['display']->content['new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c']);
+    unset($data['node_edit_panel_context']->conf['display']->panels['sidebar'][6]);
   }
 }
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info
index a0a00c24..4643452a 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info
+++ b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info
@@ -30,19 +30,21 @@ features[features_overrides][] = field_instance.fieldable_panels_pane-image-fiel
 features[features_overrides][] = field_instance.fieldable_panels_pane-image-field_basic_image_image.widget|settings|preview_image_style
 features[features_overrides][] = field_instance.fieldable_panels_pane-image-field_basic_image_image.widget|settings|progress_indicator
 features[features_overrides][] = field_instance.fieldable_panels_pane-image-field_basic_image_image.widget|type
-features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-1c073329-7f76-4b25-bdb5-ed6681a78019
-features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd|panel
-features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd|position
-features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-51126c95-cf51-4ad6-a27a-11e4260d8023|position
-features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-565b11a0-d67b-4d9f-843f-908988b830dd
-features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-73569090-5f67-47b1-b6a5-634bc8104c2b|access|logic
-features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-73569090-5f67-47b1-b6a5-634bc8104c2b|access|plugins
-features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-9176b962-e64f-44a6-8ebe-e03ebf0f6c3d|position
-features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-99f6c0bd-36fd-411b-9833-c0be0fab7548|position
-features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c|access|logic
-features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c|access|plugins
-features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c|position
-features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|layout
+features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-08dde41f-c835-4e3a-b0ef-28191ff0275d
+features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-13dff848-cce9-4135-9dcc-dab92cb83895
+features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd
+features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-3dbe9a87-780b-4039-bb07-723f5c8bca58
+features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-51126c95-cf51-4ad6-a27a-11e4260d8023
+features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-5d180289-633a-4162-b192-a1314cce1e4c
+features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-6e4a98d8-3738-41b9-8c33-4b4c905c6834
+features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-71e8c64f-55c3-40b6-ab0d-a93547057e44
+features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-9176b962-e64f-44a6-8ebe-e03ebf0f6c3d
+features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-99f6c0bd-36fd-411b-9833-c0be0fab7548
+features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-9f9a4a74-598e-4f4e-b924-0e5a20ec6637
+features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-c0926cca-059c-4bb1-bccd-2838ec7a93f2
+features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-d5114956-1a65-4500-9616-d9e7a386974c
+features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-da419228-f10f-48ea-9972-7398d723c22c
+features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|content|new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c
 features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|panel_settings|style_settings|footer
 features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|panel_settings|style_settings|header
 features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|panels|contentmain|3
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.strongarm.inc b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.strongarm.inc
index ecdf3b0f..682e5fd3 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.strongarm.inc
@@ -14,7 +14,7 @@ function ocio_panels_settings_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'panels_page_allowed_layouts';
-  $strongarm->value = 'O:22:"panels_allowed_layouts":4:{s:9:"allow_new";b:1;s:11:"module_name";s:11:"panels_page";s:23:"allowed_layout_settings";a:96:{s:8:"flexible";b:0;s:14:"twocol_stacked";b:0;s:13:"twocol_bricks";b:0;s:6:"twocol";b:0;s:25:"threecol_33_34_33_stacked";b:0;s:17:"threecol_33_34_33";b:0;s:25:"threecol_25_50_25_stacked";b:0;s:17:"threecol_25_50_25";b:0;s:6:"onecol";b:0;s:6:"whelan";b:0;s:12:"webb_flipped";b:0;s:5:"sutro";b:0;s:13:"selby_flipped";b:0;s:5:"selby";b:0;s:4:"pond";b:0;s:15:"moscone_flipped";b:0;s:7:"moscone";b:0;s:8:"mccoppin";b:0;s:15:"hewston_flipped";b:0;s:7:"hewston";b:0;s:6:"harris";b:0;s:5:"geary";b:0;s:12:"burr_flipped";b:0;s:4:"burr";b:0;s:5:"brown";b:0;s:15:"brenham_flipped";b:0;s:7:"brenham";b:0;s:16:"bartlett_flipped";b:0;s:8:"bartlett";b:0;s:17:"sanderson_flipped";b:0;s:9:"sanderson";b:0;s:6:"boxton";b:0;s:22:"bryant_flipped_flipped";b:0;s:6:"bryant";b:0;s:6:"phelan";b:0;s:14:"taylor_flipped";b:0;s:6:"taylor";b:0;s:12:"sutro_double";b:0;s:5:"rolph";b:0;s:4:"webb";b:0;s:15:"omega:ocio-full";b:0;s:18:"omega:ocio-default";b:0;s:10:"omega:hero";b:0;s:12:"omega:simple";b:0;s:16:"omega:off-canvas";b:0;s:12:"omega:divine";b:0;s:5:"naked";b:0;s:8:"mondrian";b:0;s:6:"grid-3";b:0;s:6:"grid-2";b:0;s:6:"golden";b:0;s:19:"ocio-omega-equalcol";b:0;s:19:"ocio-omega-threecol";b:0;s:25:"ocio-omega-twocol-flipped";b:0;s:17:"ocio-omega-twocol";b:0;s:12:"radix_whelan";b:0;s:18:"radix_webb_flipped";b:0;s:10:"radix_webb";b:0;s:20:"radix_taylor_flipped";b:0;s:12:"radix_taylor";b:0;s:18:"radix_sutro_double";b:0;s:11:"radix_sutro";b:0;s:19:"radix_selby_flipped";b:0;s:11:"radix_selby";b:0;s:23:"radix_sanderson_flipped";b:0;s:15:"radix_sanderson";b:0;s:11:"radix_rolph";b:0;s:10:"radix_pond";b:0;s:12:"radix_phelan";b:0;s:21:"radix_moscone_flipped";b:0;s:13:"radix_moscone";b:0;s:14:"radix_mccoppin";b:0;s:21:"radix_hewston_flipped";b:0;s:13:"radix_hewston";b:0;s:12:"radix_harris";b:0;s:11:"radix_geary";b:0;s:18:"radix_burr_flipped";b:0;s:10:"radix_burr";b:0;s:20:"radix_bryant_flipped";b:0;s:12:"radix_bryant";b:0;s:11:"radix_brown";b:0;s:21:"radix_brenham_flipped";b:0;s:13:"radix_brenham";b:0;s:12:"radix_boxton";b:0;s:22:"radix_bartlett_flipped";b:0;s:14:"radix_bartlett";b:0;s:23:"ocio-omega-tiles-twocol";b:1;s:25:"ocio-omega-tiles-equalcol";b:1;s:12:"omega:ocio-3";b:0;s:12:"omega:ocio-4";b:1;s:31:"ocio-omega-tiles-twocol-flipped";b:1;s:20:"ocio-omega-fourtiles";b:1;s:20:"ocio-omega-flip-flop";b:1;s:12:"omega:ocio-2";b:1;s:14:"ocio-omega-dps";b:1;s:14:"ocio-omega-alx";b:1;}s:10:"form_state";N;}';
+  $strongarm->value = 'O:22:"panels_allowed_layouts":4:{s:9:"allow_new";b:1;s:11:"module_name";s:11:"panels_page";s:23:"allowed_layout_settings";a:92:{s:8:"flexible";b:0;s:14:"twocol_stacked";b:0;s:13:"twocol_bricks";b:0;s:6:"twocol";b:0;s:25:"threecol_33_34_33_stacked";b:0;s:17:"threecol_33_34_33";b:0;s:25:"threecol_25_50_25_stacked";b:0;s:17:"threecol_25_50_25";b:0;s:6:"onecol";b:0;s:6:"whelan";b:0;s:12:"webb_flipped";b:0;s:5:"sutro";b:0;s:13:"selby_flipped";b:0;s:5:"selby";b:0;s:4:"pond";b:0;s:15:"moscone_flipped";b:0;s:7:"moscone";b:0;s:8:"mccoppin";b:0;s:15:"hewston_flipped";b:0;s:7:"hewston";b:0;s:6:"harris";b:0;s:5:"geary";b:0;s:12:"burr_flipped";b:0;s:4:"burr";b:0;s:5:"brown";b:0;s:15:"brenham_flipped";b:0;s:7:"brenham";b:0;s:16:"bartlett_flipped";b:0;s:8:"bartlett";b:0;s:17:"sanderson_flipped";b:0;s:9:"sanderson";b:0;s:6:"boxton";b:0;s:22:"bryant_flipped_flipped";b:0;s:6:"bryant";b:0;s:6:"phelan";b:0;s:14:"taylor_flipped";b:0;s:6:"taylor";b:0;s:12:"sutro_double";b:0;s:5:"rolph";b:0;s:4:"webb";b:0;s:15:"omega:ocio-full";b:0;s:18:"omega:ocio-default";b:0;s:10:"omega:hero";b:0;s:12:"omega:simple";b:0;s:16:"omega:off-canvas";b:0;s:12:"omega:divine";b:0;s:5:"naked";b:0;s:8:"mondrian";b:0;s:6:"grid-3";b:0;s:6:"grid-2";b:0;s:6:"golden";b:0;s:12:"radix_whelan";b:0;s:18:"radix_webb_flipped";b:0;s:10:"radix_webb";b:0;s:20:"radix_taylor_flipped";b:0;s:12:"radix_taylor";b:0;s:18:"radix_sutro_double";b:0;s:11:"radix_sutro";b:0;s:19:"radix_selby_flipped";b:0;s:11:"radix_selby";b:0;s:23:"radix_sanderson_flipped";b:0;s:15:"radix_sanderson";b:0;s:11:"radix_rolph";b:0;s:10:"radix_pond";b:0;s:12:"radix_phelan";b:0;s:21:"radix_moscone_flipped";b:0;s:13:"radix_moscone";b:0;s:14:"radix_mccoppin";b:0;s:21:"radix_hewston_flipped";b:0;s:13:"radix_hewston";b:0;s:12:"radix_harris";b:0;s:11:"radix_geary";b:0;s:18:"radix_burr_flipped";b:1;s:10:"radix_burr";b:0;s:20:"radix_bryant_flipped";b:0;s:12:"radix_bryant";b:0;s:11:"radix_brown";b:0;s:21:"radix_brenham_flipped";b:0;s:13:"radix_brenham";b:0;s:12:"radix_boxton";b:0;s:22:"radix_bartlett_flipped";b:0;s:14:"radix_bartlett";b:0;s:23:"ocio-omega-tiles-twocol";b:0;s:25:"ocio-omega-tiles-equalcol";b:0;s:12:"omega:ocio-3";b:0;s:12:"omega:ocio-4";b:0;s:31:"ocio-omega-tiles-twocol-flipped";b:0;s:20:"ocio-omega-fourtiles";b:0;s:20:"ocio-omega-flip-flop";b:0;s:12:"omega:ocio-2";b:0;s:14:"ocio-omega-dps";b:0;s:14:"ocio-omega-alx";b:0;}s:10:"form_state";N;}';
   $export['panels_page_allowed_layouts'] = $strongarm;
 
   $strongarm = new stdClass();
@@ -22,9 +22,18 @@ function ocio_panels_settings_strongarm() {
   $strongarm->api_version = 1;
   $strongarm->name = 'panels_page_allowed_types';
   $strongarm->value = array(
-    'node-node' => 'node-node',
-    'mm_widgets_live_pane-mm_widgets_live_pane' => 'mm_widgets_live_pane-mm_widgets_live_pane',
-    'reusable_widgets-reusable_widgets' => 'reusable_widgets-reusable_widgets',
+    'node_form_author-node_form_author' => 'node_form_author-node_form_author',
+    'node_form_book-node_form_book' => 'node_form_book-node_form_book',
+    'node_form_buttons-node_form_buttons' => 'node_form_buttons-node_form_buttons',
+    'node_form_language-node_form_language' => 'node_form_language-node_form_language',
+    'node_form_log-node_form_log' => 'node_form_log-node_form_log',
+    'node_form_menu-node_form_menu' => 'node_form_menu-node_form_menu',
+    'node_form_path-node_form_path' => 'node_form_path-node_form_path',
+    'node_form_publishing-node_form_publishing' => 'node_form_publishing-node_form_publishing',
+    'node_form_title-node_form_title' => 'node_form_title-node_form_title',
+    'form-form' => 'form-form',
+    'dsc-dsc' => 'dsc-dsc',
+    'panelizer_form_default-panelizer_form_default' => 'panelizer_form_default-panelizer_form_default',
     'vocabulary_terms-vocabulary_terms' => 0,
     'user_links-user_links' => 0,
     'user_picture-user_picture' => 0,
@@ -47,15 +56,6 @@ function ocio_panels_settings_strongarm() {
     'page_slogan-page_slogan' => 0,
     'page_tabs-page_tabs' => 0,
     'page_title-page_title' => 0,
-    'node_form_author-node_form_author' => 0,
-    'node_form_book-node_form_book' => 0,
-    'node_form_buttons-node_form_buttons' => 0,
-    'node_form_language-node_form_language' => 0,
-    'node_form_log-node_form_log' => 0,
-    'node_form_menu-node_form_menu' => 0,
-    'node_form_path-node_form_path' => 0,
-    'node_form_publishing-node_form_publishing' => 0,
-    'node_form_title-node_form_title' => 0,
     'node_attachments-node_attachments' => 0,
     'node_author-node_author' => 0,
     'node_body-node_body' => 0,
@@ -68,10 +68,11 @@ function ocio_panels_settings_strongarm() {
     'node_title-node_title' => 0,
     'node_type_desc-node_type_desc' => 0,
     'node_updated-node_updated' => 0,
-    'form-form' => 0,
+    'node-node' => 0,
     'comment_links-comment_links' => 0,
     'file_content-file_content' => 0,
     'file_display-file_display' => 0,
+    'mm_widgets_live_pane-mm_widgets_live_pane' => 0,
     'content-content' => 0,
     'general_panes-general_panes' => 0,
     'general_widgets-general_widgets' => 0,
@@ -79,6 +80,7 @@ function ocio_panels_settings_strongarm() {
     'menus-menus' => 0,
     'overridden_page_templates-overridden_page_templates' => 0,
     'panels_layouts-panels_layouts' => 0,
+    'reusable_widgets-reusable_widgets' => 0,
     'taxonomy-taxonomy' => 0,
     'theme-theme' => 0,
     'users-users' => 0,
@@ -92,36 +94,34 @@ function ocio_panels_settings_strongarm() {
     'views_pager-views_pager' => 0,
     'views_row-views_row' => 0,
     'views_view-views_view' => 0,
-    'dsc-dsc' => 0,
-    'panelizer_form_default-panelizer_form_default' => 0,
+    'token-node:book' => 'token-node:book',
     'token-node:uuid' => 'token-node:uuid',
     'token-node:vuuid' => 'token-node:vuuid',
-    'token-node:book' => 'token-node:book',
+    'token-node:field_tags' => 'token-node:field_tags',
+    'token-node:field_display_in_view_panes' => 'token-node:field_display_in_view_panes',
+    'token-node:field_featured_image' => 'token-node:field_featured_image',
+    'token-node:field_ocio_body' => 'token-node:field_ocio_body',
     'token-node:field_admin_lock' => 'token-node:field_admin_lock',
+    'token-node:field_answer' => 'token-node:field_answer',
+    'token-node:field_date' => 'token-node:field_date',
+    'token-node:field_disable_breadcrumbs' => 'token-node:field_disable_breadcrumbs',
+    'token-node:field_disable_title' => 'token-node:field_disable_title',
+    'token-node:field_ocio_link' => 'token-node:field_ocio_link',
+    'token-node:field_basic_image_image' => 'token-node:field_basic_image_image',
+    'token-node:field_featured_summary' => 'token-node:field_featured_summary',
     'token-node:field_alternate_panel_rows' => 'token-node:field_alternate_panel_rows',
     'token-node:field_banner_image' => 'token-node:field_banner_image',
     'token-node:field_banner_image_text' => 'token-node:field_banner_image_text',
     'token-node:field_banner_image_text_color' => 'token-node:field_banner_image_text_color',
     'token-node:field_banner_image_text_location' => 'token-node:field_banner_image_text_location',
-    'token-node:field_disable_breadcrumbs' => 'token-node:field_disable_breadcrumbs',
-    'token-node:field_disable_title' => 'token-node:field_disable_title',
     'token-node:field_pre_footer_banner_image' => 'token-node:field_pre_footer_banner_image',
-    'token-node:field_basic_image_image' => 'token-node:field_basic_image_image',
-    'token-node:field_ocio_body' => 'token-node:field_ocio_body',
-    'token-node:field_date' => 'token-node:field_date',
-    'token-node:field_answer' => 'token-node:field_answer',
-    'token-node:field_featured_summary' => 'token-node:field_featured_summary',
-    'token-node:field_ocio_link' => 'token-node:field_ocio_link',
-    'token-node:field_tags' => 'token-node:field_tags',
-    'token-node:field_display_in_view_panes' => 'token-node:field_display_in_view_panes',
-    'token-node:field_featured_image' => 'token-node:field_featured_image',
     'token-term:uuid' => 'token-term:uuid',
     'token-file:download-url' => 'token-file:download-url',
     'token-file:uuid' => 'token-file:uuid',
     'token-file:field_file_image_alt_text' => 'token-file:field_file_image_alt_text',
     'token-file:field_file_image_title_text' => 'token-file:field_file_image_title_text',
-    'token-file:field_basic_image_caption' => 'token-file:field_basic_image_caption',
     'token-file:field_file_description' => 'token-file:field_file_description',
+    'token-file:field_basic_image_caption' => 'token-file:field_basic_image_caption',
     'token-user:name-raw' => 'token-user:name-raw',
     'token-user:uuid' => 'token-user:uuid',
     'token-user:field_display_on_contact_page' => 'token-user:field_display_on_contact_page',
@@ -269,10 +269,16 @@ function ocio_panels_settings_strongarm() {
     'token-view:machine-name' => 0,
     'token-view:title' => 0,
     'token-view:url' => 0,
+    'entity_form_field-node:field_admin_lock' => 'entity_form_field-node:field_admin_lock',
+    'entity_form_field-node:field_disable_breadcrumbs' => 'entity_form_field-node:field_disable_breadcrumbs',
+    'entity_form_field-node:field_disable_title' => 'entity_form_field-node:field_disable_title',
+    'entity_form_field-node:field_tags' => 'entity_form_field-node:field_tags',
+    'entity_form_field-node:field_featured_image' => 'entity_form_field-node:field_featured_image',
     'entity_form_field-fieldable_panels_pane:field_background_color' => 0,
     'entity_form_field-fieldable_panels_pane:field_tile_background_img' => 0,
     'entity_form_field-fieldable_panels_pane:field_tile_link' => 0,
     'entity_form_field-fieldable_panels_pane:field_background_color_2' => 0,
+    'entity_form_field-fieldable_panels_pane:field_tile_image_style' => 0,
     'entity_form_field-fieldable_panels_pane:field_tile_text_area' => 0,
     'entity_form_field-fieldable_panels_pane:field_quick_links_links' => 0,
     'entity_form_field-fieldable_panels_pane:field_basic_file_file' => 0,
@@ -293,18 +299,13 @@ function ocio_panels_settings_strongarm() {
     'entity_form_field-node:field_basic_image_image' => 0,
     'entity_form_field-node:field_featured_summary' => 0,
     'entity_form_field-node:field_ocio_link' => 0,
-    'entity_form_field-node:field_admin_lock' => 0,
     'entity_form_field-node:field_alternate_panel_rows' => 0,
     'entity_form_field-node:field_banner_image' => 0,
     'entity_form_field-node:field_banner_image_text' => 0,
     'entity_form_field-node:field_banner_image_text_color' => 0,
     'entity_form_field-node:field_banner_image_text_location' => 0,
-    'entity_form_field-node:field_disable_breadcrumbs' => 0,
-    'entity_form_field-node:field_disable_title' => 0,
     'entity_form_field-node:field_pre_footer_banner_image' => 0,
-    'entity_form_field-node:field_tags' => 0,
     'entity_form_field-node:field_display_in_view_panes' => 0,
-    'entity_form_field-node:field_featured_image' => 0,
     'entity_form_field-file:field_file_image_alt_text' => 0,
     'entity_form_field-file:field_file_image_title_text' => 0,
     'entity_form_field-file:field_basic_image_caption' => 0,
@@ -324,6 +325,7 @@ function ocio_panels_settings_strongarm() {
     'entity_field-fieldable_panels_pane:field_tile_background_img' => 0,
     'entity_field-fieldable_panels_pane:field_tile_link' => 0,
     'entity_field-fieldable_panels_pane:field_background_color_2' => 0,
+    'entity_field-fieldable_panels_pane:field_tile_image_style' => 0,
     'entity_field-fieldable_panels_pane:field_tile_text_area' => 0,
     'entity_field-fieldable_panels_pane:field_quick_links_links' => 0,
     'entity_field-fieldable_panels_pane:field_basic_file_file' => 0,
@@ -371,11 +373,11 @@ function ocio_panels_settings_strongarm() {
     'entity_field-user:field_room_and_building' => 0,
     'entity_field-user:field_street_address' => 0,
     'entity_field-user:field_user_photo' => 0,
-    'entity_field_extra-fieldable_panels_pane:title' => 'entity_field_extra-fieldable_panels_pane:title',
-    'entity_field_extra-node:webform' => 'entity_field_extra-node:webform',
-    'entity_field_extra-file:file' => 'entity_field_extra-file:file',
-    'entity_field_extra-user:summary' => 'entity_field_extra-user:summary',
+    'entity_field_extra-fieldable_panels_pane:title' => 0,
+    'entity_field_extra-node:webform' => 0,
+    'entity_field_extra-file:file' => 0,
     'entity_field_extra-taxonomy_term:description' => 0,
+    'entity_field_extra-user:summary' => 0,
     'custom-custom' => 0,
     'block-apachesolr_search-mlt-001' => 0,
     'block-apachesolr_search-sort' => 0,
@@ -417,16 +419,16 @@ function ocio_panels_settings_strongarm() {
     'entity_view-taxonomy_term' => 0,
     'entity_view-user' => 0,
     'entity_view-workbench_moderation_transition' => 0,
-    'fieldable_panels_pane-tile_pane' => 'fieldable_panels_pane-tile_pane',
-    'fieldable_panels_pane-tile_pane_plus_text_area' => 'fieldable_panels_pane-tile_pane_plus_text_area',
-    'fieldable_panels_pane-quick_links' => 'fieldable_panels_pane-quick_links',
-    'fieldable_panels_pane-image' => 'fieldable_panels_pane-image',
-    'fieldable_panels_pane-text' => 'fieldable_panels_pane-text',
-    'fieldable_panels_pane-video' => 'fieldable_panels_pane-video',
     'fieldable_panels_pane-fieldable_panels_pane' => 0,
+    'fieldable_panels_pane-tile_pane' => 0,
+    'fieldable_panels_pane-tile_pane_plus_text_area' => 0,
+    'fieldable_panels_pane-quick_links' => 0,
     'fieldable_panels_pane-basic_file' => 0,
+    'fieldable_panels_pane-image' => 0,
+    'fieldable_panels_pane-text' => 0,
     'fieldable_panels_pane-map' => 0,
     'fieldable_panels_pane-table' => 0,
+    'fieldable_panels_pane-video' => 0,
     'fieldable_panels_pane-spotlight' => 0,
     'menu_tree-_active' => 0,
     'menu_tree-devel' => 0,
@@ -434,18 +436,18 @@ function ocio_panels_settings_strongarm() {
     'menu_tree-management' => 0,
     'menu_tree-navigation' => 0,
     'menu_tree-user-menu' => 0,
-    'views_panes-user_contact-panel_pane_1' => 'views_panes-user_contact-panel_pane_1',
-    'views_panes-leadership_listing-panel_pane_1' => 'views_panes-leadership_listing-panel_pane_1',
-    'views_panes-calendar-panel_pane_1' => 'views_panes-calendar-panel_pane_1',
-    'views_panes-calendar-panel_pane_2' => 'views_panes-calendar-panel_pane_2',
-    'views_panes-faq-panel_pane_1' => 'views_panes-faq-panel_pane_1',
-    'views_panes-ocio_news_archive-titles_pane' => 'views_panes-ocio_news_archive-titles_pane',
-    'views_panes-ocio_news_archive-teasers_pane' => 'views_panes-ocio_news_archive-teasers_pane',
-    'views_panes-ocio_news_archive-trio_pane' => 'views_panes-ocio_news_archive-trio_pane',
-    'views_panes-panopoly_widgets_general_content-list_of_content' => 'views_panes-panopoly_widgets_general_content-list_of_content',
+    'views_panes-calendar-panel_pane_1' => 0,
+    'views_panes-calendar-panel_pane_2' => 0,
+    'views_panes-faq-panel_pane_1' => 0,
+    'views_panes-ocio_news_archive-titles_pane' => 0,
+    'views_panes-ocio_news_archive-teasers_pane' => 0,
+    'views_panes-ocio_news_archive-trio_pane' => 0,
     'views_panes-ocio_twitter-panel_pane_1' => 0,
     'views_panes-panopoly_taxonomy-taxonomy_content' => 0,
+    'views_panes-panopoly_widgets_general_content-list_of_content' => 0,
     'views_panes-panopoly_widgets_general_content-piece_of_content' => 0,
+    'views_panes-user_contact-panel_pane_1' => 0,
+    'views_panes-leadership_listing-panel_pane_1' => 0,
   );
   $export['panels_page_allowed_types'] = $strongarm;
 
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.css b/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.css
index 2a26e353..4dc2de05 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.css
@@ -130,6 +130,10 @@ input:focus {
   outline: 1px solid #999999;
 }
 
+textarea {
+  resize: none;
+}
+
 .webform-component label {
   text-transform: uppercase;
   font-weight: 600;
@@ -156,7 +160,7 @@ input:focus {
 }
 
 @media (max-width: 47.5em) {
-  input, select, textarea {
+  .l-main input, .l-main select, .l-main textarea {
     width: 100%;
   }
 }
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css b/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css
index d3676126..d5a2c614 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css
@@ -130,6 +130,10 @@ input:focus {
   outline: 1px solid #999999;
 }
 
+textarea {
+  resize: none;
+}
+
 .webform-component label {
   text-transform: uppercase;
   font-weight: 600;
@@ -155,7 +159,7 @@ input:focus {
   max-width: 240px;
 }
 
-input, select, textarea {
+.l-main input, .l-main select, .l-main textarea {
   width: 100%;
 }
 
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css
index 12d97b38..d958c554 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css
@@ -126,6 +126,10 @@ input:focus {
   outline: 1px solid #999999;
 }
 
+textarea {
+  resize: none;
+}
+
 .webform-component label {
   text-transform: uppercase;
   font-weight: 600;
@@ -151,7 +155,7 @@ input:focus {
   max-width: 240px;
 }
 
-input, select, textarea {
+.l-main input, .l-main select, .l-main textarea {
   width: 100%;
 }
 
@@ -1659,6 +1663,8 @@ p.search-result__snippet {
   -webkit-box-sizing: content-box;
   padding-right: 1em;
   padding-left: 1em;
+  box-shadow: none;
+  padding: 0.6em 1.3em 0.4em;
 }
 
 .l-page .l-region--main-menu #search-block-toggle {
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css
index cc61747f..f9ab5a3e 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css
@@ -126,6 +126,10 @@ input:focus {
   outline: 1px solid #999999;
 }
 
+textarea {
+  resize: none;
+}
+
 .webform-component label {
   text-transform: uppercase;
   font-weight: 600;
@@ -152,7 +156,7 @@ input:focus {
 }
 
 @media (max-width: 47.5em) {
-  input, select, textarea {
+  .l-main input, .l-main select, .l-main textarea {
     width: 100%;
   }
 }
@@ -1673,6 +1677,8 @@ p.search-result__snippet {
   -webkit-box-sizing: content-box;
   padding-right: 1em;
   padding-left: 1em;
+  box-shadow: none;
+  padding: 0.6em 1.3em 0.4em;
 }
 
 @media (max-width: 47.5em) {
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_forms.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_forms.scss
index 0edee2e2..9493f243 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_forms.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_forms.scss
@@ -6,6 +6,10 @@ input:focus {
   outline: 1px solid lighten($md-gray, 20%);
 }
 
+textarea {
+  resize: none;
+}
+
 .webform-component {
   label {
     text-transform: uppercase;
@@ -45,7 +49,9 @@ input:focus {
 }
 
 @include breakpoint($small, true) {
-  input, select, textarea {
-    width: 100%;
+  .l-main {
+    input, select, textarea {
+      width: 100%;
+    }
   }
 }
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_search.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_search.scss
index c7bb965a..10f8221d 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_search.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_search.scss
@@ -82,6 +82,8 @@ p.search-result__snippet {
           -webkit-box-sizing: content-box;
           padding-right: 1em;
           padding-left: 1em;
+          box-shadow: none;
+          padding: 0.6em 1.3em 0.4em;
         }
       }
     }
diff --git a/profiles/wcm_base/themes/ocio_seven/css/ocio_seven-node_forms.css b/profiles/wcm_base/themes/ocio_seven/css/ocio_seven-node_forms.css
index 3f7b89f3..a5b8bd3f 100644
--- a/profiles/wcm_base/themes/ocio_seven/css/ocio_seven-node_forms.css
+++ b/profiles/wcm_base/themes/ocio_seven/css/ocio_seven-node_forms.css
@@ -1,4 +1,4 @@
-.node-form .ocio-omega-twocol-flipped-sidebar-inner {
+.node-form .burr-flipped .radix-layouts-sidebar {
   background: #f5f5f3;
   padding: 1em 2em;
   margin-top: 8px;
-- 
GitLab