diff --git a/composer.lock b/composer.lock
index 364220d..01dc10d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -94,7 +94,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/opencase.git",
-                "reference": "ba4e6668aadb5d3eb444b4e39316516a28a8d451"
+                "reference": "b194367eef6460ef61b921b4d97060aa64322fdb"
             },
             "require": {
                 "composer/installers": "*",
@@ -111,7 +111,7 @@
                     "email": "helo@autonomic.zone"
                 }
             ],
-            "time": "2021-12-05T19:16:39+00:00"
+            "time": "2021-12-10T09:45:22+00:00"
         },
         {
             "name": "bjeavons/zxcvbn-php",
diff --git a/config/core.entity_form_display.oc_actor.trainer.default.yml b/config/core.entity_form_display.oc_actor.trainer.default.yml
index 678da23..e0b6e49 100644
--- a/config/core.entity_form_display.oc_actor.trainer.default.yml
+++ b/config/core.entity_form_display.oc_actor.trainer.default.yml
@@ -33,76 +33,76 @@ content:
       placeholder: ''
     third_party_settings: {  }
   field_active:
+    type: boolean_checkbox
     weight: 26
+    region: content
     settings:
       display_label: true
     third_party_settings: {  }
-    type: boolean_checkbox
-    region: content
   field_availability:
     type: entity_reference_paragraphs
     weight: 6
+    region: content
     settings:
       title: Paragraph
       title_plural: Paragraphs
       edit_mode: open
       add_mode: dropdown
       form_display_mode: default
-      default_paragraph_type: ''
+      default_paragraph_type: _none
     third_party_settings: {  }
-    region: content
   field_delivery_partners:
+    type: entity_reference_autocomplete
     weight: 7
+    region: content
     settings:
       match_operator: CONTAINS
       match_limit: 10
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: entity_reference_autocomplete
-    region: content
   field_emergency_contact:
     type: entity_reference_paragraphs
     weight: 12
+    region: content
     settings:
       title: Paragraph
       title_plural: Paragraphs
       edit_mode: open
       add_mode: dropdown
       form_display_mode: default
-      default_paragraph_type: ''
+      default_paragraph_type: _none
     third_party_settings: {  }
-    region: content
   field_languages_spoken_fluently:
+    type: options_select
     weight: 5
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_select
-    region: content
   field_notes:
+    type: string_textarea
     weight: 9
+    region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-    type: string_textarea
-    region: content
   field_photo:
+    type: image_image
     weight: 8
+    region: content
     settings:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
-    type: image_image
-    region: content
   field_pronoun:
+    type: string_textfield
     weight: 2
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   first_name:
     type: string_textfield
     weight: 0
diff --git a/config/core.entity_view_display.oc_actor.trainer.default.yml b/config/core.entity_view_display.oc_actor.trainer.default.yml
index ed84635..c6d1a63 100644
--- a/config/core.entity_view_display.oc_actor.trainer.default.yml
+++ b/config/core.entity_view_display.oc_actor.trainer.default.yml
@@ -25,119 +25,119 @@ bundle: trainer
 mode: default
 content:
   email:
-    label: above
     type: string
-    weight: 3
-    region: content
+    label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
+    weight: 3
+    region: content
   field_active:
-    weight: 13
+    type: boolean
     label: above
     settings:
       format: default
       format_custom_false: ''
       format_custom_true: ''
     third_party_settings: {  }
-    type: boolean
+    weight: 11
     region: content
   field_availability:
     type: entity_reference_revisions_entity_view
-    weight: 6
     label: above
     settings:
-      view_mode: default
+      view_mode: preview
       link: ''
     third_party_settings: {  }
+    weight: 13
     region: content
   field_delivery_partners:
-    weight: 7
+    type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 6
     region: content
   field_emergency_contact:
     type: entity_reference_revisions_entity_view
-    weight: 12
     label: above
     settings:
       view_mode: default
       link: ''
     third_party_settings: {  }
+    weight: 12
     region: content
   field_languages_spoken_fluently:
-    weight: 5
+    type: list_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: list_default
+    weight: 5
     region: content
   field_notes:
-    weight: 9
+    type: basic_string
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: basic_string
+    weight: 8
     region: content
   field_photo:
-    weight: 8
+    type: image
     label: above
     settings:
-      image_style: ''
       image_link: ''
+      image_style: ''
     third_party_settings: {  }
-    type: image
+    weight: 7
     region: content
   field_pronoun:
-    weight: 2
+    type: string
     label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    type: string
+    weight: 2
     region: content
   first_name:
     type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
     weight: 0
     region: content
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
   last_name:
     type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
     weight: 1
     region: content
+  phone:
+    type: string
     label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
-  phone:
-    label: above
-    type: string
     weight: 4
     region: content
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
   post_code:
-    label: above
     type: string
-    weight: 11
-    region: content
+    label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
-  postal_address:
-    label: above
-    type: basic_string
     weight: 10
     region: content
+  postal_address:
+    type: basic_string
+    label: above
     settings: {  }
     third_party_settings: {  }
+    weight: 9
+    region: content
 hidden:
   feeds_item: true
   full_name: true
diff --git a/config/core.entity_view_display.paragraph.availability.default.yml b/config/core.entity_view_display.paragraph.availability.default.yml
index 47eaaec..18c42f8 100644
--- a/config/core.entity_view_display.paragraph.availability.default.yml
+++ b/config/core.entity_view_display.paragraph.availability.default.yml
@@ -17,17 +17,17 @@ mode: default
 content:
   field_day:
     type: list_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
     weight: 0
     region: content
-    label: inline
-    settings: {  }
-    third_party_settings: {  }
   field_time:
     type: list_default
-    weight: 1
-    region: content
-    label: inline
+    label: hidden
     settings: {  }
     third_party_settings: {  }
+    weight: 1
+    region: content
 hidden:
   search_api_excerpt: true
diff --git a/config/core.entity_view_display.paragraph.emergency_contact.default.yml b/config/core.entity_view_display.paragraph.emergency_contact.default.yml
index 0e35705..fdd6c4d 100644
--- a/config/core.entity_view_display.paragraph.emergency_contact.default.yml
+++ b/config/core.entity_view_display.paragraph.emergency_contact.default.yml
@@ -14,27 +14,27 @@ mode: default
 content:
   field_name:
     type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
     weight: 0
     region: content
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
   field_phone:
     type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
     weight: 1
     region: content
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
   field_relationship:
     type: string
-    weight: 2
-    region: content
-    label: above
+    label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
+    weight: 2
+    region: content
 hidden:
   search_api_excerpt: true
diff --git a/config/core.extension.yml b/config/core.extension.yml
index 6dbba9d..60b0084 100644
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -77,6 +77,7 @@ module:
   user: 0
   views_aggregator: 0
   views_autosubmit: 0
+  views_summarize: 0
   views_ui: 0
   views: 10
   paragraphs: 11
diff --git a/config/system.theme.yml b/config/system.theme.yml
index 8764240..113eb1f 100644
--- a/config/system.theme.yml
+++ b/config/system.theme.yml
@@ -1,4 +1,4 @@
-admin: seven
-default: bartik
 _core:
   default_config_hash: fOjer9hADYYnbCJVZMFZIIM1azTFWyg84ZkFDHfAbUg
+admin: seven
+default: bartik
diff --git a/config/user.role.anonymous.yml b/config/user.role.anonymous.yml
index daf39f9..ecc5ad0 100644
--- a/config/user.role.anonymous.yml
+++ b/config/user.role.anonymous.yml
@@ -1,7 +1,12 @@
 uuid: c3240f09-14e1-4b0d-888e-6d50f4413812
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  module:
+    - comment
+    - contact
+    - search
+    - system
 _core:
   default_config_hash: pq_mEIu_B4widZN7Ap81iCJSjShFFdcL0jEiCi8VrDk
 id: anonymous
diff --git a/config/user.role.authenticated.yml b/config/user.role.authenticated.yml
index 8a2a862..31e0efd 100644
--- a/config/user.role.authenticated.yml
+++ b/config/user.role.authenticated.yml
@@ -1,7 +1,15 @@
 uuid: 9d9980d7-806f-424e-94a3-4daed91188e4
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  config:
+    - taxonomy.vocabulary.tags
+  module:
+    - comment
+    - opencase
+    - opencase_entities
+    - system
+    - taxonomy
 _core:
   default_config_hash: btW6TFHajhy7Eo6YUvdFiPh4TcPggo8GBXYctjV6zag
 id: authenticated
diff --git a/config/user.role.gno_admin_user.yml b/config/user.role.gno_admin_user.yml
index 7b975e6..5b84130 100644
--- a/config/user.role.gno_admin_user.yml
+++ b/config/user.role.gno_admin_user.yml
@@ -1,7 +1,10 @@
 uuid: 1b23a802-601d-4d00-8818-392b5e496f9d
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  module:
+    - opencase_cases
+    - opencase_entities
 id: gno_admin_user
 label: 'GNO Additional Admin Permissions'
 weight: 4