diff --git a/config/install/structure_sync.data.yml b/config/install/structure_sync.data.yml
index ae036e58735e9e9c64aca4814cbf813778ae2d7e..ebcfff02b9fd49f9f31ac4aa7bafd11577a81252 100644
--- a/config/install/structure_sync.data.yml
+++ b/config/install/structure_sync.data.yml
@@ -13,7 +13,7 @@ menus:
     uuid: be62727e-4667-48e3-b3b1-358afafd4acb
   -
     menu_name: uw-menu-global-social-media
-    title: X (formerly Twitter)
+    title: 'X (formerly Twitter)'
     parent: null
     uri: 'https://twitter.com/uWaterloo'
     link_title: ''
diff --git a/config/install/webform.settings.yml b/config/install/webform.settings.yml
index e1c62abc4b6c7b28d467a8fab1ab32e0628dd76b..c5259f4b440866322eb580553999385c214a19fc 100644
--- a/config/install/webform.settings.yml
+++ b/config/install/webform.settings.yml
@@ -1,32 +1,32 @@
+langcode: en
 settings:
   default_status: open
+  default_categories: {  }
+  default_page: true
   default_page_base_path: /form
   default_ajax: false
+  default_ajax_progress_type: throbber
   default_ajax_effect: fade
   default_ajax_speed: 500
-  default_ajax_progress_type: throbber
-  default_form_open_message: 'This form has not yet been opened to submissions.'
-  default_form_close_message: 'Sorry...This form is closed to new submissions.'
-  default_form_exception_message: 'Unable to display this webform. Please contact the site administrator.'
   default_submit_button_label: Submit
   default_reset_button_label: Reset
   default_delete_button_label: Delete
   default_form_submit_once: true
+  default_form_open_message: 'This form has not yet been opened to submissions.'
+  default_form_close_message: 'Sorry...This form is closed to new submissions.'
+  default_form_exception_message: 'Unable to display this webform. Please contact the site administrator.'
   default_form_confidential_message: 'This form is confidential. You must <a href="[site:login-url]/logout?destination=[current-page:url:relative]">Log out</a> to submit it.'
   default_form_access_denied_message: 'Please login to access this form.'
-  default_form_disable_back: false
-  default_form_submit_back: false
-  default_form_unsaved: false
   default_form_disable_remote_addr: false
   default_form_novalidate: false
   default_form_disable_inline_errors: false
   default_form_required: false
   default_form_required_label: 'Indicates required field'
+  default_form_unsaved: false
+  default_form_disable_back: false
+  default_form_submit_back: false
   default_form_details_toggle: true
   default_form_file_limit: ''
-  default_page: true
-  form_classes: "container-inline clearfix\r\nform--inline clearfix\r\nmessages messages--error\r\nmessages messages--warning\r\nmessages messages--status\r\n"
-  button_classes: ''
   default_wizard_prev_button_label: '< Previous Page'
   default_wizard_next_button_label: 'Next Page >'
   default_wizard_start_label: Start
@@ -45,10 +45,10 @@ settings:
   default_draft_pending_multiple_message: 'You have pending drafts for this webform. <a href="#">View your pending drafts</a>.'
   default_confirmation_message: 'New submission added to [webform:title].'
   default_confirmation_back_label: 'Back to form'
+  default_confirmation_noindex: false
+  default_limit_total_message: 'No more submissions are permitted.'
+  default_limit_user_message: 'No more submissions are permitted.'
   default_submission_label: '[webform_submission:submitted-to]: Submission #[webform_submission:serial]'
-  default_submission_access_denied_message: 'Please login to access this submission.'
-  default_submission_exception_message: 'Unable to process this submission. Please contact the site administrator.'
-  default_submission_locked_message: 'This submission has been locked.'
   default_submission_log: false
   default_submission_views: {  }
   default_submission_views_replace:
@@ -64,9 +64,19 @@ settings:
       - entity.node.webform.user.drafts
       - entity.node.webform.user.submissions
   default_results_customize: false
+  default_submission_access_denied_message: 'Please login to access this submission.'
+  default_submission_exception_message: 'Unable to process this submission. Please contact the site administrator.'
+  default_submission_locked_message: 'This submission has been locked.'
   default_previous_submission_message: 'You have already submitted this webform. <a href="#">View your previous submission</a>.'
   default_previous_submissions_message: 'You have already submitted this webform. <a href="#">View your previous submissions</a>.'
   default_autofill_message: 'This submission has been autofilled with your previous submission.'
+  form_classes: |
+    container-inline clearfix
+    form--inline clearfix
+    messages messages--error
+    messages messages--warning
+    messages messages--status
+  button_classes: ''
   preview_classes: |
     messages messages--error
     messages messages--warning
@@ -77,22 +87,9 @@ settings:
     messages messages--status
   confirmation_back_classes: |
     button
-  default_limit_total_message: 'No more submissions are permitted.'
-  default_limit_user_message: 'No more submissions are permitted.'
   default_share: false
   default_share_node: false
   default_share_theme_name: ''
-  dialog: false
-  dialog_options:
-    narrow:
-      title: Narrow
-      width: 600
-    normal:
-      title: Normal
-      width: 800
-    wide:
-      title: Wide
-      width: 1000
   webform_bulk_form: true
   webform_bulk_form_actions:
     - webform_open_action
@@ -107,44 +104,22 @@ settings:
     - webform_submission_make_lock_action
     - webform_submission_make_unlock_action
     - webform_submission_delete_action
+  dialog: false
+  dialog_options:
+    narrow:
+      title: Narrow
+      width: 600
+    normal:
+      title: Normal
+      width: 800
+    wide:
+      title: Wide
+      width: 1000
 assets:
   css: ''
   javascript: ''
