From eb9335b2505b0082046589d6ae50f736f454d927 Mon Sep 17 00:00:00 2001
From: Nick <n.caris@planviewer.nl>
Date: Fri, 3 Jun 2022 12:02:45 +0200
Subject: [PATCH] Revert "commit project after oc case fee bug"

This reverts commit 809dbfc837a3716715768204947f082e9c0a6b9e.
---
 config/optional/admin_toolbar.settings.yml    |    2 +
 config/optional/bartik.settings.yml           |    4 +-
 .../block.block.accreditationcount.yml        |   20 -
 config/optional/block.block.actortypehelp.yml |    2 +-
 config/optional/block.block.addactivity.yml   |   25 +
 .../block.block.bartik_account_menu.yml       |    4 +-
 .../optional/block.block.bartik_branding.yml  |    6 +-
 .../optional/block.block.bartik_content.yml   |    4 +-
 config/optional/block.block.bartik_footer.yml |    4 +-
 .../block.block.bartik_gno_account_menu.yml   |   27 -
 ...ck.block.bartik_gno_accreditationcount.yml |   20 -
 .../block.block.bartik_gno_actortypehelp.yml  |   28 -
 .../block.block.bartik_gno_branding.yml       |   25 -
 .../block.block.bartik_gno_content.yml        |   22 -
 ...rtik_gno_exposedformactor_searchpage_1.yml |   25 -
 ..._gno_exposedformcase_fees_reportpage_1.yml |   29 -
 ...exposedformcase_provision_reportpage_1.yml |   29 -
 ...tik_gno_exposedformclient_reportpage_1.yml |   29 -
 ...ik_gno_exposedformdebrief_reportpage_1.yml |   29 -
 ...no_exposedformequal_opps_recordspage_1.yml |   29 -
 ...gno_exposedformevaluation_reportpage_1.yml |   29 -
 .../block.block.bartik_gno_footer.yml         |   27 -
 .../optional/block.block.bartik_gno_help.yml  |   22 -
 .../block.block.bartik_gno_local_actions.yml  |   20 -
 .../block.block.bartik_gno_local_tasks.yml    |   22 -
 .../block.block.bartik_gno_messages.yml       |   22 -
 .../block.block.bartik_gno_opencase.yml       |   73 -
 .../block.block.bartik_gno_page_title.yml     |   20 -
 .../block.block.bartik_gno_powered.yml        |   22 -
 config/optional/block.block.bartik_help.yml   |    6 +-
 .../block.block.bartik_local_actions.yml      |    6 +-
 .../block.block.bartik_local_tasks.yml        |    6 +-
 .../optional/block.block.bartik_messages.yml  |    4 +-
 .../block.block.bartik_page_title.yml         |    6 +-
 .../optional/block.block.bartik_powered.yml   |    4 +-
 ...ck.block.exposedformactor_searchpage_1.yml |    4 +-
 ...lock.exposedformcase_fees_reportpage_1.yml |   29 -
 ...exposedformcase_provision_reportpage_1.yml |   29 -
 ...k.block.exposedformclient_reportpage_1.yml |   29 -
 ....block.exposedformdebrief_reportpage_1.yml |   29 -
 ...ck.exposedformequal_opps_recordspage_1.yml |    6 +-
 ...ock.exposedformevaluation_reportpage_1.yml |   29 -
 config/optional/block.block.opencase.yml      |    2 +-
 .../block.block.seven_breadcrumbs.yml         |    4 +-
 config/optional/block.block.seven_content.yml |    4 +-
 config/optional/block.block.seven_help.yml    |    4 +-
 .../block.block.seven_local_actions.yml       |    4 +-
 .../optional/block.block.seven_messages.yml   |    4 +-
 .../optional/block.block.seven_page_title.yml |    4 +-
 .../block.block.seven_primary_local_tasks.yml |    4 +-
 ...lock.block.seven_secondary_local_tasks.yml |    4 +-
 ....block.views_block__activities_block_1.yml |   30 +
 config/optional/block_content.type.basic.yml  |    2 +-
 config/optional/comment.type.comment.yml      |    2 +-
 .../contact.form.contact_opencase.yml         |    6 +-
 config/optional/contact.form.feedback.yml     |    4 +-
 config/optional/contact.form.personal.yml     |    2 +-
 config/optional/contact.settings.yml          |    4 +-
 config/optional/content_as_config.config.yml  |    1 -
 .../content_as_config.taxonomy_term.yml       |  509 ---
 ....base_field_override.node.page.promote.yml |    2 +-
 ....oc_case_provision.trainer.oc_provider.yml |   24 -
 ...ion.link_between_clients.organisations.yml |   26 -
 config/optional/core.date_format.fallback.yml |    2 +-
 .../optional/core.date_format.html_date.yml   |    2 +-
 .../core.date_format.html_datetime.yml        |    2 +-
 .../optional/core.date_format.html_month.yml  |    2 +-
 .../optional/core.date_format.html_time.yml   |    2 +-
 .../optional/core.date_format.html_week.yml   |    2 +-
 .../optional/core.date_format.html_year.yml   |    2 +-
 .../core.date_format.html_yearless_date.yml   |    2 +-
 config/optional/core.date_format.long.yml     |    2 +-
 config/optional/core.date_format.medium.yml   |    2 +-
 config/optional/core.date_format.short.yml    |    2 +-
 ...rm_display.block_content.basic.default.yml |   14 +-
 ...y_form_display.comment.comment.default.yml |    2 +-
 ...ntact_message.contact_opencase.default.yml |    2 +-
 ...tity_form_display.node.article.default.yml |   20 +-
 ....entity_form_display.node.page.default.yml |   16 +-
 ...splay.oc_activity.application.default.yml} |   73 +-
 ...display.oc_activity.case_note.default.yml} |   73 +-
 ...ity.destitution_funds_provided.default.yml |   75 +
 ...form_display.oc_activity.email.default.yml |   60 +
 ...display.oc_activity.evaluation.default.yml |  139 -
 ..._display.oc_activity.interview.default.yml |   60 +
 ..._form_display.oc_activity.lete.default.yml |   60 +
 ...display.oc_activity.phone_call.default.yml |   29 +-
 ...m_display.oc_activity.research.default.yml |   60 +
 ...isplay.oc_activity.supervision.default.yml |   60 +
 ...ay.oc_activity.trainer_debrief.default.yml |  122 -
 ...y_form_display.oc_actor.client.default.yml |  233 ++
 ..._display.oc_actor.staff_member.default.yml |   79 +
 ..._form_display.oc_actor.trainer.default.yml |  168 -
 ...orm_display.oc_actor.volunteer.default.yml |  117 +
 ...display.oc_case.accommodation.default.yml} |   76 +-
 ...display.oc_case.asylum_support.default.yml |   63 +
 ..._display.oc_case.employability.default.yml |   71 +
 ...y_form_display.oc_case.enquiry.default.yml |   55 +
 ...ty_form_display.oc_case.health.default.yml |   63 +
 ...rm_display.oc_case.immigration.default.yml |   70 +
 ...e.pro_bono_immigration_service.default.yml |   46 +
 ..._form_display.oc_case.training.default.yml |  116 -
 ...display.oc_case.welfare_rights.default.yml |   63 +
 ...y_form_display.oc_case_fee.fee.default.yml |   35 +
 ...isplay.oc_case_fee.project_fee.default.yml |   40 -
 ...y.oc_case_provision.caseworker.default.yml |   79 +
 ...play.oc_case_provision.trainer.default.yml |   59 -
 ...ay.oc_equal_opps.oc_equal_opps.default.yml |   57 +
 ...lay.oc_event.train_the_trainer.default.yml |   36 -
 ...nt.volunteer_training_session.default.yml} |   29 +-
 ...display.oc_organisation.client.default.yml |  146 -
 ...anisation.partner_organisation.default.yml |   29 +-
 ...c_organisation.umbrella_client.default.yml |   68 -
 ...display.paragraph.availability.default.yml |   30 -
 ...ay.paragraph.emergency_contact.default.yml |   41 -
 ...ity_form_display.paragraph.fee.default.yml |   31 -
 ...form_display.paragraph.trainer.default.yml |   49 -
 ...orm_display.taxonomy_term.clie.default.yml |   56 -
 ....entity_form_display.user.user.default.yml |   28 +-
 .../core.entity_form_mode.user.register.yml   |    2 +-
 ...ew_display.block_content.basic.default.yml |    4 +-
 ...y_view_display.comment.comment.default.yml |    4 +-
 ...ntact_message.contact_opencase.default.yml |    2 +-
 ...tity_view_display.node.article.default.yml |    6 +-
 ...e.entity_view_display.node.article.rss.yml |    4 +-
 ...view_display.node.article.search_index.yml |   50 +
 ...iew_display.node.article.search_result.yml |   49 +
 ...ntity_view_display.node.article.teaser.yml |    6 +-
 ....entity_view_display.node.page.default.yml |    4 +-
 ...ty_view_display.node.page.search_index.yml |   28 +
 ...y_view_display.node.page.search_result.yml |   33 +
 ...e.entity_view_display.node.page.teaser.yml |    4 +-
 ...isplay.oc_activity.application.default.yml |   68 +
 ...display.oc_activity.case_note.default.yml} |   83 +-
 ...ity.destitution_funds_provided.default.yml |   79 +
 ...view_display.oc_activity.email.default.yml |   58 +
 ...display.oc_activity.evaluation.default.yml |  141 -
 ..._display.oc_activity.interview.default.yml |   58 +
 ...view_display.oc_activity.lete.default.yml} |   52 +-
 ...display.oc_activity.phone_call.default.yml |   32 +-
 ...w_display.oc_activity.research.default.yml |   58 +
 ...isplay.oc_activity.supervision.default.yml |   58 +
 ...ay.oc_activity.trainer_debrief.default.yml |  116 -
 ...y_view_display.oc_actor.client.default.yml |  203 ++
 ..._display.oc_actor.staff_member.default.yml |   58 +
 ..._view_display.oc_actor.trainer.default.yml |  158 -
 ...iew_display.oc_actor.volunteer.default.yml |  111 +
 ..._display.oc_case.accommodation.default.yml |   82 +
 ...display.oc_case.asylum_support.default.yml |   65 +
 ..._display.oc_case.employability.default.yml |   76 +
 ...y_view_display.oc_case.enquiry.default.yml |   52 +
 ...ty_view_display.oc_case.health.default.yml |   65 +
 ...ew_display.oc_case.immigration.default.yml |   73 +
 ...e.pro_bono_immigration_service.default.yml |   44 +
 ...y_view_display.oc_case.project.default.yml |  120 -
 ..._view_display.oc_case.training.default.yml |  180 -
 ...display.oc_case.welfare_rights.default.yml |   65 +
 ..._view_display.oc_case_fee.fee.default.yml} |   22 +-
 ...y.oc_case_provision.caseworker.default.yml |   50 +
 ...ay.oc_equal_opps.oc_equal_opps.default.yml |   59 +
 ...ent.volunteer_training_session.default.yml |   42 +
 ...display.oc_organisation.client.default.yml |  182 -
 ...anisation.partner_organisation.default.yml |   29 +-
 ...c_organisation.umbrella_client.default.yml |   72 -
 ...display.paragraph.availability.default.yml |   33 -
 ...ay.paragraph.emergency_contact.default.yml |   40 -
 ...ity_view_display.paragraph.fee.default.yml |   35 -
 ...view_display.paragraph.trainer.default.yml |   52 -
 ...iew_display.taxonomy_term.clie.default.yml |   22 -
 ...ay.taxonomy_term.client_status.default.yml |   31 -
 ....taxonomy_term.client_subtypes.default.yml |   31 -
 ....entity_view_display.user.user.compact.yml |   10 +-
 ....entity_view_display.user.user.default.yml |   10 +-
 ...re.entity_view_mode.block_content.full.yml |    2 +-
 .../core.entity_view_mode.comment.full.yml    |    2 +-
 .../core.entity_view_mode.feeds_feed.full.yml |   12 -
 .../core.entity_view_mode.node.full.yml       |    2 +-
 .../core.entity_view_mode.node.rss.yml        |    2 +-
 ...ore.entity_view_mode.node.search_index.yml |    2 +-
 ...re.entity_view_mode.node.search_result.yml |    2 +-
 .../core.entity_view_mode.node.teaser.yml     |    2 +-
 ...ore.entity_view_mode.paragraph.preview.yml |    2 +-
 .../core.entity_view_mode.projects.yml        |   18 -
 ...re.entity_view_mode.taxonomy_term.full.yml |    2 +-
 .../core.entity_view_mode.user.compact.yml    |    2 +-
 .../core.entity_view_mode.user.full.yml       |    2 +-
 config/optional/core.extension.yml            |   31 +-
 .../core.menu.static_menu_link_overrides.yml  |   74 +-
 config/optional/devel.settings.yml            |   12 -
 config/optional/devel.toolbar.settings.yml    |   10 -
 config/optional/editor.editor.basic_html.yml  |   12 +-
 config/optional/editor.editor.full_html.yml   |    2 +-
 ..._the_trainer_events_attended_attending.yml |   46 -
 ...eld.oc_case.accommodation.caseworkers.yml} |   26 +-
 ...extra_field.oc_case.project.activities.yml |   48 -
 ..._field.oc_case.project.billing_details.yml |   46 -
 ...field.extra_field.oc_case.project.fees.yml |   44 -
 ....extra_field.oc_case.project.trainings.yml |   54 -
 ...xtra_field.oc_case.training.activities.yml |   48 -
 ...d.extra_field.oc_case.training.debrief.yml |   46 -
 ...ield.oc_organisation.client.activities.yml |   46 -
 ....oc_organisation.client.linked_clients.yml |   48 -
 ..._field.oc_organisation.client.projects.yml |   48 -
 ...field.oc_organisation.client.trainings.yml |   53 -
 ...c_organisation.umbrella_client.clients.yml |   50 -
 ..._organisation.umbrella_client.projects.yml |   48 -
 ...nings_for_clients_within_this_umbrella.yml |   52 -
 ...ent.trainings_for_this_umbrella_client.yml |   52 -
 .../feeds.feed_type.cav_projects_2.yml        |   75 -
 .../feeds.feed_type.csv_case_provisions.yml   |   99 -
 .../optional/feeds.feed_type.csv_clients.yml  |  110 -
 ....feed_type.csv_fee_categories_and_fees.yml |   86 -
 .../optional/feeds.feed_type.csv_projects.yml |   34 -
 .../feeds.feed_type.csv_training_entities.yml |  110 -
 .../feeds.feed_type.csv_umbrella_client.yml   |   72 -
 config/optional/feeds.feed_type.trainers.yml  |   40 -
 .../field.field.block_content.basic.body.yml  |    2 +-
 ...eld.field.comment.comment.comment_body.yml |    2 +-
 .../field.field.node.article.body.yml         |    2 +-
 .../field.field.node.article.comment.yml      |    4 +-
 .../field.field.node.article.feeds_item.yml   |   23 -
 .../field.field.node.article.field_image.yml  |    4 +-
 .../field.field.node.article.field_tags.yml   |    2 +-
 .../optional/field.field.node.page.body.yml   |    2 +-
 ...estitution_funds_provided.field_amount.yml |   23 +
 ...itution_funds_provided.field_funds_for.yml |   21 +
 ...d.field.oc_activity.evaluation.field_a.yml |   23 -
 ...ivity.evaluation.field_after_knowledge.yml |   23 -
 ...activity.evaluation.field_after_skills.yml |   23 -
 ...field.oc_activity.evaluation.field_age.yml |   23 -
 ...d.field.oc_activity.evaluation.field_b.yml |   23 -
 ...ity.evaluation.field_before_confidence.yml |   23 -
 ...ctivity.evaluation.field_before_skills.yml |   23 -
 ...d.field.oc_activity.evaluation.field_d.yml |   23 -
 ...ield.oc_activity.evaluation.field_ease.yml |   23 -
 ...ld.oc_activity.evaluation.field_gender.yml |   23 -
 ...oc_activity.evaluation.field_relevance.yml |   23 -
 ...rainer_debrief.field_caption_for_photo.yml |   19 -
 ..._debrief.field_issues_and_difficulties.yml |   19 -
 ...brief.field_issues_with_group_dynamics.yml |   19 -
 ...r_debrief.field_number_of_participants.yml |   23 -
 ...c_activity.trainer_debrief.field_photo.yml |   38 -
 ...brief.field_what_came_up_for_the_group.yml |   19 -
 ...brief.field_what_could_be_improved_for.yml |   19 -
 ...brief.field_what_did_facilitators_do_w.yml |   19 -
 ...brief.field_what_real_scenarios_or_inc.yml |   19 -
 ...ld.oc_actor.client.field_asylum_status.yml |   21 +
 ...ctor.client.field_confidentiality_form.yml |   27 +
 ...ld.oc_actor.client.field_date_of_birth.yml |   21 +
 ...field.oc_actor.client.field_dependants.yml |   19 +
 ...field.oc_actor.client.field_disability.yml |   19 +
 ...d.field.oc_actor.client.field_ethnic_o.yml |   19 +
 ...or.client.field_gender_identified_with.yml |   21 +
 ...eld.oc_actor.client.field_general_noes.yml |   19 +
 ....field.oc_actor.client.field_how_heard.yml |   21 +
 ...eld.field.oc_actor.client.field_income.yml |   21 +
 ...oc_actor.client.field_languages_spoken.yml |   21 +
 ...d.field.oc_actor.client.field_marital_.yml |   21 +
 ...ld.oc_actor.client.field_nationalities.yml |   21 +
 ...ield.oc_actor.client.field_referred_by.yml |   19 +
 .../field.field.oc_actor.client.field_sex.yml |   21 +
 ...ield.field.oc_actor.trainer.feeds_item.yml |   23 -
 ...ld.field.oc_actor.trainer.field_active.yml |   23 -
 ...ld.oc_actor.trainer.field_availability.yml |   39 -
 ..._actor.trainer.field_delivery_partners.yml |   30 -
 ..._actor.trainer.field_emergency_contact.yml |   42 -
 ...rainer.field_languages_spoken_fluently.yml |   25 -
 ...eld.field.oc_actor.trainer.field_notes.yml |   21 -
 ...eld.field.oc_actor.trainer.field_photo.yml |   38 -
 ...d.field.oc_actor.trainer.field_pronoun.yml |   21 -
 ...ield.oc_actor.volunteer.field_ethnic_o.yml |   19 +
 ....oc_actor.volunteer.field_general_noes.yml |   19 +
 ...actor.volunteer.field_languages_spoken.yml |   21 +
 ...oc_actor.volunteer.field_nationalities.yml |   21 +
 ...ld.oc_actor.volunteer.field_osic_level.yml |   21 +
 ....field.oc_actor.volunteer.field_skills.yml |   19 +
 ..._case.accommodation.field_case_finance.yml |   21 +
 ...ld.oc_case.accommodation.field_outcome.yml |   21 +
 ..._case.accommodation.field_type_of_acco.yml |   21 +
 ...case.asylum_support.field_case_finance.yml |   21 +
 ...d.oc_case.asylum_support.field_outcome.yml |   21 +
 ...c_case.asylum_support.field_type_of_as.yml |   21 +
 ..._case.employability.field_case_finance.yml |   21 +
 ...loyability.field_gave_list_of_agencies.yml |   23 +
 ...ld.oc_case.employability.field_outcome.yml |   21 +
 ...ility.field_type_of_employability_help.yml |   21 +
 ...ld.field.oc_case.enquiry.field_outcome.yml |   23 +
 ..._case.enquiry.field_subject_of_enquiry.yml |   19 +
 ...ield.oc_case.health.field_case_finance.yml |   21 +
 ...eld.field.oc_case.health.field_outcome.yml |   21 +
 ...field.oc_case.health.field_type_health.yml |   21 +
 ...oc_case.immigration.field_case_finance.yml |   21 +
 ....field.oc_case.immigration.field_level.yml |   21 +
 ...ield.oc_case.immigration.field_outcome.yml |   21 +
 ...ase.immigration.field_type_of_applicat.yml |   21 +
 ...bono_immigration_service.field_outcome.yml |   21 +
 ...field.field.oc_case.project.feeds_item.yml |   23 -
 ...ase.project.field_contract_signed_date.yml |   21 -
 ....oc_case.project.field_invoicing_notes.yml |   19 -
 ...oc_case.project.field_invoicing_status.yml |   33 -
 ....oc_case.project.field_link_to_invoice.yml |   23 -
 ...ield.field.oc_case.training.feeds_item.yml |   23 -
 ...c_case.training.field_date_of_training.yml |   23 -
 ....training.field_number_of_participants.yml |   23 -
 ...d.field.oc_case.training.field_project.yml |   25 -
 ...ld.oc_case.training.field_social_media.yml |   23 -
 ...raining.field_training_delivery_format.yml |   23 -
 ...oc_case.training.field_training_status.yml |   23 -
 ...d.oc_case.training.field_training_type.yml |   21 -
 ...case.welfare_rights.field_case_finance.yml |   21 +
 ...d.oc_case.welfare_rights.field_outcome.yml |   21 +
 ...ights.field_type_of_welfare_rights_iss.yml |   21 +
 ...eld.oc_case_fee.project_fee.feeds_item.yml |   23 -
 ...c_case_provision.caseworker.field_test.yml |   31 +
 ...d.oc_case_provision.trainer.feeds_item.yml |   23 -
 ...d.oc_case_provision.trainer.field_rate.yml |   25 -
 ...case_provision.trainer.field_rate_type.yml |   23 -
 ...ield.oc_organisation.client.feeds_item.yml |   23 -
 ...sation.client.field_accreditation_date.yml |   21 -
 ...rganisation.client.field_client_status.yml |   33 -
 ...nisation.client.field_client_substatus.yml |   33 -
 ...ganisation.client.field_client_subtype.yml |   31 -
 ..._organisation.client.field_client_type.yml |   31 -
 ...client.field_how_did_you_hear_about_us.yml |   21 -
 ...ld.oc_organisation.client.field_images.yml |   40 -
 ...n.client.field_location_festival_event.yml |   19 -
 ...client.field_number_of_events_per_year.yml |   23 -
 ...anisation.client.field_number_of_staff.yml |   23 -
 ...isation.client.field_premises_capacity.yml |   23 -
 ...ield.oc_organisation.client.field_tags.yml |   29 -
 ...anisation.client.field_umbrella_client.yml |   27 -
 ...rganisation.umbrella_client.feeds_item.yml |   23 -
 ...rganisation.umbrella_client.field_tags.yml |   29 -
 ...a_client.field_type_of_umbrella_client.yml |   23 -
 ...field.paragraph.availability.field_day.yml |   23 -
 ...ield.paragraph.availability.field_time.yml |   23 -
 ...paragraph.emergency_contact.field_name.yml |   21 -
 ...aragraph.emergency_contact.field_phone.yml |   21 -
 ...h.emergency_contact.field_relationship.yml |   21 -
 ...field.field.paragraph.fee.field_amount.yml |   25 -
 ...eld.field.paragraph.fee.field_category.yml |   23 -
 ...aragraph.trainer.field_rate_if_custom_.yml |   25 -
 ....field.paragraph.trainer.field_trainer.yml |   27 -
 ...d.paragraph.trainer.field_trainer_rate.yml |   23 -
 ...d.paragraph.trainer.field_trainer_role.yml |   23 -
 ...y_term.client_status.field_substatuses.yml |   29 -
 ...term.client_subtypes.field_parent_type.yml |   31 -
 ...ld.user.user.field_last_password_reset.yml |   29 -
 ....user.user.field_linked_opencase_actor.yml |    2 +-
 ...ld.user.user.field_password_expiration.yml |   29 -
 ...ld.user.user.field_pending_expire_sent.yml |   31 -
 .../field.field.user.user.user_picture.yml    |    4 +-
 .../field.storage.block_content.body.yml      |    2 +-
 .../field.storage.comment.comment_body.yml    |    2 +-
 config/optional/field.storage.node.body.yml   |    2 +-
 .../optional/field.storage.node.comment.yml   |    2 +-
 .../field.storage.node.feeds_item.yml         |   20 -
 .../field.storage.node.field_image.yml        |    4 +-
 .../field.storage.node.field_tags.yml         |    2 +-
 .../field.storage.oc_activity.field_a.yml     |   38 -
 ...rage.oc_activity.field_after_knowledge.yml |   38 -
 ...storage.oc_activity.field_after_skills.yml |   38 -
 .../field.storage.oc_activity.field_age.yml   |   41 -
 ...ield.storage.oc_activity.field_amount.yml} |   12 +-
 ...ge.oc_activity.field_before_confidence.yml |   38 -
 ...torage.oc_activity.field_before_skills.yml |   38 -
 .../field.storage.oc_activity.field_ease.yml  |   38 -
 ...d.storage.oc_activity.field_funds_for.yml} |   23 +-
 ...field.storage.oc_activity.field_gender.yml |   44 -
 ...activity.field_issues_and_difficulties.yml |   23 -
 ...ivity.field_issues_with_group_dynamics.yml |   23 -
 .../field.storage.oc_activity.field_photo.yml |   34 -
 ...ld.storage.oc_activity.field_relevance.yml |   38 -
 ...ivity.field_what_came_up_for_the_group.yml |   23 -
 ...ivity.field_what_could_be_improved_for.yml |   23 -
 ...ivity.field_what_did_facilitators_do_w.yml |   23 -
 ...ivity.field_what_real_scenarios_or_inc.yml |   23 -
 .../field.storage.oc_actor.feeds_item.yml     |   20 -
 ...d.storage.oc_actor.field_asylum_status.yml |   27 +
 ...ld.storage.oc_actor.field_availability.yml |   23 -
 ...e.oc_actor.field_confidentiality_form.yml} |   17 +-
 ....storage.oc_actor.field_date_of_birth.yml} |   10 +-
 ...orage.oc_actor.field_delivery_partners.yml |   25 -
 ...ield.storage.oc_actor.field_dependants.yml |   21 +
 ...eld.storage.oc_actor.field_disability.yml} |   10 +-
 ...orage.oc_actor.field_emergency_contact.yml |   23 -
 ...age.oc_actor.field_equal_opportunities.yml |   23 -
 ...field.storage.oc_actor.field_ethnic_o.yml} |   12 +-
 ....oc_actor.field_gender_identified_with.yml |   30 +
 ...d.storage.oc_actor.field_general_noes.yml} |    8 +-
 ...field.storage.oc_actor.field_how_heard.yml |   39 +
 .../field.storage.oc_actor.field_income.yml   |   33 +
 ...torage.oc_actor.field_languages_spoken.yml |   36 +
 ..._actor.field_languages_spoken_fluently.yml |  239 --
 .../field.storage.oc_actor.field_marital_.yml |   30 +
 ...d.storage.oc_actor.field_nationalities.yml |  615 ++++
 ...ield.storage.oc_actor.field_osic_level.yml |   33 +
 ...eld.storage.oc_actor.field_referred_by.yml |   21 +
 .../field.storage.oc_actor.field_sex.yml      |   27 +
 ...> field.storage.oc_actor.field_skills.yml} |    8 +-
 .../field.storage.oc_case.feeds_item.yml      |   20 -
 ...eld.storage.oc_case.field_case_finance.yml |   27 +
 ...storage.oc_case.field_date_of_training.yml |   26 -
 ...e.oc_case.field_gave_list_of_agencies.yml} |   12 +-
 ...storage.oc_case.field_invoicing_status.yml |   24 -
 ... => field.storage.oc_case.field_level.yml} |   16 +-
 ....storage.oc_case.field_link_to_invoice.yml |   23 -
 ...e.oc_case.field_number_of_participants.yml |   24 -
 .../field.storage.oc_case.field_outcome.yml   |   30 +
 .../field.storage.oc_case.field_project.yml   |   23 -
 ...eld.storage.oc_case.field_social_media.yml |   22 -
 ...rage.oc_case.field_subject_of_enquiry.yml} |    8 +-
 ...oc_case.field_training_delivery_format.yml |   31 -
 ....storage.oc_case.field_training_status.yml |   40 -
 ...ld.storage.oc_case.field_training_type.yml |   43 -
 ...ield.storage.oc_case.field_type_health.yml |   33 +
 ...eld.storage.oc_case.field_type_of_acco.yml |   42 +
 ...storage.oc_case.field_type_of_applicat.yml |  108 +
 ...field.storage.oc_case.field_type_of_as.yml |   33 +
 ..._case.field_type_of_employability_help.yml |   27 +
 ..._case.field_type_of_welfare_rights_iss.yml |   45 +
 .../field.storage.oc_case_fee.feeds_item.yml  |   20 -
 ...d.storage.oc_case_provision.feeds_item.yml |   20 -
 ...d.storage.oc_case_provision.field_rate.yml |   24 -
 ...rage.oc_case_provision.field_rate_type.yml |   34 -
 ....storage.oc_case_provision.field_test.yml} |   14 +-
 ...eld.storage.oc_organisation.feeds_item.yml |   20 -
 ..._organisation.field_accreditation_date.yml |   24 -
 ...ge.oc_organisation.field_client_status.yml |   24 -
 ...oc_organisation.field_client_substatus.yml |   24 -
 ...e.oc_organisation.field_client_subtype.yml |   26 -
 ...rage.oc_organisation.field_client_type.yml |   26 -
 ...sation.field_how_did_you_hear_about_us.yml |   42 -
 ...d.storage.oc_organisation.field_images.yml |   32 -
 ...nisation.field_location_festival_event.yml |   25 -
 ...sation.field_number_of_events_per_year.yml |   20 -
 ....oc_organisation.field_number_of_staff.yml |   24 -
 ...eld.storage.oc_organisation.field_tags.yml |   24 -
 ...nisation.field_type_of_umbrella_client.yml |   35 -
 ....oc_organisation.field_umbrella_client.yml |   25 -
 ...d.storage.paragraph.field_access_needs.yml |   21 -
 .../field.storage.paragraph.field_age.yml     |   41 -
 .../field.storage.paragraph.field_amount.yml  |   26 -
 ...field.storage.paragraph.field_category.yml |   42 -
 .../field.storage.paragraph.field_day.yml     |   44 -
 .../field.storage.paragraph.field_gender.yml  |   44 -
 .../field.storage.paragraph.field_phone.yml   |   23 -
 ...storage.paragraph.field_race_ethnicity.yml |   77 -
 ...torage.paragraph.field_rate_if_custom_.yml |   26 -
 ...d.storage.paragraph.field_relationship.yml |   23 -
 ...ield.storage.paragraph.field_sexuality.yml |   23 -
 .../field.storage.paragraph.field_time.yml    |   32 -
 .../field.storage.paragraph.field_trainer.yml |   26 -
 ...d.storage.paragraph.field_trainer_rate.yml |   36 -
 ...d.storage.paragraph.field_trainer_role.yml |   29 -
 ...torage.taxonomy_term.field_parent_type.yml |   25 -
 ...torage.taxonomy_term.field_substatuses.yml |   23 -
 ...storage.user.field_last_password_reset.yml |   25 -
 ...orage.user.field_linked_opencase_actor.yml |    2 +-
 ...storage.user.field_password_expiration.yml |   23 -
 ...storage.user.field_pending_expire_sent.yml |   25 -
 .../field.storage.user.user_picture.yml       |    4 +-
 config/optional/filter.format.basic_html.yml  |    4 +-
 config/optional/filter.format.full_html.yml   |    2 +-
 config/optional/filter.format.plain_text.yml  |    2 +-
 .../filter.format.restricted_html.yml         |    4 +-
 config/optional/hal.settings.yml              |    5 +-
 config/optional/image.style.large.yml         |    2 +-
 config/optional/image.style.medium.yml        |    2 +-
 config/optional/image.style.thumbnail.yml     |    2 +-
 config/optional/image.style.wide.yml          |   17 +
 config/optional/jsonapi.settings.yml          |    4 +-
 config/optional/mailsystem.settings.yml       |   11 -
 config/optional/node.type.article.yml         |    2 +-
 config/optional/node.type.page.yml            |    2 +-
 .../opencase_cases.oc_case_fee_type.fee.yml   |    6 +
 ...ase_cases.oc_case_fee_type.project_fee.yml |    6 -
 ...ases.oc_case_provision_type.caseworker.yml |    6 +
 ...e_cases.oc_case_provision_type.trainer.yml |    6 -
 ...ncase_cases.oc_case_type.accommodation.yml |    6 +
 ...case_cases.oc_case_type.asylum_support.yml |    6 +
 ...ncase_cases.oc_case_type.employability.yml |    6 +
 .../opencase_cases.oc_case_type.enquiry.yml   |    6 +
 .../opencase_cases.oc_case_type.health.yml    |    6 +
 ...pencase_cases.oc_case_type.immigration.yml |    6 +
 ...case_type.pro_bono_immigration_service.yml |    6 +
 .../opencase_cases.oc_case_type.project.yml   |    6 -
 .../opencase_cases.oc_case_type.training.yml  |    8 -
 ...ases.oc_case_type.volunteer_engagement.yml |    6 +
 ...case_cases.oc_case_type.welfare_rights.yml |    6 +
 ..._entities.oc_activity_type.application.yml |    6 +
 ...se_entities.oc_activity_type.case_note.yml |    6 +
 ...tivity_type.destitution_funds_provided.yml |    6 +
 ...ncase_entities.oc_activity_type.email.yml} |    4 +-
 ...e_entities.oc_activity_type.evaluation.yml |    8 -
 ...se_entities.oc_activity_type.interview.yml |    6 +
 ...pencase_entities.oc_activity_type.lete.yml |    6 +
 ...e_entities.oc_activity_type.phone_call.yml |    2 +-
 ...ase_entities.oc_activity_type.research.yml |    6 +
 ..._entities.oc_activity_type.supervision.yml |    6 +
 ...ities.oc_activity_type.trainer_debrief.yml |    8 -
 ...opencase_entities.oc_actor_type.client.yml |    6 +
 ...se_entities.oc_actor_type.staff_member.yml |    6 +
 ...pencase_entities.oc_actor_type.trainer.yml |    8 -
 ...ncase_entities.oc_actor_type.volunteer.yml |    6 +
 ...tities.oc_event_type.train_the_trainer.yml |    8 -
 ..._event_type.volunteer_training_session.yml |    6 +
 ...ion_relation_type.link_between_clients.yml |    6 -
 ...e_entities.oc_organisation_type.client.yml |    8 -
 ...organisation_type.partner_organisation.yml |    6 +-
 ...s.oc_organisation_type.umbrella_client.yml |    8 -
 ...aragraphs.paragraphs_type.availability.yml |   12 -
 ...aphs.paragraphs_type.emergency_contact.yml |   12 -
 .../paragraphs.paragraphs_type.fee.yml        |   12 -
 .../paragraphs.paragraphs_type.trainer.yml    |   12 -
 config/optional/paragraphs.settings.yml       |    2 +-
 config/optional/password_policy.settings.yml  |    3 -
 .../optional/password_strength.settings.yml   |   11 -
 .../optional/rdf.mapping.comment.comment.yml  |    2 +-
 config/optional/rdf.mapping.node.article.yml  |    2 +-
 config/optional/rdf.mapping.node.page.yml     |    2 +-
 .../rdf.mapping.taxonomy_term.tags.yml        |    2 +-
 config/optional/rdf.mapping.user.user.yml     |    2 +-
 config/optional/rest.resource.entity.node.yml |   23 +
 .../rest.resource.entity.oc_organisation.yml  |   18 -
 .../rest.resource.entity.taxonomy_term.yml    |   24 -
 config/optional/rest.settings.yml             |    3 -
 config/optional/search.page.node_search.yml   |    2 +-
 config/optional/search.page.user_search.yml   |    2 +-
 config/optional/search.settings.yml           |    1 +
 config/optional/search_api.index.clients.yml  |   85 -
 .../search_api.index.default_index.yml        |  193 +
 .../search_api.index.opencase_actors.yml      |    2 +-
 .../search_api.server.default_server.yml      |   19 +
 .../search_api.server.opencase_server.yml     |    2 +-
 config/optional/search_api.settings.yml       |    4 +-
 config/optional/search_api_db.settings.yml    |    2 +-
 ...ew.check.security_review-trusted_hosts.yml |    2 -
 config/optional/security_review.settings.yml  |    8 +-
 config/optional/serialization.settings.yml    |    4 -
 config/optional/shortcut.set.default.yml      |    2 +-
 config/optional/smtp.settings.yml             |   20 +
 .../system.action.comment_delete_action.yml   |    2 +-
 .../system.action.comment_publish_action.yml  |    2 +-
 .../system.action.comment_save_action.yml     |    2 +-
 ...system.action.comment_unpublish_action.yml |    2 +-
 ...system.action.feeds_feed_delete_action.yml |   13 -
 .../system.action.node_delete_action.yml      |    2 +-
 .../system.action.node_make_sticky_action.yml |    2 +-
 ...ystem.action.node_make_unsticky_action.yml |    2 +-
 .../system.action.node_promote_action.yml     |    2 +-
 .../system.action.node_publish_action.yml     |    2 +-
 .../system.action.node_save_action.yml        |    2 +-
 .../system.action.node_unpromote_action.yml   |    2 +-
 .../system.action.node_unpublish_action.yml   |    2 +-
 ...em.action.taxonomy_term_publish_action.yml |    2 +-
 ....action.taxonomy_term_unpublish_action.yml |    2 +-
 ...ion.user_add_role_action.administrator.yml |    2 +-
 ...on.user_add_role_action.content_editor.yml |   14 +
 ....user_add_role_action.follow_up_alerts.yml |   14 -
 ...on.user_add_role_action.gno_admin_user.yml |   14 -
 ....user_add_role_action.invoicing_alerts.yml |   14 -
 ...dd_role_action.newly_accredited_alerts.yml |   14 -
 .../system.action.user_block_user_action.yml  |    2 +-
 .../system.action.user_cancel_user_action.yml |    2 +-
 ....user_remove_role_action.administrator.yml |    2 +-
 ...user_remove_role_action.content_editor.yml |   14 +
 ...er_remove_role_action.follow_up_alerts.yml |   14 -
 ...user_remove_role_action.gno_admin_user.yml |   14 -
 ...er_remove_role_action.invoicing_alerts.yml |   14 -
 ...ve_role_action.newly_accredited_alerts.yml |   14 -
 ...system.action.user_unblock_user_action.yml |    2 +-
 config/optional/system.advisories.yml         |    4 +
 config/optional/system.authorize.yml          |    3 -
 config/optional/system.date.yml               |    4 +-
 config/optional/system.logging.yml            |    2 +-
 config/optional/system.maintenance.yml        |    2 +-
 config/optional/system.menu.account.yml       |    2 +-
 config/optional/system.menu.admin.yml         |    2 +-
 config/optional/system.menu.devel.yml         |   13 -
 config/optional/system.menu.footer.yml        |    2 +-
 config/optional/system.menu.main.yml          |    2 +-
 config/optional/system.menu.opencase.yml      |    2 +-
 config/optional/system.menu.tools.yml         |    2 +-
 config/optional/system.performance.yml        |    7 +-
 config/optional/system.rss.yml                |    6 +-
 config/optional/system.site.yml               |   11 +-
 config/optional/system.theme.yml              |    2 +-
 config/optional/taxonomy.vocabulary.clie.yml  |    8 -
 .../taxonomy.vocabulary.client_status.yml     |    8 -
 .../taxonomy.vocabulary.client_subtypes.yml   |   10 -
 .../taxonomy.vocabulary.client_types.yml      |   10 -
 ...taxonomy.vocabulary.invoicing_statuses.yml |    8 -
 ...onomy.vocabulary.oc_case_provider_role.yml |    2 +-
 .../taxonomy.vocabulary.oc_fee_category.yml   |    4 +-
 config/optional/taxonomy.vocabulary.tags.yml  |    2 +-
 config/optional/tour.tour.block-layout.yml    |   48 +
 .../tour.tour.search-api-index-fields.yml     |    2 +-
 .../tour.tour.search-api-index-form.yml       |    2 +-
 .../tour.tour.search-api-index-processors.yml |    2 +-
 .../optional/tour.tour.search-api-index.yml   |    2 +-
 .../tour.tour.search-api-server-form.yml      |    2 +-
 .../optional/tour.tour.search-api-server.yml  |    2 +-
 config/optional/tour.tour.views-ui.yml        |    8 +-
 config/optional/update.settings.yml           |   13 -
 config/optional/user.mail.yml                 |  106 +-
 config/optional/user.role.administrator.yml   |    6 +-
 config/optional/user.role.anonymous.yml       |    7 +-
 config/optional/user.role.authenticated.yml   |   59 +-
 config/optional/user.role.caseworker.yml      |   22 +
 config/optional/user.role.content_editor.yml  |   48 +
 .../optional/user.role.follow_up_alerts.yml   |   12 -
 config/optional/user.role.gno_admin_user.yml  |   80 -
 .../optional/user.role.invoicing_alerts.yml   |    9 -
 .../user.role.newly_accredited_alerts.yml     |    9 -
 config/optional/user.role.opencase_admin.yml  |   51 +
 config/optional/user.role.overseer.yml        |   26 +
 .../optional/user.role.volunteer_co_ord.yml   |   21 +
 config/optional/user.settings.yml             |    4 +-
 config/optional/views.settings.yml            |    8 +-
 ...out_case.yml => views.view.activities.yml} |  531 ++-
 config/optional/views.view.actor_search.yml   |  158 +-
 config/optional/views.view.actors.yml         |  100 +-
 config/optional/views.view.all_clients.yml    | 1628 ---------
 config/optional/views.view.all_trainers.yml   |  527 ---
 .../views.view.all_umbrella_clients.yml       |  606 ----
 config/optional/views.view.archive.yml        |    6 +-
 config/optional/views.view.block_content.yml  |    8 +-
 .../optional/views.view.case_fees_report.yml  | 1350 -------
 config/optional/views.view.case_providers.yml |   80 +-
 .../views.view.case_provision_report.yml      |  772 ----
 .../optional/views.view.case_provisions.yml   |  779 ++--
 ...lling_details.yml => views.view.cases.yml} |  446 +--
 config/optional/views.view.client_report.yml  | 1373 -------
 config/optional/views.view.comment.yml        |    8 +-
 .../optional/views.view.comments_recent.yml   |    7 +-
 .../views.view.contact_details_changes.yml    |   31 +-
 config/optional/views.view.content.yml        |    6 +-
 config/optional/views.view.content_recent.yml |    6 +-
 config/optional/views.view.debrief_report.yml |  726 ----
 config/optional/views.view.debriefs.yml       |  560 ---
 .../views.view.equal_opps_records.yml         |   16 +-
 .../optional/views.view.evaluation_report.yml | 1685 ---------
 config/optional/views.view.evaluations.yml    |  547 ---
 config/optional/views.view.fees.yml           |  436 ---
 config/optional/views.view.files.yml          |    6 +-
 config/optional/views.view.frontpage.yml      |    6 +-
 config/optional/views.view.glossary.yml       |   32 +-
 ...=> views.view.name_and_status_changes.yml} |  510 ++-
 .../views.view.organisation_relations.yml     |  287 --
 config/optional/views.view.organisations.yml  |    6 +-
 config/optional/views.view.projects.yml       |  813 -----
 ...views.view.sample_downloadable_report.yml} |  230 +-
 config/optional/views.view.search_content.yml |  168 +
 config/optional/views.view.taxonomy_term.yml  |    6 +-
 .../views.view.train_the_trainer_events.yml   |  397 --
 .../optional/views.view.training_report.yml   |  695 ----
 config/optional/views.view.trainings.yml      | 3186 -----------------
 .../optional/views.view.user_admin_people.yml |    6 +-
 config/optional/views.view.watchdog.yml       |    8 +-
 config/optional/views.view.who_s_new.yml      |    6 +-
 config/optional/views.view.who_s_online.yml   |    6 +-
 .../optional/views_natural_sort.settings.yml  |   30 -
 663 files changed, 8373 insertions(+), 27768 deletions(-)
 delete mode 100644 config/optional/block.block.accreditationcount.yml
 create mode 100644 config/optional/block.block.addactivity.yml
 delete mode 100644 config/optional/block.block.bartik_gno_account_menu.yml
 delete mode 100644 config/optional/block.block.bartik_gno_accreditationcount.yml
 delete mode 100644 config/optional/block.block.bartik_gno_actortypehelp.yml
 delete mode 100644 config/optional/block.block.bartik_gno_branding.yml
 delete mode 100644 config/optional/block.block.bartik_gno_content.yml
 delete mode 100644 config/optional/block.block.bartik_gno_exposedformactor_searchpage_1.yml
 delete mode 100644 config/optional/block.block.bartik_gno_exposedformcase_fees_reportpage_1.yml
 delete mode 100644 config/optional/block.block.bartik_gno_exposedformcase_provision_reportpage_1.yml
 delete mode 100644 config/optional/block.block.bartik_gno_exposedformclient_reportpage_1.yml
 delete mode 100644 config/optional/block.block.bartik_gno_exposedformdebrief_reportpage_1.yml
 delete mode 100644 config/optional/block.block.bartik_gno_exposedformequal_opps_recordspage_1.yml
 delete mode 100644 config/optional/block.block.bartik_gno_exposedformevaluation_reportpage_1.yml
 delete mode 100644 config/optional/block.block.bartik_gno_footer.yml
 delete mode 100644 config/optional/block.block.bartik_gno_help.yml
 delete mode 100644 config/optional/block.block.bartik_gno_local_actions.yml
 delete mode 100644 config/optional/block.block.bartik_gno_local_tasks.yml
 delete mode 100644 config/optional/block.block.bartik_gno_messages.yml
 delete mode 100644 config/optional/block.block.bartik_gno_opencase.yml
 delete mode 100644 config/optional/block.block.bartik_gno_page_title.yml
 delete mode 100644 config/optional/block.block.bartik_gno_powered.yml
 delete mode 100644 config/optional/block.block.exposedformcase_fees_reportpage_1.yml
 delete mode 100644 config/optional/block.block.exposedformcase_provision_reportpage_1.yml
 delete mode 100644 config/optional/block.block.exposedformclient_reportpage_1.yml
 delete mode 100644 config/optional/block.block.exposedformdebrief_reportpage_1.yml
 delete mode 100644 config/optional/block.block.exposedformevaluation_reportpage_1.yml
 create mode 100644 config/optional/block.block.views_block__activities_block_1.yml
 delete mode 100644 config/optional/content_as_config.config.yml
 delete mode 100644 config/optional/content_as_config.taxonomy_term.yml
 delete mode 100644 config/optional/core.base_field_override.oc_case_provision.trainer.oc_provider.yml
 delete mode 100644 config/optional/core.base_field_override.oc_organisation_relation.link_between_clients.organisations.yml
 rename config/optional/{core.entity_form_display.taxonomy_term.client_subtypes.default.yml => core.entity_form_display.oc_activity.application.default.yml} (54%)
 rename config/optional/{core.entity_form_display.taxonomy_term.client_status.default.yml => core.entity_form_display.oc_activity.case_note.default.yml} (54%)
 create mode 100644 config/optional/core.entity_form_display.oc_activity.destitution_funds_provided.default.yml
 create mode 100644 config/optional/core.entity_form_display.oc_activity.email.default.yml
 delete mode 100644 config/optional/core.entity_form_display.oc_activity.evaluation.default.yml
 create mode 100644 config/optional/core.entity_form_display.oc_activity.interview.default.yml
 create mode 100644 config/optional/core.entity_form_display.oc_activity.lete.default.yml
 create mode 100644 config/optional/core.entity_form_display.oc_activity.research.default.yml
 create mode 100644 config/optional/core.entity_form_display.oc_activity.supervision.default.yml
 delete mode 100644 config/optional/core.entity_form_display.oc_activity.trainer_debrief.default.yml
 create mode 100644 config/optional/core.entity_form_display.oc_actor.client.default.yml
 create mode 100644 config/optional/core.entity_form_display.oc_actor.staff_member.default.yml
 delete mode 100644 config/optional/core.entity_form_display.oc_actor.trainer.default.yml
 create mode 100644 config/optional/core.entity_form_display.oc_actor.volunteer.default.yml
 rename config/optional/{core.entity_form_display.oc_case.project.default.yml => core.entity_form_display.oc_case.accommodation.default.yml} (52%)
 create mode 100644 config/optional/core.entity_form_display.oc_case.asylum_support.default.yml
 create mode 100644 config/optional/core.entity_form_display.oc_case.employability.default.yml
 create mode 100644 config/optional/core.entity_form_display.oc_case.enquiry.default.yml
 create mode 100644 config/optional/core.entity_form_display.oc_case.health.default.yml
 create mode 100644 config/optional/core.entity_form_display.oc_case.immigration.default.yml
 create mode 100644 config/optional/core.entity_form_display.oc_case.pro_bono_immigration_service.default.yml
 delete mode 100644 config/optional/core.entity_form_display.oc_case.training.default.yml
 create mode 100644 config/optional/core.entity_form_display.oc_case.welfare_rights.default.yml
 create mode 100644 config/optional/core.entity_form_display.oc_case_fee.fee.default.yml
 delete mode 100644 config/optional/core.entity_form_display.oc_case_fee.project_fee.default.yml
 create mode 100644 config/optional/core.entity_form_display.oc_case_provision.caseworker.default.yml
 delete mode 100644 config/optional/core.entity_form_display.oc_case_provision.trainer.default.yml
 create mode 100644 config/optional/core.entity_form_display.oc_equal_opps.oc_equal_opps.default.yml
 delete mode 100644 config/optional/core.entity_form_display.oc_event.train_the_trainer.default.yml
 rename config/optional/{core.entity_form_display.oc_activity.emi.default.yml => core.entity_form_display.oc_event.volunteer_training_session.default.yml} (56%)
 delete mode 100644 config/optional/core.entity_form_display.oc_organisation.client.default.yml
 delete mode 100644 config/optional/core.entity_form_display.oc_organisation.umbrella_client.default.yml
 delete mode 100644 config/optional/core.entity_form_display.paragraph.availability.default.yml
 delete mode 100644 config/optional/core.entity_form_display.paragraph.emergency_contact.default.yml
 delete mode 100644 config/optional/core.entity_form_display.paragraph.fee.default.yml
 delete mode 100644 config/optional/core.entity_form_display.paragraph.trainer.default.yml
 delete mode 100644 config/optional/core.entity_form_display.taxonomy_term.clie.default.yml
 create mode 100644 config/optional/core.entity_view_display.node.article.search_index.yml
 create mode 100644 config/optional/core.entity_view_display.node.article.search_result.yml
 create mode 100644 config/optional/core.entity_view_display.node.page.search_index.yml
 create mode 100644 config/optional/core.entity_view_display.node.page.search_result.yml
 create mode 100644 config/optional/core.entity_view_display.oc_activity.application.default.yml
 rename config/optional/{core.entity_view_display.oc_case_provision.trainer.default.yml => core.entity_view_display.oc_activity.case_note.default.yml} (56%)
 create mode 100644 config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml
 create mode 100644 config/optional/core.entity_view_display.oc_activity.email.default.yml
 delete mode 100644 config/optional/core.entity_view_display.oc_activity.evaluation.default.yml
 create mode 100644 config/optional/core.entity_view_display.oc_activity.interview.default.yml
 rename config/optional/{core.entity_view_display.oc_activity.emi.default.yml => core.entity_view_display.oc_activity.lete.default.yml} (69%)
 create mode 100644 config/optional/core.entity_view_display.oc_activity.research.default.yml
 create mode 100644 config/optional/core.entity_view_display.oc_activity.supervision.default.yml
 delete mode 100644 config/optional/core.entity_view_display.oc_activity.trainer_debrief.default.yml
 create mode 100644 config/optional/core.entity_view_display.oc_actor.client.default.yml
 create mode 100644 config/optional/core.entity_view_display.oc_actor.staff_member.default.yml
 delete mode 100644 config/optional/core.entity_view_display.oc_actor.trainer.default.yml
 create mode 100644 config/optional/core.entity_view_display.oc_actor.volunteer.default.yml
 create mode 100644 config/optional/core.entity_view_display.oc_case.accommodation.default.yml
 create mode 100644 config/optional/core.entity_view_display.oc_case.asylum_support.default.yml
 create mode 100644 config/optional/core.entity_view_display.oc_case.employability.default.yml
 create mode 100644 config/optional/core.entity_view_display.oc_case.enquiry.default.yml
 create mode 100644 config/optional/core.entity_view_display.oc_case.health.default.yml
 create mode 100644 config/optional/core.entity_view_display.oc_case.immigration.default.yml
 create mode 100644 config/optional/core.entity_view_display.oc_case.pro_bono_immigration_service.default.yml
 delete mode 100644 config/optional/core.entity_view_display.oc_case.project.default.yml
 delete mode 100644 config/optional/core.entity_view_display.oc_case.training.default.yml
 create mode 100644 config/optional/core.entity_view_display.oc_case.welfare_rights.default.yml
 rename config/optional/{core.entity_view_display.oc_case_fee.project_fee.default.yml => core.entity_view_display.oc_case_fee.fee.default.yml} (58%)
 create mode 100644 config/optional/core.entity_view_display.oc_case_provision.caseworker.default.yml
 create mode 100644 config/optional/core.entity_view_display.oc_equal_opps.oc_equal_opps.default.yml
 create mode 100644 config/optional/core.entity_view_display.oc_event.volunteer_training_session.default.yml
 delete mode 100644 config/optional/core.entity_view_display.oc_organisation.client.default.yml
 delete mode 100644 config/optional/core.entity_view_display.oc_organisation.umbrella_client.default.yml
 delete mode 100644 config/optional/core.entity_view_display.paragraph.availability.default.yml
 delete mode 100644 config/optional/core.entity_view_display.paragraph.emergency_contact.default.yml
 delete mode 100644 config/optional/core.entity_view_display.paragraph.fee.default.yml
 delete mode 100644 config/optional/core.entity_view_display.paragraph.trainer.default.yml
 delete mode 100644 config/optional/core.entity_view_display.taxonomy_term.clie.default.yml
 delete mode 100644 config/optional/core.entity_view_display.taxonomy_term.client_status.default.yml
 delete mode 100644 config/optional/core.entity_view_display.taxonomy_term.client_subtypes.default.yml
 delete mode 100644 config/optional/core.entity_view_mode.feeds_feed.full.yml
 delete mode 100644 config/optional/core.entity_view_mode.projects.yml
 delete mode 100644 config/optional/devel.settings.yml
 delete mode 100644 config/optional/devel.toolbar.settings.yml
 delete mode 100644 config/optional/entity_extra_field.extra_field.oc_actor.trainer.train_the_trainer_events_attended_attending.yml
 rename config/optional/{entity_extra_field.extra_field.oc_case.training.trainers.yml => entity_extra_field.extra_field.oc_case.accommodation.caseworkers.yml} (55%)
 delete mode 100644 config/optional/entity_extra_field.extra_field.oc_case.project.activities.yml
 delete mode 100644 config/optional/entity_extra_field.extra_field.oc_case.project.billing_details.yml
 delete mode 100644 config/optional/entity_extra_field.extra_field.oc_case.project.fees.yml
 delete mode 100644 config/optional/entity_extra_field.extra_field.oc_case.project.trainings.yml
 delete mode 100644 config/optional/entity_extra_field.extra_field.oc_case.training.activities.yml
 delete mode 100644 config/optional/entity_extra_field.extra_field.oc_case.training.debrief.yml
 delete mode 100644 config/optional/entity_extra_field.extra_field.oc_organisation.client.activities.yml
 delete mode 100644 config/optional/entity_extra_field.extra_field.oc_organisation.client.linked_clients.yml
 delete mode 100644 config/optional/entity_extra_field.extra_field.oc_organisation.client.projects.yml
 delete mode 100644 config/optional/entity_extra_field.extra_field.oc_organisation.client.trainings.yml
 delete mode 100644 config/optional/entity_extra_field.extra_field.oc_organisation.umbrella_client.clients.yml
 delete mode 100644 config/optional/entity_extra_field.extra_field.oc_organisation.umbrella_client.projects.yml
 delete mode 100644 config/optional/entity_extra_field.extra_field.oc_organisation.umbrella_client.trainings_for_clients_within_this_umbrella.yml
 delete mode 100644 config/optional/entity_extra_field.extra_field.oc_organisation.umbrella_client.trainings_for_this_umbrella_client.yml
 delete mode 100644 config/optional/feeds.feed_type.cav_projects_2.yml
 delete mode 100644 config/optional/feeds.feed_type.csv_case_provisions.yml
 delete mode 100644 config/optional/feeds.feed_type.csv_clients.yml
 delete mode 100644 config/optional/feeds.feed_type.csv_fee_categories_and_fees.yml
 delete mode 100644 config/optional/feeds.feed_type.csv_projects.yml
 delete mode 100644 config/optional/feeds.feed_type.csv_training_entities.yml
 delete mode 100644 config/optional/feeds.feed_type.csv_umbrella_client.yml
 delete mode 100644 config/optional/feeds.feed_type.trainers.yml
 delete mode 100644 config/optional/field.field.node.article.feeds_item.yml
 create mode 100644 config/optional/field.field.oc_activity.destitution_funds_provided.field_amount.yml
 create mode 100644 config/optional/field.field.oc_activity.destitution_funds_provided.field_funds_for.yml
 delete mode 100644 config/optional/field.field.oc_activity.evaluation.field_a.yml
 delete mode 100644 config/optional/field.field.oc_activity.evaluation.field_after_knowledge.yml
 delete mode 100644 config/optional/field.field.oc_activity.evaluation.field_after_skills.yml
 delete mode 100644 config/optional/field.field.oc_activity.evaluation.field_age.yml
 delete mode 100644 config/optional/field.field.oc_activity.evaluation.field_b.yml
 delete mode 100644 config/optional/field.field.oc_activity.evaluation.field_before_confidence.yml
 delete mode 100644 config/optional/field.field.oc_activity.evaluation.field_before_skills.yml
 delete mode 100644 config/optional/field.field.oc_activity.evaluation.field_d.yml
 delete mode 100644 config/optional/field.field.oc_activity.evaluation.field_ease.yml
 delete mode 100644 config/optional/field.field.oc_activity.evaluation.field_gender.yml
 delete mode 100644 config/optional/field.field.oc_activity.evaluation.field_relevance.yml
 delete mode 100644 config/optional/field.field.oc_activity.trainer_debrief.field_caption_for_photo.yml
 delete mode 100644 config/optional/field.field.oc_activity.trainer_debrief.field_issues_and_difficulties.yml
 delete mode 100644 config/optional/field.field.oc_activity.trainer_debrief.field_issues_with_group_dynamics.yml
 delete mode 100644 config/optional/field.field.oc_activity.trainer_debrief.field_number_of_participants.yml
 delete mode 100644 config/optional/field.field.oc_activity.trainer_debrief.field_photo.yml
 delete mode 100644 config/optional/field.field.oc_activity.trainer_debrief.field_what_came_up_for_the_group.yml
 delete mode 100644 config/optional/field.field.oc_activity.trainer_debrief.field_what_could_be_improved_for.yml
 delete mode 100644 config/optional/field.field.oc_activity.trainer_debrief.field_what_did_facilitators_do_w.yml
 delete mode 100644 config/optional/field.field.oc_activity.trainer_debrief.field_what_real_scenarios_or_inc.yml
 create mode 100644 config/optional/field.field.oc_actor.client.field_asylum_status.yml
 create mode 100644 config/optional/field.field.oc_actor.client.field_confidentiality_form.yml
 create mode 100644 config/optional/field.field.oc_actor.client.field_date_of_birth.yml
 create mode 100644 config/optional/field.field.oc_actor.client.field_dependants.yml
 create mode 100644 config/optional/field.field.oc_actor.client.field_disability.yml
 create mode 100644 config/optional/field.field.oc_actor.client.field_ethnic_o.yml
 create mode 100644 config/optional/field.field.oc_actor.client.field_gender_identified_with.yml
 create mode 100644 config/optional/field.field.oc_actor.client.field_general_noes.yml
 create mode 100644 config/optional/field.field.oc_actor.client.field_how_heard.yml
 create mode 100644 config/optional/field.field.oc_actor.client.field_income.yml
 create mode 100644 config/optional/field.field.oc_actor.client.field_languages_spoken.yml
 create mode 100644 config/optional/field.field.oc_actor.client.field_marital_.yml
 create mode 100644 config/optional/field.field.oc_actor.client.field_nationalities.yml
 create mode 100644 config/optional/field.field.oc_actor.client.field_referred_by.yml
 create mode 100644 config/optional/field.field.oc_actor.client.field_sex.yml
 delete mode 100644 config/optional/field.field.oc_actor.trainer.feeds_item.yml
 delete mode 100644 config/optional/field.field.oc_actor.trainer.field_active.yml
 delete mode 100644 config/optional/field.field.oc_actor.trainer.field_availability.yml
 delete mode 100644 config/optional/field.field.oc_actor.trainer.field_delivery_partners.yml
 delete mode 100644 config/optional/field.field.oc_actor.trainer.field_emergency_contact.yml
 delete mode 100644 config/optional/field.field.oc_actor.trainer.field_languages_spoken_fluently.yml
 delete mode 100644 config/optional/field.field.oc_actor.trainer.field_notes.yml
 delete mode 100644 config/optional/field.field.oc_actor.trainer.field_photo.yml
 delete mode 100644 config/optional/field.field.oc_actor.trainer.field_pronoun.yml
 create mode 100644 config/optional/field.field.oc_actor.volunteer.field_ethnic_o.yml
 create mode 100644 config/optional/field.field.oc_actor.volunteer.field_general_noes.yml
 create mode 100644 config/optional/field.field.oc_actor.volunteer.field_languages_spoken.yml
 create mode 100644 config/optional/field.field.oc_actor.volunteer.field_nationalities.yml
 create mode 100644 config/optional/field.field.oc_actor.volunteer.field_osic_level.yml
 create mode 100644 config/optional/field.field.oc_actor.volunteer.field_skills.yml
 create mode 100644 config/optional/field.field.oc_case.accommodation.field_case_finance.yml
 create mode 100644 config/optional/field.field.oc_case.accommodation.field_outcome.yml
 create mode 100644 config/optional/field.field.oc_case.accommodation.field_type_of_acco.yml
 create mode 100644 config/optional/field.field.oc_case.asylum_support.field_case_finance.yml
 create mode 100644 config/optional/field.field.oc_case.asylum_support.field_outcome.yml
 create mode 100644 config/optional/field.field.oc_case.asylum_support.field_type_of_as.yml
 create mode 100644 config/optional/field.field.oc_case.employability.field_case_finance.yml
 create mode 100644 config/optional/field.field.oc_case.employability.field_gave_list_of_agencies.yml
 create mode 100644 config/optional/field.field.oc_case.employability.field_outcome.yml
 create mode 100644 config/optional/field.field.oc_case.employability.field_type_of_employability_help.yml
 create mode 100644 config/optional/field.field.oc_case.enquiry.field_outcome.yml
 create mode 100644 config/optional/field.field.oc_case.enquiry.field_subject_of_enquiry.yml
 create mode 100644 config/optional/field.field.oc_case.health.field_case_finance.yml
 create mode 100644 config/optional/field.field.oc_case.health.field_outcome.yml
 create mode 100644 config/optional/field.field.oc_case.health.field_type_health.yml
 create mode 100644 config/optional/field.field.oc_case.immigration.field_case_finance.yml
 create mode 100644 config/optional/field.field.oc_case.immigration.field_level.yml
 create mode 100644 config/optional/field.field.oc_case.immigration.field_outcome.yml
 create mode 100644 config/optional/field.field.oc_case.immigration.field_type_of_applicat.yml
 create mode 100644 config/optional/field.field.oc_case.pro_bono_immigration_service.field_outcome.yml
 delete mode 100644 config/optional/field.field.oc_case.project.feeds_item.yml
 delete mode 100644 config/optional/field.field.oc_case.project.field_contract_signed_date.yml
 delete mode 100644 config/optional/field.field.oc_case.project.field_invoicing_notes.yml
 delete mode 100644 config/optional/field.field.oc_case.project.field_invoicing_status.yml
 delete mode 100644 config/optional/field.field.oc_case.project.field_link_to_invoice.yml
 delete mode 100644 config/optional/field.field.oc_case.training.feeds_item.yml
 delete mode 100644 config/optional/field.field.oc_case.training.field_date_of_training.yml
 delete mode 100644 config/optional/field.field.oc_case.training.field_number_of_participants.yml
 delete mode 100644 config/optional/field.field.oc_case.training.field_project.yml
 delete mode 100644 config/optional/field.field.oc_case.training.field_social_media.yml
 delete mode 100644 config/optional/field.field.oc_case.training.field_training_delivery_format.yml
 delete mode 100644 config/optional/field.field.oc_case.training.field_training_status.yml
 delete mode 100644 config/optional/field.field.oc_case.training.field_training_type.yml
 create mode 100644 config/optional/field.field.oc_case.welfare_rights.field_case_finance.yml
 create mode 100644 config/optional/field.field.oc_case.welfare_rights.field_outcome.yml
 create mode 100644 config/optional/field.field.oc_case.welfare_rights.field_type_of_welfare_rights_iss.yml
 delete mode 100644 config/optional/field.field.oc_case_fee.project_fee.feeds_item.yml
 create mode 100644 config/optional/field.field.oc_case_provision.caseworker.field_test.yml
 delete mode 100644 config/optional/field.field.oc_case_provision.trainer.feeds_item.yml
 delete mode 100644 config/optional/field.field.oc_case_provision.trainer.field_rate.yml
 delete mode 100644 config/optional/field.field.oc_case_provision.trainer.field_rate_type.yml
 delete mode 100644 config/optional/field.field.oc_organisation.client.feeds_item.yml
 delete mode 100644 config/optional/field.field.oc_organisation.client.field_accreditation_date.yml
 delete mode 100644 config/optional/field.field.oc_organisation.client.field_client_status.yml
 delete mode 100644 config/optional/field.field.oc_organisation.client.field_client_substatus.yml
 delete mode 100644 config/optional/field.field.oc_organisation.client.field_client_subtype.yml
 delete mode 100644 config/optional/field.field.oc_organisation.client.field_client_type.yml
 delete mode 100644 config/optional/field.field.oc_organisation.client.field_how_did_you_hear_about_us.yml
 delete mode 100644 config/optional/field.field.oc_organisation.client.field_images.yml
 delete mode 100644 config/optional/field.field.oc_organisation.client.field_location_festival_event.yml
 delete mode 100644 config/optional/field.field.oc_organisation.client.field_number_of_events_per_year.yml
 delete mode 100644 config/optional/field.field.oc_organisation.client.field_number_of_staff.yml
 delete mode 100644 config/optional/field.field.oc_organisation.client.field_premises_capacity.yml
 delete mode 100644 config/optional/field.field.oc_organisation.client.field_tags.yml
 delete mode 100644 config/optional/field.field.oc_organisation.client.field_umbrella_client.yml
 delete mode 100644 config/optional/field.field.oc_organisation.umbrella_client.feeds_item.yml
 delete mode 100644 config/optional/field.field.oc_organisation.umbrella_client.field_tags.yml
 delete mode 100644 config/optional/field.field.oc_organisation.umbrella_client.field_type_of_umbrella_client.yml
 delete mode 100644 config/optional/field.field.paragraph.availability.field_day.yml
 delete mode 100644 config/optional/field.field.paragraph.availability.field_time.yml
 delete mode 100644 config/optional/field.field.paragraph.emergency_contact.field_name.yml
 delete mode 100644 config/optional/field.field.paragraph.emergency_contact.field_phone.yml
 delete mode 100644 config/optional/field.field.paragraph.emergency_contact.field_relationship.yml
 delete mode 100644 config/optional/field.field.paragraph.fee.field_amount.yml
 delete mode 100644 config/optional/field.field.paragraph.fee.field_category.yml
 delete mode 100644 config/optional/field.field.paragraph.trainer.field_rate_if_custom_.yml
 delete mode 100644 config/optional/field.field.paragraph.trainer.field_trainer.yml
 delete mode 100644 config/optional/field.field.paragraph.trainer.field_trainer_rate.yml
 delete mode 100644 config/optional/field.field.paragraph.trainer.field_trainer_role.yml
 delete mode 100644 config/optional/field.field.taxonomy_term.client_status.field_substatuses.yml
 delete mode 100644 config/optional/field.field.taxonomy_term.client_subtypes.field_parent_type.yml
 delete mode 100644 config/optional/field.field.user.user.field_last_password_reset.yml
 delete mode 100644 config/optional/field.field.user.user.field_password_expiration.yml
 delete mode 100644 config/optional/field.field.user.user.field_pending_expire_sent.yml
 delete mode 100644 config/optional/field.storage.node.feeds_item.yml
 delete mode 100644 config/optional/field.storage.oc_activity.field_a.yml
 delete mode 100644 config/optional/field.storage.oc_activity.field_after_knowledge.yml
 delete mode 100644 config/optional/field.storage.oc_activity.field_after_skills.yml
 delete mode 100644 config/optional/field.storage.oc_activity.field_age.yml
 rename config/optional/{field.storage.oc_activity.field_number_of_participants.yml => field.storage.oc_activity.field_amount.yml} (57%)
 delete mode 100644 config/optional/field.storage.oc_activity.field_before_confidence.yml
 delete mode 100644 config/optional/field.storage.oc_activity.field_before_skills.yml
 delete mode 100644 config/optional/field.storage.oc_activity.field_ease.yml
 rename config/optional/{field.storage.oc_activity.field_d.yml => field.storage.oc_activity.field_funds_for.yml} (57%)
 delete mode 100644 config/optional/field.storage.oc_activity.field_gender.yml
 delete mode 100644 config/optional/field.storage.oc_activity.field_issues_and_difficulties.yml
 delete mode 100644 config/optional/field.storage.oc_activity.field_issues_with_group_dynamics.yml
 delete mode 100644 config/optional/field.storage.oc_activity.field_photo.yml
 delete mode 100644 config/optional/field.storage.oc_activity.field_relevance.yml
 delete mode 100644 config/optional/field.storage.oc_activity.field_what_came_up_for_the_group.yml
 delete mode 100644 config/optional/field.storage.oc_activity.field_what_could_be_improved_for.yml
 delete mode 100644 config/optional/field.storage.oc_activity.field_what_did_facilitators_do_w.yml
 delete mode 100644 config/optional/field.storage.oc_activity.field_what_real_scenarios_or_inc.yml
 delete mode 100644 config/optional/field.storage.oc_actor.feeds_item.yml
 create mode 100644 config/optional/field.storage.oc_actor.field_asylum_status.yml
 delete mode 100644 config/optional/field.storage.oc_actor.field_availability.yml
 rename config/optional/{field.storage.oc_actor.field_photo.yml => field.storage.oc_actor.field_confidentiality_form.yml} (59%)
 rename config/optional/{field.storage.oc_case.field_contract_signed_date.yml => field.storage.oc_actor.field_date_of_birth.yml} (59%)
 delete mode 100644 config/optional/field.storage.oc_actor.field_delivery_partners.yml
 create mode 100644 config/optional/field.storage.oc_actor.field_dependants.yml
 rename config/optional/{field.storage.oc_actor.field_pronoun.yml => field.storage.oc_actor.field_disability.yml} (60%)
 delete mode 100644 config/optional/field.storage.oc_actor.field_emergency_contact.yml
 delete mode 100644 config/optional/field.storage.oc_actor.field_equal_opportunities.yml
 rename config/optional/{field.storage.paragraph.field_name.yml => field.storage.oc_actor.field_ethnic_o.yml} (55%)
 create mode 100644 config/optional/field.storage.oc_actor.field_gender_identified_with.yml
 rename config/optional/{field.storage.oc_activity.field_caption_for_photo.yml => field.storage.oc_actor.field_general_noes.yml} (63%)
 create mode 100644 config/optional/field.storage.oc_actor.field_how_heard.yml
 create mode 100644 config/optional/field.storage.oc_actor.field_income.yml
 create mode 100644 config/optional/field.storage.oc_actor.field_languages_spoken.yml
 delete mode 100644 config/optional/field.storage.oc_actor.field_languages_spoken_fluently.yml
 create mode 100644 config/optional/field.storage.oc_actor.field_marital_.yml
 create mode 100644 config/optional/field.storage.oc_actor.field_nationalities.yml
 create mode 100644 config/optional/field.storage.oc_actor.field_osic_level.yml
 create mode 100644 config/optional/field.storage.oc_actor.field_referred_by.yml
 create mode 100644 config/optional/field.storage.oc_actor.field_sex.yml
 rename config/optional/{field.storage.oc_actor.field_notes.yml => field.storage.oc_actor.field_skills.yml} (62%)
 delete mode 100644 config/optional/field.storage.oc_case.feeds_item.yml
 create mode 100644 config/optional/field.storage.oc_case.field_case_finance.yml
 delete mode 100644 config/optional/field.storage.oc_case.field_date_of_training.yml
 rename config/optional/{field.storage.oc_actor.field_active.yml => field.storage.oc_case.field_gave_list_of_agencies.yml} (52%)
 delete mode 100644 config/optional/field.storage.oc_case.field_invoicing_status.yml
 rename config/optional/{field.storage.oc_activity.field_b.yml => field.storage.oc_case.field_level.yml} (60%)
 delete mode 100644 config/optional/field.storage.oc_case.field_link_to_invoice.yml
 delete mode 100644 config/optional/field.storage.oc_case.field_number_of_participants.yml
 create mode 100644 config/optional/field.storage.oc_case.field_outcome.yml
 delete mode 100644 config/optional/field.storage.oc_case.field_project.yml
 delete mode 100644 config/optional/field.storage.oc_case.field_social_media.yml
 rename config/optional/{field.storage.oc_case.field_invoicing_notes.yml => field.storage.oc_case.field_subject_of_enquiry.yml} (63%)
 delete mode 100644 config/optional/field.storage.oc_case.field_training_delivery_format.yml
 delete mode 100644 config/optional/field.storage.oc_case.field_training_status.yml
 delete mode 100644 config/optional/field.storage.oc_case.field_training_type.yml
 create mode 100644 config/optional/field.storage.oc_case.field_type_health.yml
 create mode 100644 config/optional/field.storage.oc_case.field_type_of_acco.yml
 create mode 100644 config/optional/field.storage.oc_case.field_type_of_applicat.yml
 create mode 100644 config/optional/field.storage.oc_case.field_type_of_as.yml
 create mode 100644 config/optional/field.storage.oc_case.field_type_of_employability_help.yml
 create mode 100644 config/optional/field.storage.oc_case.field_type_of_welfare_rights_iss.yml
 delete mode 100644 config/optional/field.storage.oc_case_fee.feeds_item.yml
 delete mode 100644 config/optional/field.storage.oc_case_provision.feeds_item.yml
 delete mode 100644 config/optional/field.storage.oc_case_provision.field_rate.yml
 delete mode 100644 config/optional/field.storage.oc_case_provision.field_rate_type.yml
 rename config/optional/{field.storage.oc_organisation.field_premises_capacity.yml => field.storage.oc_case_provision.field_test.yml} (51%)
 delete mode 100644 config/optional/field.storage.oc_organisation.feeds_item.yml
 delete mode 100644 config/optional/field.storage.oc_organisation.field_accreditation_date.yml
 delete mode 100644 config/optional/field.storage.oc_organisation.field_client_status.yml
 delete mode 100644 config/optional/field.storage.oc_organisation.field_client_substatus.yml
 delete mode 100644 config/optional/field.storage.oc_organisation.field_client_subtype.yml
 delete mode 100644 config/optional/field.storage.oc_organisation.field_client_type.yml
 delete mode 100644 config/optional/field.storage.oc_organisation.field_how_did_you_hear_about_us.yml
 delete mode 100644 config/optional/field.storage.oc_organisation.field_images.yml
 delete mode 100644 config/optional/field.storage.oc_organisation.field_location_festival_event.yml
 delete mode 100644 config/optional/field.storage.oc_organisation.field_number_of_events_per_year.yml
 delete mode 100644 config/optional/field.storage.oc_organisation.field_number_of_staff.yml
 delete mode 100644 config/optional/field.storage.oc_organisation.field_tags.yml
 delete mode 100644 config/optional/field.storage.oc_organisation.field_type_of_umbrella_client.yml
 delete mode 100644 config/optional/field.storage.oc_organisation.field_umbrella_client.yml
 delete mode 100644 config/optional/field.storage.paragraph.field_access_needs.yml
 delete mode 100644 config/optional/field.storage.paragraph.field_age.yml
 delete mode 100644 config/optional/field.storage.paragraph.field_amount.yml
 delete mode 100644 config/optional/field.storage.paragraph.field_category.yml
 delete mode 100644 config/optional/field.storage.paragraph.field_day.yml
 delete mode 100644 config/optional/field.storage.paragraph.field_gender.yml
 delete mode 100644 config/optional/field.storage.paragraph.field_phone.yml
 delete mode 100644 config/optional/field.storage.paragraph.field_race_ethnicity.yml
 delete mode 100644 config/optional/field.storage.paragraph.field_rate_if_custom_.yml
 delete mode 100644 config/optional/field.storage.paragraph.field_relationship.yml
 delete mode 100644 config/optional/field.storage.paragraph.field_sexuality.yml
 delete mode 100644 config/optional/field.storage.paragraph.field_time.yml
 delete mode 100644 config/optional/field.storage.paragraph.field_trainer.yml
 delete mode 100644 config/optional/field.storage.paragraph.field_trainer_rate.yml
 delete mode 100644 config/optional/field.storage.paragraph.field_trainer_role.yml
 delete mode 100644 config/optional/field.storage.taxonomy_term.field_parent_type.yml
 delete mode 100644 config/optional/field.storage.taxonomy_term.field_substatuses.yml
 delete mode 100644 config/optional/field.storage.user.field_last_password_reset.yml
 delete mode 100644 config/optional/field.storage.user.field_password_expiration.yml
 delete mode 100644 config/optional/field.storage.user.field_pending_expire_sent.yml
 create mode 100644 config/optional/image.style.wide.yml
 delete mode 100644 config/optional/mailsystem.settings.yml
 create mode 100644 config/optional/opencase_cases.oc_case_fee_type.fee.yml
 delete mode 100644 config/optional/opencase_cases.oc_case_fee_type.project_fee.yml
 create mode 100644 config/optional/opencase_cases.oc_case_provision_type.caseworker.yml
 delete mode 100644 config/optional/opencase_cases.oc_case_provision_type.trainer.yml
 create mode 100644 config/optional/opencase_cases.oc_case_type.accommodation.yml
 create mode 100644 config/optional/opencase_cases.oc_case_type.asylum_support.yml
 create mode 100644 config/optional/opencase_cases.oc_case_type.employability.yml
 create mode 100644 config/optional/opencase_cases.oc_case_type.enquiry.yml
 create mode 100644 config/optional/opencase_cases.oc_case_type.health.yml
 create mode 100644 config/optional/opencase_cases.oc_case_type.immigration.yml
 create mode 100644 config/optional/opencase_cases.oc_case_type.pro_bono_immigration_service.yml
 delete mode 100644 config/optional/opencase_cases.oc_case_type.project.yml
 delete mode 100644 config/optional/opencase_cases.oc_case_type.training.yml
 create mode 100644 config/optional/opencase_cases.oc_case_type.volunteer_engagement.yml
 create mode 100644 config/optional/opencase_cases.oc_case_type.welfare_rights.yml
 create mode 100644 config/optional/opencase_entities.oc_activity_type.application.yml
 create mode 100644 config/optional/opencase_entities.oc_activity_type.case_note.yml
 create mode 100644 config/optional/opencase_entities.oc_activity_type.destitution_funds_provided.yml
 rename config/optional/{opencase_entities.oc_activity_type.emi.yml => opencase_entities.oc_activity_type.email.yml} (52%)
 delete mode 100644 config/optional/opencase_entities.oc_activity_type.evaluation.yml
 create mode 100644 config/optional/opencase_entities.oc_activity_type.interview.yml
 create mode 100644 config/optional/opencase_entities.oc_activity_type.lete.yml
 create mode 100644 config/optional/opencase_entities.oc_activity_type.research.yml
 create mode 100644 config/optional/opencase_entities.oc_activity_type.supervision.yml
 delete mode 100644 config/optional/opencase_entities.oc_activity_type.trainer_debrief.yml
 create mode 100644 config/optional/opencase_entities.oc_actor_type.client.yml
 create mode 100644 config/optional/opencase_entities.oc_actor_type.staff_member.yml
 delete mode 100644 config/optional/opencase_entities.oc_actor_type.trainer.yml
 create mode 100644 config/optional/opencase_entities.oc_actor_type.volunteer.yml
 delete mode 100644 config/optional/opencase_entities.oc_event_type.train_the_trainer.yml
 create mode 100644 config/optional/opencase_entities.oc_event_type.volunteer_training_session.yml
 delete mode 100644 config/optional/opencase_entities.oc_organisation_relation_type.link_between_clients.yml
 delete mode 100644 config/optional/opencase_entities.oc_organisation_type.client.yml
 delete mode 100644 config/optional/opencase_entities.oc_organisation_type.umbrella_client.yml
 delete mode 100644 config/optional/paragraphs.paragraphs_type.availability.yml
 delete mode 100644 config/optional/paragraphs.paragraphs_type.emergency_contact.yml
 delete mode 100644 config/optional/paragraphs.paragraphs_type.fee.yml
 delete mode 100644 config/optional/paragraphs.paragraphs_type.trainer.yml
 delete mode 100644 config/optional/password_policy.settings.yml
 delete mode 100644 config/optional/password_strength.settings.yml
 create mode 100644 config/optional/rest.resource.entity.node.yml
 delete mode 100644 config/optional/rest.resource.entity.oc_organisation.yml
 delete mode 100644 config/optional/rest.resource.entity.taxonomy_term.yml
 delete mode 100644 config/optional/rest.settings.yml
 delete mode 100644 config/optional/search_api.index.clients.yml
 create mode 100644 config/optional/search_api.index.default_index.yml
 create mode 100644 config/optional/search_api.server.default_server.yml
 delete mode 100644 config/optional/serialization.settings.yml
 create mode 100644 config/optional/smtp.settings.yml
 delete mode 100644 config/optional/system.action.feeds_feed_delete_action.yml
 create mode 100644 config/optional/system.action.user_add_role_action.content_editor.yml
 delete mode 100644 config/optional/system.action.user_add_role_action.follow_up_alerts.yml
 delete mode 100644 config/optional/system.action.user_add_role_action.gno_admin_user.yml
 delete mode 100644 config/optional/system.action.user_add_role_action.invoicing_alerts.yml
 delete mode 100644 config/optional/system.action.user_add_role_action.newly_accredited_alerts.yml
 create mode 100644 config/optional/system.action.user_remove_role_action.content_editor.yml
 delete mode 100644 config/optional/system.action.user_remove_role_action.follow_up_alerts.yml
 delete mode 100644 config/optional/system.action.user_remove_role_action.gno_admin_user.yml
 delete mode 100644 config/optional/system.action.user_remove_role_action.invoicing_alerts.yml
 delete mode 100644 config/optional/system.action.user_remove_role_action.newly_accredited_alerts.yml
 create mode 100644 config/optional/system.advisories.yml
 delete mode 100644 config/optional/system.authorize.yml
 delete mode 100644 config/optional/system.menu.devel.yml
 delete mode 100644 config/optional/taxonomy.vocabulary.clie.yml
 delete mode 100644 config/optional/taxonomy.vocabulary.client_status.yml
 delete mode 100644 config/optional/taxonomy.vocabulary.client_subtypes.yml
 delete mode 100644 config/optional/taxonomy.vocabulary.client_types.yml
 delete mode 100644 config/optional/taxonomy.vocabulary.invoicing_statuses.yml
 create mode 100644 config/optional/tour.tour.block-layout.yml
 delete mode 100644 config/optional/update.settings.yml
 create mode 100644 config/optional/user.role.caseworker.yml
 create mode 100644 config/optional/user.role.content_editor.yml
 delete mode 100644 config/optional/user.role.follow_up_alerts.yml
 delete mode 100644 config/optional/user.role.gno_admin_user.yml
 delete mode 100644 config/optional/user.role.invoicing_alerts.yml
 delete mode 100644 config/optional/user.role.newly_accredited_alerts.yml
 create mode 100644 config/optional/user.role.opencase_admin.yml
 create mode 100644 config/optional/user.role.overseer.yml
 create mode 100644 config/optional/user.role.volunteer_co_ord.yml
 rename config/optional/{views.view.activities_without_case.yml => views.view.activities.yml} (73%)
 delete mode 100644 config/optional/views.view.all_clients.yml
 delete mode 100644 config/optional/views.view.all_trainers.yml
 delete mode 100644 config/optional/views.view.all_umbrella_clients.yml
 delete mode 100644 config/optional/views.view.case_fees_report.yml
 delete mode 100644 config/optional/views.view.case_provision_report.yml
 rename config/optional/{views.view.project_billing_details.yml => views.view.cases.yml} (78%)
 delete mode 100644 config/optional/views.view.client_report.yml
 delete mode 100644 config/optional/views.view.debrief_report.yml
 delete mode 100644 config/optional/views.view.debriefs.yml
 delete mode 100644 config/optional/views.view.evaluation_report.yml
 delete mode 100644 config/optional/views.view.evaluations.yml
 delete mode 100644 config/optional/views.view.fees.yml
 rename config/optional/{views.view.feeds_feed.yml => views.view.name_and_status_changes.yml} (69%)
 delete mode 100644 config/optional/views.view.organisation_relations.yml
 delete mode 100644 config/optional/views.view.projects.yml
 rename config/optional/{views.view.partner_organisations.yml => views.view.sample_downloadable_report.yml} (54%)
 create mode 100644 config/optional/views.view.search_content.yml
 delete mode 100644 config/optional/views.view.train_the_trainer_events.yml
 delete mode 100644 config/optional/views.view.training_report.yml
 delete mode 100644 config/optional/views.view.trainings.yml
 delete mode 100644 config/optional/views_natural_sort.settings.yml

diff --git a/config/optional/admin_toolbar.settings.yml b/config/optional/admin_toolbar.settings.yml
index 5965a31..93a6695 100644
--- a/config/optional/admin_toolbar.settings.yml
+++ b/config/optional/admin_toolbar.settings.yml
@@ -1 +1,3 @@
+_core:
+  default_config_hash: jvTSppzcgH5wnzBhX5xnAExcp2I1CzkQ_aky65XNfYI
 menu_depth: 4
diff --git a/config/optional/bartik.settings.yml b/config/optional/bartik.settings.yml
index 450ebdc..a155b5f 100644
--- a/config/optional/bartik.settings.yml
+++ b/config/optional/bartik.settings.yml
@@ -1,6 +1,6 @@
 favicon:
   mimetype: image/png
-  path: 'modules/contrib/goodnightout_opencase/images/Screenshot from 2021-09-01 13-01-43_0.png'
+  path: modules/contrib/opencase/resources/ico.png
   use_default: false
 features:
   comment_user_picture: true
@@ -8,5 +8,5 @@ features:
   favicon: true
   node_user_picture: true
 logo:
-  path: modules/contrib/goodnightout_opencase/images/GNO-logo.png
+  path: modules/contrib/opencase/resources/files.png
   use_default: false
diff --git a/config/optional/block.block.accreditationcount.yml b/config/optional/block.block.accreditationcount.yml
deleted file mode 100644
index 246703f..0000000
--- a/config/optional/block.block.accreditationcount.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 441fec17-02e0-491e-b7e0-e8113cb826ba
-langcode: en
-status: true
-dependencies:
-  module:
-    - goodnightout_opencase
-  theme:
-    - bartik
-id: accreditationcount
-theme: bartik
-region: header
-weight: -7
-provider: null
-plugin: accreditation_count
-settings:
-  id: accreditation_count
-  label: 'Accreditation Count'
-  label_display: visible
-  provider: goodnightout_opencase
-visibility: {  }
diff --git a/config/optional/block.block.actortypehelp.yml b/config/optional/block.block.actortypehelp.yml
index af9f743..2f54a0f 100644
--- a/config/optional/block.block.actortypehelp.yml
+++ b/config/optional/block.block.actortypehelp.yml
@@ -1,4 +1,4 @@
-uuid: 77c3bb97-a2ed-4a55-8430-b0871aac8c77
+uuid: ce85dde3-56b2-42e4-9ba6-626c4c1a12f5
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/block.block.addactivity.yml b/config/optional/block.block.addactivity.yml
new file mode 100644
index 0000000..2eae4c8
--- /dev/null
+++ b/config/optional/block.block.addactivity.yml
@@ -0,0 +1,25 @@
+uuid: 036ff73a-049d-4979-abf0-95b1a9d1b830
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase
+    - route_condition
+  theme:
+    - bartik
+id: addactivity
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: add_activity
+settings:
+  id: add_activity
+  label: 'Add Activity'
+  label_display: visible
+  provider: opencase
+visibility:
+  route:
+    id: route
+    negate: false
+    routes: entity.oc_actor.canonical
diff --git a/config/optional/block.block.bartik_account_menu.yml b/config/optional/block.block.bartik_account_menu.yml
index e8f8258..c0cc918 100644
--- a/config/optional/block.block.bartik_account_menu.yml
+++ b/config/optional/block.block.bartik_account_menu.yml
@@ -1,4 +1,4 @@
-uuid: 4cd86656-1a8a-493e-930a-6fffa85cc59e
+uuid: 641ec021-f8cc-4d18-aea6-78b8c1167b6d
 langcode: en
 status: true
 dependencies:
@@ -9,7 +9,7 @@ dependencies:
   theme:
     - bartik
 _core:
-  default_config_hash: 8a31Ywc1t2zlddGd3bmDrFMefWqgSK2E02ceFdr-bfc
+  default_config_hash: jzu74Q7R0QWgw8IniA9HZRSb_a8RPak1M0q5J-VGkZI
 id: bartik_account_menu
 theme: bartik
 region: secondary_menu
diff --git a/config/optional/block.block.bartik_branding.yml b/config/optional/block.block.bartik_branding.yml
index b086dc0..09308bf 100644
--- a/config/optional/block.block.bartik_branding.yml
+++ b/config/optional/block.block.bartik_branding.yml
@@ -1,4 +1,4 @@
-uuid: 5d987985-fe79-4ccc-9371-55c652e90176
+uuid: 802aa5e3-8dc9-487d-b81e-ebcb43921499
 langcode: en
 status: true
 dependencies:
@@ -7,11 +7,11 @@ dependencies:
   theme:
     - bartik
 _core:
-  default_config_hash: NDwadleLD3YVSbDUaakxyYZyINYtkFtOVGShfq4kWy8
+  default_config_hash: d-0emr1mEq7sFKDu5RHUJckvNk62hvIZdRwPEfnJyGg
 id: bartik_branding
 theme: bartik
 region: header
-weight: -5
+weight: 0
 provider: null
 plugin: system_branding_block
 settings:
diff --git a/config/optional/block.block.bartik_content.yml b/config/optional/block.block.bartik_content.yml
index 850983e..6066efc 100644
--- a/config/optional/block.block.bartik_content.yml
+++ b/config/optional/block.block.bartik_content.yml
@@ -1,4 +1,4 @@
-uuid: ef21419f-f8db-48b4-82c9-56adcd011861
+uuid: 441aa7a1-1224-4ee5-9f02-85648d5699bb
 langcode: en
 status: true
 dependencies:
@@ -7,7 +7,7 @@ dependencies:
   theme:
     - bartik
 _core:
-  default_config_hash: 9EoWV2Lot6FVSr50t4hoKgiz1LIXYWNG-IIPYsWxBqo
+  default_config_hash: kigu8pTxXt1qGR2NJ5HHdC4G2G1wsDrIjLPKBT5wUBc
 id: bartik_content
 theme: bartik
 region: content
diff --git a/config/optional/block.block.bartik_footer.yml b/config/optional/block.block.bartik_footer.yml
index 89589d9..d605dbc 100644
--- a/config/optional/block.block.bartik_footer.yml
+++ b/config/optional/block.block.bartik_footer.yml
@@ -1,4 +1,4 @@
-uuid: 2a8504df-e7e3-4ccd-b14b-aff62bfa1ff2
+uuid: a2594712-4e82-4f66-8852-b7fef9d69949
 langcode: en
 status: true
 dependencies:
@@ -9,7 +9,7 @@ dependencies:
   theme:
     - bartik
 _core:
-  default_config_hash: 8zRjTNbfNAJ94lQpZDu6MkyD87GYJ2zpH9VQPVmRbcM
+  default_config_hash: pnCK21YFjH7iB4XDeokSq3N3XSr6qX8BsqMs9nmip6E
 id: bartik_footer
 theme: bartik
 region: footer_fifth
diff --git a/config/optional/block.block.bartik_gno_account_menu.yml b/config/optional/block.block.bartik_gno_account_menu.yml
deleted file mode 100644
index b58dbce..0000000
--- a/config/optional/block.block.bartik_gno_account_menu.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: b99891b3-c07e-4b11-b51d-345eae058571
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.account
-  module:
-    - system
-  theme:
-    - bartik_gno
-_core:
-  default_config_hash: 8a31Ywc1t2zlddGd3bmDrFMefWqgSK2E02ceFdr-bfc
-id: bartik_gno_account_menu
-theme: bartik_gno
-region: secondary_menu
-weight: 0
-provider: null
-plugin: 'system_menu_block:account'
-settings:
-  id: 'system_menu_block:account'
-  label: 'User account menu'
-  label_display: '0'
-  provider: system
-  level: 1
-  depth: 1
-  expand_all_items: false
-visibility: {  }
diff --git a/config/optional/block.block.bartik_gno_accreditationcount.yml b/config/optional/block.block.bartik_gno_accreditationcount.yml
deleted file mode 100644
index 0c8814e..0000000
--- a/config/optional/block.block.bartik_gno_accreditationcount.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: d0c8a38d-e30b-4e63-b49d-6b085760c659
-langcode: en
-status: true
-dependencies:
-  module:
-    - goodnightout_opencase
-  theme:
-    - bartik_gno
-id: bartik_gno_accreditationcount
-theme: bartik_gno
-region: header
-weight: -7
-provider: null
-plugin: accreditation_count
-settings:
-  id: accreditation_count
-  label: 'Accreditation Count'
-  label_display: visible
-  provider: goodnightout_opencase
-visibility: {  }
diff --git a/config/optional/block.block.bartik_gno_actortypehelp.yml b/config/optional/block.block.bartik_gno_actortypehelp.yml
deleted file mode 100644
index 48bc631..0000000
--- a/config/optional/block.block.bartik_gno_actortypehelp.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 4fca6560-7900-42de-a4a5-a739bcee2a65
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase
-    - system
-  theme:
-    - bartik_gno
-_core:
-  default_config_hash: lsAeZ1IGTh83seQGXGHb7MipH88kV5SZEzf9PkK-uaY
-id: bartik_gno_actortypehelp
-theme: bartik_gno
-region: content
-weight: -3
-provider: null
-plugin: actor_type_help
-settings:
-  id: actor_type_help
-  label: 'Actor Type Help'
-  label_display: '0'
-  provider: opencase
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: '/admin/opencase/oc_actor_type/*/edit/fields'
diff --git a/config/optional/block.block.bartik_gno_branding.yml b/config/optional/block.block.bartik_gno_branding.yml
deleted file mode 100644
index 2dfa6f2..0000000
--- a/config/optional/block.block.bartik_gno_branding.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: a5f0d8e3-8787-4eb2-a593-f914335a4f80
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bartik_gno
-_core:
-  default_config_hash: NDwadleLD3YVSbDUaakxyYZyINYtkFtOVGShfq4kWy8
-id: bartik_gno_branding
-theme: bartik_gno
-region: header
-weight: -5
-provider: null
-plugin: system_branding_block
-settings:
-  id: system_branding_block
-  label: 'Site branding'
-  label_display: '0'
-  provider: system
-  use_site_logo: true
-  use_site_name: true
-  use_site_slogan: true
-visibility: {  }
diff --git a/config/optional/block.block.bartik_gno_content.yml b/config/optional/block.block.bartik_gno_content.yml
deleted file mode 100644
index ae231c4..0000000
--- a/config/optional/block.block.bartik_gno_content.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 670d565e-3019-4542-9b68-0303f89f8ac8
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bartik_gno
-_core:
-  default_config_hash: 9EoWV2Lot6FVSr50t4hoKgiz1LIXYWNG-IIPYsWxBqo
-id: bartik_gno_content
-theme: bartik_gno
-region: content
-weight: -1
-provider: null
-plugin: system_main_block
-settings:
-  id: system_main_block
-  label: 'Main page content'
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/config/optional/block.block.bartik_gno_exposedformactor_searchpage_1.yml b/config/optional/block.block.bartik_gno_exposedformactor_searchpage_1.yml
deleted file mode 100644
index b70f421..0000000
--- a/config/optional/block.block.bartik_gno_exposedformactor_searchpage_1.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 60c5f6ea-8732-4e42-8a75-bd038b92f213
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.actor_search
-  module:
-    - views
-  theme:
-    - bartik_gno
-_core:
-  default_config_hash: '-mPyVl2gaejJOcEbMNyCrKWvN61T9BXYb0mLKJ0wPBI'
-id: bartik_gno_exposedformactor_searchpage_1
-theme: bartik_gno
-region: header
-weight: -6
-provider: null
-plugin: 'views_exposed_filter_block:actor_search-page_1'
-settings:
-  id: 'views_exposed_filter_block:actor_search-page_1'
-  label: ''
-  label_display: '0'
-  provider: views
-  views_label: ''
-visibility: {  }
diff --git a/config/optional/block.block.bartik_gno_exposedformcase_fees_reportpage_1.yml b/config/optional/block.block.bartik_gno_exposedformcase_fees_reportpage_1.yml
deleted file mode 100644
index 0a1c15c..0000000
--- a/config/optional/block.block.bartik_gno_exposedformcase_fees_reportpage_1.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 280e12a1-825a-46c2-a0ed-f84be365fad0
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.case_fees_report
-  module:
-    - system
-    - views
-  theme:
-    - bartik_gno
-id: bartik_gno_exposedformcase_fees_reportpage_1
-theme: bartik_gno
-region: sidebar_second
-weight: 0
-provider: null
-plugin: 'views_exposed_filter_block:case_fees_report-page_1'
-settings:
-  id: 'views_exposed_filter_block:case_fees_report-page_1'
-  label: ''
-  label_display: '0'
-  provider: views
-  views_label: ''
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /project-fees-report
diff --git a/config/optional/block.block.bartik_gno_exposedformcase_provision_reportpage_1.yml b/config/optional/block.block.bartik_gno_exposedformcase_provision_reportpage_1.yml
deleted file mode 100644
index 15d2f17..0000000
--- a/config/optional/block.block.bartik_gno_exposedformcase_provision_reportpage_1.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: d397aec8-72fa-4ec8-9db7-e54352de0d5f
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.case_provision_report
-  module:
-    - system
-    - views
-  theme:
-    - bartik_gno
-id: bartik_gno_exposedformcase_provision_reportpage_1
-theme: bartik_gno
-region: sidebar_second
-weight: 0
-provider: null
-plugin: 'views_exposed_filter_block:case_provision_report-page_1'
-settings:
-  id: 'views_exposed_filter_block:case_provision_report-page_1'
-  label: ''
-  label_display: '0'
-  provider: views
-  views_label: ''
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /trainer-report
diff --git a/config/optional/block.block.bartik_gno_exposedformclient_reportpage_1.yml b/config/optional/block.block.bartik_gno_exposedformclient_reportpage_1.yml
deleted file mode 100644
index 08a652f..0000000
--- a/config/optional/block.block.bartik_gno_exposedformclient_reportpage_1.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 626804b5-1a91-4f38-bc42-74f1ea47b94c
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.client_report
-  module:
-    - system
-    - views
-  theme:
-    - bartik_gno
-id: bartik_gno_exposedformclient_reportpage_1
-theme: bartik_gno
-region: sidebar_second
-weight: 0
-provider: null
-plugin: 'views_exposed_filter_block:client_report-page_1'
-settings:
-  id: 'views_exposed_filter_block:client_report-page_1'
-  label: ''
-  label_display: '0'
-  provider: views
-  views_label: ''
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /client-report
diff --git a/config/optional/block.block.bartik_gno_exposedformdebrief_reportpage_1.yml b/config/optional/block.block.bartik_gno_exposedformdebrief_reportpage_1.yml
deleted file mode 100644
index dfd486d..0000000
--- a/config/optional/block.block.bartik_gno_exposedformdebrief_reportpage_1.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 3cf32151-8ff2-41a3-813d-5dab6aec331d
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.debrief_report
-  module:
-    - system
-    - views
-  theme:
-    - bartik_gno
-id: bartik_gno_exposedformdebrief_reportpage_1
-theme: bartik_gno
-region: sidebar_second
-weight: 0
-provider: null
-plugin: 'views_exposed_filter_block:debrief_report-page_1'
-settings:
-  id: 'views_exposed_filter_block:debrief_report-page_1'
-  label: ''
-  label_display: '0'
-  provider: views
-  views_label: ''
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /debrief-report
diff --git a/config/optional/block.block.bartik_gno_exposedformequal_opps_recordspage_1.yml b/config/optional/block.block.bartik_gno_exposedformequal_opps_recordspage_1.yml
deleted file mode 100644
index ac305aa..0000000
--- a/config/optional/block.block.bartik_gno_exposedformequal_opps_recordspage_1.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: aaadd9aa-c78d-46f2-bb3e-61295034bd99
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.equal_opps_records
-  module:
-    - system
-    - views
-  theme:
-    - bartik_gno
-id: bartik_gno_exposedformequal_opps_recordspage_1
-theme: bartik_gno
-region: content
-weight: -4
-provider: null
-plugin: 'views_exposed_filter_block:equal_opps_records-page_1'
-settings:
-  id: 'views_exposed_filter_block:equal_opps_records-page_1'
-  label: ''
-  label_display: visible
-  provider: views
-  views_label: 'Search by (whole) first or last name.'
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /equal-opps-records
diff --git a/config/optional/block.block.bartik_gno_exposedformevaluation_reportpage_1.yml b/config/optional/block.block.bartik_gno_exposedformevaluation_reportpage_1.yml
deleted file mode 100644
index 2d5f58b..0000000
--- a/config/optional/block.block.bartik_gno_exposedformevaluation_reportpage_1.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: c36fd4d6-0079-45c7-b7d8-f570481f267d
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.evaluation_report
-  module:
-    - system
-    - views
-  theme:
-    - bartik_gno
-id: bartik_gno_exposedformevaluation_reportpage_1
-theme: bartik_gno
-region: sidebar_second
-weight: 0
-provider: null
-plugin: 'views_exposed_filter_block:evaluation_report-page_1'
-settings:
-  id: 'views_exposed_filter_block:evaluation_report-page_1'
-  label: ''
-  label_display: '0'
-  provider: views
-  views_label: ''
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /evaluation-report
diff --git a/config/optional/block.block.bartik_gno_footer.yml b/config/optional/block.block.bartik_gno_footer.yml
deleted file mode 100644
index 168a538..0000000
--- a/config/optional/block.block.bartik_gno_footer.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 2e91fb94-dbef-4ecd-9cbd-a3c23ae17c67
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.footer
-  module:
-    - system
-  theme:
-    - bartik_gno
-_core:
-  default_config_hash: 8zRjTNbfNAJ94lQpZDu6MkyD87GYJ2zpH9VQPVmRbcM
-id: bartik_gno_footer
-theme: bartik_gno
-region: sidebar_first
-weight: 0
-provider: null
-plugin: 'system_menu_block:footer'
-settings:
-  id: 'system_menu_block:footer'
-  label: 'Footer menu'
-  label_display: '0'
-  provider: system
-  level: 1
-  depth: 0
-  expand_all_items: false
-visibility: {  }
diff --git a/config/optional/block.block.bartik_gno_help.yml b/config/optional/block.block.bartik_gno_help.yml
deleted file mode 100644
index 316aceb..0000000
--- a/config/optional/block.block.bartik_gno_help.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 5794b312-76d0-44e4-9641-7e2e6a879ddf
-langcode: en
-status: true
-dependencies:
-  module:
-    - help
-  theme:
-    - bartik_gno
-_core:
-  default_config_hash: 8I8iACSa0sKO3k3jlvUG1ge52rfcKX7USJAQYnzuBgg
-id: bartik_gno_help
-theme: bartik_gno
-region: content
-weight: -6
-provider: null
-plugin: help_block
-settings:
-  id: help_block
-  label: Help
-  label_display: '0'
-  provider: help
-visibility: {  }
diff --git a/config/optional/block.block.bartik_gno_local_actions.yml b/config/optional/block.block.bartik_gno_local_actions.yml
deleted file mode 100644
index 4a76036..0000000
--- a/config/optional/block.block.bartik_gno_local_actions.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: f29357ef-4056-4217-8aa7-4d8379cd1518
-langcode: en
-status: true
-dependencies:
-  theme:
-    - bartik_gno
-_core:
-  default_config_hash: 13GQpeITIJsp1kyPniXtWZfyFH87vb1xxJCHifL4UeE
-id: bartik_gno_local_actions
-theme: bartik_gno
-region: content
-weight: -5
-provider: null
-plugin: local_actions_block
-settings:
-  id: local_actions_block
-  label: 'Primary admin actions'
-  label_display: '0'
-  provider: core
-visibility: {  }
diff --git a/config/optional/block.block.bartik_gno_local_tasks.yml b/config/optional/block.block.bartik_gno_local_tasks.yml
deleted file mode 100644
index 55c8926..0000000
--- a/config/optional/block.block.bartik_gno_local_tasks.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: dc976510-64de-4c9f-8179-1e3af66691fd
-langcode: en
-status: true
-dependencies:
-  theme:
-    - bartik_gno
-_core:
-  default_config_hash: X9I1OB0W3WlWtrK-CNcg6hNWwa8wficanpH8pYnDZDE
-id: bartik_gno_local_tasks
-theme: bartik_gno
-region: content
-weight: -7
-provider: null
-plugin: local_tasks_block
-settings:
-  id: local_tasks_block
-  label: Tabs
-  label_display: '0'
-  provider: core
-  primary: true
-  secondary: true
-visibility: {  }
diff --git a/config/optional/block.block.bartik_gno_messages.yml b/config/optional/block.block.bartik_gno_messages.yml
deleted file mode 100644
index 74dc151..0000000
--- a/config/optional/block.block.bartik_gno_messages.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 99d42175-f51a-4f78-af90-5a0f24eeb23b
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bartik_gno
-_core:
-  default_config_hash: KHQIJ7Vfl25lTjzIc7qIvnuistt-Mw2O0kG4jCofmkI
-id: bartik_gno_messages
-theme: bartik_gno
-region: highlighted
-weight: 0
-provider: null
-plugin: system_messages_block
-settings:
-  id: system_messages_block
-  label: 'Status messages'
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/config/optional/block.block.bartik_gno_opencase.yml b/config/optional/block.block.bartik_gno_opencase.yml
deleted file mode 100644
index d7ca2f4..0000000
--- a/config/optional/block.block.bartik_gno_opencase.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-uuid: 6151bb4d-73d5-4021-9b99-9a60ef09026f
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.opencase
-  module:
-    - superfish
-  theme:
-    - bartik_gno
-_core:
-  default_config_hash: P5NPJ-V9_GehcsMfX2AGxHpIMY_jFzyxu0fMAdJlgiU
-id: bartik_gno_opencase
-theme: bartik_gno
-region: primary_menu
-weight: 0
-provider: null
-plugin: 'superfish:opencase'
-settings:
-  id: 'superfish:opencase'
-  label: OpenCase
-  label_display: '0'
-  provider: superfish
-  level: '1'
-  depth: '0'
-  expand_all_items: false
-  menu_type: horizontal
-  style: none
-  arrow: 0
-  shadow: 1
-  speed: fast
-  delay: '800'
-  slide: vertical
-  supposition: 1
-  hoverintent: 1
-  touch: '1'
-  touchbh: '1'
-  touchbp: '768'
-  touchua: '0'
-  touchual: ''
-  touchuam: '0'
-  small: '2'
-  smallbp: '768'
-  smallua: '0'
-  smallual: ''
-  smalluam: '0'
-  smallact: '1'
-  smallset: ''
-  smallasa: 0
-  smallcmc: 0
-  smallecm: ''
-  smallchc: 0
-  smallech: ''
-  smallicm: ''
-  smallich: ''
-  smallamt: ''
-  smallabt: '1'
-  supersubs: 1
-  minwidth: '12'
-  maxwidth: '27'
-  multicolumn: 0
-  multicolumn_depth: '1'
-  multicolumn_levels: '1'
-  pathlevels: '1'
-  expanded: 0
-  clone_parent: 0
-  hide_linkdescription: 0
-  add_linkdescription: 0
-  link_depth_class: 1
-  custom_list_class: ''
-  custom_item_class: ''
-  custom_link_class: ''
-visibility: {  }
diff --git a/config/optional/block.block.bartik_gno_page_title.yml b/config/optional/block.block.bartik_gno_page_title.yml
deleted file mode 100644
index 35a8e47..0000000
--- a/config/optional/block.block.bartik_gno_page_title.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 8d1c7399-ff25-4d74-befe-2fedd75a1f1b
-langcode: en
-status: true
-dependencies:
-  theme:
-    - bartik_gno
-_core:
-  default_config_hash: 7rR9chwXvdM2H8OYMAYx9Zj3GGlPMrZp_M3ZA4thYTk
-id: bartik_gno_page_title
-theme: bartik_gno
-region: content
-weight: -8
-provider: null
-plugin: page_title_block
-settings:
-  id: page_title_block
-  label: 'Page title'
-  label_display: '0'
-  provider: core
-visibility: {  }
diff --git a/config/optional/block.block.bartik_gno_powered.yml b/config/optional/block.block.bartik_gno_powered.yml
deleted file mode 100644
index 9554fbf..0000000
--- a/config/optional/block.block.bartik_gno_powered.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 1708443e-6fe2-4f5b-94ac-9fff580a6635
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bartik_gno
-_core:
-  default_config_hash: jQQUUWN2Uxr5qZtc9zcJKBCxpKY8orN1u2HPqYYRQDI
-id: bartik_gno_powered
-theme: bartik_gno
-region: sidebar_first
-weight: 10
-provider: null
-plugin: system_powered_by_block
-settings:
-  id: system_powered_by_block
-  label: 'Powered by Drupal'
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/config/optional/block.block.bartik_help.yml b/config/optional/block.block.bartik_help.yml
index f073486..fb885e1 100644
--- a/config/optional/block.block.bartik_help.yml
+++ b/config/optional/block.block.bartik_help.yml
@@ -1,4 +1,4 @@
-uuid: c8d14071-4b64-4c14-9775-947670d0b13a
+uuid: 4d206705-2964-4624-bfef-f2cd18c2d566
 langcode: en
 status: true
 dependencies:
@@ -7,11 +7,11 @@ dependencies:
   theme:
     - bartik
 _core:
-  default_config_hash: 8I8iACSa0sKO3k3jlvUG1ge52rfcKX7USJAQYnzuBgg
+  default_config_hash: '-laWx8WA-ikiIEH3NJQ0hVbjqk3iEuBms91LB0B4IQU'
 id: bartik_help
 theme: bartik
 region: content
-weight: -6
+weight: -5
 provider: null
 plugin: help_block
 settings:
diff --git a/config/optional/block.block.bartik_local_actions.yml b/config/optional/block.block.bartik_local_actions.yml
index c328db2..788b209 100644
--- a/config/optional/block.block.bartik_local_actions.yml
+++ b/config/optional/block.block.bartik_local_actions.yml
@@ -1,15 +1,15 @@
-uuid: 5ea8d899-a958-444e-971c-a80580790a83
+uuid: 9140917a-f290-4123-978a-1651937828ae
 langcode: en
 status: true
 dependencies:
   theme:
     - bartik
 _core:
-  default_config_hash: 13GQpeITIJsp1kyPniXtWZfyFH87vb1xxJCHifL4UeE
+  default_config_hash: XRdb8LpbArVA6CpuuEZxzi50JIdjsJaCCZ5o3fH0Blk
 id: bartik_local_actions
 theme: bartik
 region: content
-weight: -5
+weight: -4
 provider: null
 plugin: local_actions_block
 settings:
diff --git a/config/optional/block.block.bartik_local_tasks.yml b/config/optional/block.block.bartik_local_tasks.yml
index 546fe9b..fa882f9 100644
--- a/config/optional/block.block.bartik_local_tasks.yml
+++ b/config/optional/block.block.bartik_local_tasks.yml
@@ -1,15 +1,15 @@
-uuid: caed5889-7e1a-4b42-86b4-3e845d4dc2ca
+uuid: 7ecfeaf2-bcc4-4505-9ced-379cd4f78f2e
 langcode: en
 status: true
 dependencies:
   theme:
     - bartik
 _core:
-  default_config_hash: X9I1OB0W3WlWtrK-CNcg6hNWwa8wficanpH8pYnDZDE
+  default_config_hash: Qf2BoIzd9py5AYXZj8fJzCYDyVk1-AWXcu-AqQeDZKA
 id: bartik_local_tasks
 theme: bartik
 region: content
-weight: -7
+weight: -6
 provider: null
 plugin: local_tasks_block
 settings:
diff --git a/config/optional/block.block.bartik_messages.yml b/config/optional/block.block.bartik_messages.yml
index bb293df..1d77447 100644
--- a/config/optional/block.block.bartik_messages.yml
+++ b/config/optional/block.block.bartik_messages.yml
@@ -1,4 +1,4 @@
-uuid: 2fd22d2e-0d82-4ec7-906d-d1864484317c
+uuid: a5f26873-0159-467b-8043-b6b94381163c
 langcode: en
 status: true
 dependencies:
@@ -7,7 +7,7 @@ dependencies:
   theme:
     - bartik
 _core:
-  default_config_hash: KHQIJ7Vfl25lTjzIc7qIvnuistt-Mw2O0kG4jCofmkI
+  default_config_hash: KC12e0aosUnBBs5bd374JVcQjJaFNOSIHzu0dUGf22o
 id: bartik_messages
 theme: bartik
 region: highlighted
diff --git a/config/optional/block.block.bartik_page_title.yml b/config/optional/block.block.bartik_page_title.yml
index eee28fc..03ad552 100644
--- a/config/optional/block.block.bartik_page_title.yml
+++ b/config/optional/block.block.bartik_page_title.yml
@@ -1,15 +1,15 @@
-uuid: 72b42460-86d7-4df7-8041-deeb80f21c2f
+uuid: 897cb97b-43d4-4b4a-82fe-dff0e0a8d521
 langcode: en
 status: true
 dependencies:
   theme:
     - bartik
 _core:
-  default_config_hash: 7rR9chwXvdM2H8OYMAYx9Zj3GGlPMrZp_M3ZA4thYTk
+  default_config_hash: ItFhhiUOoeR7oIq73ZaCV7PAYrOwXZ-9fazMzF5DJXM
 id: bartik_page_title
 theme: bartik
 region: content
-weight: -8
+weight: -7
 provider: null
 plugin: page_title_block
 settings:
diff --git a/config/optional/block.block.bartik_powered.yml b/config/optional/block.block.bartik_powered.yml
index 94f4a39..76e3a55 100644
--- a/config/optional/block.block.bartik_powered.yml
+++ b/config/optional/block.block.bartik_powered.yml
@@ -1,4 +1,4 @@
-uuid: d7adaf92-3002-43ed-a178-b7f8830b2e73
+uuid: 063474f8-5ac9-4595-bb88-f57057e371ca
 langcode: en
 status: true
 dependencies:
@@ -7,7 +7,7 @@ dependencies:
   theme:
     - bartik
 _core:
-  default_config_hash: jQQUUWN2Uxr5qZtc9zcJKBCxpKY8orN1u2HPqYYRQDI
+  default_config_hash: I6Esh8cDlPdl2POZg4MOSRUrQNYA1UNCJCxL2yqT_wc
 id: bartik_powered
 theme: bartik
 region: footer_fifth
diff --git a/config/optional/block.block.exposedformactor_searchpage_1.yml b/config/optional/block.block.exposedformactor_searchpage_1.yml
index e7b80e7..33ae8b8 100644
--- a/config/optional/block.block.exposedformactor_searchpage_1.yml
+++ b/config/optional/block.block.exposedformactor_searchpage_1.yml
@@ -1,4 +1,4 @@
-uuid: 9c88c370-3dbf-4de9-9328-ee7ecaea7127
+uuid: d38425eb-15fe-4659-8595-57d566586633
 langcode: en
 status: true
 dependencies:
@@ -13,7 +13,7 @@ _core:
 id: exposedformactor_searchpage_1
 theme: bartik
 region: header
-weight: -6
+weight: -9
 provider: null
 plugin: 'views_exposed_filter_block:actor_search-page_1'
 settings:
diff --git a/config/optional/block.block.exposedformcase_fees_reportpage_1.yml b/config/optional/block.block.exposedformcase_fees_reportpage_1.yml
deleted file mode 100644
index 727c6d4..0000000
--- a/config/optional/block.block.exposedformcase_fees_reportpage_1.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 698f2bfe-50f2-48d1-82f0-925607b03255
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.case_fees_report
-  module:
-    - system
-    - views
-  theme:
-    - bartik
-id: exposedformcase_fees_reportpage_1
-theme: bartik
-region: sidebar_second
-weight: 0
-provider: null
-plugin: 'views_exposed_filter_block:case_fees_report-page_1'
-settings:
-  id: 'views_exposed_filter_block:case_fees_report-page_1'
-  label: ''
-  label_display: '0'
-  provider: views
-  views_label: ''
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /project-fees-report
diff --git a/config/optional/block.block.exposedformcase_provision_reportpage_1.yml b/config/optional/block.block.exposedformcase_provision_reportpage_1.yml
deleted file mode 100644
index cdd85ed..0000000
--- a/config/optional/block.block.exposedformcase_provision_reportpage_1.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: bda91917-910a-4067-ba91-41b34964b572
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.case_provision_report
-  module:
-    - system
-    - views
-  theme:
-    - bartik
-id: exposedformcase_provision_reportpage_1
-theme: bartik
-region: sidebar_second
-weight: 0
-provider: null
-plugin: 'views_exposed_filter_block:case_provision_report-page_1'
-settings:
-  id: 'views_exposed_filter_block:case_provision_report-page_1'
-  label: ''
-  label_display: '0'
-  provider: views
-  views_label: ''
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /trainer-report
diff --git a/config/optional/block.block.exposedformclient_reportpage_1.yml b/config/optional/block.block.exposedformclient_reportpage_1.yml
deleted file mode 100644
index d8e4dd1..0000000
--- a/config/optional/block.block.exposedformclient_reportpage_1.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 9a06d3fd-424b-489a-b17d-a6b9b801e03a
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.client_report
-  module:
-    - system
-    - views
-  theme:
-    - bartik
-id: exposedformclient_reportpage_1
-theme: bartik
-region: sidebar_second
-weight: 0
-provider: null
-plugin: 'views_exposed_filter_block:client_report-page_1'
-settings:
-  id: 'views_exposed_filter_block:client_report-page_1'
-  label: ''
-  label_display: '0'
-  provider: views
-  views_label: ''
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /client-report
diff --git a/config/optional/block.block.exposedformdebrief_reportpage_1.yml b/config/optional/block.block.exposedformdebrief_reportpage_1.yml
deleted file mode 100644
index 3c63c39..0000000
--- a/config/optional/block.block.exposedformdebrief_reportpage_1.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: ed8c3ee7-e973-4526-88d1-7ee8fe62b7dc
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.debrief_report
-  module:
-    - system
-    - views
-  theme:
-    - bartik
-id: exposedformdebrief_reportpage_1
-theme: bartik
-region: sidebar_second
-weight: 0
-provider: null
-plugin: 'views_exposed_filter_block:debrief_report-page_1'
-settings:
-  id: 'views_exposed_filter_block:debrief_report-page_1'
-  label: ''
-  label_display: '0'
-  provider: views
-  views_label: ''
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /debrief-report
diff --git a/config/optional/block.block.exposedformequal_opps_recordspage_1.yml b/config/optional/block.block.exposedformequal_opps_recordspage_1.yml
index 7e2d47d..fcd1fbe 100644
--- a/config/optional/block.block.exposedformequal_opps_recordspage_1.yml
+++ b/config/optional/block.block.exposedformequal_opps_recordspage_1.yml
@@ -1,4 +1,4 @@
-uuid: 61c49678-bc4a-4da7-bfc4-11491a350908
+uuid: ac7d2254-a341-4386-ae23-679d4cadb450
 langcode: en
 status: true
 dependencies:
@@ -9,10 +9,12 @@ dependencies:
     - views
   theme:
     - bartik
+_core:
+  default_config_hash: 4qMuUzO9EtuXor_WcCBwEfW8lL3V9lFvYgnEQKni3uw
 id: exposedformequal_opps_recordspage_1
 theme: bartik
 region: content
-weight: -4
+weight: -2
 provider: null
 plugin: 'views_exposed_filter_block:equal_opps_records-page_1'
 settings:
diff --git a/config/optional/block.block.exposedformevaluation_reportpage_1.yml b/config/optional/block.block.exposedformevaluation_reportpage_1.yml
deleted file mode 100644
index 604701a..0000000
--- a/config/optional/block.block.exposedformevaluation_reportpage_1.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 22af4565-e4f8-4e03-9176-8b19cf58fadc
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.evaluation_report
-  module:
-    - system
-    - views
-  theme:
-    - bartik
-id: exposedformevaluation_reportpage_1
-theme: bartik
-region: sidebar_second
-weight: 0
-provider: null
-plugin: 'views_exposed_filter_block:evaluation_report-page_1'
-settings:
-  id: 'views_exposed_filter_block:evaluation_report-page_1'
-  label: ''
-  label_display: '0'
-  provider: views
-  views_label: ''
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /evaluation-report
diff --git a/config/optional/block.block.opencase.yml b/config/optional/block.block.opencase.yml
index 005d8cd..8eb537e 100644
--- a/config/optional/block.block.opencase.yml
+++ b/config/optional/block.block.opencase.yml
@@ -1,4 +1,4 @@
-uuid: 88551b7e-a4fa-4968-ad38-6d7fafb0fb6e
+uuid: 57f624fd-8bf9-4942-8ffa-ba6639ee833f
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/block.block.seven_breadcrumbs.yml b/config/optional/block.block.seven_breadcrumbs.yml
index aecb66e..49c55cc 100644
--- a/config/optional/block.block.seven_breadcrumbs.yml
+++ b/config/optional/block.block.seven_breadcrumbs.yml
@@ -1,4 +1,4 @@
-uuid: 6c96cb71-7f60-4a15-8875-528490f31cbc
+uuid: 1dd935f9-a3bb-4bb8-a000-f92b2ccaf725
 langcode: en
 status: true
 dependencies:
@@ -7,7 +7,7 @@ dependencies:
   theme:
     - seven
 _core:
-  default_config_hash: WWu2OQswgCztl9OeXjD1stexIEMZsSgPMYIdC-JHx9c
+  default_config_hash: 2rIN97Rd7-rjv3P4h0-xrZnAgPJHyXFEwrB--sS2_qE
 id: seven_breadcrumbs
 theme: seven
 region: breadcrumb
diff --git a/config/optional/block.block.seven_content.yml b/config/optional/block.block.seven_content.yml
index a74f46c..a7f3db8 100644
--- a/config/optional/block.block.seven_content.yml
+++ b/config/optional/block.block.seven_content.yml
@@ -1,4 +1,4 @@
-uuid: 2fa563a3-1bb8-44a3-a8ec-75ba8a2ee824
+uuid: 18d8370b-7620-4d31-b708-434773fb3dcc
 langcode: en
 status: true
 dependencies:
@@ -7,7 +7,7 @@ dependencies:
   theme:
     - seven
 _core:
-  default_config_hash: YRY68JWkaUiGeZlWMv1nzeIgDm0ZZwXYgpqUpLFzwAY
+  default_config_hash: 6_eJxtyfANKFE_nfriHKgrARRIPHH88sI6jvQ4EHbBc
 id: seven_content
 theme: seven
 region: content
diff --git a/config/optional/block.block.seven_help.yml b/config/optional/block.block.seven_help.yml
index 98f2e68..2c56986 100644
--- a/config/optional/block.block.seven_help.yml
+++ b/config/optional/block.block.seven_help.yml
@@ -1,4 +1,4 @@
-uuid: e7071a97-1d35-4ce2-8890-928dc9b7344c
+uuid: ddc8f618-12a7-4cd8-849a-f432533749d1
 langcode: en
 status: true
 dependencies:
@@ -7,7 +7,7 @@ dependencies:
   theme:
     - seven
 _core:
-  default_config_hash: NU5A_49mwLHfs5xFzMFrZ850w9pgUolxMS9NNF3vv4c
+  default_config_hash: bYvyEzJ7UcmjXZAYLxb4Qb_J77K9bPbk4ealdap31FY
 id: seven_help
 theme: seven
 region: help
diff --git a/config/optional/block.block.seven_local_actions.yml b/config/optional/block.block.seven_local_actions.yml
index edfc136..e32a26a 100644
--- a/config/optional/block.block.seven_local_actions.yml
+++ b/config/optional/block.block.seven_local_actions.yml
@@ -1,11 +1,11 @@
-uuid: cf1ce2d6-df10-40df-b3f7-d1fef337058b
+uuid: be439219-ab03-4087-a272-439d7179d838
 langcode: en
 status: true
 dependencies:
   theme:
     - seven
 _core:
-  default_config_hash: HHryZVJbeKi9WnuBGC8FOhBZmBnk2G1H6KxFuy-rC9A
+  default_config_hash: gv5JXTvQXjlMY6PXrfxzcLMjMg4074WiEQCy7ZSMvK4
 id: seven_local_actions
 theme: seven
 region: content
diff --git a/config/optional/block.block.seven_messages.yml b/config/optional/block.block.seven_messages.yml
index e81adf2..e136162 100644
--- a/config/optional/block.block.seven_messages.yml
+++ b/config/optional/block.block.seven_messages.yml
@@ -1,4 +1,4 @@
-uuid: aae130e4-0688-4d3c-8f46-2da3f986be6d
+uuid: 19ed3188-d6e6-4657-9f39-3861a0f49030
 langcode: en
 status: true
 dependencies:
@@ -7,7 +7,7 @@ dependencies:
   theme:
     - seven
 _core:
-  default_config_hash: XJqWwLt1LDCnazcEN6QkJmCLjk4R0__-8s0OO9xeNjg
+  default_config_hash: bZvFlENVti4PpqT6kqoC86B5_lXp6aE-d4nrvLMU4CY
 id: seven_messages
 theme: seven
 region: highlighted
diff --git a/config/optional/block.block.seven_page_title.yml b/config/optional/block.block.seven_page_title.yml
index bb2b110..a8308d1 100644
--- a/config/optional/block.block.seven_page_title.yml
+++ b/config/optional/block.block.seven_page_title.yml
@@ -1,11 +1,11 @@
-uuid: a10f9a6c-68b9-4ed5-87e4-5b764d771568
+uuid: 12fcca5c-f192-4e49-820d-acaaf3826f65
 langcode: en
 status: true
 dependencies:
   theme:
     - seven
 _core:
-  default_config_hash: ZSpc3IoSaLd0PkB02nxjVPBMztIdsTdHek9SiGaqZ_c
+  default_config_hash: P-2PK2v3yJQRI4Mg1RqKQ0Ki0wP_UUErIvahd_MtMVc
 id: seven_page_title
 theme: seven
 region: header
diff --git a/config/optional/block.block.seven_primary_local_tasks.yml b/config/optional/block.block.seven_primary_local_tasks.yml
index efdb54c..004b79f 100644
--- a/config/optional/block.block.seven_primary_local_tasks.yml
+++ b/config/optional/block.block.seven_primary_local_tasks.yml
@@ -1,11 +1,11 @@
-uuid: 3245a9a9-be32-4204-8faa-02d632188b68
+uuid: bf6a7f48-6ec8-4772-9928-5302cd655622
 langcode: en
 status: true
 dependencies:
   theme:
     - seven
 _core:
-  default_config_hash: ddy1OsBbWxjwEI8VL1viD4I69qcLHOkul4BxbTqLBTs
+  default_config_hash: ouwsNHI1V3bwV1G1vl0EcbWy8AB9V62vgLOSjTpoCSI
 id: seven_primary_local_tasks
 theme: seven
 region: header
diff --git a/config/optional/block.block.seven_secondary_local_tasks.yml b/config/optional/block.block.seven_secondary_local_tasks.yml
index 2799eb2..f241d13 100644
--- a/config/optional/block.block.seven_secondary_local_tasks.yml
+++ b/config/optional/block.block.seven_secondary_local_tasks.yml
@@ -1,11 +1,11 @@
-uuid: 80575e4f-f1d0-405b-a0d3-dd73c652c4a8
+uuid: 4d08580d-50da-4bd7-bb1a-e657144f5610
 langcode: en
 status: true
 dependencies:
   theme:
     - seven
 _core:
-  default_config_hash: QeZBeCilQfeET3GeW6ZtJkEiwROADTZktFgKWwPieD4
+  default_config_hash: W8ripr8GQI0o3eaaD7lcd4687nUrcHoYdu4yIjzVN3o
 id: seven_secondary_local_tasks
 theme: seven
 region: pre_content
diff --git a/config/optional/block.block.views_block__activities_block_1.yml b/config/optional/block.block.views_block__activities_block_1.yml
new file mode 100644
index 0000000..acd8c6a
--- /dev/null
+++ b/config/optional/block.block.views_block__activities_block_1.yml
@@ -0,0 +1,30 @@
+uuid: 14120f1a-9009-4ed1-858a-875d748f93fe
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.activities
+  module:
+    - route_condition
+    - views
+  theme:
+    - bartik
+id: views_block__activities_block_1
+theme: bartik
+region: content
+weight: 0
+provider: null
+plugin: 'views_block:activities-block_1'
+settings:
+  id: 'views_block:activities-block_1'
+  label: ''
+  label_display: visible
+  provider: views
+  context_mapping: {  }
+  views_label: ''
+  items_per_page: none
+visibility:
+  route:
+    id: route
+    negate: false
+    routes: entity.oc_actor.canonical
diff --git a/config/optional/block_content.type.basic.yml b/config/optional/block_content.type.basic.yml
index 1e7e8b3..4990bd4 100644
--- a/config/optional/block_content.type.basic.yml
+++ b/config/optional/block_content.type.basic.yml
@@ -1,4 +1,4 @@
-uuid: d71a9327-6a96-439b-8569-56fee5aca6f1
+uuid: f45734f8-b7e5-47e9-90ce-4cb15415b01e
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/comment.type.comment.yml b/config/optional/comment.type.comment.yml
index 561bf29..c81ae8d 100644
--- a/config/optional/comment.type.comment.yml
+++ b/config/optional/comment.type.comment.yml
@@ -1,4 +1,4 @@
-uuid: 54e8bde4-0914-48f4-83d1-de4036b6f975
+uuid: 8df6634c-b663-4f63-bd02-7415be7d437b
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/contact.form.contact_opencase.yml b/config/optional/contact.form.contact_opencase.yml
index 798f59f..9b8d27a 100644
--- a/config/optional/contact.form.contact_opencase.yml
+++ b/config/optional/contact.form.contact_opencase.yml
@@ -1,13 +1,11 @@
-uuid: db90d634-addb-4516-8f87-f7f998310f95
+uuid: 70ade645-a398-40b1-808a-43f8fe99ee73
 langcode: en
 status: true
 dependencies: {  }
-_core:
-  default_config_hash: pDp867PuzrC4C_z9LPKPgQhweTwRCUwecchwLytIQv8
 id: contact_opencase
 label: 'Contact the OpenCase Developers'
 recipients:
-  - naomirosenberguk@gmail.com
+  - naomi@aktivix.org
 reply: ''
 weight: 0
 message: 'Thank you for your message. The OpenCase team will get back to you ASAP.'
diff --git a/config/optional/contact.form.feedback.yml b/config/optional/contact.form.feedback.yml
index 3dcb047..0f0352b 100644
--- a/config/optional/contact.form.feedback.yml
+++ b/config/optional/contact.form.feedback.yml
@@ -1,4 +1,4 @@
-uuid: 27bced0e-5140-41ad-af4a-90d4f79941e0
+uuid: 9fd33dd2-6476-4362-a419-31216a4c3e2f
 langcode: en
 status: true
 dependencies: {  }
@@ -7,7 +7,7 @@ _core:
 id: feedback
 label: 'Website feedback'
 recipients:
-  - helo@autonomic.zone
+  - naomirosenberguk@gmail.com
 reply: ''
 weight: 0
 message: 'Your message has been sent.'
diff --git a/config/optional/contact.form.personal.yml b/config/optional/contact.form.personal.yml
index b786b00..6116908 100644
--- a/config/optional/contact.form.personal.yml
+++ b/config/optional/contact.form.personal.yml
@@ -1,4 +1,4 @@
-uuid: 7e3c3832-2437-454e-bf68-b62fe447b822
+uuid: 366a3f34-2bb3-4a44-854b-2a8cdddc766c
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/contact.settings.yml b/config/optional/contact.settings.yml
index 5ad96f3..5af5127 100644
--- a/config/optional/contact.settings.yml
+++ b/config/optional/contact.settings.yml
@@ -1,6 +1,4 @@
-_core:
-  default_config_hash: U69DBeuvXuNVOC15rVNaBjDPK2fWFbo9v4takdYSSO8
-default_form: feedback
+default_form: contact_opencase
 flood:
   limit: 5
   interval: 3600
diff --git a/config/optional/content_as_config.config.yml b/config/optional/content_as_config.config.yml
deleted file mode 100644
index 7146028..0000000
--- a/config/optional/content_as_config.config.yml
+++ /dev/null
@@ -1 +0,0 @@
-log: 1
diff --git a/config/optional/content_as_config.taxonomy_term.yml b/config/optional/content_as_config.taxonomy_term.yml
deleted file mode 100644
index 60b7e98..0000000
--- a/config/optional/content_as_config.taxonomy_term.yml
+++ /dev/null
@@ -1,509 +0,0 @@
-3643c3b9-b688-4d8d-9665-c0e0b15b5749:
-  uuid: 3643c3b9-b688-4d8d-9665-c0e0b15b5749
-  vid: client_types
-  name: 'Licensed Premises'
-  langcode: en
-  description: ''
-  weight: '0'
-  parent: '0'
-  path: /taxonomy/term/3
-046c6995-d38b-4683-a37a-52ef472bd750:
-  uuid: 046c6995-d38b-4683-a37a-52ef472bd750
-  vid: client_types
-  name: 'Nightlife Organisation'
-  langcode: en
-  description: ''
-  weight: '0'
-  parent: '0'
-  path: /taxonomy/term/4
-1f6b268b-0ddb-4d85-a80c-3abbc54ba116:
-  uuid: 1f6b268b-0ddb-4d85-a80c-3abbc54ba116
-  vid: client_subtypes
-  name: 'Live Music Venue'
-  langcode: en
-  description: ''
-  weight: '2'
-  parent: '0'
-  fields:
-    field_parent_type:
-      -
-        target_id: '3'
-  path: /taxonomy/term/5
-484e3265-cca6-473f-9325-eb6bc1c53288:
-  uuid: 484e3265-cca6-473f-9325-eb6bc1c53288
-  vid: client_subtypes
-  name: Nightclub
-  langcode: en
-  description: ''
-  weight: '1'
-  parent: '0'
-  fields:
-    field_parent_type:
-      -
-        target_id: '3'
-  path: /taxonomy/term/6
-f44372cb-9a30-4a77-bf6d-9a1e96e257ab:
-  uuid: f44372cb-9a30-4a77-bf6d-9a1e96e257ab
-  vid: client_subtypes
-  name: 'Pub or Bar'
-  langcode: en
-  description: ''
-  weight: '0'
-  parent: '0'
-  fields:
-    field_parent_type:
-      -
-        target_id: '3'
-  path: /taxonomy/term/7
-4c31ca9d-a328-45f1-be68-9d50b5703799:
-  uuid: 4c31ca9d-a328-45f1-be68-9d50b5703799
-  vid: client_subtypes
-  name: 'Students’ Union'
-  langcode: en
-  description: ''
-  weight: '6'
-  parent: '0'
-  fields:
-    field_parent_type:
-      -
-        target_id: '3'
-  path: /taxonomy/term/8
-c3445507-4acc-4be9-a2b6-2b368a26b3bd:
-  uuid: c3445507-4acc-4be9-a2b6-2b368a26b3bd
-  vid: client_subtypes
-  name: Festival
-  langcode: en
-  description: ''
-  weight: '4'
-  parent: '0'
-  fields:
-    field_parent_type:
-      -
-        target_id: '4'
-  path: /taxonomy/term/9
-36e55848-07dc-475d-8567-e4574e6e1985:
-  uuid: 36e55848-07dc-475d-8567-e4574e6e1985
-  vid: client_subtypes
-  name: 'Event Organiser/ Promoter'
-  langcode: en
-  description: ''
-  weight: '7'
-  parent: '0'
-  fields:
-    field_parent_type:
-      -
-        target_id: '4'
-  path: /taxonomy/term/10
-190a822d-548b-42aa-82cc-5b07e40e2098:
-  uuid: 190a822d-548b-42aa-82cc-5b07e40e2098
-  vid: client_subtypes
-  name: 'Staffing Agency'
-  langcode: en
-  description: ''
-  weight: '5'
-  parent: '0'
-  fields:
-    field_parent_type:
-      -
-        target_id: '4'
-  path: /taxonomy/term/11
-f0620005-1df1-460c-8881-d63366c19a36:
-  uuid: f0620005-1df1-460c-8881-d63366c19a36
-  vid: client_subtypes
-  name: 'Other Organisation'
-  langcode: en
-  description: ''
-  weight: '8'
-  parent: '0'
-  fields:
-    field_parent_type:
-      -
-        target_id: '4'
-  path: /taxonomy/term/12
-10f0b83c-158e-4d99-9937-8fe3760fd7c9:
-  uuid: 10f0b83c-158e-4d99-9937-8fe3760fd7c9
-  vid: client_status
-  name: Lead
-  langcode: en
-  description: ''
-  weight: '0'
-  parent: '0'
-  fields:
-    field_substatuses:
-      -
-        target_id: '29'
-      -
-        target_id: '18'
-      -
-        target_id: '19'
-  path: /taxonomy/term/13
-b1d4664d-0ce9-4c6c-b224-c7cbe4913356:
-  uuid: b1d4664d-0ce9-4c6c-b224-c7cbe4913356
-  vid: client_status
-  name: Confirmed
-  langcode: en
-  description: ''
-  weight: '1'
-  parent: '0'
-  fields:
-    field_substatuses:
-      -
-        target_id: '32'
-      -
-        target_id: '22'
-      -
-        target_id: '23'
-  path: /taxonomy/term/14
-9f973447-e4ac-4191-b1a2-ff59f211967f:
-  uuid: 9f973447-e4ac-4191-b1a2-ff59f211967f
-  vid: client_status
-  name: Accredited
-  langcode: en
-  description: ''
-  weight: '2'
-  parent: '0'
-  fields:
-    field_substatuses:
-      -
-        target_id: '24'
-      -
-        target_id: '25'
-      -
-        target_id: '27'
-      -
-        target_id: '26'
-      -
-        target_id: '28'
-  path: /taxonomy/term/15
-3aca6a65-3f66-41ed-8b8a-d1a52ab8b85c:
-  uuid: 3aca6a65-3f66-41ed-8b8a-d1a52ab8b85c
-  vid: client_status
-  name: 'Reaccreditation due'
-  langcode: en
-  description: ''
-  weight: '3'
-  parent: '0'
-  fields:
-    field_substatuses:
-      -
-        target_id: '30'
-      -
-        target_id: '31'
-  path: /taxonomy/term/16
-edd4a0ac-3c1b-4717-8ea9-2486f8239545:
-  uuid: edd4a0ac-3c1b-4717-8ea9-2486f8239545
-  vid: client_status
-  name: 'Lapsed or Overdue'
-  langcode: en
-  description: ''
-  weight: '4'
-  parent: '0'
-  fields:
-    field_substatuses:
-      -
-        target_id: '33'
-  path: /taxonomy/term/17
-741d068a-df17-494d-8ce5-724d40b43f70:
-  uuid: 741d068a-df17-494d-8ce5-724d40b43f70
-  vid: clie
-  name: 'Info sent'
-  langcode: en
-  description: ''
-  weight: '1'
-  parent: '0'
-  path: /taxonomy/term/18
-33d3d101-5766-4f9c-b384-819231549cdf:
-  uuid: 33d3d101-5766-4f9c-b384-819231549cdf
-  vid: clie
-  name: 'Contract sent'
-  langcode: en
-  description: ''
-  weight: '2'
-  parent: '0'
-  path: /taxonomy/term/19
-16ee83e2-efa6-4ec7-9cd6-3c8cc5aa893b:
-  uuid: 16ee83e2-efa6-4ec7-9cd6-3c8cc5aa893b
-  vid: clie
-  name: 'One-off training'
-  langcode: en
-  description: ''
-  weight: '4'
-  parent: '0'
-  path: /taxonomy/term/22
-1f990032-7dbe-4302-9004-28af68822305:
-  uuid: 1f990032-7dbe-4302-9004-28af68822305
-  vid: clie
-  name: 'Confirmation follow-up sent'
-  langcode: en
-  description: ''
-  weight: '5'
-  parent: '0'
-  path: /taxonomy/term/23
-1e30a83f-00ea-44b0-b5a9-34b57b15696d:
-  uuid: 1e30a83f-00ea-44b0-b5a9-34b57b15696d
-  vid: clie
-  name: 'Recently Accredited'
-  langcode: en
-  description: "<p>NB: There is code in the GNO module which relies on this status existing and having ID 24. It checks for clients who've been accredited for 3 months who have this substatus and changes it to \"3-month folow-up due\".</p>\r\n"
-  weight: '6'
-  parent: '0'
-  path: /taxonomy/term/24
-9915606c-1775-4f68-be24-ffaa629ee0b1:
-  uuid: 9915606c-1775-4f68-be24-ffaa629ee0b1
-  vid: clie
-  name: '3-month follow-up due'
-  langcode: en
-  description: "<p>NB: There is code in the GNO module which relies on this status existing and having ID 25.&nbsp;</p>\r\n"
-  weight: '7'
-  parent: '0'
-  path: /taxonomy/term/25
-98d1370b-e29f-45fb-b053-b911c2538870:
-  uuid: 98d1370b-e29f-45fb-b053-b911c2538870
-  vid: clie
-  name: '6-month follow-up due'
-  langcode: en
-  description: "<p>NB: There is code in the GNO module which relies on this status existing and having ID 26.&nbsp;</p>\r\n"
-  weight: '9'
-  parent: '0'
-  path: /taxonomy/term/26
-a6a9c46d-376f-4bb7-a598-90b8e78fc40c:
-  uuid: a6a9c46d-376f-4bb7-a598-90b8e78fc40c
-  vid: clie
-  name: '3-month follow-up sent'
-  langcode: en
-  description: "<p>NB: There is code in the GNO module which relies on this status existing and having ID 27. It checks for clients who've been accredited for 6 months who have this substatus and changes it to \"6-month folow-up due\".</p>\r\n"
-  weight: '8'
-  parent: '0'
-  path: /taxonomy/term/27
-ab927ebd-555a-4f28-bcda-cc14628fc75a:
-  uuid: ab927ebd-555a-4f28-bcda-cc14628fc75a
-  vid: clie
-  name: '6-month follow-up sent'
-  langcode: en
-  description: ''
-  weight: '10'
-  parent: '0'
-  path: /taxonomy/term/28
-7c7fed76-087c-4437-894b-3dbe827df311:
-  uuid: 7c7fed76-087c-4437-894b-3dbe827df311
-  vid: clie
-  name: 'New lead'
-  langcode: en
-  description: ''
-  weight: '0'
-  parent: '0'
-  path: /taxonomy/term/29
-8528c89c-1ebd-4d2a-9d95-49d54d59fc23:
-  uuid: 8528c89c-1ebd-4d2a-9d95-49d54d59fc23
-  vid: clie
-  name: 'Reaccreditation due'
-  langcode: en
-  description: ''
-  weight: '11'
-  parent: '0'
-  path: /taxonomy/term/30
-5e8d044e-25d3-4546-ae49-f8a12ff74c64:
-  uuid: 5e8d044e-25d3-4546-ae49-f8a12ff74c64
-  vid: clie
-  name: Recontacted
-  langcode: en
-  description: ''
-  weight: '12'
-  parent: '0'
-  path: /taxonomy/term/31
-7bfa7afc-b627-4539-bd5d-162bad5577c6:
-  uuid: 7bfa7afc-b627-4539-bd5d-162bad5577c6
-  vid: clie
-  name: Confirmed
-  langcode: en
-  description: ''
-  weight: '3'
-  parent: '0'
-  path: /taxonomy/term/32
-01b3353f-0141-4d9a-a075-c7e5770e11cb:
-  uuid: 01b3353f-0141-4d9a-a075-c7e5770e11cb
-  vid: clie
-  name: 'Lapsed or overdue'
-  langcode: en
-  description: ''
-  weight: '13'
-  parent: '0'
-  path: /taxonomy/term/33
-fa8828e5-496c-4c1b-b116-3bc77481d343:
-  uuid: fa8828e5-496c-4c1b-b116-3bc77481d343
-  vid: client_status
-  name: 'Failed Accreditation'
-  langcode: en
-  description: ''
-  weight: '5'
-  parent: '0'
-  fields:
-    field_substatuses:
-      -
-        target_id: '35'
-  path: /taxonomy/term/34
-49abf09c-0f21-4627-a9d9-0a95482085a7:
-  uuid: 49abf09c-0f21-4627-a9d9-0a95482085a7
-  vid: clie
-  name: 'Failed Accreditation'
-  langcode: en
-  description: ''
-  weight: '14'
-  parent: '0'
-  path: /taxonomy/term/35
-180f0733-2d56-49fa-8dc5-8ffe1a9c02fa:
-  uuid: 180f0733-2d56-49fa-8dc5-8ffe1a9c02fa
-  vid: tags
-  name: LGBTQ+
-  langcode: en
-  description: ''
-  weight: '0'
-  parent: '0'
-  path: /taxonomy/term/36
-5afc88a5-74c3-472a-a5d6-7face67062c8:
-  uuid: 5afc88a5-74c3-472a-a5d6-7face67062c8
-  vid: tags
-  name: 'Community Project'
-  langcode: en
-  description: ''
-  weight: '0'
-  parent: '0'
-  path: /taxonomy/term/37
-31afbf21-adae-47c0-bc00-8d301fc5987c:
-  uuid: 31afbf21-adae-47c0-bc00-8d301fc5987c
-  vid: tags
-  name: 'DICE Discount'
-  langcode: en
-  description: ''
-  weight: '0'
-  parent: '0'
-  path: /taxonomy/term/38
-1aaec6b1-e013-46cc-87d3-7c03e7eb44e3:
-  uuid: 1aaec6b1-e013-46cc-87d3-7c03e7eb44e3
-  vid: client_subtypes
-  name: 'Arts Venue'
-  langcode: en
-  description: ''
-  weight: '3'
-  parent: '0'
-  fields:
-    field_parent_type:
-      -
-        target_id: '3'
-  path: /taxonomy/term/40
-057c3514-8413-463f-989e-cd8deda6c71c:
-  uuid: 057c3514-8413-463f-989e-cd8deda6c71c
-  vid: client_status
-  name: Closed
-  langcode: en
-  description: ''
-  weight: '6'
-  parent: '0'
-  fields:
-    field_substatuses:
-      -
-        target_id: '42'
-  path: /taxonomy/term/41
-c0c6397d-4f7c-4077-af51-1860ccad26a3:
-  uuid: c0c6397d-4f7c-4077-af51-1860ccad26a3
-  vid: clie
-  name: Closed
-  langcode: en
-  description: ''
-  weight: '15'
-  parent: '0'
-  path: /taxonomy/term/42
-1caee577-057e-41b2-a682-0566b7d94442:
-  uuid: 1caee577-057e-41b2-a682-0566b7d94442
-  vid: tags
-  name: 'Open Access Session'
-  langcode: en
-  description: ''
-  weight: '0'
-  parent: '0'
-  path: /taxonomy/term/43
-94195f90-8276-46eb-8510-505552e66054:
-  uuid: 94195f90-8276-46eb-8510-505552e66054
-  vid: oc_case_provider_role
-  name: Facilitator
-  langcode: en
-  description: ''
-  weight: '0'
-  parent: '0'
-  path: /taxonomy/term/44
-1cf6898b-a203-4b59-96b2-fdd303e8db7f:
-  uuid: 1cf6898b-a203-4b59-96b2-fdd303e8db7f
-  vid: oc_case_provider_role
-  name: Shadow
-  langcode: en
-  description: ''
-  weight: '0'
-  parent: '0'
-  path: /taxonomy/term/45
-16cf658a-71ae-4871-9bbd-f02d5c72d639:
-  uuid: 16cf658a-71ae-4871-9bbd-f02d5c72d639
-  vid: oc_fee_category
-  name: 'Accreditation Cost'
-  langcode: en
-  description: ''
-  weight: '0'
-  parent: '0'
-  path: /taxonomy/term/47
-397b2ec7-720a-4726-b7fe-10a41d3ea406:
-  uuid: 397b2ec7-720a-4726-b7fe-10a41d3ea406
-  vid: oc_fee_category
-  name: 'Project Cost'
-  langcode: en
-  description: ''
-  weight: '0'
-  parent: '0'
-  path: /taxonomy/term/48
-87c40494-b315-429e-827b-6b46fed068c7:
-  uuid: 87c40494-b315-429e-827b-6b46fed068c7
-  vid: oc_fee_category
-  name: 'Brand Licensing Cost'
-  langcode: en
-  description: ''
-  weight: '0'
-  parent: '0'
-  path: /taxonomy/term/49
-f7496a11-9e8d-4cae-9f53-9af37adb0783:
-  uuid: f7496a11-9e8d-4cae-9f53-9af37adb0783
-  vid: oc_fee_category
-  name: 'Consultation Cost'
-  langcode: en
-  description: ''
-  weight: '0'
-  parent: '0'
-  path: /taxonomy/term/50
-bc192846-ffbe-403f-9dc6-d5518db98dbd:
-  uuid: bc192846-ffbe-403f-9dc6-d5518db98dbd
-  vid: oc_fee_category
-  name: 'Travel Cost'
-  langcode: en
-  description: ''
-  weight: '0'
-  parent: '0'
-  path: /taxonomy/term/51
-7b0b73c0-15e8-4612-94cf-1e318a9446af:
-  uuid: 7b0b73c0-15e8-4612-94cf-1e318a9446af
-  vid: client_status
-  name: Imported
-  langcode: en
-  description: ''
-  weight: '0'
-  parent: '0'
-  fields:
-    field_substatuses:
-      -
-        target_id: '53'
-  path: /taxonomy/term/52
-4e531665-3a87-495f-9249-47a0f2655ba7:
-  uuid: 4e531665-3a87-495f-9249-47a0f2655ba7
-  vid: clie
-  name: Imported
-  langcode: en
-  description: ''
-  weight: '0'
-  parent: '0'
-  path: /taxonomy/term/53
diff --git a/config/optional/core.base_field_override.node.page.promote.yml b/config/optional/core.base_field_override.node.page.promote.yml
index 2613366..0bf0ccb 100644
--- a/config/optional/core.base_field_override.node.page.promote.yml
+++ b/config/optional/core.base_field_override.node.page.promote.yml
@@ -1,4 +1,4 @@
-uuid: 62c29bf1-1664-4d28-b4b1-dc5387d2c6a7
+uuid: bdb6aab0-ba66-4ab0-9036-0e3466b5d06d
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/core.base_field_override.oc_case_provision.trainer.oc_provider.yml b/config/optional/core.base_field_override.oc_case_provision.trainer.oc_provider.yml
deleted file mode 100644
index b7d3e69..0000000
--- a/config/optional/core.base_field_override.oc_case_provision.trainer.oc_provider.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 3494c18a-3027-4c58-a526-076e54907881
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_cases.oc_case_provision_type.trainer
-id: oc_case_provision.trainer.oc_provider
-field_name: oc_provider
-entity_type: oc_case_provision
-bundle: trainer
-label: Trainer
-description: ''
-required: true
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: views
-  handler_settings:
-    view:
-      view_name: case_providers
-      display_name: entity_reference_1
-      arguments: {  }
-field_type: entity_reference
diff --git a/config/optional/core.base_field_override.oc_organisation_relation.link_between_clients.organisations.yml b/config/optional/core.base_field_override.oc_organisation_relation.link_between_clients.organisations.yml
deleted file mode 100644
index d2c946b..0000000
--- a/config/optional/core.base_field_override.oc_organisation_relation.link_between_clients.organisations.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: d83d4c14-3ffa-4f05-8464-dfbffbcc1001
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_organisation_relation_type.link_between_clients
-    - opencase_entities.oc_organisation_type.client
-id: oc_organisation_relation.link_between_clients.organisations
-field_name: organisations
-entity_type: oc_organisation_relation
-bundle: link_between_clients
-label: 'Organisation to Link To'
-description: ''
-required: true
-translatable: true
-default_value: {  }
-default_value_callback: '\Drupal\opencase_entities\Entity\OCOrganisationRelation::defaultValueCallback'
-settings:
-  handler: views
-  handler_settings:
-    view:
-      view_name: all_clients
-      display_name: entity_reference_1
-    target_bundles:
-      - client
-field_type: entity_reference
diff --git a/config/optional/core.date_format.fallback.yml b/config/optional/core.date_format.fallback.yml
index 1ceba59..57af572 100644
--- a/config/optional/core.date_format.fallback.yml
+++ b/config/optional/core.date_format.fallback.yml
@@ -1,4 +1,4 @@
-uuid: 6f79294d-544a-44f4-a78f-630312e70711
+uuid: 781399e1-1932-46bd-a8e0-78f082cad4b1
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/core.date_format.html_date.yml b/config/optional/core.date_format.html_date.yml
index 4e53818..09904ab 100644
--- a/config/optional/core.date_format.html_date.yml
+++ b/config/optional/core.date_format.html_date.yml
@@ -1,4 +1,4 @@
-uuid: a6701ccf-e94c-4cd9-a505-d0944da9686b
+uuid: d251f5cf-a6ef-49b6-ad58-7d853df35fc9
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/core.date_format.html_datetime.yml b/config/optional/core.date_format.html_datetime.yml
index 49694fd..2308036 100644
--- a/config/optional/core.date_format.html_datetime.yml
+++ b/config/optional/core.date_format.html_datetime.yml
@@ -1,4 +1,4 @@
-uuid: b4a6a25d-02cd-4198-adf0-144979e15153
+uuid: 0e10b049-df78-4241-badf-413c52de432e
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/core.date_format.html_month.yml b/config/optional/core.date_format.html_month.yml
index e14aef5..dd26508 100644
--- a/config/optional/core.date_format.html_month.yml
+++ b/config/optional/core.date_format.html_month.yml
@@ -1,4 +1,4 @@
-uuid: 24cf90e7-7989-455b-8752-dcd7a4214333
+uuid: 3a6df8b5-ae40-4c0d-8bba-0056677544df
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/core.date_format.html_time.yml b/config/optional/core.date_format.html_time.yml
index 04ba65d..4c20c9f 100644
--- a/config/optional/core.date_format.html_time.yml
+++ b/config/optional/core.date_format.html_time.yml
@@ -1,4 +1,4 @@
-uuid: 06cf7377-260f-45a2-9cb3-0b8e3d675972
+uuid: 05ff6d01-2985-4e11-ab91-96a44b879eb9
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/core.date_format.html_week.yml b/config/optional/core.date_format.html_week.yml
index e0b9575..c3fc392 100644
--- a/config/optional/core.date_format.html_week.yml
+++ b/config/optional/core.date_format.html_week.yml
@@ -1,4 +1,4 @@
-uuid: 480bf0bb-ae90-479b-8578-4088ce0a0dfc
+uuid: a8529465-c12b-4c1f-aca0-3b0752c72a9c
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/core.date_format.html_year.yml b/config/optional/core.date_format.html_year.yml
index 15b9287..f811bfd 100644
--- a/config/optional/core.date_format.html_year.yml
+++ b/config/optional/core.date_format.html_year.yml
@@ -1,4 +1,4 @@
-uuid: ea02c889-907d-410b-8aeb-0345d4bfa8ef
+uuid: 2852ec01-ed6e-4ab3-8f90-f644b6060943
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/core.date_format.html_yearless_date.yml b/config/optional/core.date_format.html_yearless_date.yml
index 5c0c69c..66ced1f 100644
--- a/config/optional/core.date_format.html_yearless_date.yml
+++ b/config/optional/core.date_format.html_yearless_date.yml
@@ -1,4 +1,4 @@
-uuid: e1ee01b9-4d03-45fd-8373-55f3082cb6df
+uuid: 1a1ef5f5-8284-409c-b613-8a9338038bbf
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/core.date_format.long.yml b/config/optional/core.date_format.long.yml
index 8957f69..cac2518 100644
--- a/config/optional/core.date_format.long.yml
+++ b/config/optional/core.date_format.long.yml
@@ -1,4 +1,4 @@
-uuid: adb912c8-e4c2-4d92-a3b0-b93349c2b2d9
+uuid: 0aaf69e1-a7f6-4058-86fb-bb58505fd0dc
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/core.date_format.medium.yml b/config/optional/core.date_format.medium.yml
index 254550e..09fe9df 100644
--- a/config/optional/core.date_format.medium.yml
+++ b/config/optional/core.date_format.medium.yml
@@ -1,4 +1,4 @@
-uuid: fd679d2a-8168-4473-b12b-ff761ca1cdf0
+uuid: 9df18df7-3426-4cf4-83b4-2d9cc54d144f
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/core.date_format.short.yml b/config/optional/core.date_format.short.yml
index 6c70721..36918ee 100644
--- a/config/optional/core.date_format.short.yml
+++ b/config/optional/core.date_format.short.yml
@@ -1,4 +1,4 @@
-uuid: c065af51-d697-43fb-b4ad-d253c5280651
+uuid: 7868647b-7d55-4211-a799-9c06799eb3aa
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/core.entity_form_display.block_content.basic.default.yml b/config/optional/core.entity_form_display.block_content.basic.default.yml
index 0ca5355..220f1ac 100644
--- a/config/optional/core.entity_form_display.block_content.basic.default.yml
+++ b/config/optional/core.entity_form_display.block_content.basic.default.yml
@@ -1,4 +1,4 @@
-uuid: 02acdee4-d938-42a8-bd01-dfd5a43b7a57
+uuid: 0c5a17e3-0985-4016-bcd6-b86cff5ca312
 langcode: en
 status: true
 dependencies:
@@ -32,16 +32,4 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 80
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: true
-      default: ''
-      permission_based: false
-      allow_user_settings: true
-    third_party_settings: {  }
 hidden: {  }
diff --git a/config/optional/core.entity_form_display.comment.comment.default.yml b/config/optional/core.entity_form_display.comment.comment.default.yml
index d8a085f..e864065 100644
--- a/config/optional/core.entity_form_display.comment.comment.default.yml
+++ b/config/optional/core.entity_form_display.comment.comment.default.yml
@@ -1,4 +1,4 @@
-uuid: 22bb348e-ada0-400d-a791-6e16f372bf64
+uuid: 8c2b9ba0-58af-4031-8919-64134d8c8122
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/core.entity_form_display.contact_message.contact_opencase.default.yml b/config/optional/core.entity_form_display.contact_message.contact_opencase.default.yml
index 12b2788..ac515a6 100644
--- a/config/optional/core.entity_form_display.contact_message.contact_opencase.default.yml
+++ b/config/optional/core.entity_form_display.contact_message.contact_opencase.default.yml
@@ -1,4 +1,4 @@
-uuid: 16f05ca3-967f-4e36-94e2-3602c04e1d9b
+uuid: ab0feabf-73e0-44dc-9dd5-a0e9d4e13951
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/core.entity_form_display.node.article.default.yml b/config/optional/core.entity_form_display.node.article.default.yml
index 9228c96..4567a19 100644
--- a/config/optional/core.entity_form_display.node.article.default.yml
+++ b/config/optional/core.entity_form_display.node.article.default.yml
@@ -1,11 +1,10 @@
-uuid: eaf461ca-635a-4ec2-9bc0-7b77bf39a317
+uuid: 4a7d2e8b-3715-4c84-9cee-973a8ed98928
 langcode: en
 status: true
 dependencies:
   config:
     - field.field.node.article.body
     - field.field.node.article.comment
-    - field.field.node.article.feeds_item
     - field.field.node.article.field_image
     - field.field.node.article.field_tags
     - image.style.thumbnail
@@ -16,7 +15,7 @@ dependencies:
     - path
     - text
 _core:
-  default_config_hash: 6VUXB1jTUjK5zjkfMa2Kd2WW4sFUlgfBlfJSx01qLpU
+  default_config_hash: Pzq9mzrsfoPf775qgEU_SUbHSro9pv1ga-Euh1Ykd_k
 id: node.article.default
 targetEntityType: node
 bundle: article
@@ -75,18 +74,6 @@ content:
     settings:
       display_label: true
     third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 80
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: true
-      default: ''
-      permission_based: false
-      allow_user_settings: true
-    third_party_settings: {  }
   status:
     type: boolean_checkbox
     weight: 120
@@ -119,5 +106,4 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-hidden:
-  feeds_item: true
+hidden: {  }
diff --git a/config/optional/core.entity_form_display.node.page.default.yml b/config/optional/core.entity_form_display.node.page.default.yml
index facad56..ed1e73b 100644
--- a/config/optional/core.entity_form_display.node.page.default.yml
+++ b/config/optional/core.entity_form_display.node.page.default.yml
@@ -1,4 +1,4 @@
-uuid: 13fcac72-e153-4b73-b963-5de7a0749456
+uuid: 6d47445a-5bee-414e-89aa-2de09d9dc959
 langcode: en
 status: true
 dependencies:
@@ -9,7 +9,7 @@ dependencies:
     - path
     - text
 _core:
-  default_config_hash: AD_lefuYmjsKeH3OQApsyP_nLj6ZnGaALznLQSQ0Z_o
+  default_config_hash: SfpLhPExzvR0MgFp0Wp7CrmgEnhcqQ-fXIWFhbf4ue0
 id: node.page.default
 targetEntityType: node
 bundle: page
@@ -44,18 +44,6 @@ content:
     settings:
       display_label: true
     third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 80
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: true
-      default: ''
-      permission_based: false
-      allow_user_settings: true
-    third_party_settings: {  }
   status:
     type: boolean_checkbox
     weight: 120
diff --git a/config/optional/core.entity_form_display.taxonomy_term.client_subtypes.default.yml b/config/optional/core.entity_form_display.oc_activity.application.default.yml
similarity index 54%
rename from config/optional/core.entity_form_display.taxonomy_term.client_subtypes.default.yml
rename to config/optional/core.entity_form_display.oc_activity.application.default.yml
index 3cb2634..bd70d58 100644
--- a/config/optional/core.entity_form_display.taxonomy_term.client_subtypes.default.yml
+++ b/config/optional/core.entity_form_display.oc_activity.application.default.yml
@@ -1,29 +1,39 @@
-uuid: a09095b4-bb24-4d60-a525-122b2eafb758
+uuid: 4402ad3d-faa9-4091-ae6a-933b7270ce95
 langcode: en
 status: true
 dependencies:
   config:
-    - field.field.taxonomy_term.client_subtypes.field_parent_type
-    - taxonomy.vocabulary.client_subtypes
+    - opencase_entities.oc_activity_type.application
   module:
-    - path
-    - text
-_core:
-  default_config_hash: ensXtk9ZxdLejlZakVGTQ3ybcKOHB1EG2YvZIyAsrPc
-id: taxonomy_term.client_subtypes.default
-targetEntityType: taxonomy_term
-bundle: client_subtypes
+    - datetime
+id: oc_activity.application.default
+targetEntityType: oc_activity
+bundle: application
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   description:
-    type: text_textarea
-    weight: 1
+    type: string_textarea
+    weight: 5
     region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-  field_parent_type:
+  name:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
     type: entity_reference_autocomplete
     weight: 2
     region: content
@@ -33,37 +43,24 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
     region: content
     settings:
+      match_operator: CONTAINS
+      match_limit: 10
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  path:
-    type: path
-    weight: 3
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  revision_log_message:
-    type: hide_revision_field_log_widget
-    weight: 80
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: true
-      default: ''
-      permission_based: false
-      allow_user_settings: true
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
+  time_taken:
+    type: number
     weight: 4
     region: content
     settings:
-      display_label: true
+      placeholder: ''
     third_party_settings: {  }
-hidden: {  }
+hidden:
+  revision_log: true
+  status: true
+  user_id: true
diff --git a/config/optional/core.entity_form_display.taxonomy_term.client_status.default.yml b/config/optional/core.entity_form_display.oc_activity.case_note.default.yml
similarity index 54%
rename from config/optional/core.entity_form_display.taxonomy_term.client_status.default.yml
rename to config/optional/core.entity_form_display.oc_activity.case_note.default.yml
index e81b672..c29897e 100644
--- a/config/optional/core.entity_form_display.taxonomy_term.client_status.default.yml
+++ b/config/optional/core.entity_form_display.oc_activity.case_note.default.yml
@@ -1,29 +1,41 @@
-uuid: 0093dadc-135c-415b-980f-95eba8198911
+uuid: b4184284-4fa2-414f-874a-dafecb3486f5
 langcode: en
 status: true
 dependencies:
   config:
-    - field.field.taxonomy_term.client_status.field_substatuses
-    - taxonomy.vocabulary.client_status
+    - opencase_entities.oc_activity_type.case_note
   module:
-    - path
-    - text
-id: taxonomy_term.client_status.default
-targetEntityType: taxonomy_term
-bundle: client_status
+    - datetime
+id: oc_activity.case_note.default
+targetEntityType: oc_activity
+bundle: case_note
 mode: default
 content:
-  description:
-    type: text_textfield
+  activity_date_time:
+    type: datetime_default
     weight: 0
     region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 5
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 4
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  field_substatuses:
+  oc_provider:
     type: entity_reference_autocomplete
-    weight: 101
+    weight: 2
     region: content
     settings:
       match_operator: CONTAINS
@@ -31,37 +43,24 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: -5
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
     region: content
     settings:
+      match_operator: CONTAINS
+      match_limit: 10
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  path:
-    type: path
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  revision_log_message:
-    type: hide_revision_field_log_widget
-    weight: 80
+  time_taken:
+    type: number
+    weight: 3
     region: content
     settings:
-      rows: 5
       placeholder: ''
-      show: true
-      default: ''
-      permission_based: false
-      allow_user_settings: true
     third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 100
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-hidden: {  }
+hidden:
+  revision_log: true
+  status: true
+  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_activity.destitution_funds_provided.default.yml b/config/optional/core.entity_form_display.oc_activity.destitution_funds_provided.default.yml
new file mode 100644
index 0000000..c9d5939
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_activity.destitution_funds_provided.default.yml
@@ -0,0 +1,75 @@
+uuid: 9ece64fe-10fd-4a85-9ec0-8ec9429c98e4
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_activity.destitution_funds_provided.field_amount
+    - field.field.oc_activity.destitution_funds_provided.field_funds_for
+    - opencase_entities.oc_activity_type.destitution_funds_provided
+  module:
+    - datetime
+id: oc_activity.destitution_funds_provided.default
+targetEntityType: oc_activity
+bundle: destitution_funds_provided
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 6
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  field_amount:
+    type: number
+    weight: 5
+    region: content
+    settings:
+      placeholder: ''
+    third_party_settings: {  }
+  field_funds_for:
+    type: options_select
+    weight: 4
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  revision_log: true
+  status: true
+  time_taken: true
+  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_activity.email.default.yml b/config/optional/core.entity_form_display.oc_activity.email.default.yml
new file mode 100644
index 0000000..06f9fb7
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_activity.email.default.yml
@@ -0,0 +1,60 @@
+uuid: c9168804-754e-4c9c-872e-34d340c0db2a
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.email
+  module:
+    - datetime
+id: oc_activity.email.default
+targetEntityType: oc_activity
+bundle: email
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 4
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  revision_log: true
+  status: true
+  time_taken: true
+  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_activity.evaluation.default.yml b/config/optional/core.entity_form_display.oc_activity.evaluation.default.yml
deleted file mode 100644
index b47a27a..0000000
--- a/config/optional/core.entity_form_display.oc_activity.evaluation.default.yml
+++ /dev/null
@@ -1,139 +0,0 @@
-uuid: 7a3df817-a0e9-4bef-8656-b679ebcb531c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_activity.evaluation.field_a
-    - field.field.oc_activity.evaluation.field_after_knowledge
-    - field.field.oc_activity.evaluation.field_after_skills
-    - field.field.oc_activity.evaluation.field_age
-    - field.field.oc_activity.evaluation.field_b
-    - field.field.oc_activity.evaluation.field_before_confidence
-    - field.field.oc_activity.evaluation.field_before_skills
-    - field.field.oc_activity.evaluation.field_d
-    - field.field.oc_activity.evaluation.field_ease
-    - field.field.oc_activity.evaluation.field_gender
-    - field.field.oc_activity.evaluation.field_relevance
-    - opencase_entities.oc_activity_type.evaluation
-  module:
-    - datetime
-    - hide_revision_field
-_core:
-  default_config_hash: WSYAeo27GpLUUXh-PgaeoOX7BSBtIlkzHsgKXjgDbt4
-id: oc_activity.evaluation.default
-targetEntityType: oc_activity
-bundle: evaluation
-mode: default
-content:
-  activity_date_time:
-    type: datetime_default
-    weight: 0
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_a:
-    type: options_select
-    weight: 9
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_after_knowledge:
-    type: options_select
-    weight: 10
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_after_skills:
-    type: options_select
-    weight: 11
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_age:
-    type: options_select
-    weight: 3
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_b:
-    type: options_select
-    weight: 7
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_before_confidence:
-    type: options_select
-    weight: 6
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_before_skills:
-    type: options_select
-    weight: 8
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_d:
-    type: options_select
-    weight: 5
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_ease:
-    type: options_select
-    weight: 12
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_gender:
-    type: options_select
-    weight: 4
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_relevance:
-    type: options_select
-    weight: 13
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 1
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 80
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: false
-      default: ''
-      permission_based: false
-      allow_user_settings: false
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 14
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  time_taken:
-    type: number
-    weight: 2
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-hidden:
-  client: true
-  description: true
-  oc_provider: true
-  oc_target: true
-  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_activity.interview.default.yml b/config/optional/core.entity_form_display.oc_activity.interview.default.yml
new file mode 100644
index 0000000..731863d
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_activity.interview.default.yml
@@ -0,0 +1,60 @@
+uuid: 86825dc4-21cd-4670-80f5-fd3fc6c67e25
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.interview
+  module:
+    - datetime
+id: oc_activity.interview.default
+targetEntityType: oc_activity
+bundle: interview
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 4
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  revision_log: true
+  status: true
+  time_taken: true
+  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_activity.lete.default.yml b/config/optional/core.entity_form_display.oc_activity.lete.default.yml
new file mode 100644
index 0000000..b544eb8
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_activity.lete.default.yml
@@ -0,0 +1,60 @@
+uuid: a86206a2-d677-4276-8450-39941361eee1
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.lete
+  module:
+    - datetime
+id: oc_activity.lete.default
+targetEntityType: oc_activity
+bundle: lete
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 4
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  revision_log: true
+  status: true
+  time_taken: true
+  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_activity.phone_call.default.yml b/config/optional/core.entity_form_display.oc_activity.phone_call.default.yml
index 0ded4ce..422e807 100644
--- a/config/optional/core.entity_form_display.oc_activity.phone_call.default.yml
+++ b/config/optional/core.entity_form_display.oc_activity.phone_call.default.yml
@@ -1,4 +1,4 @@
-uuid: 739a9057-a782-4ee3-870d-11cf91173793
+uuid: 61cedd57-e60e-4304-afbd-6397326a1468
 langcode: en
 status: true
 dependencies:
@@ -19,7 +19,7 @@ content:
     third_party_settings: {  }
   description:
     type: string_textarea
-    weight: 2
+    weight: 4
     region: content
     settings:
       rows: 5
@@ -27,16 +27,33 @@ content:
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 1
+    weight: 3
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
 hidden:
-  client: true
-  oc_provider: true
-  oc_target: true
   revision_log: true
   status: true
   time_taken: true
diff --git a/config/optional/core.entity_form_display.oc_activity.research.default.yml b/config/optional/core.entity_form_display.oc_activity.research.default.yml
new file mode 100644
index 0000000..dce5ad8
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_activity.research.default.yml
@@ -0,0 +1,60 @@
+uuid: 0751919f-0018-47c0-b5fd-074d40ccc2df
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.research
+  module:
+    - datetime
+id: oc_activity.research.default
+targetEntityType: oc_activity
+bundle: research
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 4
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  revision_log: true
+  status: true
+  time_taken: true
+  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_activity.supervision.default.yml b/config/optional/core.entity_form_display.oc_activity.supervision.default.yml
new file mode 100644
index 0000000..c6ea98a
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_activity.supervision.default.yml
@@ -0,0 +1,60 @@
+uuid: 43b06d48-94ac-4f74-9adc-f40bb63d4f4e
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.supervision
+  module:
+    - datetime
+id: oc_activity.supervision.default
+targetEntityType: oc_activity
+bundle: supervision
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 4
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  revision_log: true
+  status: true
+  time_taken: true
+  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_activity.trainer_debrief.default.yml b/config/optional/core.entity_form_display.oc_activity.trainer_debrief.default.yml
deleted file mode 100644
index e25b400..0000000
--- a/config/optional/core.entity_form_display.oc_activity.trainer_debrief.default.yml
+++ /dev/null
@@ -1,122 +0,0 @@
-uuid: a77fe130-3ce2-4104-ae48-7adf3f883e5a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_activity.trainer_debrief.field_caption_for_photo
-    - field.field.oc_activity.trainer_debrief.field_issues_and_difficulties
-    - field.field.oc_activity.trainer_debrief.field_issues_with_group_dynamics
-    - field.field.oc_activity.trainer_debrief.field_number_of_participants
-    - field.field.oc_activity.trainer_debrief.field_photo
-    - field.field.oc_activity.trainer_debrief.field_what_came_up_for_the_group
-    - field.field.oc_activity.trainer_debrief.field_what_could_be_improved_for
-    - field.field.oc_activity.trainer_debrief.field_what_did_facilitators_do_w
-    - field.field.oc_activity.trainer_debrief.field_what_real_scenarios_or_inc
-    - image.style.thumbnail
-    - opencase_entities.oc_activity_type.trainer_debrief
-  module:
-    - datetime
-    - image
-id: oc_activity.trainer_debrief.default
-targetEntityType: oc_activity
-bundle: trainer_debrief
-mode: default
-content:
-  activity_date_time:
-    type: datetime_default
-    weight: 0
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_caption_for_photo:
-    type: string_textarea
-    weight: 10
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_issues_and_difficulties:
-    type: string_textarea
-    weight: 5
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_issues_with_group_dynamics:
-    type: string_textarea
-    weight: 6
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_number_of_participants:
-    type: number
-    weight: 2
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-  field_photo:
-    type: image_image
-    weight: 9
-    region: content
-    settings:
-      progress_indicator: throbber
-      preview_image_style: thumbnail
-    third_party_settings: {  }
-  field_what_came_up_for_the_group:
-    type: string_textarea
-    weight: 4
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_what_could_be_improved_for:
-    type: string_textarea
-    weight: 8
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_what_did_facilitators_do_w:
-    type: string_textarea
-    weight: 3
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_what_real_scenarios_or_inc:
-    type: string_textarea
-    weight: 7
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  oc_provider:
-    type: options_select
-    weight: 1
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 11
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-hidden:
-  client: true
-  description: true
-  name: true
-  oc_target: true
-  revision_log: true
-  time_taken: true
-  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_actor.client.default.yml b/config/optional/core.entity_form_display.oc_actor.client.default.yml
new file mode 100644
index 0000000..85b13d7
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_actor.client.default.yml
@@ -0,0 +1,233 @@
+uuid: 7a629105-24fb-46e2-98f0-c0c3bb2e6f76
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_actor.client.field_asylum_status
+    - field.field.oc_actor.client.field_confidentiality_form
+    - field.field.oc_actor.client.field_date_of_birth
+    - field.field.oc_actor.client.field_dependants
+    - field.field.oc_actor.client.field_disability
+    - field.field.oc_actor.client.field_ethnic_o
+    - field.field.oc_actor.client.field_gender_identified_with
+    - field.field.oc_actor.client.field_general_noes
+    - field.field.oc_actor.client.field_how_heard
+    - field.field.oc_actor.client.field_income
+    - field.field.oc_actor.client.field_languages_spoken
+    - field.field.oc_actor.client.field_marital_
+    - field.field.oc_actor.client.field_nationalities
+    - field.field.oc_actor.client.field_referred_by
+    - field.field.oc_actor.client.field_sex
+    - opencase_entities.oc_actor_type.client
+  module:
+    - datetime
+    - file
+_core:
+  default_config_hash: 90BCsdjSFMMiSp2Da3WhMM2sOUliF433LfErYxVCrgk
+id: oc_actor.client.default
+targetEntityType: oc_actor
+bundle: client
+mode: default
+content:
+  email:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  field_asylum_status:
+    type: options_select
+    weight: 11
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_client_field_1:
+    type: string_textfield
+    weight: 26
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  field_confidentiality_form:
+    type: file_generic
+    weight: 20
+    region: content
+    settings:
+      progress_indicator: throbber
+    third_party_settings: {  }
+  field_date_of_birth:
+    type: datetime_default
+    weight: 8
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_dependants:
+    type: string_textfield
+    weight: 17
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  field_disability:
+    type: string_textfield
+    weight: 15
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  field_ethnic_o:
+    type: string_textfield
+    weight: 12
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  field_gender_identified_with:
+    type: options_select
+    weight: 9
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_general_noes:
+    type: string_textarea
+    weight: 21
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  field_how_heard:
+    type: options_select
+    weight: 18
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_income:
+    type: options_select
+    weight: 16
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_languages_spoken:
+    type: options_select
+    weight: 14
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_marital_:
+    type: options_select
+    weight: 10
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_nationalities:
+    type: options_select
+    weight: 13
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_referred_by:
+    type: string_textfield
+    weight: 19
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  first_name:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  last_name:
+    type: string_textfield
+    weight: 2
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  middle_names:
+    type: string_textfield
+    weight: 1
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: -4
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  phone:
+    type: string_textfield
+    weight: 4
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  phone2:
+    type: string_textfield
+    weight: 5
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  post_code:
+    type: string_textfield
+    weight: 7
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  postal_address:
+    type: string_textarea
+    weight: 6
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  revision_log:
+    type: hide_revision_field_log_widget
+    weight: 80
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+      show: true
+      default: ''
+      permission_based: false
+      allow_user_settings: true
+    third_party_settings: {  }
+  user_id:
+    type: entity_reference_autocomplete
+    weight: 5
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  field_sex: true
+  full_name: true
+  status: true
+  user_login: true
diff --git a/config/optional/core.entity_form_display.oc_actor.staff_member.default.yml b/config/optional/core.entity_form_display.oc_actor.staff_member.default.yml
new file mode 100644
index 0000000..1f46f0f
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_actor.staff_member.default.yml
@@ -0,0 +1,79 @@
+uuid: 56d178c9-a69d-42a7-8235-6ecce238a904
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_actor_type.staff_member
+id: oc_actor.staff_member.default
+targetEntityType: oc_actor
+bundle: staff_member
+mode: default
+content:
+  email:
+    type: string_textfield
+    weight: 2
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  first_name:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  last_name:
+    type: string_textfield
+    weight: 1
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  middle_names:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  phone:
+    type: string_textfield
+    weight: 4
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  phone2:
+    type: string_textfield
+    weight: 5
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  post_code:
+    type: string_textfield
+    weight: 7
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  postal_address:
+    type: string_textarea
+    weight: 6
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  revision_log: true
+  status: true
+  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_actor.trainer.default.yml b/config/optional/core.entity_form_display.oc_actor.trainer.default.yml
deleted file mode 100644
index 91f52e3..0000000
--- a/config/optional/core.entity_form_display.oc_actor.trainer.default.yml
+++ /dev/null
@@ -1,168 +0,0 @@
-uuid: 6f959a42-96b3-4dea-b5a9-712b7fea20c4
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_actor.trainer.feeds_item
-    - field.field.oc_actor.trainer.field_active
-    - field.field.oc_actor.trainer.field_availability
-    - field.field.oc_actor.trainer.field_delivery_partners
-    - field.field.oc_actor.trainer.field_emergency_contact
-    - field.field.oc_actor.trainer.field_languages_spoken_fluently
-    - field.field.oc_actor.trainer.field_notes
-    - field.field.oc_actor.trainer.field_photo
-    - field.field.oc_actor.trainer.field_pronoun
-    - image.style.thumbnail
-    - opencase_entities.oc_actor_type.trainer
-  module:
-    - hide_revision_field
-    - image
-    - paragraphs
-_core:
-  default_config_hash: ytZJrCjxKRjlbnmW3Ga9RPMunV7aVL-ns0bB5shJhFw
-id: oc_actor.trainer.default
-targetEntityType: oc_actor
-bundle: trainer
-mode: default
-content:
-  email:
-    type: string_textfield
-    weight: 3
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_active:
-    type: boolean_checkbox
-    weight: 26
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  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: _none
-    third_party_settings: {  }
-  field_delivery_partners:
-    type: options_select
-    weight: 7
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  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: _none
-    third_party_settings: {  }
-  field_languages_spoken_fluently:
-    type: options_select
-    weight: 5
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_notes:
-    type: string_textarea
-    weight: 9
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_photo:
-    type: image_image
-    weight: 8
-    region: content
-    settings:
-      progress_indicator: throbber
-      preview_image_style: thumbnail
-    third_party_settings: {  }
-  field_pronoun:
-    type: string_textfield
-    weight: 2
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  first_name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  last_name:
-    type: string_textfield
-    weight: 1
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  phone:
-    type: string_textfield
-    weight: 4
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  post_code:
-    type: string_textfield
-    weight: 11
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  postal_address:
-    type: string_textarea
-    weight: 10
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 80
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: false
-      default: ''
-      permission_based: false
-      allow_user_settings: false
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 13
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-hidden:
-  feeds_item: true
-  full_name: true
-  middle_names: true
-  phone2: true
-  user_id: true
-  user_login: true
diff --git a/config/optional/core.entity_form_display.oc_actor.volunteer.default.yml b/config/optional/core.entity_form_display.oc_actor.volunteer.default.yml
new file mode 100644
index 0000000..d8fd572
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_actor.volunteer.default.yml
@@ -0,0 +1,117 @@
+uuid: bc7ed01d-4eba-44c2-a6ab-78500c090d70
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_actor.volunteer.field_ethnic_o
+    - field.field.oc_actor.volunteer.field_general_noes
+    - field.field.oc_actor.volunteer.field_languages_spoken
+    - field.field.oc_actor.volunteer.field_nationalities
+    - field.field.oc_actor.volunteer.field_osic_level
+    - field.field.oc_actor.volunteer.field_skills
+    - opencase_entities.oc_actor_type.volunteer
+id: oc_actor.volunteer.default
+targetEntityType: oc_actor
+bundle: volunteer
+mode: default
+content:
+  email:
+    type: string_textfield
+    weight: 2
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  field_general_noes:
+    type: string_textarea
+    weight: 10
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  field_languages_spoken:
+    type: options_select
+    weight: 7
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_osic_level:
+    type: options_select
+    weight: 8
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_skills:
+    type: string_textarea
+    weight: 9
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  first_name:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  last_name:
+    type: string_textfield
+    weight: 1
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: -4
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  phone:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  phone2:
+    type: string_textfield
+    weight: 4
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  post_code:
+    type: string_textfield
+    weight: 6
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  postal_address:
+    type: string_textarea
+    weight: 5
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  field_ethnic_o: true
+  field_nationalities: true
+  middle_names: true
+  revision_log: true
+  status: true
+  user_id: true
+  user_login: true
diff --git a/config/optional/core.entity_form_display.oc_case.project.default.yml b/config/optional/core.entity_form_display.oc_case.accommodation.default.yml
similarity index 52%
rename from config/optional/core.entity_form_display.oc_case.project.default.yml
rename to config/optional/core.entity_form_display.oc_case.accommodation.default.yml
index c1ba561..101cd06 100644
--- a/config/optional/core.entity_form_display.oc_case.project.default.yml
+++ b/config/optional/core.entity_form_display.oc_case.accommodation.default.yml
@@ -1,57 +1,37 @@
-uuid: 1c6b46be-3a22-4137-b4b2-7ddbe0921e79
+uuid: 38668a42-5ab1-4063-a1fa-75256aa1a171
 langcode: en
 status: true
 dependencies:
   config:
-    - field.field.oc_case.project.feeds_item
-    - field.field.oc_case.project.field_contract_signed_date
-    - field.field.oc_case.project.field_invoicing_notes
-    - field.field.oc_case.project.field_invoicing_status
-    - field.field.oc_case.project.field_link_to_invoice
-    - opencase_cases.oc_case_type.project
+    - field.field.oc_case.accommodation.field_case_finance
+    - field.field.oc_case.accommodation.field_outcome
+    - field.field.oc_case.accommodation.field_type_of_acco
+    - opencase_cases.oc_case_type.accommodation
   module:
-    - datetime
     - file
     - hide_revision_field
-    - link
-id: oc_case.project.default
+id: oc_case.accommodation.default
 targetEntityType: oc_case
-bundle: project
+bundle: accommodation
 mode: default
 content:
-  client:
+  field_case_finance:
     type: options_select
-    weight: 1
+    weight: 4
     region: content
     settings: {  }
     third_party_settings: {  }
-  field_contract_signed_date:
-    type: datetime_default
-    weight: 3
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_invoicing_notes:
-    type: string_textarea
-    weight: 6
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_invoicing_status:
+  field_outcome:
     type: options_select
     weight: 7
     region: content
     settings: {  }
     third_party_settings: {  }
-  field_link_to_invoice:
-    type: link_default
-    weight: 8
+  field_type_of_acco:
+    type: options_select
+    weight: 3
     region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
+    settings: {  }
     third_party_settings: {  }
   files:
     type: file_generic
@@ -68,28 +48,32 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   revision_log:
     type: hide_revision_field_log_widget
-    weight: 5
+    weight: 8
     region: content
     settings:
       rows: 5
       placeholder: ''
-      show: false
+      show: true
       default: ''
       permission_based: false
-      allow_user_settings: false
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 4
-    region: content
-    settings:
-      display_label: true
+      allow_user_settings: true
     third_party_settings: {  }
 hidden:
-  feeds_item: true
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
   notes: true
-  oc_target: true
+  status: true
   total_fee: true
   user_id: true
diff --git a/config/optional/core.entity_form_display.oc_case.asylum_support.default.yml b/config/optional/core.entity_form_display.oc_case.asylum_support.default.yml
new file mode 100644
index 0000000..6d3f588
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_case.asylum_support.default.yml
@@ -0,0 +1,63 @@
+uuid: 6bf32252-ae4d-4c4f-8484-c95c9fc07ba3
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.asylum_support.field_case_finance
+    - field.field.oc_case.asylum_support.field_outcome
+    - field.field.oc_case.asylum_support.field_type_of_as
+    - opencase_cases.oc_case_type.asylum_support
+  module:
+    - file
+    - hide_revision_field
+id: oc_case.asylum_support.default
+targetEntityType: oc_case
+bundle: asylum_support
+mode: default
+content:
+  field_case_finance:
+    type: options_select
+    weight: 27
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_outcome:
+    type: options_select
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_type_of_as:
+    type: options_select
+    weight: 26
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  files:
+    type: file_generic
+    weight: -1
+    region: content
+    settings:
+      progress_indicator: throbber
+    third_party_settings: {  }
+  revision_log:
+    type: hide_revision_field_log_widget
+    weight: 80
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+      show: true
+      default: ''
+      permission_based: false
+      allow_user_settings: true
+    third_party_settings: {  }
+hidden:
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
+  notes: true
+  oc_target: true
+  status: true
+  total_fee: true
+  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_case.employability.default.yml b/config/optional/core.entity_form_display.oc_case.employability.default.yml
new file mode 100644
index 0000000..99a9ac0
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_case.employability.default.yml
@@ -0,0 +1,71 @@
+uuid: 2cdf4d5f-96bf-4c95-8e0c-48dd867eb9cb
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.employability.field_case_finance
+    - field.field.oc_case.employability.field_gave_list_of_agencies
+    - field.field.oc_case.employability.field_outcome
+    - field.field.oc_case.employability.field_type_of_employability_help
+    - opencase_cases.oc_case_type.employability
+  module:
+    - file
+    - hide_revision_field
+id: oc_case.employability.default
+targetEntityType: oc_case
+bundle: employability
+mode: default
+content:
+  field_case_finance:
+    type: options_select
+    weight: 28
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_gave_list_of_agencies:
+    type: boolean_checkbox
+    weight: 27
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
+  field_outcome:
+    type: options_select
+    weight: 31
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_type_of_employability_help:
+    type: options_select
+    weight: 26
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  files:
+    type: file_generic
+    weight: -1
+    region: content
+    settings:
+      progress_indicator: throbber
+    third_party_settings: {  }
+  revision_log:
+    type: hide_revision_field_log_widget
+    weight: 80
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+      show: true
+      default: ''
+      permission_based: false
+      allow_user_settings: true
+    third_party_settings: {  }
+hidden:
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
+  notes: true
+  oc_target: true
+  status: true
+  total_fee: true
+  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_case.enquiry.default.yml b/config/optional/core.entity_form_display.oc_case.enquiry.default.yml
new file mode 100644
index 0000000..c315a49
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_case.enquiry.default.yml
@@ -0,0 +1,55 @@
+uuid: 9ca0d966-5d05-4e95-93fe-36bed0ee506c
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.enquiry.field_outcome
+    - field.field.oc_case.enquiry.field_subject_of_enquiry
+    - opencase_cases.oc_case_type.enquiry
+  module:
+    - file
+id: oc_case.enquiry.default
+targetEntityType: oc_case
+bundle: enquiry
+mode: default
+content:
+  field_outcome:
+    type: options_select
+    weight: 1
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_subject_of_enquiry:
+    type: string_textarea
+    weight: 0
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  files:
+    type: file_generic
+    weight: -1
+    region: content
+    settings:
+      progress_indicator: throbber
+    third_party_settings: {  }
+  revision_log:
+    type: hide_revision_field_log_widget
+    weight: 80
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+      show: true
+      default: ''
+      permission_based: false
+      allow_user_settings: true
+    third_party_settings: {  }
+hidden:
+  name: true
+  notes: true
+  oc_target: true
+  status: true
+  total_fee: true
+  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_case.health.default.yml b/config/optional/core.entity_form_display.oc_case.health.default.yml
new file mode 100644
index 0000000..4ef6e0e
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_case.health.default.yml
@@ -0,0 +1,63 @@
+uuid: 20173814-2b67-4eab-9400-af842f6196a9
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.health.field_case_finance
+    - field.field.oc_case.health.field_outcome
+    - field.field.oc_case.health.field_type_health
+    - opencase_cases.oc_case_type.health
+  module:
+    - file
+    - hide_revision_field
+id: oc_case.health.default
+targetEntityType: oc_case
+bundle: health
+mode: default
+content:
+  field_case_finance:
+    type: options_select
+    weight: 27
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_outcome:
+    type: options_select
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_type_health:
+    type: options_select
+    weight: 26
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  files:
+    type: file_generic
+    weight: -1
+    region: content
+    settings:
+      progress_indicator: throbber
+    third_party_settings: {  }
+  revision_log:
+    type: hide_revision_field_log_widget
+    weight: 80
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+      show: true
+      default: ''
+      permission_based: false
+      allow_user_settings: true
+    third_party_settings: {  }
+hidden:
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
+  notes: true
+  oc_target: true
+  status: true
+  total_fee: true
+  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_case.immigration.default.yml b/config/optional/core.entity_form_display.oc_case.immigration.default.yml
new file mode 100644
index 0000000..8007760
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_case.immigration.default.yml
@@ -0,0 +1,70 @@
+uuid: 0083be5f-a4a6-4ebd-9826-0eccf8b7cf6b
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.immigration.field_case_finance
+    - field.field.oc_case.immigration.field_level
+    - field.field.oc_case.immigration.field_outcome
+    - field.field.oc_case.immigration.field_type_of_applicat
+    - opencase_cases.oc_case_type.immigration
+  module:
+    - file
+    - hide_revision_field
+id: oc_case.immigration.default
+targetEntityType: oc_case
+bundle: immigration
+mode: default
+content:
+  field_case_finance:
+    type: options_select
+    weight: 28
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_level:
+    type: options_select
+    weight: 26
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_outcome:
+    type: options_select
+    weight: 31
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_type_of_applicat:
+    type: options_select
+    weight: 27
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  files:
+    type: file_generic
+    weight: -1
+    region: content
+    settings:
+      progress_indicator: throbber
+    third_party_settings: {  }
+  revision_log:
+    type: hide_revision_field_log_widget
+    weight: 80
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+      show: true
+      default: ''
+      permission_based: false
+      allow_user_settings: true
+    third_party_settings: {  }
+hidden:
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
+  notes: true
+  oc_target: true
+  status: true
+  total_fee: true
+  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_case.pro_bono_immigration_service.default.yml b/config/optional/core.entity_form_display.oc_case.pro_bono_immigration_service.default.yml
new file mode 100644
index 0000000..57b3f5d
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_case.pro_bono_immigration_service.default.yml
@@ -0,0 +1,46 @@
+uuid: b3d1c103-d544-48ab-b4a3-13d9fea55f98
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.pro_bono_immigration_service.field_outcome
+    - opencase_cases.oc_case_type.pro_bono_immigration_service
+  module:
+    - file
+id: oc_case.pro_bono_immigration_service.default
+targetEntityType: oc_case
+bundle: pro_bono_immigration_service
+mode: default
+content:
+  field_outcome:
+    type: options_select
+    weight: 26
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  files:
+    type: file_generic
+    weight: -1
+    region: content
+    settings:
+      progress_indicator: throbber
+    third_party_settings: {  }
+  revision_log:
+    type: hide_revision_field_log_widget
+    weight: 80
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+      show: true
+      default: ''
+      permission_based: false
+      allow_user_settings: true
+    third_party_settings: {  }
+hidden:
+  name: true
+  notes: true
+  oc_target: true
+  status: true
+  total_fee: true
+  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_case.training.default.yml b/config/optional/core.entity_form_display.oc_case.training.default.yml
deleted file mode 100644
index 6711551..0000000
--- a/config/optional/core.entity_form_display.oc_case.training.default.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-uuid: d3d5d26b-ae04-4050-9e7b-570e9e159560
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_case.training.feeds_item
-    - field.field.oc_case.training.field_date_of_training
-    - field.field.oc_case.training.field_number_of_participants
-    - field.field.oc_case.training.field_project
-    - field.field.oc_case.training.field_social_media
-    - field.field.oc_case.training.field_training_delivery_format
-    - field.field.oc_case.training.field_training_status
-    - field.field.oc_case.training.field_training_type
-    - opencase_cases.oc_case_type.training
-  module:
-    - datetime
-    - file
-    - hide_revision_field
-_core:
-  default_config_hash: dxPm53tH_SWeTJgZIfdHIIiEb4vSzqADMzUemllj8rk
-id: oc_case.training.default
-targetEntityType: oc_case
-bundle: training
-mode: default
-content:
-  client:
-    type: options_select
-    weight: 1
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_date_of_training:
-    type: datetime_default
-    weight: 5
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_project:
-    type: options_select
-    weight: 2
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_social_media:
-    type: boolean_checkbox
-    weight: 8
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  field_training_delivery_format:
-    type: options_select
-    weight: 6
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_training_status:
-    type: options_select
-    weight: 4
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_training_type:
-    type: options_select
-    weight: 3
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  files:
-    type: file_generic
-    weight: 7
-    region: content
-    settings:
-      progress_indicator: throbber
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  notes:
-    type: string_textarea
-    weight: 10
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 11
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: false
-      default: ''
-      permission_based: false
-      allow_user_settings: false
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 9
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-hidden:
-  feeds_item: true
-  field_number_of_participants: true
-  oc_target: true
-  total_fee: true
-  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_case.welfare_rights.default.yml b/config/optional/core.entity_form_display.oc_case.welfare_rights.default.yml
new file mode 100644
index 0000000..4006728
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_case.welfare_rights.default.yml
@@ -0,0 +1,63 @@
+uuid: 89d5e20a-5d26-4231-85f1-065e1c3e880c
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.welfare_rights.field_case_finance
+    - field.field.oc_case.welfare_rights.field_outcome
+    - field.field.oc_case.welfare_rights.field_type_of_welfare_rights_iss
+    - opencase_cases.oc_case_type.welfare_rights
+  module:
+    - file
+    - hide_revision_field
+id: oc_case.welfare_rights.default
+targetEntityType: oc_case
+bundle: welfare_rights
+mode: default
+content:
+  field_case_finance:
+    type: options_select
+    weight: 27
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_outcome:
+    type: options_select
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_type_of_welfare_rights_iss:
+    type: options_select
+    weight: 26
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  files:
+    type: file_generic
+    weight: -1
+    region: content
+    settings:
+      progress_indicator: throbber
+    third_party_settings: {  }
+  revision_log:
+    type: hide_revision_field_log_widget
+    weight: 80
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+      show: true
+      default: ''
+      permission_based: false
+      allow_user_settings: true
+    third_party_settings: {  }
+hidden:
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
+  notes: true
+  oc_target: true
+  status: true
+  total_fee: true
+  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_case_fee.fee.default.yml b/config/optional/core.entity_form_display.oc_case_fee.fee.default.yml
new file mode 100644
index 0000000..6c6709e
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_case_fee.fee.default.yml
@@ -0,0 +1,35 @@
+uuid: 9c6530a7-4c3c-447c-ba44-1666df974e9e
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_cases.oc_case_fee_type.fee
+id: oc_case_fee.fee.default
+targetEntityType: oc_case_fee
+bundle: fee
+mode: default
+content:
+  amount:
+    type: number
+    weight: 1
+    region: content
+    settings:
+      placeholder: ''
+    third_party_settings: {  }
+  oc_case:
+    type: entity_reference_autocomplete
+    weight: 0
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  description: true
+  name: true
+  oc_fee_category: true
+  revision_log: true
+  status: true
+  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_case_fee.project_fee.default.yml b/config/optional/core.entity_form_display.oc_case_fee.project_fee.default.yml
deleted file mode 100644
index c5e7662..0000000
--- a/config/optional/core.entity_form_display.oc_case_fee.project_fee.default.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-uuid: bde0c9bb-5bf2-4443-976d-3b42d109c4d1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_case_fee.project_fee.feeds_item
-    - opencase_cases.oc_case_fee_type.project_fee
-id: oc_case_fee.project_fee.default
-targetEntityType: oc_case_fee
-bundle: project_fee
-mode: default
-content:
-  amount:
-    type: number
-    weight: 1
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-  description:
-    type: string_textarea
-    weight: 2
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  oc_fee_category:
-    type: options_select
-    weight: 0
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden:
-  feeds_item: true
-  name: true
-  oc_case: true
-  revision_log: true
-  status: true
-  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_case_provision.caseworker.default.yml b/config/optional/core.entity_form_display.oc_case_provision.caseworker.default.yml
new file mode 100644
index 0000000..8e7d292
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_case_provision.caseworker.default.yml
@@ -0,0 +1,79 @@
+uuid: 60d3b187-2270-4cff-884f-7242f4273f2d
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case_provision.caseworker.field_test
+    - opencase_cases.oc_case_provision_type.caseworker
+  module:
+    - hide_revision_field
+id: oc_case_provision.caseworker.default
+targetEntityType: oc_case_provision
+bundle: caseworker
+mode: default
+content:
+  field_test:
+    type: entity_reference_autocomplete
+    weight: 81
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_case:
+    type: entity_reference_autocomplete
+    weight: 0
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_case_provider_role:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  revision_log:
+    type: hide_revision_field_log_widget
+    weight: 80
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+      show: true
+      default: ''
+      permission_based: false
+      allow_user_settings: true
+    third_party_settings: {  }
+  user_id:
+    type: entity_reference_autocomplete
+    weight: 3
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  name: true
+  status: true
diff --git a/config/optional/core.entity_form_display.oc_case_provision.trainer.default.yml b/config/optional/core.entity_form_display.oc_case_provision.trainer.default.yml
deleted file mode 100644
index 15b069d..0000000
--- a/config/optional/core.entity_form_display.oc_case_provision.trainer.default.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-uuid: 70d5503e-2a95-4bd3-8770-6e3ac8ef74a5
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_case_provision.trainer.feeds_item
-    - field.field.oc_case_provision.trainer.field_rate
-    - field.field.oc_case_provision.trainer.field_rate_type
-    - opencase_cases.oc_case_provision_type.trainer
-  module:
-    - hide_revision_field
-id: oc_case_provision.trainer.default
-targetEntityType: oc_case_provision
-bundle: trainer
-mode: default
-content:
-  field_rate:
-    type: number
-    weight: 3
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-  field_rate_type:
-    type: options_buttons
-    weight: 2
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  oc_case_provider_role:
-    type: options_select
-    weight: 1
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  oc_provider:
-    type: options_select
-    weight: 0
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 4
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: false
-      default: ''
-      permission_based: false
-      allow_user_settings: false
-    third_party_settings: {  }
-hidden:
-  feeds_item: true
-  name: true
-  oc_case: true
-  status: true
-  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_equal_opps.oc_equal_opps.default.yml b/config/optional/core.entity_form_display.oc_equal_opps.oc_equal_opps.default.yml
new file mode 100644
index 0000000..9d5f076
--- /dev/null
+++ b/config/optional/core.entity_form_display.oc_equal_opps.oc_equal_opps.default.yml
@@ -0,0 +1,57 @@
+uuid: 9282eb8d-96fa-4c3a-a0ea-abbdc763efa0
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+id: oc_equal_opps.oc_equal_opps.default
+targetEntityType: oc_equal_opps
+bundle: oc_equal_opps
+mode: default
+content:
+  access_needs:
+    type: string_textarea
+    weight: 2
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  age:
+    type: options_select
+    weight: 1
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  gender:
+    type: options_select
+    weight: 3
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  oc_actor:
+    type: entity_reference_autocomplete
+    weight: 0
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  race_ethnicity:
+    type: options_select
+    weight: 4
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  sexuality:
+    type: string_textfield
+    weight: 5
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  name: true
diff --git a/config/optional/core.entity_form_display.oc_event.train_the_trainer.default.yml b/config/optional/core.entity_form_display.oc_event.train_the_trainer.default.yml
deleted file mode 100644
index 8d70078..0000000
--- a/config/optional/core.entity_form_display.oc_event.train_the_trainer.default.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-uuid: 12afe302-9a15-4267-b4f4-0a0a4d70977f
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_event_type.train_the_trainer
-id: oc_event.train_the_trainer.default
-targetEntityType: oc_event
-bundle: train_the_trainer
-mode: default
-content:
-  attendees:
-    type: options_select
-    weight: 2
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 1
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-hidden:
-  activity_date_time: true
-  description: true
-  user_id: true
diff --git a/config/optional/core.entity_form_display.oc_activity.emi.default.yml b/config/optional/core.entity_form_display.oc_event.volunteer_training_session.default.yml
similarity index 56%
rename from config/optional/core.entity_form_display.oc_activity.emi.default.yml
rename to config/optional/core.entity_form_display.oc_event.volunteer_training_session.default.yml
index d833807..5f9a566 100644
--- a/config/optional/core.entity_form_display.oc_activity.emi.default.yml
+++ b/config/optional/core.entity_form_display.oc_event.volunteer_training_session.default.yml
@@ -1,22 +1,32 @@
-uuid: 83c69b0b-e1c3-413d-82df-6cc1d0f8e66c
+uuid: b512b25f-0fab-4582-88ee-ce7184c6b6c6
 langcode: en
 status: true
 dependencies:
   config:
-    - opencase_entities.oc_activity_type.emi
+    - opencase_entities.oc_event_type.volunteer_training_session
   module:
     - datetime
-id: oc_activity.emi.default
-targetEntityType: oc_activity
-bundle: emi
+id: oc_event.volunteer_training_session.default
+targetEntityType: oc_event
+bundle: volunteer_training_session
 mode: default
 content:
   activity_date_time:
     type: datetime_default
-    weight: 0
+    weight: 1
     region: content
     settings: {  }
     third_party_settings: {  }
+  attendees:
+    type: entity_reference_autocomplete
+    weight: 3
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   description:
     type: string_textarea
     weight: 2
@@ -27,17 +37,12 @@ content:
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 1
+    weight: 0
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
 hidden:
-  client: true
-  oc_provider: true
-  oc_target: true
-  revision_log: true
   status: true
-  time_taken: true
   user_id: true
diff --git a/config/optional/core.entity_form_display.oc_organisation.client.default.yml b/config/optional/core.entity_form_display.oc_organisation.client.default.yml
deleted file mode 100644
index 54058af..0000000
--- a/config/optional/core.entity_form_display.oc_organisation.client.default.yml
+++ /dev/null
@@ -1,146 +0,0 @@
-uuid: 46f56073-934f-4f2a-8d1d-1009eef441ea
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_organisation.client.feeds_item
-    - field.field.oc_organisation.client.field_accreditation_date
-    - field.field.oc_organisation.client.field_client_status
-    - field.field.oc_organisation.client.field_client_substatus
-    - field.field.oc_organisation.client.field_client_subtype
-    - field.field.oc_organisation.client.field_client_type
-    - field.field.oc_organisation.client.field_how_did_you_hear_about_us
-    - field.field.oc_organisation.client.field_images
-    - field.field.oc_organisation.client.field_location_festival_event
-    - field.field.oc_organisation.client.field_number_of_events_per_year
-    - field.field.oc_organisation.client.field_number_of_staff
-    - field.field.oc_organisation.client.field_premises_capacity
-    - field.field.oc_organisation.client.field_tags
-    - field.field.oc_organisation.client.field_umbrella_client
-    - opencase_entities.oc_organisation_type.client
-  module:
-    - datetime
-    - file
-_core:
-  default_config_hash: OUNi7pV7COebgUedxmuEz4ZF1VF4QDet2AcZ_2j3jQs
-id: oc_organisation.client.default
-targetEntityType: oc_organisation
-bundle: client
-mode: default
-content:
-  field_accreditation_date:
-    type: datetime_default
-    weight: 5
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_client_status:
-    type: options_select
-    weight: 4
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_client_substatus:
-    type: options_select
-    weight: 3
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_client_subtype:
-    type: options_select
-    weight: 2
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_client_type:
-    type: options_select
-    weight: 1
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_how_did_you_hear_about_us:
-    type: options_buttons
-    weight: 12
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_location_festival_event:
-    type: string_textfield
-    weight: 9
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_number_of_events_per_year:
-    type: number
-    weight: 10
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-  field_number_of_staff:
-    type: number
-    weight: 8
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-  field_premises_capacity:
-    type: number
-    weight: 7
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-  field_tags:
-    type: options_select
-    weight: 11
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_umbrella_client:
-    type: options_select
-    weight: 6
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  notes:
-    type: string_textarea
-    weight: 14
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 13
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-hidden:
-  billing_contact_name: true
-  billing_email: true
-  billing_phone: true
-  billing_post_code: true
-  billing_postal_address: true
-  contact_name: true
-  contact_role: true
-  email: true
-  feeds_item: true
-  field_images: true
-  phone: true
-  post_code: true
-  postal_address: true
-  revision_log: true
-  website: true
diff --git a/config/optional/core.entity_form_display.oc_organisation.partner_organisation.default.yml b/config/optional/core.entity_form_display.oc_organisation.partner_organisation.default.yml
index 83bf629..24fbc7c 100644
--- a/config/optional/core.entity_form_display.oc_organisation.partner_organisation.default.yml
+++ b/config/optional/core.entity_form_display.oc_organisation.partner_organisation.default.yml
@@ -1,4 +1,4 @@
-uuid: 83703815-32f2-4aa4-9bea-d5106ffa28b6
+uuid: ac6da2f0-4de2-4e8d-baf6-f7229b42616f
 langcode: en
 status: true
 dependencies:
@@ -11,6 +11,22 @@ targetEntityType: oc_organisation
 bundle: partner_organisation
 mode: default
 content:
+  contact_name:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  email:
+    type: string_textfield
+    weight: 4
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   name:
     type: string_textfield
     weight: 0
@@ -27,12 +43,13 @@ content:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-  status:
-    type: boolean_checkbox
+  website:
+    type: string_textfield
     weight: 1
     region: content
     settings:
-      display_label: true
+      size: 60
+      placeholder: ''
     third_party_settings: {  }
 hidden:
   billing_contact_name: true
@@ -40,11 +57,9 @@ hidden:
   billing_phone: true
   billing_post_code: true
   billing_postal_address: true
-  contact_name: true
   contact_role: true
-  email: true
   phone: true
   post_code: true
   postal_address: true
   revision_log: true
-  website: true
+  status: true
diff --git a/config/optional/core.entity_form_display.oc_organisation.umbrella_client.default.yml b/config/optional/core.entity_form_display.oc_organisation.umbrella_client.default.yml
deleted file mode 100644
index e339bec..0000000
--- a/config/optional/core.entity_form_display.oc_organisation.umbrella_client.default.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-uuid: 03518dcf-3079-4580-83eb-5a80445c723c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_organisation.umbrella_client.feeds_item
-    - field.field.oc_organisation.umbrella_client.field_tags
-    - field.field.oc_organisation.umbrella_client.field_type_of_umbrella_client
-    - opencase_entities.oc_organisation_type.umbrella_client
-  module:
-    - file
-_core:
-  default_config_hash: OC8jnc4KZMX-3IOvNhREzEIJ2cAagpxmwKeeUoAbYIc
-id: oc_organisation.umbrella_client.default
-targetEntityType: oc_organisation
-bundle: umbrella_client
-mode: default
-content:
-  field_tags:
-    type: options_select
-    weight: 2
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_type_of_umbrella_client:
-    type: options_select
-    weight: 1
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  notes:
-    type: string_textarea
-    weight: 4
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 3
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-hidden:
-  billing_contact_name: true
-  billing_email: true
-  billing_phone: true
-  billing_post_code: true
-  billing_postal_address: true
-  contact_name: true
-  contact_role: true
-  email: true
-  feeds_item: true
-  phone: true
-  post_code: true
-  postal_address: true
-  revision_log: true
-  website: true
diff --git a/config/optional/core.entity_form_display.paragraph.availability.default.yml b/config/optional/core.entity_form_display.paragraph.availability.default.yml
deleted file mode 100644
index 4bece76..0000000
--- a/config/optional/core.entity_form_display.paragraph.availability.default.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: 9ecb22ea-3cee-465e-8234-001164ddf7df
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.paragraph.availability.field_day
-    - field.field.paragraph.availability.field_time
-    - paragraphs.paragraphs_type.availability
-_core:
-  default_config_hash: 3Y59Hm04i6hAK2XQrkV7fG7myh8cJbYXs-j5EV5mKCM
-id: paragraph.availability.default
-targetEntityType: paragraph
-bundle: availability
-mode: default
-content:
-  field_day:
-    type: options_select
-    weight: 0
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_time:
-    type: options_select
-    weight: 1
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden:
-  created: true
-  status: true
diff --git a/config/optional/core.entity_form_display.paragraph.emergency_contact.default.yml b/config/optional/core.entity_form_display.paragraph.emergency_contact.default.yml
deleted file mode 100644
index e4ba9df..0000000
--- a/config/optional/core.entity_form_display.paragraph.emergency_contact.default.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-uuid: edbfbaa8-9e4c-4270-86ee-8eee697f392f
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.paragraph.emergency_contact.field_name
-    - field.field.paragraph.emergency_contact.field_phone
-    - field.field.paragraph.emergency_contact.field_relationship
-    - paragraphs.paragraphs_type.emergency_contact
-id: paragraph.emergency_contact.default
-targetEntityType: paragraph
-bundle: emergency_contact
-mode: default
-content:
-  field_name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_phone:
-    type: string_textfield
-    weight: 1
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_relationship:
-    type: string_textfield
-    weight: 2
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-hidden:
-  created: true
-  status: true
diff --git a/config/optional/core.entity_form_display.paragraph.fee.default.yml b/config/optional/core.entity_form_display.paragraph.fee.default.yml
deleted file mode 100644
index 2d7c4ba..0000000
--- a/config/optional/core.entity_form_display.paragraph.fee.default.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 8018414d-ed73-4b65-b5cc-ccca077d78d9
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.paragraph.fee.field_amount
-    - field.field.paragraph.fee.field_category
-    - paragraphs.paragraphs_type.fee
-_core:
-  default_config_hash: Fm6xaUNlRW5-ulxqWnIE9XoJ82PX8u7EVTmMWC-bfHc
-id: paragraph.fee.default
-targetEntityType: paragraph
-bundle: fee
-mode: default
-content:
-  field_amount:
-    type: number
-    weight: 1
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-  field_category:
-    type: options_select
-    weight: 0
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden:
-  created: true
-  status: true
diff --git a/config/optional/core.entity_form_display.paragraph.trainer.default.yml b/config/optional/core.entity_form_display.paragraph.trainer.default.yml
deleted file mode 100644
index f519879..0000000
--- a/config/optional/core.entity_form_display.paragraph.trainer.default.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-uuid: f2b0c51d-cc02-43ea-b073-7599b7f65952
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.paragraph.trainer.field_rate_if_custom_
-    - field.field.paragraph.trainer.field_trainer
-    - field.field.paragraph.trainer.field_trainer_rate
-    - field.field.paragraph.trainer.field_trainer_role
-    - paragraphs.paragraphs_type.trainer
-_core:
-  default_config_hash: EcTGtOderLR53vXBi036A8vDr1XI2nBit5C4iymgy44
-id: paragraph.trainer.default
-targetEntityType: paragraph
-bundle: trainer
-mode: default
-content:
-  field_rate_if_custom_:
-    type: number
-    weight: 3
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-  field_trainer:
-    type: entity_reference_autocomplete
-    weight: 0
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_trainer_rate:
-    type: options_buttons
-    weight: 2
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_trainer_role:
-    type: options_select
-    weight: 1
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden:
-  created: true
-  status: true
diff --git a/config/optional/core.entity_form_display.taxonomy_term.clie.default.yml b/config/optional/core.entity_form_display.taxonomy_term.clie.default.yml
deleted file mode 100644
index 8ddab4a..0000000
--- a/config/optional/core.entity_form_display.taxonomy_term.clie.default.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-uuid: e71e0e5d-38b6-41cf-ab7d-cc1790ef4bd4
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.clie
-  module:
-    - path
-    - text
-id: taxonomy_term.clie.default
-targetEntityType: taxonomy_term
-bundle: clie
-mode: default
-content:
-  description:
-    type: text_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: -5
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  revision_log_message:
-    type: hide_revision_field_log_widget
-    weight: 80
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: true
-      default: ''
-      permission_based: false
-      allow_user_settings: true
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 100
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/optional/core.entity_form_display.user.user.default.yml b/config/optional/core.entity_form_display.user.user.default.yml
index 5ab9973..f505761 100644
--- a/config/optional/core.entity_form_display.user.user.default.yml
+++ b/config/optional/core.entity_form_display.user.user.default.yml
@@ -1,20 +1,16 @@
-uuid: 3c77b593-fbbd-45e7-b219-526e062276ab
+uuid: db1670a5-4601-4b53-965b-d3c11ee66a4f
 langcode: en
 status: true
 dependencies:
   config:
-    - field.field.user.user.field_last_password_reset
     - field.field.user.user.field_linked_opencase_actor
-    - field.field.user.user.field_password_expiration
-    - field.field.user.user.field_pending_expire_sent
     - field.field.user.user.user_picture
     - image.style.thumbnail
   module:
-    - datetime
     - image
     - user
 _core:
-  default_config_hash: K-1rBM8mTIkFp9RqOC2tMRUukOQ1xbRCfSKK8dEddnA
+  default_config_hash: FaQ9Ptcpxpg30AtiqRDtl_8zbJArHP1LPfug_s59TOA
 id: user.user.default
 targetEntityType: user
 bundle: user
@@ -30,12 +26,6 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
-  field_last_password_reset:
-    type: datetime_default
-    weight: 4
-    region: content
-    settings: {  }
-    third_party_settings: {  }
   field_linked_opencase_actor:
     type: entity_reference_autocomplete
     weight: 1
@@ -46,21 +36,16 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  field_password_expiration:
-    type: boolean_checkbox
-    weight: 3
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
   language:
     weight: 3
     region: content
     settings: {  }
     third_party_settings: {  }
   timezone:
-    weight: 6
+    weight: 5
     region: content
+    settings: {  }
+    third_party_settings: {  }
   user_picture:
     type: image_image
     weight: 2
@@ -69,5 +54,4 @@ content:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
-hidden:
-  field_pending_expire_sent: true
+hidden: {  }
diff --git a/config/optional/core.entity_form_mode.user.register.yml b/config/optional/core.entity_form_mode.user.register.yml
index f79d7f9..b46411b 100644
--- a/config/optional/core.entity_form_mode.user.register.yml
+++ b/config/optional/core.entity_form_mode.user.register.yml
@@ -1,4 +1,4 @@
-uuid: f29a3f05-78c0-4893-a522-af4afb4a3045
+uuid: a37b640e-952d-4f06-b806-99792e29ba2d
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/core.entity_view_display.block_content.basic.default.yml b/config/optional/core.entity_view_display.block_content.basic.default.yml
index 510fa72..c3d5569 100644
--- a/config/optional/core.entity_view_display.block_content.basic.default.yml
+++ b/config/optional/core.entity_view_display.block_content.basic.default.yml
@@ -1,4 +1,4 @@
-uuid: 09d1b592-ebde-4c3c-8b31-535dd41b437d
+uuid: 72a3d45b-e611-4333-913b-4363640d30c0
 langcode: en
 status: true
 dependencies:
@@ -8,7 +8,7 @@ dependencies:
   module:
     - text
 _core:
-  default_config_hash: orJpHUlAc_wiQLMUjIgEJXGeiqylGHMPcmNRjGtct-M
+  default_config_hash: hBNNDTFwakREOTa6GGMqN899Iyrii0hInwSJtQ7Kj30
 id: block_content.basic.default
 targetEntityType: block_content
 bundle: basic
diff --git a/config/optional/core.entity_view_display.comment.comment.default.yml b/config/optional/core.entity_view_display.comment.comment.default.yml
index 8e4009d..a575c2e 100644
--- a/config/optional/core.entity_view_display.comment.comment.default.yml
+++ b/config/optional/core.entity_view_display.comment.comment.default.yml
@@ -1,4 +1,4 @@
-uuid: 7fd25a11-a92a-4a83-a3c4-4bcdefa9889b
+uuid: 6b09820a-f7eb-4c94-a271-a385fd1df95d
 langcode: en
 status: true
 dependencies:
@@ -8,7 +8,7 @@ dependencies:
   module:
     - text
 _core:
-  default_config_hash: 77Ye1kR-P6AaiGfEO8mnXNSr7nqtnP3PiiVBwJeGGMI
+  default_config_hash: aBQUGsQ46M4048fIlFuTXwl2zV0j2cJX89CTUobh9hA
 id: comment.comment.default
 targetEntityType: comment
 bundle: comment
diff --git a/config/optional/core.entity_view_display.contact_message.contact_opencase.default.yml b/config/optional/core.entity_view_display.contact_message.contact_opencase.default.yml
index 0815881..b112f02 100644
--- a/config/optional/core.entity_view_display.contact_message.contact_opencase.default.yml
+++ b/config/optional/core.entity_view_display.contact_message.contact_opencase.default.yml
@@ -1,4 +1,4 @@
-uuid: 1dcaf3f5-def3-40ba-9d36-5ba0a46b4f4b
+uuid: fc2c799b-24e3-43a8-ac17-159132cc4d1a
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/core.entity_view_display.node.article.default.yml b/config/optional/core.entity_view_display.node.article.default.yml
index 804c29a..11bc603 100644
--- a/config/optional/core.entity_view_display.node.article.default.yml
+++ b/config/optional/core.entity_view_display.node.article.default.yml
@@ -1,4 +1,4 @@
-uuid: 64649c08-e86f-4063-8771-7e4f4103d54c
+uuid: 5925a8be-7a29-47a6-b6bb-6d80b487730f
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,6 @@ dependencies:
     - core.entity_view_display.comment.comment.default
     - field.field.node.article.body
     - field.field.node.article.comment
-    - field.field.node.article.feeds_item
     - field.field.node.article.field_image
     - field.field.node.article.field_tags
     - image.style.large
@@ -17,7 +16,7 @@ dependencies:
     - text
     - user
 _core:
-  default_config_hash: ChmU3AVqDKU32A_fyChG0W9dTRKmVBR58B6OClCLvZI
+  default_config_hash: b4RQ-Nfz-gOoG_jjftd_qDIz4lf_-OzlxoLHkRXjfrE
 id: node.article.default
 targetEntityType: node
 bundle: article
@@ -62,5 +61,4 @@ content:
     weight: 100
     region: content
 hidden:
-  feeds_item: true
   search_api_excerpt: true
diff --git a/config/optional/core.entity_view_display.node.article.rss.yml b/config/optional/core.entity_view_display.node.article.rss.yml
index a8df47f..dd6fd16 100644
--- a/config/optional/core.entity_view_display.node.article.rss.yml
+++ b/config/optional/core.entity_view_display.node.article.rss.yml
@@ -1,4 +1,4 @@
-uuid: 21eae13f-b801-4419-907c-75d3c8688185
+uuid: 4d616b02-0848-43d0-bded-207c0dad3aeb
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,6 @@ dependencies:
     - core.entity_view_mode.node.rss
     - field.field.node.article.body
     - field.field.node.article.comment
-    - field.field.node.article.feeds_item
     - field.field.node.article.field_image
     - field.field.node.article.field_tags
     - node.type.article
@@ -25,7 +24,6 @@ content:
 hidden:
   body: true
   comment: true
-  feeds_item: true
   field_image: true
   field_tags: true
   search_api_excerpt: true
diff --git a/config/optional/core.entity_view_display.node.article.search_index.yml b/config/optional/core.entity_view_display.node.article.search_index.yml
new file mode 100644
index 0000000..bccd3c2
--- /dev/null
+++ b/config/optional/core.entity_view_display.node.article.search_index.yml
@@ -0,0 +1,50 @@
+uuid: 8ee38840-d43b-4623-8865-ec47ad726367
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_display.comment.comment.default
+    - core.entity_view_mode.node.search_index
+    - field.field.node.article.body
+    - field.field.node.article.comment
+    - field.field.node.article.field_image
+    - field.field.node.article.field_tags
+    - node.type.article
+  module:
+    - comment
+    - text
+    - user
+_core:
+  default_config_hash: UyS6h90lp_2z8y-boEip0WxzO-BGPHubSfeQYnjwg_4
+id: node.article.search_index
+targetEntityType: node
+bundle: article
+mode: search_index
+content:
+  body:
+    type: text_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  comment:
+    type: comment_default
+    label: hidden
+    settings:
+      pager_id: 0
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  field_tags:
+    type: entity_reference_label
+    label: hidden
+    settings:
+      link: false
+    third_party_settings: {  }
+    weight: 1
+    region: content
+hidden:
+  field_image: true
+  links: true
+  search_api_excerpt: true
diff --git a/config/optional/core.entity_view_display.node.article.search_result.yml b/config/optional/core.entity_view_display.node.article.search_result.yml
new file mode 100644
index 0000000..44317d2
--- /dev/null
+++ b/config/optional/core.entity_view_display.node.article.search_result.yml
@@ -0,0 +1,49 @@
+uuid: 82f41778-972e-4083-b6d3-efa627c36009
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.node.search_result
+    - field.field.node.article.body
+    - field.field.node.article.comment
+    - field.field.node.article.field_image
+    - field.field.node.article.field_tags
+    - image.style.thumbnail
+    - node.type.article
+  module:
+    - image
+    - text
+    - user
+_core:
+  default_config_hash: uFyekWl4pl40ClJFmjk9tcyPJ-WFSXYsItJHB_XbQqs
+id: node.article.search_result
+targetEntityType: node
+bundle: article
+mode: search_result
+content:
+  body:
+    type: text_summary_or_trimmed
+    label: hidden
+    settings:
+      trim_length: 300
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  field_image:
+    type: image
+    label: hidden
+    settings:
+      image_link: content
+      image_style: thumbnail
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  links:
+    settings: {  }
+    third_party_settings: {  }
+    weight: 2
+    region: content
+hidden:
+  comment: true
+  field_tags: true
+  search_api_excerpt: true
diff --git a/config/optional/core.entity_view_display.node.article.teaser.yml b/config/optional/core.entity_view_display.node.article.teaser.yml
index a58a3c6..bca45d3 100644
--- a/config/optional/core.entity_view_display.node.article.teaser.yml
+++ b/config/optional/core.entity_view_display.node.article.teaser.yml
@@ -1,4 +1,4 @@
-uuid: 933f8f93-6f45-4c8a-ba35-7accfe953cf2
+uuid: c810b856-b307-4583-883b-e22f624e204e
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,6 @@ dependencies:
     - core.entity_view_mode.node.teaser
     - field.field.node.article.body
     - field.field.node.article.comment
-    - field.field.node.article.feeds_item
     - field.field.node.article.field_image
     - field.field.node.article.field_tags
     - image.style.medium
@@ -16,7 +15,7 @@ dependencies:
     - text
     - user
 _core:
-  default_config_hash: 4NcL2hSQZBpJbYtNuh5jC6kyQTcAc1m5bQpTegEWEso
+  default_config_hash: 0ur5-yZyR8pJ3lugC_Micbr6V_tpMWz-yHFhtuLcZo8
 id: node.article.teaser
 targetEntityType: node
 bundle: article
@@ -52,7 +51,6 @@ content:
     region: content
 hidden:
   comment: true
-  feeds_item: true
   field_image: true
   field_tags: true
   search_api_excerpt: true
diff --git a/config/optional/core.entity_view_display.node.page.default.yml b/config/optional/core.entity_view_display.node.page.default.yml
index 47c7bdc..ccbd141 100644
--- a/config/optional/core.entity_view_display.node.page.default.yml
+++ b/config/optional/core.entity_view_display.node.page.default.yml
@@ -1,4 +1,4 @@
-uuid: 301637c4-67c3-4145-9278-dfa6e3855899
+uuid: 34735c0f-3c68-4d38-9dcf-1da96512eb59
 langcode: en
 status: true
 dependencies:
@@ -9,7 +9,7 @@ dependencies:
     - text
     - user
 _core:
-  default_config_hash: g1S3_GLaxq4l3I9RIca5Mlz02MxI2KmOquZpHw59akM
+  default_config_hash: M_Y8L5tfmhx7DR143E05YyZSpvgil6VFvqcfBWykalg
 id: node.page.default
 targetEntityType: node
 bundle: page
diff --git a/config/optional/core.entity_view_display.node.page.search_index.yml b/config/optional/core.entity_view_display.node.page.search_index.yml
new file mode 100644
index 0000000..5d3548b
--- /dev/null
+++ b/config/optional/core.entity_view_display.node.page.search_index.yml
@@ -0,0 +1,28 @@
+uuid: 3326a3ab-7eb4-42bc-828e-cc5301963c5c
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.node.search_index
+    - field.field.node.page.body
+    - node.type.page
+  module:
+    - text
+    - user
+_core:
+  default_config_hash: xBTs8g0qAlUrHQcyKIdGpebgUBgF-FOb_c0Lyu71hVc
+id: node.page.search_index
+targetEntityType: node
+bundle: page
+mode: search_index
+content:
+  body:
+    type: text_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  links: true
+  search_api_excerpt: true
diff --git a/config/optional/core.entity_view_display.node.page.search_result.yml b/config/optional/core.entity_view_display.node.page.search_result.yml
new file mode 100644
index 0000000..f88b3f1
--- /dev/null
+++ b/config/optional/core.entity_view_display.node.page.search_result.yml
@@ -0,0 +1,33 @@
+uuid: f70207b8-de58-4dbf-b900-e651167f7b0a
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.node.search_result
+    - field.field.node.page.body
+    - node.type.page
+  module:
+    - text
+    - user
+_core:
+  default_config_hash: gTB0Aw9yfUPvjMd_Pznb33eEqIGHqNQb5JtR3jZ18TE
+id: node.page.search_result
+targetEntityType: node
+bundle: page
+mode: search_result
+content:
+  body:
+    type: text_summary_or_trimmed
+    label: hidden
+    settings:
+      trim_length: 300
+    third_party_settings: {  }
+    weight: 100
+    region: content
+  links:
+    settings: {  }
+    third_party_settings: {  }
+    weight: 101
+    region: content
+hidden:
+  search_api_excerpt: true
diff --git a/config/optional/core.entity_view_display.node.page.teaser.yml b/config/optional/core.entity_view_display.node.page.teaser.yml
index 7729adf..435b153 100644
--- a/config/optional/core.entity_view_display.node.page.teaser.yml
+++ b/config/optional/core.entity_view_display.node.page.teaser.yml
@@ -1,4 +1,4 @@
-uuid: 4efc1f2b-a1e4-4b7a-a98c-f55351c333c1
+uuid: fb8a9378-9533-4701-bd30-ac2fa839a094
 langcode: en
 status: true
 dependencies:
@@ -10,7 +10,7 @@ dependencies:
     - text
     - user
 _core:
-  default_config_hash: cSv5lDnbIgDug475Hdz3woED2XMqYv3awI-J9u1JLbY
+  default_config_hash: 8BgdRtLbtQ0F__o0FHSH0Mx5fvXOra9tfT1GmNKbRYw
 id: node.page.teaser
 targetEntityType: node
 bundle: page
diff --git a/config/optional/core.entity_view_display.oc_activity.application.default.yml b/config/optional/core.entity_view_display.oc_activity.application.default.yml
new file mode 100644
index 0000000..0feabec
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_activity.application.default.yml
@@ -0,0 +1,68 @@
+uuid: 92697c37-4dbe-4b1d-a974-526a3300e2ba
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.application
+  module:
+    - datetime
+id: oc_activity.application.default
+targetEntityType: oc_activity
+bundle: application
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 5
+    region: content
+  name:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  time_taken:
+    type: number_decimal
+    label: above
+    settings:
+      thousand_separator: ''
+      decimal_separator: .
+      scale: 2
+      prefix_suffix: true
+    third_party_settings: {  }
+    weight: 3
+    region: content
+hidden:
+  search_api_excerpt: true
+  status: true
+  user_id: true
diff --git a/config/optional/core.entity_view_display.oc_case_provision.trainer.default.yml b/config/optional/core.entity_view_display.oc_activity.case_note.default.yml
similarity index 56%
rename from config/optional/core.entity_view_display.oc_case_provision.trainer.default.yml
rename to config/optional/core.entity_view_display.oc_activity.case_note.default.yml
index a3aacaf..8401adf 100644
--- a/config/optional/core.entity_view_display.oc_case_provision.trainer.default.yml
+++ b/config/optional/core.entity_view_display.oc_activity.case_note.default.yml
@@ -1,20 +1,57 @@
-uuid: ac137f06-3a96-456e-bb01-d3265df79e38
+uuid: 3ecc0f44-1288-40d5-8bf9-753e21fe1172
 langcode: en
 status: true
 dependencies:
   config:
-    - field.field.oc_case_provision.trainer.feeds_item
-    - field.field.oc_case_provision.trainer.field_rate
-    - field.field.oc_case_provision.trainer.field_rate_type
-    - opencase_cases.oc_case_provision_type.trainer
+    - opencase_entities.oc_activity_type.case_note
   module:
-    - options
-id: oc_case_provision.trainer.default
-targetEntityType: oc_case_provision
-bundle: trainer
+    - datetime
+id: oc_activity.case_note.default
+targetEntityType: oc_activity
+bundle: case_note
 mode: default
 content:
-  field_rate:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 5
+    region: content
+  name:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  time_taken:
     type: number_decimal
     label: above
     settings:
@@ -25,33 +62,7 @@ content:
     third_party_settings: {  }
     weight: 3
     region: content
-  field_rate_type:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  oc_case_provider_role:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  oc_provider:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 0
-    region: content
 hidden:
-  feeds_item: true
-  name: true
-  oc_case: true
   search_api_excerpt: true
   status: true
   user_id: true
diff --git a/config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml b/config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml
new file mode 100644
index 0000000..0bd3c06
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml
@@ -0,0 +1,79 @@
+uuid: 18ef782d-adcb-4ac9-bd50-94f005c7321d
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_activity.destitution_funds_provided.field_amount
+    - field.field.oc_activity.destitution_funds_provided.field_funds_for
+    - opencase_entities.oc_activity_type.destitution_funds_provided
+  module:
+    - datetime
+    - options
+id: oc_activity.destitution_funds_provided.default
+targetEntityType: oc_activity
+bundle: destitution_funds_provided
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 6
+    region: content
+  field_amount:
+    type: number_decimal
+    label: above
+    settings:
+      thousand_separator: ''
+      decimal_separator: .
+      scale: 2
+      prefix_suffix: true
+    third_party_settings: {  }
+    weight: 5
+    region: content
+  field_funds_for:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  name:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
+hidden:
+  search_api_excerpt: true
+  status: true
+  time_taken: true
+  user_id: true
diff --git a/config/optional/core.entity_view_display.oc_activity.email.default.yml b/config/optional/core.entity_view_display.oc_activity.email.default.yml
new file mode 100644
index 0000000..f15d7e3
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_activity.email.default.yml
@@ -0,0 +1,58 @@
+uuid: bcd68faf-74c4-457e-9fc3-6e2fb7a25c97
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.email
+  module:
+    - datetime
+id: oc_activity.email.default
+targetEntityType: oc_activity
+bundle: email
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  name:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
+hidden:
+  search_api_excerpt: true
+  status: true
+  time_taken: true
+  user_id: true
diff --git a/config/optional/core.entity_view_display.oc_activity.evaluation.default.yml b/config/optional/core.entity_view_display.oc_activity.evaluation.default.yml
deleted file mode 100644
index 2e147f6..0000000
--- a/config/optional/core.entity_view_display.oc_activity.evaluation.default.yml
+++ /dev/null
@@ -1,141 +0,0 @@
-uuid: a99df80e-52a8-495b-b16f-aa6976bd50dc
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_activity.evaluation.field_a
-    - field.field.oc_activity.evaluation.field_after_knowledge
-    - field.field.oc_activity.evaluation.field_after_skills
-    - field.field.oc_activity.evaluation.field_age
-    - field.field.oc_activity.evaluation.field_b
-    - field.field.oc_activity.evaluation.field_before_confidence
-    - field.field.oc_activity.evaluation.field_before_skills
-    - field.field.oc_activity.evaluation.field_d
-    - field.field.oc_activity.evaluation.field_ease
-    - field.field.oc_activity.evaluation.field_gender
-    - field.field.oc_activity.evaluation.field_relevance
-    - opencase_entities.oc_activity_type.evaluation
-  module:
-    - datetime
-    - options
-    - user
-_core:
-  default_config_hash: 8oP5Cry2F51ep0vQbK1W5zThOIPyv6deQfSOxKuSHzM
-id: oc_activity.evaluation.default
-targetEntityType: oc_activity
-bundle: evaluation
-mode: default
-content:
-  activity_date_time:
-    type: datetime_default
-    label: above
-    settings:
-      timezone_override: ''
-      format_type: short
-    third_party_settings: {  }
-    weight: -3
-    region: content
-  field_a:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  field_after_knowledge:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 7
-    region: content
-  field_after_skills:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 8
-    region: content
-  field_age:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_b:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_before_confidence:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_before_skills:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_d:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  field_ease:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 9
-    region: content
-  field_gender:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_relevance:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  name:
-    type: string
-    label: hidden
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: -3
-    region: content
-  time_taken:
-    type: number_decimal
-    label: above
-    settings:
-      thousand_separator: ''
-      decimal_separator: .
-      scale: 2
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: -3
-    region: content
-hidden:
-  client: true
-  description: true
-  oc_provider: true
-  oc_target: true
-  search_api_excerpt: true
-  status: true
-  user_id: true
diff --git a/config/optional/core.entity_view_display.oc_activity.interview.default.yml b/config/optional/core.entity_view_display.oc_activity.interview.default.yml
new file mode 100644
index 0000000..4f5b642
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_activity.interview.default.yml
@@ -0,0 +1,58 @@
+uuid: a696fdb4-5317-4bfa-ac92-c15b09c3a7d2
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.interview
+  module:
+    - datetime
+id: oc_activity.interview.default
+targetEntityType: oc_activity
+bundle: interview
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  name:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
+hidden:
+  search_api_excerpt: true
+  status: true
+  time_taken: true
+  user_id: true
diff --git a/config/optional/core.entity_view_display.oc_activity.emi.default.yml b/config/optional/core.entity_view_display.oc_activity.lete.default.yml
similarity index 69%
rename from config/optional/core.entity_view_display.oc_activity.emi.default.yml
rename to config/optional/core.entity_view_display.oc_activity.lete.default.yml
index 859f599..a5c4340 100644
--- a/config/optional/core.entity_view_display.oc_activity.emi.default.yml
+++ b/config/optional/core.entity_view_display.oc_activity.lete.default.yml
@@ -1,14 +1,14 @@
-uuid: 147b5ce7-db30-43de-98b8-248eb132570d
+uuid: 46f32ceb-da51-40ce-adba-1f3e4bd206ec
 langcode: en
 status: true
 dependencies:
   config:
-    - opencase_entities.oc_activity_type.emi
+    - opencase_entities.oc_activity_type.lete
   module:
     - datetime
-id: oc_activity.emi.default
+id: oc_activity.lete.default
 targetEntityType: oc_activity
-bundle: emi
+bundle: lete
 mode: default
 content:
   activity_date_time:
@@ -16,11 +16,34 @@ content:
     label: above
     settings:
       timezone_override: ''
-      format_type: short
+      format_type: medium
     third_party_settings: {  }
     weight: 0
     region: content
-  client:
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  name:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_target:
     type: entity_reference_label
     label: above
     settings:
@@ -28,24 +51,7 @@ content:
     third_party_settings: {  }
     weight: 1
     region: content
-  description:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  name:
-    type: string
-    label: hidden
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 2
-    region: content
 hidden:
-  oc_provider: true
-  oc_target: true
   search_api_excerpt: true
   status: true
   time_taken: true
diff --git a/config/optional/core.entity_view_display.oc_activity.phone_call.default.yml b/config/optional/core.entity_view_display.oc_activity.phone_call.default.yml
index b7a3fc3..3487e9c 100644
--- a/config/optional/core.entity_view_display.oc_activity.phone_call.default.yml
+++ b/config/optional/core.entity_view_display.oc_activity.phone_call.default.yml
@@ -1,4 +1,4 @@
-uuid: d9d0d719-aa17-435a-b85e-4936cde6b023
+uuid: 80ad891c-ae0f-4bbf-a9da-e9aee9db720c
 langcode: en
 status: true
 dependencies:
@@ -16,24 +16,16 @@ content:
     label: above
     settings:
       timezone_override: ''
-      format_type: short
+      format_type: medium
     third_party_settings: {  }
     weight: 0
     region: content
-  client:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 1
-    region: content
   description:
     type: basic_string
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 3
+    weight: 4
     region: content
   name:
     type: string
@@ -41,11 +33,25 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
+    weight: 3
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
     weight: 2
     region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
 hidden:
-  oc_provider: true
-  oc_target: true
   search_api_excerpt: true
   status: true
   time_taken: true
diff --git a/config/optional/core.entity_view_display.oc_activity.research.default.yml b/config/optional/core.entity_view_display.oc_activity.research.default.yml
new file mode 100644
index 0000000..511f191
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_activity.research.default.yml
@@ -0,0 +1,58 @@
+uuid: 5277f0e8-d0c5-4faf-8978-f0c6d7cc0f5b
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.research
+  module:
+    - datetime
+id: oc_activity.research.default
+targetEntityType: oc_activity
+bundle: research
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  name:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
+hidden:
+  search_api_excerpt: true
+  status: true
+  time_taken: true
+  user_id: true
diff --git a/config/optional/core.entity_view_display.oc_activity.supervision.default.yml b/config/optional/core.entity_view_display.oc_activity.supervision.default.yml
new file mode 100644
index 0000000..b62a9cf
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_activity.supervision.default.yml
@@ -0,0 +1,58 @@
+uuid: bc3147a1-d263-4fb3-8059-4fe0dc180df9
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.supervision
+  module:
+    - datetime
+id: oc_activity.supervision.default
+targetEntityType: oc_activity
+bundle: supervision
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  name:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
+hidden:
+  search_api_excerpt: true
+  status: true
+  time_taken: true
+  user_id: true
diff --git a/config/optional/core.entity_view_display.oc_activity.trainer_debrief.default.yml b/config/optional/core.entity_view_display.oc_activity.trainer_debrief.default.yml
deleted file mode 100644
index e9e146a..0000000
--- a/config/optional/core.entity_view_display.oc_activity.trainer_debrief.default.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-uuid: f8a7c20a-01e2-4dbe-bc7c-e9aaa82534f2
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_activity.trainer_debrief.field_caption_for_photo
-    - field.field.oc_activity.trainer_debrief.field_issues_and_difficulties
-    - field.field.oc_activity.trainer_debrief.field_issues_with_group_dynamics
-    - field.field.oc_activity.trainer_debrief.field_number_of_participants
-    - field.field.oc_activity.trainer_debrief.field_photo
-    - field.field.oc_activity.trainer_debrief.field_what_came_up_for_the_group
-    - field.field.oc_activity.trainer_debrief.field_what_could_be_improved_for
-    - field.field.oc_activity.trainer_debrief.field_what_did_facilitators_do_w
-    - field.field.oc_activity.trainer_debrief.field_what_real_scenarios_or_inc
-    - opencase_entities.oc_activity_type.trainer_debrief
-  module:
-    - datetime
-    - image
-id: oc_activity.trainer_debrief.default
-targetEntityType: oc_activity
-bundle: trainer_debrief
-mode: default
-content:
-  activity_date_time:
-    type: datetime_default
-    label: above
-    settings:
-      timezone_override: ''
-      format_type: short
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_caption_for_photo:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  field_issues_and_difficulties:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_issues_with_group_dynamics:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  field_number_of_participants:
-    type: number_integer
-    label: above
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  field_photo:
-    type: image
-    label: above
-    settings:
-      image_link: ''
-      image_style: ''
-    third_party_settings: {  }
-    weight: 9
-    region: content
-  field_what_came_up_for_the_group:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_what_could_be_improved_for:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 8
-    region: content
-  field_what_did_facilitators_do_w:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_what_real_scenarios_or_inc:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 7
-    region: content
-  oc_provider:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 1
-    region: content
-hidden:
-  client: true
-  description: true
-  name: true
-  oc_target: true
-  search_api_excerpt: true
-  status: true
-  time_taken: true
-  user_id: true
diff --git a/config/optional/core.entity_view_display.oc_actor.client.default.yml b/config/optional/core.entity_view_display.oc_actor.client.default.yml
new file mode 100644
index 0000000..3ff950c
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_actor.client.default.yml
@@ -0,0 +1,203 @@
+uuid: 8023b586-ad1d-43ce-a574-547db4bc4733
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_actor.client.field_asylum_status
+    - field.field.oc_actor.client.field_confidentiality_form
+    - field.field.oc_actor.client.field_date_of_birth
+    - field.field.oc_actor.client.field_dependants
+    - field.field.oc_actor.client.field_disability
+    - field.field.oc_actor.client.field_ethnic_o
+    - field.field.oc_actor.client.field_gender_identified_with
+    - field.field.oc_actor.client.field_general_noes
+    - field.field.oc_actor.client.field_how_heard
+    - field.field.oc_actor.client.field_income
+    - field.field.oc_actor.client.field_languages_spoken
+    - field.field.oc_actor.client.field_marital_
+    - field.field.oc_actor.client.field_nationalities
+    - field.field.oc_actor.client.field_referred_by
+    - field.field.oc_actor.client.field_sex
+    - opencase_entities.oc_actor_type.client
+  module:
+    - datetime
+    - file
+    - options
+id: oc_actor.client.default
+targetEntityType: oc_actor
+bundle: client
+mode: default
+content:
+  cases:
+    settings: {  }
+    third_party_settings: {  }
+    weight: 19
+    region: content
+  email:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  field_asylum_status:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 8
+    region: content
+  field_client_field_1:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  field_confidentiality_form:
+    type: file_default
+    label: above
+    settings:
+      use_description_as_link_text: true
+    third_party_settings: {  }
+    weight: 17
+    region: content
+  field_date_of_birth:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: short
+    third_party_settings: {  }
+    weight: 5
+    region: content
+  field_dependants:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 14
+    region: content
+  field_disability:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 12
+    region: content
+  field_ethnic_o:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 9
+    region: content
+  field_gender_identified_with:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 6
+    region: content
+  field_general_noes:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 18
+    region: content
+  field_how_heard:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 15
+    region: content
+  field_income:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 13
+    region: content
+  field_languages_spoken:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 11
+    region: content
+  field_marital_:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 7
+    region: content
+  field_nationalities:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 10
+    region: content
+  field_referred_by:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 16
+    region: content
+  name:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: -4
+    region: content
+  phone:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  phone2:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  post_code:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  postal_address:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 3
+    region: content
+hidden:
+  field_sex: true
+  first_name: true
+  last_name: true
+  middle_names: true
+  search_api_excerpt: true
+  status: true
+  user_id: true
diff --git a/config/optional/core.entity_view_display.oc_actor.staff_member.default.yml b/config/optional/core.entity_view_display.oc_actor.staff_member.default.yml
new file mode 100644
index 0000000..bced3c5
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_actor.staff_member.default.yml
@@ -0,0 +1,58 @@
+uuid: 67d86fb5-981d-4e62-866b-16921b71fa17
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_actor_type.staff_member
+id: oc_actor.staff_member.default
+targetEntityType: oc_actor
+bundle: staff_member
+mode: default
+content:
+  email:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  phone:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  phone2:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  post_code:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  postal_address:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 3
+    region: content
+hidden:
+  first_name: true
+  last_name: true
+  middle_names: true
+  search_api_excerpt: true
+  status: true
+  total_cases: true
+  user_id: true
diff --git a/config/optional/core.entity_view_display.oc_actor.trainer.default.yml b/config/optional/core.entity_view_display.oc_actor.trainer.default.yml
deleted file mode 100644
index 454fcd7..0000000
--- a/config/optional/core.entity_view_display.oc_actor.trainer.default.yml
+++ /dev/null
@@ -1,158 +0,0 @@
-uuid: 668d9d2d-d7c3-4870-9866-efd7c2dbb50e
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_actor.trainer.feeds_item
-    - field.field.oc_actor.trainer.field_active
-    - field.field.oc_actor.trainer.field_availability
-    - field.field.oc_actor.trainer.field_delivery_partners
-    - field.field.oc_actor.trainer.field_emergency_contact
-    - field.field.oc_actor.trainer.field_languages_spoken_fluently
-    - field.field.oc_actor.trainer.field_notes
-    - field.field.oc_actor.trainer.field_photo
-    - field.field.oc_actor.trainer.field_pronoun
-    - opencase_entities.oc_actor_type.trainer
-  module:
-    - entity_reference_revisions
-    - image
-    - options
-_core:
-  default_config_hash: AcOhkQduC7FEJNqA-HKyqupUzb3pM4aMPJx8vynmQBs
-id: oc_actor.trainer.default
-targetEntityType: oc_actor
-bundle: trainer
-mode: default
-content:
-  email:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_active:
-    type: boolean
-    label: above
-    settings:
-      format: default
-      format_custom_false: ''
-      format_custom_true: ''
-    third_party_settings: {  }
-    weight: 11
-    region: content
-  field_availability:
-    type: entity_reference_revisions_entity_view
-    label: above
-    settings:
-      view_mode: preview
-      link: ''
-    third_party_settings: {  }
-    weight: 13
-    region: content
-  field_delivery_partners:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  field_emergency_contact:
-    type: entity_reference_revisions_entity_view
-    label: above
-    settings:
-      view_mode: default
-      link: ''
-    third_party_settings: {  }
-    weight: 12
-    region: content
-  field_languages_spoken_fluently:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_notes:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 8
-    region: content
-  field_photo:
-    type: image
-    label: above
-    settings:
-      image_link: ''
-      image_style: ''
-    third_party_settings: {  }
-    weight: 7
-    region: content
-  field_pronoun:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  first_name:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  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: {  }
-    weight: 4
-    region: content
-  post_code:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  postal_address:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 9
-    region: content
-  total_cases:
-    type: number_integer
-    label: above
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 14
-    region: content
-hidden:
-  feeds_item: true
-  full_name: true
-  middle_names: true
-  phone2: true
-  recent_cases: true
-  search_api_excerpt: true
-  status: true
-  user_id: true
diff --git a/config/optional/core.entity_view_display.oc_actor.volunteer.default.yml b/config/optional/core.entity_view_display.oc_actor.volunteer.default.yml
new file mode 100644
index 0000000..4773c92
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_actor.volunteer.default.yml
@@ -0,0 +1,111 @@
+uuid: e0bcac38-7c0e-44c1-9fc4-825baf607384
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_actor.volunteer.field_ethnic_o
+    - field.field.oc_actor.volunteer.field_general_noes
+    - field.field.oc_actor.volunteer.field_languages_spoken
+    - field.field.oc_actor.volunteer.field_nationalities
+    - field.field.oc_actor.volunteer.field_osic_level
+    - field.field.oc_actor.volunteer.field_skills
+    - opencase_entities.oc_actor_type.volunteer
+  module:
+    - options
+id: oc_actor.volunteer.default
+targetEntityType: oc_actor
+bundle: volunteer
+mode: default
+content:
+  email:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  field_general_noes:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 8
+    region: content
+  field_languages_spoken:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 5
+    region: content
+  field_osic_level:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 6
+    region: content
+  field_sdfdsfds:
+    type: text_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  field_skills:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 7
+    region: content
+  name:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: -4
+    region: content
+  phone:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  phone2:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  post_code:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  postal_address:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 3
+    region: content
+hidden:
+  field_ethnic_o: true
+  field_nationalities: true
+  first_name: true
+  last_name: true
+  middle_names: true
+  search_api_excerpt: true
+  status: true
+  total_cases: true
+  user_id: true
diff --git a/config/optional/core.entity_view_display.oc_case.accommodation.default.yml b/config/optional/core.entity_view_display.oc_case.accommodation.default.yml
new file mode 100644
index 0000000..e42b3c2
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_case.accommodation.default.yml
@@ -0,0 +1,82 @@
+uuid: ced63081-89fe-4f38-9f6a-f20a0a40fc86
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.accommodation.field_case_finance
+    - field.field.oc_case.accommodation.field_outcome
+    - field.field.oc_case.accommodation.field_type_of_acco
+    - opencase_cases.oc_case_type.accommodation
+  module:
+    - file
+    - options
+    - user
+id: oc_case.accommodation.default
+targetEntityType: oc_case
+bundle: accommodation
+mode: default
+content:
+  field_case_finance:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  field_outcome:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  field_type_of_acco:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  files:
+    type: file_default
+    label: above
+    settings:
+      use_description_as_link_text: true
+    third_party_settings: {  }
+    weight: 6
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  total_fee:
+    type: number_decimal
+    label: above
+    settings:
+      thousand_separator: ''
+      decimal_separator: .
+      scale: 2
+      prefix_suffix: true
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  user_id:
+    type: author
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 5
+    region: content
+hidden:
+  changed: true
+  created: true
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
+  notes: true
+  search_api_excerpt: true
+  status: true
diff --git a/config/optional/core.entity_view_display.oc_case.asylum_support.default.yml b/config/optional/core.entity_view_display.oc_case.asylum_support.default.yml
new file mode 100644
index 0000000..f380fe8
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_case.asylum_support.default.yml
@@ -0,0 +1,65 @@
+uuid: abe5cea9-03ef-4548-b983-6f5f56f1fd4f
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.asylum_support.field_case_finance
+    - field.field.oc_case.asylum_support.field_outcome
+    - field.field.oc_case.asylum_support.field_type_of_as
+    - opencase_cases.oc_case_type.asylum_support
+  module:
+    - file
+    - options
+    - user
+id: oc_case.asylum_support.default
+targetEntityType: oc_case
+bundle: asylum_support
+mode: default
+content:
+  field_case_finance:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  field_outcome:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  field_type_of_as:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  files:
+    type: file_default
+    label: above
+    settings:
+      use_description_as_link_text: true
+    third_party_settings: {  }
+    weight: 82
+    region: content
+  user_id:
+    type: author
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 80
+    region: content
+hidden:
+  changed: true
+  created: true
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
+  notes: true
+  oc_target: true
+  search_api_excerpt: true
+  status: true
+  total_fee: true
diff --git a/config/optional/core.entity_view_display.oc_case.employability.default.yml b/config/optional/core.entity_view_display.oc_case.employability.default.yml
new file mode 100644
index 0000000..89b7ff0
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_case.employability.default.yml
@@ -0,0 +1,76 @@
+uuid: 794e772e-d592-45ef-9e03-d99d079044a6
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.employability.field_case_finance
+    - field.field.oc_case.employability.field_gave_list_of_agencies
+    - field.field.oc_case.employability.field_outcome
+    - field.field.oc_case.employability.field_type_of_employability_help
+    - opencase_cases.oc_case_type.employability
+  module:
+    - file
+    - options
+    - user
+id: oc_case.employability.default
+targetEntityType: oc_case
+bundle: employability
+mode: default
+content:
+  field_case_finance:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  field_gave_list_of_agencies:
+    type: boolean
+    label: above
+    settings:
+      format: default
+      format_custom_false: ''
+      format_custom_true: ''
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  field_outcome:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 5
+    region: content
+  field_type_of_employability_help:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  files:
+    type: file_default
+    label: above
+    settings:
+      use_description_as_link_text: true
+    third_party_settings: {  }
+    weight: 82
+    region: content
+  user_id:
+    type: author
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 80
+    region: content
+hidden:
+  changed: true
+  created: true
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
+  notes: true
+  oc_target: true
+  search_api_excerpt: true
+  status: true
+  total_fee: true
diff --git a/config/optional/core.entity_view_display.oc_case.enquiry.default.yml b/config/optional/core.entity_view_display.oc_case.enquiry.default.yml
new file mode 100644
index 0000000..44b4cc6
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_case.enquiry.default.yml
@@ -0,0 +1,52 @@
+uuid: fea5c4a2-2a54-4bdc-b9f1-14a169133afa
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.enquiry.field_outcome
+    - field.field.oc_case.enquiry.field_subject_of_enquiry
+    - opencase_cases.oc_case_type.enquiry
+  module:
+    - file
+    - options
+    - user
+id: oc_case.enquiry.default
+targetEntityType: oc_case
+bundle: enquiry
+mode: default
+content:
+  field_outcome:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  field_subject_of_enquiry:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  files:
+    type: file_default
+    label: above
+    settings:
+      use_description_as_link_text: true
+    third_party_settings: {  }
+    weight: 82
+    region: content
+  user_id:
+    type: author
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 80
+    region: content
+hidden:
+  changed: true
+  created: true
+  notes: true
+  search_api_excerpt: true
+  total_fee: true
diff --git a/config/optional/core.entity_view_display.oc_case.health.default.yml b/config/optional/core.entity_view_display.oc_case.health.default.yml
new file mode 100644
index 0000000..72108b3
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_case.health.default.yml
@@ -0,0 +1,65 @@
+uuid: e0da4919-2896-44aa-bb6c-c59ad9c0b63f
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.health.field_case_finance
+    - field.field.oc_case.health.field_outcome
+    - field.field.oc_case.health.field_type_health
+    - opencase_cases.oc_case_type.health
+  module:
+    - file
+    - options
+    - user
+id: oc_case.health.default
+targetEntityType: oc_case
+bundle: health
+mode: default
+content:
+  field_case_finance:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  field_outcome:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  field_type_health:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  files:
+    type: file_default
+    label: above
+    settings:
+      use_description_as_link_text: true
+    third_party_settings: {  }
+    weight: 82
+    region: content
+  user_id:
+    type: author
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 80
+    region: content
+hidden:
+  changed: true
+  created: true
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
+  notes: true
+  oc_target: true
+  search_api_excerpt: true
+  status: true
+  total_fee: true
diff --git a/config/optional/core.entity_view_display.oc_case.immigration.default.yml b/config/optional/core.entity_view_display.oc_case.immigration.default.yml
new file mode 100644
index 0000000..ede2aea
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_case.immigration.default.yml
@@ -0,0 +1,73 @@
+uuid: 8cb96899-5711-47e6-8e21-5e58bcf3325b
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.immigration.field_case_finance
+    - field.field.oc_case.immigration.field_level
+    - field.field.oc_case.immigration.field_outcome
+    - field.field.oc_case.immigration.field_type_of_applicat
+    - opencase_cases.oc_case_type.immigration
+  module:
+    - file
+    - options
+    - user
+id: oc_case.immigration.default
+targetEntityType: oc_case
+bundle: immigration
+mode: default
+content:
+  field_case_finance:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  field_level:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  field_outcome:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 5
+    region: content
+  field_type_of_applicat:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  files:
+    type: file_default
+    label: above
+    settings:
+      use_description_as_link_text: true
+    third_party_settings: {  }
+    weight: 82
+    region: content
+  user_id:
+    type: author
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 80
+    region: content
+hidden:
+  changed: true
+  created: true
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
+  notes: true
+  oc_target: true
+  search_api_excerpt: true
+  status: true
+  total_fee: true
diff --git a/config/optional/core.entity_view_display.oc_case.pro_bono_immigration_service.default.yml b/config/optional/core.entity_view_display.oc_case.pro_bono_immigration_service.default.yml
new file mode 100644
index 0000000..6eab945
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_case.pro_bono_immigration_service.default.yml
@@ -0,0 +1,44 @@
+uuid: 72cb25c8-4006-44f2-bdbd-36c6a20f7bba
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.pro_bono_immigration_service.field_outcome
+    - opencase_cases.oc_case_type.pro_bono_immigration_service
+  module:
+    - file
+    - options
+    - user
+id: oc_case.pro_bono_immigration_service.default
+targetEntityType: oc_case
+bundle: pro_bono_immigration_service
+mode: default
+content:
+  field_outcome:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 6
+    region: content
+  files:
+    type: file_default
+    label: above
+    settings:
+      use_description_as_link_text: true
+    third_party_settings: {  }
+    weight: 82
+    region: content
+  user_id:
+    type: author
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 80
+    region: content
+hidden:
+  changed: true
+  created: true
+  notes: true
+  search_api_excerpt: true
+  total_fee: true
diff --git a/config/optional/core.entity_view_display.oc_case.project.default.yml b/config/optional/core.entity_view_display.oc_case.project.default.yml
deleted file mode 100644
index 712da5e..0000000
--- a/config/optional/core.entity_view_display.oc_case.project.default.yml
+++ /dev/null
@@ -1,120 +0,0 @@
-uuid: 702bcc8f-a5af-46e2-a62d-39fd56c533a7
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_case.project.feeds_item
-    - field.field.oc_case.project.field_contract_signed_date
-    - field.field.oc_case.project.field_invoicing_notes
-    - field.field.oc_case.project.field_invoicing_status
-    - field.field.oc_case.project.field_link_to_invoice
-    - opencase_cases.oc_case_type.project
-  module:
-    - datetime
-    - file
-    - link
-    - user
-id: oc_case.project.default
-targetEntityType: oc_case
-bundle: project
-mode: default
-content:
-  activities:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  billing_details:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  client:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 8
-    region: content
-  fees:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  field_contract_signed_date:
-    type: datetime_default
-    label: above
-    settings:
-      timezone_override: ''
-      format_type: short
-    third_party_settings: {  }
-    weight: 9
-    region: content
-  field_invoicing_notes:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 7
-    region: content
-  field_invoicing_status:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_link_to_invoice:
-    type: link
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: ''
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  files:
-    type: file_default
-    label: above
-    settings:
-      use_description_as_link_text: true
-    third_party_settings: {  }
-    weight: 11
-    region: content
-  total_fee:
-    type: number_decimal
-    label: above
-    settings:
-      thousand_separator: ''
-      decimal_separator: .
-      scale: 2
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  trainings:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  user_id:
-    type: author
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-hidden:
-  changed: true
-  created: true
-  feeds_item: true
-  name: true
-  notes: true
-  oc_target: true
-  search_api_excerpt: true
-  status: true
diff --git a/config/optional/core.entity_view_display.oc_case.training.default.yml b/config/optional/core.entity_view_display.oc_case.training.default.yml
deleted file mode 100644
index 9fdba1f..0000000
--- a/config/optional/core.entity_view_display.oc_case.training.default.yml
+++ /dev/null
@@ -1,180 +0,0 @@
-uuid: 01342722-0b8a-4ba5-9018-0de593878433
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_case.training.feeds_item
-    - field.field.oc_case.training.field_date_of_training
-    - field.field.oc_case.training.field_number_of_participants
-    - field.field.oc_case.training.field_project
-    - field.field.oc_case.training.field_social_media
-    - field.field.oc_case.training.field_training_delivery_format
-    - field.field.oc_case.training.field_training_status
-    - field.field.oc_case.training.field_training_type
-    - opencase_cases.oc_case_type.training
-  module:
-    - datetime
-    - file
-    - options
-    - user
-_core:
-  default_config_hash: wU4PURroIwIN58h-ZY5MoE5znq462sD-R2FfSuRh8XA
-id: oc_case.training.default
-targetEntityType: oc_case
-bundle: training
-mode: default
-content:
-  activities:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 12
-    region: content
-  activities_entity_view_1:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  client:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  debrief:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  debriefs:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  debriefs_entity_view_1:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  evaluations:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 11
-    region: content
-  evaluations_entity_view_1:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_date_of_training:
-    type: datetime_default
-    label: above
-    settings:
-      timezone_override: ''
-      format_type: medium
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_fee:
-    type: number_decimal
-    label: above
-    settings:
-      thousand_separator: ''
-      decimal_separator: .
-      scale: 2
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_fee_category:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  field_number_of_participants:
-    type: number_integer
-    label: above
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  field_project:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_social_media:
-    type: boolean
-    label: above
-    settings:
-      format: default
-      format_custom_false: ''
-      format_custom_true: ''
-    third_party_settings: {  }
-    weight: 7
-    region: content
-  field_training_delivery_format:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_training_status:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_training_type:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  files:
-    type: file_default
-    label: above
-    settings:
-      use_description_as_link_text: true
-    third_party_settings: {  }
-    weight: 8
-    region: content
-  notes:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 14
-    region: content
-  trainers:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 9
-    region: content
-  user_id:
-    type: author
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 13
-    region: content
-hidden:
-  changed: true
-  created: true
-  feeds_item: true
-  name: true
-  oc_target: true
-  search_api_excerpt: true
-  status: true
-  total_fee: true
diff --git a/config/optional/core.entity_view_display.oc_case.welfare_rights.default.yml b/config/optional/core.entity_view_display.oc_case.welfare_rights.default.yml
new file mode 100644
index 0000000..d0a4a8e
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_case.welfare_rights.default.yml
@@ -0,0 +1,65 @@
+uuid: 295dcda5-a59d-444f-927a-4a28d504da16
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.welfare_rights.field_case_finance
+    - field.field.oc_case.welfare_rights.field_outcome
+    - field.field.oc_case.welfare_rights.field_type_of_welfare_rights_iss
+    - opencase_cases.oc_case_type.welfare_rights
+  module:
+    - file
+    - options
+    - user
+id: oc_case.welfare_rights.default
+targetEntityType: oc_case
+bundle: welfare_rights
+mode: default
+content:
+  field_case_finance:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  field_outcome:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  field_type_of_welfare_rights_iss:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  files:
+    type: file_default
+    label: above
+    settings:
+      use_description_as_link_text: true
+    third_party_settings: {  }
+    weight: 82
+    region: content
+  user_id:
+    type: author
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 80
+    region: content
+hidden:
+  changed: true
+  created: true
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
+  notes: true
+  oc_target: true
+  search_api_excerpt: true
+  status: true
+  total_fee: true
diff --git a/config/optional/core.entity_view_display.oc_case_fee.project_fee.default.yml b/config/optional/core.entity_view_display.oc_case_fee.fee.default.yml
similarity index 58%
rename from config/optional/core.entity_view_display.oc_case_fee.project_fee.default.yml
rename to config/optional/core.entity_view_display.oc_case_fee.fee.default.yml
index 9ab2932..e1ed519 100644
--- a/config/optional/core.entity_view_display.oc_case_fee.project_fee.default.yml
+++ b/config/optional/core.entity_view_display.oc_case_fee.fee.default.yml
@@ -1,13 +1,12 @@
-uuid: efaca5b6-aed7-4957-a728-fb0eea27d8ef
+uuid: 0f6f56e5-27c1-459e-b8a8-a54396c1e443
 langcode: en
 status: true
 dependencies:
   config:
-    - field.field.oc_case_fee.project_fee.feeds_item
-    - opencase_cases.oc_case_fee_type.project_fee
-id: oc_case_fee.project_fee.default
+    - opencase_cases.oc_case_fee_type.fee
+id: oc_case_fee.fee.default
 targetEntityType: oc_case_fee
-bundle: project_fee
+bundle: fee
 mode: default
 content:
   amount:
@@ -21,14 +20,7 @@ content:
     third_party_settings: {  }
     weight: 1
     region: content
-  description:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  oc_fee_category:
+  oc_case:
     type: entity_reference_label
     label: above
     settings:
@@ -37,9 +29,9 @@ content:
     weight: 0
     region: content
 hidden:
-  feeds_item: true
+  description: true
   name: true
-  oc_case: true
+  oc_fee_category: true
   search_api_excerpt: true
   status: true
   user_id: true
diff --git a/config/optional/core.entity_view_display.oc_case_provision.caseworker.default.yml b/config/optional/core.entity_view_display.oc_case_provision.caseworker.default.yml
new file mode 100644
index 0000000..6d3aa24
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_case_provision.caseworker.default.yml
@@ -0,0 +1,50 @@
+uuid: d748e2ca-1e99-44d7-8fe5-d59b064becff
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case_provision.caseworker.field_test
+    - opencase_cases.oc_case_provision_type.caseworker
+  module:
+    - user
+id: oc_case_provision.caseworker.default
+targetEntityType: oc_case_provision
+bundle: caseworker
+mode: default
+content:
+  field_test:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  oc_case_provider_role:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  user_id:
+    type: author
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 3
+    region: content
+hidden:
+  name: true
+  oc_case: true
+  search_api_excerpt: true
+  status: true
diff --git a/config/optional/core.entity_view_display.oc_equal_opps.oc_equal_opps.default.yml b/config/optional/core.entity_view_display.oc_equal_opps.oc_equal_opps.default.yml
new file mode 100644
index 0000000..b352ce9
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_equal_opps.oc_equal_opps.default.yml
@@ -0,0 +1,59 @@
+uuid: a943f9cf-97d5-47e4-99dd-bef53045f497
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_equal_opps.oc_equal_opps.default
+targetEntityType: oc_equal_opps
+bundle: oc_equal_opps
+mode: default
+content:
+  access_needs:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  age:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  gender:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  oc_actor:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  race_ethnicity:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  sexuality:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 5
+    region: content
+hidden:
+  name: true
+  search_api_excerpt: true
diff --git a/config/optional/core.entity_view_display.oc_event.volunteer_training_session.default.yml b/config/optional/core.entity_view_display.oc_event.volunteer_training_session.default.yml
new file mode 100644
index 0000000..c5b0d01
--- /dev/null
+++ b/config/optional/core.entity_view_display.oc_event.volunteer_training_session.default.yml
@@ -0,0 +1,42 @@
+uuid: 2018da40-3ab6-436f-8f34-8544ac73fb29
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_event_type.volunteer_training_session
+  module:
+    - datetime
+id: oc_event.volunteer_training_session.default
+targetEntityType: oc_event
+bundle: volunteer_training_session
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  attendees:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
+hidden:
+  name: true
+  search_api_excerpt: true
+  status: true
+  user_id: true
diff --git a/config/optional/core.entity_view_display.oc_organisation.client.default.yml b/config/optional/core.entity_view_display.oc_organisation.client.default.yml
deleted file mode 100644
index d64bc14..0000000
--- a/config/optional/core.entity_view_display.oc_organisation.client.default.yml
+++ /dev/null
@@ -1,182 +0,0 @@
-uuid: 8f03e5c8-61a0-47f1-996f-b8c118b7e8b0
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_organisation.client.feeds_item
-    - field.field.oc_organisation.client.field_accreditation_date
-    - field.field.oc_organisation.client.field_client_status
-    - field.field.oc_organisation.client.field_client_substatus
-    - field.field.oc_organisation.client.field_client_subtype
-    - field.field.oc_organisation.client.field_client_type
-    - field.field.oc_organisation.client.field_how_did_you_hear_about_us
-    - field.field.oc_organisation.client.field_images
-    - field.field.oc_organisation.client.field_location_festival_event
-    - field.field.oc_organisation.client.field_number_of_events_per_year
-    - field.field.oc_organisation.client.field_number_of_staff
-    - field.field.oc_organisation.client.field_premises_capacity
-    - field.field.oc_organisation.client.field_tags
-    - field.field.oc_organisation.client.field_umbrella_client
-    - opencase_entities.oc_organisation_type.client
-  module:
-    - datetime
-    - file
-    - options
-_core:
-  default_config_hash: k0IjsUiJUMCRPtA5WjL0mj2EMva1RA6kUXKzviwGKC4
-id: oc_organisation.client.default
-targetEntityType: oc_organisation
-bundle: client
-mode: default
-content:
-  activities:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_accreditation_date:
-    type: datetime_default
-    label: above
-    settings:
-      timezone_override: ''
-      format_type: short
-    third_party_settings: {  }
-    weight: 9
-    region: content
-  field_client_status:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: false
-    third_party_settings: {  }
-    weight: 8
-    region: content
-  field_client_substatus:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: false
-    third_party_settings: {  }
-    weight: 7
-    region: content
-  field_client_subtype:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: false
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  field_client_type:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: false
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_how_did_you_hear_about_us:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 16
-    region: content
-  field_location_festival_event:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 13
-    region: content
-  field_number_of_events_per_year:
-    type: number_integer
-    label: above
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 14
-    region: content
-  field_number_of_staff:
-    type: number_integer
-    label: above
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 12
-    region: content
-  field_premises_capacity:
-    type: number_integer
-    label: above
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 11
-    region: content
-  field_tags:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: false
-    third_party_settings: {  }
-    weight: 15
-    region: content
-  field_umbrella_client:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  linked_clients:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  name:
-    type: string
-    label: hidden
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  notes:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 17
-    region: content
-  projects:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  trainings:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 1
-    region: content
-hidden:
-  billing_contact_name: true
-  billing_email: true
-  billing_phone: true
-  billing_post_code: true
-  billing_postal_address: true
-  contact_name: true
-  contact_role: true
-  email: true
-  feeds_item: true
-  field_images: true
-  phone: true
-  post_code: true
-  postal_address: true
-  search_api_excerpt: true
-  status: true
-  website: true
diff --git a/config/optional/core.entity_view_display.oc_organisation.partner_organisation.default.yml b/config/optional/core.entity_view_display.oc_organisation.partner_organisation.default.yml
index bd52494..1f1ea68 100644
--- a/config/optional/core.entity_view_display.oc_organisation.partner_organisation.default.yml
+++ b/config/optional/core.entity_view_display.oc_organisation.partner_organisation.default.yml
@@ -1,4 +1,4 @@
-uuid: a9a25529-1bee-4ba2-8ddc-1dda14c54d48
+uuid: 96b9f3c8-1433-4915-9656-4547eb1bc899
 langcode: en
 status: true
 dependencies:
@@ -11,11 +11,35 @@ targetEntityType: oc_organisation
 bundle: partner_organisation
 mode: default
 content:
+  contact_name:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  email:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 3
+    region: content
   notes:
     type: basic_string
     label: above
     settings: {  }
     third_party_settings: {  }
+    weight: 1
+    region: content
+  website:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
     weight: 0
     region: content
 hidden:
@@ -24,13 +48,10 @@ hidden:
   billing_phone: true
   billing_post_code: true
   billing_postal_address: true
-  contact_name: true
   contact_role: true
-  email: true
   name: true
   phone: true
   post_code: true
   postal_address: true
   search_api_excerpt: true
   status: true
-  website: true
diff --git a/config/optional/core.entity_view_display.oc_organisation.umbrella_client.default.yml b/config/optional/core.entity_view_display.oc_organisation.umbrella_client.default.yml
deleted file mode 100644
index e69fc84..0000000
--- a/config/optional/core.entity_view_display.oc_organisation.umbrella_client.default.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-uuid: e23626af-bf0c-4910-8c9d-fa6a2e888fc7
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_organisation.umbrella_client.feeds_item
-    - field.field.oc_organisation.umbrella_client.field_tags
-    - field.field.oc_organisation.umbrella_client.field_type_of_umbrella_client
-    - opencase_entities.oc_organisation_type.umbrella_client
-  module:
-    - file
-    - options
-_core:
-  default_config_hash: 37tKDa2NJgMS0ZcYoj_CHysv7JU3_AaCfHOEpJIrJqE
-id: oc_organisation.umbrella_client.default
-targetEntityType: oc_organisation
-bundle: umbrella_client
-mode: default
-content:
-  clients:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_tags:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: false
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_type_of_umbrella_client:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  projects:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  trainings_for_clients_within_this_umbrella:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  trainings_for_this_umbrella_client:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-hidden:
-  billing_contact_name: true
-  billing_email: true
-  billing_phone: true
-  billing_post_code: true
-  billing_postal_address: true
-  contact_name: true
-  contact_role: true
-  email: true
-  feeds_item: true
-  name: true
-  notes: true
-  phone: true
-  post_code: true
-  postal_address: true
-  search_api_excerpt: true
-  status: true
-  website: true
diff --git a/config/optional/core.entity_view_display.paragraph.availability.default.yml b/config/optional/core.entity_view_display.paragraph.availability.default.yml
deleted file mode 100644
index 18c42f8..0000000
--- a/config/optional/core.entity_view_display.paragraph.availability.default.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-uuid: 1871fb24-876c-4d48-a45a-58b71e2e41a0
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.paragraph.availability.field_day
-    - field.field.paragraph.availability.field_time
-    - paragraphs.paragraphs_type.availability
-  module:
-    - options
-_core:
-  default_config_hash: NVrutKqTAWXK20upKCd3C1HfZlKvDf7ucSr236PQFBE
-id: paragraph.availability.default
-targetEntityType: paragraph
-bundle: availability
-mode: default
-content:
-  field_day:
-    type: list_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_time:
-    type: list_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 1
-    region: content
-hidden:
-  search_api_excerpt: true
diff --git a/config/optional/core.entity_view_display.paragraph.emergency_contact.default.yml b/config/optional/core.entity_view_display.paragraph.emergency_contact.default.yml
deleted file mode 100644
index fdd6c4d..0000000
--- a/config/optional/core.entity_view_display.paragraph.emergency_contact.default.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-uuid: fa7997d2-1045-4fce-9e5a-269070f0e7bf
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.paragraph.emergency_contact.field_name
-    - field.field.paragraph.emergency_contact.field_phone
-    - field.field.paragraph.emergency_contact.field_relationship
-    - paragraphs.paragraphs_type.emergency_contact
-id: paragraph.emergency_contact.default
-targetEntityType: paragraph
-bundle: emergency_contact
-mode: default
-content:
-  field_name:
-    type: string
-    label: hidden
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_phone:
-    type: string
-    label: hidden
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_relationship:
-    type: string
-    label: hidden
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 2
-    region: content
-hidden:
-  search_api_excerpt: true
diff --git a/config/optional/core.entity_view_display.paragraph.fee.default.yml b/config/optional/core.entity_view_display.paragraph.fee.default.yml
deleted file mode 100644
index a21e219..0000000
--- a/config/optional/core.entity_view_display.paragraph.fee.default.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-uuid: 65e2cc70-118b-4e3a-9466-ba291544b942
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.paragraph.fee.field_amount
-    - field.field.paragraph.fee.field_category
-    - paragraphs.paragraphs_type.fee
-  module:
-    - options
-_core:
-  default_config_hash: kMJ7yJFvJiLDC6StGhAnpokjfB46GXcGBLKrZwl5cHs
-id: paragraph.fee.default
-targetEntityType: paragraph
-bundle: fee
-mode: default
-content:
-  field_amount:
-    type: number_integer
-    label: inline
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_category:
-    type: list_default
-    label: inline
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  search_api_excerpt: true
diff --git a/config/optional/core.entity_view_display.paragraph.trainer.default.yml b/config/optional/core.entity_view_display.paragraph.trainer.default.yml
deleted file mode 100644
index 40ed2ba..0000000
--- a/config/optional/core.entity_view_display.paragraph.trainer.default.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-uuid: 200868f1-d728-4ac3-8fb8-9db91920be58
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.paragraph.trainer.field_rate_if_custom_
-    - field.field.paragraph.trainer.field_trainer
-    - field.field.paragraph.trainer.field_trainer_rate
-    - field.field.paragraph.trainer.field_trainer_role
-    - paragraphs.paragraphs_type.trainer
-  module:
-    - options
-_core:
-  default_config_hash: _wpY7syL1PVxWUIqujVcJ54cRK-Q_bqpjyDEQFMlVd4
-id: paragraph.trainer.default
-targetEntityType: paragraph
-bundle: trainer
-mode: default
-content:
-  field_rate_if_custom_:
-    type: number_integer
-    label: inline
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_trainer:
-    type: entity_reference_label
-    label: visually_hidden
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_trainer_rate:
-    type: list_default
-    label: inline
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  field_trainer_role:
-    type: list_default
-    label: inline
-    settings: {  }
-    third_party_settings: {  }
-    weight: 1
-    region: content
-hidden:
-  search_api_excerpt: true
diff --git a/config/optional/core.entity_view_display.taxonomy_term.clie.default.yml b/config/optional/core.entity_view_display.taxonomy_term.clie.default.yml
deleted file mode 100644
index 55a6802..0000000
--- a/config/optional/core.entity_view_display.taxonomy_term.clie.default.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 4ad542f3-80bb-48c9-a885-7c607c3c3cc1
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.clie
-  module:
-    - text
-id: taxonomy_term.clie.default
-targetEntityType: taxonomy_term
-bundle: clie
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  search_api_excerpt: true
diff --git a/config/optional/core.entity_view_display.taxonomy_term.client_status.default.yml b/config/optional/core.entity_view_display.taxonomy_term.client_status.default.yml
deleted file mode 100644
index 35affb2..0000000
--- a/config/optional/core.entity_view_display.taxonomy_term.client_status.default.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: e3e991f3-1d90-4b8f-a2e4-863b89aaf594
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.client_status.field_substatuses
-    - taxonomy.vocabulary.client_status
-  module:
-    - text
-id: taxonomy_term.client_status.default
-targetEntityType: taxonomy_term
-bundle: client_status
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_substatuses:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 1
-    region: content
-hidden:
-  search_api_excerpt: true
diff --git a/config/optional/core.entity_view_display.taxonomy_term.client_subtypes.default.yml b/config/optional/core.entity_view_display.taxonomy_term.client_subtypes.default.yml
deleted file mode 100644
index 52d1f3a..0000000
--- a/config/optional/core.entity_view_display.taxonomy_term.client_subtypes.default.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 31dc8d53-4c68-4ee4-a7a6-4964915664f9
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.client_subtypes.field_parent_type
-    - taxonomy.vocabulary.client_subtypes
-  module:
-    - text
-id: taxonomy_term.client_subtypes.default
-targetEntityType: taxonomy_term
-bundle: client_subtypes
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_parent_type:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 1
-    region: content
-hidden:
-  search_api_excerpt: true
diff --git a/config/optional/core.entity_view_display.user.user.compact.yml b/config/optional/core.entity_view_display.user.user.compact.yml
index 58a0840..2f25ffc 100644
--- a/config/optional/core.entity_view_display.user.user.compact.yml
+++ b/config/optional/core.entity_view_display.user.user.compact.yml
@@ -1,20 +1,17 @@
-uuid: e49bb552-885c-4473-9536-7e50986ac57a
+uuid: e4dd30f9-b300-48ab-8052-32857f84895a
 langcode: en
 status: true
 dependencies:
   config:
     - core.entity_view_mode.user.compact
-    - field.field.user.user.field_last_password_reset
     - field.field.user.user.field_linked_opencase_actor
-    - field.field.user.user.field_password_expiration
-    - field.field.user.user.field_pending_expire_sent
     - field.field.user.user.user_picture
     - image.style.thumbnail
   module:
     - image
     - user
 _core:
-  default_config_hash: '-cLsS3M3JycipXQt9rEb81_HxKneReoGuRh8ijcOPXs'
+  default_config_hash: kD2TjItfNDKFw2CFJQfuv4Ys6qg3uYa4hCJYN2jreec
 id: user.user.compact
 targetEntityType: user
 bundle: user
@@ -30,9 +27,6 @@ content:
     weight: 0
     region: content
 hidden:
-  field_last_password_reset: true
   field_linked_opencase_actor: true
-  field_password_expiration: true
-  field_pending_expire_sent: true
   member_for: true
   search_api_excerpt: true
diff --git a/config/optional/core.entity_view_display.user.user.default.yml b/config/optional/core.entity_view_display.user.user.default.yml
index 56d7377..28f3475 100644
--- a/config/optional/core.entity_view_display.user.user.default.yml
+++ b/config/optional/core.entity_view_display.user.user.default.yml
@@ -1,19 +1,16 @@
-uuid: 5828dc0c-7c34-43f3-a814-97d742f07daa
+uuid: 901064b0-859a-47ce-8242-f47840d80b79
 langcode: en
 status: true
 dependencies:
   config:
-    - field.field.user.user.field_last_password_reset
     - field.field.user.user.field_linked_opencase_actor
-    - field.field.user.user.field_password_expiration
-    - field.field.user.user.field_pending_expire_sent
     - field.field.user.user.user_picture
     - image.style.thumbnail
   module:
     - image
     - user
 _core:
-  default_config_hash: V51QPCKkgNREKtSmB9Iu2wmAMEpktVpnzklWaZV8UYo
+  default_config_hash: E1qmUI2SlozLlJ308jfMMFKT67l1p6PywE2LTRbeYS4
 id: user.user.default
 targetEntityType: user
 bundle: user
@@ -42,7 +39,4 @@ content:
     weight: 1
     region: content
 hidden:
-  field_last_password_reset: true
-  field_password_expiration: true
-  field_pending_expire_sent: true
   search_api_excerpt: true
diff --git a/config/optional/core.entity_view_mode.block_content.full.yml b/config/optional/core.entity_view_mode.block_content.full.yml
index 755f9cf..39bc171 100644
--- a/config/optional/core.entity_view_mode.block_content.full.yml
+++ b/config/optional/core.entity_view_mode.block_content.full.yml
@@ -1,4 +1,4 @@
-uuid: 489ee71c-cdd4-468c-a90e-ce6b48a440bb
+uuid: fbf18ec5-2dad-496d-8777-668ff804b017
 langcode: en
 status: false
 dependencies:
diff --git a/config/optional/core.entity_view_mode.comment.full.yml b/config/optional/core.entity_view_mode.comment.full.yml
index 96bd9e5..12a67f1 100644
--- a/config/optional/core.entity_view_mode.comment.full.yml
+++ b/config/optional/core.entity_view_mode.comment.full.yml
@@ -1,4 +1,4 @@
-uuid: be049773-6af0-4890-8481-1ccd480c49b0
+uuid: 697b9402-411a-49be-9dc3-82c7867e9e6c
 langcode: en
 status: false
 dependencies:
diff --git a/config/optional/core.entity_view_mode.feeds_feed.full.yml b/config/optional/core.entity_view_mode.feeds_feed.full.yml
deleted file mode 100644
index 0f1dbcb..0000000
--- a/config/optional/core.entity_view_mode.feeds_feed.full.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: cdfdb2b5-968b-4aaa-a8ca-4524230213dc
-langcode: en
-status: false
-dependencies:
-  module:
-    - feeds
-_core:
-  default_config_hash: 8I9Vm3L0dLCdctKfCjpw5vLwMetyaJzxbWNMzb2V7-I
-id: feeds_feed.full
-label: 'Full feed'
-targetEntityType: feeds_feed
-cache: true
diff --git a/config/optional/core.entity_view_mode.node.full.yml b/config/optional/core.entity_view_mode.node.full.yml
index f20d901..0ae2830 100644
--- a/config/optional/core.entity_view_mode.node.full.yml
+++ b/config/optional/core.entity_view_mode.node.full.yml
@@ -1,4 +1,4 @@
-uuid: 70fd15b4-4281-4556-a0c7-971763cc4095
+uuid: bc808534-08e2-468b-a409-bfa2d557b6e1
 langcode: en
 status: false
 dependencies:
diff --git a/config/optional/core.entity_view_mode.node.rss.yml b/config/optional/core.entity_view_mode.node.rss.yml
index 5ab0f9a..242c91f 100644
--- a/config/optional/core.entity_view_mode.node.rss.yml
+++ b/config/optional/core.entity_view_mode.node.rss.yml
@@ -1,4 +1,4 @@
-uuid: fbcf2bb0-f3de-4b7f-972e-5db138e19fd0
+uuid: 826b2e06-6027-4567-a474-a9fdd7e88633
 langcode: en
 status: false
 dependencies:
diff --git a/config/optional/core.entity_view_mode.node.search_index.yml b/config/optional/core.entity_view_mode.node.search_index.yml
index 08b9224..bbf282c 100644
--- a/config/optional/core.entity_view_mode.node.search_index.yml
+++ b/config/optional/core.entity_view_mode.node.search_index.yml
@@ -1,4 +1,4 @@
-uuid: 7d51909f-6e60-4a5b-bd34-180fa0e9bd36
+uuid: 3673e658-0302-4f17-a391-39b9597a8ab6
 langcode: en
 status: false
 dependencies:
diff --git a/config/optional/core.entity_view_mode.node.search_result.yml b/config/optional/core.entity_view_mode.node.search_result.yml
index 2a439e0..d640857 100644
--- a/config/optional/core.entity_view_mode.node.search_result.yml
+++ b/config/optional/core.entity_view_mode.node.search_result.yml
@@ -1,4 +1,4 @@
-uuid: ab8d29f6-fadc-49a3-b976-2f2d1ca39b48
+uuid: 2fbac467-ec0d-433a-acfd-e2bb10ca7089
 langcode: en
 status: false
 dependencies:
diff --git a/config/optional/core.entity_view_mode.node.teaser.yml b/config/optional/core.entity_view_mode.node.teaser.yml
index 3eb7d8a..0189324 100644
--- a/config/optional/core.entity_view_mode.node.teaser.yml
+++ b/config/optional/core.entity_view_mode.node.teaser.yml
@@ -1,4 +1,4 @@
-uuid: 082a0a56-2e6b-41db-96c3-0d3996a43d5b
+uuid: 361f5ad9-631e-40eb-ba48-50bb6e5f6eed
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/core.entity_view_mode.paragraph.preview.yml b/config/optional/core.entity_view_mode.paragraph.preview.yml
index 62d895e..1e54fd4 100644
--- a/config/optional/core.entity_view_mode.paragraph.preview.yml
+++ b/config/optional/core.entity_view_mode.paragraph.preview.yml
@@ -1,4 +1,4 @@
-uuid: d7d628eb-ceb0-4216-b6cb-e85d9551899a
+uuid: 03b2c037-4ae0-4452-b524-53d1c3dcff9f
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/core.entity_view_mode.projects.yml b/config/optional/core.entity_view_mode.projects.yml
deleted file mode 100644
index e47d274..0000000
--- a/config/optional/core.entity_view_mode.projects.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: d6279582-2817-4fc5-8da1-7aef408ac19f
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_contract_signed_date
-    - opencase_cases.oc_case_type.project
-    - system.menu.opencase
-    - user.role.administrator
-    - user.role.gno_admin_user
-  module:
-    - datetime
-    - opencase_cases
-    - user
-id: projects
-label: Projects
-targetEntityType: null
-cache: true
diff --git a/config/optional/core.entity_view_mode.taxonomy_term.full.yml b/config/optional/core.entity_view_mode.taxonomy_term.full.yml
index 8b595d1..0eae13f 100644
--- a/config/optional/core.entity_view_mode.taxonomy_term.full.yml
+++ b/config/optional/core.entity_view_mode.taxonomy_term.full.yml
@@ -1,4 +1,4 @@
-uuid: 2466bd2f-2901-4ca8-adec-99666ac3ce8c
+uuid: cab77fdc-1f42-41d6-8e91-b8de9c11e5c0
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/core.entity_view_mode.user.compact.yml b/config/optional/core.entity_view_mode.user.compact.yml
index dc07ddf..ec5db1d 100644
--- a/config/optional/core.entity_view_mode.user.compact.yml
+++ b/config/optional/core.entity_view_mode.user.compact.yml
@@ -1,4 +1,4 @@
-uuid: fa322922-9e8b-4363-9cb6-0c01109529db
+uuid: f4310344-bb6e-48d7-b358-8853992d537b
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/core.entity_view_mode.user.full.yml b/config/optional/core.entity_view_mode.user.full.yml
index c0cfc4f..8afd7a3 100644
--- a/config/optional/core.entity_view_mode.user.full.yml
+++ b/config/optional/core.entity_view_mode.user.full.yml
@@ -1,4 +1,4 @@
-uuid: 9b9fc3cd-7ff9-43a7-a559-ded569de539a
+uuid: 9e613419-ece4-4f3a-9391-5162e67763fc
 langcode: en
 status: false
 dependencies:
diff --git a/config/optional/core.extension.yml b/config/optional/core.extension.yml
index e829704..22ae288 100644
--- a/config/optional/core.extension.yml
+++ b/config/optional/core.extension.yml
@@ -4,7 +4,7 @@ module:
   admin_toolbar: 0
   automated_cron: 0
   base_field_override_ui: 0
-  better_exposed_filters: 0
+  basic_auth: 0
   big_pipe: 0
   block: 0
   block_content: 0
@@ -14,29 +14,27 @@ module:
   comment: 0
   config: 0
   contact: 0
-  content_as_config: 0
   contextual: 0
   csv_serialization: 0
   ctools: 0
+  ctools_entity_mask: 0
+  ctools_views: 0
   date_popup: 0
   datetime: 0
+  datetime_range: 0
   dblog: 0
-  dbug: 0
-  devel: 0
-  devel_entity_updates: 0
   dynamic_page_cache: 0
   editor: 0
   entity_extra_field: 0
   entity_extra_field_ui: 0
   entity_reference_revisions: 0
   facets: 0
-  feeds: 0
+  facets_rest: 0
+  facets_searchbox_widget: 0
   field: 0
-  field_permissions: 0
   field_ui: 0
   file: 0
   filter: 0
-  goodnightout_opencase: 0
   hal: 0
   help: 0
   history: 0
@@ -44,10 +42,8 @@ module:
   jquery_ui: 0
   jquery_ui_datepicker: 0
   jquery_ui_slider: 0
-  jquery_ui_touch_punch: 0
   jsonapi: 0
   link: 0
-  mailsystem: 0
   menu_link_content: 0
   menu_ui: 0
   node: 0
@@ -57,10 +53,9 @@ module:
   opencase_search: 0
   options: 0
   page_cache: 0
-  password_strength: 0
+  paragraphs_collapsible: 0
   path: 0
   path_alias: 0
-  quickedit: 0
   rdf: 0
   rest: 0
   restui: 0
@@ -68,33 +63,33 @@ module:
   search: 0
   search_api: 0
   search_api_db: 0
+  search_api_db_defaults: 0
   security_review: 0
   serialization: 0
   shortcut: 0
+  smtp: 0
   superfish: 0
   system: 0
+  tamper: 0
   taxonomy: 0
+  telephone: 0
   text: 0
   toolbar: 0
   tour: 0
   typed_data: 0
-  update: 0
   user: 0
   views_aggregator: 0
+  views_aggregator_more_functions: 0
   views_autosubmit: 0
+  views_contextual_filters_or: 0
   views_data_export: 0
-  views_natural_sort: 0
   views_summarize: 0
   views_ui: 0
   hide_revision_field: 1
-  password_policy: 10
   views: 10
   paragraphs: 11
   standard: 1000
 theme:
-  stable: 0
-  classy: 0
   bartik: 0
   seven: 0
-  bartik_gno: 0
 profile: standard
diff --git a/config/optional/core.menu.static_menu_link_overrides.yml b/config/optional/core.menu.static_menu_link_overrides.yml
index 22175e2..02670cc 100644
--- a/config/optional/core.menu.static_menu_link_overrides.yml
+++ b/config/optional/core.menu.static_menu_link_overrides.yml
@@ -1,81 +1,33 @@
 _core:
-  default_config_hash: o4bYR9ZupWb3AsOIizTUG4g-nu1mdJqA59UB7QT-ifQ
+  default_config_hash: CXhei_vpaZk-3f_Mj2cH0YmpK-ZpKHoSzVA3yZrDq0g
 definitions:
-  opencase__reporting:
-    menu_name: opencase
+  contact__site_page:
+    menu_name: footer
     parent: ''
-    weight: -47
+    weight: 0
     expanded: false
     enabled: true
-  opencase__see_all:
+  opencase__reporting:
+    weight: -48
     menu_name: opencase
     parent: ''
+    enabled: true
+    expanded: false
+  opencase__see_all:
     weight: -50
+    menu_name: opencase
+    parent: ''
     expanded: false
     enabled: true
   opencase__opencase_add_new_things_menu:
+    weight: -49
     menu_name: opencase
     parent: ''
-    weight: -49
     expanded: false
     enabled: true
   opencase__opencase_admin_menu:
+    weight: -47
     menu_name: opencase
     parent: ''
-    weight: -48
     expanded: false
     enabled: true
-  'opencase__manage_taxonomy_links:client_status':
-    menu_name: opencase
-    parent: opencase.opencase_admin_menu
-    weight: 0
-    expanded: false
-    enabled: false
-  'opencase__manage_taxonomy_links:clie':
-    menu_name: opencase
-    parent: opencase.opencase_admin_menu
-    weight: 0
-    expanded: false
-    enabled: false
-  'opencase__manage_taxonomy_links:client_subtypes':
-    menu_name: opencase
-    parent: opencase.opencase_admin_menu
-    weight: 0
-    expanded: false
-    enabled: false
-  'opencase__manage_taxonomy_links:client_types':
-    menu_name: opencase
-    parent: opencase.opencase_admin_menu
-    weight: 0
-    expanded: false
-    enabled: false
-  'opencase__see_all_organisations_links:client':
-    menu_name: opencase
-    parent: opencase.see_all
-    weight: 0
-    expanded: false
-    enabled: false
-  'opencase__see_all_organisations_links:partner_organisation':
-    menu_name: opencase
-    parent: opencase.see_all
-    weight: 0
-    expanded: false
-    enabled: false
-  'opencase__see_all_people_links:trainer':
-    menu_name: opencase
-    parent: opencase.see_all
-    weight: 0
-    expanded: false
-    enabled: false
-  'opencase__see_all_organisations_links:umbrella_client':
-    menu_name: opencase
-    parent: opencase.see_all
-    weight: 0
-    expanded: false
-    enabled: false
-  'opencase__manage_taxonomy_links:oc_case_provider_role':
-    menu_name: opencase
-    parent: opencase.opencase_admin_menu
-    weight: 0
-    expanded: false
-    enabled: false
diff --git a/config/optional/devel.settings.yml b/config/optional/devel.settings.yml
deleted file mode 100644
index 7bb48ed..0000000
--- a/config/optional/devel.settings.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-page_alter: false
-raw_names: false
-error_handlers:
-  1: 1
-rebuild_theme: false
-debug_mail_file_format: '%to-%subject-%datetime.mail.txt'
-debug_mail_directory: 'temporary://devel-mails'
-devel_dumper: default
-debug_logfile: 'temporary://drupal_debug.txt'
-debug_pre: true
-_core:
-  default_config_hash: Aqx6J0yYT6mVqT0fbjeP4JkoL-700nmudVF5d6Pq2Yo
diff --git a/config/optional/devel.toolbar.settings.yml b/config/optional/devel.toolbar.settings.yml
deleted file mode 100644
index 4ea562c..0000000
--- a/config/optional/devel.toolbar.settings.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-toolbar_items:
-  - devel.admin_settings_link
-  - devel.cache_clear
-  - devel.container_info.service
-  - devel.menu_rebuild
-  - devel.reinstall
-  - devel.route_info
-  - devel.run_cron
-_core:
-  default_config_hash: IQjf_ytthngZTAk_MU8-74VecArWD3G5g0oEH6PM6GA
diff --git a/config/optional/editor.editor.basic_html.yml b/config/optional/editor.editor.basic_html.yml
index beca06c..d1ae14e 100644
--- a/config/optional/editor.editor.basic_html.yml
+++ b/config/optional/editor.editor.basic_html.yml
@@ -1,6 +1,6 @@
-uuid: bce05a02-b793-466b-a492-1febe92d1f85
+uuid: b4db73a4-6b3f-49dd-a8a2-2b1faac836ef
 langcode: en
-status: false
+status: true
 dependencies:
   config:
     - filter.format.basic_html
@@ -43,13 +43,15 @@ settings:
           items:
             - Source
   plugins:
+    language:
+      language_list: un
     stylescombo:
       styles: ''
 image_upload:
-  status: true
+  status: false
   scheme: public
   directory: inline-images
   max_size: ''
   max_dimensions:
-    width: 0
-    height: 0
+    width: null
+    height: null
diff --git a/config/optional/editor.editor.full_html.yml b/config/optional/editor.editor.full_html.yml
index 403e428..2f6a5ef 100644
--- a/config/optional/editor.editor.full_html.yml
+++ b/config/optional/editor.editor.full_html.yml
@@ -1,4 +1,4 @@
-uuid: a2c2797e-c7cb-4d9d-9d6d-2f8aa79c7d58
+uuid: 61fc776d-4f1b-4a0f-9566-d402e60162f9
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/entity_extra_field.extra_field.oc_actor.trainer.train_the_trainer_events_attended_attending.yml b/config/optional/entity_extra_field.extra_field.oc_actor.trainer.train_the_trainer_events_attended_attending.yml
deleted file mode 100644
index 66d7ac9..0000000
--- a/config/optional/entity_extra_field.extra_field.oc_actor.trainer.train_the_trainer_events_attended_attending.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-uuid: 00a81427-011d-4646-9a69-9c3fb0ace387
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_event_type.train_the_trainer
-    - system.menu.opencase
-    - user.role.authenticated
-  module:
-    - datetime
-    - opencase_entities
-    - user
-id: oc_actor.trainer.train_the_trainer_events_attended_attending
-label: 'Train the trainer events attended/attending'
-display_label: true
-name: train_the_trainer_events_attended_attending
-description: ''
-base_entity_type_id: oc_actor
-base_bundle_type_id: trainer
-field_type_id: views
-field_type_config:
-  view_name: train_the_trainer_events
-  display: page_1
-  arguments: ''
-field_type_condition:
-  'entity_bundle:oc_actor':
-    id: 'entity_bundle:oc_actor'
-    negate: false
-    context_mapping:
-      oc_actor: entity_extra_field.target_entity
-    bundles: {  }
-  route:
-    id: route
-    negate: false
-    routes: ''
-  request_path:
-    id: request_path
-    negate: false
-    pages: ''
-  current_theme:
-    id: current_theme
-    theme: ''
-    negate: 0
-field_conditions_all_pass: false
-display:
-  type: view
diff --git a/config/optional/entity_extra_field.extra_field.oc_case.training.trainers.yml b/config/optional/entity_extra_field.extra_field.oc_case.accommodation.caseworkers.yml
similarity index 55%
rename from config/optional/entity_extra_field.extra_field.oc_case.training.trainers.yml
rename to config/optional/entity_extra_field.extra_field.oc_case.accommodation.caseworkers.yml
index 35c6e11..bf740b9 100644
--- a/config/optional/entity_extra_field.extra_field.oc_case.training.trainers.yml
+++ b/config/optional/entity_extra_field.extra_field.oc_case.accommodation.caseworkers.yml
@@ -1,26 +1,24 @@
-uuid: ae8f2f7c-3545-46e4-9176-0c48725c38da
+uuid: 77781cfa-1449-4d3b-8e87-28b1eb760e14
 langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.oc_case_provision.field_rate
-    - field.storage.oc_case_provision.field_rate_type
+    - opencase_cases.oc_case_provision_type.caseworker
     - user.role.authenticated
   module:
     - opencase_cases
-    - options
     - user
-id: oc_case.training.trainers
-label: Trainers
+id: oc_case.accommodation.caseworkers
+label: Caseworkers
 display_label: true
-name: trainers
+name: caseworkers
 description: ''
 base_entity_type_id: oc_case
-base_bundle_type_id: training
+base_bundle_type_id: accommodation
 field_type_id: views
 field_type_config:
   view_name: case_provisions
-  display: block_1
+  display: block_2
   arguments: ''
 field_type_condition:
   'entity_bundle:oc_case':
@@ -29,7 +27,15 @@ field_type_condition:
     context_mapping:
       oc_case: entity_extra_field.target_entity
     bundles:
-      training: training
+      accommodation: accommodation
+      asylum_support: asylum_support
+      employability: employability
+      enquiry: enquiry
+      health: health
+      immigration: immigration
+      pro_bono_immigration_service: pro_bono_immigration_service
+      volunteer_engagement: volunteer_engagement
+      welfare_rights: welfare_rights
   route:
     id: route
     negate: false
diff --git a/config/optional/entity_extra_field.extra_field.oc_case.project.activities.yml b/config/optional/entity_extra_field.extra_field.oc_case.project.activities.yml
deleted file mode 100644
index e25456f..0000000
--- a/config/optional/entity_extra_field.extra_field.oc_case.project.activities.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-uuid: 5dcb8bf1-2961-42ac-b031-3d152ae78c5d
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_activity_type.evaluation
-    - opencase_entities.oc_activity_type.trainer_debrief
-    - user.role.gno_admin_user
-  module:
-    - datetime
-    - opencase_entities
-    - user
-id: oc_case.project.activities
-label: Activities
-display_label: true
-name: activities
-description: ''
-base_entity_type_id: oc_case
-base_bundle_type_id: project
-field_type_id: views
-field_type_config:
-  view_name: activities_without_case
-  display: block_2
-  arguments: ''
-field_type_condition:
-  'entity_bundle:oc_case':
-    id: 'entity_bundle:oc_case'
-    negate: false
-    context_mapping:
-      oc_case: entity_extra_field.target_entity
-    bundles:
-      project: project
-      training: training
-  route:
-    id: route
-    negate: false
-    routes: ''
-  request_path:
-    id: request_path
-    negate: false
-    pages: ''
-  current_theme:
-    id: current_theme
-    theme: ''
-    negate: 0
-field_conditions_all_pass: false
-display:
-  type: view
diff --git a/config/optional/entity_extra_field.extra_field.oc_case.project.billing_details.yml b/config/optional/entity_extra_field.extra_field.oc_case.project.billing_details.yml
deleted file mode 100644
index eee6584..0000000
--- a/config/optional/entity_extra_field.extra_field.oc_case.project.billing_details.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-uuid: f28e376d-3695-41ec-843b-e7e6aec5c88e
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_cases.oc_case_type.project
-    - user.role.authenticated
-  module:
-    - opencase_cases
-    - opencase_entities
-    - user
-id: oc_case.project.billing_details
-label: 'Billing details'
-display_label: true
-name: billing_details
-description: ''
-base_entity_type_id: oc_case
-base_bundle_type_id: project
-field_type_id: views
-field_type_config:
-  view_name: project_billing_details
-  display: page_1
-  arguments: ''
-field_type_condition:
-  'entity_bundle:oc_case':
-    id: 'entity_bundle:oc_case'
-    negate: false
-    context_mapping:
-      oc_case: entity_extra_field.target_entity
-    bundles:
-      project: project
-  route:
-    id: route
-    negate: false
-    routes: ''
-  request_path:
-    id: request_path
-    negate: false
-    pages: ''
-  current_theme:
-    id: current_theme
-    theme: ''
-    negate: 0
-field_conditions_all_pass: false
-display:
-  type: view
diff --git a/config/optional/entity_extra_field.extra_field.oc_case.project.fees.yml b/config/optional/entity_extra_field.extra_field.oc_case.project.fees.yml
deleted file mode 100644
index bce5f84..0000000
--- a/config/optional/entity_extra_field.extra_field.oc_case.project.fees.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-uuid: cba6cacd-6ca4-4b4b-9300-d6113e4d77df
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.authenticated
-  module:
-    - opencase_cases
-    - user
-id: oc_case.project.fees
-label: Fees
-display_label: true
-name: fees
-description: ''
-base_entity_type_id: oc_case
-base_bundle_type_id: project
-field_type_id: views
-field_type_config:
-  view_name: fees
-  display: block_1
-  arguments: ''
-field_type_condition:
-  'entity_bundle:oc_case':
-    id: 'entity_bundle:oc_case'
-    negate: false
-    context_mapping:
-      oc_case: entity_extra_field.target_entity
-    bundles:
-      project: project
-  route:
-    id: route
-    negate: false
-    routes: ''
-  request_path:
-    id: request_path
-    negate: false
-    pages: ''
-  current_theme:
-    id: current_theme
-    theme: ''
-    negate: 0
-field_conditions_all_pass: false
-display:
-  type: view
diff --git a/config/optional/entity_extra_field.extra_field.oc_case.project.trainings.yml b/config/optional/entity_extra_field.extra_field.oc_case.project.trainings.yml
deleted file mode 100644
index 9ce708b..0000000
--- a/config/optional/entity_extra_field.extra_field.oc_case.project.trainings.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-uuid: 4cf9ed31-fa62-41b4-a7a3-2750e7769e00
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_date_of_training
-    - field.storage.oc_case.field_number_of_participants
-    - field.storage.oc_case.field_project
-    - field.storage.oc_case.field_training_status
-    - field.storage.oc_case.field_training_type
-    - opencase_cases.oc_case_type.training
-    - system.menu.opencase
-    - user.role.authenticated
-  module:
-    - datetime
-    - opencase_cases
-    - opencase_entities
-    - options
-    - user
-id: oc_case.project.trainings
-label: Trainings
-display_label: true
-name: trainings
-description: ''
-base_entity_type_id: oc_case
-base_bundle_type_id: project
-field_type_id: views
-field_type_config:
-  view_name: trainings
-  display: block_5
-  arguments: ''
-field_type_condition:
-  'entity_bundle:oc_case':
-    id: 'entity_bundle:oc_case'
-    negate: false
-    context_mapping:
-      oc_case: entity_extra_field.target_entity
-    bundles:
-      project: project
-  route:
-    id: route
-    negate: false
-    routes: ''
-  request_path:
-    id: request_path
-    negate: false
-    pages: ''
-  current_theme:
-    id: current_theme
-    theme: ''
-    negate: 0
-field_conditions_all_pass: false
-display:
-  type: view
diff --git a/config/optional/entity_extra_field.extra_field.oc_case.training.activities.yml b/config/optional/entity_extra_field.extra_field.oc_case.training.activities.yml
deleted file mode 100644
index 0116960..0000000
--- a/config/optional/entity_extra_field.extra_field.oc_case.training.activities.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-uuid: 59986339-28c0-46b7-a224-5e9a2196bb8c
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_activity_type.evaluation
-    - opencase_entities.oc_activity_type.trainer_debrief
-    - user.role.gno_admin_user
-  module:
-    - datetime
-    - opencase_entities
-    - user
-id: oc_case.training.activities
-label: Activities
-display_label: true
-name: activities
-description: ''
-base_entity_type_id: oc_case
-base_bundle_type_id: training
-field_type_id: views
-field_type_config:
-  view_name: activities_without_case
-  display: block_2
-  arguments: ''
-field_type_condition:
-  'entity_bundle:oc_case':
-    id: 'entity_bundle:oc_case'
-    negate: false
-    context_mapping:
-      oc_case: entity_extra_field.target_entity
-    bundles:
-      project: project
-      training: training
-  route:
-    id: route
-    negate: false
-    routes: ''
-  request_path:
-    id: request_path
-    negate: false
-    pages: ''
-  current_theme:
-    id: current_theme
-    theme: ''
-    negate: 0
-field_conditions_all_pass: false
-display:
-  type: view
diff --git a/config/optional/entity_extra_field.extra_field.oc_case.training.debrief.yml b/config/optional/entity_extra_field.extra_field.oc_case.training.debrief.yml
deleted file mode 100644
index 33f31c1..0000000
--- a/config/optional/entity_extra_field.extra_field.oc_case.training.debrief.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-uuid: 72f123c9-f0ab-4c83-b87a-f8e02c7d92fc
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_activity_type.trainer_debrief
-    - user.role.authenticated
-  module:
-    - opencase_cases
-    - opencase_entities
-    - user
-id: oc_case.training.debrief
-label: Debrief
-display_label: true
-name: debrief
-description: ''
-base_entity_type_id: oc_case
-base_bundle_type_id: training
-field_type_id: views
-field_type_config:
-  view_name: debriefs
-  display: block_1
-  arguments: ''
-field_type_condition:
-  'entity_bundle:oc_case':
-    id: 'entity_bundle:oc_case'
-    negate: false
-    context_mapping:
-      oc_case: entity_extra_field.target_entity
-    bundles:
-      training: training
-  route:
-    id: route
-    negate: false
-    routes: ''
-  request_path:
-    id: request_path
-    negate: false
-    pages: ''
-  current_theme:
-    id: current_theme
-    theme: ''
-    negate: 0
-field_conditions_all_pass: false
-display:
-  type: view
diff --git a/config/optional/entity_extra_field.extra_field.oc_organisation.client.activities.yml b/config/optional/entity_extra_field.extra_field.oc_organisation.client.activities.yml
deleted file mode 100644
index 643b253..0000000
--- a/config/optional/entity_extra_field.extra_field.oc_organisation.client.activities.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-uuid: 78975dca-1800-41d5-96ad-bef6edbfcbb3
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.gno_admin_user
-  module:
-    - datetime
-    - opencase_entities
-    - user
-id: oc_organisation.client.activities
-label: Activities
-display_label: true
-name: activities
-description: 'Activities that do not relate to a specific training.'
-base_entity_type_id: oc_organisation
-base_bundle_type_id: client
-field_type_id: views
-field_type_config:
-  view_name: activities_without_case
-  display: block_1
-  arguments: ''
-field_type_condition:
-  'entity_bundle:oc_organisation':
-    id: 'entity_bundle:oc_organisation'
-    negate: false
-    context_mapping:
-      oc_organisation: entity_extra_field.target_entity
-    bundles:
-      client: client
-      umbrella_client: umbrella_client
-  route:
-    id: route
-    negate: false
-    routes: ''
-  request_path:
-    id: request_path
-    negate: false
-    pages: ''
-  current_theme:
-    id: current_theme
-    theme: ''
-    negate: 0
-field_conditions_all_pass: false
-display:
-  type: view
diff --git a/config/optional/entity_extra_field.extra_field.oc_organisation.client.linked_clients.yml b/config/optional/entity_extra_field.extra_field.oc_organisation.client.linked_clients.yml
deleted file mode 100644
index a75879c..0000000
--- a/config/optional/entity_extra_field.extra_field.oc_organisation.client.linked_clients.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-uuid: fc150048-86dc-468b-a427-2d853735d6d1
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase
-    - opencase_entities
-    - user
-id: oc_organisation.client.linked_clients
-label: 'Linked clients'
-display_label: true
-name: linked_clients
-description: ''
-base_entity_type_id: oc_organisation
-base_bundle_type_id: client
-field_type_id: views
-field_type_config:
-  view_name: organisation_relations
-  display: block_1
-  arguments: ''
-field_type_condition:
-  'entity_bundle:oc_organisation':
-    id: 'entity_bundle:oc_organisation'
-    negate: false
-    context_mapping:
-      oc_organisation: entity_extra_field.target_entity
-    bundles:
-      client: client
-  route:
-    id: route
-    negate: false
-    routes: ''
-  current_theme:
-    id: current_theme
-    theme: ''
-    negate: 0
-  request_path:
-    id: request_path
-    negate: false
-    pages: ''
-  webform:
-    id: webform
-    webforms: {  }
-    context_mapping: {  }
-    negate: false
-field_conditions_all_pass: true
-display:
-  type: view
diff --git a/config/optional/entity_extra_field.extra_field.oc_organisation.client.projects.yml b/config/optional/entity_extra_field.extra_field.oc_organisation.client.projects.yml
deleted file mode 100644
index ae76188..0000000
--- a/config/optional/entity_extra_field.extra_field.oc_organisation.client.projects.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-uuid: b33e2ab2-6f8c-4b52-9372-736541568116
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_contract_signed_date
-    - opencase_cases.oc_case_type.project
-    - system.menu.opencase
-  module:
-    - datetime
-    - opencase_cases
-    - user
-id: oc_organisation.client.projects
-label: Projects
-display_label: true
-name: projects
-description: ''
-base_entity_type_id: oc_organisation
-base_bundle_type_id: client
-field_type_id: views
-field_type_config:
-  view_name: projects
-  display: block_1
-  arguments: ''
-field_type_condition:
-  'entity_bundle:oc_organisation':
-    id: 'entity_bundle:oc_organisation'
-    negate: false
-    context_mapping:
-      oc_organisation: entity_extra_field.target_entity
-    bundles:
-      client: client
-      umbrella_client: umbrella_client
-  route:
-    id: route
-    negate: false
-    routes: ''
-  current_theme:
-    id: current_theme
-    theme: ''
-    negate: 0
-  request_path:
-    id: request_path
-    negate: false
-    pages: ''
-field_conditions_all_pass: false
-display:
-  type: view
diff --git a/config/optional/entity_extra_field.extra_field.oc_organisation.client.trainings.yml b/config/optional/entity_extra_field.extra_field.oc_organisation.client.trainings.yml
deleted file mode 100644
index 03835da..0000000
--- a/config/optional/entity_extra_field.extra_field.oc_organisation.client.trainings.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-uuid: 57f257e9-5e60-4342-87b0-2bcfbc50b560
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_date_of_training
-    - field.storage.oc_case.field_project
-    - field.storage.oc_case.field_training_status
-    - field.storage.oc_case.field_training_type
-    - opencase_cases.oc_case_type.training
-    - system.menu.opencase
-    - user.role.authenticated
-  module:
-    - datetime
-    - opencase_cases
-    - opencase_entities
-    - options
-    - paragraphs
-    - user
-id: oc_organisation.client.trainings
-label: Trainings
-display_label: true
-name: trainings
-description: ''
-base_entity_type_id: oc_organisation
-base_bundle_type_id: client
-field_type_id: views
-field_type_config:
-  view_name: trainings
-  display: block_2
-  arguments: ''
-field_type_condition:
-  'entity_bundle:oc_organisation':
-    id: 'entity_bundle:oc_organisation'
-    negate: false
-    context_mapping:
-      oc_organisation: entity_extra_field.target_entity
-    bundles: {  }
-  route:
-    id: route
-    negate: false
-    routes: ''
-  request_path:
-    id: request_path
-    negate: false
-    pages: ''
-  current_theme:
-    id: current_theme
-    theme: ''
-    negate: 0
-field_conditions_all_pass: false
-display:
-  type: view
diff --git a/config/optional/entity_extra_field.extra_field.oc_organisation.umbrella_client.clients.yml b/config/optional/entity_extra_field.extra_field.oc_organisation.umbrella_client.clients.yml
deleted file mode 100644
index 89e435f..0000000
--- a/config/optional/entity_extra_field.extra_field.oc_organisation.umbrella_client.clients.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-uuid: fc8eb2ba-bc53-4331-be78-0b23cd12f4cd
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_client_status
-    - field.storage.oc_organisation.field_client_substatus
-    - field.storage.oc_organisation.field_client_subtype
-    - field.storage.oc_organisation.field_client_type
-    - field.storage.oc_organisation.field_tags
-    - opencase_entities.oc_organisation_type.client
-    - system.menu.opencase
-  module:
-    - opencase_entities
-    - user
-id: oc_organisation.umbrella_client.clients
-label: Clients
-display_label: true
-name: clients
-description: ''
-base_entity_type_id: oc_organisation
-base_bundle_type_id: umbrella_client
-field_type_id: views
-field_type_config:
-  view_name: all_clients
-  display: block_1
-  arguments: ''
-field_type_condition:
-  'entity_bundle:oc_organisation':
-    id: 'entity_bundle:oc_organisation'
-    negate: false
-    context_mapping:
-      oc_organisation: entity_extra_field.target_entity
-    bundles:
-      umbrella_client: umbrella_client
-  route:
-    id: route
-    negate: false
-    routes: ''
-  current_theme:
-    id: current_theme
-    theme: ''
-    negate: 0
-  request_path:
-    id: request_path
-    negate: false
-    pages: ''
-field_conditions_all_pass: true
-display:
-  type: view
diff --git a/config/optional/entity_extra_field.extra_field.oc_organisation.umbrella_client.projects.yml b/config/optional/entity_extra_field.extra_field.oc_organisation.umbrella_client.projects.yml
deleted file mode 100644
index 38c9d33..0000000
--- a/config/optional/entity_extra_field.extra_field.oc_organisation.umbrella_client.projects.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-uuid: e02bafbe-fae9-4a77-ba04-69aa1e816d31
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_contract_signed_date
-    - opencase_cases.oc_case_type.project
-    - system.menu.opencase
-  module:
-    - datetime
-    - opencase_cases
-    - user
-id: oc_organisation.umbrella_client.projects
-label: Projects
-display_label: true
-name: projects
-description: ''
-base_entity_type_id: oc_organisation
-base_bundle_type_id: umbrella_client
-field_type_id: views
-field_type_config:
-  view_name: projects
-  display: block_1
-  arguments: ''
-field_type_condition:
-  'entity_bundle:oc_organisation':
-    id: 'entity_bundle:oc_organisation'
-    negate: false
-    context_mapping:
-      oc_organisation: entity_extra_field.target_entity
-    bundles:
-      client: client
-      umbrella_client: umbrella_client
-  route:
-    id: route
-    negate: false
-    routes: ''
-  current_theme:
-    id: current_theme
-    theme: ''
-    negate: 0
-  request_path:
-    id: request_path
-    negate: false
-    pages: ''
-field_conditions_all_pass: false
-display:
-  type: view
diff --git a/config/optional/entity_extra_field.extra_field.oc_organisation.umbrella_client.trainings_for_clients_within_this_umbrella.yml b/config/optional/entity_extra_field.extra_field.oc_organisation.umbrella_client.trainings_for_clients_within_this_umbrella.yml
deleted file mode 100644
index 8060542..0000000
--- a/config/optional/entity_extra_field.extra_field.oc_organisation.umbrella_client.trainings_for_clients_within_this_umbrella.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-uuid: ce2aa5ef-25d4-4f02-921a-d6298b43210f
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_date_of_training
-    - field.storage.oc_case.field_training_status
-    - field.storage.oc_case.field_training_type
-    - opencase_cases.oc_case_type.training
-    - system.menu.opencase
-  module:
-    - datetime
-    - opencase_cases
-    - opencase_entities
-    - options
-    - paragraphs
-    - user
-id: oc_organisation.umbrella_client.trainings_for_clients_within_this_umbrella
-label: 'Trainings for clients within this umbrella'
-display_label: true
-name: trainings_for_clients_within_this_umbrella
-description: ''
-base_entity_type_id: oc_organisation
-base_bundle_type_id: umbrella_client
-field_type_id: views
-field_type_config:
-  view_name: trainings
-  display: block_3
-  arguments: ''
-field_type_condition:
-  'entity_bundle:oc_organisation':
-    id: 'entity_bundle:oc_organisation'
-    negate: false
-    context_mapping:
-      oc_organisation: entity_extra_field.target_entity
-    bundles:
-      umbrella_client: umbrella_client
-  route:
-    id: route
-    negate: false
-    routes: ''
-  current_theme:
-    id: current_theme
-    theme: ''
-    negate: 0
-  request_path:
-    id: request_path
-    negate: false
-    pages: ''
-field_conditions_all_pass: false
-display:
-  type: view
diff --git a/config/optional/entity_extra_field.extra_field.oc_organisation.umbrella_client.trainings_for_this_umbrella_client.yml b/config/optional/entity_extra_field.extra_field.oc_organisation.umbrella_client.trainings_for_this_umbrella_client.yml
deleted file mode 100644
index 317bd92..0000000
--- a/config/optional/entity_extra_field.extra_field.oc_organisation.umbrella_client.trainings_for_this_umbrella_client.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-uuid: 22df4e28-b8ef-41ef-b1fd-d04e19ff42e8
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_date_of_training
-    - field.storage.oc_case.field_training_status
-    - field.storage.oc_case.field_training_type
-    - opencase_cases.oc_case_type.training
-    - system.menu.opencase
-  module:
-    - datetime
-    - opencase_cases
-    - opencase_entities
-    - options
-    - paragraphs
-    - user
-id: oc_organisation.umbrella_client.trainings_for_this_umbrella_client
-label: 'Trainings for this Umbrella Client'
-display_label: true
-name: trainings_for_this_umbrella_client
-description: ''
-base_entity_type_id: oc_organisation
-base_bundle_type_id: umbrella_client
-field_type_id: views
-field_type_config:
-  view_name: trainings
-  display: block_4
-  arguments: ''
-field_type_condition:
-  'entity_bundle:oc_organisation':
-    id: 'entity_bundle:oc_organisation'
-    negate: false
-    context_mapping:
-      oc_organisation: entity_extra_field.target_entity
-    bundles:
-      umbrella_client: umbrella_client
-  route:
-    id: route
-    negate: false
-    routes: ''
-  current_theme:
-    id: current_theme
-    theme: ''
-    negate: 0
-  request_path:
-    id: request_path
-    negate: false
-    pages: ''
-field_conditions_all_pass: false
-display:
-  type: view
diff --git a/config/optional/feeds.feed_type.cav_projects_2.yml b/config/optional/feeds.feed_type.cav_projects_2.yml
deleted file mode 100644
index 0fe49c7..0000000
--- a/config/optional/feeds.feed_type.cav_projects_2.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-uuid: 2285dbe0-b1c3-418b-b7cc-0a704bb857c0
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_case.project.field_contract_signed_date
-    - opencase_cases.oc_case_type.project
-  module:
-    - opencase_cases
-label: 'CAV Projects 2'
-id: cav_projects_2
-description: ''
-help: ''
-import_period: -1
-fetcher: upload
-fetcher_configuration:
-  allowed_extensions: 'txt csv tsv xml opml'
-  directory: 'private://feeds'
-parser: csv
-parser_configuration:
-  delimiter: ','
-  no_headers: false
-  line_limit: 100
-processor: 'entity:oc_case'
-processor_configuration:
-  values:
-    type: project
-  langcode: en
-  insert_new: 1
-  update_existing: 0
-  update_non_existent: _delete
-  skip_hash_check: false
-  authorize: true
-  expire: -1
-  owner_feed_author: false
-  owner_id: 0
-custom_sources:
-  client:
-    value: CLIENT
-    label: CLIENT
-    machine_name: client
-    type: csv
-  project:
-    value: PROJECT
-    label: PROJECT
-    machine_name: project
-    type: csv
-  project_date:
-    value: 'PROJECT DATE'
-    label: 'PROJECT DATE'
-    machine_name: project_date
-    type: csv
-mappings:
-  -
-    target: name
-    map:
-      value: project
-    settings: {  }
-    unique: {  }
-  -
-    target: client
-    map:
-      target_id: client
-    settings:
-      language: null
-      reference_by: name
-      autocreate: false
-      feeds_item: false
-  -
-    target: field_contract_signed_date
-    map:
-      value: project_date
-    settings:
-      language: null
-      timezone: UTC
diff --git a/config/optional/feeds.feed_type.csv_case_provisions.yml b/config/optional/feeds.feed_type.csv_case_provisions.yml
deleted file mode 100644
index c25a449..0000000
--- a/config/optional/feeds.feed_type.csv_case_provisions.yml
+++ /dev/null
@@ -1,99 +0,0 @@
-uuid: 612cd149-6c4f-440f-a80b-d9cf11ee4f2c
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.base_field_override.oc_case_provision.trainer.oc_provider
-    - opencase_cases.oc_case_provision_type.trainer
-  module:
-    - opencase_cases
-label: 'CSV Case Provisions'
-id: csv_case_provisions
-description: ''
-help: ''
-import_period: 3600
-fetcher: upload
-fetcher_configuration:
-  allowed_extensions: 'txt csv tsv xml opml'
-  directory: 'public://feeds'
-parser: csv
-parser_configuration:
-  delimiter: ','
-  no_headers: false
-  line_limit: 100
-processor: 'entity:oc_case_provision'
-processor_configuration:
-  values:
-    type: trainer
-  langcode: en
-  insert_new: 1
-  update_existing: 0
-  update_non_existent: _delete
-  skip_hash_check: false
-  authorize: true
-  expire: -1
-  owner_feed_author: false
-  owner_id: 0
-custom_sources:
-  training:
-    value: Training
-    label: Training
-    machine_name: training
-    type: csv
-  trainer:
-    value: Trainer
-    label: Trainer
-    machine_name: trainer
-    type: csv
-  role:
-    value: Role
-    label: Role
-    machine_name: role
-    type: csv
-  trainer_:
-    value: Trainer
-    label: Trainer
-    machine_name: trainer_
-    type: csv
-  name:
-    value: Name
-    label: Name
-    machine_name: name
-    type: csv
-  loop:
-    value: Loop
-    label: Loop
-    machine_name: loop
-    type: csv
-mappings:
-  -
-    target: oc_case
-    map:
-      target_id: training
-    settings:
-      language: null
-      reference_by: name
-      autocreate: false
-  -
-    target: oc_provider
-    map:
-      target_id: loop
-    settings:
-      language: ''
-      reference_by: last_name
-      feeds_item: guid
-      autocreate: 0
-  -
-    target: oc_case_provider_role
-    map:
-      target_id: role
-    settings:
-      language: null
-      reference_by: name
-      autocreate: false
-  -
-    target: name
-    map:
-      value: name
-    settings: {  }
-    unique: {  }
diff --git a/config/optional/feeds.feed_type.csv_clients.yml b/config/optional/feeds.feed_type.csv_clients.yml
deleted file mode 100644
index 02dc467..0000000
--- a/config/optional/feeds.feed_type.csv_clients.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-uuid: 4eb11220-0e79-4e7f-a0d8-2300fb7b365b
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_organisation.client.field_client_subtype
-    - field.field.oc_organisation.client.field_client_type
-    - field.field.oc_organisation.client.field_tags
-    - field.field.oc_organisation.client.field_umbrella_client
-    - opencase_entities.oc_organisation_type.client
-  module:
-    - opencase_entities
-label: 'CSV Clients'
-id: csv_clients
-description: ''
-help: ''
-import_period: -1
-fetcher: upload
-fetcher_configuration:
-  allowed_extensions: 'txt csv tsv xml opml'
-  directory: 'public://feeds'
-parser: csv
-parser_configuration:
-  delimiter: ','
-  no_headers: false
-  line_limit: 100
-processor: 'entity:oc_organisation'
-processor_configuration:
-  values:
-    type: client
-  langcode: en
-  insert_new: 1
-  update_existing: 1
-  update_non_existent: _delete
-  skip_hash_check: false
-  authorize: true
-  expire: -1
-  owner_feed_author: false
-  owner_id: 0
-custom_sources:
-  tags:
-    value: Tags
-    label: Tags
-    machine_name: tags
-    type: csv
-  name:
-    value: Name
-    label: Name
-    machine_name: name
-    type: csv
-  umbrella_client:
-    value: 'Umbrella Client'
-    label: 'Umbrella Client'
-    machine_name: umbrella_client
-    type: csv
-  client_type:
-    value: 'Client type'
-    label: 'Client type'
-    machine_name: client_type
-    type: csv
-  client_subtype:
-    value: 'Client subtype'
-    label: 'Client subtype'
-    machine_name: client_subtype
-    type: csv
-  umbrella_client_2:
-    value: 'Umbrella client'
-    label: 'Umbrella client'
-    machine_name: umbrella_client_2
-    type: csv
-mappings:
-  -
-    target: field_tags
-    map:
-      target_id: tags
-    settings:
-      language: ''
-      reference_by: name
-      autocreate: '1'
-  -
-    target: name
-    map:
-      value: name
-    settings: {  }
-    unique: {  }
-  -
-    target: field_umbrella_client
-    map:
-      target_id: umbrella_client_2
-    settings:
-      language: ''
-      reference_by: id
-      feeds_item: guid
-      autocreate: 0
-  -
-    target: field_client_type
-    map:
-      target_id: client_type
-    settings:
-      language: ''
-      reference_by: name
-      autocreate: '1'
-  -
-    target: field_client_subtype
-    map:
-      target_id: client_subtype
-    settings:
-      language: ''
-      reference_by: name
-      autocreate: '1'
diff --git a/config/optional/feeds.feed_type.csv_fee_categories_and_fees.yml b/config/optional/feeds.feed_type.csv_fee_categories_and_fees.yml
deleted file mode 100644
index 652ffb9..0000000
--- a/config/optional/feeds.feed_type.csv_fee_categories_and_fees.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-uuid: 8e347001-5784-40b1-b6e1-3ff3b8773dd3
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_cases.oc_case_fee_type.project_fee
-  module:
-    - opencase_cases
-label: 'CSV Fee Categories and Fees'
-id: csv_fee_categories_and_fees
-description: ''
-help: ''
-import_period: -1
-fetcher: upload
-fetcher_configuration:
-  allowed_extensions: 'txt csv tsv xml opml'
-  directory: 'private://feeds'
-parser: csv
-parser_configuration:
-  delimiter: ','
-  no_headers: false
-  line_limit: 100
-processor: 'entity:oc_case_fee'
-processor_configuration:
-  values:
-    type: project_fee
-  langcode: en
-  insert_new: 1
-  update_existing: 0
-  update_non_existent: _keep
-  skip_hash_check: false
-  authorize: true
-  expire: -1
-  owner_feed_author: false
-  owner_id: 0
-custom_sources:
-  fee_category:
-    value: 'FEE CATEGORY'
-    label: 'FEE CATEGORY'
-    machine_name: fee_category
-    type: csv
-  fee_amount:
-    value: 'FEE AMOUNT'
-    label: 'FEE AMOUNT'
-    machine_name: fee_amount
-    type: csv
-  project:
-    value: PROJECT
-    label: PROJECT
-    machine_name: project
-    type: csv
-  name:
-    value: NAME
-    label: NAME
-    machine_name: name
-    type: csv
-mappings:
-  -
-    target: oc_fee_category
-    map:
-      target_id: fee_category
-    settings:
-      language: null
-      reference_by: name
-      autocreate: false
-  -
-    target: amount
-    map:
-      value: fee_amount
-    settings: {  }
-    unique: {  }
-  -
-    target: oc_case
-    map:
-      target_id: project
-    settings:
-      language: null
-      reference_by: name
-      autocreate: false
-      feeds_item: false
-  -
-    target: name
-    map:
-      value: name
-    settings: {  }
-    unique: {  }
diff --git a/config/optional/feeds.feed_type.csv_projects.yml b/config/optional/feeds.feed_type.csv_projects.yml
deleted file mode 100644
index e47c0ae..0000000
--- a/config/optional/feeds.feed_type.csv_projects.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-uuid: 598b7583-02ff-4797-8613-7f182cd5c951
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.article
-  module:
-    - node
-label: 'CSV Projects'
-id: csv_projects
-description: ''
-help: ''
-import_period: 3600
-fetcher: upload
-fetcher_configuration:
-  allowed_extensions: 'txt csv tsv xml opml'
-  directory: 'private://feeds'
-parser: syndication
-parser_configuration: {  }
-processor: 'entity:node'
-processor_configuration:
-  values:
-    type: article
-  langcode: en
-  insert_new: 1
-  update_existing: 0
-  update_non_existent: _delete
-  skip_hash_check: false
-  authorize: true
-  expire: -1
-  owner_feed_author: false
-  owner_id: 0
-custom_sources: {  }
-mappings: {  }
diff --git a/config/optional/feeds.feed_type.csv_training_entities.yml b/config/optional/feeds.feed_type.csv_training_entities.yml
deleted file mode 100644
index 545ca3d..0000000
--- a/config/optional/feeds.feed_type.csv_training_entities.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-uuid: fcae341e-1c7d-4a25-8cd5-dfc78d13a941
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_case.training.field_date_of_training
-    - field.field.oc_case.training.field_number_of_participants
-    - field.field.oc_case.training.field_training_type
-    - opencase_cases.oc_case_type.training
-  module:
-    - opencase_cases
-label: 'CSV Training entities'
-id: csv_training_entities
-description: ''
-help: ''
-import_period: 0
-fetcher: upload
-fetcher_configuration:
-  allowed_extensions: 'txt csv tsv xml opml'
-  directory: 'private://feeds'
-parser: csv
-parser_configuration:
-  delimiter: ','
-  no_headers: false
-  line_limit: 100
-processor: 'entity:oc_case'
-processor_configuration:
-  values:
-    type: training
-  langcode: en
-  insert_new: 1
-  update_existing: 0
-  update_non_existent: _delete
-  skip_hash_check: false
-  authorize: true
-  expire: -1
-  owner_feed_author: false
-  owner_id: 0
-custom_sources:
-  client:
-    value: CLIENT
-    label: CLIENT
-    machine_name: client
-    type: csv
-  training_name:
-    value: 'TRAINING NAME'
-    label: 'TRAINING NAME'
-    machine_name: training_name
-    type: csv
-  training_type:
-    value: 'TRAINING TYPE'
-    label: 'TRAINING TYPE'
-    machine_name: training_type
-    type: csv
-  date_of_training:
-    value: 'DATE OF TRAINING'
-    label: 'DATE OF TRAINING'
-    machine_name: date_of_training
-    type: csv
-  number_of_participants:
-    value: 'NUMBER OF PARTICIPANTS'
-    label: 'NUMBER OF PARTICIPANTS'
-    machine_name: number_of_participants
-    type: csv
-  notes:
-    value: NOTES
-    label: NOTES
-    machine_name: notes
-    type: csv
-mappings:
-  -
-    target: client
-    map:
-      target_id: client
-    settings:
-      language: null
-      reference_by: name
-      autocreate: false
-      feeds_item: false
-  -
-    target: name
-    map:
-      value: training_name
-    settings: {  }
-    unique: {  }
-  -
-    target: field_training_type
-    map:
-      value: training_type
-    settings:
-      language: null
-  -
-    target: field_date_of_training
-    map:
-      value: date_of_training
-    settings:
-      language: null
-      timezone: UTC
-  -
-    target: field_number_of_participants
-    map:
-      value: number_of_participants
-    settings:
-      language: null
-    unique: {  }
-  -
-    target: notes
-    map:
-      value: notes
-    settings: {  }
diff --git a/config/optional/feeds.feed_type.csv_umbrella_client.yml b/config/optional/feeds.feed_type.csv_umbrella_client.yml
deleted file mode 100644
index 51db22d..0000000
--- a/config/optional/feeds.feed_type.csv_umbrella_client.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-uuid: 17ebbce1-9756-400f-a58a-65b765f00813
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_organisation.umbrella_client.field_type_of_umbrella_client
-    - opencase_entities.oc_organisation_type.umbrella_client
-  module:
-    - opencase_entities
-label: 'CSV Umbrella Clients'
-id: csv_umbrella_client
-description: ''
-help: ''
-import_period: -1
-fetcher: upload
-fetcher_configuration:
-  allowed_extensions: 'txt csv tsv xml opml'
-  directory: 'public://feeds'
-parser: csv
-parser_configuration:
-  delimiter: ','
-  no_headers: false
-  line_limit: 100
-processor: 'entity:oc_organisation'
-processor_configuration:
-  values:
-    type: umbrella_client
-  langcode: en
-  insert_new: 1
-  update_existing: 0
-  update_non_existent: _delete
-  skip_hash_check: false
-  authorize: true
-  expire: -1
-  owner_feed_author: false
-  owner_id: 0
-custom_sources:
-  name:
-    value: name
-    label: name
-    machine_name: name
-    type: csv
-  field_type_of_umbrella_client:
-    value: field_type_of_umbrella_client
-    label: field_type_of_umbrella_client
-    machine_name: field_type_of_umbrella_client
-    type: csv
-  contact_name:
-    value: contact_name
-    label: contact_name
-    machine_name: contact_name
-    type: csv
-mappings:
-  -
-    target: name
-    map:
-      value: name
-    settings: {  }
-    unique:
-      value: '1'
-  -
-    target: field_type_of_umbrella_client
-    map:
-      value: field_type_of_umbrella_client
-    settings:
-      language: null
-  -
-    target: contact_name
-    map:
-      value: contact_name
-    settings: {  }
-    unique: {  }
diff --git a/config/optional/feeds.feed_type.trainers.yml b/config/optional/feeds.feed_type.trainers.yml
deleted file mode 100644
index ac1eae8..0000000
--- a/config/optional/feeds.feed_type.trainers.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-uuid: ad3e47c2-2f4b-46d5-9107-86192040fead
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_actor_type.trainer
-  module:
-    - opencase_entities
-label: 'CSV Trainers'
-id: trainers
-description: ''
-help: ''
-import_period: -1
-fetcher: http
-fetcher_configuration:
-  auto_detect_feeds: false
-  use_pubsubhubbub: false
-  always_download: false
-  fallback_hub: ''
-  request_timeout: 30
-parser: csv
-parser_configuration:
-  delimiter: ','
-  no_headers: false
-  line_limit: 100
-processor: 'entity:oc_actor'
-processor_configuration:
-  values:
-    type: trainer
-  langcode: en
-  insert_new: 1
-  update_existing: 0
-  update_non_existent: _delete
-  skip_hash_check: false
-  authorize: true
-  expire: -1
-  owner_feed_author: false
-  owner_id: 0
-custom_sources: {  }
-mappings: {  }
diff --git a/config/optional/field.field.block_content.basic.body.yml b/config/optional/field.field.block_content.basic.body.yml
index e428d34..e8014ac 100644
--- a/config/optional/field.field.block_content.basic.body.yml
+++ b/config/optional/field.field.block_content.basic.body.yml
@@ -1,4 +1,4 @@
-uuid: 089fa13e-f8d3-4ba3-a596-6233a4deb19f
+uuid: 01e741a3-8f64-4f58-8c45-af56ad94c786
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/field.field.comment.comment.comment_body.yml b/config/optional/field.field.comment.comment.comment_body.yml
index 8978cf8..fb6a7ce 100644
--- a/config/optional/field.field.comment.comment.comment_body.yml
+++ b/config/optional/field.field.comment.comment.comment_body.yml
@@ -1,4 +1,4 @@
-uuid: af11adfb-ac0f-4fb8-bc58-de59ab11929e
+uuid: 20ad8b80-b7c6-4867-8bda-611f03a4afe9
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/field.field.node.article.body.yml b/config/optional/field.field.node.article.body.yml
index 1d0a689..4c86115 100644
--- a/config/optional/field.field.node.article.body.yml
+++ b/config/optional/field.field.node.article.body.yml
@@ -1,4 +1,4 @@
-uuid: ceb6c8c4-1317-4705-a352-20e9cd32490a
+uuid: 1c34d32f-a7a8-4c5e-8941-1610c6f11533
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/field.field.node.article.comment.yml b/config/optional/field.field.node.article.comment.yml
index 323de49..5ab2b37 100644
--- a/config/optional/field.field.node.article.comment.yml
+++ b/config/optional/field.field.node.article.comment.yml
@@ -1,4 +1,4 @@
-uuid: 9b136603-6fca-4bdb-9225-1f8a59062431
+uuid: f44a217b-2fec-47d0-af19-fee067282f6e
 langcode: en
 status: true
 dependencies:
@@ -8,7 +8,7 @@ dependencies:
   module:
     - comment
 _core:
-  default_config_hash: r-hrxwbKKXBKQnBefGjXNSdU00u2fPvMWEykGRHqd10
+  default_config_hash: UqXlkKC4v2-bDfWx4zcXQrD5YIi3d5byENEmWv-G_Uc
 id: node.article.comment
 field_name: comment
 entity_type: node
diff --git a/config/optional/field.field.node.article.feeds_item.yml b/config/optional/field.field.node.article.feeds_item.yml
deleted file mode 100644
index 13b9eac..0000000
--- a/config/optional/field.field.node.article.feeds_item.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 8ea56c44-d41d-4b54-8e94-3436d9a0bfed
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.feeds_item
-    - node.type.article
-  module:
-    - feeds
-id: node.article.feeds_item
-field_name: feeds_item
-entity_type: node
-bundle: article
-label: 'Feeds item'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:feeds_feed'
-  handler_settings: {  }
-field_type: feeds_item
diff --git a/config/optional/field.field.node.article.field_image.yml b/config/optional/field.field.node.article.field_image.yml
index 665f189..f321062 100644
--- a/config/optional/field.field.node.article.field_image.yml
+++ b/config/optional/field.field.node.article.field_image.yml
@@ -1,4 +1,4 @@
-uuid: 8d5f9418-28fd-4002-b811-1971d772ef28
+uuid: 20266ecb-59ac-44e6-92e9-38e14dff6f40
 langcode: en
 status: true
 dependencies:
@@ -8,7 +8,7 @@ dependencies:
   module:
     - image
 _core:
-  default_config_hash: tgJzhA7Swh4M_gWU5FwFe5lPxPj5rebpMbvhpdNrERs
+  default_config_hash: PmVL51L3A9QGbPLoeLHw5epAPszeZRasCeC3imeeDRQ
 id: node.article.field_image
 field_name: field_image
 entity_type: node
diff --git a/config/optional/field.field.node.article.field_tags.yml b/config/optional/field.field.node.article.field_tags.yml
index cb19ac7..c490dce 100644
--- a/config/optional/field.field.node.article.field_tags.yml
+++ b/config/optional/field.field.node.article.field_tags.yml
@@ -1,4 +1,4 @@
-uuid: c26a8427-dc39-4c80-a4aa-f3cd1593a760
+uuid: a1afb5f9-a4ac-456b-9ac1-a704cb68a3be
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/field.field.node.page.body.yml b/config/optional/field.field.node.page.body.yml
index 4c53479..1e1bef8 100644
--- a/config/optional/field.field.node.page.body.yml
+++ b/config/optional/field.field.node.page.body.yml
@@ -1,4 +1,4 @@
-uuid: 0d9efe09-d1b9-4df3-87a2-cb96a207250a
+uuid: a261e859-bb5a-4096-a176-65de05d642fb
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/field.field.oc_activity.destitution_funds_provided.field_amount.yml b/config/optional/field.field.oc_activity.destitution_funds_provided.field_amount.yml
new file mode 100644
index 0000000..274ec6a
--- /dev/null
+++ b/config/optional/field.field.oc_activity.destitution_funds_provided.field_amount.yml
@@ -0,0 +1,23 @@
+uuid: a2ce100d-02d5-4675-a29b-b5c8cc343181
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_activity.field_amount
+    - opencase_entities.oc_activity_type.destitution_funds_provided
+id: oc_activity.destitution_funds_provided.field_amount
+field_name: field_amount
+entity_type: oc_activity
+bundle: destitution_funds_provided
+label: Amount
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  min: null
+  max: null
+  prefix: £
+  suffix: ''
+field_type: decimal
diff --git a/config/optional/field.field.oc_activity.destitution_funds_provided.field_funds_for.yml b/config/optional/field.field.oc_activity.destitution_funds_provided.field_funds_for.yml
new file mode 100644
index 0000000..cb98071
--- /dev/null
+++ b/config/optional/field.field.oc_activity.destitution_funds_provided.field_funds_for.yml
@@ -0,0 +1,21 @@
+uuid: 470e9e4a-b6a1-49ee-8f87-4deae14a7156
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_activity.field_funds_for
+    - opencase_entities.oc_activity_type.destitution_funds_provided
+  module:
+    - options
+id: oc_activity.destitution_funds_provided.field_funds_for
+field_name: field_funds_for
+entity_type: oc_activity
+bundle: destitution_funds_provided
+label: For
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_activity.evaluation.field_a.yml b/config/optional/field.field.oc_activity.evaluation.field_a.yml
deleted file mode 100644
index aced191..0000000
--- a/config/optional/field.field.oc_activity.evaluation.field_a.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: e5f3e291-6d06-46fb-8adc-0e4572bee8c9
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_a
-    - opencase_entities.oc_activity_type.evaluation
-  module:
-    - options
-_core:
-  default_config_hash: ObG4utZDeqRoGVb7azoe9tKFOp2zFrmdmmbWHQiyvJ8
-id: oc_activity.evaluation.field_a
-field_name: field_a
-entity_type: oc_activity
-bundle: evaluation
-label: 'After confidence'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_integer
diff --git a/config/optional/field.field.oc_activity.evaluation.field_after_knowledge.yml b/config/optional/field.field.oc_activity.evaluation.field_after_knowledge.yml
deleted file mode 100644
index c609be9..0000000
--- a/config/optional/field.field.oc_activity.evaluation.field_after_knowledge.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 52d4decc-8b05-4a4e-85c8-3c66078e7208
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_after_knowledge
-    - opencase_entities.oc_activity_type.evaluation
-  module:
-    - options
-_core:
-  default_config_hash: Lb-0Gi0cCh8UYTN9g64VIiQjbwiFlHNCT1vKKNWdbvo
-id: oc_activity.evaluation.field_after_knowledge
-field_name: field_after_knowledge
-entity_type: oc_activity
-bundle: evaluation
-label: 'After knowledge'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_integer
diff --git a/config/optional/field.field.oc_activity.evaluation.field_after_skills.yml b/config/optional/field.field.oc_activity.evaluation.field_after_skills.yml
deleted file mode 100644
index 7338b2a..0000000
--- a/config/optional/field.field.oc_activity.evaluation.field_after_skills.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: cadb4700-45c7-4822-9230-d05f7b2a0f76
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_after_skills
-    - opencase_entities.oc_activity_type.evaluation
-  module:
-    - options
-_core:
-  default_config_hash: mvH1iCvl943LttBysgZhTpOt7fFDowzg2FvgoS72kac
-id: oc_activity.evaluation.field_after_skills
-field_name: field_after_skills
-entity_type: oc_activity
-bundle: evaluation
-label: 'After skills'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_integer
diff --git a/config/optional/field.field.oc_activity.evaluation.field_age.yml b/config/optional/field.field.oc_activity.evaluation.field_age.yml
deleted file mode 100644
index b60e21c..0000000
--- a/config/optional/field.field.oc_activity.evaluation.field_age.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 7b05a30a-2e49-43cc-89a6-0ec24bffec16
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_age
-    - opencase_entities.oc_activity_type.evaluation
-  module:
-    - options
-_core:
-  default_config_hash: lVBdCpScFneU3j_DT5fLqDGeX1clEbASSN7G4xJb1Ts
-id: oc_activity.evaluation.field_age
-field_name: field_age
-entity_type: oc_activity
-bundle: evaluation
-label: Age
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_string
diff --git a/config/optional/field.field.oc_activity.evaluation.field_b.yml b/config/optional/field.field.oc_activity.evaluation.field_b.yml
deleted file mode 100644
index 2593919..0000000
--- a/config/optional/field.field.oc_activity.evaluation.field_b.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 3dbed408-4f61-48cb-a11e-970aa272cd4e
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_b
-    - opencase_entities.oc_activity_type.evaluation
-  module:
-    - options
-_core:
-  default_config_hash: 9r7nVDcx15YRH44G85jhDmjBa36Ng5NYKz97T6UcLeo
-id: oc_activity.evaluation.field_b
-field_name: field_b
-entity_type: oc_activity
-bundle: evaluation
-label: 'Before knowledge'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_integer
diff --git a/config/optional/field.field.oc_activity.evaluation.field_before_confidence.yml b/config/optional/field.field.oc_activity.evaluation.field_before_confidence.yml
deleted file mode 100644
index 1558526..0000000
--- a/config/optional/field.field.oc_activity.evaluation.field_before_confidence.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 5e1c3b5f-f173-4c95-afdf-d6a9629914d1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_before_confidence
-    - opencase_entities.oc_activity_type.evaluation
-  module:
-    - options
-_core:
-  default_config_hash: zEGhDQsYPFONNLeH-7n__llZLSA7HTC_8SPy6fPb1X8
-id: oc_activity.evaluation.field_before_confidence
-field_name: field_before_confidence
-entity_type: oc_activity
-bundle: evaluation
-label: 'Before confidence'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_integer
diff --git a/config/optional/field.field.oc_activity.evaluation.field_before_skills.yml b/config/optional/field.field.oc_activity.evaluation.field_before_skills.yml
deleted file mode 100644
index 626ba94..0000000
--- a/config/optional/field.field.oc_activity.evaluation.field_before_skills.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 4ea0c624-acd1-4699-aa65-77a6c832543c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_before_skills
-    - opencase_entities.oc_activity_type.evaluation
-  module:
-    - options
-_core:
-  default_config_hash: FuqOYa1vpnuKpHEZRjV7zA1TJgDsDbroLbORcF6jT08
-id: oc_activity.evaluation.field_before_skills
-field_name: field_before_skills
-entity_type: oc_activity
-bundle: evaluation
-label: 'Before skills'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_integer
diff --git a/config/optional/field.field.oc_activity.evaluation.field_d.yml b/config/optional/field.field.oc_activity.evaluation.field_d.yml
deleted file mode 100644
index bfb5690..0000000
--- a/config/optional/field.field.oc_activity.evaluation.field_d.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 0abb2b6f-9bc0-42d7-b19b-2b7b2e1a306d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_d
-    - opencase_entities.oc_activity_type.evaluation
-  module:
-    - options
-_core:
-  default_config_hash: vJIwUGF9_r7WdhatA9WrPStuROQ_5-qWOR1yYufFoNg
-id: oc_activity.evaluation.field_d
-field_name: field_d
-entity_type: oc_activity
-bundle: evaluation
-label: 'Data sharing'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_string
diff --git a/config/optional/field.field.oc_activity.evaluation.field_ease.yml b/config/optional/field.field.oc_activity.evaluation.field_ease.yml
deleted file mode 100644
index 350e404..0000000
--- a/config/optional/field.field.oc_activity.evaluation.field_ease.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 6cb52dad-9da3-460e-a8bf-a2ba4c26a09c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_ease
-    - opencase_entities.oc_activity_type.evaluation
-  module:
-    - options
-_core:
-  default_config_hash: 8vsMC-k1cE2I5nvHUWnjBmGE5T09TNT1VuGsT4ZZME8
-id: oc_activity.evaluation.field_ease
-field_name: field_ease
-entity_type: oc_activity
-bundle: evaluation
-label: Ease
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_integer
diff --git a/config/optional/field.field.oc_activity.evaluation.field_gender.yml b/config/optional/field.field.oc_activity.evaluation.field_gender.yml
deleted file mode 100644
index d867391..0000000
--- a/config/optional/field.field.oc_activity.evaluation.field_gender.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: b513a929-2571-4209-aa8d-099d442aef43
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_gender
-    - opencase_entities.oc_activity_type.evaluation
-  module:
-    - options
-_core:
-  default_config_hash: rudaFjlQTw-s91c-5C1k0eVyLz9Of5rZ-P4Hb5Mew7s
-id: oc_activity.evaluation.field_gender
-field_name: field_gender
-entity_type: oc_activity
-bundle: evaluation
-label: Gender
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_string
diff --git a/config/optional/field.field.oc_activity.evaluation.field_relevance.yml b/config/optional/field.field.oc_activity.evaluation.field_relevance.yml
deleted file mode 100644
index 9d79d32..0000000
--- a/config/optional/field.field.oc_activity.evaluation.field_relevance.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: b659ac2f-ad92-420a-a89b-099349da7e78
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_relevance
-    - opencase_entities.oc_activity_type.evaluation
-  module:
-    - options
-_core:
-  default_config_hash: 5yhVV6XSB6BOFPYTuqz02tjItEnz5QRwlEy9kSyeU_0
-id: oc_activity.evaluation.field_relevance
-field_name: field_relevance
-entity_type: oc_activity
-bundle: evaluation
-label: Relevance
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_integer
diff --git a/config/optional/field.field.oc_activity.trainer_debrief.field_caption_for_photo.yml b/config/optional/field.field.oc_activity.trainer_debrief.field_caption_for_photo.yml
deleted file mode 100644
index f214773..0000000
--- a/config/optional/field.field.oc_activity.trainer_debrief.field_caption_for_photo.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-uuid: b9f11c90-860d-473c-bbb7-485742ca4cff
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_caption_for_photo
-    - opencase_entities.oc_activity_type.trainer_debrief
-id: oc_activity.trainer_debrief.field_caption_for_photo
-field_name: field_caption_for_photo
-entity_type: oc_activity
-bundle: trainer_debrief
-label: 'Caption for photo'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string_long
diff --git a/config/optional/field.field.oc_activity.trainer_debrief.field_issues_and_difficulties.yml b/config/optional/field.field.oc_activity.trainer_debrief.field_issues_and_difficulties.yml
deleted file mode 100644
index b46b29e..0000000
--- a/config/optional/field.field.oc_activity.trainer_debrief.field_issues_and_difficulties.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-uuid: fca7a779-4562-4fd1-9bef-fa6725128fa8
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_issues_and_difficulties
-    - opencase_entities.oc_activity_type.trainer_debrief
-id: oc_activity.trainer_debrief.field_issues_and_difficulties
-field_name: field_issues_and_difficulties
-entity_type: oc_activity
-bundle: trainer_debrief
-label: 'Technical difficulties or issues with the material'
-description: 'Please describe any technical difficulties or issues that you or the participants had, or anything in the materials which needs editing'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string_long
diff --git a/config/optional/field.field.oc_activity.trainer_debrief.field_issues_with_group_dynamics.yml b/config/optional/field.field.oc_activity.trainer_debrief.field_issues_with_group_dynamics.yml
deleted file mode 100644
index 7eecacc..0000000
--- a/config/optional/field.field.oc_activity.trainer_debrief.field_issues_with_group_dynamics.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-uuid: d63e0dcd-ef29-418c-9620-26201e680cd8
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_issues_with_group_dynamics
-    - opencase_entities.oc_activity_type.trainer_debrief
-id: oc_activity.trainer_debrief.field_issues_with_group_dynamics
-field_name: field_issues_with_group_dynamics
-entity_type: oc_activity
-bundle: trainer_debrief
-label: 'Issues with group dynamics'
-description: "Please describe any issues with group dynamics\r\n"
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string_long
diff --git a/config/optional/field.field.oc_activity.trainer_debrief.field_number_of_participants.yml b/config/optional/field.field.oc_activity.trainer_debrief.field_number_of_participants.yml
deleted file mode 100644
index 5a0dd9b..0000000
--- a/config/optional/field.field.oc_activity.trainer_debrief.field_number_of_participants.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 07604b32-7f73-473d-8981-45633f2ab4c1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_number_of_participants
-    - opencase_entities.oc_activity_type.trainer_debrief
-id: oc_activity.trainer_debrief.field_number_of_participants
-field_name: field_number_of_participants
-entity_type: oc_activity
-bundle: trainer_debrief
-label: 'Number of participants'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: ''
-  suffix: ''
-field_type: integer
diff --git a/config/optional/field.field.oc_activity.trainer_debrief.field_photo.yml b/config/optional/field.field.oc_activity.trainer_debrief.field_photo.yml
deleted file mode 100644
index fe39113..0000000
--- a/config/optional/field.field.oc_activity.trainer_debrief.field_photo.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-uuid: 920c5a83-262d-4ed3-8859-b5bb63c0097f
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_photo
-    - opencase_entities.oc_activity_type.trainer_debrief
-  module:
-    - image
-id: oc_activity.trainer_debrief.field_photo
-field_name: field_photo
-entity_type: oc_activity
-bundle: trainer_debrief
-label: Photo
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:file'
-  handler_settings: {  }
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'png gif jpg jpeg'
-  max_filesize: ''
-  max_resolution: ''
-  min_resolution: ''
-  alt_field: false
-  alt_field_required: false
-  title_field: true
-  title_field_required: true
-  default_image:
-    uuid: ''
-    alt: ''
-    title: ''
-    width: null
-    height: null
-field_type: image
diff --git a/config/optional/field.field.oc_activity.trainer_debrief.field_what_came_up_for_the_group.yml b/config/optional/field.field.oc_activity.trainer_debrief.field_what_came_up_for_the_group.yml
deleted file mode 100644
index 5cd7683..0000000
--- a/config/optional/field.field.oc_activity.trainer_debrief.field_what_came_up_for_the_group.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-uuid: 1a6bb37b-fa8d-4a8a-80e3-463e5ede729f
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_what_came_up_for_the_group
-    - opencase_entities.oc_activity_type.trainer_debrief
-id: oc_activity.trainer_debrief.field_what_came_up_for_the_group
-field_name: field_what_came_up_for_the_group
-entity_type: oc_activity
-bundle: trainer_debrief
-label: 'What came up for the group?'
-description: 'e.g. Any particular myths, how strongly held, what challenges to myths did or didn''t work'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string_long
diff --git a/config/optional/field.field.oc_activity.trainer_debrief.field_what_could_be_improved_for.yml b/config/optional/field.field.oc_activity.trainer_debrief.field_what_could_be_improved_for.yml
deleted file mode 100644
index 83146a7..0000000
--- a/config/optional/field.field.oc_activity.trainer_debrief.field_what_could_be_improved_for.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-uuid: 0a0a1c9d-071f-4614-aa9f-95d405a017dc
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_what_could_be_improved_for
-    - opencase_entities.oc_activity_type.trainer_debrief
-id: oc_activity.trainer_debrief.field_what_could_be_improved_for
-field_name: field_what_could_be_improved_for
-entity_type: oc_activity
-bundle: trainer_debrief
-label: 'What could be improved for next time?'
-description: 'Answer for yourself and for others!'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string_long
diff --git a/config/optional/field.field.oc_activity.trainer_debrief.field_what_did_facilitators_do_w.yml b/config/optional/field.field.oc_activity.trainer_debrief.field_what_did_facilitators_do_w.yml
deleted file mode 100644
index 291e139..0000000
--- a/config/optional/field.field.oc_activity.trainer_debrief.field_what_did_facilitators_do_w.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-uuid: 7bd4dfc8-1dd9-4b49-afe6-395bfeca5f40
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_what_did_facilitators_do_w
-    - opencase_entities.oc_activity_type.trainer_debrief
-id: oc_activity.trainer_debrief.field_what_did_facilitators_do_w
-field_name: field_what_did_facilitators_do_w
-entity_type: oc_activity
-bundle: trainer_debrief
-label: 'What did facilitators do well in this session?'
-description: 'Answer for yourself and others'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string_long
diff --git a/config/optional/field.field.oc_activity.trainer_debrief.field_what_real_scenarios_or_inc.yml b/config/optional/field.field.oc_activity.trainer_debrief.field_what_real_scenarios_or_inc.yml
deleted file mode 100644
index 46654b1..0000000
--- a/config/optional/field.field.oc_activity.trainer_debrief.field_what_real_scenarios_or_inc.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-uuid: 1d31d400-f439-49e7-b2d5-4c8d82425f1f
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_what_real_scenarios_or_inc
-    - opencase_entities.oc_activity_type.trainer_debrief
-id: oc_activity.trainer_debrief.field_what_real_scenarios_or_inc
-field_name: field_what_real_scenarios_or_inc
-entity_type: oc_activity
-bundle: trainer_debrief
-label: 'What real scenarios or incidents were mentioned?'
-description: 'Anonymise for training content, research and materials!'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string_long
diff --git a/config/optional/field.field.oc_actor.client.field_asylum_status.yml b/config/optional/field.field.oc_actor.client.field_asylum_status.yml
new file mode 100644
index 0000000..14b6649
--- /dev/null
+++ b/config/optional/field.field.oc_actor.client.field_asylum_status.yml
@@ -0,0 +1,21 @@
+uuid: 17dcbde5-8100-408e-9364-c2483a03a465
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_asylum_status
+    - opencase_entities.oc_actor_type.client
+  module:
+    - options
+id: oc_actor.client.field_asylum_status
+field_name: field_asylum_status
+entity_type: oc_actor
+bundle: client
+label: 'Asylum status'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_actor.client.field_confidentiality_form.yml b/config/optional/field.field.oc_actor.client.field_confidentiality_form.yml
new file mode 100644
index 0000000..1113f2a
--- /dev/null
+++ b/config/optional/field.field.oc_actor.client.field_confidentiality_form.yml
@@ -0,0 +1,27 @@
+uuid: e527191c-447e-4b84-b6ed-ba950a08ff00
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_confidentiality_form
+    - opencase_entities.oc_actor_type.client
+  module:
+    - file
+id: oc_actor.client.field_confidentiality_form
+field_name: field_confidentiality_form
+entity_type: oc_actor
+bundle: client
+label: 'Confidentiality Form'
+description: 'Data protection/confidentiality/complaints form signed and uploaded'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:file'
+  handler_settings: {  }
+  file_directory: '[date:custom:Y]-[date:custom:m]'
+  file_extensions: pdf
+  max_filesize: '2 MB'
+  description_field: false
+field_type: file
diff --git a/config/optional/field.field.oc_actor.client.field_date_of_birth.yml b/config/optional/field.field.oc_actor.client.field_date_of_birth.yml
new file mode 100644
index 0000000..d11c7ee
--- /dev/null
+++ b/config/optional/field.field.oc_actor.client.field_date_of_birth.yml
@@ -0,0 +1,21 @@
+uuid: 20dc980c-2b57-4973-8b79-c44b1455dbee
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_date_of_birth
+    - opencase_entities.oc_actor_type.client
+  module:
+    - datetime
+id: oc_actor.client.field_date_of_birth
+field_name: field_date_of_birth
+entity_type: oc_actor
+bundle: client
+label: 'Date of birth'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: datetime
diff --git a/config/optional/field.field.oc_actor.client.field_dependants.yml b/config/optional/field.field.oc_actor.client.field_dependants.yml
new file mode 100644
index 0000000..ce265c7
--- /dev/null
+++ b/config/optional/field.field.oc_actor.client.field_dependants.yml
@@ -0,0 +1,19 @@
+uuid: 97ff9075-c988-41ab-849e-538f25dcbaf6
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_dependants
+    - opencase_entities.oc_actor_type.client
+id: oc_actor.client.field_dependants
+field_name: field_dependants
+entity_type: oc_actor
+bundle: client
+label: Dependants
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/config/optional/field.field.oc_actor.client.field_disability.yml b/config/optional/field.field.oc_actor.client.field_disability.yml
new file mode 100644
index 0000000..6a8c7d1
--- /dev/null
+++ b/config/optional/field.field.oc_actor.client.field_disability.yml
@@ -0,0 +1,19 @@
+uuid: cda7c4ec-59cf-4078-81c9-8a4be2b98db0
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_disability
+    - opencase_entities.oc_actor_type.client
+id: oc_actor.client.field_disability
+field_name: field_disability
+entity_type: oc_actor
+bundle: client
+label: Disability
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/config/optional/field.field.oc_actor.client.field_ethnic_o.yml b/config/optional/field.field.oc_actor.client.field_ethnic_o.yml
new file mode 100644
index 0000000..4cfc3e8
--- /dev/null
+++ b/config/optional/field.field.oc_actor.client.field_ethnic_o.yml
@@ -0,0 +1,19 @@
+uuid: 1b833c39-43d9-4b55-9b2b-1616a1387c98
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_ethnic_o
+    - opencase_entities.oc_actor_type.client
+id: oc_actor.client.field_ethnic_o
+field_name: field_ethnic_o
+entity_type: oc_actor
+bundle: client
+label: 'Ethnic origin'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/config/optional/field.field.oc_actor.client.field_gender_identified_with.yml b/config/optional/field.field.oc_actor.client.field_gender_identified_with.yml
new file mode 100644
index 0000000..9c952d5
--- /dev/null
+++ b/config/optional/field.field.oc_actor.client.field_gender_identified_with.yml
@@ -0,0 +1,21 @@
+uuid: 4567518c-f87d-4c9c-b018-af52fa5cd16d
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_gender_identified_with
+    - opencase_entities.oc_actor_type.client
+  module:
+    - options
+id: oc_actor.client.field_gender_identified_with
+field_name: field_gender_identified_with
+entity_type: oc_actor
+bundle: client
+label: 'Gender identified with'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_actor.client.field_general_noes.yml b/config/optional/field.field.oc_actor.client.field_general_noes.yml
new file mode 100644
index 0000000..aca1665
--- /dev/null
+++ b/config/optional/field.field.oc_actor.client.field_general_noes.yml
@@ -0,0 +1,19 @@
+uuid: 78ab875e-8992-4f07-9ff2-759a2dad285a
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_general_noes
+    - opencase_entities.oc_actor_type.client
+id: oc_actor.client.field_general_noes
+field_name: field_general_noes
+entity_type: oc_actor
+bundle: client
+label: 'General notes'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string_long
diff --git a/config/optional/field.field.oc_actor.client.field_how_heard.yml b/config/optional/field.field.oc_actor.client.field_how_heard.yml
new file mode 100644
index 0000000..5cef8cf
--- /dev/null
+++ b/config/optional/field.field.oc_actor.client.field_how_heard.yml
@@ -0,0 +1,21 @@
+uuid: 7cfa74cf-3f57-4fb1-8e66-50026564cbcd
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_how_heard
+    - opencase_entities.oc_actor_type.client
+  module:
+    - options
+id: oc_actor.client.field_how_heard
+field_name: field_how_heard
+entity_type: oc_actor
+bundle: client
+label: 'How did you hear about the service?'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_actor.client.field_income.yml b/config/optional/field.field.oc_actor.client.field_income.yml
new file mode 100644
index 0000000..a6a1cf0
--- /dev/null
+++ b/config/optional/field.field.oc_actor.client.field_income.yml
@@ -0,0 +1,21 @@
+uuid: ea266268-610e-4e32-8c98-c611d2a3be3e
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_income
+    - opencase_entities.oc_actor_type.client
+  module:
+    - options
+id: oc_actor.client.field_income
+field_name: field_income
+entity_type: oc_actor
+bundle: client
+label: Income
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_actor.client.field_languages_spoken.yml b/config/optional/field.field.oc_actor.client.field_languages_spoken.yml
new file mode 100644
index 0000000..4906065
--- /dev/null
+++ b/config/optional/field.field.oc_actor.client.field_languages_spoken.yml
@@ -0,0 +1,21 @@
+uuid: 3d1c8306-0dc1-4d1d-b34c-26b406eff61a
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_languages_spoken
+    - opencase_entities.oc_actor_type.client
+  module:
+    - options
+id: oc_actor.client.field_languages_spoken
+field_name: field_languages_spoken
+entity_type: oc_actor
+bundle: client
+label: 'Languages spoken'
+description: 'Hold down <b>Ctrl</b> (or the Mac equivalent) while clicking, and you can select more than one.'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_actor.client.field_marital_.yml b/config/optional/field.field.oc_actor.client.field_marital_.yml
new file mode 100644
index 0000000..8b855f8
--- /dev/null
+++ b/config/optional/field.field.oc_actor.client.field_marital_.yml
@@ -0,0 +1,21 @@
+uuid: 4d92f2ef-e150-4b52-bcc1-1ce5fc7baf0e
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_marital_
+    - opencase_entities.oc_actor_type.client
+  module:
+    - options
+id: oc_actor.client.field_marital_
+field_name: field_marital_
+entity_type: oc_actor
+bundle: client
+label: 'Marital status'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_actor.client.field_nationalities.yml b/config/optional/field.field.oc_actor.client.field_nationalities.yml
new file mode 100644
index 0000000..7e7444f
--- /dev/null
+++ b/config/optional/field.field.oc_actor.client.field_nationalities.yml
@@ -0,0 +1,21 @@
+uuid: 14b80c08-49ba-4dff-a534-ed5a89d87507
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_nationalities
+    - opencase_entities.oc_actor_type.client
+  module:
+    - options
+id: oc_actor.client.field_nationalities
+field_name: field_nationalities
+entity_type: oc_actor
+bundle: client
+label: Nationality
+description: 'To select multiple nationalities, hold down <b>Ctrl</b> (or the Mac equivalent) while clicking.'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_actor.client.field_referred_by.yml b/config/optional/field.field.oc_actor.client.field_referred_by.yml
new file mode 100644
index 0000000..3a4301a
--- /dev/null
+++ b/config/optional/field.field.oc_actor.client.field_referred_by.yml
@@ -0,0 +1,19 @@
+uuid: 717ffd79-07b7-484e-b87c-27670bebcf35
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_referred_by
+    - opencase_entities.oc_actor_type.client
+id: oc_actor.client.field_referred_by
+field_name: field_referred_by
+entity_type: oc_actor
+bundle: client
+label: 'Referred by'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/config/optional/field.field.oc_actor.client.field_sex.yml b/config/optional/field.field.oc_actor.client.field_sex.yml
new file mode 100644
index 0000000..ac2a895
--- /dev/null
+++ b/config/optional/field.field.oc_actor.client.field_sex.yml
@@ -0,0 +1,21 @@
+uuid: 90c1489c-eb64-4a5c-a940-f1feb77cecc0
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_sex
+    - opencase_entities.oc_actor_type.client
+  module:
+    - options
+id: oc_actor.client.field_sex
+field_name: field_sex
+entity_type: oc_actor
+bundle: client
+label: Sex
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_actor.trainer.feeds_item.yml b/config/optional/field.field.oc_actor.trainer.feeds_item.yml
deleted file mode 100644
index 9e61966..0000000
--- a/config/optional/field.field.oc_actor.trainer.feeds_item.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 48212965-7239-40e6-b653-cb162c079816
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_actor.feeds_item
-    - opencase_entities.oc_actor_type.trainer
-  module:
-    - feeds
-id: oc_actor.trainer.feeds_item
-field_name: feeds_item
-entity_type: oc_actor
-bundle: trainer
-label: 'Feeds item'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:feeds_feed'
-  handler_settings: {  }
-field_type: feeds_item
diff --git a/config/optional/field.field.oc_actor.trainer.field_active.yml b/config/optional/field.field.oc_actor.trainer.field_active.yml
deleted file mode 100644
index 707c949..0000000
--- a/config/optional/field.field.oc_actor.trainer.field_active.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: c571d051-afbf-4593-8d8e-436cf655c23d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_actor.field_active
-    - opencase_entities.oc_actor_type.trainer
-id: oc_actor.trainer.field_active
-field_name: field_active
-entity_type: oc_actor
-bundle: trainer
-label: Active
-description: 'Unticking this box means the trainer is not currently active and will not show up when selecting trainers to add to trainings. '
-required: false
-translatable: false
-default_value:
-  -
-    value: 1
-default_value_callback: ''
-settings:
-  on_label: 'Yes'
-  off_label: 'No'
-field_type: boolean
diff --git a/config/optional/field.field.oc_actor.trainer.field_availability.yml b/config/optional/field.field.oc_actor.trainer.field_availability.yml
deleted file mode 100644
index eb0e08d..0000000
--- a/config/optional/field.field.oc_actor.trainer.field_availability.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: 207300c5-457b-4b37-8de7-701b4a22fd73
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_actor.field_availability
-    - opencase_entities.oc_actor_type.trainer
-    - paragraphs.paragraphs_type.availability
-  module:
-    - entity_reference_revisions
-_core:
-  default_config_hash: uQVX8aARc5u4X8cz18ov6naEBIb8yA86LEopEEtLpCc
-id: oc_actor.trainer.field_availability
-field_name: field_availability
-entity_type: oc_actor
-bundle: trainer
-label: Availability
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:paragraph'
-  handler_settings:
-    target_bundles:
-      availability: availability
-    negate: 0
-    target_bundles_drag_drop:
-      availability:
-        weight: 4
-        enabled: true
-      emergency_contact:
-        weight: 5
-        enabled: false
-      trainer:
-        weight: 6
-        enabled: false
-field_type: entity_reference_revisions
diff --git a/config/optional/field.field.oc_actor.trainer.field_delivery_partners.yml b/config/optional/field.field.oc_actor.trainer.field_delivery_partners.yml
deleted file mode 100644
index 8170ca6..0000000
--- a/config/optional/field.field.oc_actor.trainer.field_delivery_partners.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: 22f671d9-baf0-4d5a-bfa3-12a43b317572
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_actor.field_delivery_partners
-    - opencase_entities.oc_actor_type.trainer
-    - opencase_entities.oc_organisation_type.partner_organisation
-_core:
-  default_config_hash: q5QrznzeWFtZ_O9HEx8dlNmO-zlwQEpghpfP2XldKuM
-id: oc_actor.trainer.field_delivery_partners
-field_name: field_delivery_partners
-entity_type: oc_actor
-bundle: trainer
-label: 'Delivery Partners'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:oc_organisation'
-  handler_settings:
-    target_bundles:
-      partner_organisation: partner_organisation
-    sort:
-      field: _none
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/optional/field.field.oc_actor.trainer.field_emergency_contact.yml b/config/optional/field.field.oc_actor.trainer.field_emergency_contact.yml
deleted file mode 100644
index 05504aa..0000000
--- a/config/optional/field.field.oc_actor.trainer.field_emergency_contact.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-uuid: 12875525-a26c-4e94-a58f-1a87d274e8a1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_actor.field_emergency_contact
-    - opencase_entities.oc_actor_type.trainer
-    - paragraphs.paragraphs_type.emergency_contact
-  module:
-    - entity_reference_revisions
-_core:
-  default_config_hash: HBybBu74EjoqpQirTndvbeLGGVThxd2-dP9Rf0ugKvM
-id: oc_actor.trainer.field_emergency_contact
-field_name: field_emergency_contact
-entity_type: oc_actor
-bundle: trainer
-label: 'Emergency Contact'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:paragraph'
-  handler_settings:
-    target_bundles:
-      emergency_contact: emergency_contact
-    negate: 0
-    target_bundles_drag_drop:
-      availability:
-        weight: 6
-        enabled: false
-      emergency_contact:
-        weight: 3
-        enabled: true
-      equal_opportunities:
-        weight: 5
-        enabled: false
-      trainer:
-        weight: 4
-        enabled: false
-field_type: entity_reference_revisions
diff --git a/config/optional/field.field.oc_actor.trainer.field_languages_spoken_fluently.yml b/config/optional/field.field.oc_actor.trainer.field_languages_spoken_fluently.yml
deleted file mode 100644
index fa03a3e..0000000
--- a/config/optional/field.field.oc_actor.trainer.field_languages_spoken_fluently.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 6d23fd86-5270-4497-8c2b-9f2235977d01
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_actor.field_languages_spoken_fluently
-    - opencase_entities.oc_actor_type.trainer
-  module:
-    - options
-_core:
-  default_config_hash: 2WATBem9tnVvtOg0Eq8S0gTnPMUzBKsxZ1STClyDOVk
-id: oc_actor.trainer.field_languages_spoken_fluently
-field_name: field_languages_spoken_fluently
-entity_type: oc_actor
-bundle: trainer
-label: 'Languages spoken fluently'
-description: ''
-required: true
-translatable: false
-default_value:
-  -
-    value: English
-default_value_callback: ''
-settings: {  }
-field_type: list_string
diff --git a/config/optional/field.field.oc_actor.trainer.field_notes.yml b/config/optional/field.field.oc_actor.trainer.field_notes.yml
deleted file mode 100644
index ce64731..0000000
--- a/config/optional/field.field.oc_actor.trainer.field_notes.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 404d402a-5c42-499e-ae56-c80e8bf2e73e
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_actor.field_notes
-    - opencase_entities.oc_actor_type.trainer
-_core:
-  default_config_hash: WuQITynCjpRYWMANBShHe9ATbxNdHcjJxjTPjh796kk
-id: oc_actor.trainer.field_notes
-field_name: field_notes
-entity_type: oc_actor
-bundle: trainer
-label: Notes
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string_long
diff --git a/config/optional/field.field.oc_actor.trainer.field_photo.yml b/config/optional/field.field.oc_actor.trainer.field_photo.yml
deleted file mode 100644
index df094cc..0000000
--- a/config/optional/field.field.oc_actor.trainer.field_photo.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-uuid: 7d17d469-b5dd-4c29-bc8e-fd1dd04f8685
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_actor.field_photo
-    - opencase_entities.oc_actor_type.trainer
-  module:
-    - image
-id: oc_actor.trainer.field_photo
-field_name: field_photo
-entity_type: oc_actor
-bundle: trainer
-label: Photo
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:file'
-  handler_settings: {  }
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'png gif jpg jpeg'
-  max_filesize: ''
-  max_resolution: ''
-  min_resolution: ''
-  alt_field: true
-  alt_field_required: true
-  title_field: false
-  title_field_required: false
-  default_image:
-    uuid: null
-    alt: ''
-    title: ''
-    width: null
-    height: null
-field_type: image
diff --git a/config/optional/field.field.oc_actor.trainer.field_pronoun.yml b/config/optional/field.field.oc_actor.trainer.field_pronoun.yml
deleted file mode 100644
index 497e763..0000000
--- a/config/optional/field.field.oc_actor.trainer.field_pronoun.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 1c943d94-a971-44f2-92a5-3e81f8c2b4e5
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_actor.field_pronoun
-    - opencase_entities.oc_actor_type.trainer
-_core:
-  default_config_hash: 6qoHmiByUUu9UdhKtyl5QuQnsvn_BbUvNQnwQTUy1bY
-id: oc_actor.trainer.field_pronoun
-field_name: field_pronoun
-entity_type: oc_actor
-bundle: trainer
-label: Pronoun
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/optional/field.field.oc_actor.volunteer.field_ethnic_o.yml b/config/optional/field.field.oc_actor.volunteer.field_ethnic_o.yml
new file mode 100644
index 0000000..4cd43be
--- /dev/null
+++ b/config/optional/field.field.oc_actor.volunteer.field_ethnic_o.yml
@@ -0,0 +1,19 @@
+uuid: f3d61464-555e-4fe9-9142-19bc201d5f14
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_ethnic_o
+    - opencase_entities.oc_actor_type.volunteer
+id: oc_actor.volunteer.field_ethnic_o
+field_name: field_ethnic_o
+entity_type: oc_actor
+bundle: volunteer
+label: 'Ethnic origin'
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/config/optional/field.field.oc_actor.volunteer.field_general_noes.yml b/config/optional/field.field.oc_actor.volunteer.field_general_noes.yml
new file mode 100644
index 0000000..2a2b018
--- /dev/null
+++ b/config/optional/field.field.oc_actor.volunteer.field_general_noes.yml
@@ -0,0 +1,19 @@
+uuid: 7b3060d9-8841-40bd-8355-3c46a2e95b1a
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_general_noes
+    - opencase_entities.oc_actor_type.volunteer
+id: oc_actor.volunteer.field_general_noes
+field_name: field_general_noes
+entity_type: oc_actor
+bundle: volunteer
+label: 'General notes'
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string_long
diff --git a/config/optional/field.field.oc_actor.volunteer.field_languages_spoken.yml b/config/optional/field.field.oc_actor.volunteer.field_languages_spoken.yml
new file mode 100644
index 0000000..8720b2d
--- /dev/null
+++ b/config/optional/field.field.oc_actor.volunteer.field_languages_spoken.yml
@@ -0,0 +1,21 @@
+uuid: 3ffa9f18-0b23-44d5-b5f6-4b6b48148814
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_languages_spoken
+    - opencase_entities.oc_actor_type.volunteer
+  module:
+    - options
+id: oc_actor.volunteer.field_languages_spoken
+field_name: field_languages_spoken
+entity_type: oc_actor
+bundle: volunteer
+label: 'Languages spoken'
+description: 'Hold down <b>Ctrl</b> (or the Mac equivalent) while clicking, and you can select more than one.'
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_actor.volunteer.field_nationalities.yml b/config/optional/field.field.oc_actor.volunteer.field_nationalities.yml
new file mode 100644
index 0000000..1715839
--- /dev/null
+++ b/config/optional/field.field.oc_actor.volunteer.field_nationalities.yml
@@ -0,0 +1,21 @@
+uuid: 11771f51-2a8e-462b-b8a1-9c08a5957175
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_nationalities
+    - opencase_entities.oc_actor_type.volunteer
+  module:
+    - options
+id: oc_actor.volunteer.field_nationalities
+field_name: field_nationalities
+entity_type: oc_actor
+bundle: volunteer
+label: Nationality
+description: 'To select multiple nationalities, hold down <b>Ctrl</b> (or the Mac equivalent) while clicking.'
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_actor.volunteer.field_osic_level.yml b/config/optional/field.field.oc_actor.volunteer.field_osic_level.yml
new file mode 100644
index 0000000..36f9c37
--- /dev/null
+++ b/config/optional/field.field.oc_actor.volunteer.field_osic_level.yml
@@ -0,0 +1,21 @@
+uuid: e7b67185-ec95-44a3-b30b-d246b2aae216
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_osic_level
+    - opencase_entities.oc_actor_type.volunteer
+  module:
+    - options
+id: oc_actor.volunteer.field_osic_level
+field_name: field_osic_level
+entity_type: oc_actor
+bundle: volunteer
+label: 'OSIC level'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_actor.volunteer.field_skills.yml b/config/optional/field.field.oc_actor.volunteer.field_skills.yml
new file mode 100644
index 0000000..13d9d3f
--- /dev/null
+++ b/config/optional/field.field.oc_actor.volunteer.field_skills.yml
@@ -0,0 +1,19 @@
+uuid: 519f4b4e-9eb1-4f54-aa55-c4343005de03
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_skills
+    - opencase_entities.oc_actor_type.volunteer
+id: oc_actor.volunteer.field_skills
+field_name: field_skills
+entity_type: oc_actor
+bundle: volunteer
+label: Skills
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string_long
diff --git a/config/optional/field.field.oc_case.accommodation.field_case_finance.yml b/config/optional/field.field.oc_case.accommodation.field_case_finance.yml
new file mode 100644
index 0000000..666fdc7
--- /dev/null
+++ b/config/optional/field.field.oc_case.accommodation.field_case_finance.yml
@@ -0,0 +1,21 @@
+uuid: 752c10e9-9fa8-4f22-98cb-934d5a5ed84d
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_case_finance
+    - opencase_cases.oc_case_type.accommodation
+  module:
+    - options
+id: oc_case.accommodation.field_case_finance
+field_name: field_case_finance
+entity_type: oc_case
+bundle: accommodation
+label: 'Case finance'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.accommodation.field_outcome.yml b/config/optional/field.field.oc_case.accommodation.field_outcome.yml
new file mode 100644
index 0000000..d60f95c
--- /dev/null
+++ b/config/optional/field.field.oc_case.accommodation.field_outcome.yml
@@ -0,0 +1,21 @@
+uuid: 29400400-9ecc-40ec-9065-59a24f460eec
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_outcome
+    - opencase_cases.oc_case_type.accommodation
+  module:
+    - options
+id: oc_case.accommodation.field_outcome
+field_name: field_outcome
+entity_type: oc_case
+bundle: accommodation
+label: Outcome
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.accommodation.field_type_of_acco.yml b/config/optional/field.field.oc_case.accommodation.field_type_of_acco.yml
new file mode 100644
index 0000000..e08bad9
--- /dev/null
+++ b/config/optional/field.field.oc_case.accommodation.field_type_of_acco.yml
@@ -0,0 +1,21 @@
+uuid: 9b75feec-69bf-4ac4-a037-e73a15ca926e
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_type_of_acco
+    - opencase_cases.oc_case_type.accommodation
+  module:
+    - options
+id: oc_case.accommodation.field_type_of_acco
+field_name: field_type_of_acco
+entity_type: oc_case
+bundle: accommodation
+label: 'Type of accommodation issue'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.asylum_support.field_case_finance.yml b/config/optional/field.field.oc_case.asylum_support.field_case_finance.yml
new file mode 100644
index 0000000..12b7b89
--- /dev/null
+++ b/config/optional/field.field.oc_case.asylum_support.field_case_finance.yml
@@ -0,0 +1,21 @@
+uuid: 0cc4c4a3-a116-4811-a520-772b81b4ecda
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_case_finance
+    - opencase_cases.oc_case_type.asylum_support
+  module:
+    - options
+id: oc_case.asylum_support.field_case_finance
+field_name: field_case_finance
+entity_type: oc_case
+bundle: asylum_support
+label: 'Case finance'
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.asylum_support.field_outcome.yml b/config/optional/field.field.oc_case.asylum_support.field_outcome.yml
new file mode 100644
index 0000000..6531239
--- /dev/null
+++ b/config/optional/field.field.oc_case.asylum_support.field_outcome.yml
@@ -0,0 +1,21 @@
+uuid: 7ea138ce-76a9-47e2-9d93-c9b0a302f566
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_outcome
+    - opencase_cases.oc_case_type.asylum_support
+  module:
+    - options
+id: oc_case.asylum_support.field_outcome
+field_name: field_outcome
+entity_type: oc_case
+bundle: asylum_support
+label: Outcome
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.asylum_support.field_type_of_as.yml b/config/optional/field.field.oc_case.asylum_support.field_type_of_as.yml
new file mode 100644
index 0000000..badebe3
--- /dev/null
+++ b/config/optional/field.field.oc_case.asylum_support.field_type_of_as.yml
@@ -0,0 +1,21 @@
+uuid: 87c58a58-c451-49b8-a078-cababd2e3c5d
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_type_of_as
+    - opencase_cases.oc_case_type.asylum_support
+  module:
+    - options
+id: oc_case.asylum_support.field_type_of_as
+field_name: field_type_of_as
+entity_type: oc_case
+bundle: asylum_support
+label: 'Type of asylum support'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.employability.field_case_finance.yml b/config/optional/field.field.oc_case.employability.field_case_finance.yml
new file mode 100644
index 0000000..14c657d
--- /dev/null
+++ b/config/optional/field.field.oc_case.employability.field_case_finance.yml
@@ -0,0 +1,21 @@
+uuid: c318911a-558d-4aa4-b4c4-0353fbc70e0f
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_case_finance
+    - opencase_cases.oc_case_type.employability
+  module:
+    - options
+id: oc_case.employability.field_case_finance
+field_name: field_case_finance
+entity_type: oc_case
+bundle: employability
+label: 'Case finance'
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.employability.field_gave_list_of_agencies.yml b/config/optional/field.field.oc_case.employability.field_gave_list_of_agencies.yml
new file mode 100644
index 0000000..4fcdb9b
--- /dev/null
+++ b/config/optional/field.field.oc_case.employability.field_gave_list_of_agencies.yml
@@ -0,0 +1,23 @@
+uuid: fc32cb9c-1302-4ece-973d-99764fcb4e8c
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_gave_list_of_agencies
+    - opencase_cases.oc_case_type.employability
+id: oc_case.employability.field_gave_list_of_agencies
+field_name: field_gave_list_of_agencies
+entity_type: oc_case
+bundle: employability
+label: 'Gave list of agencies'
+description: ''
+required: false
+translatable: false
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'Yes'
+  off_label: 'No'
+field_type: boolean
diff --git a/config/optional/field.field.oc_case.employability.field_outcome.yml b/config/optional/field.field.oc_case.employability.field_outcome.yml
new file mode 100644
index 0000000..5c6174c
--- /dev/null
+++ b/config/optional/field.field.oc_case.employability.field_outcome.yml
@@ -0,0 +1,21 @@
+uuid: 57500d51-ecb1-4610-9803-1119736d4f7d
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_outcome
+    - opencase_cases.oc_case_type.employability
+  module:
+    - options
+id: oc_case.employability.field_outcome
+field_name: field_outcome
+entity_type: oc_case
+bundle: employability
+label: Outcome
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.employability.field_type_of_employability_help.yml b/config/optional/field.field.oc_case.employability.field_type_of_employability_help.yml
new file mode 100644
index 0000000..bd1706a
--- /dev/null
+++ b/config/optional/field.field.oc_case.employability.field_type_of_employability_help.yml
@@ -0,0 +1,21 @@
+uuid: 2b74b37e-9dbc-41e2-a1ad-c787b118fcf5
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_type_of_employability_help
+    - opencase_cases.oc_case_type.employability
+  module:
+    - options
+id: oc_case.employability.field_type_of_employability_help
+field_name: field_type_of_employability_help
+entity_type: oc_case
+bundle: employability
+label: 'Type of employability help'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.enquiry.field_outcome.yml b/config/optional/field.field.oc_case.enquiry.field_outcome.yml
new file mode 100644
index 0000000..12f6f86
--- /dev/null
+++ b/config/optional/field.field.oc_case.enquiry.field_outcome.yml
@@ -0,0 +1,23 @@
+uuid: a95d9860-b1b4-4726-80e0-5d322536f082
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_outcome
+    - opencase_cases.oc_case_type.enquiry
+  module:
+    - options
+id: oc_case.enquiry.field_outcome
+field_name: field_outcome
+entity_type: oc_case
+bundle: enquiry
+label: Outcome
+description: ''
+required: false
+translatable: true
+default_value:
+  -
+    value: 'One-off interaction'
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.enquiry.field_subject_of_enquiry.yml b/config/optional/field.field.oc_case.enquiry.field_subject_of_enquiry.yml
new file mode 100644
index 0000000..f32e6f9
--- /dev/null
+++ b/config/optional/field.field.oc_case.enquiry.field_subject_of_enquiry.yml
@@ -0,0 +1,19 @@
+uuid: 703ae9cd-15d9-4c21-b218-f026d144f40d
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_subject_of_enquiry
+    - opencase_cases.oc_case_type.enquiry
+id: oc_case.enquiry.field_subject_of_enquiry
+field_name: field_subject_of_enquiry
+entity_type: oc_case
+bundle: enquiry
+label: 'Subject of Enquiry'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string_long
diff --git a/config/optional/field.field.oc_case.health.field_case_finance.yml b/config/optional/field.field.oc_case.health.field_case_finance.yml
new file mode 100644
index 0000000..63b02e0
--- /dev/null
+++ b/config/optional/field.field.oc_case.health.field_case_finance.yml
@@ -0,0 +1,21 @@
+uuid: 39d740be-ba2f-42d1-9479-04c09d32eac9
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_case_finance
+    - opencase_cases.oc_case_type.health
+  module:
+    - options
+id: oc_case.health.field_case_finance
+field_name: field_case_finance
+entity_type: oc_case
+bundle: health
+label: 'Case finance'
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.health.field_outcome.yml b/config/optional/field.field.oc_case.health.field_outcome.yml
new file mode 100644
index 0000000..19ed93d
--- /dev/null
+++ b/config/optional/field.field.oc_case.health.field_outcome.yml
@@ -0,0 +1,21 @@
+uuid: b6e4401d-114c-41e9-a009-bce1e313aed4
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_outcome
+    - opencase_cases.oc_case_type.health
+  module:
+    - options
+id: oc_case.health.field_outcome
+field_name: field_outcome
+entity_type: oc_case
+bundle: health
+label: Outcome
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.health.field_type_health.yml b/config/optional/field.field.oc_case.health.field_type_health.yml
new file mode 100644
index 0000000..307773e
--- /dev/null
+++ b/config/optional/field.field.oc_case.health.field_type_health.yml
@@ -0,0 +1,21 @@
+uuid: 7d101be7-d6d1-4ba6-820a-90b963268e3b
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_type_health
+    - opencase_cases.oc_case_type.health
+  module:
+    - options
+id: oc_case.health.field_type_health
+field_name: field_type_health
+entity_type: oc_case
+bundle: health
+label: 'Type of health assistance'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.immigration.field_case_finance.yml b/config/optional/field.field.oc_case.immigration.field_case_finance.yml
new file mode 100644
index 0000000..793666d
--- /dev/null
+++ b/config/optional/field.field.oc_case.immigration.field_case_finance.yml
@@ -0,0 +1,21 @@
+uuid: 1bf95946-ed4f-486d-941f-f464f9f0c213
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_case_finance
+    - opencase_cases.oc_case_type.immigration
+  module:
+    - options
+id: oc_case.immigration.field_case_finance
+field_name: field_case_finance
+entity_type: oc_case
+bundle: immigration
+label: 'Case finance'
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.immigration.field_level.yml b/config/optional/field.field.oc_case.immigration.field_level.yml
new file mode 100644
index 0000000..cef5322
--- /dev/null
+++ b/config/optional/field.field.oc_case.immigration.field_level.yml
@@ -0,0 +1,21 @@
+uuid: 5ea5541c-5288-47e1-bf13-70ed01075ab0
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_level
+    - opencase_cases.oc_case_type.immigration
+  module:
+    - options
+id: oc_case.immigration.field_level
+field_name: field_level
+entity_type: oc_case
+bundle: immigration
+label: Level
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_integer
diff --git a/config/optional/field.field.oc_case.immigration.field_outcome.yml b/config/optional/field.field.oc_case.immigration.field_outcome.yml
new file mode 100644
index 0000000..5ace978
--- /dev/null
+++ b/config/optional/field.field.oc_case.immigration.field_outcome.yml
@@ -0,0 +1,21 @@
+uuid: 2a76f964-55cf-426c-a1b7-609d575526dc
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_outcome
+    - opencase_cases.oc_case_type.immigration
+  module:
+    - options
+id: oc_case.immigration.field_outcome
+field_name: field_outcome
+entity_type: oc_case
+bundle: immigration
+label: Outcome
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.immigration.field_type_of_applicat.yml b/config/optional/field.field.oc_case.immigration.field_type_of_applicat.yml
new file mode 100644
index 0000000..5e283a9
--- /dev/null
+++ b/config/optional/field.field.oc_case.immigration.field_type_of_applicat.yml
@@ -0,0 +1,21 @@
+uuid: d8cc5c82-f768-4641-9b86-5ecc0a6b645f
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_type_of_applicat
+    - opencase_cases.oc_case_type.immigration
+  module:
+    - options
+id: oc_case.immigration.field_type_of_applicat
+field_name: field_type_of_applicat
+entity_type: oc_case
+bundle: immigration
+label: 'Type of application'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.pro_bono_immigration_service.field_outcome.yml b/config/optional/field.field.oc_case.pro_bono_immigration_service.field_outcome.yml
new file mode 100644
index 0000000..ea8cced
--- /dev/null
+++ b/config/optional/field.field.oc_case.pro_bono_immigration_service.field_outcome.yml
@@ -0,0 +1,21 @@
+uuid: f3d1ed7a-098b-49e7-96d4-d2e30b34fc5b
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_outcome
+    - opencase_cases.oc_case_type.pro_bono_immigration_service
+  module:
+    - options
+id: oc_case.pro_bono_immigration_service.field_outcome
+field_name: field_outcome
+entity_type: oc_case
+bundle: pro_bono_immigration_service
+label: Outcome
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.project.feeds_item.yml b/config/optional/field.field.oc_case.project.feeds_item.yml
deleted file mode 100644
index 3660f4d..0000000
--- a/config/optional/field.field.oc_case.project.feeds_item.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 257f2c44-7371-495b-a41d-df7b433bc33d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.feeds_item
-    - opencase_cases.oc_case_type.project
-  module:
-    - feeds
-id: oc_case.project.feeds_item
-field_name: feeds_item
-entity_type: oc_case
-bundle: project
-label: 'Feeds item'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:feeds_feed'
-  handler_settings: {  }
-field_type: feeds_item
diff --git a/config/optional/field.field.oc_case.project.field_contract_signed_date.yml b/config/optional/field.field.oc_case.project.field_contract_signed_date.yml
deleted file mode 100644
index 5052f3c..0000000
--- a/config/optional/field.field.oc_case.project.field_contract_signed_date.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: f2ca295b-126e-4902-aaca-77298af449d9
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_contract_signed_date
-    - opencase_cases.oc_case_type.project
-  module:
-    - datetime
-id: oc_case.project.field_contract_signed_date
-field_name: field_contract_signed_date
-entity_type: oc_case
-bundle: project
-label: 'Contract signed date'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: datetime
diff --git a/config/optional/field.field.oc_case.project.field_invoicing_notes.yml b/config/optional/field.field.oc_case.project.field_invoicing_notes.yml
deleted file mode 100644
index cc4708f..0000000
--- a/config/optional/field.field.oc_case.project.field_invoicing_notes.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-uuid: cec8eb04-c5a8-461f-be02-3d3f5d4ed161
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_invoicing_notes
-    - opencase_cases.oc_case_type.project
-id: oc_case.project.field_invoicing_notes
-field_name: field_invoicing_notes
-entity_type: oc_case
-bundle: project
-label: 'Invoicing notes'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string_long
diff --git a/config/optional/field.field.oc_case.project.field_invoicing_status.yml b/config/optional/field.field.oc_case.project.field_invoicing_status.yml
deleted file mode 100644
index 536c168..0000000
--- a/config/optional/field.field.oc_case.project.field_invoicing_status.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-uuid: 615e68c9-6593-4720-97db-b77bdad48eb2
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_invoicing_status
-    - opencase_cases.oc_case_type.project
-    - taxonomy.vocabulary.invoicing_statuses
-  content:
-    - 'taxonomy_term:invoicing_statuses:18d498c4-a77c-4724-9512-58d72f245c16'
-id: oc_case.project.field_invoicing_status
-field_name: field_invoicing_status
-entity_type: oc_case
-bundle: project
-label: 'Invoicing status'
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    target_uuid: 18d498c4-a77c-4724-9512-58d72f245c16
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      invoicing_statuses: invoicing_statuses
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/optional/field.field.oc_case.project.field_link_to_invoice.yml b/config/optional/field.field.oc_case.project.field_link_to_invoice.yml
deleted file mode 100644
index 7e0a446..0000000
--- a/config/optional/field.field.oc_case.project.field_link_to_invoice.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 485b2e9f-88b1-4848-839f-473f7ee02478
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_link_to_invoice
-    - opencase_cases.oc_case_type.project
-  module:
-    - link
-id: oc_case.project.field_link_to_invoice
-field_name: field_link_to_invoice
-entity_type: oc_case
-bundle: project
-label: 'Link to invoice'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  title: 0
-  link_type: 16
-field_type: link
diff --git a/config/optional/field.field.oc_case.training.feeds_item.yml b/config/optional/field.field.oc_case.training.feeds_item.yml
deleted file mode 100644
index 3919af1..0000000
--- a/config/optional/field.field.oc_case.training.feeds_item.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 6a88f0d0-60ac-4c8b-b2c5-66a12c101df8
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.feeds_item
-    - opencase_cases.oc_case_type.training
-  module:
-    - feeds
-id: oc_case.training.feeds_item
-field_name: feeds_item
-entity_type: oc_case
-bundle: training
-label: 'Feeds item'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:feeds_feed'
-  handler_settings: {  }
-field_type: feeds_item
diff --git a/config/optional/field.field.oc_case.training.field_date_of_training.yml b/config/optional/field.field.oc_case.training.field_date_of_training.yml
deleted file mode 100644
index 12eef74..0000000
--- a/config/optional/field.field.oc_case.training.field_date_of_training.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 8191567d-65ee-41e4-832d-5049b00b0224
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_date_of_training
-    - opencase_cases.oc_case_type.training
-  module:
-    - datetime
-_core:
-  default_config_hash: e7S8sfHRRbaXeu2bwbLE5x-RYwzUGC_h_wFvlJH43jE
-id: oc_case.training.field_date_of_training
-field_name: field_date_of_training
-entity_type: oc_case
-bundle: training
-label: 'Date and time of training'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: datetime
diff --git a/config/optional/field.field.oc_case.training.field_number_of_participants.yml b/config/optional/field.field.oc_case.training.field_number_of_participants.yml
deleted file mode 100644
index b110d16..0000000
--- a/config/optional/field.field.oc_case.training.field_number_of_participants.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 588f54aa-5542-4e6c-902b-88ccc3088dc4
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_number_of_participants
-    - opencase_cases.oc_case_type.training
-id: oc_case.training.field_number_of_participants
-field_name: field_number_of_participants
-entity_type: oc_case
-bundle: training
-label: 'Number of participants'
-description: 'This is a read-only field which will be populated when a trainer submits their debrief.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: ''
-  suffix: ''
-field_type: integer
diff --git a/config/optional/field.field.oc_case.training.field_project.yml b/config/optional/field.field.oc_case.training.field_project.yml
deleted file mode 100644
index beb5c8d..0000000
--- a/config/optional/field.field.oc_case.training.field_project.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: c25be4d0-c1a4-449d-a1f5-5fd249764339
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_project
-    - opencase_cases.oc_case_type.training
-id: oc_case.training.field_project
-field_name: field_project
-entity_type: oc_case
-bundle: training
-label: Project
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: views
-  handler_settings:
-    view:
-      view_name: projects
-      display_name: entity_reference_1
-      arguments: {  }
-field_type: entity_reference
diff --git a/config/optional/field.field.oc_case.training.field_social_media.yml b/config/optional/field.field.oc_case.training.field_social_media.yml
deleted file mode 100644
index 802275f..0000000
--- a/config/optional/field.field.oc_case.training.field_social_media.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: cbcef836-83c9-4b35-8eea-0dd35831f9ed
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_social_media
-    - opencase_cases.oc_case_type.training
-id: oc_case.training.field_social_media
-field_name: field_social_media
-entity_type: oc_case
-bundle: training
-label: 'Social Media'
-description: 'Whether this training has been documented on social media.'
-required: false
-translatable: false
-default_value:
-  -
-    value: 0
-default_value_callback: ''
-settings:
-  on_label: 'Yes'
-  off_label: 'No'
-field_type: boolean
diff --git a/config/optional/field.field.oc_case.training.field_training_delivery_format.yml b/config/optional/field.field.oc_case.training.field_training_delivery_format.yml
deleted file mode 100644
index 87cdf7d..0000000
--- a/config/optional/field.field.oc_case.training.field_training_delivery_format.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: a405f668-5418-4ac5-a3a7-e176a2aa378a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_training_delivery_format
-    - opencase_cases.oc_case_type.training
-  module:
-    - options
-id: oc_case.training.field_training_delivery_format
-field_name: field_training_delivery_format
-entity_type: oc_case
-bundle: training
-label: 'Delivery format'
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    value: 'In person'
-default_value_callback: ''
-settings: {  }
-field_type: list_string
diff --git a/config/optional/field.field.oc_case.training.field_training_status.yml b/config/optional/field.field.oc_case.training.field_training_status.yml
deleted file mode 100644
index 2ecfe6d..0000000
--- a/config/optional/field.field.oc_case.training.field_training_status.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 773810b1-b8c0-4774-b2e1-2b32d99f6e27
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_training_status
-    - opencase_cases.oc_case_type.training
-  module:
-    - options
-id: oc_case.training.field_training_status
-field_name: field_training_status
-entity_type: oc_case
-bundle: training
-label: 'Training Status'
-description: ''
-required: true
-translatable: false
-default_value:
-  -
-    value: na
-default_value_callback: ''
-settings: {  }
-field_type: list_string
diff --git a/config/optional/field.field.oc_case.training.field_training_type.yml b/config/optional/field.field.oc_case.training.field_training_type.yml
deleted file mode 100644
index c4f437f..0000000
--- a/config/optional/field.field.oc_case.training.field_training_type.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: ef83d9ae-64e1-4481-bf69-60911dc0e60d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_training_type
-    - opencase_cases.oc_case_type.training
-  module:
-    - options
-id: oc_case.training.field_training_type
-field_name: field_training_type
-entity_type: oc_case
-bundle: training
-label: 'Training type'
-description: ''
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_string
diff --git a/config/optional/field.field.oc_case.welfare_rights.field_case_finance.yml b/config/optional/field.field.oc_case.welfare_rights.field_case_finance.yml
new file mode 100644
index 0000000..6d89f05
--- /dev/null
+++ b/config/optional/field.field.oc_case.welfare_rights.field_case_finance.yml
@@ -0,0 +1,21 @@
+uuid: f34251c0-0ad9-4d37-809c-5ddac756b5e6
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_case_finance
+    - opencase_cases.oc_case_type.welfare_rights
+  module:
+    - options
+id: oc_case.welfare_rights.field_case_finance
+field_name: field_case_finance
+entity_type: oc_case
+bundle: welfare_rights
+label: 'Case finance'
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.welfare_rights.field_outcome.yml b/config/optional/field.field.oc_case.welfare_rights.field_outcome.yml
new file mode 100644
index 0000000..20688bc
--- /dev/null
+++ b/config/optional/field.field.oc_case.welfare_rights.field_outcome.yml
@@ -0,0 +1,21 @@
+uuid: bc2bb257-6e90-4943-943e-92f31155cee4
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_outcome
+    - opencase_cases.oc_case_type.welfare_rights
+  module:
+    - options
+id: oc_case.welfare_rights.field_outcome
+field_name: field_outcome
+entity_type: oc_case
+bundle: welfare_rights
+label: Outcome
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case.welfare_rights.field_type_of_welfare_rights_iss.yml b/config/optional/field.field.oc_case.welfare_rights.field_type_of_welfare_rights_iss.yml
new file mode 100644
index 0000000..e2fc6cd
--- /dev/null
+++ b/config/optional/field.field.oc_case.welfare_rights.field_type_of_welfare_rights_iss.yml
@@ -0,0 +1,21 @@
+uuid: 1a061087-c866-4c17-94a4-d345eba40302
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_type_of_welfare_rights_iss
+    - opencase_cases.oc_case_type.welfare_rights
+  module:
+    - options
+id: oc_case.welfare_rights.field_type_of_welfare_rights_iss
+field_name: field_type_of_welfare_rights_iss
+entity_type: oc_case
+bundle: welfare_rights
+label: 'Type of welfare rights issue'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/config/optional/field.field.oc_case_fee.project_fee.feeds_item.yml b/config/optional/field.field.oc_case_fee.project_fee.feeds_item.yml
deleted file mode 100644
index bc30db3..0000000
--- a/config/optional/field.field.oc_case_fee.project_fee.feeds_item.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: e4ac2e15-209e-4598-83df-07937bae60d6
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case_fee.feeds_item
-    - opencase_cases.oc_case_fee_type.project_fee
-  module:
-    - feeds
-id: oc_case_fee.project_fee.feeds_item
-field_name: feeds_item
-entity_type: oc_case_fee
-bundle: project_fee
-label: 'Feeds item'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:feeds_feed'
-  handler_settings: {  }
-field_type: feeds_item
diff --git a/config/optional/field.field.oc_case_provision.caseworker.field_test.yml b/config/optional/field.field.oc_case_provision.caseworker.field_test.yml
new file mode 100644
index 0000000..b016d3a
--- /dev/null
+++ b/config/optional/field.field.oc_case_provision.caseworker.field_test.yml
@@ -0,0 +1,31 @@
+uuid: 561fe652-6e6b-401a-a5d7-eef6402f6d07
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case_provision.field_test
+    - opencase_cases.oc_case_provision_type.caseworker
+    - opencase_entities.oc_actor_type.staff_member
+    - opencase_entities.oc_actor_type.volunteer
+id: oc_case_provision.caseworker.field_test
+field_name: field_test
+entity_type: oc_case_provision
+bundle: caseworker
+label: test
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:oc_actor'
+  handler_settings:
+    target_bundles:
+      staff_member: staff_member
+      volunteer: volunteer
+    sort:
+      field: _none
+      direction: ASC
+    auto_create: false
+    auto_create_bundle: staff_member
+field_type: entity_reference
diff --git a/config/optional/field.field.oc_case_provision.trainer.feeds_item.yml b/config/optional/field.field.oc_case_provision.trainer.feeds_item.yml
deleted file mode 100644
index a016b7a..0000000
--- a/config/optional/field.field.oc_case_provision.trainer.feeds_item.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: b1cb77c9-9177-4e86-8a09-d8acbdd2f34e
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case_provision.feeds_item
-    - opencase_cases.oc_case_provision_type.trainer
-  module:
-    - feeds
-id: oc_case_provision.trainer.feeds_item
-field_name: feeds_item
-entity_type: oc_case_provision
-bundle: trainer
-label: 'Feeds item'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:feeds_feed'
-  handler_settings: {  }
-field_type: feeds_item
diff --git a/config/optional/field.field.oc_case_provision.trainer.field_rate.yml b/config/optional/field.field.oc_case_provision.trainer.field_rate.yml
deleted file mode 100644
index 184d87e..0000000
--- a/config/optional/field.field.oc_case_provision.trainer.field_rate.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 6eabba7d-8c24-400e-9e90-588a1732b89a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case_provision.field_rate
-    - opencase_cases.oc_case_provision_type.trainer
-id: oc_case_provision.trainer.field_rate
-field_name: field_rate
-entity_type: oc_case_provision
-bundle: trainer
-label: Rate
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    value: !!float 120
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: £
-  suffix: ''
-field_type: decimal
diff --git a/config/optional/field.field.oc_case_provision.trainer.field_rate_type.yml b/config/optional/field.field.oc_case_provision.trainer.field_rate_type.yml
deleted file mode 100644
index bc8277f..0000000
--- a/config/optional/field.field.oc_case_provision.trainer.field_rate_type.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 5efe46e6-d1eb-45f6-8fb0-6647fd7a9bcb
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case_provision.field_rate_type
-    - opencase_cases.oc_case_provision_type.trainer
-  module:
-    - options
-id: oc_case_provision.trainer.field_rate_type
-field_name: field_rate_type
-entity_type: oc_case_provision
-bundle: trainer
-label: 'Rate type'
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    value: standard
-default_value_callback: ''
-settings: {  }
-field_type: list_string
diff --git a/config/optional/field.field.oc_organisation.client.feeds_item.yml b/config/optional/field.field.oc_organisation.client.feeds_item.yml
deleted file mode 100644
index cda30e8..0000000
--- a/config/optional/field.field.oc_organisation.client.feeds_item.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: e8cd1296-438d-41df-afd6-328f1cf83741
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.feeds_item
-    - opencase_entities.oc_organisation_type.client
-  module:
-    - feeds
-id: oc_organisation.client.feeds_item
-field_name: feeds_item
-entity_type: oc_organisation
-bundle: client
-label: 'Feeds item'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:feeds_feed'
-  handler_settings: {  }
-field_type: feeds_item
diff --git a/config/optional/field.field.oc_organisation.client.field_accreditation_date.yml b/config/optional/field.field.oc_organisation.client.field_accreditation_date.yml
deleted file mode 100644
index a69ab5c..0000000
--- a/config/optional/field.field.oc_organisation.client.field_accreditation_date.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 3261ac4b-36e5-483b-af01-ec2a7852ac5b
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_accreditation_date
-    - opencase_entities.oc_organisation_type.client
-  module:
-    - datetime
-id: oc_organisation.client.field_accreditation_date
-field_name: field_accreditation_date
-entity_type: oc_organisation
-bundle: client
-label: 'Accreditation date'
-description: 'If the client has more than one accreditation then this will show the date of the most recent one.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: datetime
diff --git a/config/optional/field.field.oc_organisation.client.field_client_status.yml b/config/optional/field.field.oc_organisation.client.field_client_status.yml
deleted file mode 100644
index c00a9db..0000000
--- a/config/optional/field.field.oc_organisation.client.field_client_status.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-uuid: b1fecf3d-91dd-4fde-bd01-cb4c0c425008
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_client_status
-    - opencase_entities.oc_organisation_type.client
-    - taxonomy.vocabulary.client_status
-  content:
-    - 'taxonomy_term:client_status:10f0b83c-158e-4d99-9937-8fe3760fd7c9'
-id: oc_organisation.client.field_client_status
-field_name: field_client_status
-entity_type: oc_organisation
-bundle: client
-label: 'Client Status'
-description: ''
-required: true
-translatable: false
-default_value:
-  -
-    target_uuid: 10f0b83c-158e-4d99-9937-8fe3760fd7c9
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      client_status: client_status
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: client_status
-field_type: entity_reference
diff --git a/config/optional/field.field.oc_organisation.client.field_client_substatus.yml b/config/optional/field.field.oc_organisation.client.field_client_substatus.yml
deleted file mode 100644
index f9d69e6..0000000
--- a/config/optional/field.field.oc_organisation.client.field_client_substatus.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-uuid: d7827e3b-9b84-433a-acb6-79d45a8e6c55
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_client_substatus
-    - opencase_entities.oc_organisation_type.client
-    - taxonomy.vocabulary.clie
-  content:
-    - 'taxonomy_term:clie:7c7fed76-087c-4437-894b-3dbe827df311'
-id: oc_organisation.client.field_client_substatus
-field_name: field_client_substatus
-entity_type: oc_organisation
-bundle: client
-label: 'Client substatus'
-description: ''
-required: true
-translatable: false
-default_value:
-  -
-    target_uuid: 7c7fed76-087c-4437-894b-3dbe827df311
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      clie: clie
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/optional/field.field.oc_organisation.client.field_client_subtype.yml b/config/optional/field.field.oc_organisation.client.field_client_subtype.yml
deleted file mode 100644
index 0acaecf..0000000
--- a/config/optional/field.field.oc_organisation.client.field_client_subtype.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: be224938-978a-4adf-9a8d-2438281e2fbc
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_client_subtype
-    - opencase_entities.oc_organisation_type.client
-    - taxonomy.vocabulary.client_subtypes
-_core:
-  default_config_hash: kHcvcm7U4-99QTGhplkTgQA-uefnl5LN1O_-PH3pODs
-id: oc_organisation.client.field_client_subtype
-field_name: field_client_subtype
-entity_type: oc_organisation
-bundle: client
-label: 'Client subtype'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      client_subtypes: client_subtypes
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/optional/field.field.oc_organisation.client.field_client_type.yml b/config/optional/field.field.oc_organisation.client.field_client_type.yml
deleted file mode 100644
index 6c2ce30..0000000
--- a/config/optional/field.field.oc_organisation.client.field_client_type.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 2799238c-812c-4e94-b470-183fec8715ee
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_client_type
-    - opencase_entities.oc_organisation_type.client
-    - taxonomy.vocabulary.client_types
-_core:
-  default_config_hash: NYIJRrOkZ7ZKf8UjjANnhQc4aeJXTj8wItjE_M0iwWY
-id: oc_organisation.client.field_client_type
-field_name: field_client_type
-entity_type: oc_organisation
-bundle: client
-label: 'Client type'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      client_types: client_types
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/optional/field.field.oc_organisation.client.field_how_did_you_hear_about_us.yml b/config/optional/field.field.oc_organisation.client.field_how_did_you_hear_about_us.yml
deleted file mode 100644
index d87fe67..0000000
--- a/config/optional/field.field.oc_organisation.client.field_how_did_you_hear_about_us.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 374c9da1-31a7-4471-b9a4-d9b4bc3ee044
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_how_did_you_hear_about_us
-    - opencase_entities.oc_organisation_type.client
-  module:
-    - options
-id: oc_organisation.client.field_how_did_you_hear_about_us
-field_name: field_how_did_you_hear_about_us
-entity_type: oc_organisation
-bundle: client
-label: 'How did you hear about us?'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_string
diff --git a/config/optional/field.field.oc_organisation.client.field_images.yml b/config/optional/field.field.oc_organisation.client.field_images.yml
deleted file mode 100644
index fd36177..0000000
--- a/config/optional/field.field.oc_organisation.client.field_images.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-uuid: bfc34664-c32b-41f7-8885-1513db5dabfe
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_images
-    - opencase_entities.oc_organisation_type.client
-  module:
-    - image
-_core:
-  default_config_hash: zWlevYUD6lkryvwYX6exqoEFTG99NvlKRBAVnoKM6ik
-id: oc_organisation.client.field_images
-field_name: field_images
-entity_type: oc_organisation
-bundle: client
-label: Images
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:file'
-  handler_settings: {  }
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'png gif jpg jpeg'
-  max_filesize: ''
-  max_resolution: ''
-  min_resolution: ''
-  alt_field: true
-  alt_field_required: true
-  title_field: false
-  title_field_required: false
-  default_image:
-    uuid: null
-    alt: ''
-    title: ''
-    width: null
-    height: null
-field_type: image
diff --git a/config/optional/field.field.oc_organisation.client.field_location_festival_event.yml b/config/optional/field.field.oc_organisation.client.field_location_festival_event.yml
deleted file mode 100644
index 39d7f13..0000000
--- a/config/optional/field.field.oc_organisation.client.field_location_festival_event.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-uuid: e7b4bf6f-0d7b-4b63-b7b5-57f57d44b0f6
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_location_festival_event
-    - opencase_entities.oc_organisation_type.client
-id: oc_organisation.client.field_location_festival_event
-field_name: field_location_festival_event
-entity_type: oc_organisation
-bundle: client
-label: 'Location (of festival or event)'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/optional/field.field.oc_organisation.client.field_number_of_events_per_year.yml b/config/optional/field.field.oc_organisation.client.field_number_of_events_per_year.yml
deleted file mode 100644
index 9b17225..0000000
--- a/config/optional/field.field.oc_organisation.client.field_number_of_events_per_year.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 0148f66d-7a86-4303-82be-c2cfb339bab5
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_number_of_events_per_year
-    - opencase_entities.oc_organisation_type.client
-id: oc_organisation.client.field_number_of_events_per_year
-field_name: field_number_of_events_per_year
-entity_type: oc_organisation
-bundle: client
-label: 'Number of events per year (if applicable)'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: ''
-  suffix: ''
-field_type: integer
diff --git a/config/optional/field.field.oc_organisation.client.field_number_of_staff.yml b/config/optional/field.field.oc_organisation.client.field_number_of_staff.yml
deleted file mode 100644
index 27c8449..0000000
--- a/config/optional/field.field.oc_organisation.client.field_number_of_staff.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 560e168a-5562-47d0-a7d6-ee650d6f3f8a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_number_of_staff
-    - opencase_entities.oc_organisation_type.client
-id: oc_organisation.client.field_number_of_staff
-field_name: field_number_of_staff
-entity_type: oc_organisation
-bundle: client
-label: 'Number of staff / volunteers'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: ''
-  suffix: ''
-field_type: integer
diff --git a/config/optional/field.field.oc_organisation.client.field_premises_capacity.yml b/config/optional/field.field.oc_organisation.client.field_premises_capacity.yml
deleted file mode 100644
index 97bc364..0000000
--- a/config/optional/field.field.oc_organisation.client.field_premises_capacity.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 91bbae3b-ac83-4940-9fb7-50502a9de629
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_premises_capacity
-    - opencase_entities.oc_organisation_type.client
-id: oc_organisation.client.field_premises_capacity
-field_name: field_premises_capacity
-entity_type: oc_organisation
-bundle: client
-label: 'Premises capacity'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: ''
-  suffix: ''
-field_type: integer
diff --git a/config/optional/field.field.oc_organisation.client.field_tags.yml b/config/optional/field.field.oc_organisation.client.field_tags.yml
deleted file mode 100644
index 0998b06..0000000
--- a/config/optional/field.field.oc_organisation.client.field_tags.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: cc2fb7b0-a498-4454-8806-4808857f581a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_tags
-    - opencase_entities.oc_organisation_type.client
-    - taxonomy.vocabulary.tags
-id: oc_organisation.client.field_tags
-field_name: field_tags
-entity_type: oc_organisation
-bundle: client
-label: Tags
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      tags: tags
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/optional/field.field.oc_organisation.client.field_umbrella_client.yml b/config/optional/field.field.oc_organisation.client.field_umbrella_client.yml
deleted file mode 100644
index cec6514..0000000
--- a/config/optional/field.field.oc_organisation.client.field_umbrella_client.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: ed841153-e4d1-4eb1-bb2d-f3f3cbcd5b0e
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_umbrella_client
-    - opencase_entities.oc_organisation_type.client
-_core:
-  default_config_hash: tIK3YfjqaKVW_2O0nXhBMu3VaM82TN4nIb5ecnX4zZY
-id: oc_organisation.client.field_umbrella_client
-field_name: field_umbrella_client
-entity_type: oc_organisation
-bundle: client
-label: 'Umbrella Client'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: views
-  handler_settings:
-    view:
-      view_name: all_umbrella_clients
-      display_name: entity_reference_1
-      arguments: {  }
-field_type: entity_reference
diff --git a/config/optional/field.field.oc_organisation.umbrella_client.feeds_item.yml b/config/optional/field.field.oc_organisation.umbrella_client.feeds_item.yml
deleted file mode 100644
index dff09af..0000000
--- a/config/optional/field.field.oc_organisation.umbrella_client.feeds_item.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 17d8780f-7a4c-450f-ab68-e1620725f319
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.feeds_item
-    - opencase_entities.oc_organisation_type.umbrella_client
-  module:
-    - feeds
-id: oc_organisation.umbrella_client.feeds_item
-field_name: feeds_item
-entity_type: oc_organisation
-bundle: umbrella_client
-label: 'Feeds item'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:feeds_feed'
-  handler_settings: {  }
-field_type: feeds_item
diff --git a/config/optional/field.field.oc_organisation.umbrella_client.field_tags.yml b/config/optional/field.field.oc_organisation.umbrella_client.field_tags.yml
deleted file mode 100644
index 716b38c..0000000
--- a/config/optional/field.field.oc_organisation.umbrella_client.field_tags.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 62407775-95d5-4141-966c-2ef3c7d84ca4
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_tags
-    - opencase_entities.oc_organisation_type.umbrella_client
-    - taxonomy.vocabulary.tags
-id: oc_organisation.umbrella_client.field_tags
-field_name: field_tags
-entity_type: oc_organisation
-bundle: umbrella_client
-label: Tags
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      tags: tags
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/optional/field.field.oc_organisation.umbrella_client.field_type_of_umbrella_client.yml b/config/optional/field.field.oc_organisation.umbrella_client.field_type_of_umbrella_client.yml
deleted file mode 100644
index 1b24ca5..0000000
--- a/config/optional/field.field.oc_organisation.umbrella_client.field_type_of_umbrella_client.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 735b067f-48f3-48aa-8b70-26590efe1537
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_type_of_umbrella_client
-    - opencase_entities.oc_organisation_type.umbrella_client
-  module:
-    - options
-_core:
-  default_config_hash: a1_kBAglauOZN3jX7lL4hTedcZqWcoNGq7GnIZvmJHo
-id: oc_organisation.umbrella_client.field_type_of_umbrella_client
-field_name: field_type_of_umbrella_client
-entity_type: oc_organisation
-bundle: umbrella_client
-label: 'Type of umbrella client'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_string
diff --git a/config/optional/field.field.paragraph.availability.field_day.yml b/config/optional/field.field.paragraph.availability.field_day.yml
deleted file mode 100644
index 0f64986..0000000
--- a/config/optional/field.field.paragraph.availability.field_day.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: dc853779-0421-4a43-987d-0a4040655065
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.paragraph.field_day
-    - paragraphs.paragraphs_type.availability
-  module:
-    - options
-_core:
-  default_config_hash: iFbs37ejHXSPnRQiy5Q8vEjnp9tzZ5oiiQJte41w6Zc
-id: paragraph.availability.field_day
-field_name: field_day
-entity_type: paragraph
-bundle: availability
-label: Day
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_string
diff --git a/config/optional/field.field.paragraph.availability.field_time.yml b/config/optional/field.field.paragraph.availability.field_time.yml
deleted file mode 100644
index e51640a..0000000
--- a/config/optional/field.field.paragraph.availability.field_time.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 50abae7a-5405-4437-ad30-1427d493eef1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.paragraph.field_time
-    - paragraphs.paragraphs_type.availability
-  module:
-    - options
-_core:
-  default_config_hash: q1VVSmAzHcvV4DWlVBMhVtJ-falAwbwPZfzOEVdmou8
-id: paragraph.availability.field_time
-field_name: field_time
-entity_type: paragraph
-bundle: availability
-label: Time
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_string
diff --git a/config/optional/field.field.paragraph.emergency_contact.field_name.yml b/config/optional/field.field.paragraph.emergency_contact.field_name.yml
deleted file mode 100644
index 023ed65..0000000
--- a/config/optional/field.field.paragraph.emergency_contact.field_name.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: f31b8f90-6148-434e-80ef-684deb7d1a52
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.paragraph.field_name
-    - paragraphs.paragraphs_type.emergency_contact
-_core:
-  default_config_hash: SWhKzplB7xz47dDBsmnfMMzMz1nap1RcLnsu2Et8CCY
-id: paragraph.emergency_contact.field_name
-field_name: field_name
-entity_type: paragraph
-bundle: emergency_contact
-label: Name
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/optional/field.field.paragraph.emergency_contact.field_phone.yml b/config/optional/field.field.paragraph.emergency_contact.field_phone.yml
deleted file mode 100644
index 1177c02..0000000
--- a/config/optional/field.field.paragraph.emergency_contact.field_phone.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: f01d75e5-80ab-4c8c-bd77-49b4ee6b97ad
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.paragraph.field_phone
-    - paragraphs.paragraphs_type.emergency_contact
-_core:
-  default_config_hash: OOpI43fp1KZJJk78mPRZZbeBUU-iBk67Z28j-U6M4Ys
-id: paragraph.emergency_contact.field_phone
-field_name: field_phone
-entity_type: paragraph
-bundle: emergency_contact
-label: Phone
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/optional/field.field.paragraph.emergency_contact.field_relationship.yml b/config/optional/field.field.paragraph.emergency_contact.field_relationship.yml
deleted file mode 100644
index 1e08b80..0000000
--- a/config/optional/field.field.paragraph.emergency_contact.field_relationship.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 50a8b9e6-09fd-4d79-aa7e-3d98e1478900
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.paragraph.field_relationship
-    - paragraphs.paragraphs_type.emergency_contact
-_core:
-  default_config_hash: GTXNoOGoBkgvqjRvtADLNmEdzaDAP6Qtod-R5A9rIcA
-id: paragraph.emergency_contact.field_relationship
-field_name: field_relationship
-entity_type: paragraph
-bundle: emergency_contact
-label: Relationship
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/optional/field.field.paragraph.fee.field_amount.yml b/config/optional/field.field.paragraph.fee.field_amount.yml
deleted file mode 100644
index a2bb7c4..0000000
--- a/config/optional/field.field.paragraph.fee.field_amount.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 71ed5ae3-5b03-476c-a7b4-7493efa6190c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.paragraph.field_amount
-    - paragraphs.paragraphs_type.fee
-_core:
-  default_config_hash: K5QSLuOtV9BlK3L-09fPjbJ4wi3-NpEX1LZD7FcWbl8
-id: paragraph.fee.field_amount
-field_name: field_amount
-entity_type: paragraph
-bundle: fee
-label: Amount
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: £
-  suffix: ''
-field_type: integer
diff --git a/config/optional/field.field.paragraph.fee.field_category.yml b/config/optional/field.field.paragraph.fee.field_category.yml
deleted file mode 100644
index 17503e8..0000000
--- a/config/optional/field.field.paragraph.fee.field_category.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 4aa9e6fe-cbe8-4a6b-9592-3e022161a06d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.paragraph.field_category
-    - paragraphs.paragraphs_type.fee
-  module:
-    - options
-_core:
-  default_config_hash: Ym1BXeaQyJ5SgPu7IjWCP0gK-n8Idoe9A3266Vwy2GA
-id: paragraph.fee.field_category
-field_name: field_category
-entity_type: paragraph
-bundle: fee
-label: Category
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_integer
diff --git a/config/optional/field.field.paragraph.trainer.field_rate_if_custom_.yml b/config/optional/field.field.paragraph.trainer.field_rate_if_custom_.yml
deleted file mode 100644
index b4b3828..0000000
--- a/config/optional/field.field.paragraph.trainer.field_rate_if_custom_.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: dc0eaeab-18c8-4a83-8f09-5ac4bc653c77
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.paragraph.field_rate_if_custom_
-    - paragraphs.paragraphs_type.trainer
-_core:
-  default_config_hash: cnkfkLqmdScNjmujzDTJSPsInOBar_YT_w8QuELGuUQ
-id: paragraph.trainer.field_rate_if_custom_
-field_name: field_rate_if_custom_
-entity_type: paragraph
-bundle: trainer
-label: Rate
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: £
-  suffix: ''
-field_type: integer
diff --git a/config/optional/field.field.paragraph.trainer.field_trainer.yml b/config/optional/field.field.paragraph.trainer.field_trainer.yml
deleted file mode 100644
index b74f47b..0000000
--- a/config/optional/field.field.paragraph.trainer.field_trainer.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: a2ef0372-dec2-4339-ab31-c914b4d32ecf
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.paragraph.field_trainer
-    - paragraphs.paragraphs_type.trainer
-_core:
-  default_config_hash: d9Ea50H6q3WNZweoghPEUnWEu8HsSdxaK0ExEn0Cyq4
-id: paragraph.trainer.field_trainer
-field_name: field_trainer
-entity_type: paragraph
-bundle: trainer
-label: 'Name of trainer'
-description: ''
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: views
-  handler_settings:
-    view:
-      view_name: all_trainers
-      display_name: entity_reference_1
-      arguments: {  }
-field_type: entity_reference
diff --git a/config/optional/field.field.paragraph.trainer.field_trainer_rate.yml b/config/optional/field.field.paragraph.trainer.field_trainer_rate.yml
deleted file mode 100644
index 58b6e0e..0000000
--- a/config/optional/field.field.paragraph.trainer.field_trainer_rate.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 3a951124-3d36-4109-8ebe-4a829bda9eef
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.paragraph.field_trainer_rate
-    - paragraphs.paragraphs_type.trainer
-  module:
-    - options
-_core:
-  default_config_hash: 6IjYTsz6CSCPRaEKMIkkSHhzZM1O82y71pCqEEyv_e4
-id: paragraph.trainer.field_trainer_rate
-field_name: field_trainer_rate
-entity_type: paragraph
-bundle: trainer
-label: 'Trainer rate type'
-description: ''
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_string
diff --git a/config/optional/field.field.paragraph.trainer.field_trainer_role.yml b/config/optional/field.field.paragraph.trainer.field_trainer_role.yml
deleted file mode 100644
index b0f6545..0000000
--- a/config/optional/field.field.paragraph.trainer.field_trainer_role.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 9bb96631-824b-459d-9597-78e06225989c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.paragraph.field_trainer_role
-    - paragraphs.paragraphs_type.trainer
-  module:
-    - options
-_core:
-  default_config_hash: jsnCE7pyQTr_cCIXdqSlK_F0hJKnN5uPNV72AiCpwOc
-id: paragraph.trainer.field_trainer_role
-field_name: field_trainer_role
-entity_type: paragraph
-bundle: trainer
-label: 'Trainer role'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_string
diff --git a/config/optional/field.field.taxonomy_term.client_status.field_substatuses.yml b/config/optional/field.field.taxonomy_term.client_status.field_substatuses.yml
deleted file mode 100644
index e078b21..0000000
--- a/config/optional/field.field.taxonomy_term.client_status.field_substatuses.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 42485355-7b4b-4c03-a5ea-9316703c0ea9
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_substatuses
-    - taxonomy.vocabulary.clie
-    - taxonomy.vocabulary.client_status
-id: taxonomy_term.client_status.field_substatuses
-field_name: field_substatuses
-entity_type: taxonomy_term
-bundle: client_status
-label: Substatuses
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      clie: clie
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/optional/field.field.taxonomy_term.client_subtypes.field_parent_type.yml b/config/optional/field.field.taxonomy_term.client_subtypes.field_parent_type.yml
deleted file mode 100644
index 490f498..0000000
--- a/config/optional/field.field.taxonomy_term.client_subtypes.field_parent_type.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: ea07fcc0-4fc6-464a-89de-7eafc1bed32d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_parent_type
-    - taxonomy.vocabulary.client_subtypes
-    - taxonomy.vocabulary.client_types
-_core:
-  default_config_hash: GTDaRzPShlm7juocqAdP6XMdV69fy4lq62LPCOBFetI
-id: taxonomy_term.client_subtypes.field_parent_type
-field_name: field_parent_type
-entity_type: taxonomy_term
-bundle: client_subtypes
-label: 'Parent type'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      client_types: client_types
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/optional/field.field.user.user.field_last_password_reset.yml b/config/optional/field.field.user.user.field_last_password_reset.yml
deleted file mode 100644
index ba0ab43..0000000
--- a/config/optional/field.field.user.user.field_last_password_reset.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 6482cced-5372-40f2-9dea-2649c3594838
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.user.field_last_password_reset
-  module:
-    - datetime
-    - user
-  enforced:
-    module:
-      - password_policy
-_core:
-  default_config_hash: 9KNibQftQSQkxINz3CmNcDC0f6rp2Krw6lkJ2en-G7g
-id: user.user.field_last_password_reset
-field_name: field_last_password_reset
-entity_type: user
-bundle: user
-label: 'Last Password Reset'
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    default_date_type: now
-    default_date: now
-default_value_callback: ''
-settings: {  }
-field_type: datetime
diff --git a/config/optional/field.field.user.user.field_linked_opencase_actor.yml b/config/optional/field.field.user.user.field_linked_opencase_actor.yml
index 3ad4ffd..bea88d0 100644
--- a/config/optional/field.field.user.user.field_linked_opencase_actor.yml
+++ b/config/optional/field.field.user.user.field_linked_opencase_actor.yml
@@ -1,4 +1,4 @@
-uuid: 0b2cd645-9f84-44ec-9b04-96687f04aa51
+uuid: b78585c2-09d8-484f-b55c-aaa9610181e0
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/field.field.user.user.field_password_expiration.yml b/config/optional/field.field.user.user.field_password_expiration.yml
deleted file mode 100644
index d59080c..0000000
--- a/config/optional/field.field.user.user.field_password_expiration.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 0cd16f22-646d-4012-bca6-f30bf84db5ca
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.user.field_password_expiration
-  module:
-    - user
-  enforced:
-    module:
-      - password_policy
-_core:
-  default_config_hash: 0ivgsjOQ8AUH27JwMzGE7C0VC8M0dGiAZd1JKmC1liQ
-id: user.user.field_password_expiration
-field_name: field_password_expiration
-entity_type: user
-bundle: user
-label: 'Password Expiration'
-description: 'Control whether the user must reset their password. If the password has expired, this field is automatically checked after the execution of Cron.'
-required: false
-translatable: false
-default_value:
-  -
-    value: 0
-default_value_callback: ''
-settings:
-  on_label: 'Expired Password'
-  off_label: 'Non-expired Password'
-field_type: boolean
diff --git a/config/optional/field.field.user.user.field_pending_expire_sent.yml b/config/optional/field.field.user.user.field_pending_expire_sent.yml
deleted file mode 100644
index 986b754..0000000
--- a/config/optional/field.field.user.user.field_pending_expire_sent.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 2e6b10f8-5337-4d7c-8252-a3fcd736e09c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.user.field_pending_expire_sent
-  module:
-    - user
-  enforced:
-    module:
-      - password_policy
-_core:
-  default_config_hash: oYe3JWMO6vLsJ9iypb1Bg9YQcT3TGqGtKwzHc3jcTXg
-id: user.user.field_pending_expire_sent
-field_name: field_pending_expire_sent
-entity_type: user
-bundle: user
-label: 'Pending Expiration Mail Count'
-description: 'Whether an email notifying of a pending password expiration has been sent'
-required: false
-translatable: false
-default_value:
-  -
-    value: 0
-default_value_callback: ''
-settings:
-  min: 0
-  max: null
-  prefix: ''
-  suffix: ''
-field_type: integer
diff --git a/config/optional/field.field.user.user.user_picture.yml b/config/optional/field.field.user.user.user_picture.yml
index 1bac814..28edab6 100644
--- a/config/optional/field.field.user.user.user_picture.yml
+++ b/config/optional/field.field.user.user.user_picture.yml
@@ -1,4 +1,4 @@
-uuid: 671d5265-af38-4f0a-8804-9b1438c214e0
+uuid: 5393c3ed-2816-4ffb-a1c3-5765e14ff31b
 langcode: en
 status: true
 dependencies:
@@ -8,7 +8,7 @@ dependencies:
     - image
     - user
 _core:
-  default_config_hash: Iiq0AttdhgbebJwabSFwQQ1ORn64GoGz0xSZ_eyCJ8A
+  default_config_hash: twhm-ZOwSVkUjuLI_pQsaPo_pVLcqFfDmY-ojfqw0yk
 id: user.user.user_picture
 field_name: user_picture
 entity_type: user
diff --git a/config/optional/field.storage.block_content.body.yml b/config/optional/field.storage.block_content.body.yml
index a4b85c1..fcf1867 100644
--- a/config/optional/field.storage.block_content.body.yml
+++ b/config/optional/field.storage.block_content.body.yml
@@ -1,4 +1,4 @@
-uuid: 25ea89b6-7c6e-4b65-8a34-813098d42e5c
+uuid: a105a899-d2ed-4dda-b23a-56c25fe067f1
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/field.storage.comment.comment_body.yml b/config/optional/field.storage.comment.comment_body.yml
index b697d7f..65c5989 100644
--- a/config/optional/field.storage.comment.comment_body.yml
+++ b/config/optional/field.storage.comment.comment_body.yml
@@ -1,4 +1,4 @@
-uuid: 86f27d5f-adc2-474e-aad1-135f3939a59c
+uuid: 72f8870f-39ef-4476-81a3-7e538b6f883d
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/field.storage.node.body.yml b/config/optional/field.storage.node.body.yml
index 99044f2..16e98df 100644
--- a/config/optional/field.storage.node.body.yml
+++ b/config/optional/field.storage.node.body.yml
@@ -1,4 +1,4 @@
-uuid: d2524c2f-d431-4d69-8ebd-654efb8960d1
+uuid: 2da98818-3732-4ae9-b970-48bebb92ed54
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/field.storage.node.comment.yml b/config/optional/field.storage.node.comment.yml
index 85a35ca..135b4ea 100644
--- a/config/optional/field.storage.node.comment.yml
+++ b/config/optional/field.storage.node.comment.yml
@@ -1,4 +1,4 @@
-uuid: dee82884-51a7-4155-be40-ca43c946e39f
+uuid: b5b8d786-63c2-4ce8-8ec3-e3ff702cee95
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/field.storage.node.feeds_item.yml b/config/optional/field.storage.node.feeds_item.yml
deleted file mode 100644
index 613b483..0000000
--- a/config/optional/field.storage.node.feeds_item.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 0813e771-9112-4a4a-a6aa-e25f8d4e6104
-langcode: en
-status: true
-dependencies:
-  module:
-    - feeds
-    - node
-id: node.feeds_item
-field_name: feeds_item
-entity_type: node
-type: feeds_item
-settings:
-  target_type: feeds_feed
-module: feeds
-locked: false
-cardinality: 1
-translatable: false
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.node.field_image.yml b/config/optional/field.storage.node.field_image.yml
index b795463..3dc4645 100644
--- a/config/optional/field.storage.node.field_image.yml
+++ b/config/optional/field.storage.node.field_image.yml
@@ -1,4 +1,4 @@
-uuid: 12125818-49cb-4177-a73f-d61f3d4a46c2
+uuid: 4ec9b76a-82e1-4783-9b34-f809107490fc
 langcode: en
 status: true
 dependencies:
@@ -7,7 +7,7 @@ dependencies:
     - image
     - node
 _core:
-  default_config_hash: SkXIPKZYiIMMtnBmfnxk58RYfbZ8cHSw5NZPY_JByME
+  default_config_hash: EymokncRIZ7SgQT2IdOQhQJicX4nNc0K89ik-LxmOHE
 id: node.field_image
 field_name: field_image
 entity_type: node
diff --git a/config/optional/field.storage.node.field_tags.yml b/config/optional/field.storage.node.field_tags.yml
index fa5d039..a7c3231 100644
--- a/config/optional/field.storage.node.field_tags.yml
+++ b/config/optional/field.storage.node.field_tags.yml
@@ -1,4 +1,4 @@
-uuid: 15a902aa-6e1c-4377-80cc-966775e24d5a
+uuid: bd20c25d-4263-4e41-9c36-afaba86bf5a6
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/field.storage.oc_activity.field_a.yml b/config/optional/field.storage.oc_activity.field_a.yml
deleted file mode 100644
index 69d39c9..0000000
--- a/config/optional/field.storage.oc_activity.field_a.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-uuid: a8b74d6d-5733-41bc-9f22-dac1527b4d1a
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-    - options
-_core:
-  default_config_hash: eAETiBebyk1-tRTvK7MyCBEwiGkW-fanIWTLULX_Ud8
-id: oc_activity.field_a
-field_name: field_a
-entity_type: oc_activity
-type: list_integer
-settings:
-  allowed_values:
-    -
-      value: 1
-      label: '1'
-    -
-      value: 2
-      label: '2'
-    -
-      value: 3
-      label: '3'
-    -
-      value: 4
-      label: '4'
-    -
-      value: 5
-      label: '5'
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_activity.field_after_knowledge.yml b/config/optional/field.storage.oc_activity.field_after_knowledge.yml
deleted file mode 100644
index bc6da68..0000000
--- a/config/optional/field.storage.oc_activity.field_after_knowledge.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-uuid: 8edb37cc-c942-4a06-9d6a-02d42e764a6d
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-    - options
-_core:
-  default_config_hash: zcxLkIyBeqFDs3YDRz8uDIYGvgBbNL9w9WW4qVvRDXo
-id: oc_activity.field_after_knowledge
-field_name: field_after_knowledge
-entity_type: oc_activity
-type: list_integer
-settings:
-  allowed_values:
-    -
-      value: 1
-      label: '1'
-    -
-      value: 2
-      label: '2'
-    -
-      value: 3
-      label: '3'
-    -
-      value: 4
-      label: '4'
-    -
-      value: 5
-      label: '5'
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_activity.field_after_skills.yml b/config/optional/field.storage.oc_activity.field_after_skills.yml
deleted file mode 100644
index 708e24e..0000000
--- a/config/optional/field.storage.oc_activity.field_after_skills.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-uuid: 02f82da7-87ec-467a-84f4-00397cf23d8c
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-    - options
-_core:
-  default_config_hash: VsC4tTShJDQ8FsLoVs9RKu3kzpRL76qpiGcv5k9CAYA
-id: oc_activity.field_after_skills
-field_name: field_after_skills
-entity_type: oc_activity
-type: list_integer
-settings:
-  allowed_values:
-    -
-      value: 1
-      label: '1'
-    -
-      value: 2
-      label: '2'
-    -
-      value: 3
-      label: '3'
-    -
-      value: 4
-      label: '4'
-    -
-      value: 5
-      label: '5'
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_activity.field_age.yml b/config/optional/field.storage.oc_activity.field_age.yml
deleted file mode 100644
index 4327797..0000000
--- a/config/optional/field.storage.oc_activity.field_age.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-uuid: 29b0971b-1129-44f9-920a-5f6407543226
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-    - options
-_core:
-  default_config_hash: tBshsk7K-HRh0L8ZgG-WSRRNNJ26PzLfow2SzhT9nTI
-id: oc_activity.field_age
-field_name: field_age
-entity_type: oc_activity
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: under_18
-      label: 'Under 18'
-    -
-      value: 18-24
-      label: 18-24
-    -
-      value: 25-34
-      label: 25-34
-    -
-      value: 35-44
-      label: 35-44
-    -
-      value: 45-54
-      label: 45-54
-    -
-      value: 55+
-      label: 55+
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_activity.field_number_of_participants.yml b/config/optional/field.storage.oc_activity.field_amount.yml
similarity index 57%
rename from config/optional/field.storage.oc_activity.field_number_of_participants.yml
rename to config/optional/field.storage.oc_activity.field_amount.yml
index 2f30534..e40de4e 100644
--- a/config/optional/field.storage.oc_activity.field_number_of_participants.yml
+++ b/config/optional/field.storage.oc_activity.field_amount.yml
@@ -1,16 +1,16 @@
-uuid: 57f69986-0c4e-47c6-970e-3bca1c26703a
+uuid: 8debce06-7eff-4e3f-92e9-c9fba53201e7
 langcode: en
 status: true
 dependencies:
   module:
     - opencase_entities
-id: oc_activity.field_number_of_participants
-field_name: field_number_of_participants
+id: oc_activity.field_amount
+field_name: field_amount
 entity_type: oc_activity
-type: integer
+type: decimal
 settings:
-  unsigned: false
-  size: normal
+  precision: 10
+  scale: 2
 module: core
 locked: false
 cardinality: 1
diff --git a/config/optional/field.storage.oc_activity.field_before_confidence.yml b/config/optional/field.storage.oc_activity.field_before_confidence.yml
deleted file mode 100644
index a744b91..0000000
--- a/config/optional/field.storage.oc_activity.field_before_confidence.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-uuid: 2127b267-d245-4d2f-8e50-76727ff876bf
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-    - options
-_core:
-  default_config_hash: WKmFba0xOnp_24bVWVBVAlkRK_GeoLPHMvXHGKCq-l8
-id: oc_activity.field_before_confidence
-field_name: field_before_confidence
-entity_type: oc_activity
-type: list_integer
-settings:
-  allowed_values:
-    -
-      value: 1
-      label: '1'
-    -
-      value: 2
-      label: '2'
-    -
-      value: 3
-      label: '3'
-    -
-      value: 4
-      label: '4'
-    -
-      value: 5
-      label: '5'
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_activity.field_before_skills.yml b/config/optional/field.storage.oc_activity.field_before_skills.yml
deleted file mode 100644
index 68660b5..0000000
--- a/config/optional/field.storage.oc_activity.field_before_skills.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-uuid: cfd14804-0bd3-452f-8aa5-abdab885e7a9
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-    - options
-_core:
-  default_config_hash: WZdK-eer6kzqztK-Ck1v2nmCCPhFBFUANrFaPyzm9W8
-id: oc_activity.field_before_skills
-field_name: field_before_skills
-entity_type: oc_activity
-type: list_integer
-settings:
-  allowed_values:
-    -
-      value: 1
-      label: '1'
-    -
-      value: 2
-      label: '2'
-    -
-      value: 3
-      label: '3'
-    -
-      value: 4
-      label: '4'
-    -
-      value: 5
-      label: '5'
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_activity.field_ease.yml b/config/optional/field.storage.oc_activity.field_ease.yml
deleted file mode 100644
index c473c6d..0000000
--- a/config/optional/field.storage.oc_activity.field_ease.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-uuid: 02ef7714-def6-4b87-82e4-bc4969a12d7d
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-    - options
-_core:
-  default_config_hash: rtC-1PIsXwX9S410oT4ZUf2bDQpxRxYSwiIZfURadiw
-id: oc_activity.field_ease
-field_name: field_ease
-entity_type: oc_activity
-type: list_integer
-settings:
-  allowed_values:
-    -
-      value: 1
-      label: '1'
-    -
-      value: 2
-      label: '2'
-    -
-      value: 3
-      label: '3'
-    -
-      value: 4
-      label: '4'
-    -
-      value: 5
-      label: '5'
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_activity.field_d.yml b/config/optional/field.storage.oc_activity.field_funds_for.yml
similarity index 57%
rename from config/optional/field.storage.oc_activity.field_d.yml
rename to config/optional/field.storage.oc_activity.field_funds_for.yml
index 2e490b8..854777b 100644
--- a/config/optional/field.storage.oc_activity.field_d.yml
+++ b/config/optional/field.storage.oc_activity.field_funds_for.yml
@@ -1,27 +1,28 @@
-uuid: 64970cd7-d466-446c-9991-602ac9c1b207
+uuid: 68a8c62f-932f-45e5-ac6f-a789cf3e8d14
 langcode: en
 status: true
 dependencies:
   module:
     - opencase_entities
     - options
-_core:
-  default_config_hash: aFSukt9qGbt1EbLsNEdtQgiG5_rTsqaCobB-2KPgHIo
-id: oc_activity.field_d
-field_name: field_d
+id: oc_activity.field_funds_for
+field_name: field_funds_for
 entity_type: oc_activity
 type: list_string
 settings:
   allowed_values:
     -
-      value: 'yes'
-      label: 'Yes'
+      value: Travel
+      label: Travel
     -
-      value: 'no'
-      label: 'No'
+      value: Accommodation
+      label: Accommodation
     -
-      value: anonymous
-      label: Anonymous
+      value: Food
+      label: Food
+    -
+      value: Clothes
+      label: Clothes
   allowed_values_function: ''
 module: options
 locked: false
diff --git a/config/optional/field.storage.oc_activity.field_gender.yml b/config/optional/field.storage.oc_activity.field_gender.yml
deleted file mode 100644
index 47c52ff..0000000
--- a/config/optional/field.storage.oc_activity.field_gender.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-uuid: 0d7ba2a6-29c6-45b7-88e8-54ee69130fe5
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-    - options
-_core:
-  default_config_hash: hNITu_ziHfB26eJZFtp1SfFzXqsdk4CHvshYgQA7txk
-id: oc_activity.field_gender
-field_name: field_gender
-entity_type: oc_activity
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: man
-      label: Man
-    -
-      value: woman
-      label: Woman
-    -
-      value: non-binary
-      label: Non-Binary
-    -
-      value: trans-gnc
-      label: 'Trans / GNC'
-    -
-      value: trans-man
-      label: 'Trans man'
-    -
-      value: trans-woman
-      label: 'Trans woman'
-    -
-      value: trans-nb
-      label: 'Trans NB'
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_activity.field_issues_and_difficulties.yml b/config/optional/field.storage.oc_activity.field_issues_and_difficulties.yml
deleted file mode 100644
index 55e4b84..0000000
--- a/config/optional/field.storage.oc_activity.field_issues_and_difficulties.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 7209ef82-114c-47ef-90b1-8cd48bed5b92
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_entities
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_activity.field_issues_and_difficulties
-field_name: field_issues_and_difficulties
-entity_type: oc_activity
-type: string_long
-settings:
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_activity.field_issues_with_group_dynamics.yml b/config/optional/field.storage.oc_activity.field_issues_with_group_dynamics.yml
deleted file mode 100644
index 2285543..0000000
--- a/config/optional/field.storage.oc_activity.field_issues_with_group_dynamics.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 80805ad1-8098-4feb-a919-84c6b9021914
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_entities
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_activity.field_issues_with_group_dynamics
-field_name: field_issues_with_group_dynamics
-entity_type: oc_activity
-type: string_long
-settings:
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_activity.field_photo.yml b/config/optional/field.storage.oc_activity.field_photo.yml
deleted file mode 100644
index ad24179..0000000
--- a/config/optional/field.storage.oc_activity.field_photo.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-uuid: f7c9692b-44e9-443c-9d1d-251617a328c4
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - file
-    - image
-    - opencase_entities
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_activity.field_photo
-field_name: field_photo
-entity_type: oc_activity
-type: image
-settings:
-  target_type: file
-  display_field: false
-  display_default: false
-  uri_scheme: public
-  default_image:
-    uuid: ''
-    alt: ''
-    title: ''
-    width: null
-    height: null
-module: image
-locked: false
-cardinality: 3
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_activity.field_relevance.yml b/config/optional/field.storage.oc_activity.field_relevance.yml
deleted file mode 100644
index 2e6da8c..0000000
--- a/config/optional/field.storage.oc_activity.field_relevance.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-uuid: cc29550f-df91-49aa-a1f6-d3a4c44d92f3
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-    - options
-_core:
-  default_config_hash: HD1-Btt06fQHUtZQLEuRMT5iDoqTB0cZxMmRzDO_8vE
-id: oc_activity.field_relevance
-field_name: field_relevance
-entity_type: oc_activity
-type: list_integer
-settings:
-  allowed_values:
-    -
-      value: 1
-      label: '1'
-    -
-      value: 2
-      label: '2'
-    -
-      value: 3
-      label: '3'
-    -
-      value: 4
-      label: '4'
-    -
-      value: 5
-      label: '5'
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_activity.field_what_came_up_for_the_group.yml b/config/optional/field.storage.oc_activity.field_what_came_up_for_the_group.yml
deleted file mode 100644
index a952443..0000000
--- a/config/optional/field.storage.oc_activity.field_what_came_up_for_the_group.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: d3d85dca-fec7-47d5-8fe0-b8d8e3a0a5b7
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_entities
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_activity.field_what_came_up_for_the_group
-field_name: field_what_came_up_for_the_group
-entity_type: oc_activity
-type: string_long
-settings:
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_activity.field_what_could_be_improved_for.yml b/config/optional/field.storage.oc_activity.field_what_could_be_improved_for.yml
deleted file mode 100644
index 208272c..0000000
--- a/config/optional/field.storage.oc_activity.field_what_could_be_improved_for.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 0947f02a-10d7-4b74-937e-219950f4433e
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_entities
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_activity.field_what_could_be_improved_for
-field_name: field_what_could_be_improved_for
-entity_type: oc_activity
-type: string_long
-settings:
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_activity.field_what_did_facilitators_do_w.yml b/config/optional/field.storage.oc_activity.field_what_did_facilitators_do_w.yml
deleted file mode 100644
index 88105f8..0000000
--- a/config/optional/field.storage.oc_activity.field_what_did_facilitators_do_w.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: ecca472a-162a-4b07-ae04-8a1c190dc18a
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_entities
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_activity.field_what_did_facilitators_do_w
-field_name: field_what_did_facilitators_do_w
-entity_type: oc_activity
-type: string_long
-settings:
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_activity.field_what_real_scenarios_or_inc.yml b/config/optional/field.storage.oc_activity.field_what_real_scenarios_or_inc.yml
deleted file mode 100644
index 9bbecda..0000000
--- a/config/optional/field.storage.oc_activity.field_what_real_scenarios_or_inc.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: a2849bdf-0637-4f33-8105-440d37aea937
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_entities
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_activity.field_what_real_scenarios_or_inc
-field_name: field_what_real_scenarios_or_inc
-entity_type: oc_activity
-type: string_long
-settings:
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_actor.feeds_item.yml b/config/optional/field.storage.oc_actor.feeds_item.yml
deleted file mode 100644
index 29afd29..0000000
--- a/config/optional/field.storage.oc_actor.feeds_item.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: fbac65af-99cb-46cc-911c-04a831121ecf
-langcode: en
-status: true
-dependencies:
-  module:
-    - feeds
-    - opencase_entities
-id: oc_actor.feeds_item
-field_name: feeds_item
-entity_type: oc_actor
-type: feeds_item
-settings:
-  target_type: feeds_feed
-module: feeds
-locked: false
-cardinality: 1
-translatable: false
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_actor.field_asylum_status.yml b/config/optional/field.storage.oc_actor.field_asylum_status.yml
new file mode 100644
index 0000000..f9c6b1e
--- /dev/null
+++ b/config/optional/field.storage.oc_actor.field_asylum_status.yml
@@ -0,0 +1,27 @@
+uuid: 2397ef56-c208-47f2-93e6-3e18e643ed21
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_actor.field_asylum_status
+field_name: field_asylum_status
+entity_type: oc_actor
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: Refused
+      label: Refused
+    -
+      value: 'Leave to remain'
+      label: 'Leave to remain'
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_actor.field_availability.yml b/config/optional/field.storage.oc_actor.field_availability.yml
deleted file mode 100644
index 1f19871..0000000
--- a/config/optional/field.storage.oc_actor.field_availability.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: a41d7d19-2153-4a2c-8077-48792b9615e2
-langcode: en
-status: true
-dependencies:
-  module:
-    - entity_reference_revisions
-    - opencase_entities
-    - paragraphs
-_core:
-  default_config_hash: iEcyO_vDrm8cFFMgArr5ae_Rkj9hmSmB9Lgnp5P3hqw
-id: oc_actor.field_availability
-field_name: field_availability
-entity_type: oc_actor
-type: entity_reference_revisions
-settings:
-  target_type: paragraph
-module: entity_reference_revisions
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_actor.field_photo.yml b/config/optional/field.storage.oc_actor.field_confidentiality_form.yml
similarity index 59%
rename from config/optional/field.storage.oc_actor.field_photo.yml
rename to config/optional/field.storage.oc_actor.field_confidentiality_form.yml
index 25eaf46..355eb22 100644
--- a/config/optional/field.storage.oc_actor.field_photo.yml
+++ b/config/optional/field.storage.oc_actor.field_confidentiality_form.yml
@@ -1,27 +1,20 @@
-uuid: ba934278-2836-426a-b0c9-9ab5d197d7bd
+uuid: 65ba7f58-f449-440e-b014-10cb33571cd2
 langcode: en
 status: true
 dependencies:
   module:
     - file
-    - image
     - opencase_entities
-id: oc_actor.field_photo
-field_name: field_photo
+id: oc_actor.field_confidentiality_form
+field_name: field_confidentiality_form
 entity_type: oc_actor
-type: image
+type: file
 settings:
   target_type: file
   display_field: false
   display_default: false
   uri_scheme: private
-  default_image:
-    uuid: ''
-    alt: ''
-    title: ''
-    width: null
-    height: null
-module: image
+module: file
 locked: false
 cardinality: 1
 translatable: true
diff --git a/config/optional/field.storage.oc_case.field_contract_signed_date.yml b/config/optional/field.storage.oc_actor.field_date_of_birth.yml
similarity index 59%
rename from config/optional/field.storage.oc_case.field_contract_signed_date.yml
rename to config/optional/field.storage.oc_actor.field_date_of_birth.yml
index d2f8d09..cd2f21b 100644
--- a/config/optional/field.storage.oc_case.field_contract_signed_date.yml
+++ b/config/optional/field.storage.oc_actor.field_date_of_birth.yml
@@ -1,13 +1,13 @@
-uuid: c4e38c7c-996c-4274-96a9-281b97a2ca7d
+uuid: c39a8fc0-05e3-4edc-bd44-2489a2942a77
 langcode: en
 status: true
 dependencies:
   module:
     - datetime
-    - opencase_cases
-id: oc_case.field_contract_signed_date
-field_name: field_contract_signed_date
-entity_type: oc_case
+    - opencase_entities
+id: oc_actor.field_date_of_birth
+field_name: field_date_of_birth
+entity_type: oc_actor
 type: datetime
 settings:
   datetime_type: date
diff --git a/config/optional/field.storage.oc_actor.field_delivery_partners.yml b/config/optional/field.storage.oc_actor.field_delivery_partners.yml
deleted file mode 100644
index 7fdc402..0000000
--- a/config/optional/field.storage.oc_actor.field_delivery_partners.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: a0cf72a1-20aa-46a1-81ad-2b56ba32dad1
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_entities
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: 9ei99N74ZNdmEq1IdFkYgnp6wJG2TS0_oF64xC6ftr0
-id: oc_actor.field_delivery_partners
-field_name: field_delivery_partners
-entity_type: oc_actor
-type: entity_reference
-settings:
-  target_type: oc_organisation
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_actor.field_dependants.yml b/config/optional/field.storage.oc_actor.field_dependants.yml
new file mode 100644
index 0000000..5f0fbf7
--- /dev/null
+++ b/config/optional/field.storage.oc_actor.field_dependants.yml
@@ -0,0 +1,21 @@
+uuid: 576f678d-0194-4ab1-89f3-5f4993d85c6f
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+id: oc_actor.field_dependants
+field_name: field_dependants
+entity_type: oc_actor
+type: string
+settings:
+  max_length: 255
+  case_sensitive: false
+  is_ascii: false
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_actor.field_pronoun.yml b/config/optional/field.storage.oc_actor.field_disability.yml
similarity index 60%
rename from config/optional/field.storage.oc_actor.field_pronoun.yml
rename to config/optional/field.storage.oc_actor.field_disability.yml
index 4b70ed9..cb17a70 100644
--- a/config/optional/field.storage.oc_actor.field_pronoun.yml
+++ b/config/optional/field.storage.oc_actor.field_disability.yml
@@ -1,17 +1,15 @@
-uuid: eadda086-566e-4bbf-8b08-88f10828b965
+uuid: d966e557-9e6a-4638-961e-914cc7a7f1c2
 langcode: en
 status: true
 dependencies:
   module:
     - opencase_entities
-_core:
-  default_config_hash: sb0fDlaExhG5KOO042ZM6NKu_79zjfwowDlIvqVt91M
-id: oc_actor.field_pronoun
-field_name: field_pronoun
+id: oc_actor.field_disability
+field_name: field_disability
 entity_type: oc_actor
 type: string
 settings:
-  max_length: 50
+  max_length: 255
   case_sensitive: false
   is_ascii: false
 module: core
diff --git a/config/optional/field.storage.oc_actor.field_emergency_contact.yml b/config/optional/field.storage.oc_actor.field_emergency_contact.yml
deleted file mode 100644
index 2ccb881..0000000
--- a/config/optional/field.storage.oc_actor.field_emergency_contact.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 5c8c64d7-7b72-434a-bc48-5a77b262d9a0
-langcode: en
-status: true
-dependencies:
-  module:
-    - entity_reference_revisions
-    - opencase_entities
-    - paragraphs
-_core:
-  default_config_hash: feZyTus_JRFILnz4C6SoeFF2f9_eQmOjf6JlY-36428
-id: oc_actor.field_emergency_contact
-field_name: field_emergency_contact
-entity_type: oc_actor
-type: entity_reference_revisions
-settings:
-  target_type: paragraph
-module: entity_reference_revisions
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_actor.field_equal_opportunities.yml b/config/optional/field.storage.oc_actor.field_equal_opportunities.yml
deleted file mode 100644
index b946572..0000000
--- a/config/optional/field.storage.oc_actor.field_equal_opportunities.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 650111fc-ea45-4ba2-b0df-231ed9a68567
-langcode: en
-status: true
-dependencies:
-  module:
-    - entity_reference_revisions
-    - opencase_entities
-    - paragraphs
-_core:
-  default_config_hash: d_-uU7v_nG2Uz5d-Ki1sQYnexKhqNHymokaXW2nk9ok
-id: oc_actor.field_equal_opportunities
-field_name: field_equal_opportunities
-entity_type: oc_actor
-type: entity_reference_revisions
-settings:
-  target_type: paragraph
-module: entity_reference_revisions
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.paragraph.field_name.yml b/config/optional/field.storage.oc_actor.field_ethnic_o.yml
similarity index 55%
rename from config/optional/field.storage.paragraph.field_name.yml
rename to config/optional/field.storage.oc_actor.field_ethnic_o.yml
index 71fb786..b2d0c5b 100644
--- a/config/optional/field.storage.paragraph.field_name.yml
+++ b/config/optional/field.storage.oc_actor.field_ethnic_o.yml
@@ -1,14 +1,12 @@
-uuid: 6c79d3e9-193b-4fa9-afab-bf5d679182c0
+uuid: cd672f52-26dd-4773-be89-f2f12c5e41f2
 langcode: en
 status: true
 dependencies:
   module:
-    - paragraphs
-_core:
-  default_config_hash: EXozQGm8wr-TU04mjqcx5Mm4ua0s-LLA7-8C3LS40tQ
-id: paragraph.field_name
-field_name: field_name
-entity_type: paragraph
+    - opencase_entities
+id: oc_actor.field_ethnic_o
+field_name: field_ethnic_o
+entity_type: oc_actor
 type: string
 settings:
   max_length: 255
diff --git a/config/optional/field.storage.oc_actor.field_gender_identified_with.yml b/config/optional/field.storage.oc_actor.field_gender_identified_with.yml
new file mode 100644
index 0000000..5d04372
--- /dev/null
+++ b/config/optional/field.storage.oc_actor.field_gender_identified_with.yml
@@ -0,0 +1,30 @@
+uuid: 4340ee58-d00d-40da-a1e4-f8b2306678e1
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_actor.field_gender_identified_with
+field_name: field_gender_identified_with
+entity_type: oc_actor
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: Male
+      label: Male
+    -
+      value: Female
+      label: Female
+    -
+      value: 'Non specific'
+      label: 'Non specific'
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_activity.field_caption_for_photo.yml b/config/optional/field.storage.oc_actor.field_general_noes.yml
similarity index 63%
rename from config/optional/field.storage.oc_activity.field_caption_for_photo.yml
rename to config/optional/field.storage.oc_actor.field_general_noes.yml
index 9aba0ce..b138a13 100644
--- a/config/optional/field.storage.oc_activity.field_caption_for_photo.yml
+++ b/config/optional/field.storage.oc_actor.field_general_noes.yml
@@ -1,12 +1,12 @@
-uuid: efe1c754-c21b-4bc9-a8ef-3f238c87edf3
+uuid: 6d2f6e3a-9113-4b58-994e-799a0d8c1fd9
 langcode: en
 status: true
 dependencies:
   module:
     - opencase_entities
-id: oc_activity.field_caption_for_photo
-field_name: field_caption_for_photo
-entity_type: oc_activity
+id: oc_actor.field_general_noes
+field_name: field_general_noes
+entity_type: oc_actor
 type: string_long
 settings:
   case_sensitive: false
diff --git a/config/optional/field.storage.oc_actor.field_how_heard.yml b/config/optional/field.storage.oc_actor.field_how_heard.yml
new file mode 100644
index 0000000..1c2269f
--- /dev/null
+++ b/config/optional/field.storage.oc_actor.field_how_heard.yml
@@ -0,0 +1,39 @@
+uuid: 97fa81ee-22fc-4d70-b3ec-a04eda7cca81
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_actor.field_how_heard
+field_name: field_how_heard
+entity_type: oc_actor
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: 'Referral (state by whom)'
+      label: 'Referral (state by whom)'
+    -
+      value: Leaflet
+      label: Leaflet
+    -
+      value: Website
+      label: Website
+    -
+      value: Facebook
+      label: Facebook
+    -
+      value: 'Word of mouth'
+      label: 'Word of mouth'
+    -
+      value: 'Existing client'
+      label: 'Existing client'
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_actor.field_income.yml b/config/optional/field.storage.oc_actor.field_income.yml
new file mode 100644
index 0000000..83630d5
--- /dev/null
+++ b/config/optional/field.storage.oc_actor.field_income.yml
@@ -0,0 +1,33 @@
+uuid: 96574864-35c8-43be-ba99-6c9ba4a86632
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_actor.field_income
+field_name: field_income
+entity_type: oc_actor
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: 'Asylum support'
+      label: 'Asylum support'
+    -
+      value: 'Welfare benefits'
+      label: 'Welfare benefits'
+    -
+      value: Working
+      label: Working
+    -
+      value: 'No legal income'
+      label: 'No legal income'
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_actor.field_languages_spoken.yml b/config/optional/field.storage.oc_actor.field_languages_spoken.yml
new file mode 100644
index 0000000..37ff5b4
--- /dev/null
+++ b/config/optional/field.storage.oc_actor.field_languages_spoken.yml
@@ -0,0 +1,36 @@
+uuid: 4773657a-de38-4477-91f8-eb8e015d5e7f
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_actor.field_languages_spoken
+field_name: field_languages_spoken
+entity_type: oc_actor
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: English
+      label: English
+    -
+      value: French
+      label: French
+    -
+      value: Arabic
+      label: Arabic
+    -
+      value: Kurdish
+      label: Kurdish
+    -
+      value: Farsi
+      label: Farsi
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_actor.field_languages_spoken_fluently.yml b/config/optional/field.storage.oc_actor.field_languages_spoken_fluently.yml
deleted file mode 100644
index effea6e..0000000
--- a/config/optional/field.storage.oc_actor.field_languages_spoken_fluently.yml
+++ /dev/null
@@ -1,239 +0,0 @@
-uuid: 68e47064-be63-4faa-aaac-fcf43fc0f48a
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-    - options
-_core:
-  default_config_hash: wvbzj9yyOsnxMR2Rau3n-QIy9LBtFyQnh_8cJbLtVfc
-id: oc_actor.field_languages_spoken_fluently
-field_name: field_languages_spoken_fluently
-entity_type: oc_actor
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: Afrikanns
-      label: Afrikanns
-    -
-      value: Albanian
-      label: Albanian
-    -
-      value: Arabic
-      label: Arabic
-    -
-      value: Armenian
-      label: Armenian
-    -
-      value: Basque
-      label: Basque
-    -
-      value: Bengali
-      label: Bengali
-    -
-      value: Bulgarian
-      label: Bulgarian
-    -
-      value: Catalan
-      label: Catalan
-    -
-      value: Cambodian
-      label: Cambodian
-    -
-      value: 'Chinese (Mandarin)'
-      label: 'Chinese (Mandarin)'
-    -
-      value: Croation
-      label: Croation
-    -
-      value: Czech
-      label: Czech
-    -
-      value: Danish
-      label: Danish
-    -
-      value: Dutch
-      label: Dutch
-    -
-      value: English
-      label: English
-    -
-      value: Estonian
-      label: Estonian
-    -
-      value: Fiji
-      label: Fiji
-    -
-      value: Finnish
-      label: Finnish
-    -
-      value: French
-      label: French
-    -
-      value: Georgian
-      label: Georgian
-    -
-      value: German
-      label: German
-    -
-      value: Greek
-      label: Greek
-    -
-      value: Gujarati
-      label: Gujarati
-    -
-      value: Hebrew
-      label: Hebrew
-    -
-      value: Hindi
-      label: Hindi
-    -
-      value: Hungarian
-      label: Hungarian
-    -
-      value: Icelandic
-      label: Icelandic
-    -
-      value: Indonesian
-      label: Indonesian
-    -
-      value: Irish
-      label: Irish
-    -
-      value: Italian
-      label: Italian
-    -
-      value: Japanese
-      label: Japanese
-    -
-      value: Javanese
-      label: Javanese
-    -
-      value: Korean
-      label: Korean
-    -
-      value: Latin
-      label: Latin
-    -
-      value: Latvian
-      label: Latvian
-    -
-      value: Lithuanian
-      label: Lithuanian
-    -
-      value: Macedonian
-      label: Macedonian
-    -
-      value: Malay
-      label: Malay
-    -
-      value: Malayalam
-      label: Malayalam
-    -
-      value: Maltese
-      label: Maltese
-    -
-      value: Maori
-      label: Maori
-    -
-      value: Marathi
-      label: Marathi
-    -
-      value: Mongolian
-      label: Mongolian
-    -
-      value: Nepali
-      label: Nepali
-    -
-      value: Norwegian
-      label: Norwegian
-    -
-      value: Persian
-      label: Persian
-    -
-      value: Polish
-      label: Polish
-    -
-      value: Portuguese
-      label: Portuguese
-    -
-      value: Punjabi
-      label: Punjabi
-    -
-      value: Quechua
-      label: Quechua
-    -
-      value: Romanian
-      label: Romanian
-    -
-      value: Russian
-      label: Russian
-    -
-      value: Samoan
-      label: Samoan
-    -
-      value: Serbian
-      label: Serbian
-    -
-      value: Slovak
-      label: Slovak
-    -
-      value: Slovenian
-      label: Slovenian
-    -
-      value: Spanish
-      label: Spanish
-    -
-      value: Swahili
-      label: Swahili
-    -
-      value: Swedish
-      label: Swedish
-    -
-      value: Tamil
-      label: Tamil
-    -
-      value: Tatar
-      label: Tatar
-    -
-      value: Telugu
-      label: Telugu
-    -
-      value: Thai
-      label: Thai
-    -
-      value: Tibetan
-      label: Tibetan
-    -
-      value: Tonga
-      label: Tonga
-    -
-      value: Turkish
-      label: Turkish
-    -
-      value: Ukranian
-      label: Ukranian
-    -
-      value: Urdu
-      label: Urdu
-    -
-      value: Uzbek
-      label: Uzbek
-    -
-      value: Vietnamese
-      label: Vietnamese
-    -
-      value: Welsh
-      label: Welsh
-    -
-      value: Xhosa
-      label: Xhosa
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_actor.field_marital_.yml b/config/optional/field.storage.oc_actor.field_marital_.yml
new file mode 100644
index 0000000..18bef22
--- /dev/null
+++ b/config/optional/field.storage.oc_actor.field_marital_.yml
@@ -0,0 +1,30 @@
+uuid: 252a2b96-3e9c-4d92-b385-4a68155e9eaa
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_actor.field_marital_
+field_name: field_marital_
+entity_type: oc_actor
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: Married
+      label: Married
+    -
+      value: Single
+      label: Single
+    -
+      value: 'In a civil partnership'
+      label: 'In a civil partnership'
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_actor.field_nationalities.yml b/config/optional/field.storage.oc_actor.field_nationalities.yml
new file mode 100644
index 0000000..820f49a
--- /dev/null
+++ b/config/optional/field.storage.oc_actor.field_nationalities.yml
@@ -0,0 +1,615 @@
+uuid: b8b0b008-4eb9-48e4-b2d8-d699fb5dc38a
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_actor.field_nationalities
+field_name: field_nationalities
+entity_type: oc_actor
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: Stateless
+      label: Stateless
+    -
+      value: Afghan
+      label: Afghan
+    -
+      value: Albanian
+      label: Albanian
+    -
+      value: Algerian
+      label: Algerian
+    -
+      value: American
+      label: American
+    -
+      value: Andorran
+      label: Andorran
+    -
+      value: Angolan
+      label: Angolan
+    -
+      value: Antiguans
+      label: Antiguans
+    -
+      value: Argentinean
+      label: Argentinean
+    -
+      value: Armenian
+      label: Armenian
+    -
+      value: Australian
+      label: Australian
+    -
+      value: Austrian
+      label: Austrian
+    -
+      value: Azerbaijani
+      label: Azerbaijani
+    -
+      value: Bahamian
+      label: Bahamian
+    -
+      value: Bahraini
+      label: Bahraini
+    -
+      value: Bangladeshi
+      label: Bangladeshi
+    -
+      value: Barbadian
+      label: Barbadian
+    -
+      value: Barbudans
+      label: Barbudans
+    -
+      value: Batswana
+      label: Batswana
+    -
+      value: Belarusian
+      label: Belarusian
+    -
+      value: Belgian
+      label: Belgian
+    -
+      value: Belizean
+      label: Belizean
+    -
+      value: Beninese
+      label: Beninese
+    -
+      value: Bhutanese
+      label: Bhutanese
+    -
+      value: Bolivian
+      label: Bolivian
+    -
+      value: Bosnian
+      label: Bosnian
+    -
+      value: Brazilian
+      label: Brazilian
+    -
+      value: British
+      label: British
+    -
+      value: Bruneian
+      label: Bruneian
+    -
+      value: Bulgarian
+      label: Bulgarian
+    -
+      value: Burkinabe
+      label: Burkinabe
+    -
+      value: Burmese
+      label: Burmese
+    -
+      value: Burundian
+      label: Burundian
+    -
+      value: Cambodian
+      label: Cambodian
+    -
+      value: Cameroonian
+      label: Cameroonian
+    -
+      value: Canadian
+      label: Canadian
+    -
+      value: 'Cape Verdean'
+      label: 'Cape Verdean'
+    -
+      value: 'Central African'
+      label: 'Central African'
+    -
+      value: Chadian
+      label: Chadian
+    -
+      value: Chilean
+      label: Chilean
+    -
+      value: Chinese
+      label: Chinese
+    -
+      value: Colombian
+      label: Colombian
+    -
+      value: Comoran
+      label: Comoran
+    -
+      value: Congolese
+      label: Congolese
+    -
+      value: 'Costa Rican'
+      label: 'Costa Rican'
+    -
+      value: Croatian
+      label: Croatian
+    -
+      value: Cuban
+      label: Cuban
+    -
+      value: Cypriot
+      label: Cypriot
+    -
+      value: Czech
+      label: Czech
+    -
+      value: Danish
+      label: Danish
+    -
+      value: Djibouti
+      label: Djibouti
+    -
+      value: Dominican
+      label: Dominican
+    -
+      value: Dutch
+      label: Dutch
+    -
+      value: Dutchman
+      label: Dutchman
+    -
+      value: Dutchwoman
+      label: Dutchwoman
+    -
+      value: 'East Timorese'
+      label: 'East Timorese'
+    -
+      value: Ecuadorean
+      label: Ecuadorean
+    -
+      value: Egyptian
+      label: Egyptian
+    -
+      value: Emirian
+      label: Emirian
+    -
+      value: 'Equatorial Guinean'
+      label: 'Equatorial Guinean'
+    -
+      value: Eritrean
+      label: Eritrean
+    -
+      value: Estonian
+      label: Estonian
+    -
+      value: Ethiopian
+      label: Ethiopian
+    -
+      value: Fijian
+      label: Fijian
+    -
+      value: Filipino
+      label: Filipino
+    -
+      value: Finnish
+      label: Finnish
+    -
+      value: French
+      label: French
+    -
+      value: Gabonese
+      label: Gabonese
+    -
+      value: Gambian
+      label: Gambian
+    -
+      value: Georgian
+      label: Georgian
+    -
+      value: German
+      label: German
+    -
+      value: Ghanaian
+      label: Ghanaian
+    -
+      value: Greek
+      label: Greek
+    -
+      value: Grenadian
+      label: Grenadian
+    -
+      value: Guatemalan
+      label: Guatemalan
+    -
+      value: Guinea-Bissauan
+      label: Guinea-Bissauan
+    -
+      value: Guinean
+      label: Guinean
+    -
+      value: Guyanese
+      label: Guyanese
+    -
+      value: Haitian
+      label: Haitian
+    -
+      value: Herzegovinian
+      label: Herzegovinian
+    -
+      value: Honduran
+      label: Honduran
+    -
+      value: Hungarian
+      label: Hungarian
+    -
+      value: I-Kiribati
+      label: I-Kiribati
+    -
+      value: Icelander
+      label: Icelander
+    -
+      value: Indian
+      label: Indian
+    -
+      value: Indonesian
+      label: Indonesian
+    -
+      value: Iranian
+      label: Iranian
+    -
+      value: Iraqi
+      label: Iraqi
+    -
+      value: Irish
+      label: Irish
+    -
+      value: Israeli
+      label: Israeli
+    -
+      value: Italian
+      label: Italian
+    -
+      value: Ivorian
+      label: Ivorian
+    -
+      value: Jamaican
+      label: Jamaican
+    -
+      value: Japanese
+      label: Japanese
+    -
+      value: Jordanian
+      label: Jordanian
+    -
+      value: Kazakhstani
+      label: Kazakhstani
+    -
+      value: Kenyan
+      label: Kenyan
+    -
+      value: 'Kittian and Nevisian'
+      label: 'Kittian and Nevisian'
+    -
+      value: Kuwaiti
+      label: Kuwaiti
+    -
+      value: Kyrgyz
+      label: Kyrgyz
+    -
+      value: Laotian
+      label: Laotian
+    -
+      value: Latvian
+      label: Latvian
+    -
+      value: Lebanese
+      label: Lebanese
+    -
+      value: Liberian
+      label: Liberian
+    -
+      value: Libyan
+      label: Libyan
+    -
+      value: Liechtensteiner
+      label: Liechtensteiner
+    -
+      value: Lithuanian
+      label: Lithuanian
+    -
+      value: Luxembourger
+      label: Luxembourger
+    -
+      value: Macedonian
+      label: Macedonian
+    -
+      value: Malagasy
+      label: Malagasy
+    -
+      value: Malawian
+      label: Malawian
+    -
+      value: Malaysian
+      label: Malaysian
+    -
+      value: Maldivan
+      label: Maldivan
+    -
+      value: Malian
+      label: Malian
+    -
+      value: Maltese
+      label: Maltese
+    -
+      value: Marshallese
+      label: Marshallese
+    -
+      value: Mauritanian
+      label: Mauritanian
+    -
+      value: Mauritian
+      label: Mauritian
+    -
+      value: Mexican
+      label: Mexican
+    -
+      value: Micronesian
+      label: Micronesian
+    -
+      value: Moldovan
+      label: Moldovan
+    -
+      value: Monacan
+      label: Monacan
+    -
+      value: Mongolian
+      label: Mongolian
+    -
+      value: Moroccan
+      label: Moroccan
+    -
+      value: Mosotho
+      label: Mosotho
+    -
+      value: Motswana
+      label: Motswana
+    -
+      value: Mozambican
+      label: Mozambican
+    -
+      value: Namibian
+      label: Namibian
+    -
+      value: Nauruan
+      label: Nauruan
+    -
+      value: Nepalese
+      label: Nepalese
+    -
+      value: Netherlander
+      label: Netherlander
+    -
+      value: 'New Zealander'
+      label: 'New Zealander'
+    -
+      value: Ni-Vanuatu
+      label: Ni-Vanuatu
+    -
+      value: Nicaraguan
+      label: Nicaraguan
+    -
+      value: Nigerian
+      label: Nigerian
+    -
+      value: Nigerien
+      label: Nigerien
+    -
+      value: 'North Korean'
+      label: 'North Korean'
+    -
+      value: 'Northern Irish'
+      label: 'Northern Irish'
+    -
+      value: Norwegian
+      label: Norwegian
+    -
+      value: Omani
+      label: Omani
+    -
+      value: Pakistani
+      label: Pakistani
+    -
+      value: Palauan
+      label: Palauan
+    -
+      value: Panamanian
+      label: Panamanian
+    -
+      value: 'Papua New Guinean'
+      label: 'Papua New Guinean'
+    -
+      value: Paraguayan
+      label: Paraguayan
+    -
+      value: Peruvian
+      label: Peruvian
+    -
+      value: Polish
+      label: Polish
+    -
+      value: Portuguese
+      label: Portuguese
+    -
+      value: Qatari
+      label: Qatari
+    -
+      value: Romanian
+      label: Romanian
+    -
+      value: Russian
+      label: Russian
+    -
+      value: Rwandan
+      label: Rwandan
+    -
+      value: 'Saint Lucian'
+      label: 'Saint Lucian'
+    -
+      value: Salvadoran
+      label: Salvadoran
+    -
+      value: Samoan
+      label: Samoan
+    -
+      value: 'San Marinese'
+      label: 'San Marinese'
+    -
+      value: 'Sao Tomean'
+      label: 'Sao Tomean'
+    -
+      value: Saudi
+      label: Saudi
+    -
+      value: Scottish
+      label: Scottish
+    -
+      value: Senegalese
+      label: Senegalese
+    -
+      value: Serbian
+      label: Serbian
+    -
+      value: Seychellois
+      label: Seychellois
+    -
+      value: 'Sierra Leonean'
+      label: 'Sierra Leonean'
+    -
+      value: Singaporean
+      label: Singaporean
+    -
+      value: Slovakian
+      label: Slovakian
+    -
+      value: Slovenian
+      label: Slovenian
+    -
+      value: 'Solomon Islander'
+      label: 'Solomon Islander'
+    -
+      value: Somali
+      label: Somali
+    -
+      value: 'South African'
+      label: 'South African'
+    -
+      value: 'South Korean'
+      label: 'South Korean'
+    -
+      value: Spanish
+      label: Spanish
+    -
+      value: 'Sri Lankan'
+      label: 'Sri Lankan'
+    -
+      value: Sudanese
+      label: Sudanese
+    -
+      value: Surinamer
+      label: Surinamer
+    -
+      value: Swazi
+      label: Swazi
+    -
+      value: Swedish
+      label: Swedish
+    -
+      value: Swiss
+      label: Swiss
+    -
+      value: Syrian
+      label: Syrian
+    -
+      value: Taiwanese
+      label: Taiwanese
+    -
+      value: Tajik
+      label: Tajik
+    -
+      value: Tanzanian
+      label: Tanzanian
+    -
+      value: Thai
+      label: Thai
+    -
+      value: Togolese
+      label: Togolese
+    -
+      value: Tongan
+      label: Tongan
+    -
+      value: 'Trinidadian or Tobagonian'
+      label: 'Trinidadian or Tobagonian'
+    -
+      value: Tunisian
+      label: Tunisian
+    -
+      value: Turkish
+      label: Turkish
+    -
+      value: Tuvaluan
+      label: Tuvaluan
+    -
+      value: Ugandan
+      label: Ugandan
+    -
+      value: Ukrainian
+      label: Ukrainian
+    -
+      value: Uruguayan
+      label: Uruguayan
+    -
+      value: Uzbekistani
+      label: Uzbekistani
+    -
+      value: Venezuelan
+      label: Venezuelan
+    -
+      value: Vietnamese
+      label: Vietnamese
+    -
+      value: Welsh
+      label: Welsh
+    -
+      value: Yemenite
+      label: Yemenite
+    -
+      value: Zambian
+      label: Zambian
+    -
+      value: Zimbabwean
+      label: Zimbabwean
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_actor.field_osic_level.yml b/config/optional/field.storage.oc_actor.field_osic_level.yml
new file mode 100644
index 0000000..1e984d7
--- /dev/null
+++ b/config/optional/field.storage.oc_actor.field_osic_level.yml
@@ -0,0 +1,33 @@
+uuid: e5a9d468-5e8c-496b-9eda-fcf585663736
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_actor.field_osic_level
+field_name: field_osic_level
+entity_type: oc_actor
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: 'Under supervision'
+      label: 'Under supervision'
+    -
+      value: 'Level 1'
+      label: 'Level 1'
+    -
+      value: 'Level 2'
+      label: 'Level 2'
+    -
+      value: 'Level 3'
+      label: 'Level 3'
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_actor.field_referred_by.yml b/config/optional/field.storage.oc_actor.field_referred_by.yml
new file mode 100644
index 0000000..b973ec6
--- /dev/null
+++ b/config/optional/field.storage.oc_actor.field_referred_by.yml
@@ -0,0 +1,21 @@
+uuid: 32971cf5-3894-4ff4-8334-a6f6b61e2b56
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+id: oc_actor.field_referred_by
+field_name: field_referred_by
+entity_type: oc_actor
+type: string
+settings:
+  max_length: 255
+  case_sensitive: false
+  is_ascii: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_actor.field_sex.yml b/config/optional/field.storage.oc_actor.field_sex.yml
new file mode 100644
index 0000000..1dd2a26
--- /dev/null
+++ b/config/optional/field.storage.oc_actor.field_sex.yml
@@ -0,0 +1,27 @@
+uuid: 46e8a8ae-6f61-4c02-81b7-3a9cbf9a616d
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_actor.field_sex
+field_name: field_sex
+entity_type: oc_actor
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: Male
+      label: Male
+    -
+      value: Female
+      label: Female
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_actor.field_notes.yml b/config/optional/field.storage.oc_actor.field_skills.yml
similarity index 62%
rename from config/optional/field.storage.oc_actor.field_notes.yml
rename to config/optional/field.storage.oc_actor.field_skills.yml
index f555dc5..8d06215 100644
--- a/config/optional/field.storage.oc_actor.field_notes.yml
+++ b/config/optional/field.storage.oc_actor.field_skills.yml
@@ -1,13 +1,11 @@
-uuid: 3d00b9b2-cbcf-449e-9b9f-e2d3953390d3
+uuid: b6fbe87d-9c41-4ad1-902a-75be73bbe23d
 langcode: en
 status: true
 dependencies:
   module:
     - opencase_entities
-_core:
-  default_config_hash: lNDtrlurQvqBRVnItkYiqMptdz_Z3V2LMRuH139C-KI
-id: oc_actor.field_notes
-field_name: field_notes
+id: oc_actor.field_skills
+field_name: field_skills
 entity_type: oc_actor
 type: string_long
 settings:
diff --git a/config/optional/field.storage.oc_case.feeds_item.yml b/config/optional/field.storage.oc_case.feeds_item.yml
deleted file mode 100644
index e77a4c0..0000000
--- a/config/optional/field.storage.oc_case.feeds_item.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: afe9a9ff-1fe9-42a5-aeae-52dfd8d4108b
-langcode: en
-status: true
-dependencies:
-  module:
-    - feeds
-    - opencase_cases
-id: oc_case.feeds_item
-field_name: feeds_item
-entity_type: oc_case
-type: feeds_item
-settings:
-  target_type: feeds_feed
-module: feeds
-locked: false
-cardinality: 1
-translatable: false
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_case.field_case_finance.yml b/config/optional/field.storage.oc_case.field_case_finance.yml
new file mode 100644
index 0000000..79b01d0
--- /dev/null
+++ b/config/optional/field.storage.oc_case.field_case_finance.yml
@@ -0,0 +1,27 @@
+uuid: 6ce98b3d-d156-44c0-9d8f-6624aa62bc24
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_case.field_case_finance
+field_name: field_case_finance
+entity_type: oc_case
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: Paid
+      label: Paid
+    -
+      value: 'Pro bono'
+      label: 'Pro bono'
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_case.field_date_of_training.yml b/config/optional/field.storage.oc_case.field_date_of_training.yml
deleted file mode 100644
index 04a1a51..0000000
--- a/config/optional/field.storage.oc_case.field_date_of_training.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: c8df6773-3c2f-4cc8-8063-92aa3a4480f9
-langcode: en
-status: true
-dependencies:
-  module:
-    - datetime
-    - field_permissions
-    - opencase_cases
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: vaT16NjWGciiIYaWSvJsWuY5D_LMWZBk9XE3cC6NOss
-id: oc_case.field_date_of_training
-field_name: field_date_of_training
-entity_type: oc_case
-type: datetime
-settings:
-  datetime_type: datetime
-module: datetime
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_actor.field_active.yml b/config/optional/field.storage.oc_case.field_gave_list_of_agencies.yml
similarity index 52%
rename from config/optional/field.storage.oc_actor.field_active.yml
rename to config/optional/field.storage.oc_case.field_gave_list_of_agencies.yml
index 1d8f052..88fca6a 100644
--- a/config/optional/field.storage.oc_actor.field_active.yml
+++ b/config/optional/field.storage.oc_case.field_gave_list_of_agencies.yml
@@ -1,16 +1,12 @@
-uuid: 49feb61b-2e9e-4a4b-8715-a5c66c319161
+uuid: 9de1a3d4-7039-4917-9980-edf3bbb2e215
 langcode: en
 status: true
 dependencies:
   module:
-    - field_permissions
     - opencase_entities
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_actor.field_active
-field_name: field_active
-entity_type: oc_actor
+id: oc_case.field_gave_list_of_agencies
+field_name: field_gave_list_of_agencies
+entity_type: oc_case
 type: boolean
 settings: {  }
 module: core
diff --git a/config/optional/field.storage.oc_case.field_invoicing_status.yml b/config/optional/field.storage.oc_case.field_invoicing_status.yml
deleted file mode 100644
index dc8d4ca..0000000
--- a/config/optional/field.storage.oc_case.field_invoicing_status.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: f94656f9-410c-4fac-9e78-72e719c7a91c
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_cases
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_case.field_invoicing_status
-field_name: field_invoicing_status
-entity_type: oc_case
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_activity.field_b.yml b/config/optional/field.storage.oc_case.field_level.yml
similarity index 60%
rename from config/optional/field.storage.oc_activity.field_b.yml
rename to config/optional/field.storage.oc_case.field_level.yml
index e90b78b..be86949 100644
--- a/config/optional/field.storage.oc_activity.field_b.yml
+++ b/config/optional/field.storage.oc_case.field_level.yml
@@ -1,15 +1,13 @@
-uuid: da841bb5-c318-4808-8ae0-858b1cb82491
+uuid: 55ce2cb5-3992-4000-9a87-cea4562f7761
 langcode: en
 status: true
 dependencies:
   module:
     - opencase_entities
     - options
-_core:
-  default_config_hash: uEKfECbHnyBhBiQqohaD5Ljy0DQqv_fUPFrqfotpH24
-id: oc_activity.field_b
-field_name: field_b
-entity_type: oc_activity
+id: oc_case.field_level
+field_name: field_level
+entity_type: oc_case
 type: list_integer
 settings:
   allowed_values:
@@ -22,12 +20,6 @@ settings:
     -
       value: 3
       label: '3'
-    -
-      value: 4
-      label: '4'
-    -
-      value: 5
-      label: '5'
   allowed_values_function: ''
 module: options
 locked: false
diff --git a/config/optional/field.storage.oc_case.field_link_to_invoice.yml b/config/optional/field.storage.oc_case.field_link_to_invoice.yml
deleted file mode 100644
index 8d38b34..0000000
--- a/config/optional/field.storage.oc_case.field_link_to_invoice.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: a719c93e-3463-4071-a003-7fa42ef5b7ae
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - link
-    - opencase_cases
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_case.field_link_to_invoice
-field_name: field_link_to_invoice
-entity_type: oc_case
-type: link
-settings: {  }
-module: link
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_case.field_number_of_participants.yml b/config/optional/field.storage.oc_case.field_number_of_participants.yml
deleted file mode 100644
index 862fa26..0000000
--- a/config/optional/field.storage.oc_case.field_number_of_participants.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 7278be3c-e085-452a-93d4-09e8e7b24c60
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_cases
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_case.field_number_of_participants
-field_name: field_number_of_participants
-entity_type: oc_case
-type: integer
-settings:
-  unsigned: false
-  size: normal
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_case.field_outcome.yml b/config/optional/field.storage.oc_case.field_outcome.yml
new file mode 100644
index 0000000..5c75f8d
--- /dev/null
+++ b/config/optional/field.storage.oc_case.field_outcome.yml
@@ -0,0 +1,30 @@
+uuid: bfe1a0f8-4a06-4f0a-82ef-bd5a2d4e4950
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_case.field_outcome
+field_name: field_outcome
+entity_type: oc_case
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: Positive
+      label: Positive
+    -
+      value: Negative
+      label: Negative
+    -
+      value: 'One-off interaction'
+      label: 'One-off interaction'
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_case.field_project.yml b/config/optional/field.storage.oc_case.field_project.yml
deleted file mode 100644
index 6b67c83..0000000
--- a/config/optional/field.storage.oc_case.field_project.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 03c0bad7-1a84-4ae4-8d33-753336652a7b
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_cases
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_case.field_project
-field_name: field_project
-entity_type: oc_case
-type: entity_reference
-settings:
-  target_type: oc_case
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_case.field_social_media.yml b/config/optional/field.storage.oc_case.field_social_media.yml
deleted file mode 100644
index 354ec6d..0000000
--- a/config/optional/field.storage.oc_case.field_social_media.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 8039bc0c-6753-400b-9929-77915c880d13
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_cases
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_case.field_social_media
-field_name: field_social_media
-entity_type: oc_case
-type: boolean
-settings: {  }
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_case.field_invoicing_notes.yml b/config/optional/field.storage.oc_case.field_subject_of_enquiry.yml
similarity index 63%
rename from config/optional/field.storage.oc_case.field_invoicing_notes.yml
rename to config/optional/field.storage.oc_case.field_subject_of_enquiry.yml
index fb5cfbe..f6dfbd8 100644
--- a/config/optional/field.storage.oc_case.field_invoicing_notes.yml
+++ b/config/optional/field.storage.oc_case.field_subject_of_enquiry.yml
@@ -1,11 +1,11 @@
-uuid: 04d70cb8-6464-4f57-97f5-e28c0476a69f
+uuid: 47deff81-9bbe-4cc0-8443-b38ea7b56d6e
 langcode: en
 status: true
 dependencies:
   module:
-    - opencase_cases
-id: oc_case.field_invoicing_notes
-field_name: field_invoicing_notes
+    - opencase_entities
+id: oc_case.field_subject_of_enquiry
+field_name: field_subject_of_enquiry
 entity_type: oc_case
 type: string_long
 settings:
diff --git a/config/optional/field.storage.oc_case.field_training_delivery_format.yml b/config/optional/field.storage.oc_case.field_training_delivery_format.yml
deleted file mode 100644
index 7455fa2..0000000
--- a/config/optional/field.storage.oc_case.field_training_delivery_format.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: e349155a-7746-4e18-90df-041c62ebbef1
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_cases
-    - options
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_case.field_training_delivery_format
-field_name: field_training_delivery_format
-entity_type: oc_case
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: 'In person'
-      label: 'In person'
-    -
-      value: Zoom
-      label: Zoom
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_case.field_training_status.yml b/config/optional/field.storage.oc_case.field_training_status.yml
deleted file mode 100644
index 33f1b60..0000000
--- a/config/optional/field.storage.oc_case.field_training_status.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-uuid: 597f69ed-98af-4552-b65b-71aeb8193869
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_cases
-    - options
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_case.field_training_status
-field_name: field_training_status
-entity_type: oc_case
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: na
-      label: N/A
-    -
-      value: training_date_confirmed
-      label: 'Training date confirmed'
-    -
-      value: trainers_booked
-      label: 'Trainers booked'
-    -
-      value: post_training_materials_sent
-      label: 'Post training materials sent'
-    -
-      value: client_no_show
-      label: 'Client no-show'
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_case.field_training_type.yml b/config/optional/field.storage.oc_case.field_training_type.yml
deleted file mode 100644
index b38233d..0000000
--- a/config/optional/field.storage.oc_case.field_training_type.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-uuid: 7d2f6c13-2385-4b94-9afd-37808d232361
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_cases
-    - options
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_case.field_training_type
-field_name: field_training_type
-entity_type: oc_case
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: '[LP]'
-      label: '[LP]'
-    -
-      value: '[EOP]'
-      label: '[EOP]'
-    -
-      value: '[NAAW]'
-      label: '[NAAW]'
-    -
-      value: '[DIY]'
-      label: '[DIY]'
-    -
-      value: '[R2D]'
-      label: '[R2D]'
-    -
-      value: '[BESPOKE]'
-      label: '[BESPOKE]'
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_case.field_type_health.yml b/config/optional/field.storage.oc_case.field_type_health.yml
new file mode 100644
index 0000000..113342b
--- /dev/null
+++ b/config/optional/field.storage.oc_case.field_type_health.yml
@@ -0,0 +1,33 @@
+uuid: 694afca9-ca5e-45e5-a9bd-addd2762f958
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_case.field_type_health
+field_name: field_type_health
+entity_type: oc_case
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: HC1
+      label: HC1
+    -
+      value: GP
+      label: GP
+    -
+      value: Dentist
+      label: Dentist
+    -
+      value: Other
+      label: Other
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_case.field_type_of_acco.yml b/config/optional/field.storage.oc_case.field_type_of_acco.yml
new file mode 100644
index 0000000..22a7876
--- /dev/null
+++ b/config/optional/field.storage.oc_case.field_type_of_acco.yml
@@ -0,0 +1,42 @@
+uuid: 002ec349-0524-46e8-b0ee-750f095d9bad
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_case.field_type_of_acco
+field_name: field_type_of_acco
+entity_type: oc_case
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: NASS
+      label: NASS
+    -
+      value: Destitute
+      label: Destitute
+    -
+      value: Hostel
+      label: Hostel
+    -
+      value: 'Private landlord'
+      label: 'Private landlord'
+    -
+      value: Council
+      label: Council
+    -
+      value: 'Housing association'
+      label: 'Housing association'
+    -
+      value: Repair
+      label: Repair
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_case.field_type_of_applicat.yml b/config/optional/field.storage.oc_case.field_type_of_applicat.yml
new file mode 100644
index 0000000..236eb14
--- /dev/null
+++ b/config/optional/field.storage.oc_case.field_type_of_applicat.yml
@@ -0,0 +1,108 @@
+uuid: 60ad49c3-6f43-4e73-9a18-44f37aa3260c
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_case.field_type_of_applicat
+field_name: field_type_of_applicat
+entity_type: oc_case
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: 'Asylum fresh submission'
+      label: 'Asylum fresh submission'
+    -
+      value: SET(P)
+      label: SET(P)
+    -
+      value: 'Human rights'
+      label: 'Human rights'
+    -
+      value: Citizenship
+      label: Citizenship
+    -
+      value: 'Travel document'
+      label: 'Travel document'
+    -
+      value: 'Lost brp'
+      label: 'Replacement brp'
+    -
+      value: 'Spouse visa and renewal'
+      label: 'Spouse visa and renewal'
+    -
+      value: 'Visit visa'
+      label: 'Visit visa'
+    -
+      value: 'Tier 1'
+      label: 'Tier 1'
+    -
+      value: 'Tier 2'
+      label: 'Tier 2'
+    -
+      value: 'Tier 4'
+      label: 'Tier 4'
+    -
+      value: 'Tier 5'
+      label: 'Tier 5'
+    -
+      value: DL
+      label: DL
+    -
+      value: Passport
+      label: Passport
+    -
+      value: 'Family reunion'
+      label: 'Family reunion'
+    -
+      value: 'Family reunion (non-refugee)'
+      label: 'Family reunion (non-refugee)'
+    -
+      value: Stateless
+      label: Stateless
+    -
+      value: 'EU SS'
+      label: 'EU SS'
+    -
+      value: 'EEA PR'
+      label: 'EEA PR'
+    -
+      value: 'EEA QP'
+      label: 'EEA QP'
+    -
+      value: 'EEA FM'
+      label: 'EEA FM'
+    -
+      value: 'EEA EFM'
+      label: 'EEA EFM'
+    -
+      value: 'Addition to refugee status'
+      label: 'Addition to refugee status'
+    -
+      value: Bail
+      label: Bail
+    -
+      value: Appeal
+      label: Appeal
+    -
+      value: 'Judicial review'
+      label: 'Judicial review'
+    -
+      value: 'Ten year partner/parent route'
+      label: 'Ten year partner/parent route'
+    -
+      value: 'Private life'
+      label: 'Private life'
+    -
+      value: NTL
+      label: NTL
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_case.field_type_of_as.yml b/config/optional/field.storage.oc_case.field_type_of_as.yml
new file mode 100644
index 0000000..78a6e42
--- /dev/null
+++ b/config/optional/field.storage.oc_case.field_type_of_as.yml
@@ -0,0 +1,33 @@
+uuid: c27a8802-9a7b-4f03-a3c6-8eb2071a9527
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_case.field_type_of_as
+field_name: field_type_of_as
+entity_type: oc_case
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: S98
+      label: S98
+    -
+      value: S95
+      label: S95
+    -
+      value: S4
+      label: S4
+    -
+      value: Appeal
+      label: Appeal
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_case.field_type_of_employability_help.yml b/config/optional/field.storage.oc_case.field_type_of_employability_help.yml
new file mode 100644
index 0000000..b2f566a
--- /dev/null
+++ b/config/optional/field.storage.oc_case.field_type_of_employability_help.yml
@@ -0,0 +1,27 @@
+uuid: 4208b753-a739-4432-84cb-f8f2c2644b3d
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_case.field_type_of_employability_help
+field_name: field_type_of_employability_help
+entity_type: oc_case
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: 'Job search'
+      label: 'Job search'
+    -
+      value: 'Interview skills'
+      label: 'Interview skills'
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_case.field_type_of_welfare_rights_iss.yml b/config/optional/field.storage.oc_case.field_type_of_welfare_rights_iss.yml
new file mode 100644
index 0000000..e3b49a0
--- /dev/null
+++ b/config/optional/field.storage.oc_case.field_type_of_welfare_rights_iss.yml
@@ -0,0 +1,45 @@
+uuid: b8a468e8-0538-4a17-be97-cd06fe5bd4aa
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_case.field_type_of_welfare_rights_iss
+field_name: field_type_of_welfare_rights_iss
+entity_type: oc_case
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: JSA
+      label: JSA
+    -
+      value: ESA
+      label: ESA
+    -
+      value: IS
+      label: IS
+    -
+      value: UC
+      label: UC
+    -
+      value: PIP
+      label: PIP
+    -
+      value: 'Child benefit'
+      label: 'Child benefit'
+    -
+      value: 'Tax Credits'
+      label: 'Tax Credits'
+    -
+      value: Other
+      label: Other
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/optional/field.storage.oc_case_fee.feeds_item.yml b/config/optional/field.storage.oc_case_fee.feeds_item.yml
deleted file mode 100644
index 0e54398..0000000
--- a/config/optional/field.storage.oc_case_fee.feeds_item.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: fefe2f90-556a-4806-b2a5-04e276bf6fca
-langcode: en
-status: true
-dependencies:
-  module:
-    - feeds
-    - opencase_cases
-id: oc_case_fee.feeds_item
-field_name: feeds_item
-entity_type: oc_case_fee
-type: feeds_item
-settings:
-  target_type: feeds_feed
-module: feeds
-locked: false
-cardinality: 1
-translatable: false
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_case_provision.feeds_item.yml b/config/optional/field.storage.oc_case_provision.feeds_item.yml
deleted file mode 100644
index 6dda103..0000000
--- a/config/optional/field.storage.oc_case_provision.feeds_item.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: c250a9f6-5365-457c-bd91-14272120f055
-langcode: en
-status: true
-dependencies:
-  module:
-    - feeds
-    - opencase_cases
-id: oc_case_provision.feeds_item
-field_name: feeds_item
-entity_type: oc_case_provision
-type: feeds_item
-settings:
-  target_type: feeds_feed
-module: feeds
-locked: false
-cardinality: 1
-translatable: false
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_case_provision.field_rate.yml b/config/optional/field.storage.oc_case_provision.field_rate.yml
deleted file mode 100644
index 5673b00..0000000
--- a/config/optional/field.storage.oc_case_provision.field_rate.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 18776adb-cf4b-4d4a-9a97-08b4921c2a12
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_cases
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_case_provision.field_rate
-field_name: field_rate
-entity_type: oc_case_provision
-type: decimal
-settings:
-  precision: 10
-  scale: 2
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_case_provision.field_rate_type.yml b/config/optional/field.storage.oc_case_provision.field_rate_type.yml
deleted file mode 100644
index 291df24..0000000
--- a/config/optional/field.storage.oc_case_provision.field_rate_type.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-uuid: d073da7b-97d5-493d-b8ff-3926f9b0284a
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_cases
-    - options
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_case_provision.field_rate_type
-field_name: field_rate_type
-entity_type: oc_case_provision
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: none
-      label: None
-    -
-      value: standard
-      label: Standard
-    -
-      value: custom
-      label: Custom
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_organisation.field_premises_capacity.yml b/config/optional/field.storage.oc_case_provision.field_test.yml
similarity index 51%
rename from config/optional/field.storage.oc_organisation.field_premises_capacity.yml
rename to config/optional/field.storage.oc_case_provision.field_test.yml
index e362f8e..9071af1 100644
--- a/config/optional/field.storage.oc_organisation.field_premises_capacity.yml
+++ b/config/optional/field.storage.oc_case_provision.field_test.yml
@@ -1,16 +1,16 @@
-uuid: 9054715f-0e38-41f2-be6d-fb4b71a4854e
+uuid: f90d1b9f-ee8a-4f79-ae7d-fafd4ec10cea
 langcode: en
 status: true
 dependencies:
   module:
+    - opencase_cases
     - opencase_entities
-id: oc_organisation.field_premises_capacity
-field_name: field_premises_capacity
-entity_type: oc_organisation
-type: integer
+id: oc_case_provision.field_test
+field_name: field_test
+entity_type: oc_case_provision
+type: entity_reference
 settings:
-  unsigned: false
-  size: normal
+  target_type: oc_actor
 module: core
 locked: false
 cardinality: 1
diff --git a/config/optional/field.storage.oc_organisation.feeds_item.yml b/config/optional/field.storage.oc_organisation.feeds_item.yml
deleted file mode 100644
index 76e4c0f..0000000
--- a/config/optional/field.storage.oc_organisation.feeds_item.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 68bb9674-ea4e-48ef-87b6-da010fa674ec
-langcode: en
-status: true
-dependencies:
-  module:
-    - feeds
-    - opencase_entities
-id: oc_organisation.feeds_item
-field_name: feeds_item
-entity_type: oc_organisation
-type: feeds_item
-settings:
-  target_type: feeds_feed
-module: feeds
-locked: false
-cardinality: 1
-translatable: false
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_organisation.field_accreditation_date.yml b/config/optional/field.storage.oc_organisation.field_accreditation_date.yml
deleted file mode 100644
index 3a3f6df..0000000
--- a/config/optional/field.storage.oc_organisation.field_accreditation_date.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: dcd05ff2-5201-46ba-ae2a-3da730db0826
-langcode: en
-status: true
-dependencies:
-  module:
-    - datetime
-    - field_permissions
-    - opencase_entities
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_organisation.field_accreditation_date
-field_name: field_accreditation_date
-entity_type: oc_organisation
-type: datetime
-settings:
-  datetime_type: date
-module: datetime
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_organisation.field_client_status.yml b/config/optional/field.storage.oc_organisation.field_client_status.yml
deleted file mode 100644
index b237454..0000000
--- a/config/optional/field.storage.oc_organisation.field_client_status.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: b5e868c2-3e34-48ac-a5b2-95c1fdd03f3e
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_entities
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_organisation.field_client_status
-field_name: field_client_status
-entity_type: oc_organisation
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_organisation.field_client_substatus.yml b/config/optional/field.storage.oc_organisation.field_client_substatus.yml
deleted file mode 100644
index b92e543..0000000
--- a/config/optional/field.storage.oc_organisation.field_client_substatus.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: fb62a603-fbde-40da-99fe-d2ac523231bb
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_entities
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_organisation.field_client_substatus
-field_name: field_client_substatus
-entity_type: oc_organisation
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_organisation.field_client_subtype.yml b/config/optional/field.storage.oc_organisation.field_client_subtype.yml
deleted file mode 100644
index 9121ba3..0000000
--- a/config/optional/field.storage.oc_organisation.field_client_subtype.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: e7219afa-6bec-45bb-92ac-66e81d46139e
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_entities
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: uRQcYQeVZWb6wTFpbiKCBH6mjjtC-Yc0O9UmvAtpeyg
-id: oc_organisation.field_client_subtype
-field_name: field_client_subtype
-entity_type: oc_organisation
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_organisation.field_client_type.yml b/config/optional/field.storage.oc_organisation.field_client_type.yml
deleted file mode 100644
index a5f14df..0000000
--- a/config/optional/field.storage.oc_organisation.field_client_type.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 7e751354-4b9f-4663-9b9c-0189a40516db
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_entities
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: 9r53T-UXqyvscL16KdyCRiYhdTzkIhA10Fg51kbozeQ
-id: oc_organisation.field_client_type
-field_name: field_client_type
-entity_type: oc_organisation
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_organisation.field_how_did_you_hear_about_us.yml b/config/optional/field.storage.oc_organisation.field_how_did_you_hear_about_us.yml
deleted file mode 100644
index 14f9e4a..0000000
--- a/config/optional/field.storage.oc_organisation.field_how_did_you_hear_about_us.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-uuid: 088e52cc-d0ca-4f2d-a052-dee77dba0c17
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-    - options
-id: oc_organisation.field_how_did_you_hear_about_us
-field_name: field_how_did_you_hear_about_us
-entity_type: oc_organisation
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: 'Online search'
-      label: 'Online search'
-    -
-      value: Instagram
-      label: Instagram
-    -
-      value: Twitter
-      label: Twitter
-    -
-      value: Facebook
-      label: Facebook
-    -
-      value: 'Word of mouth'
-      label: 'Word of mouth'
-    -
-      value: 'Print media / press'
-      label: 'Print media / press'
-    -
-      value: Other
-      label: Other
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_organisation.field_images.yml b/config/optional/field.storage.oc_organisation.field_images.yml
deleted file mode 100644
index d375cea..0000000
--- a/config/optional/field.storage.oc_organisation.field_images.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-uuid: d506f8eb-656a-4d01-a845-9ddb56b62c52
-langcode: en
-status: true
-dependencies:
-  module:
-    - file
-    - image
-    - opencase_entities
-_core:
-  default_config_hash: aqDaSMOUYFwUbwE2RGYxhlT0Lgskkn3PGECm9lpyStw
-id: oc_organisation.field_images
-field_name: field_images
-entity_type: oc_organisation
-type: image
-settings:
-  target_type: file
-  display_field: false
-  display_default: false
-  uri_scheme: private
-  default_image:
-    uuid: ''
-    alt: ''
-    title: ''
-    width: null
-    height: null
-module: image
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_organisation.field_location_festival_event.yml b/config/optional/field.storage.oc_organisation.field_location_festival_event.yml
deleted file mode 100644
index d6dc2fa..0000000
--- a/config/optional/field.storage.oc_organisation.field_location_festival_event.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 51710d20-c218-47e2-904f-996bf99ebe0f
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_entities
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_organisation.field_location_festival_event
-field_name: field_location_festival_event
-entity_type: oc_organisation
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_organisation.field_number_of_events_per_year.yml b/config/optional/field.storage.oc_organisation.field_number_of_events_per_year.yml
deleted file mode 100644
index c1f2fc6..0000000
--- a/config/optional/field.storage.oc_organisation.field_number_of_events_per_year.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 82df67b4-ebb2-4ebc-99ef-0434968cca40
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-id: oc_organisation.field_number_of_events_per_year
-field_name: field_number_of_events_per_year
-entity_type: oc_organisation
-type: integer
-settings:
-  unsigned: false
-  size: normal
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_organisation.field_number_of_staff.yml b/config/optional/field.storage.oc_organisation.field_number_of_staff.yml
deleted file mode 100644
index 2db67ed..0000000
--- a/config/optional/field.storage.oc_organisation.field_number_of_staff.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 05b045ba-d501-4fea-9d47-5786e0d84868
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_entities
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_organisation.field_number_of_staff
-field_name: field_number_of_staff
-entity_type: oc_organisation
-type: integer
-settings:
-  unsigned: false
-  size: normal
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_organisation.field_tags.yml b/config/optional/field.storage.oc_organisation.field_tags.yml
deleted file mode 100644
index 8be4d00..0000000
--- a/config/optional/field.storage.oc_organisation.field_tags.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 287c2910-2056-4a25-a0ad-ce11b99a4712
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_entities
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_organisation.field_tags
-field_name: field_tags
-entity_type: oc_organisation
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_organisation.field_type_of_umbrella_client.yml b/config/optional/field.storage.oc_organisation.field_type_of_umbrella_client.yml
deleted file mode 100644
index b26d4e2..0000000
--- a/config/optional/field.storage.oc_organisation.field_type_of_umbrella_client.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-uuid: 6dfae9c6-9e78-4660-86e8-dd251758d1cf
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-    - options
-_core:
-  default_config_hash: eJUo3haa_0Kyx_CfbTsrXQfFyorqac5h52S1gHC0ySs
-id: oc_organisation.field_type_of_umbrella_client
-field_name: field_type_of_umbrella_client
-entity_type: oc_organisation
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: local_authority
-      label: 'Local Authority'
-    -
-      value: parent_company
-      label: 'Parent Company'
-    -
-      value: bid
-      label: BID
-    -
-      value: funder
-      label: Funder
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.oc_organisation.field_umbrella_client.yml b/config/optional/field.storage.oc_organisation.field_umbrella_client.yml
deleted file mode 100644
index a59f315..0000000
--- a/config/optional/field.storage.oc_organisation.field_umbrella_client.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 39f95fb9-8f12-4a86-9f56-0ed9a88a56fd
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_entities
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: 1U8GYQXtF_GX3zLP-YCI-xlO1LHVaC6yBcj8hcpcYSA
-id: oc_organisation.field_umbrella_client
-field_name: field_umbrella_client
-entity_type: oc_organisation
-type: entity_reference
-settings:
-  target_type: oc_organisation
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.paragraph.field_access_needs.yml b/config/optional/field.storage.paragraph.field_access_needs.yml
deleted file mode 100644
index b63d18b..0000000
--- a/config/optional/field.storage.paragraph.field_access_needs.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: bc70c2d5-a83c-40d1-9d2f-8220e0b61574
-langcode: en
-status: true
-dependencies:
-  module:
-    - paragraphs
-_core:
-  default_config_hash: HL0TskwLS6pKAqnid-EXuFYPlIqNedk5nrGA2mypKUI
-id: paragraph.field_access_needs
-field_name: field_access_needs
-entity_type: paragraph
-type: string_long
-settings:
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.paragraph.field_age.yml b/config/optional/field.storage.paragraph.field_age.yml
deleted file mode 100644
index ed0fc2b..0000000
--- a/config/optional/field.storage.paragraph.field_age.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-uuid: 4eefa870-8f38-4a0a-8187-5c98051fcb52
-langcode: en
-status: true
-dependencies:
-  module:
-    - options
-    - paragraphs
-_core:
-  default_config_hash: UwySGjaje5uystf1clX1ujPGm8QyTOYvl7W-446B23Q
-id: paragraph.field_age
-field_name: field_age
-entity_type: paragraph
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: 18-24
-      label: 18-24
-    -
-      value: 25-34
-      label: 25-34
-    -
-      value: 35-44
-      label: 35-44
-    -
-      value: 45-54
-      label: 45-54
-    -
-      value: 56-70
-      label: 56-70
-    -
-      value: 70+
-      label: 70+
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.paragraph.field_amount.yml b/config/optional/field.storage.paragraph.field_amount.yml
deleted file mode 100644
index 7a3e527..0000000
--- a/config/optional/field.storage.paragraph.field_amount.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 5419288d-7161-4a1f-91e1-ae33184ab570
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - paragraphs
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: RJDAlbRZ5RpBK6vhMseuMExmCOh5rL4-nWuFVKKJz7k
-id: paragraph.field_amount
-field_name: field_amount
-entity_type: paragraph
-type: integer
-settings:
-  unsigned: false
-  size: normal
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.paragraph.field_category.yml b/config/optional/field.storage.paragraph.field_category.yml
deleted file mode 100644
index 3d99997..0000000
--- a/config/optional/field.storage.paragraph.field_category.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-uuid: d7f3fa98-bf24-4c07-ac3f-1bb10ec69669
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - options
-    - paragraphs
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: QSjwGYisde2KIFRI2eyh2Sq-HdeU3yO5n_PZh1JqbVQ
-id: paragraph.field_category
-field_name: field_category
-entity_type: paragraph
-type: list_integer
-settings:
-  allowed_values:
-    -
-      value: 0
-      label: 'Accreditation Cost'
-    -
-      value: 1
-      label: 'Project Cost'
-    -
-      value: 2
-      label: 'Brand Licensing Cost'
-    -
-      value: 3
-      label: 'Consultation Cost'
-    -
-      value: 4
-      label: 'Travel Cost'
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.paragraph.field_day.yml b/config/optional/field.storage.paragraph.field_day.yml
deleted file mode 100644
index 4dca10c..0000000
--- a/config/optional/field.storage.paragraph.field_day.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-uuid: 3d287a98-b809-4231-b9ae-eb07f37d2377
-langcode: en
-status: true
-dependencies:
-  module:
-    - options
-    - paragraphs
-_core:
-  default_config_hash: imO_xHkLERBuqMzNTeE9vfiBowfcfIOtVSGkWxcTGuE
-id: paragraph.field_day
-field_name: field_day
-entity_type: paragraph
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: Monday
-      label: Monday
-    -
-      value: Tuesday
-      label: Tuesday
-    -
-      value: Wednesday
-      label: Wednesday
-    -
-      value: Thursday
-      label: Thursday
-    -
-      value: Friday
-      label: Friday
-    -
-      value: Saturday
-      label: Saturday
-    -
-      value: Sunday
-      label: Sunday
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.paragraph.field_gender.yml b/config/optional/field.storage.paragraph.field_gender.yml
deleted file mode 100644
index 37501ce..0000000
--- a/config/optional/field.storage.paragraph.field_gender.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-uuid: 6270d3ba-4564-4733-bc2a-f106a32fb99e
-langcode: en
-status: true
-dependencies:
-  module:
-    - options
-    - paragraphs
-_core:
-  default_config_hash: 0YPzFo-cfLnUB3wh8DhIT_hf30199SIhHEw-VKDlP50
-id: paragraph.field_gender
-field_name: field_gender
-entity_type: paragraph
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: man
-      label: Man
-    -
-      value: woman
-      label: Woman
-    -
-      value: non-binary
-      label: Non-Binary
-    -
-      value: trans-gnc
-      label: 'Trans / GNC'
-    -
-      value: trans-man
-      label: 'Trans man'
-    -
-      value: trans-woman
-      label: 'Trans woman'
-    -
-      value: trans-nb
-      label: 'Trans NB'
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.paragraph.field_phone.yml b/config/optional/field.storage.paragraph.field_phone.yml
deleted file mode 100644
index 1a5bfae..0000000
--- a/config/optional/field.storage.paragraph.field_phone.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 530dbae5-2837-4d43-99cd-ffd0766c1d9b
-langcode: en
-status: true
-dependencies:
-  module:
-    - paragraphs
-_core:
-  default_config_hash: LlRS2Tzrh-yJsna5E8PZz03eNrTvD_u5kDawg069GaA
-id: paragraph.field_phone
-field_name: field_phone
-entity_type: paragraph
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.paragraph.field_race_ethnicity.yml b/config/optional/field.storage.paragraph.field_race_ethnicity.yml
deleted file mode 100644
index 84a58f5..0000000
--- a/config/optional/field.storage.paragraph.field_race_ethnicity.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-uuid: fc67f19a-83af-4da9-879a-c6f630271cdf
-langcode: en
-status: true
-dependencies:
-  module:
-    - options
-    - paragraphs
-_core:
-  default_config_hash: AjvlK2fzIsvAqDuAqGACSQjorlTT7rQ4bqpk0PqQ7FI
-id: paragraph.field_race_ethnicity
-field_name: field_race_ethnicity
-entity_type: paragraph
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: 'White: English, Welsh, Scottish, Northern Irish or British'
-      label: 'White: English, Welsh, Scottish, Northern Irish or British'
-    -
-      value: 'White: Irish'
-      label: 'White: Irish'
-    -
-      value: 'White: Gypsy or Irish Traveller'
-      label: 'White: Gypsy or Irish Traveller'
-    -
-      value: 'White: Any other White background'
-      label: 'White: Any other White background'
-    -
-      value: 'Mixed: White and Black Caribbean'
-      label: 'Mixed: White and Black Caribbean'
-    -
-      value: 'Mixed: White and Black African'
-      label: 'Mixed: White and Black African'
-    -
-      value: 'Mixed: White and Asian'
-      label: 'Mixed: White and Asian'
-    -
-      value: 'Mixed: Other'
-      label: 'Mixed: Other'
-    -
-      value: 'Asian: Indian'
-      label: 'Asian: Indian'
-    -
-      value: 'Asian: Pakistani'
-      label: 'Asian: Pakistani'
-    -
-      value: 'Asian: Bangladeshi'
-      label: 'Asian: Bangladeshi'
-    -
-      value: 'Asian: Chinese'
-      label: 'Asian: Chinese'
-    -
-      value: 'Asian: Other'
-      label: 'Asian: Other'
-    -
-      value: 'Black: African'
-      label: 'Black: African'
-    -
-      value: 'Black: Caribbean'
-      label: 'Black: Caribbean'
-    -
-      value: 'Black: Other'
-      label: 'Black: Other'
-    -
-      value: Arab
-      label: Arab
-    -
-      value: Other
-      label: Other
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.paragraph.field_rate_if_custom_.yml b/config/optional/field.storage.paragraph.field_rate_if_custom_.yml
deleted file mode 100644
index f4c921a..0000000
--- a/config/optional/field.storage.paragraph.field_rate_if_custom_.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 2344344e-6119-41f8-a71b-7c4bea478a10
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - paragraphs
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: TaFMY_UpvZX2af3PyigRZvlUxHc1ZjvsJL5NQ9UaR6A
-id: paragraph.field_rate_if_custom_
-field_name: field_rate_if_custom_
-entity_type: paragraph
-type: integer
-settings:
-  unsigned: false
-  size: normal
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.paragraph.field_relationship.yml b/config/optional/field.storage.paragraph.field_relationship.yml
deleted file mode 100644
index 58367ac..0000000
--- a/config/optional/field.storage.paragraph.field_relationship.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: b09f46f3-697b-4d4e-9878-3fd4aebe10d3
-langcode: en
-status: true
-dependencies:
-  module:
-    - paragraphs
-_core:
-  default_config_hash: Xq68BCLZnU40uQLX1hFUM_-PPJvaalzKCOWu4P4vcFM
-id: paragraph.field_relationship
-field_name: field_relationship
-entity_type: paragraph
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.paragraph.field_sexuality.yml b/config/optional/field.storage.paragraph.field_sexuality.yml
deleted file mode 100644
index 37928d1..0000000
--- a/config/optional/field.storage.paragraph.field_sexuality.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: e5753040-60ad-4875-99f6-64d2d9c13981
-langcode: en
-status: true
-dependencies:
-  module:
-    - paragraphs
-_core:
-  default_config_hash: k2JPcTQdV_EPhAnhg0wrvtlZXjIhI508trs8BWfqEb8
-id: paragraph.field_sexuality
-field_name: field_sexuality
-entity_type: paragraph
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.paragraph.field_time.yml b/config/optional/field.storage.paragraph.field_time.yml
deleted file mode 100644
index b180a28..0000000
--- a/config/optional/field.storage.paragraph.field_time.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-uuid: 17fa45a1-947e-4920-b2fc-7e926437bab2
-langcode: en
-status: true
-dependencies:
-  module:
-    - options
-    - paragraphs
-_core:
-  default_config_hash: CIv_4DDy04F9EMzoYR8PoKSt3v84fxJQJ-GzpvMA_Vk
-id: paragraph.field_time
-field_name: field_time
-entity_type: paragraph
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: Morning
-      label: Morning
-    -
-      value: Afternoon
-      label: Afternoon
-    -
-      value: Evening
-      label: Evening
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.paragraph.field_trainer.yml b/config/optional/field.storage.paragraph.field_trainer.yml
deleted file mode 100644
index a58558c..0000000
--- a/config/optional/field.storage.paragraph.field_trainer.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 7134be96-6971-46aa-a2a8-e44d5a93ae6b
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_entities
-    - paragraphs
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: T4phw98eK1pCPhW2V6ro30LiNfTQ6Dfg_M94_8Nz_cQ
-id: paragraph.field_trainer
-field_name: field_trainer
-entity_type: paragraph
-type: entity_reference
-settings:
-  target_type: oc_actor
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.paragraph.field_trainer_rate.yml b/config/optional/field.storage.paragraph.field_trainer_rate.yml
deleted file mode 100644
index 6be790e..0000000
--- a/config/optional/field.storage.paragraph.field_trainer_rate.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-uuid: e2224d3f-1541-4217-8479-52eea4a73e22
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - options
-    - paragraphs
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: _K17_7vAOC7pmRjd-XJZDjUk9F2dTwpXWTl5k-IWD0M
-id: paragraph.field_trainer_rate
-field_name: field_trainer_rate
-entity_type: paragraph
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: none
-      label: None
-    -
-      value: standard
-      label: Standard
-    -
-      value: custom
-      label: Custom
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.paragraph.field_trainer_role.yml b/config/optional/field.storage.paragraph.field_trainer_role.yml
deleted file mode 100644
index 1a9b30d..0000000
--- a/config/optional/field.storage.paragraph.field_trainer_role.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 3bf089c7-5741-4e38-95db-23bfbe8c5d07
-langcode: en
-status: true
-dependencies:
-  module:
-    - options
-    - paragraphs
-_core:
-  default_config_hash: G3ne5lpNzQj1j_wWcTeRgYV_fc960AzIwzqlJOVB4-o
-id: paragraph.field_trainer_role
-field_name: field_trainer_role
-entity_type: paragraph
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: facilitator
-      label: Facilitator
-    -
-      value: shadow
-      label: Shadow
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.taxonomy_term.field_parent_type.yml b/config/optional/field.storage.taxonomy_term.field_parent_type.yml
deleted file mode 100644
index f40b367..0000000
--- a/config/optional/field.storage.taxonomy_term.field_parent_type.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: adb3fb58-49e1-4513-a27a-af6bd3fb3e56
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: WZU6_nk6mWV-T5TSfjNSSpYM25K_XqrW5B-sDmar49M
-id: taxonomy_term.field_parent_type
-field_name: field_parent_type
-entity_type: taxonomy_term
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.taxonomy_term.field_substatuses.yml b/config/optional/field.storage.taxonomy_term.field_substatuses.yml
deleted file mode 100644
index ff78033..0000000
--- a/config/optional/field.storage.taxonomy_term.field_substatuses.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 2ef38d9d-928a-4388-bbc1-a2bedd8780d3
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_substatuses
-field_name: field_substatuses
-entity_type: taxonomy_term
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.user.field_last_password_reset.yml b/config/optional/field.storage.user.field_last_password_reset.yml
deleted file mode 100644
index 53d572e..0000000
--- a/config/optional/field.storage.user.field_last_password_reset.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: e5b7ebb7-c2eb-45d8-ad18-aefd62362b8f
-langcode: en
-status: true
-dependencies:
-  module:
-    - datetime
-    - user
-  enforced:
-    module:
-      - password_policy
-_core:
-  default_config_hash: fe_vhJzBU4DNfc97fsLUU54pydpOw-caxcFMckk-UA4
-id: user.field_last_password_reset
-field_name: field_last_password_reset
-entity_type: user
-type: datetime
-settings:
-  datetime_type: datetime
-module: datetime
-locked: true
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.user.field_linked_opencase_actor.yml b/config/optional/field.storage.user.field_linked_opencase_actor.yml
index b56b481..35515cc 100644
--- a/config/optional/field.storage.user.field_linked_opencase_actor.yml
+++ b/config/optional/field.storage.user.field_linked_opencase_actor.yml
@@ -1,4 +1,4 @@
-uuid: 6118ab40-dd6a-4cb0-8cd8-8fb9a1bb1d95
+uuid: b2e420f2-8b91-4fb1-8c73-4b8ffe5701dd
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/field.storage.user.field_password_expiration.yml b/config/optional/field.storage.user.field_password_expiration.yml
deleted file mode 100644
index 1118373..0000000
--- a/config/optional/field.storage.user.field_password_expiration.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 446e3a97-1ae2-4bec-8b2d-6be49a09ddb3
-langcode: en
-status: true
-dependencies:
-  module:
-    - user
-  enforced:
-    module:
-      - password_policy
-_core:
-  default_config_hash: hZ92ctP_IPOvYwFWeh-8cu0xIcJJXuJ0nV-6IbQT3vM
-id: user.field_password_expiration
-field_name: field_password_expiration
-entity_type: user
-type: boolean
-settings: {  }
-module: core
-locked: true
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.user.field_pending_expire_sent.yml b/config/optional/field.storage.user.field_pending_expire_sent.yml
deleted file mode 100644
index 66f9f3e..0000000
--- a/config/optional/field.storage.user.field_pending_expire_sent.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 73d33e56-f266-480c-8d66-1e21ef9777ba
-langcode: en
-status: true
-dependencies:
-  module:
-    - user
-  enforced:
-    module:
-      - password_policy
-_core:
-  default_config_hash: FkcjtYqR-bTc6oZBLdP6A89u1UPfdRIV1NYQg_kkUkg
-id: user.field_pending_expire_sent
-field_name: field_pending_expire_sent
-entity_type: user
-type: integer
-settings:
-  unsigned: false
-  size: normal
-module: core
-locked: true
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/optional/field.storage.user.user_picture.yml b/config/optional/field.storage.user.user_picture.yml
index 535ed26..796c90d 100644
--- a/config/optional/field.storage.user.user_picture.yml
+++ b/config/optional/field.storage.user.user_picture.yml
@@ -1,4 +1,4 @@
-uuid: cf62c526-70a3-45e6-a9c9-3d83e137f80e
+uuid: d39d920a-b4b4-416c-987b-7af25ba7cab6
 langcode: en
 status: true
 dependencies:
@@ -7,7 +7,7 @@ dependencies:
     - image
     - user
 _core:
-  default_config_hash: 6k-VBFilDLuzgSOT-77CFgHFlcd5D-kqRixtH89EShU
+  default_config_hash: 0q8-mw8y-Ls5I578sIPQFLp4ljpH7WvVYpzY-I9O-8E
 id: user.user_picture
 field_name: user_picture
 entity_type: user
diff --git a/config/optional/filter.format.basic_html.yml b/config/optional/filter.format.basic_html.yml
index 109fef8..6cd7c0f 100644
--- a/config/optional/filter.format.basic_html.yml
+++ b/config/optional/filter.format.basic_html.yml
@@ -1,6 +1,6 @@
-uuid: 4b8e98d8-da03-48f8-a3cc-4525b628f5a5
+uuid: c2f450b0-67bb-4531-a101-936f8bfac33a
 langcode: en
-status: false
+status: true
 dependencies:
   module:
     - editor
diff --git a/config/optional/filter.format.full_html.yml b/config/optional/filter.format.full_html.yml
index dd01058..f1dcd1b 100644
--- a/config/optional/filter.format.full_html.yml
+++ b/config/optional/filter.format.full_html.yml
@@ -1,4 +1,4 @@
-uuid: 48288abb-d5e9-462a-bf89-3fce3ae582c9
+uuid: 51739edf-acd5-49b3-b461-744b44268bfa
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/filter.format.plain_text.yml b/config/optional/filter.format.plain_text.yml
index 5d053d1..70e8875 100644
--- a/config/optional/filter.format.plain_text.yml
+++ b/config/optional/filter.format.plain_text.yml
@@ -1,4 +1,4 @@
-uuid: 5cbd7ce9-2d45-4a36-9dba-43b6380e4f84
+uuid: 1ab4c0c7-b4bf-4794-a958-555721a8c798
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/filter.format.restricted_html.yml b/config/optional/filter.format.restricted_html.yml
index f04a397..9a3d969 100644
--- a/config/optional/filter.format.restricted_html.yml
+++ b/config/optional/filter.format.restricted_html.yml
@@ -1,6 +1,6 @@
-uuid: e2433365-4de4-44cf-a519-9a22c3a656a7
+uuid: b6f8f717-286b-4008-9a99-587cb1bbe9d0
 langcode: en
-status: false
+status: true
 dependencies: {  }
 _core:
   default_config_hash: oz6NyPDAB4HB6N9hgH2LwNVtCd-sXbMG1fbn5KsRIDI
diff --git a/config/optional/hal.settings.yml b/config/optional/hal.settings.yml
index afd7fa3..d515621 100644
--- a/config/optional/hal.settings.yml
+++ b/config/optional/hal.settings.yml
@@ -1,4 +1,3 @@
-link_domain: null
-bc_file_uri_as_url_normalizer: false
 _core:
-  default_config_hash: swYtdod4psGvRvRY6OTGagGJPAuknS7WMgn1089yjL0
+  default_config_hash: YD6v6hkrHtj51mcZHn6s2HulUJHWVZ_D7Y_SllXF6WE
+link_domain: null
diff --git a/config/optional/image.style.large.yml b/config/optional/image.style.large.yml
index 34f840f..5169558 100644
--- a/config/optional/image.style.large.yml
+++ b/config/optional/image.style.large.yml
@@ -1,4 +1,4 @@
-uuid: 05085a35-ec07-4bfe-bf38-3bc563523227
+uuid: 64c8173e-ed68-4f65-ae02-c12d8b879b38
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/image.style.medium.yml b/config/optional/image.style.medium.yml
index ecc9ed2..7c37b99 100644
--- a/config/optional/image.style.medium.yml
+++ b/config/optional/image.style.medium.yml
@@ -1,4 +1,4 @@
-uuid: 87e48ccc-e464-4036-a374-80efc24924fe
+uuid: 52b8ad4b-d005-4a69-8f6c-78baa56ceda0
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/image.style.thumbnail.yml b/config/optional/image.style.thumbnail.yml
index d7afffd..3f39d0c 100644
--- a/config/optional/image.style.thumbnail.yml
+++ b/config/optional/image.style.thumbnail.yml
@@ -1,4 +1,4 @@
-uuid: 57e99028-c005-4a3b-a088-5c11e1e328a3
+uuid: 693ddedf-eadc-41c7-b0be-dfe9903a60f1
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/image.style.wide.yml b/config/optional/image.style.wide.yml
new file mode 100644
index 0000000..cb5c1a7
--- /dev/null
+++ b/config/optional/image.style.wide.yml
@@ -0,0 +1,17 @@
+uuid: fa6bc48f-c31e-4a10-a589-c39e95ba8068
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: LswCVLg8z4Zk1u6pV1Dpj1qUj5YY2CQ7_ojx7bJQ8qk
+name: wide
+label: 'Wide (1090)'
+effects:
+  09959c15-59ce-4f6d-90df-e2d7cf32bce5:
+    uuid: 09959c15-59ce-4f6d-90df-e2d7cf32bce5
+    id: image_scale
+    weight: 1
+    data:
+      width: 1090
+      height: null
+      upscale: false
diff --git a/config/optional/jsonapi.settings.yml b/config/optional/jsonapi.settings.yml
index 4b98d81..bf8b5aa 100644
--- a/config/optional/jsonapi.settings.yml
+++ b/config/optional/jsonapi.settings.yml
@@ -1,4 +1,4 @@
-langcode: en
-read_only: false
 _core:
   default_config_hash: p_qzzTwtOMiIPE7CyG0wD6M-UCpBp6Y5E4LhNCnCRpY
+langcode: en
+read_only: true
diff --git a/config/optional/mailsystem.settings.yml b/config/optional/mailsystem.settings.yml
deleted file mode 100644
index 29ef3b3..0000000
--- a/config/optional/mailsystem.settings.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-_core:
-  default_config_hash: IhwTepsVwtbtbcT5GzQKhCXDCRvbk3MNkWqPiuiZ10s
-theme: current
-defaults:
-  sender: php_mail
-  formatter: php_mail
-modules:
-  swiftmailer:
-    none:
-      sender: swiftmailer
-      formatter: swiftmailer
diff --git a/config/optional/node.type.article.yml b/config/optional/node.type.article.yml
index 8100981..0a29030 100644
--- a/config/optional/node.type.article.yml
+++ b/config/optional/node.type.article.yml
@@ -1,4 +1,4 @@
-uuid: 4edb140e-d3f0-41c6-b893-33363a708084
+uuid: af609b94-9116-4cda-a4eb-ed91179f714b
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/node.type.page.yml b/config/optional/node.type.page.yml
index c30bd8f..4db8bef 100644
--- a/config/optional/node.type.page.yml
+++ b/config/optional/node.type.page.yml
@@ -1,4 +1,4 @@
-uuid: ab030e94-15f6-443e-8ba4-b29fc01cbb83
+uuid: 02eb7477-b4de-40d8-b56f-4e0e01bb1a8b
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/opencase_cases.oc_case_fee_type.fee.yml b/config/optional/opencase_cases.oc_case_fee_type.fee.yml
new file mode 100644
index 0000000..b3b3c5b
--- /dev/null
+++ b/config/optional/opencase_cases.oc_case_fee_type.fee.yml
@@ -0,0 +1,6 @@
+uuid: f9a5c3c2-6a08-42f6-bf87-4b9972b02b4f
+langcode: en
+status: true
+dependencies: {  }
+id: fee
+label: Fee
diff --git a/config/optional/opencase_cases.oc_case_fee_type.project_fee.yml b/config/optional/opencase_cases.oc_case_fee_type.project_fee.yml
deleted file mode 100644
index 12733b8..0000000
--- a/config/optional/opencase_cases.oc_case_fee_type.project_fee.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-uuid: e6e6349b-1f5a-410d-9640-6a4ffb489f41
-langcode: en
-status: true
-dependencies: {  }
-id: project_fee
-label: 'Project fee'
diff --git a/config/optional/opencase_cases.oc_case_provision_type.caseworker.yml b/config/optional/opencase_cases.oc_case_provision_type.caseworker.yml
new file mode 100644
index 0000000..1ca05ce
--- /dev/null
+++ b/config/optional/opencase_cases.oc_case_provision_type.caseworker.yml
@@ -0,0 +1,6 @@
+uuid: 20044a20-050f-42a4-a213-93bb9ab276b2
+langcode: en
+status: true
+dependencies: {  }
+id: caseworker
+label: Caseworker
diff --git a/config/optional/opencase_cases.oc_case_provision_type.trainer.yml b/config/optional/opencase_cases.oc_case_provision_type.trainer.yml
deleted file mode 100644
index 2972451..0000000
--- a/config/optional/opencase_cases.oc_case_provision_type.trainer.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-uuid: aef80be5-4366-40ee-a878-ac3e40678799
-langcode: en
-status: true
-dependencies: {  }
-id: trainer
-label: Trainer
diff --git a/config/optional/opencase_cases.oc_case_type.accommodation.yml b/config/optional/opencase_cases.oc_case_type.accommodation.yml
new file mode 100644
index 0000000..9f1cfb5
--- /dev/null
+++ b/config/optional/opencase_cases.oc_case_type.accommodation.yml
@@ -0,0 +1,6 @@
+uuid: 4b193664-a08d-40ae-a835-c103920ff094
+langcode: en
+status: true
+dependencies: {  }
+id: accommodation
+label: Accommodation
diff --git a/config/optional/opencase_cases.oc_case_type.asylum_support.yml b/config/optional/opencase_cases.oc_case_type.asylum_support.yml
new file mode 100644
index 0000000..e7015dd
--- /dev/null
+++ b/config/optional/opencase_cases.oc_case_type.asylum_support.yml
@@ -0,0 +1,6 @@
+uuid: 1330ffcc-78ab-4bff-a99b-e1b55d413412
+langcode: en
+status: true
+dependencies: {  }
+id: asylum_support
+label: 'Asylum support'
diff --git a/config/optional/opencase_cases.oc_case_type.employability.yml b/config/optional/opencase_cases.oc_case_type.employability.yml
new file mode 100644
index 0000000..c0ee1b9
--- /dev/null
+++ b/config/optional/opencase_cases.oc_case_type.employability.yml
@@ -0,0 +1,6 @@
+uuid: 27ce6c4d-8254-4b60-be87-364a3ab9a9b8
+langcode: en
+status: true
+dependencies: {  }
+id: employability
+label: Employability
diff --git a/config/optional/opencase_cases.oc_case_type.enquiry.yml b/config/optional/opencase_cases.oc_case_type.enquiry.yml
new file mode 100644
index 0000000..9222c1a
--- /dev/null
+++ b/config/optional/opencase_cases.oc_case_type.enquiry.yml
@@ -0,0 +1,6 @@
+uuid: afd7ceb2-8137-4cd8-9d6b-cc93ce53a262
+langcode: en
+status: true
+dependencies: {  }
+id: enquiry
+label: Enquiry
diff --git a/config/optional/opencase_cases.oc_case_type.health.yml b/config/optional/opencase_cases.oc_case_type.health.yml
new file mode 100644
index 0000000..b0e2e09
--- /dev/null
+++ b/config/optional/opencase_cases.oc_case_type.health.yml
@@ -0,0 +1,6 @@
+uuid: ebd3f0c6-d9ef-49cb-a5c5-7041164e220e
+langcode: en
+status: true
+dependencies: {  }
+id: health
+label: Health
diff --git a/config/optional/opencase_cases.oc_case_type.immigration.yml b/config/optional/opencase_cases.oc_case_type.immigration.yml
new file mode 100644
index 0000000..b42bd1f
--- /dev/null
+++ b/config/optional/opencase_cases.oc_case_type.immigration.yml
@@ -0,0 +1,6 @@
+uuid: 377d3b08-ee55-4094-aed1-234741d00ace
+langcode: en
+status: true
+dependencies: {  }
+id: immigration
+label: Immigration
diff --git a/config/optional/opencase_cases.oc_case_type.pro_bono_immigration_service.yml b/config/optional/opencase_cases.oc_case_type.pro_bono_immigration_service.yml
new file mode 100644
index 0000000..c8a4004
--- /dev/null
+++ b/config/optional/opencase_cases.oc_case_type.pro_bono_immigration_service.yml
@@ -0,0 +1,6 @@
+uuid: 4cc023df-c807-4096-bf73-5ed04ae142c7
+langcode: en
+status: true
+dependencies: {  }
+id: pro_bono_immigration_service
+label: 'Pro Bono Immigration Service'
diff --git a/config/optional/opencase_cases.oc_case_type.project.yml b/config/optional/opencase_cases.oc_case_type.project.yml
deleted file mode 100644
index 44e4ba1..0000000
--- a/config/optional/opencase_cases.oc_case_type.project.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-uuid: e7954033-8b1e-4be5-9944-8c7761b0aad2
-langcode: en
-status: true
-dependencies: {  }
-id: project
-label: Project
diff --git a/config/optional/opencase_cases.oc_case_type.training.yml b/config/optional/opencase_cases.oc_case_type.training.yml
deleted file mode 100644
index 51c188b..0000000
--- a/config/optional/opencase_cases.oc_case_type.training.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-uuid: 3c90f876-273f-475a-93ae-877927c016aa
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: vFqT_BBJUVundpg4_KjwfBNo0Ob-PMMfdnX4mWVMKUM
-id: training
-label: Training
diff --git a/config/optional/opencase_cases.oc_case_type.volunteer_engagement.yml b/config/optional/opencase_cases.oc_case_type.volunteer_engagement.yml
new file mode 100644
index 0000000..42e813b
--- /dev/null
+++ b/config/optional/opencase_cases.oc_case_type.volunteer_engagement.yml
@@ -0,0 +1,6 @@
+uuid: a6377d41-69c5-48ee-b5b6-e7f2169b2a65
+langcode: en
+status: true
+dependencies: {  }
+id: volunteer_engagement
+label: 'Volunteer Engagement'
diff --git a/config/optional/opencase_cases.oc_case_type.welfare_rights.yml b/config/optional/opencase_cases.oc_case_type.welfare_rights.yml
new file mode 100644
index 0000000..55789b6
--- /dev/null
+++ b/config/optional/opencase_cases.oc_case_type.welfare_rights.yml
@@ -0,0 +1,6 @@
+uuid: 848efb6b-e5bb-4b99-9487-a09f0ad50717
+langcode: en
+status: true
+dependencies: {  }
+id: welfare_rights
+label: 'Welfare Rights'
diff --git a/config/optional/opencase_entities.oc_activity_type.application.yml b/config/optional/opencase_entities.oc_activity_type.application.yml
new file mode 100644
index 0000000..df966c0
--- /dev/null
+++ b/config/optional/opencase_entities.oc_activity_type.application.yml
@@ -0,0 +1,6 @@
+uuid: 42e96dc4-2e31-4ab3-9025-f700d4d8a5af
+langcode: en
+status: true
+dependencies: {  }
+id: application
+label: Application
diff --git a/config/optional/opencase_entities.oc_activity_type.case_note.yml b/config/optional/opencase_entities.oc_activity_type.case_note.yml
new file mode 100644
index 0000000..fd160fb
--- /dev/null
+++ b/config/optional/opencase_entities.oc_activity_type.case_note.yml
@@ -0,0 +1,6 @@
+uuid: 2f899cb0-5852-4edf-a541-abcdc5a4ced1
+langcode: en
+status: true
+dependencies: {  }
+id: case_note
+label: 'Case note'
diff --git a/config/optional/opencase_entities.oc_activity_type.destitution_funds_provided.yml b/config/optional/opencase_entities.oc_activity_type.destitution_funds_provided.yml
new file mode 100644
index 0000000..a028a40
--- /dev/null
+++ b/config/optional/opencase_entities.oc_activity_type.destitution_funds_provided.yml
@@ -0,0 +1,6 @@
+uuid: a7bc53ae-3f39-4740-9285-f3e1cc860d43
+langcode: en
+status: true
+dependencies: {  }
+id: destitution_funds_provided
+label: 'Destitution funds provided'
diff --git a/config/optional/opencase_entities.oc_activity_type.emi.yml b/config/optional/opencase_entities.oc_activity_type.email.yml
similarity index 52%
rename from config/optional/opencase_entities.oc_activity_type.emi.yml
rename to config/optional/opencase_entities.oc_activity_type.email.yml
index 39896e3..b838a48 100644
--- a/config/optional/opencase_entities.oc_activity_type.emi.yml
+++ b/config/optional/opencase_entities.oc_activity_type.email.yml
@@ -1,6 +1,6 @@
-uuid: d42c321e-4412-4963-8956-4a5646e9e3a3
+uuid: 71ff41f1-3617-43ed-954f-63f69ff87d3a
 langcode: en
 status: true
 dependencies: {  }
-id: emi
+id: email
 label: Email
diff --git a/config/optional/opencase_entities.oc_activity_type.evaluation.yml b/config/optional/opencase_entities.oc_activity_type.evaluation.yml
deleted file mode 100644
index ab5cc22..0000000
--- a/config/optional/opencase_entities.oc_activity_type.evaluation.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-uuid: 58a37e1e-820e-4505-9f20-ed09184b38d5
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: g_9_Zi7RTDVaK6uOZjxWTESl7CcmOHMXcRa3zW9q-KM
-id: evaluation
-label: Evaluation
diff --git a/config/optional/opencase_entities.oc_activity_type.interview.yml b/config/optional/opencase_entities.oc_activity_type.interview.yml
new file mode 100644
index 0000000..030aba7
--- /dev/null
+++ b/config/optional/opencase_entities.oc_activity_type.interview.yml
@@ -0,0 +1,6 @@
+uuid: df2d3a99-9bb0-43a2-bae0-f6728bdfa991
+langcode: en
+status: true
+dependencies: {  }
+id: interview
+label: Interview
diff --git a/config/optional/opencase_entities.oc_activity_type.lete.yml b/config/optional/opencase_entities.oc_activity_type.lete.yml
new file mode 100644
index 0000000..3f0c6ca
--- /dev/null
+++ b/config/optional/opencase_entities.oc_activity_type.lete.yml
@@ -0,0 +1,6 @@
+uuid: a848e853-6578-49b8-beac-647b68852889
+langcode: en
+status: true
+dependencies: {  }
+id: lete
+label: Letter
diff --git a/config/optional/opencase_entities.oc_activity_type.phone_call.yml b/config/optional/opencase_entities.oc_activity_type.phone_call.yml
index 9012953..c39d23e 100644
--- a/config/optional/opencase_entities.oc_activity_type.phone_call.yml
+++ b/config/optional/opencase_entities.oc_activity_type.phone_call.yml
@@ -1,4 +1,4 @@
-uuid: 35370264-20ab-4f4c-a0a5-dc7dc858d20d
+uuid: 16c3ed7a-2e81-4727-9baf-e48302dd120b
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/opencase_entities.oc_activity_type.research.yml b/config/optional/opencase_entities.oc_activity_type.research.yml
new file mode 100644
index 0000000..10d5f8c
--- /dev/null
+++ b/config/optional/opencase_entities.oc_activity_type.research.yml
@@ -0,0 +1,6 @@
+uuid: 21bcf5b1-6344-4e6a-865e-eebc7f66f89d
+langcode: en
+status: true
+dependencies: {  }
+id: research
+label: Research
diff --git a/config/optional/opencase_entities.oc_activity_type.supervision.yml b/config/optional/opencase_entities.oc_activity_type.supervision.yml
new file mode 100644
index 0000000..ba756bd
--- /dev/null
+++ b/config/optional/opencase_entities.oc_activity_type.supervision.yml
@@ -0,0 +1,6 @@
+uuid: 4328562d-2a50-4a5a-b33b-6d1c4d0cba90
+langcode: en
+status: true
+dependencies: {  }
+id: supervision
+label: Supervision
diff --git a/config/optional/opencase_entities.oc_activity_type.trainer_debrief.yml b/config/optional/opencase_entities.oc_activity_type.trainer_debrief.yml
deleted file mode 100644
index 7217f41..0000000
--- a/config/optional/opencase_entities.oc_activity_type.trainer_debrief.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-uuid: 2b5249cb-18a9-4f5a-bc30-f5dfd0390ea7
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: S93coNek6ZNLMLOvnFDISj2jXjj0zh1tQrmR5YQ_kgA
-id: trainer_debrief
-label: 'Trainer debrief'
diff --git a/config/optional/opencase_entities.oc_actor_type.client.yml b/config/optional/opencase_entities.oc_actor_type.client.yml
new file mode 100644
index 0000000..a3ceca5
--- /dev/null
+++ b/config/optional/opencase_entities.oc_actor_type.client.yml
@@ -0,0 +1,6 @@
+uuid: 7f1a38b7-9b91-4b52-8bcb-6ab808668c70
+langcode: en
+status: true
+dependencies: {  }
+id: client
+label: Client
diff --git a/config/optional/opencase_entities.oc_actor_type.staff_member.yml b/config/optional/opencase_entities.oc_actor_type.staff_member.yml
new file mode 100644
index 0000000..ece2457
--- /dev/null
+++ b/config/optional/opencase_entities.oc_actor_type.staff_member.yml
@@ -0,0 +1,6 @@
+uuid: 78db71ef-db34-41a9-95fb-0549465b43bb
+langcode: en
+status: true
+dependencies: {  }
+id: staff_member
+label: 'Staff member'
diff --git a/config/optional/opencase_entities.oc_actor_type.trainer.yml b/config/optional/opencase_entities.oc_actor_type.trainer.yml
deleted file mode 100644
index 31297c6..0000000
--- a/config/optional/opencase_entities.oc_actor_type.trainer.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-uuid: 2e9ced1a-226a-48d3-a24c-bb29f5a091f0
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: _Ki-TqhDex_DBQmlwqi6YFwOXkGoOx-a6jsexczBEjM
-id: trainer
-label: Trainer
diff --git a/config/optional/opencase_entities.oc_actor_type.volunteer.yml b/config/optional/opencase_entities.oc_actor_type.volunteer.yml
new file mode 100644
index 0000000..bada4e8
--- /dev/null
+++ b/config/optional/opencase_entities.oc_actor_type.volunteer.yml
@@ -0,0 +1,6 @@
+uuid: 87522e44-baa4-4b68-add6-f3a92c8a1e2f
+langcode: en
+status: true
+dependencies: {  }
+id: volunteer
+label: Volunteer
diff --git a/config/optional/opencase_entities.oc_event_type.train_the_trainer.yml b/config/optional/opencase_entities.oc_event_type.train_the_trainer.yml
deleted file mode 100644
index 9f9a5a6..0000000
--- a/config/optional/opencase_entities.oc_event_type.train_the_trainer.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-uuid: 3f7d77ba-3866-45cd-a2d2-d5fc8dbe7e28
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: pSgZLszwcuFvaadECXdBV42L0pWPGS_eCLO6zCw5x6g
-id: train_the_trainer
-label: 'Train the Trainer'
diff --git a/config/optional/opencase_entities.oc_event_type.volunteer_training_session.yml b/config/optional/opencase_entities.oc_event_type.volunteer_training_session.yml
new file mode 100644
index 0000000..13d37dd
--- /dev/null
+++ b/config/optional/opencase_entities.oc_event_type.volunteer_training_session.yml
@@ -0,0 +1,6 @@
+uuid: 23b76c7c-1cee-4bcf-ba4b-97696774c574
+langcode: en
+status: true
+dependencies: {  }
+id: volunteer_training_session
+label: 'Volunteer training session'
diff --git a/config/optional/opencase_entities.oc_organisation_relation_type.link_between_clients.yml b/config/optional/opencase_entities.oc_organisation_relation_type.link_between_clients.yml
deleted file mode 100644
index 743221d..0000000
--- a/config/optional/opencase_entities.oc_organisation_relation_type.link_between_clients.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-uuid: 28c3cd09-b66a-441c-b553-7d5233b49957
-langcode: en
-status: true
-dependencies: {  }
-id: link_between_clients
-label: 'Linked client'
diff --git a/config/optional/opencase_entities.oc_organisation_type.client.yml b/config/optional/opencase_entities.oc_organisation_type.client.yml
deleted file mode 100644
index 212f342..0000000
--- a/config/optional/opencase_entities.oc_organisation_type.client.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-uuid: 213c77b5-60dc-430e-b8ba-799265ff6e8d
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: LiizS3yDi_sK9bhQExEXCVch22UGTKgpRUI75sl_kyk
-id: client
-label: Client
diff --git a/config/optional/opencase_entities.oc_organisation_type.partner_organisation.yml b/config/optional/opencase_entities.oc_organisation_type.partner_organisation.yml
index fec04ee..5b6b37e 100644
--- a/config/optional/opencase_entities.oc_organisation_type.partner_organisation.yml
+++ b/config/optional/opencase_entities.oc_organisation_type.partner_organisation.yml
@@ -1,8 +1,6 @@
-uuid: 8093fc06-d551-49fc-9fc5-adf29dfbd3ab
+uuid: 19c728dd-796b-4773-8acd-21869a047277
 langcode: en
 status: true
 dependencies: {  }
-_core:
-  default_config_hash: w0d1MgjJBTiD5XQkSTURf6js3Sk0iAEyCVViNqK_tmU
 id: partner_organisation
-label: 'Partner Organisation'
+label: 'Partner organisation'
diff --git a/config/optional/opencase_entities.oc_organisation_type.umbrella_client.yml b/config/optional/opencase_entities.oc_organisation_type.umbrella_client.yml
deleted file mode 100644
index 75dae12..0000000
--- a/config/optional/opencase_entities.oc_organisation_type.umbrella_client.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-uuid: 8a193579-f906-4080-b09e-6ffb6a2a4a0c
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: YRQFHWN90tId4ej0eXIVwp5EcovOwyoN1A3U-7bun2A
-id: umbrella_client
-label: 'Umbrella Client'
diff --git a/config/optional/paragraphs.paragraphs_type.availability.yml b/config/optional/paragraphs.paragraphs_type.availability.yml
deleted file mode 100644
index 7db8cbe..0000000
--- a/config/optional/paragraphs.paragraphs_type.availability.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: f9e38fcf-4654-44e8-a02c-0204c2922b3c
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: JgRmPzPOZbwPIvRCxWWi3G0dD3uLwXAyDTHCPqwKC3M
-id: availability
-label: Availability
-icon_uuid: null
-icon_default: null
-description: ''
-behavior_plugins: {  }
diff --git a/config/optional/paragraphs.paragraphs_type.emergency_contact.yml b/config/optional/paragraphs.paragraphs_type.emergency_contact.yml
deleted file mode 100644
index ff38bc4..0000000
--- a/config/optional/paragraphs.paragraphs_type.emergency_contact.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 24dde044-706a-4c72-9c2a-25d902e52eb9
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: d7B8998p69-rXYI6h9TEF5_DF5rYgH6fKDiicRTnnng
-id: emergency_contact
-label: 'Emergency Contact'
-icon_uuid: null
-icon_default: null
-description: ''
-behavior_plugins: {  }
diff --git a/config/optional/paragraphs.paragraphs_type.fee.yml b/config/optional/paragraphs.paragraphs_type.fee.yml
deleted file mode 100644
index 57734ef..0000000
--- a/config/optional/paragraphs.paragraphs_type.fee.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 68c58f02-4121-4c1a-acf4-c543b3f6dfc8
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: 9HIzjIpzIrRaPKLNs_OmHYZsP4CY6uDdL11IQHdYxc4
-id: fee
-label: Fee
-icon_uuid: null
-icon_default: null
-description: ''
-behavior_plugins: {  }
diff --git a/config/optional/paragraphs.paragraphs_type.trainer.yml b/config/optional/paragraphs.paragraphs_type.trainer.yml
deleted file mode 100644
index dfa6b32..0000000
--- a/config/optional/paragraphs.paragraphs_type.trainer.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 034d2a65-2d25-459a-8076-150fb03b2196
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: RoKlMbFzhOknj-HbMtIccgvm_chEbVRb_UffSLrf-p0
-id: trainer
-label: Trainer
-icon_uuid: null
-icon_default: null
-description: ''
-behavior_plugins: {  }
diff --git a/config/optional/paragraphs.settings.yml b/config/optional/paragraphs.settings.yml
index cafb409..c43733b 100644
--- a/config/optional/paragraphs.settings.yml
+++ b/config/optional/paragraphs.settings.yml
@@ -1,3 +1,3 @@
-show_unpublished: true
 _core:
   default_config_hash: 7eR0sk71Eol86r_A7BMqn5_46wzenh5J1O5vZRCGKv8
+show_unpublished: true
diff --git a/config/optional/password_policy.settings.yml b/config/optional/password_policy.settings.yml
deleted file mode 100644
index 08d2bcb..0000000
--- a/config/optional/password_policy.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: ylS3vsh8Ssk63Wrb_g1Np12zqe2qfK0NX4AOV1OYgLQ
-cron_threshold: 250
diff --git a/config/optional/password_strength.settings.yml b/config/optional/password_strength.settings.yml
deleted file mode 100644
index eaf4187..0000000
--- a/config/optional/password_strength.settings.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-_core:
-  default_config_hash: YeBe2Sr-ePva2qvjDyOI1kxGGr8by1JqcGGm6YINNnI
-enabled_matchers:
-  zxcvbn_datematch: zxcvbn_datematch
-  zxcvbn_digitmatch: zxcvbn_digitmatch
-  zxcvbn_l33tmatch: zxcvbn_l33tmatch
-  zxcvbn_repeatmatch: zxcvbn_repeatmatch
-  zxcvbn_sequencematch: zxcvbn_sequencematch
-  zxcvbn_spatialmatch: zxcvbn_spatialmatch
-  zxcvbn_yearmatch: zxcvbn_yearmatch
-  zxcvbn_dictionarymatch: zxcvbn_dictionarymatch
diff --git a/config/optional/rdf.mapping.comment.comment.yml b/config/optional/rdf.mapping.comment.comment.yml
index 4d99dc1..5c9705c 100644
--- a/config/optional/rdf.mapping.comment.comment.yml
+++ b/config/optional/rdf.mapping.comment.comment.yml
@@ -1,4 +1,4 @@
-uuid: 09abb583-78f5-4a6a-88b3-a97bd001267b
+uuid: 3561eeee-75c7-45f5-b65f-cdccc59f1852
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/rdf.mapping.node.article.yml b/config/optional/rdf.mapping.node.article.yml
index fa72153..e622c1d 100644
--- a/config/optional/rdf.mapping.node.article.yml
+++ b/config/optional/rdf.mapping.node.article.yml
@@ -1,4 +1,4 @@
-uuid: 42c01df1-c844-4b3d-b17c-3a075e092512
+uuid: 66d0d0b4-c069-4812-8c54-8edafedccb1d
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/rdf.mapping.node.page.yml b/config/optional/rdf.mapping.node.page.yml
index b78c271..4a3df33 100644
--- a/config/optional/rdf.mapping.node.page.yml
+++ b/config/optional/rdf.mapping.node.page.yml
@@ -1,4 +1,4 @@
-uuid: 64dcfba8-5768-4199-be36-3b271fe4d1c5
+uuid: eaa2bde5-545f-425e-bf4f-ed7b46732547
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/rdf.mapping.taxonomy_term.tags.yml b/config/optional/rdf.mapping.taxonomy_term.tags.yml
index 1debbb5..1e16e09 100644
--- a/config/optional/rdf.mapping.taxonomy_term.tags.yml
+++ b/config/optional/rdf.mapping.taxonomy_term.tags.yml
@@ -1,4 +1,4 @@
-uuid: 759f6b7d-f533-47be-a92a-7e2ff008b87b
+uuid: c3a2dd02-4bf6-4ad0-9a4d-c116a9e9d8bd
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/rdf.mapping.user.user.yml b/config/optional/rdf.mapping.user.user.yml
index b7f0ef1..6469297 100644
--- a/config/optional/rdf.mapping.user.user.yml
+++ b/config/optional/rdf.mapping.user.user.yml
@@ -1,4 +1,4 @@
-uuid: 12282f54-7e4b-4017-90c8-9a15915c5bbe
+uuid: c2d84826-cac1-4dcd-ab52-e2014ab0fd71
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/rest.resource.entity.node.yml b/config/optional/rest.resource.entity.node.yml
new file mode 100644
index 0000000..5ada824
--- /dev/null
+++ b/config/optional/rest.resource.entity.node.yml
@@ -0,0 +1,23 @@
+uuid: c886e492-78c7-49ae-9c48-3687af2fa95d
+langcode: en
+status: true
+dependencies:
+  module:
+    - basic_auth
+    - hal
+    - node
+_core:
+  default_config_hash: t_jfECmZhJqBOJuSOFn87EOi_TWi-_fRYTuJgd19vgg
+id: entity.node
+plugin_id: 'entity:node'
+granularity: resource
+configuration:
+  methods:
+    - GET
+    - POST
+    - PATCH
+    - DELETE
+  formats:
+    - hal_json
+  authentication:
+    - basic_auth
diff --git a/config/optional/rest.resource.entity.oc_organisation.yml b/config/optional/rest.resource.entity.oc_organisation.yml
deleted file mode 100644
index cf2ad65..0000000
--- a/config/optional/rest.resource.entity.oc_organisation.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: 08792b4f-f3f8-4f07-8c4a-cc76ee2fa282
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-    - serialization
-    - user
-id: entity.oc_organisation
-plugin_id: 'entity:oc_organisation'
-granularity: resource
-configuration:
-  methods:
-    - POST
-  formats:
-    - json
-  authentication:
-    - cookie
diff --git a/config/optional/rest.resource.entity.taxonomy_term.yml b/config/optional/rest.resource.entity.taxonomy_term.yml
deleted file mode 100644
index 08d499a..0000000
--- a/config/optional/rest.resource.entity.taxonomy_term.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 8e3fcade-e335-4a5b-80e9-8679b882814e
-langcode: en
-status: true
-dependencies:
-  module:
-    - hal
-    - serialization
-    - taxonomy
-    - user
-id: entity.taxonomy_term
-plugin_id: 'entity:taxonomy_term'
-granularity: resource
-configuration:
-  methods:
-    - GET
-    - POST
-    - DELETE
-    - PATCH
-  formats:
-    - hal_json
-    - json
-    - xml
-  authentication:
-    - cookie
diff --git a/config/optional/rest.settings.yml b/config/optional/rest.settings.yml
deleted file mode 100644
index 5cc6cce..0000000
--- a/config/optional/rest.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-bc_entity_resource_permissions: false
-_core:
-  default_config_hash: Jg3_yqsTIZ51KOKp3OV2KDVVrlx3N3OCEfniEse09KE
diff --git a/config/optional/search.page.node_search.yml b/config/optional/search.page.node_search.yml
index 7aa0288..f87ff28 100644
--- a/config/optional/search.page.node_search.yml
+++ b/config/optional/search.page.node_search.yml
@@ -1,4 +1,4 @@
-uuid: 09e53140-ac19-4d6d-a8ce-8d79322a6074
+uuid: 56bb085d-8ca2-4fc3-9be3-2a45f20866f3
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/search.page.user_search.yml b/config/optional/search.page.user_search.yml
index d95ad55..c4630ef 100644
--- a/config/optional/search.page.user_search.yml
+++ b/config/optional/search.page.user_search.yml
@@ -1,4 +1,4 @@
-uuid: 6cd6ef49-ff48-41e3-9c0e-72c3ded8b6ed
+uuid: a6a275c8-ff73-4266-a004-045f391e7d41
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/search.settings.yml b/config/optional/search.settings.yml
index f89d175..f864b47 100644
--- a/config/optional/search.settings.yml
+++ b/config/optional/search.settings.yml
@@ -1,6 +1,7 @@
 _core:
   default_config_hash: hvVxL1G-ZCxaq32IZws0YsfuhvaDiQE_np-0g35KjUk
 and_or_limit: 7
+default_page: node_search
 index:
   cron_limit: 100
   overlap_cjk: true
diff --git a/config/optional/search_api.index.clients.yml b/config/optional/search_api.index.clients.yml
deleted file mode 100644
index 488520b..0000000
--- a/config/optional/search_api.index.clients.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-uuid: db5edde5-3b1f-4270-a9f7-1a2e7e43fc90
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_accreditation_date
-    - field.storage.oc_organisation.field_client_status
-    - field.storage.oc_organisation.field_client_type
-    - field.storage.oc_organisation.field_tags
-    - field.storage.oc_organisation.field_type_of_umbrella_client
-    - field.storage.oc_organisation.field_umbrella_client
-    - search_api.server.opencase_server
-  module:
-    - opencase_entities
-    - search_api
-id: clients
-name: Clients
-description: ''
-read_only: false
-field_settings:
-  field_accreditation_date:
-    label: 'Accreditation date'
-    datasource_id: 'entity:oc_organisation'
-    property_path: field_accreditation_date
-    type: date
-    dependencies:
-      config:
-        - field.storage.oc_organisation.field_accreditation_date
-  field_client_status:
-    label: 'Client Status'
-    datasource_id: 'entity:oc_organisation'
-    property_path: field_client_status
-    type: integer
-    dependencies:
-      config:
-        - field.storage.oc_organisation.field_client_status
-  field_client_type:
-    label: 'Client type'
-    datasource_id: 'entity:oc_organisation'
-    property_path: field_client_type
-    type: integer
-    dependencies:
-      config:
-        - field.storage.oc_organisation.field_client_type
-  field_tags:
-    label: Tags
-    datasource_id: 'entity:oc_organisation'
-    property_path: field_tags
-    type: integer
-    dependencies:
-      config:
-        - field.storage.oc_organisation.field_tags
-  field_type_of_umbrella_client:
-    label: 'Type of umbrella client that this client belongs to'
-    datasource_id: 'entity:oc_organisation'
-    property_path: 'field_umbrella_client:entity:field_type_of_umbrella_client'
-    type: string
-    dependencies:
-      config:
-        - field.storage.oc_organisation.field_type_of_umbrella_client
-        - field.storage.oc_organisation.field_umbrella_client
-      module:
-        - opencase_entities
-datasource_settings:
-  'entity:oc_organisation':
-    bundles:
-      default: false
-      selected:
-        - client
-    languages:
-      default: true
-      selected: {  }
-processor_settings:
-  add_url: {  }
-  aggregated_field: {  }
-  language_with_fallback: {  }
-  rendered_item: {  }
-tracker_settings:
-  default:
-    indexing_order: fifo
-options:
-  cron_limit: 50
-  index_directly: true
-  track_changes_in_references: true
-server: opencase_server
diff --git a/config/optional/search_api.index.default_index.yml b/config/optional/search_api.index.default_index.yml
new file mode 100644
index 0000000..5b9d873
--- /dev/null
+++ b/config/optional/search_api.index.default_index.yml
@@ -0,0 +1,193 @@
+uuid: 426fbcb6-d1c5-4b8e-aa2c-a86bee39d65c
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.server.default_server
+    - core.entity_view_mode.node.search_index
+  module:
+    - search_api
+    - node
+_core:
+  default_config_hash: GLmLegZGHtMF6annRqgjizJAoiAip-IT-XOsDMCZfog
+id: default_index
+name: 'Default content index'
+description: 'Default content index created by the Database Search Defaults module'
+read_only: false
+field_settings:
+  author:
+    label: 'Author name'
+    datasource_id: 'entity:node'
+    property_path: 'uid:entity:name'
+    type: string
+  changed:
+    label: Changed
+    datasource_id: 'entity:node'
+    property_path: changed
+    type: date
+  created:
+    label: 'Authored on'
+    datasource_id: 'entity:node'
+    property_path: created
+    type: date
+  field_tags:
+    label: Tags
+    datasource_id: 'entity:node'
+    property_path: field_tags
+    type: integer
+  node_grants:
+    label: 'Node access information'
+    property_path: search_api_node_grants
+    type: string
+    indexed_locked: true
+    type_locked: true
+    hidden: true
+  rendered_item:
+    label: 'Rendered item'
+    property_path: rendered_item
+    type: text
+    configuration:
+      roles:
+        anonymous: anonymous
+      view_mode:
+        'entity:node':
+          article: search_index
+          page: search_index
+  status:
+    label: 'Publishing status'
+    datasource_id: 'entity:node'
+    property_path: status
+    type: boolean
+    indexed_locked: true
+    type_locked: true
+  sticky:
+    label: 'Sticky at top of lists'
+    datasource_id: 'entity:node'
+    property_path: sticky
+    type: boolean
+  title:
+    label: Title
+    datasource_id: 'entity:node'
+    property_path: title
+    type: text
+    boost: !!float 8
+  type:
+    label: 'Content type'
+    datasource_id: 'entity:node'
+    property_path: type
+    type: string
+  uid:
+    label: 'Author ID'
+    datasource_id: 'entity:node'
+    property_path: uid
+    type: integer
+    indexed_locked: true
+    type_locked: true
+datasource_settings:
+  'entity:node': {  }
+processor_settings:
+  add_url:
+    weights:
+      preprocess_index: -30
+  aggregated_field:
+    weights:
+      add_properties: 20
+  content_access:
+    weights:
+      preprocess_index: -6
+      preprocess_query: -4
+  entity_status:
+    weights:
+      preprocess_index: -10
+  html_filter:
+    weights:
+      preprocess_index: -3
+      preprocess_query: -6
+    fields:
+      - rendered_item
+    title: true
+    alt: true
+    tags:
+      b: 2
+      h1: 5
+      h2: 3
+      h3: 2
+      string: 2
+  ignorecase:
+    weights:
+      preprocess_index: -5
+      preprocess_query: -8
+    fields:
+      - rendered_item
+      - title
+  rendered_item:
+    weights:
+      add_properties: 0
+      pre_index_save: -10
+  stopwords:
+    weights:
+      postprocess_query: -10
+      preprocess_query: -10
+    fields:
+      - rendered_item
+      - title
+    stopwords:
+      - a
+      - an
+      - and
+      - are
+      - as
+      - at
+      - be
+      - but
+      - by
+      - for
+      - if
+      - in
+      - into
+      - is
+      - it
+      - 'no'
+      - not
+      - of
+      - 'on'
+      - or
+      - s
+      - such
+      - t
+      - that
+      - the
+      - their
+      - then
+      - there
+      - these
+      - they
+      - this
+      - to
+      - was
+      - will
+      - with
+  tokenizer:
+    weights:
+      preprocess_index: -2
+      preprocess_query: -5
+    fields:
+      - rendered_item
+      - title
+    spaces: ''
+    overlap_cjk: 1
+    minimum_word_size: '3'
+  transliteration:
+    weights:
+      preprocess_index: -4
+      preprocess_query: -7
+    fields:
+      - rendered_item
+      - title
+tracker_settings:
+  default: {  }
+options:
+  cron_limit: 50
+  index_directly: true
+  track_changes_in_references: true
+server: default_server
diff --git a/config/optional/search_api.index.opencase_actors.yml b/config/optional/search_api.index.opencase_actors.yml
index e9c1430..181706d 100644
--- a/config/optional/search_api.index.opencase_actors.yml
+++ b/config/optional/search_api.index.opencase_actors.yml
@@ -1,4 +1,4 @@
-uuid: 42f67f66-427a-4ad4-94d7-fc4030cb03dc
+uuid: 5dd4123f-ff7e-45e6-9cb8-a3ef2cdd8e34
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/search_api.server.default_server.yml b/config/optional/search_api.server.default_server.yml
new file mode 100644
index 0000000..551bea4
--- /dev/null
+++ b/config/optional/search_api.server.default_server.yml
@@ -0,0 +1,19 @@
+uuid: ff3c3087-bcaa-4f3a-9a8b-8ec63df67285
+langcode: en
+status: true
+dependencies:
+  module:
+    - search_api_db
+_core:
+  default_config_hash: zzCxllu86Y8P1gOFGuYFCaNsL6Az5mn5V2Z_fN17YaU
+id: default_server
+name: 'Database Server'
+description: 'Default database server created by the Database Search Defaults module'
+backend: search_api_db
+backend_config:
+  database: 'default:default'
+  min_chars: 3
+  matching: words
+  autocomplete:
+    suggest_suffix: true
+    suggest_words: true
diff --git a/config/optional/search_api.server.opencase_server.yml b/config/optional/search_api.server.opencase_server.yml
index f1cc372..9427eff 100644
--- a/config/optional/search_api.server.opencase_server.yml
+++ b/config/optional/search_api.server.opencase_server.yml
@@ -1,4 +1,4 @@
-uuid: 829382af-4d75-40f5-bf32-c1c79822cd33
+uuid: 332ea481-95b0-4f63-9d38-d2812710bd17
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/search_api.settings.yml b/config/optional/search_api.settings.yml
index a625fdf..21dfa08 100644
--- a/config/optional/search_api.settings.yml
+++ b/config/optional/search_api.settings.yml
@@ -1,9 +1,9 @@
+_core:
+  default_config_hash: b2zIRm9Jv3SB60NYdZkZHxH8-KdEa-Xa48-4NsIi4lg
 default_cron_limit: 50
 cron_worker_runtime: 15
 default_tracker: default
 tracking_page_size: 100
-_core:
-  default_config_hash: n7m4vlCPoB3_1C7l13LKYsifmLur4QR71mOD7S_5hSE
 boost_factors:
   - !!float 0
   - 0.1
diff --git a/config/optional/search_api_db.settings.yml b/config/optional/search_api_db.settings.yml
index 6620cef..32ffc94 100644
--- a/config/optional/search_api_db.settings.yml
+++ b/config/optional/search_api_db.settings.yml
@@ -1,3 +1,3 @@
-autocomplete_max_occurrences: 0.9
 _core:
   default_config_hash: fEmluJPpUL5dVqkWi0Fw89OlZYLhjQqyZIl6HWCDE1s
+autocomplete_max_occurrences: 0.9
diff --git a/config/optional/security_review.check.security_review-trusted_hosts.yml b/config/optional/security_review.check.security_review-trusted_hosts.yml
index f2d542d..f529411 100644
--- a/config/optional/security_review.check.security_review-trusted_hosts.yml
+++ b/config/optional/security_review.check.security_review-trusted_hosts.yml
@@ -1,3 +1 @@
 id: security_review-trusted_hosts
-settings:
-  method: token
diff --git a/config/optional/security_review.settings.yml b/config/optional/security_review.settings.yml
index 26d773d..46a3c76 100644
--- a/config/optional/security_review.settings.yml
+++ b/config/optional/security_review.settings.yml
@@ -1,7 +1,5 @@
-configured: true
-untrusted_roles:
-  - anonymous
-  - authenticated
-log: true
 _core:
   default_config_hash: ylcsF3ZfWc6Ua1nUaTXyVy2TNwupiRAtBA6w_whTMGg
+configured: false
+untrusted_roles: {  }
+log: true
diff --git a/config/optional/serialization.settings.yml b/config/optional/serialization.settings.yml
deleted file mode 100644
index ea2d8a5..0000000
--- a/config/optional/serialization.settings.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-bc_primitives_as_strings: false
-bc_timestamp_normalizer_unix: false
-_core:
-  default_config_hash: 6A1rmsmNf4SJrwCEt_aZyO_kPYuFnIOPC2n5lJiIftA
diff --git a/config/optional/shortcut.set.default.yml b/config/optional/shortcut.set.default.yml
index 0972655..a8b29c7 100644
--- a/config/optional/shortcut.set.default.yml
+++ b/config/optional/shortcut.set.default.yml
@@ -1,4 +1,4 @@
-uuid: c8d7d864-9b02-4b03-87ad-792750c8b57d
+uuid: 73ee928a-4309-4bdf-b4a1-3a84341cd622
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/smtp.settings.yml b/config/optional/smtp.settings.yml
new file mode 100644
index 0000000..dccf869
--- /dev/null
+++ b/config/optional/smtp.settings.yml
@@ -0,0 +1,20 @@
+_core:
+  default_config_hash: 2v5R3I9tNatGzKQjuZWh1y_955xK09313Vn-IIuedyI
+smtp_on: false
+smtp_host: ''
+smtp_hostbackup: ''
+smtp_port: '25'
+smtp_protocol: standard
+smtp_autotls: true
+smtp_timeout: 30
+smtp_username: ''
+smtp_password: ''
+smtp_from: ''
+smtp_fromname: ''
+smtp_client_hostname: ''
+smtp_client_helo: ''
+smtp_allowhtml: ''
+smtp_test_address: ''
+smtp_debugging: false
+prev_mail_system: php_mail
+smtp_keepalive: false
diff --git a/config/optional/system.action.comment_delete_action.yml b/config/optional/system.action.comment_delete_action.yml
index bee5d27..aaaaab4 100644
--- a/config/optional/system.action.comment_delete_action.yml
+++ b/config/optional/system.action.comment_delete_action.yml
@@ -1,4 +1,4 @@
-uuid: dec8e0e5-529e-42a4-801f-2bf828b1d357
+uuid: d15a97f9-9522-4664-94dd-88f68725ea6b
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.action.comment_publish_action.yml b/config/optional/system.action.comment_publish_action.yml
index 1599af2..560cae8 100644
--- a/config/optional/system.action.comment_publish_action.yml
+++ b/config/optional/system.action.comment_publish_action.yml
@@ -1,4 +1,4 @@
-uuid: 8dfd4121-9204-465e-878e-5e2e090a7c15
+uuid: f93294eb-fcaf-46b8-8ca7-707556568784
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.action.comment_save_action.yml b/config/optional/system.action.comment_save_action.yml
index cc3552d..986a25f 100644
--- a/config/optional/system.action.comment_save_action.yml
+++ b/config/optional/system.action.comment_save_action.yml
@@ -1,4 +1,4 @@
-uuid: 1a16569d-f4ce-4be2-9299-0021ecf412aa
+uuid: 30339f9d-1e1b-4adb-b551-1a8391762fe6
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.action.comment_unpublish_action.yml b/config/optional/system.action.comment_unpublish_action.yml
index 9c6d7e9..073709e 100644
--- a/config/optional/system.action.comment_unpublish_action.yml
+++ b/config/optional/system.action.comment_unpublish_action.yml
@@ -1,4 +1,4 @@
-uuid: c056dcec-6f95-48c7-9943-2f6231cb282c
+uuid: 152d7cdb-7c1a-4f82-bb58-a71f7aa23a88
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.action.feeds_feed_delete_action.yml b/config/optional/system.action.feeds_feed_delete_action.yml
deleted file mode 100644
index 712adc9..0000000
--- a/config/optional/system.action.feeds_feed_delete_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: e1de8102-418b-4b0d-961f-f52a1f4a2045
-langcode: en
-status: true
-dependencies:
-  module:
-    - feeds
-_core:
-  default_config_hash: yZW4ELH2L51kf2mGKd7f62uozGH-jFuWz1k9abACq1U
-id: feeds_feed_delete_action
-label: 'Delete selected feeds'
-type: feeds_feed
-plugin: feeds_feed_delete_action
-configuration: {  }
diff --git a/config/optional/system.action.node_delete_action.yml b/config/optional/system.action.node_delete_action.yml
index 1e19243..a58bb73 100644
--- a/config/optional/system.action.node_delete_action.yml
+++ b/config/optional/system.action.node_delete_action.yml
@@ -1,4 +1,4 @@
-uuid: 5f932be7-b790-43f3-8206-852a5c8703d2
+uuid: 43e8df41-8900-41e4-95c1-2b31a571f8bd
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.action.node_make_sticky_action.yml b/config/optional/system.action.node_make_sticky_action.yml
index 5192faf..2a45892 100644
--- a/config/optional/system.action.node_make_sticky_action.yml
+++ b/config/optional/system.action.node_make_sticky_action.yml
@@ -1,4 +1,4 @@
-uuid: dbd9b07d-c99a-4390-b1cd-b979ced91188
+uuid: 015ac1f3-7957-4e1f-9248-7f8e879f5063
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.action.node_make_unsticky_action.yml b/config/optional/system.action.node_make_unsticky_action.yml
index 3c2d628..4386e96 100644
--- a/config/optional/system.action.node_make_unsticky_action.yml
+++ b/config/optional/system.action.node_make_unsticky_action.yml
@@ -1,4 +1,4 @@
-uuid: a3b1cef3-8041-4163-9aa4-5b0c3717bdc0
+uuid: a2ce21a6-dd77-475d-8698-122f30de50eb
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.action.node_promote_action.yml b/config/optional/system.action.node_promote_action.yml
index 6daa2e4..638dfa4 100644
--- a/config/optional/system.action.node_promote_action.yml
+++ b/config/optional/system.action.node_promote_action.yml
@@ -1,4 +1,4 @@
-uuid: 1183ea37-ca1e-4df2-b8ad-74ee102f7718
+uuid: b623f0b8-894d-445a-9dac-533973e08ec0
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.action.node_publish_action.yml b/config/optional/system.action.node_publish_action.yml
index f6c2b48..9aa28d1 100644
--- a/config/optional/system.action.node_publish_action.yml
+++ b/config/optional/system.action.node_publish_action.yml
@@ -1,4 +1,4 @@
-uuid: 1f4ffecc-d399-441b-af84-b6910cce2665
+uuid: 9ec5a5a2-c1f9-42e8-99b7-5873f9f22bd6
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.action.node_save_action.yml b/config/optional/system.action.node_save_action.yml
index 4c164c8..4a968c2 100644
--- a/config/optional/system.action.node_save_action.yml
+++ b/config/optional/system.action.node_save_action.yml
@@ -1,4 +1,4 @@
-uuid: 554c4e4b-e9e5-47f3-8ead-72aca4d8c916
+uuid: d916594b-6ec1-4c79-bb14-7019b8a21c8a
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.action.node_unpromote_action.yml b/config/optional/system.action.node_unpromote_action.yml
index 0405226..29ad778 100644
--- a/config/optional/system.action.node_unpromote_action.yml
+++ b/config/optional/system.action.node_unpromote_action.yml
@@ -1,4 +1,4 @@
-uuid: a7c2c31e-c28e-41c5-b60f-91050abfdaf1
+uuid: 49d09790-2510-4c1a-94aa-d749d0acf45b
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.action.node_unpublish_action.yml b/config/optional/system.action.node_unpublish_action.yml
index ff18bb4..777b304 100644
--- a/config/optional/system.action.node_unpublish_action.yml
+++ b/config/optional/system.action.node_unpublish_action.yml
@@ -1,4 +1,4 @@
-uuid: 58ed6cd2-ac06-4e83-b80a-55a30f7472b4
+uuid: 65edd3e7-2060-4072-9d27-5bc5e773e893
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.action.taxonomy_term_publish_action.yml b/config/optional/system.action.taxonomy_term_publish_action.yml
index 4db2c4f..4fca89b 100644
--- a/config/optional/system.action.taxonomy_term_publish_action.yml
+++ b/config/optional/system.action.taxonomy_term_publish_action.yml
@@ -1,4 +1,4 @@
-uuid: 8ff1745c-9844-43ae-91a3-7cb9ffb48e13
+uuid: 5b6f8d43-fcfc-405d-92ce-215296787cc6
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.action.taxonomy_term_unpublish_action.yml b/config/optional/system.action.taxonomy_term_unpublish_action.yml
index 858305e..58f0990 100644
--- a/config/optional/system.action.taxonomy_term_unpublish_action.yml
+++ b/config/optional/system.action.taxonomy_term_unpublish_action.yml
@@ -1,4 +1,4 @@
-uuid: d56e242f-274c-4fb3-bb59-6fcb896e36a5
+uuid: ad67bfb7-b20f-40c0-93ed-3f4c1637f23e
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.action.user_add_role_action.administrator.yml b/config/optional/system.action.user_add_role_action.administrator.yml
index 851ea90..4e56dce 100644
--- a/config/optional/system.action.user_add_role_action.administrator.yml
+++ b/config/optional/system.action.user_add_role_action.administrator.yml
@@ -1,4 +1,4 @@
-uuid: 4f4c5cc6-81e0-49af-9fd4-f8638d7b1769
+uuid: 281c1bf1-a0f4-4bd3-bfa6-259ac2c1d77d
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.action.user_add_role_action.content_editor.yml b/config/optional/system.action.user_add_role_action.content_editor.yml
new file mode 100644
index 0000000..347adf4
--- /dev/null
+++ b/config/optional/system.action.user_add_role_action.content_editor.yml
@@ -0,0 +1,14 @@
+uuid: 3f8fe1d1-de55-44ca-bc56-736bca19e9b4
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.content_editor
+  module:
+    - user
+id: user_add_role_action.content_editor
+label: 'Add the Content editor role to the selected user(s)'
+type: user
+plugin: user_add_role_action
+configuration:
+  rid: content_editor
diff --git a/config/optional/system.action.user_add_role_action.follow_up_alerts.yml b/config/optional/system.action.user_add_role_action.follow_up_alerts.yml
deleted file mode 100644
index f3f7ac9..0000000
--- a/config/optional/system.action.user_add_role_action.follow_up_alerts.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 2477506b-d3d4-484d-9d71-f2a93b341996
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.follow_up_alerts
-  module:
-    - user
-id: user_add_role_action.follow_up_alerts
-label: 'Add the Follow-up alerts role to the selected user(s)'
-type: user
-plugin: user_add_role_action
-configuration:
-  rid: follow_up_alerts
diff --git a/config/optional/system.action.user_add_role_action.gno_admin_user.yml b/config/optional/system.action.user_add_role_action.gno_admin_user.yml
deleted file mode 100644
index 84e575a..0000000
--- a/config/optional/system.action.user_add_role_action.gno_admin_user.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: ba93670a-ccb1-42d9-90e1-571ed5c89309
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.gno_admin_user
-  module:
-    - user
-id: user_add_role_action.gno_admin_user
-label: 'Add the GNO Admin user role to the selected user(s)'
-type: user
-plugin: user_add_role_action
-configuration:
-  rid: gno_admin_user
diff --git a/config/optional/system.action.user_add_role_action.invoicing_alerts.yml b/config/optional/system.action.user_add_role_action.invoicing_alerts.yml
deleted file mode 100644
index 55db8bb..0000000
--- a/config/optional/system.action.user_add_role_action.invoicing_alerts.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 63de88ab-e439-4b10-89eb-48f9303c7aab
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.invoicing_alerts
-  module:
-    - user
-id: user_add_role_action.invoicing_alerts
-label: 'Add the Invoicing Alerts role to the selected user(s)'
-type: user
-plugin: user_add_role_action
-configuration:
-  rid: invoicing_alerts
diff --git a/config/optional/system.action.user_add_role_action.newly_accredited_alerts.yml b/config/optional/system.action.user_add_role_action.newly_accredited_alerts.yml
deleted file mode 100644
index 3abbfed..0000000
--- a/config/optional/system.action.user_add_role_action.newly_accredited_alerts.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 9ccffac0-9acb-41f6-95a5-9aa062f4ab83
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.newly_accredited_alerts
-  module:
-    - user
-id: user_add_role_action.newly_accredited_alerts
-label: 'Add the Newly Accredited Alerts role to the selected user(s)'
-type: user
-plugin: user_add_role_action
-configuration:
-  rid: newly_accredited_alerts
diff --git a/config/optional/system.action.user_block_user_action.yml b/config/optional/system.action.user_block_user_action.yml
index c924249..7a58dac 100644
--- a/config/optional/system.action.user_block_user_action.yml
+++ b/config/optional/system.action.user_block_user_action.yml
@@ -1,4 +1,4 @@
-uuid: 3ccf14af-1b93-4796-9c8f-b38be9b20ca2
+uuid: d3a11490-32ec-44cb-8e82-2653276eb185
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.action.user_cancel_user_action.yml b/config/optional/system.action.user_cancel_user_action.yml
index 2406088..47299c4 100644
--- a/config/optional/system.action.user_cancel_user_action.yml
+++ b/config/optional/system.action.user_cancel_user_action.yml
@@ -1,4 +1,4 @@
-uuid: 1fd86e6d-fb6d-4f2e-a961-62de25051b6a
+uuid: 6cbe90da-cefa-4a54-9bcb-0fd9a216fa20
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.action.user_remove_role_action.administrator.yml b/config/optional/system.action.user_remove_role_action.administrator.yml
index 901d58a..4945844 100644
--- a/config/optional/system.action.user_remove_role_action.administrator.yml
+++ b/config/optional/system.action.user_remove_role_action.administrator.yml
@@ -1,4 +1,4 @@
-uuid: 2861143f-6364-49fe-b533-9123e342cb6e
+uuid: d140be3d-f687-4cee-8f5a-1ba8f1f0c455
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.action.user_remove_role_action.content_editor.yml b/config/optional/system.action.user_remove_role_action.content_editor.yml
new file mode 100644
index 0000000..ac8cc6b
--- /dev/null
+++ b/config/optional/system.action.user_remove_role_action.content_editor.yml
@@ -0,0 +1,14 @@
+uuid: 196fa9a6-cb8b-4300-84c5-1ec09151b457
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.content_editor
+  module:
+    - user
+id: user_remove_role_action.content_editor
+label: 'Remove the Content editor role from the selected user(s)'
+type: user
+plugin: user_remove_role_action
+configuration:
+  rid: content_editor
diff --git a/config/optional/system.action.user_remove_role_action.follow_up_alerts.yml b/config/optional/system.action.user_remove_role_action.follow_up_alerts.yml
deleted file mode 100644
index 7d7b7b8..0000000
--- a/config/optional/system.action.user_remove_role_action.follow_up_alerts.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: c1953991-174f-4390-a5db-d992c6c9395d
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.follow_up_alerts
-  module:
-    - user
-id: user_remove_role_action.follow_up_alerts
-label: 'Remove the Follow-up alerts role from the selected user(s)'
-type: user
-plugin: user_remove_role_action
-configuration:
-  rid: follow_up_alerts
diff --git a/config/optional/system.action.user_remove_role_action.gno_admin_user.yml b/config/optional/system.action.user_remove_role_action.gno_admin_user.yml
deleted file mode 100644
index d1ed52d..0000000
--- a/config/optional/system.action.user_remove_role_action.gno_admin_user.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: c596d543-d07d-450f-ae48-7536026c466b
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.gno_admin_user
-  module:
-    - user
-id: user_remove_role_action.gno_admin_user
-label: 'Remove the GNO Admin user role from the selected user(s)'
-type: user
-plugin: user_remove_role_action
-configuration:
-  rid: gno_admin_user
diff --git a/config/optional/system.action.user_remove_role_action.invoicing_alerts.yml b/config/optional/system.action.user_remove_role_action.invoicing_alerts.yml
deleted file mode 100644
index abd701a..0000000
--- a/config/optional/system.action.user_remove_role_action.invoicing_alerts.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 418e7e95-3e97-4bca-aca7-39f107d27a96
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.invoicing_alerts
-  module:
-    - user
-id: user_remove_role_action.invoicing_alerts
-label: 'Remove the Invoicing Alerts role from the selected user(s)'
-type: user
-plugin: user_remove_role_action
-configuration:
-  rid: invoicing_alerts
diff --git a/config/optional/system.action.user_remove_role_action.newly_accredited_alerts.yml b/config/optional/system.action.user_remove_role_action.newly_accredited_alerts.yml
deleted file mode 100644
index 04a25a1..0000000
--- a/config/optional/system.action.user_remove_role_action.newly_accredited_alerts.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 1d159794-2fff-4094-8fd5-4094feb784ac
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.newly_accredited_alerts
-  module:
-    - user
-id: user_remove_role_action.newly_accredited_alerts
-label: 'Remove the Newly Accredited Alerts role from the selected user(s)'
-type: user
-plugin: user_remove_role_action
-configuration:
-  rid: newly_accredited_alerts
diff --git a/config/optional/system.action.user_unblock_user_action.yml b/config/optional/system.action.user_unblock_user_action.yml
index 96e8569..f1c1117 100644
--- a/config/optional/system.action.user_unblock_user_action.yml
+++ b/config/optional/system.action.user_unblock_user_action.yml
@@ -1,4 +1,4 @@
-uuid: 4c907bb8-7d9c-4e78-9c5b-db6a5095e858
+uuid: 6039de9a-179e-4aef-9dc5-65cf2b151c16
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/system.advisories.yml b/config/optional/system.advisories.yml
new file mode 100644
index 0000000..2ad53d6
--- /dev/null
+++ b/config/optional/system.advisories.yml
@@ -0,0 +1,4 @@
+_core:
+  default_config_hash: x0FuQ_7Cg81mSDQwG028_Z0CjH3R9ib5IDlHeV2BbAo
+enabled: true
+interval_hours: 6
diff --git a/config/optional/system.authorize.yml b/config/optional/system.authorize.yml
deleted file mode 100644
index c469cae..0000000
--- a/config/optional/system.authorize.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-filetransfer_default: null
-_core:
-  default_config_hash: z63ds8M4zPrylEgFRkRcOlfcsXWwfITzjD4cj1kRdfg
diff --git a/config/optional/system.date.yml b/config/optional/system.date.yml
index e37bcb9..e0dca4f 100644
--- a/config/optional/system.date.yml
+++ b/config/optional/system.date.yml
@@ -1,11 +1,11 @@
 _core:
-  default_config_hash: V9UurX2GPT05NWKG9f2GWQqFG2TRG8vczidwjpy7Woo
+  default_config_hash: t7clj3mzmOGrXX0HuCH5usf0vEqRtnMTBFVBIEmZ5pc
 first_day: 0
 country:
   default: GB
 timezone:
   default: Europe/London
   user:
-    configurable: false
+    configurable: true
     default: 0
     warn: false
diff --git a/config/optional/system.logging.yml b/config/optional/system.logging.yml
index 0137fe9..d6164de 100644
--- a/config/optional/system.logging.yml
+++ b/config/optional/system.logging.yml
@@ -1,3 +1,3 @@
 _core:
   default_config_hash: u3-njszl92FaxjrCMiq0yDcjAfcdx72w1zT1O9dx6aA
-error_level: all
+error_level: hide
diff --git a/config/optional/system.maintenance.yml b/config/optional/system.maintenance.yml
index 7bc5b98..65a36d2 100644
--- a/config/optional/system.maintenance.yml
+++ b/config/optional/system.maintenance.yml
@@ -1,4 +1,4 @@
 _core:
-  default_config_hash: Z5MXifrF77GEAgx0GQ6iWT8wStjFuY8BD9OruofWTJ8
+  default_config_hash: 1SNdA25INsV5YjlgAJtfC-6AM8VcWe_00xneMLb2yFg
 langcode: en
 message: '@site is currently under maintenance. We should be back shortly. Thank you for your patience.'
diff --git a/config/optional/system.menu.account.yml b/config/optional/system.menu.account.yml
index b934289..a457100 100644
--- a/config/optional/system.menu.account.yml
+++ b/config/optional/system.menu.account.yml
@@ -1,4 +1,4 @@
-uuid: abae2480-00ec-4229-98ff-f9d8ad240a08
+uuid: 60081067-afd8-4fbe-8f97-97c7ece2af6e
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/system.menu.admin.yml b/config/optional/system.menu.admin.yml
index 38e221c..c28b985 100644
--- a/config/optional/system.menu.admin.yml
+++ b/config/optional/system.menu.admin.yml
@@ -1,4 +1,4 @@
-uuid: 2d70b1ec-e1b4-4826-9d79-9f73ca4852fa
+uuid: b49de79f-a139-4cc7-ab32-2ed864d7fc63
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/system.menu.devel.yml b/config/optional/system.menu.devel.yml
deleted file mode 100644
index da6d0b6..0000000
--- a/config/optional/system.menu.devel.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: d0dc58fa-693d-4b44-8fda-60678eb6e17c
-langcode: en
-status: true
-dependencies:
-  enforced:
-    module:
-      - devel
-_core:
-  default_config_hash: 3V-l1uuTcyirYOGLPZV5HWaDfr02uEbWZJIwc8Byz-c
-id: devel
-label: Development
-description: 'Links related to Devel module.'
-locked: true
diff --git a/config/optional/system.menu.footer.yml b/config/optional/system.menu.footer.yml
index c608672..1bbd28c 100644
--- a/config/optional/system.menu.footer.yml
+++ b/config/optional/system.menu.footer.yml
@@ -1,4 +1,4 @@
-uuid: 11f3b8fb-6111-450a-9f7a-50434b2a8a50
+uuid: e89337a3-781f-49b7-83ee-607bda18a285
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/system.menu.main.yml b/config/optional/system.menu.main.yml
index 91eb594..6f9e7b3 100644
--- a/config/optional/system.menu.main.yml
+++ b/config/optional/system.menu.main.yml
@@ -1,4 +1,4 @@
-uuid: e15f7b80-97ea-405e-a404-eda38d3bee69
+uuid: 6dc64f9e-4148-41a1-9b2e-5e1ce066db14
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/system.menu.opencase.yml b/config/optional/system.menu.opencase.yml
index 573237d..599460d 100644
--- a/config/optional/system.menu.opencase.yml
+++ b/config/optional/system.menu.opencase.yml
@@ -1,4 +1,4 @@
-uuid: 45c229ff-4aa4-4268-b994-cf6a7014a8d8
+uuid: 88b82973-1c44-4de2-abc4-6d73fdca2e0c
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/system.menu.tools.yml b/config/optional/system.menu.tools.yml
index 2712756..b20563d 100644
--- a/config/optional/system.menu.tools.yml
+++ b/config/optional/system.menu.tools.yml
@@ -1,4 +1,4 @@
-uuid: 4d4c9910-7aae-4a78-98c3-aa2adc4b99e2
+uuid: 66aa1aaa-6085-4a68-9197-92472c35f68b
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/system.performance.yml b/config/optional/system.performance.yml
index b380f12..6b57fb6 100644
--- a/config/optional/system.performance.yml
+++ b/config/optional/system.performance.yml
@@ -3,10 +3,9 @@ _core:
 cache:
   page:
     max_age: 0
-    use_internal: false
 css:
   preprocess: false
-  gzip: false
+  gzip: true
 fast_404:
   enabled: true
   paths: '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i'
@@ -14,7 +13,5 @@ fast_404:
   html: '<!DOCTYPE html><html><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>'
 js:
   preprocess: false
-  gzip: false
+  gzip: true
 stale_file_threshold: 2592000
-response:
-  gzip: false
diff --git a/config/optional/system.rss.yml b/config/optional/system.rss.yml
index 18b255d..d806208 100644
--- a/config/optional/system.rss.yml
+++ b/config/optional/system.rss.yml
@@ -1,8 +1,4 @@
 _core:
-  default_config_hash: TlH7NNk46phfxu1mSUfwg1C0YqaGsUCeD4l9JQnQlDU
-langcode: en
+  default_config_hash: MIpNzlG4gPunfS7vTCwUPum6QH3GUsEBMj-qS631Jw0
 items:
   view_mode: rss
-  limit: 10
-channel:
-  description: ''
diff --git a/config/optional/system.site.yml b/config/optional/system.site.yml
index e634bb9..10c0d47 100644
--- a/config/optional/system.site.yml
+++ b/config/optional/system.site.yml
@@ -1,15 +1,14 @@
 _core:
-  default_config_hash: yTxtFqBHnEWxQswuWvkjE8mKw2t8oKuCL1q8KnfHuGE
+  default_config_hash: VDJxTZtQR21qB4lvOq8zszJZLvLKrSPQpdn2E3T71Ww
 langcode: en
-uuid: 8061a200-27ed-4d40-8fc0-e239276e66dd
-name: GNO
-mail: no-reply@dev.autonomic.zone
+uuid: 0c85ec7c-68f9-419f-92bb-d9a3a256ca23
+name: 'Opencase Local'
+mail: naomirosenberguk@gmail.com
 slogan: ''
 page:
   403: /user/login
   404: ''
-  front: /opencase/trainings/all
+  front: /opencase/actors/client
 admin_compact_mode: false
 weight_select_max: 100
 default_langcode: en
-mail_notification: ''
diff --git a/config/optional/system.theme.yml b/config/optional/system.theme.yml
index 25ef024..113eb1f 100644
--- a/config/optional/system.theme.yml
+++ b/config/optional/system.theme.yml
@@ -1,4 +1,4 @@
 _core:
   default_config_hash: fOjer9hADYYnbCJVZMFZIIM1azTFWyg84ZkFDHfAbUg
 admin: seven
-default: bartik_gno
+default: bartik
diff --git a/config/optional/taxonomy.vocabulary.clie.yml b/config/optional/taxonomy.vocabulary.clie.yml
deleted file mode 100644
index ffece07..0000000
--- a/config/optional/taxonomy.vocabulary.clie.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-uuid: d441f873-3318-4cbb-b1be-cc59b5b3b5ce
-langcode: en
-status: true
-dependencies: {  }
-name: 'Client substatuses'
-vid: clie
-description: ''
-weight: 0
diff --git a/config/optional/taxonomy.vocabulary.client_status.yml b/config/optional/taxonomy.vocabulary.client_status.yml
deleted file mode 100644
index cfb6c38..0000000
--- a/config/optional/taxonomy.vocabulary.client_status.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-uuid: 98b21a27-0782-4f27-be5f-5256c58cccc2
-langcode: en
-status: true
-dependencies: {  }
-name: 'Client status'
-vid: client_status
-description: ''
-weight: 0
diff --git a/config/optional/taxonomy.vocabulary.client_subtypes.yml b/config/optional/taxonomy.vocabulary.client_subtypes.yml
deleted file mode 100644
index 13a7ee6..0000000
--- a/config/optional/taxonomy.vocabulary.client_subtypes.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 589b1eb2-de61-492b-907a-6442755c6033
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: tjuVBuvKlpg_4muzQZ_ly5moMJ6ZKpPRm0GfnVNfFxM
-name: 'Client subtypes'
-vid: client_subtypes
-description: ''
-weight: 0
diff --git a/config/optional/taxonomy.vocabulary.client_types.yml b/config/optional/taxonomy.vocabulary.client_types.yml
deleted file mode 100644
index f96a438..0000000
--- a/config/optional/taxonomy.vocabulary.client_types.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 5da83acd-7643-4eb0-8ce8-49b0708f66fc
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: 7q2s6rCVNBUeSek1FmWAj9ns_hVuNEP3V2sNFJBLncc
-name: 'Client types'
-vid: client_types
-description: ''
-weight: 0
diff --git a/config/optional/taxonomy.vocabulary.invoicing_statuses.yml b/config/optional/taxonomy.vocabulary.invoicing_statuses.yml
deleted file mode 100644
index eefc381..0000000
--- a/config/optional/taxonomy.vocabulary.invoicing_statuses.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-uuid: c8f89b5c-1d2c-47db-89aa-d9c274b89a43
-langcode: en
-status: true
-dependencies: {  }
-name: 'Invoicing statuses'
-vid: invoicing_statuses
-description: ''
-weight: 0
diff --git a/config/optional/taxonomy.vocabulary.oc_case_provider_role.yml b/config/optional/taxonomy.vocabulary.oc_case_provider_role.yml
index a821317..35e4d2b 100644
--- a/config/optional/taxonomy.vocabulary.oc_case_provider_role.yml
+++ b/config/optional/taxonomy.vocabulary.oc_case_provider_role.yml
@@ -1,4 +1,4 @@
-uuid: 4bde2bbb-7fa3-4647-893e-e8bf691b8824
+uuid: 85aacc47-8df9-4309-b7f4-f58be70f83d0
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/taxonomy.vocabulary.oc_fee_category.yml b/config/optional/taxonomy.vocabulary.oc_fee_category.yml
index 374d160..842c389 100644
--- a/config/optional/taxonomy.vocabulary.oc_fee_category.yml
+++ b/config/optional/taxonomy.vocabulary.oc_fee_category.yml
@@ -1,8 +1,8 @@
-uuid: e7f05cce-e8e1-4a48-81ea-7a9104f3e823
+uuid: 93a96bb4-da95-4d69-be37-d1477624f849
 langcode: en
 status: true
 dependencies: {  }
-name: 'Fee Categories'
+name: 'Fee categories'
 vid: oc_fee_category
 description: ''
 weight: 0
diff --git a/config/optional/taxonomy.vocabulary.tags.yml b/config/optional/taxonomy.vocabulary.tags.yml
index cc000e5..63cf9d9 100644
--- a/config/optional/taxonomy.vocabulary.tags.yml
+++ b/config/optional/taxonomy.vocabulary.tags.yml
@@ -1,4 +1,4 @@
-uuid: e1fb476b-f911-4f4f-a6ad-ba9e679c5412
+uuid: 6bf974cb-9387-49f5-9dd2-f1176dbb908d
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/optional/tour.tour.block-layout.yml b/config/optional/tour.tour.block-layout.yml
new file mode 100644
index 0000000..8f6bcad
--- /dev/null
+++ b/config/optional/tour.tour.block-layout.yml
@@ -0,0 +1,48 @@
+uuid: 9a7b322b-8129-4aec-b391-18e2b64204ea
+langcode: en
+status: true
+dependencies:
+  module:
+    - block
+_core:
+  default_config_hash: DI2aQ7IbaYrwUfiwSn-3g-ANh_t7LzQ1JkRqd1ujgFs
+id: block-layout
+label: 'Block Layout Page'
+module: block
+routes:
+  -
+    route_name: block.admin_display
+tips:
+  block-layout:
+    id: block-layout
+    plugin: text
+    label: 'Block Layout'
+    weight: 1
+    body: 'Blocks are boxes of content rendered into an area, or region, of a web page that can be displayed in regions (such as footer or sidebar) on your page.'
+  place-block:
+    id: place-block
+    plugin: text
+    label: 'Place Blocks'
+    weight: 2
+    selector: .button--small
+    body: 'Any custom or contributed block can be added to a particular region by clicking on a button Place block. A new block can also be created by clicking on Place Block'
+  block-region:
+    id: block-region
+    plugin: text
+    label: 'Block Region'
+    weight: 3
+    selector: .block-region-select
+    body: 'Assign or change the region of a block by clicking here. A dropdown list with all the regions will appear.You can place one block in multiple regions.'
+  configure-block:
+    id: configure-block
+    plugin: text
+    label: 'Configure Block'
+    weight: 4
+    selector: .dropbutton-widget
+    body: 'By Clicking on "Configure" you can go ahead and edit the contents of the block, deal with the visibility settings and even change the placement of where it is on your theme.'
+  custom-block-library:
+    id: custom-block-library
+    plugin: text
+    label: 'Custom Block Library'
+    weight: 5
+    body: 'The block management screen also has an another tab on the top which is used to add Custom blocks. The name of the tab is "Custom block library". This tab ultimately provides a link to add custom blocks.'
diff --git a/config/optional/tour.tour.search-api-index-fields.yml b/config/optional/tour.tour.search-api-index-fields.yml
index 17a0e7a..e229361 100644
--- a/config/optional/tour.tour.search-api-index-fields.yml
+++ b/config/optional/tour.tour.search-api-index-fields.yml
@@ -1,4 +1,4 @@
-uuid: 6c162404-f155-469e-800b-ec4726a6ca4e
+uuid: ff59c4d1-b787-48a1-a617-856bf0e2286f
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/tour.tour.search-api-index-form.yml b/config/optional/tour.tour.search-api-index-form.yml
index 75191a2..be22951 100644
--- a/config/optional/tour.tour.search-api-index-form.yml
+++ b/config/optional/tour.tour.search-api-index-form.yml
@@ -1,4 +1,4 @@
-uuid: f6e8fd4d-7ab0-47c4-a34b-9e7b15bcecd0
+uuid: 5bf2a918-ba0e-45dd-86be-ee69923fd910
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/tour.tour.search-api-index-processors.yml b/config/optional/tour.tour.search-api-index-processors.yml
index 622eb5e..9612d1e 100644
--- a/config/optional/tour.tour.search-api-index-processors.yml
+++ b/config/optional/tour.tour.search-api-index-processors.yml
@@ -1,4 +1,4 @@
-uuid: efcf1687-54fe-4148-ba2e-921678139911
+uuid: 69395205-da2d-4ab2-93a3-e4824a20450f
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/tour.tour.search-api-index.yml b/config/optional/tour.tour.search-api-index.yml
index aed458f..603cfd9 100644
--- a/config/optional/tour.tour.search-api-index.yml
+++ b/config/optional/tour.tour.search-api-index.yml
@@ -1,4 +1,4 @@
-uuid: 4f3a020d-3307-4bfc-aad5-fc167fc9161b
+uuid: 974dd8fd-6286-4386-b88f-e9b32fffbb03
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/tour.tour.search-api-server-form.yml b/config/optional/tour.tour.search-api-server-form.yml
index 454dbfb..56df6eb 100644
--- a/config/optional/tour.tour.search-api-server-form.yml
+++ b/config/optional/tour.tour.search-api-server-form.yml
@@ -1,4 +1,4 @@
-uuid: 346651f1-be71-4c61-ba81-71848758e2c5
+uuid: 98d1c8ef-7a91-471c-956e-25b69bd0ac2e
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/tour.tour.search-api-server.yml b/config/optional/tour.tour.search-api-server.yml
index 84baf55..ef3861f 100644
--- a/config/optional/tour.tour.search-api-server.yml
+++ b/config/optional/tour.tour.search-api-server.yml
@@ -1,4 +1,4 @@
-uuid: b5f0949c-e41d-4ba9-a974-5362544af18a
+uuid: 9869fb2b-360a-4904-aa8a-d8f7a2d7ce3c
 langcode: en
 status: true
 dependencies:
diff --git a/config/optional/tour.tour.views-ui.yml b/config/optional/tour.tour.views-ui.yml
index cad1b09..5646ae5 100644
--- a/config/optional/tour.tour.views-ui.yml
+++ b/config/optional/tour.tour.views-ui.yml
@@ -1,11 +1,11 @@
-uuid: e62cee25-de79-4a9a-8eea-4770acb132ee
+uuid: 161a388d-bd16-4d86-a61c-831711fb1f1e
 langcode: en
 status: true
 dependencies:
   module:
     - views_ui
 _core:
-  default_config_hash: c-HMyZwgeP8H6AITDcq4hznePkd7azpe8xl_WTnx2O0
+  default_config_hash: XIYL1KF7ND2XQRa5AxvEcp8vgCN2kUGiuBNhCgxrPME
 id: views-ui
 label: 'View edit page'
 module: views_ui
@@ -33,7 +33,7 @@ tips:
     plugin: text
     label: 'View administration'
     weight: 3
-    position: left-start
+    position: right
     selector: '#views-display-extra-actions'
     body: 'Perform administrative tasks, including adding a description and creating a clone. Click the drop-down button to view the available options.'
   views-ui-format:
@@ -83,6 +83,6 @@ tips:
     plugin: text
     label: Preview
     weight: 10
-    position: left-start
+    position: right
     selector: '#preview-submit'
     body: 'Show a preview of the view output.'
diff --git a/config/optional/update.settings.yml b/config/optional/update.settings.yml
deleted file mode 100644
index 7052d9d..0000000
--- a/config/optional/update.settings.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-_core:
-  default_config_hash: 2QzULf0zovJQx3J06Y9rufzzfi-CY2CTTlEfJJh2Qyw
-check:
-  disabled_extensions: false
-  interval_days: 1
-fetch:
-  url: ''
-  max_attempts: 2
-  timeout: 30
-notification:
-  emails:
-    - helo@autonomic.zone
-  threshold: security
diff --git a/config/optional/user.mail.yml b/config/optional/user.mail.yml
index 224d083..bf425c0 100644
--- a/config/optional/user.mail.yml
+++ b/config/optional/user.mail.yml
@@ -1,30 +1,116 @@
 _core:
-  default_config_hash: IWzNdUVX2YSiflxrGSTLIiqTrhgIzbV2C-hRL5DniJM
+  default_config_hash: 6CZIzFifRq3qbdq3n3nDpEOO4hWIQtKOAQNPvGNGKeM
 langcode: en
 cancel_confirm:
   subject: 'Account cancellation request for [user:display-name] at [site:name]'
-  body: "[user:display-name],\r\n\r\nA request to cancel your account has been made at [site:name].\r\n\r\nYou may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:cancel-url]\r\n\r\nNOTE: The cancellation of your account is not reversible.\r\n\r\nThis link expires in one day and nothing will happen if it is not used.\r\n\r\n--  [site:name] team"
+  body: |-
+    [user:display-name]
+
+    A request to cancel your account has been made at [site:name].
+
+    You may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser:
+
+    [user:cancel-url]
+
+    NOTE: The cancellation of your account is not reversible.
+
+    This link expires in one day and nothing will happen if it is not used.
+
+    --  [site:name] team
 password_reset:
   subject: 'Replacement login information for [user:display-name] at [site:name]'
-  body: "[user:display-name],\r\n\r\nA request to reset the password for your account has been made at [site:name].\r\n\r\nYou may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used.\r\n\r\n--  [site:name] team"
+  body: |-
+    [user:display-name],
+
+    A request to reset the password for your account has been made at [site:name].
+
+    You may now log in by clicking this link or copying and pasting it into your browser:
+
+    [user:one-time-login-url]
+
+    This link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used.
+
+    --  [site:name] team
 register_admin_created:
   subject: 'An administrator created an account for you at [site:name]'
-  body: "[user:display-name],\r\n\r\nA site administrator at [site:name] has created an account for you. You may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:name]\r\npassword: Your password\r\n\r\n--  [site:name] team"
+  body: |-
+    [user:display-name],
+
+    A site administrator at [site:name] has created an account for you. You may now log in by clicking this link or copying and pasting it into your browser:
+
+    [user:one-time-login-url]
+
+    This link can only be used once to log in and will lead you to a page where you can set your password.
+
+    After setting your password, you will be able to log in at [site:login-url] in the future using:
+
+    username: [user:name]
+    password: Your password
+
+    --  [site:name] team
 register_no_approval_required:
   subject: 'Account details for [user:display-name] at [site:name]'
-  body: "[user:display-name],\r\n\r\nThank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:name]\r\npassword: Your password\r\n\r\n--  [site:name] team"
+  body: |-
+    [user:display-name],
+
+    Thank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it into your browser:
+
+    [user:one-time-login-url]
+
+    This link can only be used once to log in and will lead you to a page where you can set your password.
+
+    After setting your password, you will be able to log in at [site:login-url] in the future using:
+
+    username: [user:name]
+    password: Your password
+
+    --  [site:name] team
 register_pending_approval:
   subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)'
-  body: "[user:display-name],\r\n\r\nThank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\r\n\r\n--  [site:name] team"
+  body: |-
+    [user:display-name],
+
+    Thank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.
+
+    --  [site:name] team
 register_pending_approval_admin:
   subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)'
-  body: "[user:display-name] has applied for an account.\r\n\r\n[user:edit-url]"
+  body: |-
+    [user:display-name] has applied for an account.
+
+    [user:edit-url]
 status_activated:
   subject: 'Account details for [user:display-name] at [site:name] (approved)'
-  body: "[user:display-name],\r\n\r\nYour account at [site:name] has been activated.\r\n\r\nYou may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:account-name]\r\npassword: Your password\r\n\r\n--  [site:name] team"
+  body: |-
+    [user:display-name],
+
+    Your account at [site:name] has been activated.
+
+    You may now log in by clicking this link or copying and pasting it into your browser:
+
+    [user:one-time-login-url]
+
+    This link can only be used once to log in and will lead you to a page where you can set your password.
+
+    After setting your password, you will be able to log in at [site:login-url] in the future using:
+
+    username: [user:account-name]
+    password: Your password
+
+    --  [site:name] team
 status_blocked:
   subject: 'Account details for [user:display-name] at [site:name] (blocked)'
-  body: "[user:display-name],\r\n\r\nYour account on [site:name] has been blocked.\r\n\r\n--  [site:name] team"
+  body: |-
+    [user:display-name],
+
+    Your account on [site:name] has been blocked.
+
+    --  [site:name] team
 status_canceled:
   subject: 'Account details for [user:display-name] at [site:name] (canceled)'
-  body: "[user:display-name],\r\n\r\nYour account on [site:name] has been canceled.\r\n\r\n--  [site:name] team"
+  body: |-
+    [user:display-name],
+
+    Your account on [site:name] has been canceled.
+
+    --  [site:name] team
\ No newline at end of file
diff --git a/config/optional/user.role.administrator.yml b/config/optional/user.role.administrator.yml
index 71eda86..88cf890 100644
--- a/config/optional/user.role.administrator.yml
+++ b/config/optional/user.role.administrator.yml
@@ -1,11 +1,11 @@
-uuid: 0b1a6940-a5dc-466a-a5e2-08290d339cf4
+uuid: 5c60f664-ea20-45b3-b9cb-ad42d76a7c9c
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: Om6FEO7vZZMkPIbVvfxtdkWerQ2PvQM4sWUd6Q3ZnfI
+  default_config_hash: OeKGIkmZA_c-t6QLH81WNQx8gDCc1MRmxaTuQgxBByU
 id: administrator
 label: Administrator
-weight: 2
+weight: 3
 is_admin: true
 permissions: {  }
diff --git a/config/optional/user.role.anonymous.yml b/config/optional/user.role.anonymous.yml
index ecc5ad0..11a97d7 100644
--- a/config/optional/user.role.anonymous.yml
+++ b/config/optional/user.role.anonymous.yml
@@ -1,14 +1,17 @@
-uuid: c3240f09-14e1-4b0d-888e-6d50f4413812
+uuid: 0f09eeb8-da59-4988-b010-4112537e6cd4
 langcode: en
 status: true
 dependencies:
+  config:
+    - filter.format.restricted_html
   module:
     - comment
     - contact
+    - filter
     - search
     - system
 _core:
-  default_config_hash: pq_mEIu_B4widZN7Ap81iCJSjShFFdcL0jEiCi8VrDk
+  default_config_hash: 6WavjUYXIegP9AAg2zXGx54MWIVoomC3SZhNiqe-Dyk
 id: anonymous
 label: 'Anonymous user'
 weight: 0
diff --git a/config/optional/user.role.authenticated.yml b/config/optional/user.role.authenticated.yml
index 9d510f9..9019baf 100644
--- a/config/optional/user.role.authenticated.yml
+++ b/config/optional/user.role.authenticated.yml
@@ -1,17 +1,20 @@
-uuid: 9d9980d7-806f-424e-94a3-4daed91188e4
+uuid: 2af432cd-d7c6-4f5c-ad38-99d86a910368
 langcode: en
 status: true
 dependencies:
   config:
-    - taxonomy.vocabulary.tags
+    - filter.format.basic_html
   module:
     - comment
-    - opencase_cases
+    - contact
+    - filter
+    - opencase
     - opencase_entities
+    - search
+    - shortcut
     - system
-    - taxonomy
 _core:
-  default_config_hash: btW6TFHajhy7Eo6YUvdFiPh4TcPggo8GBXYctjV6zag
+  default_config_hash: I44QAB4es39lNzMQWiJLq2dfjX7VRSOzT_5KzAcUq_M
 id: authenticated
 label: 'Authenticated user'
 weight: 1
@@ -19,29 +22,45 @@ is_admin: false
 permissions:
   - 'access comments'
   - 'access content'
+  - 'access shortcuts'
+  - 'access site-wide contact form'
   - 'add activity entities'
   - 'add case entities'
+  - 'add client entities'
+  - 'add equal opps entities'
   - 'add event entities'
   - 'add organisation entities'
-  - 'add organisation relation entities'
-  - 'add trainer entities'
-  - 'create paragraph content availability'
-  - 'create paragraph content trainer'
-  - 'create terms in tags'
-  - 'delete organisation relation entities'
-  - 'delete paragraph content availability'
-  - 'delete paragraph content trainer'
+  - 'add staff_member entities'
+  - 'add volunteer entities'
   - 'edit activity entities'
+  - 'edit bank account entities'
+  - 'edit case entities'
+  - 'edit client entities'
+  - 'edit equal opps entities'
   - 'edit event entities'
   - 'edit organisation entities'
-  - 'edit organisation relation entities'
-  - 'edit trainer entities'
-  - 'update paragraph content availability'
-  - 'update paragraph content trainer'
-  - 'view paragraph content availability'
-  - 'view paragraph content trainer'
+  - 'edit staff_member entities'
+  - 'edit volunteer entities'
+  - 'post comments'
+  - 'revert all activity revisions'
+  - 'revert all client revisions'
+  - 'revert all organisation revisions'
+  - 'revert all staff_member revisions'
+  - 'revert all volunteer revisions'
+  - 'search content'
+  - 'skip comment approval'
+  - 'use opencase'
+  - 'use text format basic_html'
+  - 'view all activity revisions'
+  - 'view all client revisions'
+  - 'view all organisation revisions'
+  - 'view all staff_member revisions'
+  - 'view all volunteer revisions'
   - 'view published activity entities'
-  - 'view published case provision entities'
+  - 'view published client entities'
+  - 'view published equal opps entities'
   - 'view published event entities'
   - 'view published organisation entities'
   - 'view published organisation relation entities'
+  - 'view published staff_member entities'
+  - 'view published volunteer entities'
diff --git a/config/optional/user.role.caseworker.yml b/config/optional/user.role.caseworker.yml
new file mode 100644
index 0000000..f0d7d71
--- /dev/null
+++ b/config/optional/user.role.caseworker.yml
@@ -0,0 +1,22 @@
+uuid: 82123195-ae6e-4d7a-9755-df73244e110d
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+id: caseworker
+label: Caseworker
+weight: 5
+is_admin: null
+permissions:
+  - 'add activity entities'
+  - 'add case entities'
+  - 'add client entities'
+  - 'delete activity entities'
+  - 'delete case entities'
+  - 'delete client entities'
+  - 'edit activity entities'
+  - 'edit case entities'
+  - 'edit client entities'
+  - 'view own cases'
+  - 'view published client entities'
diff --git a/config/optional/user.role.content_editor.yml b/config/optional/user.role.content_editor.yml
new file mode 100644
index 0000000..c56cbe6
--- /dev/null
+++ b/config/optional/user.role.content_editor.yml
@@ -0,0 +1,48 @@
+uuid: addbcf01-8c5f-4eb4-9027-1b6524ab1d8f
+langcode: en
+status: true
+dependencies:
+  config:
+    - node.type.article
+    - node.type.page
+    - taxonomy.vocabulary.tags
+  module:
+    - comment
+    - contextual
+    - file
+    - node
+    - path
+    - system
+    - taxonomy
+    - toolbar
+    - tour
+_core:
+  default_config_hash: Wur9kcEOwY1Jal81NssKnz3RhVJxAvBwyWQBGcA_1Go
+id: content_editor
+label: 'Content editor'
+weight: 2
+is_admin: false
+permissions:
+  - 'access administration pages'
+  - 'access content overview'
+  - 'access contextual links'
+  - 'access files overview'
+  - 'access toolbar'
+  - 'access tour'
+  - 'administer url aliases'
+  - 'create article content'
+  - 'create page content'
+  - 'create terms in tags'
+  - 'create url aliases'
+  - 'delete article revisions'
+  - 'delete own article content'
+  - 'delete own page content'
+  - 'delete page revisions'
+  - 'edit own article content'
+  - 'edit own comments'
+  - 'edit own page content'
+  - 'edit terms in tags'
+  - 'revert all revisions'
+  - 'view all revisions'
+  - 'view own unpublished content'
+  - 'view the administration theme'
diff --git a/config/optional/user.role.follow_up_alerts.yml b/config/optional/user.role.follow_up_alerts.yml
deleted file mode 100644
index 9ad56a7..0000000
--- a/config/optional/user.role.follow_up_alerts.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 53c0d18d-4e94-4997-9b59-7f2d5e1770e4
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-id: follow_up_alerts
-label: 'Follow-up alerts'
-weight: 5
-is_admin: null
-permissions:
-  - 'view published trainer entities'
diff --git a/config/optional/user.role.gno_admin_user.yml b/config/optional/user.role.gno_admin_user.yml
deleted file mode 100644
index 3be1d4a..0000000
--- a/config/optional/user.role.gno_admin_user.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-uuid: 1b23a802-601d-4d00-8818-392b5e496f9d
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.clie
-    - taxonomy.vocabulary.client_status
-    - taxonomy.vocabulary.client_subtypes
-    - taxonomy.vocabulary.client_types
-    - taxonomy.vocabulary.oc_case_provider_role
-    - taxonomy.vocabulary.oc_fee_category
-    - taxonomy.vocabulary.tags
-  module:
-    - field_ui
-    - opencase
-    - opencase_cases
-    - opencase_entities
-    - taxonomy
-id: gno_admin_user
-label: 'GNO Additional Admin Permissions'
-weight: 4
-is_admin: null
-permissions:
-  - '9 edit any entities'
-  - 'add case fee entities'
-  - 'add case provision entities'
-  - 'add equal opps entities'
-  - 'administer oc_case_provision fields'
-  - 'administer taxonomy'
-  - 'administer users'
-  - 'create terms in clie'
-  - 'create terms in client_status'
-  - 'create terms in client_subtypes'
-  - 'create terms in client_types'
-  - 'create terms in oc_case_provider_role'
-  - 'create terms in oc_fee_category'
-  - 'create terms in tags'
-  - 'delete activity entities'
-  - 'delete all trainer revisions'
-  - 'delete bank account entities'
-  - 'delete case entities'
-  - 'delete case fee entities'
-  - 'delete case provision entities'
-  - 'delete equal opps entities'
-  - 'delete event entities'
-  - 'delete organisation entities'
-  - 'delete terms in client_subtypes'
-  - 'delete terms in client_types'
-  - 'delete terms in oc_case_provider_role'
-  - 'delete terms in oc_fee_category'
-  - 'delete terms in tags'
-  - 'delete trainer entities'
-  - 'edit case entities'
-  - 'edit case fee entities'
-  - 'edit case provision entities'
-  - 'edit equal opps entities'
-  - 'edit terms in client_subtypes'
-  - 'edit terms in client_types'
-  - 'edit terms in oc_case_provider_role'
-  - 'edit terms in oc_fee_category'
-  - 'edit terms in tags'
-  - 'use opencase'
-  - 'view all case fee revisions'
-  - 'view all case provision revisions'
-  - 'view edit delete all actor entities'
-  - 'view published case entities'
-  - 'view published case fee entities'
-  - 'view published case provision entities'
-  - 'view published equal opps entities'
-  - 'view published trainer entities'
-  - 'view unpublished activity entities'
-  - 'view unpublished actor entities'
-  - 'view unpublished bank account entities'
-  - 'view unpublished case entities'
-  - 'view unpublished case fee entities'
-  - 'view unpublished case provision entities'
-  - 'view unpublished equal opps entities'
-  - 'view unpublished event entities'
-  - 'view unpublished organisation entities'
-  - 'view unpublished organisation relation entities'
diff --git a/config/optional/user.role.invoicing_alerts.yml b/config/optional/user.role.invoicing_alerts.yml
deleted file mode 100644
index a47e879..0000000
--- a/config/optional/user.role.invoicing_alerts.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-uuid: adcb5e23-6def-4616-b99c-a35a87e52164
-langcode: en
-status: true
-dependencies: {  }
-id: invoicing_alerts
-label: 'Invoicing Alerts'
-weight: 7
-is_admin: null
-permissions: {  }
diff --git a/config/optional/user.role.newly_accredited_alerts.yml b/config/optional/user.role.newly_accredited_alerts.yml
deleted file mode 100644
index abb85a4..0000000
--- a/config/optional/user.role.newly_accredited_alerts.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-uuid: 8354168f-7bfd-4b34-8bd8-295dcc452357
-langcode: en
-status: true
-dependencies: {  }
-id: newly_accredited_alerts
-label: 'Newly Accredited Alerts'
-weight: 6
-is_admin: null
-permissions: {  }
diff --git a/config/optional/user.role.opencase_admin.yml b/config/optional/user.role.opencase_admin.yml
new file mode 100644
index 0000000..0dbeb7a
--- /dev/null
+++ b/config/optional/user.role.opencase_admin.yml
@@ -0,0 +1,51 @@
+uuid: 89e8d1a4-b540-4ce5-b503-bf6f32178d49
+langcode: en
+status: true
+dependencies:
+  module:
+    - field_ui
+    - opencase
+    - opencase_cases
+    - opencase_entities
+_core:
+  default_config_hash: NYNlwo5WdxRZXhqrfBgLvCR19LE64SrLojs7_zOGJ5Q
+id: opencase_admin
+label: 'CRM Admin'
+weight: 7
+is_admin: null
+permissions:
+  - 'add activity entities'
+  - 'add case entities'
+  - 'add client entities'
+  - 'add volunteer entities'
+  - 'administer oc_activity display'
+  - 'administer oc_activity fields'
+  - 'administer oc_activity form display'
+  - 'administer oc_actor display'
+  - 'administer oc_actor fields'
+  - 'administer oc_actor form display'
+  - 'administer oc_case fields'
+  - 'administer oc_case form display'
+  - 'administer opencase entity bundles'
+  - 'administer users'
+  - 'delete activity entities'
+  - 'delete case entities'
+  - 'delete case provision entities'
+  - 'delete client entities'
+  - 'delete volunteer entities'
+  - 'edit activity entities'
+  - 'edit case entities'
+  - 'edit case fee entities'
+  - 'edit client entities'
+  - 'edit volunteer entities'
+  - 'use opencase'
+  - 'view all case fee revisions'
+  - 'view all case provision revisions'
+  - 'view published activity entities'
+  - 'view published case entities'
+  - 'view published case fee entities'
+  - 'view published case provision entities'
+  - 'view published client entities'
+  - 'view published volunteer entities'
+  - 'view unpublished case fee entities'
+  - 'view unpublished case provision entities'
diff --git a/config/optional/user.role.overseer.yml b/config/optional/user.role.overseer.yml
new file mode 100644
index 0000000..24dcad9
--- /dev/null
+++ b/config/optional/user.role.overseer.yml
@@ -0,0 +1,26 @@
+uuid: 7f74c263-619c-41d8-a528-6eacff355fe7
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+id: overseer
+label: Overseer
+weight: 4
+is_admin: null
+permissions:
+  - 'add activity entities'
+  - 'add case entities'
+  - 'add client entities'
+  - 'add volunteer entities'
+  - 'delete activity entities'
+  - 'delete case entities'
+  - 'delete client entities'
+  - 'delete volunteer entities'
+  - 'edit activity entities'
+  - 'edit case entities'
+  - 'edit client entities'
+  - 'edit volunteer entities'
+  - 'view published case entities'
+  - 'view published client entities'
+  - 'view published volunteer entities'
diff --git a/config/optional/user.role.volunteer_co_ord.yml b/config/optional/user.role.volunteer_co_ord.yml
new file mode 100644
index 0000000..db713ca
--- /dev/null
+++ b/config/optional/user.role.volunteer_co_ord.yml
@@ -0,0 +1,21 @@
+uuid: 88bb4aeb-bccc-41ed-8799-bdb10d5e4f4e
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+id: volunteer_co_ord
+label: 'Volunteer Co-ordinator'
+weight: 6
+is_admin: null
+permissions:
+  - 'add activity entities'
+  - 'add case entities'
+  - 'add volunteer entities'
+  - 'delete activity entities'
+  - 'delete case entities'
+  - 'delete volunteer entities'
+  - 'edit activity entities'
+  - 'edit case entities'
+  - 'edit volunteer entities'
+  - 'view published volunteer entities'
diff --git a/config/optional/user.settings.yml b/config/optional/user.settings.yml
index b19be51..8f55269 100644
--- a/config/optional/user.settings.yml
+++ b/config/optional/user.settings.yml
@@ -1,5 +1,5 @@
 _core:
-  default_config_hash: w314Zp7B4NbrlV4KeeZLNSmTTpdJiv-KwZO2E1fSSK0
+  default_config_hash: '-htDFWUv1S4OlJMzta2nhFl4QbhJvu0D9xsJ-clxo-M'
 langcode: en
 anonymous: Anonymous
 verify_mail: true
@@ -12,7 +12,7 @@ notify:
   register_admin_created: true
   register_no_approval_required: true
   register_pending_approval: true
-register: admin_only
+register: visitors_admin_approval
 cancel_method: user_cancel_block
 password_reset_timeout: 86400
 password_strength: true
diff --git a/config/optional/views.settings.yml b/config/optional/views.settings.yml
index d78ef33..e57e73a 100644
--- a/config/optional/views.settings.yml
+++ b/config/optional/views.settings.yml
@@ -1,5 +1,5 @@
 _core:
-  default_config_hash: RaRd9EIcwA4u3qCSRLL8EnCicbda1kV__ASmVbyehvQ
+  default_config_hash: uZHsLrDp1ThO0RvupHKcPzLOyVvWexm58JTTHNDo7yc
 display_extenders: {  }
 skip_cache: false
 sql_signature: false
@@ -7,13 +7,13 @@ ui:
   show:
     additional_queries: false
     advanced_column: false
-    performance_statistics: true
+    default_display: false
+    performance_statistics: false
     preview_information: true
     sql_query:
-      enabled: true
+      enabled: false
       where: above
     display_embed: false
-    master_display: false
   always_live_preview: true
   exposed_filter_any_label: old_any
 field_rewrite_elements:
diff --git a/config/optional/views.view.activities_without_case.yml b/config/optional/views.view.activities.yml
similarity index 73%
rename from config/optional/views.view.activities_without_case.yml
rename to config/optional/views.view.activities.yml
index aa40e3b..714863d 100644
--- a/config/optional/views.view.activities_without_case.yml
+++ b/config/optional/views.view.activities.yml
@@ -1,17 +1,14 @@
-uuid: 8328f802-8577-4bf7-b908-44ca55102832
+uuid: 94f53966-e29c-43e2-83ae-1a4c967ea98b
 langcode: en
 status: true
 dependencies:
   config:
-    - opencase_entities.oc_activity_type.evaluation
-    - opencase_entities.oc_activity_type.trainer_debrief
-    - user.role.administrator
-    - user.role.gno_admin_user
+    - user.role.authenticated
   module:
     - datetime
     - opencase_entities
     - user
-id: activities_without_case
+id: activities
 label: Activities
 module: views
 description: ''
@@ -25,7 +22,7 @@ display:
     display_plugin: default
     position: 0
     display_options:
-      title: 'Activities without case'
+      title: Activities
       fields:
         type:
           id: type
@@ -158,6 +155,136 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
+        oc_target:
+          id: oc_target
+          table: oc_activity_field_data
+          field: oc_target
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_activity
+          entity_field: oc_target
+          plugin_id: field
+          label: Target
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        oc_provider:
+          id: oc_provider
+          table: oc_activity_field_data
+          field: oc_provider
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_activity
+          entity_field: oc_provider
+          plugin_id: field
+          label: Provider
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
         name:
           id: name
           table: oc_activity_field_data
@@ -201,7 +328,7 @@ display:
           element_class: ''
           element_label_type: ''
           element_label_class: ''
-          element_label_colon: true
+          element_label_colon: false
           element_wrapper_type: ''
           element_wrapper_class: ''
           element_default_classes: true
@@ -212,7 +339,7 @@ display:
           click_sort_column: value
           type: string
           settings:
-            link_to_entity: false
+            link_to_entity: true
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -252,7 +379,7 @@ display:
             suffix: ''
             target: ''
             nl2br: false
-            max_length: 200
+            max_length: 0
             word_boundary: true
             ellipsis: true
             more_link: false
@@ -287,124 +414,16 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        view_oc_activity:
-          id: view_oc_activity
-          table: oc_activity
-          field: view_oc_activity
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          plugin_id: entity_link
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: view
-          output_url_as_text: false
-          absolute: false
-        edit_oc_activity:
-          id: edit_oc_activity
-          table: oc_activity
-          field: edit_oc_activity
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          plugin_id: entity_link_edit
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: edit
-          output_url_as_text: false
-          absolute: false
       pager:
-        type: full
+        type: mini
         options:
           offset: 0
           items_per_page: 10
           total_pages: null
           id: 0
           tags:
-            next: 'Next ›'
-            previous: '‹ Previous'
-            first: '« First'
-            last: 'Last »'
+            next: ››
+            previous: ‹‹
           expose:
             items_per_page: false
             items_per_page_label: 'Items per page'
@@ -413,7 +432,6 @@ display:
             items_per_page_options_all_label: '- All -'
             offset: false
             offset_label: Offset
-          quantity: 9
       exposed_form:
         type: basic
         options:
@@ -428,23 +446,60 @@ display:
         type: role
         options:
           role:
-            administrator: administrator
-            gno_admin_user: gno_admin_user
+            authenticated: authenticated
       cache:
         type: tag
         options: {  }
       empty: {  }
       sorts: {  }
       arguments:
-        client:
-          id: client
+        oc_target:
+          id: oc_target
           table: oc_activity_field_data
-          field: client
+          field: oc_target
           relationship: none
           group_type: group
           admin_label: ''
           entity_type: oc_activity
-          entity_field: client
+          entity_field: oc_target
+          plugin_id: numeric
+          default_action: default
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: false
+          title: ''
+          default_argument_type: raw
+          default_argument_options:
+            index: 2
+            use_alias: false
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            override: false
+            items_per_page: 25
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: false
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
+          break_phrase: false
+          not: false
+        oc_provider:
+          id: oc_provider
+          table: oc_activity_field_data
+          field: oc_provider
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_activity
+          entity_field: oc_provider
           plugin_id: numeric
           default_action: default
           exception:
@@ -477,8 +532,74 @@ display:
       filters: {  }
       style:
         type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          columns:
+            type: type
+            activity_date_time: activity_date_time
+            oc_target: oc_target
+            oc_provider: oc_provider
+            name: name
+            description: description
+          default: '-1'
+          info:
+            type:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            activity_date_time:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            oc_target:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            oc_provider:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            name:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            description:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          override: true
+          sticky: false
+          summary: ''
+          empty_table: false
+          caption: ''
+          description: ''
       row:
         type: fields
+        options:
+          default_field_elements: true
+          inline: {  }
+          separator: ''
+          hide_empty: false
       query:
         type: views_query
         options:
@@ -487,20 +608,10 @@ display:
           distinct: false
           replica: false
           query_tags: {  }
+          contextual_filters_or: true
       relationships: {  }
       header: {  }
-      footer:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: "<a class=\"button\" href=\"/opencase/oc_activity/add/phone_call?client_id={{ raw_arguments.client }}&destination=/opencase/oc_organisation/{{ raw_arguments.client}}\">Add phone call</a>\r\n"
-          tokenize: true
+      footer: {  }
       display_extenders: {  }
     cache_metadata:
       max-age: -1
@@ -513,149 +624,13 @@ display:
       tags: {  }
   block_1:
     id: block_1
-    display_title: 'Without case'
+    display_title: 'By target'
     display_plugin: block
     position: 1
     display_options:
-      defaults:
-        footer: false
       display_description: ''
-      footer:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: "<a class=\"button\" href=\"/opencase/oc_activity/add/phone_call?client_id={{ raw_arguments.client }}&destination=/opencase/oc_organisation/{{ raw_arguments.client}}\">Add phone call</a>\r\n\r\n<a class=\"button\" href=\"/opencase/oc_activity/add/emi?client_id={{ raw_arguments.client }}&destination=/opencase/oc_organisation/{{ raw_arguments.client}}\">Add email</a>"
-          tokenize: true
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags: {  }
-  block_2:
-    id: block_2
-    display_title: 'With case'
-    display_plugin: block
-    position: 2
-    display_options:
-      title: 'Activities with case'
-      arguments:
-        oc_case:
-          id: oc_case
-          table: oc_activity_field_data
-          field: oc_case
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: oc_case
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 2
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        type:
-          id: type
-          table: oc_activity_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: type
-          plugin_id: bundle
-          operator: 'not in'
-          value:
-            evaluation: evaluation
-            trainer_debrief: trainer_debrief
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        title: false
-        arguments: false
-        filters: false
-        filter_groups: false
-        footer: false
-      display_description: ''
-      footer:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: "<a class=\"button\" href=\"/opencase/oc_activity/add/phone_call?case_id={{ raw_arguments.oc_case}}&destination=/opencase/oc_case/{{ raw_arguments.oc_case}}\">Add phone call</a>\r\n\r\n<a class=\"button\" href=\"/opencase/oc_activity/add/emi?case_id={{ raw_arguments.oc_case}}&destination=/opencase/oc_case/{{ raw_arguments.oc_case}}\">Add email</a>\r\n"
-          tokenize: true
       display_extenders: {  }
+      block_hide_empty: true
     cache_metadata:
       max-age: -1
       contexts:
diff --git a/config/optional/views.view.actor_search.yml b/config/optional/views.view.actor_search.yml
index 2a9efcd..f522b2e 100644
--- a/config/optional/views.view.actor_search.yml
+++ b/config/optional/views.view.actor_search.yml
@@ -1,4 +1,4 @@
-uuid: 06d6d179-3ccb-4bf8-b632-3f10dbe37ffc
+uuid: 78d8c048-0602-4ed3-b7fa-e4a6fe5690e4
 langcode: en
 status: true
 dependencies:
@@ -28,14 +28,15 @@ display:
       fields:
         name:
           id: name
-          table: search_api_index_opencase_actors
+          table: search_api_datasource_opencase_actors_entity_oc_actor
           field: name
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: oc_actor
           plugin_id: search_api_field
-          label: 'Organisation name '
-          exclude: true
+          label: Name
+          exclude: false
           alter:
             alter_text: false
             text: ''
@@ -96,77 +97,6 @@ display:
             use_highlighting: false
             multi_type: separator
             multi_separator: ', '
-        name_1:
-          id: name_1
-          table: search_api_datasource_opencase_actors_entity_oc_actor
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_actor
-          plugin_id: search_api_field
-          label: Name
-          exclude: false
-          alter:
-            alter_text: false
-            text: '{{ name_1 }}'
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: '{{ name }}'
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          field_rendering: true
-          fallback_handler: search_api
-          fallback_options:
-            link_to_item: false
-            use_highlighting: false
-            multi_type: separator
-            multi_separator: ', '
         type:
           id: type
           table: search_api_datasource_opencase_actors_entity_oc_actor
@@ -177,7 +107,7 @@ display:
           entity_type: oc_actor
           plugin_id: search_api_field
           label: 'Person type'
-          exclude: true
+          exclude: false
           alter:
             alter_text: false
             text: ''
@@ -241,80 +171,6 @@ display:
             display_methods:
               oc_actor_type:
                 display_method: label
-        type_1:
-          id: type_1
-          table: search_api_datasource_opencase_actors_entity_oc_organisation
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation
-          plugin_id: search_api_field
-          label: Type
-          exclude: false
-          alter:
-            alter_text: true
-            text: '{{ type }}{{ type_1 }}'
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: '{{ type }}{{ type_1 }}'
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          field_rendering: true
-          fallback_handler: search_api_entity
-          fallback_options:
-            link_to_item: false
-            use_highlighting: false
-            multi_type: separator
-            multi_separator: ', '
-            display_methods:
-              oc_organisation_type:
-                display_method: label
       pager:
         type: mini
         options:
@@ -343,7 +199,7 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-          text_input_required_format: full_html
+          text_input_required_format: basic_html
       access:
         type: role
         options:
diff --git a/config/optional/views.view.actors.yml b/config/optional/views.view.actors.yml
index c2c859f..d67fa8c 100644
--- a/config/optional/views.view.actors.yml
+++ b/config/optional/views.view.actors.yml
@@ -1,4 +1,4 @@
-uuid: 3c5bb2b8-402b-4876-a243-b05c20976cb3
+uuid: 5a5780c2-4754-48ba-89da-122c0b3de51a
 langcode: en
 status: true
 dependencies:
@@ -87,6 +87,73 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
+        created:
+          id: created
+          table: oc_actor_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_actor
+          entity_field: created
+          plugin_id: field
+          label: 'Date added'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: short
+            custom_date_format: ''
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
       pager:
         type: mini
         options:
@@ -124,7 +191,22 @@ display:
         type: tag
         options: {  }
       empty: {  }
-      sorts: {  }
+      sorts:
+        name:
+          id: name
+          table: oc_actor_field_data
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_actor
+          entity_field: name
+          plugin_id: standard
+          order: ASC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
       arguments:
         type:
           id: type
@@ -142,7 +224,7 @@ display:
             title_enable: false
             title: All
           title_enable: true
-          title: '{{ arguments.type }} '
+          title: '{{ arguments.type }}s'
           default_argument_type: raw
           default_argument_options:
             index: 1
@@ -164,7 +246,7 @@ display:
           validate_options: {  }
           glossary: false
           limit: 0
-          case: none
+          case: ucfirst
           path_case: none
           transform_dash: false
           break_phrase: false
@@ -177,15 +259,23 @@ display:
           default_row_class: true
           columns:
             name: name
+            created: created
           default: '-1'
           info:
             name:
-              sortable: false
+              sortable: true
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
+            created:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
           override: true
           sticky: false
           summary: ''
diff --git a/config/optional/views.view.all_clients.yml b/config/optional/views.view.all_clients.yml
deleted file mode 100644
index 4f40a44..0000000
--- a/config/optional/views.view.all_clients.yml
+++ /dev/null
@@ -1,1628 +0,0 @@
-uuid: 300758b9-4857-4f01-a43d-56edb6c80400
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_accreditation_date
-    - field.storage.oc_organisation.field_client_status
-    - field.storage.oc_organisation.field_client_substatus
-    - field.storage.oc_organisation.field_client_subtype
-    - field.storage.oc_organisation.field_client_type
-    - field.storage.oc_organisation.field_tags
-    - opencase_entities.oc_organisation_type.client
-    - opencase_entities.oc_organisation_type.umbrella_client
-    - system.menu.opencase
-    - taxonomy.vocabulary.clie
-    - taxonomy.vocabulary.client_status
-    - user.role.administrator
-    - user.role.gno_admin_user
-  content:
-    - 'taxonomy_term:clie:98d1370b-e29f-45fb-b053-b911c2538870'
-    - 'taxonomy_term:clie:9915606c-1775-4f68-be24-ffaa629ee0b1'
-    - 'taxonomy_term:clie:c0c6397d-4f7c-4077-af51-1860ccad26a3'
-    - 'taxonomy_term:client_status:057c3514-8413-463f-989e-cd8deda6c71c'
-  module:
-    - datetime
-    - opencase_entities
-    - taxonomy
-    - user
-    - views_natural_sort
-_core:
-  default_config_hash: pWMOeW65lTFcupF8kOfCddaTRWZAleVVi4cARbKaS0M
-id: all_clients
-label: Clients
-module: views
-description: ''
-tag: ''
-base_table: oc_organisation_field_data
-base_field: id
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'All clients'
-      fields:
-        name:
-          id: name
-          table: oc_organisation_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-          label: Name
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_client_type:
-          id: field_client_type
-          table: oc_organisation__field_client_type
-          field: field_client_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Client type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_client_subtype:
-          id: field_client_subtype
-          table: oc_organisation__field_client_subtype
-          field: field_client_subtype
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Client subtype'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_client_status:
-          id: field_client_status
-          table: oc_organisation__field_client_status
-          field: field_client_status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Client Status'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_client_substatus:
-          id: field_client_substatus
-          table: oc_organisation__field_client_substatus
-          field: field_client_substatus
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Client substatus'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: true
-            path: '/opencase/clients_by_substatus/{{ field_client_substatus__target_id }}'
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_tags:
-          id: field_tags
-          table: oc_organisation__field_tags
-          field: field_tags
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Tags
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        status:
-          id: status
-          table: oc_organisation_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation
-          entity_field: status
-          plugin_id: field
-          label: 'Publishing status'
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: boolean
-          settings:
-            format: default
-            format_custom_false: ''
-            format_custom_true: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_accreditation_date:
-          id: field_accreditation_date
-          table: oc_organisation__field_accreditation_date
-          field: field_accreditation_date
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Accreditation date'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: datetime_default
-          settings:
-            timezone_override: ''
-            format_type: short
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: role
-        options:
-          role:
-            administrator: administrator
-            gno_admin_user: gno_admin_user
-      cache:
-        type: tag
-        options: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: '<a class="button" href="/opencase/oc_organisation/add/client?umbrella_client_id={{ raw_arguments.umbrella_client }}">Add client</a><br /><br />'
-          tokenize: false
-      sorts:
-        name:
-          id: name
-          table: oc_organisation_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation
-          entity_field: name
-          plugin_id: standard
-          order: NASC
-          expose:
-            label: ''
-            field_identifier: name
-          exposed: false
-      arguments: {  }
-      filters:
-        type:
-          id: type
-          table: oc_organisation_field_data
-          field: type
-          entity_type: oc_organisation
-          entity_field: type
-          plugin_id: bundle
-          value:
-            client: client
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: '{{ status }}'
-          default_row_class: true
-          columns:
-            name: name
-            field_client_type: field_client_type
-            field_client_subtype: field_client_subtype
-            field_client_status: field_client_status
-            field_client_substatus: field_client_substatus
-            field_tags: field_tags
-            status: status
-            field_accreditation_date: field_accreditation_date
-          default: '-1'
-          info:
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_client_type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_client_subtype:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_client_status:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_client_substatus:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_tags:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_accreditation_date:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: false
-          content: '<a class="button" href="/opencase/oc_organistaion/add/client?umbrella_client_id={{ raw_arguments.umbrella_client }}">Add client</a><br /><br />'
-          tokenize: false
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_organisation.field_accreditation_date'
-        - 'config:field.storage.oc_organisation.field_client_status'
-        - 'config:field.storage.oc_organisation.field_client_substatus'
-        - 'config:field.storage.oc_organisation.field_client_subtype'
-        - 'config:field.storage.oc_organisation.field_client_type'
-        - 'config:field.storage.oc_organisation.field_tags'
-  attachment_1:
-    id: attachment_1
-    display_title: 'Follow-ups due'
-    display_plugin: attachment
-    position: 1
-    display_options:
-      title: 'Follow-ups due'
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: 'No clients have follow-ups due'
-          tokenize: false
-      filters:
-        type:
-          id: type
-          table: oc_organisation_field_data
-          field: type
-          entity_type: oc_organisation
-          entity_field: type
-          plugin_id: bundle
-          value:
-            client: client
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        field_client_substatus_target_id:
-          id: field_client_substatus_target_id
-          table: oc_organisation__field_client_substatus
-          field: field_client_substatus_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value:
-            74: 74
-            75: 75
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: clie
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        empty: false
-        title: false
-        css_class: false
-        filters: false
-        filter_groups: false
-        header: false
-        footer: false
-      css_class: follow-ups-due
-      display_description: ''
-      header:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: '<h2>Clients with follow-ups due</h2>'
-          tokenize: false
-      footer:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text
-          empty: true
-          content:
-            value: '<h2>Other clients</h2>'
-            format: full_html
-          tokenize: false
-      display_extenders: {  }
-      displays:
-        page_1: page_1
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_organisation.field_accreditation_date'
-        - 'config:field.storage.oc_organisation.field_client_status'
-        - 'config:field.storage.oc_organisation.field_client_substatus'
-        - 'config:field.storage.oc_organisation.field_client_subtype'
-        - 'config:field.storage.oc_organisation.field_client_type'
-        - 'config:field.storage.oc_organisation.field_tags'
-  block_1:
-    id: block_1
-    display_title: 'By Umbrella Client'
-    display_plugin: block
-    position: 2
-    display_options:
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: 'None yet. '
-          tokenize: false
-      arguments:
-        field_umbrella_client_target_id:
-          id: field_umbrella_client_target_id
-          table: oc_organisation__field_umbrella_client
-          field: field_umbrella_client_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 2
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      defaults:
-        empty: false
-        arguments: false
-        footer: false
-      display_description: ''
-      footer:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: '<a class="button" href="/opencase/oc_organisation/add/client?umbrella_client_id={{ raw_arguments.field_umbrella_client_target_id }}&destination=/opencase/oc_organisation/{{ raw_arguments.field_umbrella_client_target_id }}">Add client</a><br /><br />'
-          tokenize: true
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_organisation.field_accreditation_date'
-        - 'config:field.storage.oc_organisation.field_client_status'
-        - 'config:field.storage.oc_organisation.field_client_substatus'
-        - 'config:field.storage.oc_organisation.field_client_subtype'
-        - 'config:field.storage.oc_organisation.field_client_type'
-        - 'config:field.storage.oc_organisation.field_tags'
-  entity_reference_1:
-    id: entity_reference_1
-    display_title: 'Entity Reference'
-    display_plugin: entity_reference
-    position: 6
-    display_options:
-      fields:
-        name:
-          id: name
-          table: oc_organisation_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      filters:
-        type:
-          id: type
-          table: oc_organisation_field_data
-          field: type
-          entity_type: oc_organisation
-          entity_field: type
-          plugin_id: bundle
-          value:
-            client: client
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        status:
-          id: status
-          table: oc_organisation_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation
-          entity_field: status
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: entity_reference
-        options:
-          search_fields:
-            name: name
-            field_client_type: '0'
-            field_client_subtype: '0'
-            field_client_status: '0'
-            field_client_substatus: '0'
-            field_tags: '0'
-            status: '0'
-      row:
-        type: entity_reference
-        options:
-          default_field_elements: true
-          inline:
-            name: name
-          separator: '-'
-          hide_empty: false
-      defaults:
-        fields: false
-        filters: false
-        filter_groups: false
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user.roles
-      tags: {  }
-  entity_reference_2:
-    id: entity_reference_2
-    display_title: 'Entity Reference'
-    display_plugin: entity_reference
-    position: 6
-    display_options:
-      fields:
-        name:
-          id: name
-          table: oc_organisation_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      filters:
-        type:
-          id: type
-          table: oc_organisation_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation
-          entity_field: type
-          plugin_id: bundle
-          operator: in
-          value:
-            client: client
-            umbrella_client: umbrella_client
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        status:
-          id: status
-          table: oc_organisation_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation
-          entity_field: status
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: entity_reference
-        options:
-          search_fields:
-            name: name
-            field_client_type: '0'
-            field_client_subtype: '0'
-            field_client_status: '0'
-            field_client_substatus: '0'
-            field_tags: '0'
-            status: '0'
-      row:
-        type: entity_reference
-        options:
-          default_field_elements: true
-          inline:
-            name: name
-          separator: '-'
-          hide_empty: false
-      defaults:
-        fields: false
-        filters: false
-        filter_groups: false
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user.roles
-      tags: {  }
-  page_1:
-    id: page_1
-    display_title: All
-    display_plugin: page
-    position: 1
-    display_options:
-      title: 'All clients'
-      empty: {  }
-      filters:
-        type:
-          id: type
-          table: oc_organisation_field_data
-          field: type
-          entity_type: oc_organisation
-          entity_field: type
-          plugin_id: bundle
-          value:
-            client: client
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        field_client_substatus_target_id:
-          id: field_client_substatus_target_id
-          table: oc_organisation__field_client_substatus
-          field: field_client_substatus_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: not
-          value:
-            74: 74
-            75: 75
-            90: 90
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: clie
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        empty: false
-        title: false
-        filters: false
-        filter_groups: false
-        header: false
-        footer: false
-      display_description: ''
-      header:
-        display_link:
-          id: display_link
-          table: views
-          field: display_link
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: display_link
-          label: 'This display does not include closed clients. Click here to see them'
-          empty: true
-          display_id: page_3
-      footer: {  }
-      display_extenders: {  }
-      path: opencase/all-clients
-      menu:
-        type: normal
-        title: Clients
-        description: ''
-        weight: -50
-        expanded: false
-        menu_name: opencase
-        parent: opencase.see_all
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_organisation.field_accreditation_date'
-        - 'config:field.storage.oc_organisation.field_client_status'
-        - 'config:field.storage.oc_organisation.field_client_substatus'
-        - 'config:field.storage.oc_organisation.field_client_subtype'
-        - 'config:field.storage.oc_organisation.field_client_type'
-        - 'config:field.storage.oc_organisation.field_tags'
-  page_2:
-    id: page_2
-    display_title: 'By substatus'
-    display_plugin: page
-    position: 3
-    display_options:
-      title: 'Clients by substatus'
-      empty: {  }
-      arguments:
-        field_client_substatus_target_id:
-          id: field_client_substatus_target_id
-          table: oc_organisation__field_client_substatus
-          field: field_client_substatus_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 2
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      defaults:
-        empty: false
-        title: false
-        fields: true
-        arguments: false
-        footer: false
-      display_description: ''
-      footer: {  }
-      display_extenders: {  }
-      path: opencase/clients_by_substatus/%
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_organisation.field_accreditation_date'
-        - 'config:field.storage.oc_organisation.field_client_status'
-        - 'config:field.storage.oc_organisation.field_client_substatus'
-        - 'config:field.storage.oc_organisation.field_client_subtype'
-        - 'config:field.storage.oc_organisation.field_client_type'
-        - 'config:field.storage.oc_organisation.field_tags'
-  page_3:
-    id: page_3
-    display_title: 'Closed clients'
-    display_plugin: page
-    position: 4
-    display_options:
-      title: 'Closed clients'
-      empty: {  }
-      filters:
-        type:
-          id: type
-          table: oc_organisation_field_data
-          field: type
-          entity_type: oc_organisation
-          entity_field: type
-          plugin_id: bundle
-          value:
-            client: client
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        field_client_status_target_id:
-          id: field_client_status_target_id
-          table: oc_organisation__field_client_status
-          field: field_client_status_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value:
-            89: 89
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: client_status
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        empty: false
-        title: false
-        filters: false
-        filter_groups: false
-        header: false
-        footer: false
-      display_description: ''
-      header:
-        display_link:
-          id: display_link
-          table: views
-          field: display_link
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: display_link
-          label: 'Back to non-closed client list'
-          empty: true
-          display_id: page_1
-      footer: {  }
-      display_extenders: {  }
-      path: opencase/closed-clients
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_organisation.field_accreditation_date'
-        - 'config:field.storage.oc_organisation.field_client_status'
-        - 'config:field.storage.oc_organisation.field_client_substatus'
-        - 'config:field.storage.oc_organisation.field_client_subtype'
-        - 'config:field.storage.oc_organisation.field_client_type'
-        - 'config:field.storage.oc_organisation.field_tags'
diff --git a/config/optional/views.view.all_trainers.yml b/config/optional/views.view.all_trainers.yml
deleted file mode 100644
index 327a961..0000000
--- a/config/optional/views.view.all_trainers.yml
+++ /dev/null
@@ -1,527 +0,0 @@
-uuid: b0fe8588-2191-4520-93fd-280fdebe7f38
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_actor_type.trainer
-    - system.menu.opencase
-    - user.role.administrator
-    - user.role.gno_admin_user
-  module:
-    - opencase_entities
-    - user
-_core:
-  default_config_hash: rXd5ligSDPXUE3RqmFooKq2SIHt4OMYn3oI1MOPY-Zs
-id: all_trainers
-label: 'All trainers'
-module: views
-description: ''
-tag: ''
-base_table: oc_actor_field_data
-base_field: id
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'All trainers'
-      fields:
-        name:
-          id: name
-          table: oc_actor_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-          label: Name
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        status:
-          id: status
-          table: oc_actor_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_actor
-          entity_field: status
-          plugin_id: field
-          label: 'Publishing status'
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: boolean
-          settings:
-            format: default
-            format_custom_false: ''
-            format_custom_true: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        total_cases:
-          id: total_cases
-          table: oc_actor_field_data
-          field: total_cases
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_actor
-          entity_field: total_cases
-          plugin_id: field
-          label: 'Number of Cases'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_integer
-          settings:
-            thousand_separator: ''
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: role
-        options:
-          role:
-            administrator: administrator
-            gno_admin_user: gno_admin_user
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts:
-        name:
-          id: name
-          table: oc_actor_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_actor
-          entity_field: name
-          plugin_id: standard
-          order: ASC
-          expose:
-            label: ''
-            field_identifier: ''
-          exposed: false
-      arguments: {  }
-      filters:
-        type:
-          id: type
-          table: oc_actor_field_data
-          field: type
-          entity_type: oc_actor
-          entity_field: type
-          plugin_id: bundle
-          value:
-            trainer: trainer
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        field_active_value:
-          id: field_active_value
-          table: oc_actor__field_active
-          field: field_active_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: '{{ status }}'
-          default_row_class: true
-          columns:
-            name: name
-            status: status
-          default: '-1'
-          info:
-            name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: false
-          content: '<a href=''/opencase/inactive-trainers''>This display does not include inactive trainers. Click here to see them</a>'
-          tokenize: false
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user.roles
-      tags: {  }
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      defaults:
-        header: false
-      header:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: false
-          content: '<a href=''/opencase/inactive-trainers''>This display does not include inactive trainers. Click here to see them</a>'
-          tokenize: false
-      display_extenders: {  }
-      path: opencase/all-trainers
-      menu:
-        type: normal
-        title: Trainers
-        description: ''
-        weight: -48
-        expanded: false
-        menu_name: opencase
-        parent: opencase.see_all
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user.roles
-      tags: {  }
-  page_2:
-    id: page_2
-    display_title: Inactive
-    display_plugin: page
-    position: 2
-    display_options:
-      title: 'Inactive trainers'
-      filters:
-        type:
-          id: type
-          table: oc_actor_field_data
-          field: type
-          entity_type: oc_actor
-          entity_field: type
-          plugin_id: bundle
-          value:
-            trainer: trainer
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        field_active_value:
-          id: field_active_value
-          table: oc_actor__field_active
-          field: field_active_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: boolean
-          operator: '='
-          value: '0'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        title: false
-        filters: false
-        filter_groups: false
-        header: false
-      display_description: ''
-      header:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: false
-          content: '<a href=''/opencase/all-trainers''>Back to active trainer list</a>'
-          tokenize: false
-      display_extenders: {  }
-      path: opencase/inactive-trainers
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user.roles
-      tags: {  }
diff --git a/config/optional/views.view.all_umbrella_clients.yml b/config/optional/views.view.all_umbrella_clients.yml
deleted file mode 100644
index 2bb5635..0000000
--- a/config/optional/views.view.all_umbrella_clients.yml
+++ /dev/null
@@ -1,606 +0,0 @@
-uuid: c2d59024-2672-4045-814e-9347cc41ff6d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_tags
-    - field.storage.oc_organisation.field_type_of_umbrella_client
-    - opencase_entities.oc_organisation_type.umbrella_client
-    - system.menu.opencase
-    - user.role.administrator
-    - user.role.gno_admin_user
-  module:
-    - opencase_entities
-    - options
-    - user
-    - views_natural_sort
-_core:
-  default_config_hash: W-ZfwQBxjxMfDysdofrzyH08lGFBd7hBpQyE8IXLM1M
-id: all_umbrella_clients
-label: 'All umbrella clients'
-module: views
-description: ''
-tag: ''
-base_table: oc_organisation_field_data
-base_field: id
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'All Umbrella Clients'
-      fields:
-        name:
-          id: name
-          table: oc_organisation_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-          label: Name
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_type_of_umbrella_client:
-          id: field_type_of_umbrella_client
-          table: oc_organisation__field_type_of_umbrella_client
-          field: field_type_of_umbrella_client
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Type
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_tags:
-          id: field_tags
-          table: oc_organisation__field_tags
-          field: field_tags
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Tags
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        status:
-          id: status
-          table: oc_organisation_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation
-          entity_field: status
-          plugin_id: field
-          label: Published
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: boolean
-          settings:
-            format: default
-            format_custom_false: ''
-            format_custom_true: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: role
-        options:
-          role:
-            administrator: administrator
-            gno_admin_user: gno_admin_user
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts:
-        name:
-          id: name
-          table: oc_organisation_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation
-          entity_field: name
-          plugin_id: standard
-          order: ASC
-          expose:
-            label: ''
-            field_identifier: name
-          exposed: false
-      arguments: {  }
-      filters:
-        type:
-          id: type
-          table: oc_organisation_field_data
-          field: type
-          entity_type: oc_organisation
-          entity_field: type
-          plugin_id: bundle
-          value:
-            umbrella_client: umbrella_client
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: '{{ status }}'
-          default_row_class: true
-          columns:
-            name: name
-            field_type_of_umbrella_client: field_type_of_umbrella_client
-            field_tags: field_tags
-            status: status
-          default: '-1'
-          info:
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_type_of_umbrella_client:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_tags:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_organisation.field_tags'
-        - 'config:field.storage.oc_organisation.field_type_of_umbrella_client'
-  entity_reference_1:
-    id: entity_reference_1
-    display_title: 'Entity Reference'
-    display_plugin: entity_reference
-    position: 2
-    display_options:
-      fields:
-        name:
-          id: name
-          table: oc_organisation_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      filters:
-        type:
-          id: type
-          table: oc_organisation_field_data
-          field: type
-          entity_type: oc_organisation
-          entity_field: type
-          plugin_id: bundle
-          value:
-            umbrella_client: umbrella_client
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        status:
-          id: status
-          table: oc_organisation_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation
-          entity_field: status
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: entity_reference
-        options:
-          search_fields:
-            name: name
-      defaults:
-        fields: false
-        filters: false
-        filter_groups: false
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user.roles
-      tags: {  }
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      display_extenders: {  }
-      path: opencase/all-umbrella-clients
-      menu:
-        type: normal
-        title: 'Umbrella clients'
-        description: ''
-        weight: -49
-        expanded: false
-        menu_name: opencase
-        parent: opencase.see_all
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_organisation.field_tags'
-        - 'config:field.storage.oc_organisation.field_type_of_umbrella_client'
diff --git a/config/optional/views.view.archive.yml b/config/optional/views.view.archive.yml
index a7da044..89c34e9 100644
--- a/config/optional/views.view.archive.yml
+++ b/config/optional/views.view.archive.yml
@@ -1,4 +1,4 @@
-uuid: 0ddb30fb-b329-4a16-9b94-003b5993901c
+uuid: 77f85295-5485-4999-8410-96e3e2a89508
 langcode: en
 status: false
 dependencies:
@@ -8,7 +8,7 @@ dependencies:
     - node
     - user
 _core:
-  default_config_hash: gA3tLETtsrObWW1Uvb6Mh-fg0Qu_6uCEzgL9jKQgPgo
+  default_config_hash: ko9GznzNBXHkuz09OCaBQ1YOSJYYjTY0TBpNV3WKnog
 id: archive
 label: Archive
 module: node
@@ -19,7 +19,7 @@ base_field: nid
 display:
   default:
     id: default
-    display_title: Master
+    display_title: Default
     display_plugin: default
     position: 0
     display_options:
diff --git a/config/optional/views.view.block_content.yml b/config/optional/views.view.block_content.yml
index 7ed5a93..6d0b9ae 100644
--- a/config/optional/views.view.block_content.yml
+++ b/config/optional/views.view.block_content.yml
@@ -1,4 +1,4 @@
-uuid: 73c864c6-e15c-4373-9dcf-2aeccee69029
+uuid: 6d23717d-0616-43d7-8715-5d13a2593d36
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     - block_content
     - user
 _core:
-  default_config_hash: 2J0rd5cWfFsdSX-kAb0f9EzvC0_vn4NxGlUpOQAXeOU
+  default_config_hash: jvd5Pu6jy-lra4oMr-mR7zuY6CVDv9CaNeoj0Y70gV4
 id: block_content
 label: 'Custom block library'
 module: views
@@ -17,7 +17,7 @@ base_field: id
 display:
   default:
     id: default
-    display_title: Master
+    display_title: Default
     display_plugin: default
     position: 0
     display_options:
@@ -282,7 +282,7 @@ display:
         type: basic
         options:
           submit_button: Apply
-          reset_button: false
+          reset_button: true
           reset_button_label: Reset
           exposed_sorts_label: 'Sort by'
           expose_sort_order: true
diff --git a/config/optional/views.view.case_fees_report.yml b/config/optional/views.view.case_fees_report.yml
deleted file mode 100644
index 5dc13c8..0000000
--- a/config/optional/views.view.case_fees_report.yml
+++ /dev/null
@@ -1,1350 +0,0 @@
-uuid: 6cef006a-ed22-4f55-a142-bb5482600516
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_contract_signed_date
-    - field.storage.oc_organisation.field_client_subtype
-    - field.storage.oc_organisation.field_client_type
-    - field.storage.oc_organisation.field_tags
-    - field.storage.oc_organisation.field_type_of_umbrella_client
-    - field.storage.oc_organisation.field_umbrella_client
-    - system.menu.opencase
-    - taxonomy.vocabulary.client_subtypes
-    - taxonomy.vocabulary.client_types
-    - taxonomy.vocabulary.tags
-    - user.role.gno_admin_user
-  module:
-    - csv_serialization
-    - datetime
-    - opencase_cases
-    - opencase_entities
-    - options
-    - rest
-    - serialization
-    - taxonomy
-    - user
-    - views_data_export
-    - views_summarize
-id: case_fees_report
-label: 'Case Fees Report'
-module: views
-description: ''
-tag: ''
-base_table: oc_case_fee_field_data
-base_field: id
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Project Fees Report'
-      fields:
-        field_umbrella_client:
-          id: field_umbrella_client
-          table: oc_organisation__field_umbrella_client
-          field: field_umbrella_client
-          relationship: client
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Umbrella Client'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_type_of_umbrella_client:
-          id: field_type_of_umbrella_client
-          table: oc_organisation__field_type_of_umbrella_client
-          field: field_type_of_umbrella_client
-          relationship: field_umbrella_client
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Umbrella client type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: oc_case
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: field
-          label: Client
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_client_type:
-          id: field_client_type
-          table: oc_organisation__field_client_type
-          field: field_client_type
-          relationship: client
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Client type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_client_subtype:
-          id: field_client_subtype
-          table: oc_organisation__field_client_subtype
-          field: field_client_subtype
-          relationship: client
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Client subtype'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_tags:
-          id: field_tags
-          table: oc_organisation__field_tags
-          field: field_tags
-          relationship: client
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Client Tags'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        oc_case:
-          id: oc_case
-          table: oc_case_fee_field_data
-          field: oc_case
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case_fee
-          entity_field: oc_case
-          plugin_id: field
-          label: Project
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_contract_signed_date:
-          id: field_contract_signed_date
-          table: oc_case__field_contract_signed_date
-          field: field_contract_signed_date
-          relationship: oc_case
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Contract signed date'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: datetime_default
-          settings:
-            timezone_override: ''
-            format_type: short
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        oc_fee_category:
-          id: oc_fee_category
-          table: oc_case_fee_field_data
-          field: oc_fee_category
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case_fee
-          entity_field: oc_fee_category
-          plugin_id: field
-          label: 'Fee Category'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        amount:
-          id: amount
-          table: oc_case_fee_field_data
-          field: amount
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case_fee
-          entity_field: amount
-          plugin_id: field
-          label: Amount
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_decimal
-          settings:
-            thousand_separator: ','
-            decimal_separator: .
-            scale: 2
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: role
-        options:
-          role:
-            gno_admin_user: gno_admin_user
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments: {  }
-      filters:
-        status:
-          id: status
-          table: oc_case_fee_field_data
-          field: status
-          entity_type: oc_case_fee
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_client_type_target_id:
-          id: field_client_type_target_id
-          table: oc_organisation__field_client_type
-          field: field_client_type_target_id
-          relationship: client
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_client_type_target_id_op
-            label: 'Client type'
-            description: ''
-            use_operator: false
-            operator: field_client_type_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_client_type_target_id
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: client_types
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-        field_client_subtype_target_id:
-          id: field_client_subtype_target_id
-          table: oc_organisation__field_client_subtype
-          field: field_client_subtype_target_id
-          relationship: client
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_client_subtype_target_id_op
-            label: 'Client subtype'
-            description: ''
-            use_operator: false
-            operator: field_client_subtype_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_client_subtype_target_id
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: client_subtypes
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-        field_tags_target_id:
-          id: field_tags_target_id
-          table: oc_organisation__field_tags
-          field: field_tags_target_id
-          relationship: client
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_tags_target_id_op
-            label: 'Client Tags'
-            description: ''
-            use_operator: false
-            operator: field_tags_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_tags_target_id
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: tags
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-        field_type_of_umbrella_client_value:
-          id: field_type_of_umbrella_client_value
-          table: oc_organisation__field_type_of_umbrella_client
-          field: field_type_of_umbrella_client_value
-          relationship: field_umbrella_client
-          group_type: group
-          admin_label: ''
-          plugin_id: list_field
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_type_of_umbrella_client_value_op
-            label: 'Umbrella client type'
-            description: ''
-            use_operator: false
-            operator: field_type_of_umbrella_client_value_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_type_of_umbrella_client_value
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-        field_contract_signed_date_value_1:
-          id: field_contract_signed_date_value_1
-          table: oc_case__field_contract_signed_date
-          field: field_contract_signed_date_value
-          relationship: oc_case
-          group_type: group
-          admin_label: ''
-          plugin_id: datetime
-          operator: between
-          value:
-            min: ''
-            max: ''
-            value: ''
-            type: date
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_contract_signed_date_value_1_op
-            label: 'Contract signed date between'
-            description: ''
-            use_operator: false
-            operator: field_contract_signed_date_value_1_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_contract_signed_date_value_1
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: tablesummarized
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          override: 1
-          sticky: 0
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            amount: amount
-          info:
-            amount:
-              sortable: 0
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: 0
-              responsive: ''
-              summarize: currency
-          default: '-1'
-          empty_table: 0
-          summary_only: 1
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        oc_case:
-          id: oc_case
-          table: oc_case_fee_field_data
-          field: oc_case
-          relationship: none
-          group_type: group
-          admin_label: Case
-          entity_type: oc_case_fee
-          entity_field: oc_case
-          plugin_id: standard
-          required: false
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: oc_case
-          group_type: group
-          admin_label: Organisation
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: standard
-          required: false
-        field_umbrella_client:
-          id: field_umbrella_client
-          table: oc_organisation__field_umbrella_client
-          field: field_umbrella_client
-          relationship: client
-          group_type: group
-          admin_label: 'field_umbrella_client: Organisation'
-          plugin_id: standard
-          required: false
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case.field_contract_signed_date'
-        - 'config:field.storage.oc_organisation.field_client_subtype'
-        - 'config:field.storage.oc_organisation.field_client_type'
-        - 'config:field.storage.oc_organisation.field_tags'
-        - 'config:field.storage.oc_organisation.field_type_of_umbrella_client'
-        - 'config:field.storage.oc_organisation.field_umbrella_client'
-  attachment_1:
-    id: attachment_1
-    display_title: Attachment
-    display_plugin: attachment
-    position: 1
-    display_options:
-      fields:
-        amount:
-          id: amount
-          table: oc_case_fee_field_data
-          field: amount
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case_fee
-          entity_field: amount
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_decimal
-          settings:
-            thousand_separator: ','
-            decimal_separator: .
-            scale: 2
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: none
-        options:
-          offset: 0
-      defaults:
-        fields: false
-      exposed_block: true
-      display_extenders: {  }
-      displays:
-        page_1: page_1
-      inherit_exposed_filters: true
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user
-        - user.roles
-      tags: {  }
-  data_export_1:
-    id: data_export_1
-    display_title: 'Data export'
-    display_plugin: data_export
-    position: 3
-    display_options:
-      style:
-        type: data_export
-        options:
-          formats:
-            csv: csv
-          csv_settings:
-            delimiter: ','
-            enclosure: '"'
-            escape_char: \
-            strip_tags: true
-            trim: true
-            encoding: utf8
-            utf8_bom: '0'
-            use_serializer_encode_only: false
-      display_extenders: {  }
-      path: case_fees_report/download
-      auth:
-        - cookie
-      displays:
-        page_1: page_1
-        default: '0'
-      filename: '[view:label]-[date:short].csv'
-      automatic_download: false
-      store_in_public_file_directory: null
-      custom_redirect_path: false
-      redirect_to_display: none
-      include_query_params: false
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - user
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case.field_contract_signed_date'
-        - 'config:field.storage.oc_organisation.field_client_subtype'
-        - 'config:field.storage.oc_organisation.field_client_type'
-        - 'config:field.storage.oc_organisation.field_tags'
-        - 'config:field.storage.oc_organisation.field_type_of_umbrella_client'
-        - 'config:field.storage.oc_organisation.field_umbrella_client'
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            field_umbrella_client: field_umbrella_client
-            field_type_of_umbrella_client: field_type_of_umbrella_client
-            client: client
-            field_client_type: field_client_type
-            field_client_subtype: field_client_subtype
-            field_tags: field_tags
-            oc_case: oc_case
-            field_contract_signed_date: field_contract_signed_date
-            oc_fee_category: oc_fee_category
-            amount: amount
-          default: '-1'
-          info:
-            field_umbrella_client:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_type_of_umbrella_client:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            client:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_client_type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_client_subtype:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_tags:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            oc_case:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_contract_signed_date:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            oc_fee_category:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            amount:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: fields
-        options: {  }
-      defaults:
-        style: false
-        row: false
-      exposed_block: true
-      display_extenders: {  }
-      path: project-fees-report
-      menu:
-        type: normal
-        title: 'Project fees report'
-        description: ''
-        weight: 0
-        expanded: false
-        menu_name: opencase
-        parent: opencase.reporting
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case.field_contract_signed_date'
-        - 'config:field.storage.oc_organisation.field_client_subtype'
-        - 'config:field.storage.oc_organisation.field_client_type'
-        - 'config:field.storage.oc_organisation.field_tags'
-        - 'config:field.storage.oc_organisation.field_type_of_umbrella_client'
-        - 'config:field.storage.oc_organisation.field_umbrella_client'
diff --git a/config/optional/views.view.case_providers.yml b/config/optional/views.view.case_providers.yml
index 1d589ec..9d6e48c 100644
--- a/config/optional/views.view.case_providers.yml
+++ b/config/optional/views.view.case_providers.yml
@@ -1,14 +1,16 @@
-uuid: ad574fd4-03dc-4a3f-b818-2f71d80a929c
+uuid: 20fed501-ec98-4f7e-a082-56669f688310
 langcode: en
 status: true
 dependencies:
   config:
+    - opencase_entities.oc_actor_type.staff_member
+    - opencase_entities.oc_actor_type.volunteer
     - user.role.authenticated
   module:
     - opencase_entities
     - user
 id: case_providers
-label: 'Case Providers'
+label: 'Case providers'
 module: views
 description: ''
 tag: ''
@@ -17,7 +19,7 @@ base_field: id
 display:
   default:
     id: default
-    display_title: Master
+    display_title: Default
     display_plugin: default
     position: 0
     display_options:
@@ -123,74 +125,23 @@ display:
         type: tag
         options: {  }
       empty: {  }
-      sorts:
-        name:
-          id: name
-          table: oc_actor_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_actor
-          entity_field: name
-          plugin_id: standard
-          order: ASC
-          expose:
-            label: ''
-            field_identifier: ''
-          exposed: false
+      sorts: {  }
       arguments: {  }
       filters:
-        field_active_value:
-          id: field_active_value
-          table: oc_actor__field_active
-          field: field_active_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        status:
-          id: status
+        type:
+          id: type
           table: oc_actor_field_data
-          field: status
+          field: type
           relationship: none
           group_type: group
           admin_label: ''
           entity_type: oc_actor
-          entity_field: status
-          plugin_id: boolean
-          operator: '='
-          value: '1'
+          entity_field: type
+          plugin_id: bundle
+          operator: in
+          value:
+            staff_member: staff_member
+            volunteer: volunteer
           group: 1
           exposed: false
           expose:
@@ -207,6 +158,7 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
+            reduce: false
           is_grouped: false
           group_info:
             label: ''
diff --git a/config/optional/views.view.case_provision_report.yml b/config/optional/views.view.case_provision_report.yml
deleted file mode 100644
index 4e2c162..0000000
--- a/config/optional/views.view.case_provision_report.yml
+++ /dev/null
@@ -1,772 +0,0 @@
-uuid: 83684818-2ee2-4e07-abd9-7c97526f0f83
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case_provision.field_rate
-    - field.storage.oc_case_provision.field_rate_type
-    - system.menu.opencase
-    - user.role.gno_admin_user
-  module:
-    - csv_serialization
-    - opencase_cases
-    - opencase_entities
-    - options
-    - rest
-    - serialization
-    - user
-    - views_data_export
-id: case_provision_report
-label: 'Case provision report'
-module: views
-description: ''
-tag: ''
-base_table: oc_case_provision_field_data
-base_field: id
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Trainer report'
-      fields:
-        oc_provider:
-          id: oc_provider
-          table: oc_case_provision_field_data
-          field: oc_provider
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case_provision
-          entity_field: oc_provider
-          plugin_id: field
-          label: Trainer
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        oc_case:
-          id: oc_case
-          table: oc_case_provision_field_data
-          field: oc_case
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case_provision
-          entity_field: oc_case
-          plugin_id: field
-          label: Training
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: oc_case
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: field
-          label: Client
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_rate:
-          id: field_rate
-          table: oc_case_provision__field_rate
-          field: field_rate
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Rate
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_decimal
-          settings:
-            thousand_separator: ','
-            decimal_separator: .
-            scale: 2
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_rate_type:
-          id: field_rate_type
-          table: oc_case_provision__field_rate_type
-          field: field_rate_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Rate type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        oc_case_provider_role:
-          id: oc_case_provider_role
-          table: oc_case_provision_field_data
-          field: oc_case_provider_role
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case_provision
-          entity_field: oc_case_provider_role
-          plugin_id: field
-          label: Role
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: role
-        options:
-          role:
-            gno_admin_user: gno_admin_user
-      cache:
-        type: tag
-        options: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: 'None found'
-          tokenize: false
-      sorts: {  }
-      arguments: {  }
-      filters:
-        status:
-          id: status
-          table: oc_case_provision_field_data
-          field: status
-          entity_type: oc_case_provision
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        first_name:
-          id: first_name
-          table: oc_actor_field_data
-          field: first_name
-          relationship: oc_provider
-          group_type: group
-          admin_label: ''
-          entity_type: oc_actor
-          entity_field: first_name
-          plugin_id: string
-          operator: '='
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: first_name_op
-            label: 'First Name'
-            description: ''
-            use_operator: false
-            operator: first_name_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: first_name
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        last_name:
-          id: last_name
-          table: oc_actor_field_data
-          field: last_name
-          relationship: oc_provider
-          group_type: group
-          admin_label: ''
-          entity_type: oc_actor
-          entity_field: last_name
-          plugin_id: string
-          operator: '='
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: last_name_op
-            label: 'Last Name'
-            description: ''
-            use_operator: false
-            operator: last_name_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: last_name
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            oc_provider: oc_provider
-            oc_case: oc_case
-            client: client
-            field_rate: field_rate
-            field_rate_type: field_rate_type
-            oc_case_provider_role: oc_case_provider_role
-          default: '-1'
-          info:
-            oc_provider:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            oc_case:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            client:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_rate:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_rate_type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            oc_case_provider_role:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        oc_case:
-          id: oc_case
-          table: oc_case_provision_field_data
-          field: oc_case
-          relationship: none
-          group_type: group
-          admin_label: Case
-          entity_type: oc_case_provision
-          entity_field: oc_case
-          plugin_id: standard
-          required: false
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: oc_case
-          group_type: group
-          admin_label: Organisation
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: standard
-          required: false
-        oc_provider:
-          id: oc_provider
-          table: oc_case_provision_field_data
-          field: oc_provider
-          relationship: none
-          group_type: group
-          admin_label: Person
-          entity_type: oc_case_provision
-          entity_field: oc_provider
-          plugin_id: standard
-          required: false
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case_provision.field_rate'
-        - 'config:field.storage.oc_case_provision.field_rate_type'
-  data_export_1:
-    id: data_export_1
-    display_title: 'Data export'
-    display_plugin: data_export
-    position: 2
-    display_options:
-      style:
-        type: data_export
-        options:
-          formats:
-            csv: csv
-          csv_settings:
-            delimiter: ','
-            enclosure: '"'
-            escape_char: \
-            strip_tags: true
-            trim: true
-            encoding: utf8
-            utf8_bom: '0'
-            use_serializer_encode_only: false
-      display_extenders: {  }
-      path: case_provision_report/download
-      auth:
-        - cookie
-      displays:
-        page_1: page_1
-        default: '0'
-      filename: 'Trainer-report-[date:short].csv'
-      automatic_download: false
-      store_in_public_file_directory: null
-      custom_redirect_path: false
-      redirect_to_display: none
-      include_query_params: false
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case_provision.field_rate'
-        - 'config:field.storage.oc_case_provision.field_rate_type'
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      exposed_block: true
-      display_extenders: {  }
-      path: trainer-report
-      menu:
-        type: normal
-        title: 'Trainer report'
-        description: ''
-        weight: 0
-        expanded: false
-        menu_name: opencase
-        parent: opencase.reporting
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case_provision.field_rate'
-        - 'config:field.storage.oc_case_provision.field_rate_type'
diff --git a/config/optional/views.view.case_provisions.yml b/config/optional/views.view.case_provisions.yml
index 1aa07e8..65ad989 100644
--- a/config/optional/views.view.case_provisions.yml
+++ b/config/optional/views.view.case_provisions.yml
@@ -1,17 +1,15 @@
-uuid: db25a718-da8d-49cc-8790-618f30580bed
+uuid: 00afe158-4881-4478-b808-06e2841efc36
 langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.oc_case_provision.field_rate
-    - field.storage.oc_case_provision.field_rate_type
+    - opencase_cases.oc_case_provision_type.caseworker
     - user.role.authenticated
   module:
     - opencase_cases
-    - options
     - user
 id: case_provisions
-label: 'Case Provisions'
+label: 'Case provisions'
 module: views
 description: ''
 tag: ''
@@ -20,88 +18,23 @@ base_field: id
 display:
   default:
     id: default
-    display_title: Master
+    display_title: Default
     display_plugin: default
     position: 0
     display_options:
-      title: Trainers
+      title: 'Case provisions'
       fields:
-        name:
-          id: name
+        oc_case:
+          id: oc_case
           table: oc_case_provision_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        oc_provider:
-          id: oc_provider
-          table: oc_case_provision_field_data
-          field: oc_provider
+          field: oc_case
           relationship: none
           group_type: group
           admin_label: ''
           entity_type: oc_case_provision
-          entity_field: oc_provider
+          entity_field: oc_case
           plugin_id: field
-          label: Trainer
+          label: Case
           exclude: false
           alter:
             alter_text: false
@@ -145,7 +78,7 @@ display:
           click_sort_column: target_id
           type: entity_reference_label
           settings:
-            link: false
+            link: true
           group_column: target_id
           group_columns: {  }
           group_rows: true
@@ -156,134 +89,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        field_rate_type:
-          id: field_rate_type
-          table: oc_case_provision__field_rate_type
-          field: field_rate_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Rate type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_rate:
-          id: field_rate
-          table: oc_case_provision__field_rate
-          field: field_rate
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Rate
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_decimal
-          settings:
-            thousand_separator: ','
-            decimal_separator: .
-            scale: 2
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
         oc_case_provider_role:
           id: oc_case_provider_role
           table: oc_case_provision_field_data
@@ -338,7 +143,7 @@ display:
           click_sort_column: target_id
           type: entity_reference_label
           settings:
-            link: false
+            link: true
           group_column: target_id
           group_columns: {  }
           group_rows: true
@@ -349,63 +154,11 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        edit_oc_case_provision:
-          id: edit_oc_case_provision
-          table: oc_case_provision
-          field: edit_oc_case_provision
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case_provision
-          plugin_id: entity_link_edit
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: edit
-          output_url_as_text: false
-          absolute: false
       pager:
         type: none
         options:
           offset: 0
+          items_per_page: null
       exposed_form:
         type: basic
         options:
@@ -424,31 +177,18 @@ display:
       cache:
         type: tag
         options: {  }
-      empty:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text
-          empty: true
-          content:
-            value: "Trainers will appear here once they are added.\r\n"
-            format: full_html
-          tokenize: false
+      empty: {  }
       sorts: {  }
       arguments:
-        oc_case:
-          id: oc_case
+        oc_provider:
+          id: oc_provider
           table: oc_case_provision_field_data
-          field: oc_case
+          field: oc_provider
           relationship: none
           group_type: group
           admin_label: ''
           entity_type: oc_case_provision
-          entity_field: oc_case
+          entity_field: oc_provider
           plugin_id: numeric
           default_action: default
           exception:
@@ -492,36 +232,22 @@ display:
             operator: ''
             operator_limit_selection: false
             operator_list: {  }
+        type:
+          id: type
+          table: oc_case_provision_field_data
+          field: type
+          entity_type: oc_case_provision
+          entity_field: type
+          plugin_id: bundle
+          value:
+            caseworker: caseworker
+          expose:
+            operator_limit_selection: false
+            operator_list: {  }
       style:
         type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            name: name
-          default: '-1'
-          info:
-            name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
       row:
         type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
       query:
         type: views_query
         options:
@@ -532,7 +258,427 @@ display:
           query_tags: {  }
       relationships: {  }
       header: {  }
-      footer:
+      footer: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - user.roles
+      tags: {  }
+  block_1:
+    id: block_1
+    display_title: 'By provider'
+    display_plugin: block
+    position: 1
+    display_options:
+      fields:
+        oc_case:
+          id: oc_case
+          table: oc_case_provision_field_data
+          field: oc_case
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_provision
+          entity_field: oc_case
+          plugin_id: field
+          label: Case
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        oc_case_provider_role:
+          id: oc_case_provider_role
+          table: oc_case_provision_field_data
+          field: oc_case_provider_role
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_provision
+          entity_field: oc_case_provider_role
+          plugin_id: field
+          label: Role
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        oc_target:
+          id: oc_target
+          table: oc_case_field_data
+          field: oc_target
+          relationship: oc_case
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case
+          entity_field: oc_target
+          plugin_id: field
+          label: Target
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+      defaults:
+        relationships: false
+        fields: false
+      relationships:
+        oc_case:
+          id: oc_case
+          table: oc_case_provision_field_data
+          field: oc_case
+          relationship: none
+          group_type: group
+          admin_label: Case
+          entity_type: oc_case_provision
+          entity_field: oc_case
+          plugin_id: standard
+          required: false
+      display_description: ''
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - user.roles
+      tags: {  }
+  block_2:
+    id: block_2
+    display_title: 'By case'
+    display_plugin: block
+    position: 2
+    display_options:
+      fields:
+        oc_provider:
+          id: oc_provider
+          table: oc_case_provision_field_data
+          field: oc_provider
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_provision
+          entity_field: oc_provider
+          plugin_id: field
+          label: Name
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        oc_case_provider_role:
+          id: oc_case_provider_role
+          table: oc_case_provision_field_data
+          field: oc_case_provider_role
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_provision
+          entity_field: oc_case_provider_role
+          plugin_id: field
+          label: Role
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+      arguments:
+        oc_case:
+          id: oc_case
+          table: oc_case_provision_field_data
+          field: oc_case
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_provision
+          entity_field: oc_case
+          plugin_id: numeric
+          default_action: default
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: false
+          title: ''
+          default_argument_type: raw
+          default_argument_options:
+            index: 2
+            use_alias: false
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            override: false
+            items_per_page: 25
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: false
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
+          break_phrase: false
+          not: false
+      defaults:
+        relationships: false
+        fields: false
+        arguments: false
+        header: false
+      relationships: {  }
+      display_description: ''
+      header:
         area_text_custom:
           id: area_text_custom
           table: views
@@ -542,7 +688,7 @@ display:
           admin_label: ''
           plugin_id: text_custom
           empty: true
-          content: '<a class="button" href="/opencase/oc_case_provision/add/trainer?case_id={{ raw_arguments.oc_case }}&destination=/opencase/oc_case/{{ raw_arguments.oc_case }}">Add trainer</a><br /><br />'
+          content: '<a href=''/opencase/oc_case_provision/add/caseworker?case_id={{ raw_arguments.oc_case }}''>Add a caseworker</a>'
           tokenize: true
       display_extenders: {  }
     cache_metadata:
@@ -552,23 +698,4 @@ display:
         - 'languages:language_interface'
         - url
         - user.roles
-      tags:
-        - 'config:field.storage.oc_case_provision.field_rate'
-        - 'config:field.storage.oc_case_provision.field_rate_type'
-  block_1:
-    id: block_1
-    display_title: Block
-    display_plugin: block
-    position: 1
-    display_options:
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case_provision.field_rate'
-        - 'config:field.storage.oc_case_provision.field_rate_type'
+      tags: {  }
diff --git a/config/optional/views.view.project_billing_details.yml b/config/optional/views.view.cases.yml
similarity index 78%
rename from config/optional/views.view.project_billing_details.yml
rename to config/optional/views.view.cases.yml
index 4c1a729..c80bdd1 100644
--- a/config/optional/views.view.project_billing_details.yml
+++ b/config/optional/views.view.cases.yml
@@ -1,16 +1,15 @@
-uuid: 4ba7d470-c876-475d-94f3-254271a206da
+uuid: f9c4fcfe-3dd4-4afa-babc-31c03a9cf83f
 langcode: en
 status: true
 dependencies:
   config:
-    - opencase_cases.oc_case_type.project
+    - system.menu.opencase
     - user.role.authenticated
   module:
     - opencase_cases
-    - opencase_entities
     - user
-id: project_billing_details
-label: 'Project billing details'
+id: cases
+label: Cases
 module: views
 description: ''
 tag: ''
@@ -19,88 +18,23 @@ base_field: id
 display:
   default:
     id: default
-    display_title: Master
+    display_title: Default
     display_plugin: default
     position: 0
     display_options:
-      title: 'Billing details'
+      title: Cases
       fields:
-        billing_contact_name:
-          id: billing_contact_name
-          table: oc_organisation_field_data
-          field: billing_contact_name
-          relationship: client
+        name:
+          id: name
+          table: oc_case_field_data
+          field: name
+          relationship: none
           group_type: group
           admin_label: ''
-          entity_type: oc_organisation
-          entity_field: billing_contact_name
+          entity_type: null
+          entity_field: name
           plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: h5
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        billing_email:
-          id: billing_email
-          table: oc_organisation_field_data
-          field: billing_email
-          relationship: client
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation
-          entity_field: billing_email
-          plugin_id: field
-          label: ''
+          label: Title
           exclude: false
           alter:
             alter_text: false
@@ -133,7 +67,7 @@ display:
           element_class: ''
           element_label_type: ''
           element_label_class: ''
-          element_label_colon: false
+          element_label_colon: true
           element_wrapper_type: ''
           element_wrapper_class: ''
           element_default_classes: true
@@ -144,7 +78,7 @@ display:
           click_sort_column: value
           type: string
           settings:
-            link_to_entity: false
+            link_to_entity: true
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -155,17 +89,17 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        billing_phone:
-          id: billing_phone
-          table: oc_organisation_field_data
-          field: billing_phone
-          relationship: client
+        type:
+          id: type
+          table: oc_case_field_data
+          field: type
+          relationship: none
           group_type: group
           admin_label: ''
-          entity_type: oc_organisation
-          entity_field: billing_phone
+          entity_type: oc_case
+          entity_field: type
           plugin_id: field
-          label: ''
+          label: 'Case type'
           exclude: false
           alter:
             alter_text: false
@@ -198,7 +132,7 @@ display:
           element_class: ''
           element_label_type: ''
           element_label_class: ''
-          element_label_colon: false
+          element_label_colon: true
           element_wrapper_type: ''
           element_wrapper_class: ''
           element_default_classes: true
@@ -206,11 +140,11 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          click_sort_column: value
-          type: string
+          click_sort_column: target_id
+          type: entity_reference_label
           settings:
-            link_to_entity: false
-          group_column: value
+            link: false
+          group_column: target_id
           group_columns: {  }
           group_rows: true
           delta_limit: 0
@@ -220,17 +154,17 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        billing_postal_address:
-          id: billing_postal_address
-          table: oc_organisation_field_data
-          field: billing_postal_address
-          relationship: client
+        oc_target:
+          id: oc_target
+          table: oc_case_field_data
+          field: oc_target
+          relationship: none
           group_type: group
           admin_label: ''
-          entity_type: oc_organisation
-          entity_field: billing_postal_address
+          entity_type: oc_case
+          entity_field: oc_target
           plugin_id: field
-          label: ''
+          label: Target
           exclude: false
           alter:
             alter_text: false
@@ -263,7 +197,7 @@ display:
           element_class: ''
           element_label_type: ''
           element_label_class: ''
-          element_label_colon: false
+          element_label_colon: true
           element_wrapper_type: ''
           element_wrapper_class: ''
           element_default_classes: true
@@ -271,75 +205,11 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          click_sort_column: value
-          type: basic_string
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        billing_post_code:
-          id: billing_post_code
-          table: oc_organisation_field_data
-          field: billing_post_code
-          relationship: client
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation
-          entity_field: billing_post_code
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
+          click_sort_column: target_id
+          type: entity_reference_label
           settings:
-            link_to_entity: false
-          group_column: value
+            link: true
+          group_column: target_id
           group_columns: {  }
           group_rows: true
           delta_limit: 0
@@ -387,16 +257,179 @@ display:
         options: {  }
       empty: {  }
       sorts: {  }
-      arguments:
-        id:
-          id: id
+      arguments: {  }
+      filters: {  }
+      style:
+        type: table
+      row:
+        type: fields
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      relationships: {  }
+      header: {  }
+      footer: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - user.roles
+      tags: {  }
+  block_1:
+    id: block_1
+    display_title: Block
+    display_plugin: block
+    position: 2
+    display_options:
+      fields:
+        name:
+          id: name
           table: oc_case_field_data
-          field: id
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: null
+          entity_field: name
+          plugin_id: field
+          label: Title
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        type:
+          id: type
+          table: oc_case_field_data
+          field: type
           relationship: none
           group_type: group
           admin_label: ''
           entity_type: oc_case
-          entity_field: id
+          entity_field: type
+          plugin_id: field
+          label: 'Case type'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+      arguments:
+        oc_target:
+          id: oc_target
+          table: oc_case_field_data
+          field: oc_target
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case
+          entity_field: oc_target
           plugin_id: numeric
           default_action: default
           exception:
@@ -426,50 +459,11 @@ display:
           validate_options: {  }
           break_phrase: false
           not: false
-      filters:
-        type:
-          id: type
-          table: oc_case_field_data
-          field: type
-          entity_type: oc_case
-          entity_field: type
-          plugin_id: bundle
-          value:
-            project: project
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: default
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: none
-          group_type: group
-          admin_label: Organisation
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: standard
-          required: true
-      header: {  }
-      footer: {  }
+      defaults:
+        fields: false
+        arguments: false
       display_extenders: {  }
+      block_description: 'Cases: by target'
     cache_metadata:
       max-age: -1
       contexts:
@@ -486,13 +480,21 @@ display:
     position: 1
     display_options:
       display_extenders: {  }
-      path: project-billing-details
+      path: cases/all
+      menu:
+        type: normal
+        title: Cases
+        description: ''
+        weight: 0
+        expanded: false
+        menu_name: opencase
+        parent: opencase.see_all
+        context: '0'
     cache_metadata:
       max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
-        - url
         - url.query_args
         - user.roles
       tags: {  }
diff --git a/config/optional/views.view.client_report.yml b/config/optional/views.view.client_report.yml
deleted file mode 100644
index 77d6250..0000000
--- a/config/optional/views.view.client_report.yml
+++ /dev/null
@@ -1,1373 +0,0 @@
-uuid: a9c27af6-274f-441f-b9fe-3ddd54c7716f
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_organisation.field_accreditation_date
-    - field.storage.oc_organisation.field_client_status
-    - field.storage.oc_organisation.field_client_substatus
-    - field.storage.oc_organisation.field_client_subtype
-    - field.storage.oc_organisation.field_client_type
-    - field.storage.oc_organisation.field_tags
-    - field.storage.oc_organisation.field_type_of_umbrella_client
-    - field.storage.oc_organisation.field_umbrella_client
-    - opencase_entities.oc_organisation_type.client
-    - system.menu.opencase
-    - taxonomy.vocabulary.client_status
-    - taxonomy.vocabulary.client_subtypes
-    - taxonomy.vocabulary.client_types
-    - taxonomy.vocabulary.tags
-    - user.role.administrator
-    - user.role.gno_admin_user
-  module:
-    - better_exposed_filters
-    - csv_serialization
-    - datetime
-    - opencase_entities
-    - options
-    - rest
-    - serialization
-    - taxonomy
-    - user
-    - views_data_export
-id: client_report
-label: 'Client Report'
-module: views
-description: ''
-tag: ''
-base_table: oc_organisation_field_data
-base_field: id
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Client Report'
-      fields:
-        name:
-          id: name
-          table: oc_organisation_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-          label: Name
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_accreditation_date:
-          id: field_accreditation_date
-          table: oc_organisation__field_accreditation_date
-          field: field_accreditation_date
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Accreditation date'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: datetime_default
-          settings:
-            timezone_override: ''
-            format_type: short
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_client_type:
-          id: field_client_type
-          table: oc_organisation__field_client_type
-          field: field_client_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Client type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_client_subtype:
-          id: field_client_subtype
-          table: oc_organisation__field_client_subtype
-          field: field_client_subtype
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Client subtype'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_client_status:
-          id: field_client_status
-          table: oc_organisation__field_client_status
-          field: field_client_status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Client Status'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_client_substatus:
-          id: field_client_substatus
-          table: oc_organisation__field_client_substatus
-          field: field_client_substatus
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Client substatus'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_tags:
-          id: field_tags
-          table: oc_organisation__field_tags
-          field: field_tags
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Tags
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_umbrella_client:
-          id: field_umbrella_client
-          table: oc_organisation__field_umbrella_client
-          field: field_umbrella_client
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Umbrella client'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_type_of_umbrella_client:
-          id: field_type_of_umbrella_client
-          table: oc_organisation__field_type_of_umbrella_client
-          field: field_type_of_umbrella_client
-          relationship: field_umbrella_client
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Type of umbrella client'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        postal_address:
-          id: postal_address
-          table: oc_organisation_field_data
-          field: postal_address
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation
-          entity_field: postal_address
-          plugin_id: field
-          label: Address
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: basic_string
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: full
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-            first: '« First'
-            last: 'Last »'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          quantity: 9
-      exposed_form:
-        type: bef
-        options:
-          submit_button: Apply
-          reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-          text_input_required: 'Select any filter and click on Apply to see results'
-          text_input_required_format: full_html
-          bef:
-            general:
-              autosubmit: false
-              autosubmit_exclude_textfield: true
-              autosubmit_textfield_delay: 500
-              autosubmit_hide: false
-              input_required: false
-              allow_secondary: false
-              secondary_label: 'Advanced options'
-              secondary_open: false
-            filter:
-              field_client_status_target_id:
-                plugin_id: bef
-                advanced:
-                  sort_options: false
-                  rewrite:
-                    filter_rewrite_values: ''
-                  collapsible: false
-                  is_secondary: false
-                select_all_none: false
-                select_all_none_nested: false
-                display_inline: false
-              field_tags_target_id:
-                plugin_id: default
-                advanced:
-                  sort_options: false
-                  rewrite:
-                    filter_rewrite_values: ''
-                  collapsible: false
-                  is_secondary: false
-              field_type_of_umbrella_client_value:
-                plugin_id: default
-                advanced:
-                  sort_options: false
-                  rewrite:
-                    filter_rewrite_values: ''
-                  collapsible: false
-                  is_secondary: false
-              field_accreditation_date_value:
-                plugin_id: default
-                advanced:
-                  collapsible: false
-                  is_secondary: false
-      access:
-        type: role
-        options:
-          role:
-            administrator: administrator
-            gno_admin_user: gno_admin_user
-      cache:
-        type: tag
-        options: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: 'None found'
-          tokenize: false
-      sorts: {  }
-      arguments: {  }
-      filters:
-        status:
-          id: status
-          table: oc_organisation_field_data
-          field: status
-          entity_type: oc_organisation
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        type:
-          id: type
-          table: oc_organisation_field_data
-          field: type
-          entity_type: oc_organisation
-          entity_field: type
-          plugin_id: bundle
-          value:
-            client: client
-          group: 1
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        field_client_status_target_id:
-          id: field_client_status_target_id
-          table: oc_organisation__field_client_status
-          field: field_client_status_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_client_status_target_id_op
-            label: 'Client status'
-            description: ''
-            use_operator: false
-            operator: field_client_status_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_client_status_target_id
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: client_status
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-        field_tags_target_id:
-          id: field_tags_target_id
-          table: oc_organisation__field_tags
-          field: field_tags_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_tags_target_id_op
-            label: Tags
-            description: ''
-            use_operator: false
-            operator: field_tags_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_tags_target_id
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: tags
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-        field_type_of_umbrella_client_value:
-          id: field_type_of_umbrella_client_value
-          table: oc_organisation__field_type_of_umbrella_client
-          field: field_type_of_umbrella_client_value
-          relationship: field_umbrella_client
-          group_type: group
-          admin_label: ''
-          plugin_id: list_field
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_type_of_umbrella_client_value_op
-            label: 'Umbrella client type'
-            description: ''
-            use_operator: false
-            operator: field_type_of_umbrella_client_value_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_type_of_umbrella_client_value
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-        field_accreditation_date_value:
-          id: field_accreditation_date_value
-          table: oc_organisation__field_accreditation_date
-          field: field_accreditation_date_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: datetime
-          operator: between
-          value:
-            min: ''
-            max: ''
-            value: ''
-            type: date
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_accreditation_date_value_op
-            label: 'Accreditation date between'
-            description: ''
-            use_operator: false
-            operator: field_accreditation_date_value_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_accreditation_date_value
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        postal_address:
-          id: postal_address
-          table: oc_organisation_field_data
-          field: postal_address
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation
-          entity_field: postal_address
-          plugin_id: string
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: postal_address_op
-            label: 'Address contains ...'
-            description: ''
-            use_operator: false
-            operator: postal_address_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: postal_address
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_client_subtype_target_id:
-          id: field_client_subtype_target_id
-          table: oc_organisation__field_client_subtype
-          field: field_client_subtype_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_client_subtype_target_id_op
-            label: 'Client subtype'
-            description: ''
-            use_operator: false
-            operator: field_client_subtype_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_client_subtype_target_id
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: client_subtypes
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-        field_client_type_target_id:
-          id: field_client_type_target_id
-          table: oc_organisation__field_client_type
-          field: field_client_type_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_client_type_target_id_op
-            label: 'Client type'
-            description: ''
-            use_operator: false
-            operator: field_client_type_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_client_type_target_id
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: client_types
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            name: name
-            field_accreditation_date: field_accreditation_date
-            field_client_type: field_client_type
-            field_client_subtype: field_client_subtype
-            field_client_status: field_client_status
-            field_client_substatus: field_client_substatus
-            field_tags: field_tags
-            field_umbrella_client: field_umbrella_client
-            field_type_of_umbrella_client: field_type_of_umbrella_client
-            postal_address: postal_address
-          default: '-1'
-          info:
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_accreditation_date:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_client_type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_client_subtype:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_client_status:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_client_substatus:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_tags:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_umbrella_client:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_type_of_umbrella_client:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            postal_address:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        field_umbrella_client:
-          id: field_umbrella_client
-          table: oc_organisation__field_umbrella_client
-          field: field_umbrella_client
-          relationship: none
-          group_type: group
-          admin_label: 'field_umbrella_client: Organisation'
-          plugin_id: standard
-          required: false
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_organisation.field_accreditation_date'
-        - 'config:field.storage.oc_organisation.field_client_status'
-        - 'config:field.storage.oc_organisation.field_client_substatus'
-        - 'config:field.storage.oc_organisation.field_client_subtype'
-        - 'config:field.storage.oc_organisation.field_client_type'
-        - 'config:field.storage.oc_organisation.field_tags'
-        - 'config:field.storage.oc_organisation.field_type_of_umbrella_client'
-        - 'config:field.storage.oc_organisation.field_umbrella_client'
-  data_export_1:
-    id: data_export_1
-    display_title: 'Data export'
-    display_plugin: data_export
-    position: 2
-    display_options:
-      style:
-        type: data_export
-        options:
-          formats:
-            csv: csv
-          csv_settings:
-            delimiter: ','
-            enclosure: '"'
-            escape_char: \
-            strip_tags: true
-            trim: true
-            encoding: utf8
-            utf8_bom: '0'
-            use_serializer_encode_only: false
-      display_extenders: {  }
-      path: client-report/download
-      auth:
-        - cookie
-      displays:
-        page_1: page_1
-        default: '0'
-      filename: '[view:label]-[date:short].csv'
-      automatic_download: false
-      store_in_public_file_directory: null
-      custom_redirect_path: false
-      redirect_to_display: none
-      include_query_params: false
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - user
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_organisation.field_accreditation_date'
-        - 'config:field.storage.oc_organisation.field_client_status'
-        - 'config:field.storage.oc_organisation.field_client_substatus'
-        - 'config:field.storage.oc_organisation.field_client_subtype'
-        - 'config:field.storage.oc_organisation.field_client_type'
-        - 'config:field.storage.oc_organisation.field_tags'
-        - 'config:field.storage.oc_organisation.field_type_of_umbrella_client'
-        - 'config:field.storage.oc_organisation.field_umbrella_client'
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      exposed_block: true
-      display_extenders: {  }
-      path: client-report
-      menu:
-        type: normal
-        title: 'Client Report'
-        description: ''
-        weight: 0
-        expanded: false
-        menu_name: opencase
-        parent: opencase.reporting
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_organisation.field_accreditation_date'
-        - 'config:field.storage.oc_organisation.field_client_status'
-        - 'config:field.storage.oc_organisation.field_client_substatus'
-        - 'config:field.storage.oc_organisation.field_client_subtype'
-        - 'config:field.storage.oc_organisation.field_client_type'
-        - 'config:field.storage.oc_organisation.field_tags'
-        - 'config:field.storage.oc_organisation.field_type_of_umbrella_client'
-        - 'config:field.storage.oc_organisation.field_umbrella_client'
diff --git a/config/optional/views.view.comment.yml b/config/optional/views.view.comment.yml
index a2ec7e6..1da5bf3 100644
--- a/config/optional/views.view.comment.yml
+++ b/config/optional/views.view.comment.yml
@@ -1,4 +1,4 @@
-uuid: a4f71120-e0d2-49ae-856f-c670b0fb51f7
+uuid: 10eb8157-a8e9-4eb4-b261-2efca7289422
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     - comment
     - user
 _core:
-  default_config_hash: fsBo_zgUeLyYZdghaw4PkOHA-HqFxu7wmQLilF35XYg
+  default_config_hash: CgXkKY33fd-yaHz89du2hSw6MJOoIeNUJ-VHE5BiSdQ
 id: comment
 label: Comments
 module: comment
@@ -17,7 +17,7 @@ base_field: cid
 display:
   default:
     id: default
-    display_title: Master
+    display_title: Default
     display_plugin: default
     position: 0
     display_options:
@@ -544,7 +544,7 @@ display:
       exposed_form:
         type: basic
         options:
-          submit_button: Apply
+          submit_button: Filter
           reset_button: false
           reset_button_label: Reset
           exposed_sorts_label: 'Sort by'
diff --git a/config/optional/views.view.comments_recent.yml b/config/optional/views.view.comments_recent.yml
index b983d8a..a574870 100644
--- a/config/optional/views.view.comments_recent.yml
+++ b/config/optional/views.view.comments_recent.yml
@@ -1,4 +1,4 @@
-uuid: 1c01d3c6-d4e1-4e5f-a2a1-0386734d033d
+uuid: c3fc61e3-a96c-4630-afb4-73b856543cb5
 langcode: en
 status: true
 dependencies:
@@ -7,7 +7,7 @@ dependencies:
     - node
     - user
 _core:
-  default_config_hash: rX48v_U7vIh1FltSyJnTdpebtM-lj991qL_jO8BmZ2w
+  default_config_hash: S_NN2ubd_NovTfgzbHVlZMmIJJQS-3h9h3inzbaFUMY
 id: comments_recent
 label: 'Recent comments'
 module: views
@@ -18,7 +18,7 @@ base_field: cid
 display:
   default:
     id: default
-    display_title: Master
+    display_title: Default
     display_plugin: default
     position: 0
     display_options:
@@ -188,6 +188,7 @@ display:
           plugin_id: field
           order: DESC
           expose:
+            label: ''
             field_identifier: cid
           exposed: false
       filters:
diff --git a/config/optional/views.view.contact_details_changes.yml b/config/optional/views.view.contact_details_changes.yml
index 9f6df1f..90ee314 100644
--- a/config/optional/views.view.contact_details_changes.yml
+++ b/config/optional/views.view.contact_details_changes.yml
@@ -1,9 +1,7 @@
-uuid: d5004479-5d1a-40ea-88d3-158be6ace990
+uuid: 3e700e8c-41f3-47d5-a801-60c52a13e597
 langcode: en
 status: true
 dependencies:
-  config:
-    - user.role.authenticated
   module:
     - opencase_entities
     - user
@@ -669,23 +667,9 @@ display:
           output_url_as_text: false
           absolute: false
       pager:
-        type: mini
+        type: none
         options:
           offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
       exposed_form:
         type: basic
         options:
@@ -697,10 +681,9 @@ display:
           sort_asc_label: Asc
           sort_desc_label: Desc
       access:
-        type: role
+        type: perm
         options:
-          role:
-            authenticated: authenticated
+          perm: 'view published client entities'
       cache:
         type: tag
         options: {  }
@@ -854,8 +837,7 @@ display:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
-        - url.query_args
-        - user.roles
+        - user.permissions
       tags: {  }
   page_1:
     id: page_1
@@ -871,6 +853,5 @@ display:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
-        - url.query_args
-        - user.roles
+        - user.permissions
       tags: {  }
diff --git a/config/optional/views.view.content.yml b/config/optional/views.view.content.yml
index 91458f1..d7b6580 100644
--- a/config/optional/views.view.content.yml
+++ b/config/optional/views.view.content.yml
@@ -1,4 +1,4 @@
-uuid: 5cb8e2b1-a54e-4a7d-a1fd-c99e4ad17e31
+uuid: 21602a3d-e853-4fc2-95ea-c20a318f7ad7
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     - node
     - user
 _core:
-  default_config_hash: P7F4DFe8BL31DRVqsvS-ix9KZZqvvaPjZ7zEvGo9yNM
+  default_config_hash: vBKWYGGDoAX-tFd1JErB8tZLSxx3lJ0foouVsgpcbB4
 id: content
 label: Content
 module: node
@@ -17,7 +17,7 @@ base_field: nid
 display:
   default:
     id: default
-    display_title: Master
+    display_title: Default
     display_plugin: default
     position: 0
     display_options:
diff --git a/config/optional/views.view.content_recent.yml b/config/optional/views.view.content_recent.yml
index ccaf165..b215c4e 100644
--- a/config/optional/views.view.content_recent.yml
+++ b/config/optional/views.view.content_recent.yml
@@ -1,4 +1,4 @@
-uuid: 9fa23c3d-47b9-4222-9cde-250b67479130
+uuid: 9f059100-758d-4bb8-8690-02daefef0925
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     - node
     - user
 _core:
-  default_config_hash: MxwbHUmXqKQgTGCTWcMxsfUH9NZJ8ZVqZp6801AOa40
+  default_config_hash: YqZN5rc7XDQcFcInc8wkzuaHJmC5YvirhTmDcrarT6M
 id: content_recent
 label: 'Recent content'
 module: node
@@ -17,7 +17,7 @@ base_field: nid
 display:
   default:
     id: default
-    display_title: Master
+    display_title: Default
     display_plugin: default
     position: 0
     display_options:
diff --git a/config/optional/views.view.debrief_report.yml b/config/optional/views.view.debrief_report.yml
deleted file mode 100644
index 7f0c451..0000000
--- a/config/optional/views.view.debrief_report.yml
+++ /dev/null
@@ -1,726 +0,0 @@
-uuid: f3b15831-5f66-4688-adf3-9b1ea3b36242
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_activity_type.trainer_debrief
-    - system.menu.opencase
-    - user.role.gno_admin_user
-  module:
-    - csv_serialization
-    - datetime
-    - opencase_entities
-    - rest
-    - serialization
-    - user
-    - views_data_export
-id: debrief_report
-label: 'Debrief Report'
-module: views
-description: ''
-tag: ''
-base_table: oc_activity_field_data
-base_field: id
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Debrief Report'
-      fields:
-        activity_date_time:
-          id: activity_date_time
-          table: oc_activity_field_data
-          field: activity_date_time
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: activity_date_time
-          plugin_id: field
-          label: 'Date submitted'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: datetime_default
-          settings:
-            timezone_override: ''
-            format_type: short
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        oc_case:
-          id: oc_case
-          table: oc_activity_field_data
-          field: oc_case
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: oc_case
-          plugin_id: field
-          label: Training
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        oc_provider:
-          id: oc_provider
-          table: oc_activity_field_data
-          field: oc_provider
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: oc_provider
-          plugin_id: field
-          label: 'Submitted by'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        view_oc_activity:
-          id: view_oc_activity
-          table: oc_activity
-          field: view_oc_activity
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          plugin_id: entity_link
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: view
-          output_url_as_text: false
-          absolute: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: role
-        options:
-          role:
-            gno_admin_user: gno_admin_user
-      cache:
-        type: tag
-        options: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: 'None found'
-          tokenize: false
-      sorts: {  }
-      arguments: {  }
-      filters:
-        type:
-          id: type
-          table: oc_activity_field_data
-          field: type
-          entity_type: oc_activity
-          entity_field: type
-          plugin_id: bundle
-          value:
-            trainer_debrief: trainer_debrief
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        created:
-          id: created
-          table: oc_activity_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: created
-          plugin_id: date
-          operator: between
-          value:
-            min: ''
-            max: ''
-            value: ''
-            type: date
-          group: 1
-          exposed: true
-          expose:
-            operator_id: created_op
-            label: 'Submitted between'
-            description: ''
-            use_operator: false
-            operator: created_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: created
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            created: created
-            oc_case: oc_case
-            oc_provider: oc_provider
-          default: '-1'
-          info:
-            created:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            oc_case:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            oc_provider:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags: {  }
-  data_export_1:
-    id: data_export_1
-    display_title: 'Data export'
-    display_plugin: data_export
-    position: 2
-    display_options:
-      fields:
-        activity_date_time:
-          id: activity_date_time
-          table: oc_activity_field_data
-          field: activity_date_time
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: activity_date_time
-          plugin_id: field
-          label: 'Date submitted'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: datetime_default
-          settings:
-            timezone_override: ''
-            format_type: short
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        oc_case:
-          id: oc_case
-          table: oc_activity_field_data
-          field: oc_case
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: oc_case
-          plugin_id: field
-          label: Training
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        oc_provider:
-          id: oc_provider
-          table: oc_activity_field_data
-          field: oc_provider
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: oc_provider
-          plugin_id: field
-          label: 'Submitted by'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      style:
-        type: data_export
-        options:
-          formats:
-            csv: csv
-          csv_settings:
-            delimiter: ','
-            enclosure: '"'
-            escape_char: \
-            strip_tags: true
-            trim: true
-            encoding: utf8
-            utf8_bom: '0'
-            use_serializer_encode_only: false
-      defaults:
-        fields: false
-      display_extenders: {  }
-      path: debrief-report/download
-      auth:
-        - cookie
-      displays:
-        page_1: page_1
-        default: '0'
-      filename: '[view:label]-[date:short].csv'
-      automatic_download: false
-      store_in_public_file_directory: null
-      custom_redirect_path: false
-      redirect_to_display: none
-      include_query_params: false
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - user.roles
-      tags: {  }
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      exposed_block: true
-      display_extenders: {  }
-      path: debrief-report
-      menu:
-        type: normal
-        title: 'Debrief Report'
-        description: ''
-        weight: 0
-        expanded: false
-        menu_name: opencase
-        parent: opencase.reporting
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags: {  }
diff --git a/config/optional/views.view.debriefs.yml b/config/optional/views.view.debriefs.yml
deleted file mode 100644
index 24c5056..0000000
--- a/config/optional/views.view.debriefs.yml
+++ /dev/null
@@ -1,560 +0,0 @@
-uuid: b4a17cdd-f6a9-4afc-a3e7-dfb1b1e53d40
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_activity_type.trainer_debrief
-    - user.role.authenticated
-  module:
-    - datetime
-    - opencase_cases
-    - opencase_entities
-    - user
-_core:
-  default_config_hash: SxsvSdjmVHSg9OmH0pUqCTeGy9mRdcHyZ2YhOC5HBOc
-id: debriefs
-label: Debrief
-module: views
-description: ''
-tag: ''
-base_table: oc_activity_field_data
-base_field: id
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: Debrief
-      fields:
-        status:
-          id: status
-          table: oc_activity_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: status
-          plugin_id: field
-          label: 'Publishing status'
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: boolean
-          settings:
-            format: default
-            format_custom_false: ''
-            format_custom_true: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        activity_date_time:
-          id: activity_date_time
-          table: oc_activity_field_data
-          field: activity_date_time
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: activity_date_time
-          plugin_id: field
-          label: Date
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: datetime_default
-          settings:
-            timezone_override: ''
-            format_type: short
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        oc_provider:
-          id: oc_provider
-          table: oc_activity_field_data
-          field: oc_provider
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: oc_provider
-          plugin_id: field
-          label: 'Submitted by'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        view_oc_activity:
-          id: view_oc_activity
-          table: oc_activity
-          field: view_oc_activity
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          plugin_id: entity_link
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: view
-          output_url_as_text: false
-          absolute: false
-        edit_oc_activity:
-          id: edit_oc_activity
-          table: oc_activity
-          field: edit_oc_activity
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          plugin_id: entity_link_edit
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: edit
-          output_url_as_text: false
-          absolute: false
-      pager:
-        type: none
-        options:
-          offset: 0
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: role
-        options:
-          role:
-            authenticated: authenticated
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments:
-        oc_case:
-          id: oc_case
-          table: oc_activity_field_data
-          field: oc_case
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: oc_case
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 2
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        type:
-          id: type
-          table: oc_activity_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: type
-          plugin_id: bundle
-          operator: in
-          value:
-            trainer_debrief: trainer_debrief
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: '{{ status }}'
-          default_row_class: true
-          columns:
-            field_trainer: field_trainer
-            status: status
-            created: created
-            view_oc_activity: view_oc_activity
-            edit_oc_activity: edit_oc_activity
-          default: '-1'
-          info:
-            field_trainer:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            created:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            view_oc_activity:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            edit_oc_activity:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: 'Trainer Debrief'
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        oc_case:
-          id: oc_case
-          table: oc_activity_field_data
-          field: oc_case
-          relationship: none
-          group_type: group
-          admin_label: Case
-          entity_type: oc_activity
-          entity_field: oc_case
-          plugin_id: standard
-          required: true
-      header: {  }
-      footer:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: '<div><a class="button" href="/opencase/oc_activity/add/trainer_debrief?case_id={{ raw_arguments.oc_case }}&destination=/opencase/oc_case/{{ raw_arguments.oc_case }}">Add trainer debrief</a></div>'
-          tokenize: true
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.roles
-      tags: {  }
-  block_1:
-    id: block_1
-    display_title: Block
-    display_plugin: block
-    position: 1
-    display_options:
-      title: 'Trainer Debriefs'
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.roles
-      tags: {  }
diff --git a/config/optional/views.view.equal_opps_records.yml b/config/optional/views.view.equal_opps_records.yml
index 9d8bb61..9cfac80 100644
--- a/config/optional/views.view.equal_opps_records.yml
+++ b/config/optional/views.view.equal_opps_records.yml
@@ -1,4 +1,4 @@
-uuid: 5e83353c-47f2-4856-92b1-477da4dfe937
+uuid: 80abd531-6d56-405e-b51f-b60b207bb26d
 langcode: en
 status: true
 dependencies:
@@ -7,7 +7,8 @@ dependencies:
   module:
     - opencase_entities
     - user
-    - views_autosubmit
+_core:
+  default_config_hash: eYcO9ivZP8SZgdNDXedppm0USNqwvJM7jFy6LOV6tcg
 id: equal_opps_records
 label: 'Equal Opps Records'
 module: views
@@ -93,7 +94,7 @@ display:
         type: mini
         options:
           offset: 0
-          items_per_page: 50
+          items_per_page: 10
           total_pages: null
           id: 0
           tags:
@@ -108,7 +109,7 @@ display:
             offset: false
             offset_label: Offset
       exposed_form:
-        type: autosubmit
+        type: input_required
         options:
           submit_button: Apply
           reset_button: false
@@ -117,7 +118,8 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-          autosubmit_hide: true
+          text_input_required: ''
+          text_input_required_format: basic_html
       access:
         type: perm
         options:
@@ -137,7 +139,7 @@ display:
           empty: true
           content:
             value: 'There is no Equal Opps record by that name. Please check the spelling'
-            format: full_html
+            format: basic_html
           tokenize: false
       sorts: {  }
       arguments: {  }
@@ -293,7 +295,7 @@ display:
         type: normal
         title: 'Equal Opps Records'
         description: ''
-        weight: -43
+        weight: 10
         expanded: false
         menu_name: opencase
         parent: opencase.see_all
diff --git a/config/optional/views.view.evaluation_report.yml b/config/optional/views.view.evaluation_report.yml
deleted file mode 100644
index d280524..0000000
--- a/config/optional/views.view.evaluation_report.yml
+++ /dev/null
@@ -1,1685 +0,0 @@
-uuid: 787d3fa6-9c0f-4f76-a71e-f133db469dc4
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_a
-    - field.storage.oc_activity.field_after_knowledge
-    - field.storage.oc_activity.field_after_skills
-    - field.storage.oc_activity.field_age
-    - field.storage.oc_activity.field_b
-    - field.storage.oc_activity.field_before_confidence
-    - field.storage.oc_activity.field_before_skills
-    - field.storage.oc_activity.field_gender
-    - field.storage.oc_organisation.field_client_type
-    - opencase_entities.oc_activity_type.evaluation
-    - taxonomy.vocabulary.client_types
-    - user.role.gno_admin_user
-  module:
-    - better_exposed_filters
-    - csv_serialization
-    - datetime
-    - opencase_cases
-    - opencase_entities
-    - options
-    - rest
-    - serialization
-    - taxonomy
-    - user
-    - views_data_export
-id: evaluation_report
-label: 'Evaluation report'
-module: views
-description: ''
-tag: ''
-base_table: oc_activity_field_data
-base_field: id
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Evaluation report'
-      fields:
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: oc_case
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: field
-          label: Client
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_client_type:
-          id: field_client_type
-          table: oc_organisation__field_client_type
-          field: field_client_type
-          relationship: client
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Client type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        oc_case:
-          id: oc_case
-          table: oc_activity_field_data
-          field: oc_case
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: oc_case
-          plugin_id: field
-          label: Training
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        created:
-          id: created
-          table: oc_activity_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: created
-          plugin_id: field
-          label: 'Date submitted'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_age:
-          id: field_age
-          table: oc_activity__field_age
-          field: field_age
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Age
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_gender:
-          id: field_gender
-          table: oc_activity__field_gender
-          field: field_gender
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Gender
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_before_skills:
-          id: field_before_skills
-          table: oc_activity__field_before_skills
-          field: field_before_skills
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Before skills'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_after_skills:
-          id: field_after_skills
-          table: oc_activity__field_after_skills
-          field: field_after_skills
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'After skills'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_b:
-          id: field_b
-          table: oc_activity__field_b
-          field: field_b
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Before knowledge'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_after_knowledge:
-          id: field_after_knowledge
-          table: oc_activity__field_after_knowledge
-          field: field_after_knowledge
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'After knowledge'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_before_confidence:
-          id: field_before_confidence
-          table: oc_activity__field_before_confidence
-          field: field_before_confidence
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Before confidence'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_a:
-          id: field_a
-          table: oc_activity__field_a
-          field: field_a
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'After confidence'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: bef
-        options:
-          submit_button: Apply
-          reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-          text_input_required: 'Select any filter and click on Apply to see results'
-          text_input_required_format: full_html
-          bef:
-            general:
-              autosubmit: false
-              autosubmit_exclude_textfield: false
-              autosubmit_textfield_delay: 500
-              autosubmit_hide: false
-              input_required: false
-              allow_secondary: false
-              secondary_label: 'Advanced options'
-              secondary_open: false
-            filter:
-              field_age_value:
-                plugin_id: bef
-                advanced:
-                  sort_options: false
-                  rewrite:
-                    filter_rewrite_values: ''
-                  collapsible: false
-                  is_secondary: false
-                select_all_none: false
-                select_all_none_nested: false
-                display_inline: false
-              field_gender_value:
-                plugin_id: bef
-                advanced:
-                  sort_options: false
-                  rewrite:
-                    filter_rewrite_values: ''
-                  collapsible: false
-                  is_secondary: false
-                select_all_none: false
-                select_all_none_nested: false
-                display_inline: false
-              field_before_confidence_value:
-                plugin_id: bef
-                advanced:
-                  sort_options: false
-                  rewrite:
-                    filter_rewrite_values: ''
-                  collapsible: false
-                  is_secondary: false
-                select_all_none: false
-                select_all_none_nested: false
-                display_inline: false
-              field_a_value:
-                plugin_id: bef
-                advanced:
-                  sort_options: false
-                  rewrite:
-                    filter_rewrite_values: ''
-                  collapsible: false
-                  is_secondary: false
-                select_all_none: false
-                select_all_none_nested: false
-                display_inline: false
-              field_b_value:
-                plugin_id: bef
-                advanced:
-                  sort_options: false
-                  rewrite:
-                    filter_rewrite_values: ''
-                  collapsible: false
-                  is_secondary: false
-                select_all_none: false
-                select_all_none_nested: false
-                display_inline: false
-              field_after_knowledge_value:
-                plugin_id: bef
-                advanced:
-                  sort_options: false
-                  rewrite:
-                    filter_rewrite_values: ''
-                  collapsible: false
-                  is_secondary: false
-                select_all_none: false
-                select_all_none_nested: false
-                display_inline: false
-              field_before_skills_value:
-                plugin_id: bef
-                advanced:
-                  sort_options: false
-                  rewrite:
-                    filter_rewrite_values: ''
-                  collapsible: false
-                  is_secondary: false
-                select_all_none: false
-                select_all_none_nested: false
-                display_inline: false
-              field_after_skills_value:
-                plugin_id: bef
-                advanced:
-                  sort_options: false
-                  rewrite:
-                    filter_rewrite_values: ''
-                  collapsible: false
-                  is_secondary: false
-                select_all_none: false
-                select_all_none_nested: false
-                display_inline: false
-              field_client_type_target_id:
-                plugin_id: bef
-                advanced:
-                  sort_options: false
-                  rewrite:
-                    filter_rewrite_values: ''
-                  collapsible: false
-                  is_secondary: false
-                select_all_none: false
-                select_all_none_nested: false
-                display_inline: false
-              field_accreditation_date_value:
-                plugin_id: default
-                advanced:
-                  collapsible: false
-                  is_secondary: false
-      access:
-        type: role
-        options:
-          role:
-            gno_admin_user: gno_admin_user
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments: {  }
-      filters:
-        type:
-          id: type
-          table: oc_activity_field_data
-          field: type
-          entity_type: oc_activity
-          entity_field: type
-          plugin_id: bundle
-          value:
-            evaluation: evaluation
-          group: 1
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        field_age_value:
-          id: field_age_value
-          table: oc_activity__field_age
-          field: field_age_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: list_field
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_age_value_op
-            label: Age
-            description: ''
-            use_operator: false
-            operator: field_age_value_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_age_value
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-        field_gender_value:
-          id: field_gender_value
-          table: oc_activity__field_gender
-          field: field_gender_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: list_field
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_gender_value_op
-            label: Gender
-            description: ''
-            use_operator: false
-            operator: field_gender_value_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_gender_value
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-        field_before_confidence_value:
-          id: field_before_confidence_value
-          table: oc_activity__field_before_confidence
-          field: field_before_confidence_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: list_field
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_before_confidence_value_op
-            label: 'Before confidence'
-            description: ''
-            use_operator: false
-            operator: field_before_confidence_value_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_before_confidence_value
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-        field_a_value:
-          id: field_a_value
-          table: oc_activity__field_a
-          field: field_a_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: list_field
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_a_value_op
-            label: 'After confidence'
-            description: ''
-            use_operator: false
-            operator: field_a_value_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_a_value
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-        field_b_value:
-          id: field_b_value
-          table: oc_activity__field_b
-          field: field_b_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: list_field
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_b_value_op
-            label: 'Before knowledge'
-            description: ''
-            use_operator: false
-            operator: field_b_value_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_b_value
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-        field_after_knowledge_value:
-          id: field_after_knowledge_value
-          table: oc_activity__field_after_knowledge
-          field: field_after_knowledge_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: list_field
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_after_knowledge_value_op
-            label: 'After knowledge'
-            description: ''
-            use_operator: false
-            operator: field_after_knowledge_value_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_after_knowledge_value
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-        field_before_skills_value:
-          id: field_before_skills_value
-          table: oc_activity__field_before_skills
-          field: field_before_skills_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: list_field
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_before_skills_value_op
-            label: 'Before skills'
-            description: ''
-            use_operator: false
-            operator: field_before_skills_value_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_before_skills_value
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-        field_after_skills_value:
-          id: field_after_skills_value
-          table: oc_activity__field_after_skills
-          field: field_after_skills_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: list_field
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_after_skills_value_op
-            label: 'After skills'
-            description: ''
-            use_operator: false
-            operator: field_after_skills_value_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_after_skills_value
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-        field_client_type_target_id:
-          id: field_client_type_target_id
-          table: oc_organisation__field_client_type
-          field: field_client_type_target_id
-          relationship: client
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_client_type_target_id_op
-            label: 'Client type'
-            description: ''
-            use_operator: false
-            operator: field_client_type_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_client_type_target_id
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: client_types
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-        field_accreditation_date_value:
-          id: field_accreditation_date_value
-          table: oc_organisation__field_accreditation_date
-          field: field_accreditation_date_value
-          relationship: client
-          group_type: group
-          admin_label: ''
-          plugin_id: datetime
-          operator: between
-          value:
-            min: ''
-            max: ''
-            value: ''
-            type: date
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_accreditation_date_value_op
-            label: 'Accreditation date between'
-            description: ''
-            use_operator: false
-            operator: field_accreditation_date_value_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_accreditation_date_value
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            client: client
-            field_client_type: field_client_type
-            oc_case: oc_case
-            created: created
-            field_age: field_age
-            field_gender: field_gender
-            field_before_skills: field_before_skills
-            field_after_skills: field_after_skills
-            field_b: field_b
-            field_after_knowledge: field_after_knowledge
-            field_before_confidence: field_before_confidence
-            field_a: field_a
-          default: '-1'
-          info:
-            client:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_client_type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            oc_case:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            created:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_age:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_gender:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_before_skills:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_after_skills:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_b:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_after_knowledge:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_before_confidence:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_a:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        oc_case:
-          id: oc_case
-          table: oc_activity_field_data
-          field: oc_case
-          relationship: none
-          group_type: group
-          admin_label: Case
-          entity_type: oc_activity
-          entity_field: oc_case
-          plugin_id: standard
-          required: false
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: oc_case
-          group_type: group
-          admin_label: Organisation
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: standard
-          required: false
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_activity.field_a'
-        - 'config:field.storage.oc_activity.field_after_knowledge'
-        - 'config:field.storage.oc_activity.field_after_skills'
-        - 'config:field.storage.oc_activity.field_age'
-        - 'config:field.storage.oc_activity.field_b'
-        - 'config:field.storage.oc_activity.field_before_confidence'
-        - 'config:field.storage.oc_activity.field_before_skills'
-        - 'config:field.storage.oc_activity.field_gender'
-        - 'config:field.storage.oc_organisation.field_client_type'
-  data_export_1:
-    id: data_export_1
-    display_title: 'Data export'
-    display_plugin: data_export
-    position: 2
-    display_options:
-      style:
-        type: data_export
-        options:
-          formats:
-            csv: csv
-          csv_settings:
-            delimiter: ','
-            enclosure: '"'
-            escape_char: \
-            strip_tags: true
-            trim: true
-            encoding: utf8
-            utf8_bom: '0'
-            use_serializer_encode_only: false
-      display_extenders: {  }
-      path: evaluation-report/download
-      filename: '[view:label]-[date:short] '
-      automatic_download: false
-      store_in_public_file_directory: null
-      custom_redirect_path: false
-      redirect_to_display: none
-      include_query_params: false
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - user
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_activity.field_a'
-        - 'config:field.storage.oc_activity.field_after_knowledge'
-        - 'config:field.storage.oc_activity.field_after_skills'
-        - 'config:field.storage.oc_activity.field_age'
-        - 'config:field.storage.oc_activity.field_b'
-        - 'config:field.storage.oc_activity.field_before_confidence'
-        - 'config:field.storage.oc_activity.field_before_skills'
-        - 'config:field.storage.oc_activity.field_gender'
-        - 'config:field.storage.oc_organisation.field_client_type'
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      exposed_block: true
-      display_extenders: {  }
-      path: evaluation-report
-      menu:
-        type: none
-        title: 'Evaluation Report'
-        description: ''
-        weight: 0
-        expanded: false
-        menu_name: opencase
-        parent: opencase.reporting
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_activity.field_a'
-        - 'config:field.storage.oc_activity.field_after_knowledge'
-        - 'config:field.storage.oc_activity.field_after_skills'
-        - 'config:field.storage.oc_activity.field_age'
-        - 'config:field.storage.oc_activity.field_b'
-        - 'config:field.storage.oc_activity.field_before_confidence'
-        - 'config:field.storage.oc_activity.field_before_skills'
-        - 'config:field.storage.oc_activity.field_gender'
-        - 'config:field.storage.oc_organisation.field_client_type'
diff --git a/config/optional/views.view.evaluations.yml b/config/optional/views.view.evaluations.yml
deleted file mode 100644
index 9246f13..0000000
--- a/config/optional/views.view.evaluations.yml
+++ /dev/null
@@ -1,547 +0,0 @@
-uuid: 615c5537-5899-463d-a81f-f693d2d32ea1
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_activity_type.evaluation
-    - user.role.administrator
-    - user.role.gno_admin_user
-  module:
-    - datetime
-    - opencase_cases
-    - opencase_entities
-    - user
-_core:
-  default_config_hash: qZu_1v2SecbmCYiKUxUcLjzjqmpQ_DltQ1409nzcMA0
-id: evaluations
-label: Evaluations
-module: views
-description: ''
-tag: ''
-base_table: oc_activity_field_data
-base_field: id
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      fields:
-        name:
-          id: name
-          table: oc_activity_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-          label: Subject
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        activity_date_time:
-          id: activity_date_time
-          table: oc_activity_field_data
-          field: activity_date_time
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: activity_date_time
-          plugin_id: field
-          label: Date
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: datetime_default
-          settings:
-            timezone_override: ''
-            format_type: short
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        status:
-          id: status
-          table: oc_activity_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: status
-          plugin_id: field
-          label: 'Publishing status'
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: boolean
-          settings:
-            format: default
-            format_custom_false: ''
-            format_custom_true: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        view_oc_activity:
-          id: view_oc_activity
-          table: oc_activity
-          field: view_oc_activity
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          plugin_id: entity_link
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: view
-          output_url_as_text: false
-          absolute: false
-        edit_oc_activity:
-          id: edit_oc_activity
-          table: oc_activity
-          field: edit_oc_activity
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          plugin_id: entity_link_edit
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: edit
-          output_url_as_text: false
-          absolute: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: role
-        options:
-          role:
-            administrator: administrator
-            gno_admin_user: gno_admin_user
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments:
-        oc_case:
-          id: oc_case
-          table: oc_activity_field_data
-          field: oc_case
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: oc_case
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 2
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        type:
-          id: type
-          table: oc_activity_field_data
-          field: type
-          entity_type: oc_activity
-          entity_field: type
-          plugin_id: bundle
-          value:
-            evaluation: evaluation
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: '{{ status }}'
-          default_row_class: true
-          columns:
-            name: name
-            activity_date_time: activity_date_time
-            status: status
-            view_oc_activity: view_oc_activity
-            edit_oc_activity: edit_oc_activity
-          default: '-1'
-          info:
-            name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            activity_date_time:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            view_oc_activity:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            edit_oc_activity:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        oc_case:
-          id: oc_case
-          table: oc_activity_field_data
-          field: oc_case
-          relationship: none
-          group_type: group
-          admin_label: Case
-          entity_type: oc_activity
-          entity_field: oc_case
-          plugin_id: standard
-          required: true
-      header: {  }
-      footer:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: "<a class=\"button\" href=\"/opencase/oc_activity/add/evaluation?case_id={{ raw_arguments.oc_case }}&destination=/opencase/oc_case/{{ raw_arguments.oc_case }}\">Add evaluation</a>\r\n<br />"
-          tokenize: true
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags: {  }
-  block_1:
-    id: block_1
-    display_title: Block
-    display_plugin: block
-    position: 1
-    display_options:
-      title: Evaluations
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags: {  }
diff --git a/config/optional/views.view.fees.yml b/config/optional/views.view.fees.yml
deleted file mode 100644
index 4428b29..0000000
--- a/config/optional/views.view.fees.yml
+++ /dev/null
@@ -1,436 +0,0 @@
-uuid: d8b6df6a-dd6f-41b8-af27-b02fdb15ea8e
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.authenticated
-  module:
-    - opencase_cases
-    - user
-id: fees
-label: Fees
-module: views
-description: ''
-tag: ''
-base_table: oc_case_fee_field_data
-base_field: id
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: Fees
-      fields:
-        name:
-          id: name
-          table: oc_case_fee_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        amount:
-          id: amount
-          table: oc_case_fee_field_data
-          field: amount
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case_fee
-          entity_field: amount
-          plugin_id: field
-          label: Amount
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_decimal
-          settings:
-            thousand_separator: ','
-            decimal_separator: .
-            scale: 2
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        oc_fee_category:
-          id: oc_fee_category
-          table: oc_case_fee_field_data
-          field: oc_fee_category
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case_fee
-          entity_field: oc_fee_category
-          plugin_id: field
-          label: 'Fee Category'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        edit_oc_case_fee:
-          id: edit_oc_case_fee
-          table: oc_case_fee
-          field: edit_oc_case_fee
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case_fee
-          plugin_id: entity_link_edit
-          label: Edit
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: edit
-          output_url_as_text: false
-          absolute: false
-      pager:
-        type: some
-        options:
-          offset: 0
-          items_per_page: 5
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: role
-        options:
-          role:
-            authenticated: authenticated
-      cache:
-        type: tag
-        options: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: "Fees will appear here once they are added.\r\n"
-          tokenize: false
-      sorts: {  }
-      arguments:
-        oc_case:
-          id: oc_case
-          table: oc_case_fee_field_data
-          field: oc_case
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case_fee
-          entity_field: oc_case
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 2
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        status:
-          id: status
-          table: oc_case_fee_field_data
-          field: status
-          entity_type: oc_case_fee
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            name: name
-          default: '-1'
-          info:
-            name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: 'entity:oc_case_fee'
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: '<a class="button" href="/opencase/oc_case_fee/add/project_fee?case_id={{ raw_arguments.oc_case }}&destination=/opencase/oc_case/{{ raw_arguments.oc_case }}">Add fee</a><br /><br />'
-          tokenize: true
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.roles
-      tags: {  }
-  block_1:
-    id: block_1
-    display_title: Block
-    display_plugin: block
-    position: 1
-    display_options:
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.roles
-      tags: {  }
diff --git a/config/optional/views.view.files.yml b/config/optional/views.view.files.yml
index 1dbaad8..577c12a 100644
--- a/config/optional/views.view.files.yml
+++ b/config/optional/views.view.files.yml
@@ -1,4 +1,4 @@
-uuid: d1164e2c-0b31-4a36-8183-49b1f04d5fd7
+uuid: 0d0f0b6a-4f12-4503-b04b-b8e8dff67ec8
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     - file
     - user
 _core:
-  default_config_hash: gLmoA0yjvlXfMRp9ihOhRKSSQQlbdLdvpDkbVwkYPrg
+  default_config_hash: DaGeEDJMcbbQtgV96AuPeZ-0irMc_Oa6Zzh2U3Kmul8
 id: files
 label: Files
 module: file
@@ -17,7 +17,7 @@ base_field: fid
 display:
   default:
     id: default
-    display_title: Master
+    display_title: Default
     display_plugin: default
     position: 0
     display_options:
diff --git a/config/optional/views.view.frontpage.yml b/config/optional/views.view.frontpage.yml
index aed03c4..b60a36f 100644
--- a/config/optional/views.view.frontpage.yml
+++ b/config/optional/views.view.frontpage.yml
@@ -1,4 +1,4 @@
-uuid: 87cdc89f-5d1e-4ad8-a27b-5cd4e29ca3f0
+uuid: 3a585de8-8973-43e4-83f9-33a929a7376e
 langcode: en
 status: true
 dependencies:
@@ -9,7 +9,7 @@ dependencies:
     - node
     - user
 _core:
-  default_config_hash: Xk6puCoRlHSJG8mU9Zg2iN4fbnzaw2dFolwMfpWxDSE
+  default_config_hash: XEFoA1ECJzKZN4VpnDqqRQO-oltuYdmjjvGEYDKs8uU
 id: frontpage
 label: Frontpage
 module: node
@@ -20,7 +20,7 @@ base_field: nid
 display:
   default:
     id: default
-    display_title: Master
+    display_title: Default
     display_plugin: default
     position: 0
     display_options:
diff --git a/config/optional/views.view.glossary.yml b/config/optional/views.view.glossary.yml
index 82cd558..254b507 100644
--- a/config/optional/views.view.glossary.yml
+++ b/config/optional/views.view.glossary.yml
@@ -1,4 +1,4 @@
-uuid: 238e9002-45de-46c4-a594-8f9560081414
+uuid: 14bae0ea-9afd-46df-9f14-5107bc4cb80b
 langcode: en
 status: false
 dependencies:
@@ -8,7 +8,7 @@ dependencies:
     - node
     - user
 _core:
-  default_config_hash: Z1Lg95xnf11BTHIugkzple_pdxZdECiqLRcrLVo3bcw
+  default_config_hash: sz_FoMz5aClG4jFy4UDlkenXQtgTUXohEDjWVBuHaro
 id: glossary
 label: Glossary
 module: node
@@ -19,7 +19,7 @@ base_field: nid
 display:
   default:
     id: default
-    display_title: Master
+    display_title: Default
     display_plugin: default
     position: 0
     display_options:
@@ -255,6 +255,19 @@ display:
           transform_dash: false
           break_phrase: false
       filters:
+        status:
+          id: status
+          table: node_field_data
+          field: status
+          entity_type: node
+          entity_field: status
+          plugin_id: boolean
+          value: '1'
+          group: 1
+          expose:
+            operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
         langcode:
           id: langcode
           table: node_field_data
@@ -297,19 +310,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          entity_type: node
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
       style:
         type: table
         options:
diff --git a/config/optional/views.view.feeds_feed.yml b/config/optional/views.view.name_and_status_changes.yml
similarity index 69%
rename from config/optional/views.view.feeds_feed.yml
rename to config/optional/views.view.name_and_status_changes.yml
index c036bab..92e9365 100644
--- a/config/optional/views.view.feeds_feed.yml
+++ b/config/optional/views.view.name_and_status_changes.yml
@@ -1,21 +1,21 @@
-uuid: 6b047e2d-1057-4786-9ad8-179a87ed80be
+uuid: b1b1aa4e-b423-4136-9457-1fb9ae53c234
 langcode: en
 status: true
 dependencies:
   config:
-    - system.menu.admin
+    - field.storage.oc_actor.field_asylum_status
+    - field.storage.oc_actor.field_marital_
   module:
-    - feeds
+    - opencase_entities
+    - options
     - user
-_core:
-  default_config_hash: qEFCGJZmfPO8q5G05QiqwLQcMxrQ7PaLQMmF3nt3iMY
-id: feeds_feed
-label: Feeds
+id: name_and_status_changes
+label: 'Name and Status Changes'
 module: views
 description: ''
 tag: ''
-base_table: feeds_feed
-base_field: fid
+base_table: oc_actor_field_revision
+base_field: vid
 display:
   default:
     id: default
@@ -23,22 +23,23 @@ display:
     display_plugin: default
     position: 0
     display_options:
-      title: Feeds
+      title: 'Name, Asylum and Marital Status Report'
       fields:
-        feeds_feed_bulk_form:
-          id: feeds_feed_bulk_form
-          table: feeds_feed
-          field: feeds_feed_bulk_form
+        revision_created:
+          id: revision_created
+          table: oc_actor_revision
+          field: revision_created
           relationship: none
-          group_type: group
+          group_type: min
           admin_label: ''
-          entity_type: feeds_feed
-          plugin_id: bulk_form
-          label: 'Bulk update'
+          entity_type: oc_actor
+          entity_field: revision_created
+          plugin_id: field
+          label: 'Date changed'
           exclude: false
           alter:
-            alter_text: false
-            text: ''
+            alter_text: true
+            text: '{{ revision_created | date(''d/m/Y'') }}'
             make_link: false
             path: ''
             absolute: false
@@ -75,20 +76,37 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          action_title: 'With selection'
-          include_exclude: exclude
-          selected_actions: {  }
-        title:
-          id: title
-          table: feeds_feed
-          field: title
+          click_sort_column: value
+          type: timestamp
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ''
+          field_api_classes: false
+          set_precision: false
+          precision: 0
+          decimal: .
+          format_plural: 0
+          format_plural_string: !!binary MQNAY291bnQ=
+          prefix: ''
+          suffix: ''
+        first_name:
+          id: first_name
+          table: oc_actor_field_revision
+          field: first_name
           relationship: none
           group_type: group
           admin_label: ''
-          entity_type: null
-          entity_field: title
+          entity_type: oc_actor
+          entity_field: first_name
           plugin_id: field
-          label: Title
+          label: 'First Name'
           exclude: false
           alter:
             alter_text: false
@@ -132,7 +150,7 @@ display:
           click_sort_column: value
           type: string
           settings:
-            link_to_entity: true
+            link_to_entity: false
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -143,82 +161,17 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        type:
-          id: type
-          table: feeds_feed
-          field: type
+        middle_names:
+          id: middle_names
+          table: oc_actor_field_revision
+          field: middle_names
           relationship: none
           group_type: group
           admin_label: ''
-          entity_type: feeds_feed
-          entity_field: type
+          entity_type: oc_actor
+          entity_field: middle_names
           plugin_id: field
-          label: Type
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        name:
-          id: name
-          table: users_field_data
-          field: name
-          relationship: uid
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: name
-          plugin_id: field
-          label: Author
+          label: 'Middle Names'
           exclude: false
           alter:
             alter_text: false
@@ -260,9 +213,9 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: value
-          type: user_name
+          type: string
           settings:
-            link_to_entity: true
+            link_to_entity: false
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -273,17 +226,17 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        changed:
-          id: changed
-          table: feeds_feed
-          field: changed
+        last_name:
+          id: last_name
+          table: oc_actor_field_revision
+          field: last_name
           relationship: none
           group_type: group
           admin_label: ''
-          entity_type: feeds_feed
-          entity_field: changed
+          entity_type: oc_actor
+          entity_field: last_name
           plugin_id: field
-          label: Updated
+          label: 'Last Name'
           exclude: false
           alter:
             alter_text: false
@@ -325,11 +278,9 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: value
-          type: timestamp
+          type: string
           settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
+            link_to_entity: false
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -340,17 +291,15 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        imported:
-          id: imported
-          table: feeds_feed
-          field: imported
+        field_asylum_status-revision_id:
+          id: field_asylum_status-revision_id
+          table: oc_actor_revision__field_asylum_status
+          field: field_asylum_status-revision_id
           relationship: none
           group_type: group
           admin_label: ''
-          entity_type: feeds_feed
-          entity_field: imported
           plugin_id: field
-          label: Imported
+          label: 'Asylum status'
           exclude: false
           alter:
             alter_text: false
@@ -392,11 +341,8 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
+          type: list_default
+          settings: {  }
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -407,16 +353,15 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        operations:
-          id: operations
-          table: feeds_feed
-          field: operations
+        field_marital_-revision_id:
+          id: field_marital_-revision_id
+          table: oc_actor_revision__field_marital_
+          field: field_marital_-revision_id
           relationship: none
           group_type: group
           admin_label: ''
-          entity_type: feeds_feed
-          plugin_id: entity_operations
-          label: Operations
+          plugin_id: field
+          label: 'Marital status'
           exclude: false
           alter:
             alter_text: false
@@ -457,104 +402,148 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          destination: true
+          click_sort_column: value
+          type: list_default
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        view_oc_actor:
+          id: view_oc_actor
+          table: oc_actor_field_revision
+          field: view_oc_actor
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_actor
+          plugin_id: entity_link
+          label: ''
+          exclude: true
+          alter:
+            alter_text: true
+            text: 'View current record for this person &#9660;'
+            make_link: true
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          text: 'See "rewrite results" (had to do it that way because contains HTML).'
+          output_url_as_text: false
+          absolute: false
       pager:
-        type: full
+        type: none
         options:
           offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: 'next ›'
-            previous: '‹ previous'
-            first: '« first'
-            last: 'last »'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          quantity: 9
       exposed_form:
         type: basic
         options:
-          submit_button: Apply
+          submit_button: Go
           reset_button: false
           reset_button_label: Reset
           exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
+          expose_sort_order: false
           sort_asc_label: Asc
           sort_desc_label: Desc
       access:
         type: perm
         options:
-          perm: 'access feed overview'
+          perm: 'view published case entities'
       cache:
-        type: none
+        type: tag
         options: {  }
-      empty:
-        result:
-          id: result
-          table: views
-          field: result
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: result
-          empty: true
-          content: 'There are no feeds yet.'
+      empty: {  }
       sorts:
-        changed:
-          id: changed
-          table: feeds_feed
-          field: changed
+        revision_created:
+          id: revision_created
+          table: oc_actor_revision
+          field: revision_created
           relationship: none
-          group_type: group
+          group_type: min
           admin_label: ''
-          entity_type: feeds_feed
-          entity_field: changed
+          entity_type: oc_actor
+          entity_field: revision_created
           plugin_id: date
-          order: DESC
+          order: ASC
           expose:
             label: ''
-            field_identifier: changed
+            field_identifier: revision_created
           exposed: false
           granularity: second
       arguments: {  }
       filters:
-        title:
-          id: title
-          table: feeds_feed
-          field: title
+        first_name:
+          id: first_name
+          table: oc_actor_field_revision
+          field: first_name
           relationship: none
           group_type: group
           admin_label: ''
-          entity_type: feeds_feed
-          entity_field: title
+          entity_type: oc_actor
+          entity_field: first_name
           plugin_id: string
-          operator: contains
+          operator: starts
           value: ''
           group: 1
           exposed: true
           expose:
-            operator_id: title_op
-            label: Title
+            operator_id: first_name_op
+            label: 'First Name'
             description: ''
             use_operator: false
-            operator: title_op
+            operator: first_name_op
             operator_limit_selection: false
             operator_list: {  }
-            identifier: title
+            identifier: first_name
             required: false
             remember: false
             multiple: false
             remember_roles:
               authenticated: authenticated
               anonymous: '0'
+              administrator: '0'
+              overseer: '0'
+              caseworker: '0'
+              volunteer_co_ord: '0'
+              opencase_admin: '0'
+            placeholder: ''
           is_grouped: false
           group_info:
             label: ''
@@ -567,36 +556,41 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-        type:
-          id: type
-          table: feeds_feed
-          field: type
+        last_name:
+          id: last_name
+          table: oc_actor_field_revision
+          field: last_name
           relationship: none
           group_type: group
           admin_label: ''
-          entity_type: feeds_feed
-          entity_field: type
-          plugin_id: bundle
-          operator: in
-          value: {  }
+          entity_type: oc_actor
+          entity_field: last_name
+          plugin_id: string
+          operator: starts
+          value: ''
           group: 1
           exposed: true
           expose:
-            operator_id: type_op
-            label: Type
+            operator_id: last_name_op
+            label: 'Last Name'
             description: ''
             use_operator: false
-            operator: type_op
+            operator: last_name_op
             operator_limit_selection: false
             operator_list: {  }
-            identifier: type
+            identifier: last_name
             required: false
             remember: false
             multiple: false
             remember_roles:
               authenticated: authenticated
               anonymous: '0'
-            reduce: false
+              administrator: '0'
+              overseer: '0'
+              caseworker: '0'
+              volunteer_co_ord: '0'
+              opencase_admin: '0'
+            placeholder: ''
           is_grouped: false
           group_info:
             label: ''
@@ -609,67 +603,71 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
       style:
         type: table
         options:
-          grouping: {  }
+          grouping:
+            -
+              field: view_oc_actor
+              rendered: true
+              rendered_strip: false
           row_class: ''
           default_row_class: true
           columns:
-            feeds_feed_bulk_form: feeds_feed_bulk_form
-            title: title
-            type: type
-            name: name
-            changed: changed
-            imported: imported
-            operations: operations
+            first_name: first_name
+            middle_names: middle_names
+            last_name: last_name
+            field_asylum_status-revision_id: field_asylum_status-revision_id
+            field_marital_-revision_id: field_marital_-revision_id
+            view_oc_actor: view_oc_actor
+            revision_created: revision_created
           default: '-1'
           info:
-            feeds_feed_bulk_form:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            title:
-              sortable: true
+            first_name:
+              sortable: false
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
-            type:
-              sortable: true
+            middle_names:
+              sortable: false
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
-            name:
-              sortable: true
+            last_name:
+              sortable: false
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
-            changed:
-              sortable: true
+            field_asylum_status-revision_id:
+              sortable: false
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
-            imported:
-              sortable: true
+            field_marital_-revision_id:
+              sortable: false
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
-            operations:
+            view_oc_actor:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            revision_created:
+              sortable: false
+              default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
@@ -677,11 +675,16 @@ display:
           override: true
           sticky: false
           summary: ''
-          empty_table: true
+          empty_table: false
           caption: ''
           description: ''
       row:
         type: fields
+        options:
+          default_field_elements: true
+          inline: {  }
+          separator: ''
+          hide_empty: false
       query:
         type: views_query
         options:
@@ -690,53 +693,38 @@ display:
           distinct: false
           replica: false
           query_tags: {  }
-      relationships:
-        uid:
-          id: uid
-          table: feeds_feed
-          field: uid
-          relationship: none
-          group_type: group
-          admin_label: Author
-          entity_type: feeds_feed
-          entity_field: uid
-          plugin_id: standard
-          required: false
+      relationships: {  }
+      use_ajax: true
+      group_by: true
       header: {  }
       footer: {  }
       display_extenders: {  }
     cache_metadata:
-      max-age: 0
+      max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
-        - url.query_args
         - user.permissions
-      tags: {  }
+      tags:
+        - 'config:field.storage.oc_actor.field_asylum_status'
+        - 'config:field.storage.oc_actor.field_marital_'
   page_1:
     id: page_1
     display_title: Page
     display_plugin: page
     position: 1
     display_options:
-      display_extenders: {  }
-      path: admin/content/feed
-      menu:
-        type: normal
-        title: Feeds
-        description: ''
-        weight: 0
-        expanded: false
-        menu_name: admin
-        parent: system.admin_content
-        context: '0'
+      display_extenders:
+        library_in_views_display_extender: {  }
+      path: opencase/reporting/name_and_status_changes
     cache_metadata:
-      max-age: 0
+      max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
-        - url.query_args
         - user.permissions
-      tags: {  }
+      tags:
+        - 'config:field.storage.oc_actor.field_asylum_status'
+        - 'config:field.storage.oc_actor.field_marital_'
diff --git a/config/optional/views.view.organisation_relations.yml b/config/optional/views.view.organisation_relations.yml
deleted file mode 100644
index 23e8446..0000000
--- a/config/optional/views.view.organisation_relations.yml
+++ /dev/null
@@ -1,287 +0,0 @@
-uuid: ffbb03c6-1a52-4116-9e5e-44c5db190a20
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase
-    - opencase_entities
-    - user
-id: organisation_relations
-label: 'Organisation Relations'
-module: views
-description: ''
-tag: ''
-base_table: oc_organisation_relation
-base_field: id
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Organisation Relations'
-      fields:
-        organisations_target_id:
-          id: organisations_target_id
-          table: oc_organisation_relation__organisations
-          field: organisations_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation_relation
-          entity_field: organisations
-          plugin_id: field
-          label: 'Linked client'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_current_target_excluder
-          settings:
-            link: 1
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 2
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        delete_oc_organisation_relation:
-          id: delete_oc_organisation_relation
-          table: oc_organisation_relation
-          field: delete_oc_organisation_relation
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation_relation
-          plugin_id: entity_link_delete
-          label: Delete
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: delete
-          output_url_as_text: false
-          absolute: false
-      pager:
-        type: full
-        options:
-          offset: 0
-          items_per_page: 10
-          total_pages: null
-          id: 0
-          tags:
-            next: 'Next ›'
-            previous: '‹ Previous'
-            first: '« First'
-            last: 'Last »'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          quantity: 9
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'use opencase'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments:
-        organisations_target_id:
-          id: organisations_target_id
-          table: oc_organisation_relation__organisations
-          field: organisations_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation_relation
-          entity_field: organisations
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 2
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        status:
-          id: status
-          table: oc_organisation_relation
-          field: status
-          entity_type: oc_organisation_relation
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: table
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: '<a class="button" href="/opencase/oc_organisation_relation/add/link_between_clients?organisation_id={{ raw_arguments.organisations_target_id }}&destination=/opencase/oc_organisation/{{ raw_arguments.organisations_target_id }}">Add linked client</a>'
-          tokenize: true
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags: {  }
-  block_1:
-    id: block_1
-    display_title: Block
-    display_plugin: block
-    position: 1
-    display_options:
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags: {  }
diff --git a/config/optional/views.view.organisations.yml b/config/optional/views.view.organisations.yml
index 0997dd1..dfa18c6 100644
--- a/config/optional/views.view.organisations.yml
+++ b/config/optional/views.view.organisations.yml
@@ -1,4 +1,4 @@
-uuid: a0a32301-1ab4-46e5-8fc0-e0060e36d3e8
+uuid: 91879a90-88f1-4e91-b010-819cadad081a
 langcode: en
 status: true
 dependencies:
@@ -143,7 +143,7 @@ display:
             title_enable: false
             title: All
           title_enable: true
-          title: '{{ arguments.type }}'
+          title: '{{ arguments.type }}s'
           default_argument_type: raw
           default_argument_options:
             index: 1
@@ -165,7 +165,7 @@ display:
           validate_options: {  }
           glossary: false
           limit: 0
-          case: none
+          case: ucfirst
           path_case: none
           transform_dash: false
           break_phrase: false
diff --git a/config/optional/views.view.projects.yml b/config/optional/views.view.projects.yml
deleted file mode 100644
index 2ab5bab..0000000
--- a/config/optional/views.view.projects.yml
+++ /dev/null
@@ -1,813 +0,0 @@
-uuid: d6279582-2817-4fc5-8da1-7aef408ac19f
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_contract_signed_date
-    - opencase_cases.oc_case_type.project
-    - system.menu.opencase
-    - user.role.administrator
-    - user.role.gno_admin_user
-  module:
-    - datetime
-    - opencase_cases
-    - user
-id: projects
-label: Projects
-module: views
-description: ''
-tag: ''
-base_table: oc_case_field_data
-base_field: id
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: Projects
-      fields:
-        name:
-          id: name
-          table: oc_case_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-          label: Title
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: field
-          label: Client
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_contract_signed_date:
-          id: field_contract_signed_date
-          table: oc_case__field_contract_signed_date
-          field: field_contract_signed_date
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Contract signed date'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: datetime_default
-          settings:
-            timezone_override: ''
-            format_type: short
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        total_fee:
-          id: total_fee
-          table: oc_case_field_data
-          field: total_fee
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: total_fee
-          plugin_id: field
-          label: 'Total Fee'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_decimal
-          settings:
-            thousand_separator: ''
-            decimal_separator: .
-            scale: 2
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: role
-        options:
-          role:
-            administrator: administrator
-            gno_admin_user: gno_admin_user
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments: {  }
-      filters:
-        type:
-          id: type
-          table: oc_case_field_data
-          field: type
-          entity_type: oc_case
-          entity_field: type
-          plugin_id: bundle
-          value:
-            project: project
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: table
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case.field_contract_signed_date'
-  block_1:
-    id: block_1
-    display_title: Block
-    display_plugin: block
-    position: 2
-    display_options:
-      fields:
-        name:
-          id: name
-          table: oc_case_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-          label: Title
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_contract_signed_date:
-          id: field_contract_signed_date
-          table: oc_case__field_contract_signed_date
-          field: field_contract_signed_date
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Contract signed date'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: datetime_default
-          settings:
-            timezone_override: ''
-            format_type: short
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_total_fee:
-          id: field_total_fee
-          table: oc_case__field_total_fee
-          field: field_total_fee
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Total fee'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_decimal
-          settings:
-            thousand_separator: ''
-            decimal_separator: .
-            scale: 2
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      arguments:
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 2
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      defaults:
-        fields: false
-        arguments: false
-        footer: false
-      footer:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: '<a class="button" href="/opencase/oc_case/add/project?client_id={{ raw_arguments.client }}&destination=/opencase/oc_organisation/{{ raw_arguments.client }}">Add project</a><br /><br />'
-          tokenize: true
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case.field_contract_signed_date'
-  entity_reference_1:
-    id: entity_reference_1
-    display_title: 'Entity Reference'
-    display_plugin: entity_reference
-    position: 3
-    display_options:
-      fields:
-        name:
-          id: name
-          table: oc_case_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      filters:
-        type:
-          id: type
-          table: oc_case_field_data
-          field: type
-          entity_type: oc_case
-          entity_field: type
-          plugin_id: bundle
-          value:
-            project: project
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        status:
-          id: status
-          table: oc_case_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: status
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: entity_reference
-        options:
-          search_fields:
-            name: name
-      defaults:
-        fields: false
-        filters: false
-        filter_groups: false
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user.roles
-      tags: {  }
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      defaults:
-        footer: false
-      footer: {  }
-      display_extenders: {  }
-      path: opencase/projects
-      menu:
-        type: normal
-        title: Projects
-        description: ''
-        weight: 10
-        expanded: false
-        menu_name: opencase
-        parent: opencase.see_all
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case.field_contract_signed_date'
diff --git a/config/optional/views.view.partner_organisations.yml b/config/optional/views.view.sample_downloadable_report.yml
similarity index 54%
rename from config/optional/views.view.partner_organisations.yml
rename to config/optional/views.view.sample_downloadable_report.yml
index b0bfdca..f572ad8 100644
--- a/config/optional/views.view.partner_organisations.yml
+++ b/config/optional/views.view.sample_downloadable_report.yml
@@ -1,34 +1,36 @@
-uuid: 26f1d504-2640-45fb-a62c-58f8a6b1456f
+uuid: 0c812021-ff90-442b-a7a0-353d538d6e15
 langcode: en
 status: true
 dependencies:
   config:
-    - opencase_entities.oc_organisation_type.partner_organisation
     - system.menu.opencase
-    - user.role.administrator
-    - user.role.gno_admin_user
+    - user.role.authenticated
   module:
+    - csv_serialization
     - opencase_entities
+    - rest
+    - serialization
     - user
-id: partner_organisations
-label: 'Partner Organisations'
+    - views_data_export
+id: sample_downloadable_report
+label: 'Sample Downloadable Report'
 module: views
 description: ''
 tag: ''
-base_table: oc_organisation_field_data
+base_table: oc_actor_field_data
 base_field: id
 display:
   default:
     id: default
-    display_title: Master
+    display_title: Default
     display_plugin: default
     position: 0
     display_options:
-      title: 'Partner Organisations'
+      title: 'Sample Report'
       fields:
         name:
           id: name
-          table: oc_organisation_field_data
+          table: oc_actor_field_data
           field: name
           relationship: none
           group_type: group
@@ -79,75 +81,7 @@ display:
           hide_alter_empty: true
           click_sort_column: value
           type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        status:
-          id: status
-          table: oc_organisation_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation
-          entity_field: status
-          plugin_id: field
-          label: Published
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: boolean
-          settings:
-            format: default
-            format_custom_false: ''
-            format_custom_true: ''
+          settings: {  }
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -162,7 +96,7 @@ display:
         type: mini
         options:
           offset: 0
-          items_per_page: 50
+          items_per_page: 10
           total_pages: null
           id: 0
           tags:
@@ -190,8 +124,7 @@ display:
         type: role
         options:
           role:
-            administrator: administrator
-            gno_admin_user: gno_admin_user
+            authenticated: authenticated
       cache:
         type: tag
         options: {  }
@@ -199,49 +132,56 @@ display:
       sorts: {  }
       arguments: {  }
       filters:
-        type:
-          id: type
-          table: oc_organisation_field_data
-          field: type
-          entity_type: oc_organisation
-          entity_field: type
-          plugin_id: bundle
-          value:
-            partner_organisation: partner_organisation
+        first_name:
+          id: first_name
+          table: oc_actor_field_data
+          field: first_name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_actor
+          entity_field: first_name
+          plugin_id: string
+          operator: starts
+          value: ''
+          group: 1
+          exposed: true
           expose:
+            operator_id: first_name_op
+            label: 'First Name'
+            description: ''
+            use_operator: false
+            operator: first_name_op
             operator_limit_selection: false
             operator_list: {  }
+            identifier: first_name
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              content_editor: '0'
+              administrator: '0'
+              overseer: '0'
+              caseworker: '0'
+              volunteer_co_ord: '0'
+              opencase_admin: '0'
+            placeholder: ''
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
       style:
         type: table
-        options:
-          grouping: {  }
-          row_class: '{{ status }}'
-          default_row_class: true
-          columns:
-            name: name
-            status: status
-          default: '-1'
-          info:
-            name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
       row:
         type: fields
       query:
@@ -261,9 +201,50 @@ display:
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
+        - url
         - url.query_args
         - user.roles
       tags: {  }
+  data_export_1:
+    id: data_export_1
+    display_title: 'Data export'
+    display_plugin: data_export
+    position: 2
+    display_options:
+      style:
+        type: data_export
+        options:
+          formats:
+            csv: csv
+          csv_settings:
+            delimiter: ','
+            enclosure: '"'
+            escape_char: \
+            strip_tags: true
+            trim: true
+            encoding: utf8
+            utf8_bom: '0'
+            use_serializer_encode_only: false
+      display_extenders: {  }
+      path: sample-downloadable-report/download
+      displays:
+        page_1: page_1
+        default: '0'
+      filename: ''
+      automatic_download: false
+      store_in_public_file_directory: null
+      custom_redirect_path: false
+      redirect_to_display: none
+      include_query_params: false
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - request_format
+        - url
+        - user.roles
+      tags: {  }
   page_1:
     id: page_1
     display_title: Page
@@ -271,21 +252,22 @@ display:
     position: 1
     display_options:
       display_extenders: {  }
-      path: partner-organisations
+      path: sample-downloadable-report
       menu:
         type: normal
-        title: 'Partner Organisations'
+        title: 'Sample downloadable report'
         description: ''
-        weight: -44
+        weight: 0
         expanded: false
         menu_name: opencase
-        parent: opencase.see_all
+        parent: opencase.reporting
         context: '0'
     cache_metadata:
       max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
+        - url
         - url.query_args
         - user.roles
       tags: {  }
diff --git a/config/optional/views.view.search_content.yml b/config/optional/views.view.search_content.yml
new file mode 100644
index 0000000..ef23a91
--- /dev/null
+++ b/config/optional/views.view.search_content.yml
@@ -0,0 +1,168 @@
+uuid: 82ba3633-76c3-464e-b8c3-bfcf30309f81
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.default_index
+    - user.role.authenticated
+  module:
+    - search_api
+    - user
+_core:
+  default_config_hash: EeNNkLARDmftWehrk-ew_OW8srW2RgDKI1mZrWxZ-ao
+id: search_content
+label: 'Search content'
+module: views
+description: 'A search page preconfigured to search through the content of your site'
+tag: ''
+base_table: search_api_index_default_index
+base_field: search_api_id
+display:
+  default:
+    id: default
+    display_title: Master
+    display_plugin: default
+    position: 0
+    display_options:
+      title: 'Search Content'
+      pager:
+        type: mini
+        options:
+          offset: 0
+          items_per_page: 10
+          total_pages: null
+          id: 0
+          tags:
+            next: 'next ›'
+            previous: '‹ previous'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+      exposed_form:
+        type: input_required
+        options:
+          submit_button: Search
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+          text_input_required: 'Please enter some keywords to search.'
+          text_input_required_format: basic_html
+      access:
+        type: role
+        options:
+          role:
+            authenticated: authenticated
+      cache:
+        type: none
+        options: {  }
+      empty: {  }
+      sorts: {  }
+      arguments: {  }
+      filters:
+        search_api_fulltext:
+          id: search_api_fulltext
+          table: search_api_index_default_index
+          field: search_api_fulltext
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: search_api_fulltext
+          operator: and
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: search_op
+            label: Search
+            description: ''
+            use_operator: false
+            operator: search_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: keys
+            required: true
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          parse_mode: terms
+          min_length: 3
+          fields: {  }
+      style:
+        type: default
+      row:
+        type: search_api
+        options:
+          view_modes:
+            'entity:node':
+              article: search_result
+              page: search_result
+      query:
+        type: search_api_query
+        options: {  }
+      relationships: {  }
+      header:
+        result:
+          id: result
+          table: views
+          field: result
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: result
+          empty: false
+          content: 'Displaying results @start - @end of @total'
+      footer: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.roles
+      tags:
+        - 'config:search_api.index.default_index'
+      cacheable: false
+  page_1:
+    id: page_1
+    display_title: Page
+    display_plugin: page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: search/content
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.roles
+      tags:
+        - 'config:search_api.index.default_index'
+      cacheable: false
diff --git a/config/optional/views.view.taxonomy_term.yml b/config/optional/views.view.taxonomy_term.yml
index becfc9a..257ecb4 100644
--- a/config/optional/views.view.taxonomy_term.yml
+++ b/config/optional/views.view.taxonomy_term.yml
@@ -1,4 +1,4 @@
-uuid: 524072d4-848b-46f4-aefe-37a7a1686a3e
+uuid: 561561b1-1083-4259-a9aa-a640041595e1
 langcode: en
 status: true
 dependencies:
@@ -9,7 +9,7 @@ dependencies:
     - taxonomy
     - user
 _core:
-  default_config_hash: uvMAn5Qf8Uni989mhr5KY4hx66xkSpP8nFYZMHgj7kY
+  default_config_hash: YKgw0f77GEmCu6_6Om9Mbig0mON9JdfVuMxTtd0WQaI
 id: taxonomy_term
 label: 'Taxonomy term'
 module: taxonomy
@@ -20,7 +20,7 @@ base_field: nid
 display:
   default:
     id: default
-    display_title: Master
+    display_title: Default
     display_plugin: default
     position: 0
     display_options:
diff --git a/config/optional/views.view.train_the_trainer_events.yml b/config/optional/views.view.train_the_trainer_events.yml
deleted file mode 100644
index 539ccd4..0000000
--- a/config/optional/views.view.train_the_trainer_events.yml
+++ /dev/null
@@ -1,397 +0,0 @@
-uuid: 3b51937a-b7ee-40f0-a4a2-306c14b56072
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_event_type.train_the_trainer
-    - system.menu.opencase
-    - user.role.authenticated
-  module:
-    - datetime
-    - opencase_entities
-    - user
-_core:
-  default_config_hash: Z7P1-z_LTYkxZNNXhweeGl3mBoxClGxmYY52XCGcZEE
-id: train_the_trainer_events
-label: 'Train the Trainer Events'
-module: views
-description: ''
-tag: ''
-base_table: oc_event
-base_field: id
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Train the Trainer Events Attended'
-      fields:
-        name:
-          id: name
-          table: oc_event
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-          label: Name
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        activity_date_time:
-          id: activity_date_time
-          table: oc_event
-          field: activity_date_time
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_event
-          entity_field: activity_date_time
-          plugin_id: field
-          label: 'Date and time'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: datetime_default
-          settings:
-            timezone_override: ''
-            format_type: medium
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: role
-        options:
-          role:
-            authenticated: authenticated
-      cache:
-        type: tag
-        options: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: 'None yet. To register this trainer for an event, find the event and then add them as an attendee.'
-          tokenize: false
-      sorts:
-        activity_date_time:
-          id: activity_date_time
-          table: oc_event
-          field: activity_date_time
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_event
-          entity_field: activity_date_time
-          plugin_id: standard
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: activity_date_time
-          exposed: false
-      arguments:
-        attendees_target_id:
-          id: attendees_target_id
-          table: oc_event__attendees
-          field: attendees_target_id
-          entity_type: oc_event
-          entity_field: attendees
-          plugin_id: numeric
-      filters:
-        status:
-          id: status
-          table: oc_event
-          field: status
-          entity_type: oc_event
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        type:
-          id: type
-          table: oc_event
-          field: type
-          entity_type: oc_event
-          entity_field: type
-          plugin_id: bundle
-          value:
-            train_the_trainer: train_the_trainer
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            name: name
-          default: '-1'
-          info:
-            name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: 'entity:oc_event'
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags: {  }
-  block_1:
-    id: block_1
-    display_title: Block
-    display_plugin: block
-    position: 2
-    display_options:
-      title: 'Train the Trainer Events Attended/Attending'
-      arguments:
-        attendees_target_id:
-          id: attendees_target_id
-          table: oc_event__attendees
-          field: attendees_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_event
-          entity_field: attendees
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 2
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      defaults:
-        title: false
-        arguments: false
-      display_extenders: {  }
-      block_description: 'Train the Trainer Events Attended'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags: {  }
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      title: 'Train the Trainer Events'
-      empty: {  }
-      arguments: {  }
-      defaults:
-        empty: false
-        title: false
-        arguments: false
-      display_extenders: {  }
-      path: train-the-trainer-events
-      menu:
-        type: normal
-        title: 'Train The Trainer Events'
-        description: ''
-        weight: -45
-        expanded: false
-        menu_name: opencase
-        parent: opencase.see_all
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user.roles
-      tags: {  }
diff --git a/config/optional/views.view.training_report.yml b/config/optional/views.view.training_report.yml
deleted file mode 100644
index 3da7964..0000000
--- a/config/optional/views.view.training_report.yml
+++ /dev/null
@@ -1,695 +0,0 @@
-uuid: b90d9369-451f-4f14-984b-171501d868e1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_date_of_training
-    - field.storage.oc_case.field_number_of_participants
-    - field.storage.oc_case.field_training_status
-    - field.storage.oc_case.field_training_type
-    - opencase_cases.oc_case_type.training
-    - system.menu.opencase
-    - user.role.gno_admin_user
-  module:
-    - csv_serialization
-    - datetime
-    - opencase_cases
-    - opencase_entities
-    - options
-    - rest
-    - serialization
-    - user
-    - views_data_export
-id: training_report
-label: 'Training Report'
-module: views
-description: ''
-tag: ''
-base_table: oc_case_field_data
-base_field: id
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Training Report'
-      fields:
-        name:
-          id: name
-          table: oc_case_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: field
-          label: Client
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_training_type:
-          id: field_training_type
-          table: oc_case__field_training_type
-          field: field_training_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Training type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_date_of_training:
-          id: field_date_of_training
-          table: oc_case__field_date_of_training
-          field: field_date_of_training
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Date and time of training'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: datetime_default
-          settings:
-            timezone_override: ''
-            format_type: medium
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_number_of_participants:
-          id: field_number_of_participants
-          table: oc_case__field_number_of_participants
-          field: field_number_of_participants
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Number of participants'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_integer
-          settings:
-            thousand_separator: ''
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_training_status:
-          id: field_training_status
-          table: oc_case__field_training_status
-          field: field_training_status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Training Status'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: role
-        options:
-          role:
-            gno_admin_user: gno_admin_user
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments: {  }
-      filters:
-        type:
-          id: type
-          table: oc_case_field_data
-          field: type
-          entity_type: oc_case
-          entity_field: type
-          plugin_id: bundle
-          value:
-            training: training
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        name:
-          id: name
-          table: oc_organisation_field_data
-          field: name
-          relationship: client
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation
-          entity_field: name
-          plugin_id: string
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: name_op
-            label: 'Client name contains...'
-            description: ''
-            use_operator: false
-            operator: name_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: name
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              gno_admin_user: '0'
-              follow_up_alerts: '0'
-              newly_accredited_alerts: '0'
-              invoicing_alerts: '0'
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            name: name
-            client: client
-            field_training_type: field_training_type
-            field_date_of_training: field_date_of_training
-            field_number_of_participants: field_number_of_participants
-            field_training_status: field_training_status
-          default: '-1'
-          info:
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            client:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_training_type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_date_of_training:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_number_of_participants:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_training_status:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: 'entity:oc_case'
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: none
-          group_type: group
-          admin_label: Organisation
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: standard
-          required: true
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case.field_date_of_training'
-        - 'config:field.storage.oc_case.field_number_of_participants'
-        - 'config:field.storage.oc_case.field_training_status'
-        - 'config:field.storage.oc_case.field_training_type'
-  data_export_1:
-    id: data_export_1
-    display_title: 'Data export'
-    display_plugin: data_export
-    position: 2
-    display_options:
-      style:
-        type: data_export
-        options:
-          formats:
-            csv: csv
-          csv_settings:
-            delimiter: ','
-            enclosure: '"'
-            escape_char: \
-            strip_tags: true
-            trim: true
-            encoding: utf8
-            utf8_bom: '0'
-            use_serializer_encode_only: false
-      display_extenders: {  }
-      path: training-report/download
-      auth:
-        - cookie
-      displays:
-        page_1: page_1
-        default: '0'
-      filename: '[view:label]-[date:short].csv'
-      automatic_download: false
-      store_in_public_file_directory: null
-      custom_redirect_path: false
-      redirect_to_display: none
-      include_query_params: false
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case.field_date_of_training'
-        - 'config:field.storage.oc_case.field_number_of_participants'
-        - 'config:field.storage.oc_case.field_training_status'
-        - 'config:field.storage.oc_case.field_training_type'
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      display_extenders: {  }
-      path: training-report
-      menu:
-        type: normal
-        title: 'Training report'
-        description: ''
-        weight: 0
-        expanded: false
-        menu_name: opencase
-        parent: opencase.reporting
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case.field_date_of_training'
-        - 'config:field.storage.oc_case.field_number_of_participants'
-        - 'config:field.storage.oc_case.field_training_status'
-        - 'config:field.storage.oc_case.field_training_type'
diff --git a/config/optional/views.view.trainings.yml b/config/optional/views.view.trainings.yml
deleted file mode 100644
index 45f871c..0000000
--- a/config/optional/views.view.trainings.yml
+++ /dev/null
@@ -1,3186 +0,0 @@
-uuid: dd1f8ad7-68ff-432e-8e48-ff4a9431fb0d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_date_of_training
-    - field.storage.oc_case.field_number_of_participants
-    - field.storage.oc_case.field_project
-    - field.storage.oc_case.field_training_status
-    - field.storage.oc_case.field_training_type
-    - opencase_cases.oc_case_type.training
-    - system.menu.opencase
-    - user.role.authenticated
-  module:
-    - datetime
-    - opencase_cases
-    - opencase_entities
-    - options
-    - user
-_core:
-  default_config_hash: WEXYdHXh9zqan0bEwCzQypvhQhKOI9vpV1OM5DO-Rlk
-id: trainings
-label: Trainings
-module: views
-description: ''
-tag: ''
-base_table: oc_case_field_data
-base_field: id
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: Trainings
-      fields:
-        id:
-          id: id
-          table: oc_case_field_data
-          field: id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: id
-          plugin_id: field
-          label: ID
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_integer
-          settings:
-            thousand_separator: ''
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        name:
-          id: name
-          table: oc_case_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: name
-          plugin_id: field
-          label: Title
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: field
-          label: Client
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_training_type:
-          id: field_training_type
-          table: oc_case__field_training_type
-          field: field_training_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Training type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: '/opencase/oc_case/{{ id }}'
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_date_of_training:
-          id: field_date_of_training
-          table: oc_case__field_date_of_training
-          field: field_date_of_training
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Date of training'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: datetime_default
-          settings:
-            timezone_override: ''
-            format_type: short
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_training_status:
-          id: field_training_status
-          table: oc_case__field_training_status
-          field: field_training_status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Training Status'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_project:
-          id: field_project
-          table: oc_case__field_project
-          field: field_project
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Project
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_number_of_participants:
-          id: field_number_of_participants
-          table: oc_case__field_number_of_participants
-          field: field_number_of_participants
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Number of participants'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_integer
-          settings:
-            thousand_separator: ''
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: role
-        options:
-          role:
-            authenticated: authenticated
-      cache:
-        type: tag
-        options: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: 'None yet.'
-          tokenize: false
-      sorts: {  }
-      arguments: {  }
-      filters:
-        type:
-          id: type
-          table: oc_case_field_data
-          field: type
-          entity_type: oc_case
-          entity_field: type
-          plugin_id: bundle
-          value:
-            training: training
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            id: id
-            name: name
-            client: client
-            field_training_type: field_training_type
-            field_date_of_training: field_date_of_training
-            field_training_status: field_training_status
-            field_project: field_project
-          default: '-1'
-          info:
-            id:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            client:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_training_type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_date_of_training:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_training_status:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_project:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      group_by: false
-      header:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: ''
-          tokenize: false
-      footer:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: '<a class="button" href="/opencase/oc_case/add/training?client_id={{ raw_arguments.client }}&destination=/opencase/oc_organisation/{{ raw_arguments.client }}">Add training</a><br /><br />'
-          tokenize: true
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case.field_date_of_training'
-        - 'config:field.storage.oc_case.field_number_of_participants'
-        - 'config:field.storage.oc_case.field_project'
-        - 'config:field.storage.oc_case.field_training_status'
-        - 'config:field.storage.oc_case.field_training_type'
-  attachment_1:
-    id: attachment_1
-    display_title: 'Attachment - trainings without date'
-    display_plugin: attachment
-    position: 2
-    display_options:
-      title: 'Without date'
-      fields:
-        id:
-          id: id
-          table: oc_case_field_data
-          field: id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: id
-          plugin_id: field
-          label: ID
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_integer
-          settings:
-            thousand_separator: ''
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        name:
-          id: name
-          table: oc_case_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: name
-          plugin_id: field
-          label: Title
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: field
-          label: Client
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_training_type:
-          id: field_training_type
-          table: oc_case__field_training_type
-          field: field_training_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Training type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: '/opencase/oc_case/{{ id }}'
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_date_of_training:
-          id: field_date_of_training
-          table: oc_case__field_date_of_training
-          field: field_date_of_training
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Date of training'
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: datetime_default
-          settings:
-            timezone_override: ''
-            format_type: short
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_training_status:
-          id: field_training_status
-          table: oc_case__field_training_status
-          field: field_training_status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Training Status'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_project:
-          id: field_project
-          table: oc_case__field_project
-          field: field_project
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Project
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_number_of_participants:
-          id: field_number_of_participants
-          table: oc_case__field_number_of_participants
-          field: field_number_of_participants
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Number of participants'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_integer
-          settings:
-            thousand_separator: ''
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: none
-        options:
-          offset: 0
-      sorts:
-        name:
-          id: name
-          table: oc_case_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: name
-          plugin_id: standard
-          order: ASC
-          expose:
-            label: ''
-            field_identifier: ''
-          exposed: false
-      filters:
-        type:
-          id: type
-          table: oc_case_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: type
-          plugin_id: bundle
-          operator: in
-          value:
-            training: training
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_date_of_training_value:
-          id: field_date_of_training_value
-          table: oc_case__field_date_of_training
-          field: field_date_of_training_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: datetime
-          operator: empty
-          value:
-            min: ''
-            max: ''
-            value: ''
-            type: date
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        title: false
-        relationships: false
-        fields: false
-        sorts: false
-        arguments: true
-        filters: false
-        filter_groups: false
-        header: false
-        footer: false
-      relationships: {  }
-      display_description: ''
-      header:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: '<h2>Without date</h2>'
-          tokenize: false
-      footer:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: false
-          content: '<h2>With date</h2>'
-          tokenize: false
-      display_extenders: {  }
-      displays:
-        page_2: page_2
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case.field_date_of_training'
-        - 'config:field.storage.oc_case.field_number_of_participants'
-        - 'config:field.storage.oc_case.field_project'
-        - 'config:field.storage.oc_case.field_training_status'
-        - 'config:field.storage.oc_case.field_training_type'
-  block_2:
-    id: block_2
-    display_title: 'By client'
-    display_plugin: block
-    position: 2
-    display_options:
-      fields:
-        id:
-          id: id
-          table: oc_case_field_data
-          field: id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: id
-          plugin_id: field
-          label: ID
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_integer
-          settings:
-            thousand_separator: ''
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        name:
-          id: name
-          table: oc_case_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: name
-          plugin_id: field
-          label: Title
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: field
-          label: Client
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_training_type:
-          id: field_training_type
-          table: oc_case__field_training_type
-          field: field_training_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Training type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: '/opencase/oc_case/{{ id }}'
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_date_of_training:
-          id: field_date_of_training
-          table: oc_case__field_date_of_training
-          field: field_date_of_training
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Date of training'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: datetime_default
-          settings:
-            timezone_override: ''
-            format_type: short
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_training_status:
-          id: field_training_status
-          table: oc_case__field_training_status
-          field: field_training_status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Training Status'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_project:
-          id: field_project
-          table: oc_case__field_project
-          field: field_project
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Project
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      arguments:
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 2
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      defaults:
-        title: true
-        relationships: false
-        fields: false
-        arguments: false
-      relationships: {  }
-      display_description: ''
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case.field_date_of_training'
-        - 'config:field.storage.oc_case.field_project'
-        - 'config:field.storage.oc_case.field_training_status'
-        - 'config:field.storage.oc_case.field_training_type'
-  block_3:
-    id: block_3
-    display_title: 'By client by umbrella'
-    display_plugin: block
-    position: 4
-    display_options:
-      arguments:
-        field_umbrella_client_target_id:
-          id: field_umbrella_client_target_id
-          table: oc_organisation__field_umbrella_client
-          field: field_umbrella_client_target_id
-          relationship: client
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 2
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      defaults:
-        relationships: false
-        arguments: false
-        footer: false
-      relationships:
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: none
-          group_type: group
-          admin_label: Organisation
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: standard
-          required: true
-      display_description: ''
-      footer: {  }
-      display_extenders: {  }
-      block_description: 'Trainings by Umbrella Client'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case.field_date_of_training'
-        - 'config:field.storage.oc_case.field_number_of_participants'
-        - 'config:field.storage.oc_case.field_project'
-        - 'config:field.storage.oc_case.field_training_status'
-        - 'config:field.storage.oc_case.field_training_type'
-  block_4:
-    id: block_4
-    display_title: 'Umbrella trainings by umbrella'
-    display_plugin: block
-    position: 5
-    display_options:
-      fields:
-        id:
-          id: id
-          table: oc_case_field_data
-          field: id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: id
-          plugin_id: field
-          label: ID
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_integer
-          settings:
-            thousand_separator: ''
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        name:
-          id: name
-          table: oc_case_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: name
-          plugin_id: field
-          label: Title
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: field
-          label: Client
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_date_of_training:
-          id: field_date_of_training
-          table: oc_case__field_date_of_training
-          field: field_date_of_training
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Date of training'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: datetime_default
-          settings:
-            timezone_override: ''
-            format_type: short
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_training_type:
-          id: field_training_type
-          table: oc_case__field_training_type
-          field: field_training_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Training type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_project:
-          id: field_project
-          table: oc_case__field_project
-          field: field_project
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Project
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      arguments:
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 2
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        type:
-          id: type
-          table: oc_case_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: type
-          plugin_id: bundle
-          operator: in
-          value:
-            training: training
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        fields: false
-        arguments: false
-        filters: false
-        filter_groups: false
-        footer: false
-      display_description: ''
-      footer:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: '<a class="button" href="/opencase/oc_case/add/training?client_id={{ raw_arguments.client }}&destination=/opencase/oc_organisation/{{ raw_arguments.client }}">Add training</a><br /><br />'
-          tokenize: true
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case.field_date_of_training'
-        - 'config:field.storage.oc_case.field_project'
-        - 'config:field.storage.oc_case.field_training_type'
-  block_5:
-    id: block_5
-    display_title: 'By project'
-    display_plugin: block
-    position: 6
-    display_options:
-      fields:
-        id:
-          id: id
-          table: oc_case_field_data
-          field: id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: id
-          plugin_id: field
-          label: ID
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_integer
-          settings:
-            thousand_separator: ''
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        name:
-          id: name
-          table: oc_case_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: name
-          plugin_id: field
-          label: Title
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        client:
-          id: client
-          table: oc_case_field_data
-          field: client
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: client
-          plugin_id: field
-          label: Client
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_training_type:
-          id: field_training_type
-          table: oc_case__field_training_type
-          field: field_training_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Training type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: '/opencase/oc_case/{{ id }}'
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_date_of_training:
-          id: field_date_of_training
-          table: oc_case__field_date_of_training
-          field: field_date_of_training
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Date of training'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: datetime_default
-          settings:
-            timezone_override: ''
-            format_type: short
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_training_status:
-          id: field_training_status
-          table: oc_case__field_training_status
-          field: field_training_status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Training Status'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_project:
-          id: field_project
-          table: oc_case__field_project
-          field: field_project
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Project
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      arguments:
-        field_project_target_id:
-          id: field_project_target_id
-          table: oc_case__field_project
-          field: field_project_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 2
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      defaults:
-        fields: false
-        arguments: false
-        footer: false
-      display_description: ''
-      footer:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: '<a class="button" href="/opencase/oc_case/add/training?project_id={{ raw_arguments.field_project_target_id }}">Add training</a><br /><br />'
-          tokenize: true
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case.field_date_of_training'
-        - 'config:field.storage.oc_case.field_project'
-        - 'config:field.storage.oc_case.field_training_status'
-        - 'config:field.storage.oc_case.field_training_type'
-  page_2:
-    id: page_2
-    display_title: 'All Trainings'
-    display_plugin: page
-    position: 2
-    display_options:
-      sorts:
-        field_date_of_training_value:
-          id: field_date_of_training_value
-          table: oc_case__field_date_of_training
-          field: field_date_of_training_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: datetime
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: field_date_of_training_value
-          exposed: false
-          granularity: second
-      filters:
-        type:
-          id: type
-          table: oc_case_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_case
-          entity_field: type
-          plugin_id: bundle
-          operator: in
-          value:
-            training: training
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_date_of_training_value:
-          id: field_date_of_training_value
-          table: oc_case__field_date_of_training
-          field: field_date_of_training_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: datetime
-          operator: 'not empty'
-          value:
-            min: ''
-            max: ''
-            value: ''
-            type: date
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        relationships: false
-        fields: true
-        sorts: false
-        arguments: true
-        filters: false
-        filter_groups: false
-        footer: false
-      relationships: {  }
-      display_description: ''
-      footer: {  }
-      display_extenders: {  }
-      path: opencase/trainings/all
-      menu:
-        type: normal
-        title: Trainings
-        description: ''
-        weight: -47
-        expanded: false
-        menu_name: opencase
-        parent: opencase.see_all
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case.field_date_of_training'
-        - 'config:field.storage.oc_case.field_number_of_participants'
-        - 'config:field.storage.oc_case.field_project'
-        - 'config:field.storage.oc_case.field_training_status'
-        - 'config:field.storage.oc_case.field_training_type'
diff --git a/config/optional/views.view.user_admin_people.yml b/config/optional/views.view.user_admin_people.yml
index 585e0f3..9d897bd 100644
--- a/config/optional/views.view.user_admin_people.yml
+++ b/config/optional/views.view.user_admin_people.yml
@@ -1,11 +1,11 @@
-uuid: 2558deef-e892-4410-b292-cf8801b07e4b
+uuid: e7a3692d-80c6-4726-8895-66d236f9e519
 langcode: en
 status: true
 dependencies:
   module:
     - user
 _core:
-  default_config_hash: J5EbGNdz0YUaSIYKwomyFSOtZjsV9TrBA3qdb3ZwBS0
+  default_config_hash: njaZigMvB4ap21Fg_tQcJhWgYJCGNi49Z5rRL_N6RI0
 id: user_admin_people
 label: People
 module: user
@@ -16,7 +16,7 @@ base_field: uid
 display:
   default:
     id: default
-    display_title: Master
+    display_title: Default
     display_plugin: default
     position: 0
     display_options:
diff --git a/config/optional/views.view.watchdog.yml b/config/optional/views.view.watchdog.yml
index dad9958..2a4dc0d 100644
--- a/config/optional/views.view.watchdog.yml
+++ b/config/optional/views.view.watchdog.yml
@@ -1,4 +1,4 @@
-uuid: 820e710a-92c7-4941-a90f-b8422a12c5dc
+uuid: 6a3d86ee-adc4-4256-96ff-028465cda633
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     - dblog
     - user
 _core:
-  default_config_hash: oG4FVrpj6HxivwdvkAyY23ApbR-iWTnKvM4JHdJ6XmA
+  default_config_hash: j0txIxY4nkJT_dscmXckM-1vanygDkJAeHPawZKfyH0
 id: watchdog
 label: Watchdog
 module: views
@@ -17,7 +17,7 @@ base_field: wid
 display:
   default:
     id: default
-    display_title: Master
+    display_title: Default
     display_plugin: default
     position: 0
     display_options:
@@ -603,8 +603,6 @@ display:
           default: wid
           info:
             nothing:
-              sortable: false
-              default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
diff --git a/config/optional/views.view.who_s_new.yml b/config/optional/views.view.who_s_new.yml
index c41c1c1..4e4a820 100644
--- a/config/optional/views.view.who_s_new.yml
+++ b/config/optional/views.view.who_s_new.yml
@@ -1,11 +1,11 @@
-uuid: 87ee2fd5-fe6f-4615-9960-72a87016d8e7
+uuid: 447e88d6-6d3f-4eae-9de6-a941046bc1a8
 langcode: en
 status: true
 dependencies:
   module:
     - user
 _core:
-  default_config_hash: nCa1oy25w2fh-nk_iQ7IJFQwQIcKxrV_5EQW2y8dzPc
+  default_config_hash: zji0_13MyVGK7Bn1lUMDeZyyOIZedWvqpYUeM_SioPI
 id: who_s_new
 label: 'Who''s new'
 module: user
@@ -16,7 +16,7 @@ base_field: uid
 display:
   default:
     id: default
-    display_title: Master
+    display_title: Default
     display_plugin: default
     position: 0
     display_options:
diff --git a/config/optional/views.view.who_s_online.yml b/config/optional/views.view.who_s_online.yml
index 779894d..48ca114 100644
--- a/config/optional/views.view.who_s_online.yml
+++ b/config/optional/views.view.who_s_online.yml
@@ -1,11 +1,11 @@
-uuid: 1ea60493-840a-442f-8409-835f7f0d1325
+uuid: 25461172-152e-4971-a977-9d8e97c7d42c
 langcode: en
 status: true
 dependencies:
   module:
     - user
 _core:
-  default_config_hash: t9qu6R6PnnbZNOft0SpIMxwCg6VCfaX3aW2W-NjeFyc
+  default_config_hash: suDsVMgawXoQt4rfmdfpr05EVX3z3KyfDDTYgeSM898
 id: who_s_online
 label: 'Who''s online block'
 module: user
@@ -16,7 +16,7 @@ base_field: uid
 display:
   default:
     id: default
-    display_title: Master
+    display_title: Default
     display_plugin: default
     position: 0
     display_options:
diff --git a/config/optional/views_natural_sort.settings.yml b/config/optional/views_natural_sort.settings.yml
deleted file mode 100644
index e65dedf..0000000
--- a/config/optional/views_natural_sort.settings.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-_core:
-  default_config_hash: o57trdcl5av39RvArvfjkUXYdhd3UbY2pEg0yZpIu-0
-rebuild_items_per_batch: 100
-transformation_settings:
-  remove_beginning_words:
-    enabled: true
-    settings:
-      - The
-      - A
-      - An
-      - La
-      - Le
-      - Il
-  remove_words:
-    enabled: true
-    settings:
-      - and
-      - or
-      - of
-  remove_symbols:
-    enabled: true
-    settings: '#"''\()[]'
-  numbers:
-    enabled: true
-    settings: {  }
-  days_of_the_week:
-    enabled: false
-dependencies:
-  module:
-    - views_natural_sort