-handler:
-  excluded_handlers: {  }
-variant:
-  excluded_variants: {  }
-export:
-  temp_directory: ''
-  exporter: delimited
-  multiple_delimiter: ;
-  header_format: label
-  header_prefix: true
-  header_prefix_label_delimiter: ': '
-  header_prefix_key_delimiter: __
-  composite_element_item_format: label
-  options_single_format: compact
-  options_multiple_format: compact
-  options_item_format: label
-  entity_reference_items:
-    - id
-    - title
-    - url
-  likert_answers_format: label
-  signature_format: status
-  delimiter: ','
-  excel: false
-  archive_type: tar
-  excluded_exporters: {  }
-batch:
-  default_batch_export_size: 500
-  default_batch_import_size: 100
-  default_batch_update_size: 500
-  default_batch_delete_size: 500
-  default_batch_email_size: 500
-purge:
-  cron_size: 100
 form:
+  limit: 50
   filter_category: ''
   filter_state: ''
 element:
@@ -198,8 +173,8 @@ element:
     webform_variant: webform_variant
 html_editor:
   disabled: false
-  element_format: ''
-  mail_format: ''
+  element_format: webform_default
+  mail_format: webform_default
   tidy: true
   make_unused_managed_files_temporary: true
 file:
@@ -208,10 +183,10 @@ file:
   file_private_redirect_message: 'Please login to access the uploaded file.'
   default_max_filesize: ''
   default_managed_file_extensions: 'gif jpg png bmp eps tif pict psd txt rtf html odf pdf doc docx ppt pptx xls xlsx xml avi mov mp3 ogg wav bz2 dmg gz jar rar sit svg tar zip'
-  default_audio_file_extensions: 'mp3 ogg wav'
-  default_document_file_extensions: 'txt rtf pdf doc docx odt ppt pptx odp xls xlsx ods'
   default_image_file_extensions: 'gif jpg png svg'
   default_video_file_extensions: 'avi mov mp4 ogg wav webm'
+  default_audio_file_extensions: 'mp3 ogg wav'
+  default_document_file_extensions: 'txt rtf pdf doc docx odt ppt pptx odp xls xlsx ods'
   make_unused_managed_files_temporary: true
   delete_temporary_managed_files: true
 format: {  }
@@ -236,6 +211,40 @@ mail:
     <p>Submitted values are:</p>
     [webform_submission:values]
   roles: {  }
+export:
+  temp_directory: ''
+  exporter: delimited
+  delimiter: ','
+  multiple_delimiter: ;
+  excel: false
+  archive_type: tar
+  header_format: label
+  header_prefix: true
+  header_prefix_key_delimiter: __
+  header_prefix_label_delimiter: ': '
+  entity_reference_items:
+    - id
+    - title
+    - url
+  options_single_format: compact
+  options_multiple_format: compact
+  options_item_format: label
+  likert_answers_format: label
+  signature_format: status
+  composite_element_item_format: label
+  excluded_exporters: {  }
+handler:
+  excluded_handlers: {  }
+variant:
+  excluded_variants: {  }
+batch:
+  default_batch_export_size: 500
+  default_batch_import_size: 100
+  default_batch_update_size: 500
+  default_batch_delete_size: 500
+  default_batch_email_size: 500
+purge:
+  cron_size: 100
 test:
   types: |
     checkbox:
@@ -318,13 +327,13 @@ test:
       - 'Dixisset'
 ui:
   video_display: hidden
-  details_save: true
   help_disabled: true
   dialog_disabled: false
   offcanvas_disabled: false
   promotions_disabled: true
   support_disabled: true
-  description_help: true
+  details_save: true
+  description_help: false
   toolbar_item: false
 libraries:
   excluded_libraries:
@@ -349,10 +358,9 @@ libraries:
     - tippyjs/6.x
 requirements:
   cdn: true
-  bootstrap: true
   clientside_validation: false
+  bootstrap: true
   spam: true
-langcode: en
 third_party_settings:
   captcha:
     replace_administration_mode: false
diff --git a/uw_sites_all.info.yml b/uw_sites_all.info.yml
index 17ee3362b85e1f0caa88c1d808cd0b0acefe5328..6c935814ec0fcfee1bcfa61979ea287d3febe527 100644
--- a/uw_sites_all.info.yml
+++ b/uw_sites_all.info.yml
@@ -179,6 +179,7 @@ dependencies:
   - 'uw_ws_ofis:uw_ws_ofis'
   - 'views_autocomplete_filters:views_autocomplete_filters'
   - 'views_block_placement_exposed_form_defaults:views_block_placement_exposed_form_defaults'
+  - 'views_cm_current_state:views_cm_current_state'
   - 'views_contextual_filters_or:views_contextual_filters_or'
   - 'views_exposed_filter_blocks:views_exposed_filter_blocks'
   - 'views_ical:views_ical'
diff --git a/uw_sites_all.install b/uw_sites_all.install
index 467000c046ccc9eb16ec5be4ba37c90a8555a1a1..841e3e5ad9bae3e312a40c8e2868233b35a13579 100644
--- a/uw_sites_all.install
+++ b/uw_sites_all.install
@@ -1688,3 +1688,14 @@ function uw_sites_all_update_9141(&$sandbox) {
 function uw_sites_all_update_9142(&$sandbox) {
   \Drupal::service('module_installer')->uninstall(['conditional_fields']);
 }
+
+/**
+ * Install views_cm_current_state.
+ */
+function uw_sites_all_update_9143(&$sandbox) {
+  $modules = [
+    'views_cm_current_state',
+  ];
+
+  \Drupal::service('module_installer')->install($modules);
+}