From 304c3495ecd2512c996a7ee82fc30704dffb815a Mon Sep 17 00:00:00 2001
From: Don Richards <highlander411@gmail.com>
Date: Fri, 3 Nov 2023 11:15:07 -0400
Subject: [PATCH] Remove hashes

---
 config/sync/admin_toolbar_search.settings.yml |    3 -
 ...csl_style.american_medical_association.yml |  289 ---
 config/sync/bibcite.bibcite_csl_style.apa.yml | 1581 -----------------
 ....bibcite_csl_style.chicago_author_date.yml |  670 -------
 ..._csl_style.modern_language_association.yml |  473 -----
 ...odern_language_association_8th_edition.yml |  323 ----
 config/sync/bibcite.settings.yml              |    4 -
 ...block.block.idc_ui_theme_boots_content.yml |    2 +-
 .../block.block.idc_ui_theme_boots_help.yml   |    4 +-
 ...block.idc_ui_theme_boots_local_actions.yml |    2 +-
 ...k.block.idc_ui_theme_boots_local_tasks.yml |    2 +-
 ...lock.block.idc_ui_theme_boots_memberof.yml |    6 +-
 ...ck.block.idc_ui_theme_boots_page_title.yml |    6 +-
 ...ock.idc_ui_theme_boots_resourcetype_2.yml} |   24 +-
 ...earchcontentsearchresultspagerforpage.yml} |   34 +-
 ...block.block.idc_ui_theme_boots_subject.yml |    2 +-
 ...ock.year.yml => block.block.pagetitle.yml} |   33 +-
 config/sync/block.block.search.yml            |   51 -
 ...olrsearchcontentadvancedsearchforblock.yml |   48 -
 ...solrsearchcontentadvancedsearchforpage.yml |   56 -
 ...earchcontentsearchresultspagerforblock.yml |   46 -
 ...ews_block__solr_search_content_block_1.yml |   50 -
 config/sync/block.block.yearswc.yml           |   50 -
 config/sync/citation_select.settings.yml      |   12 -
 config/sync/context.context.collection.yml    |    8 +-
 ..._display.node.islandora_object.default.yml |    9 -
 ...display.node.collection_object.default.yml |  236 ++-
 ..._display.node.collection_object.teaser.yml |   22 +-
 ...w_display.node.islandora_object.binary.yml |    2 -
 ..._display.node.islandora_object.default.yml |    9 -
 ...y.node.islandora_object.open_seadragon.yml |    2 -
 ...ew_display.node.islandora_object.pdfjs.yml |    2 -
 ...lay.node.islandora_object.search_index.yml |    2 -
 ...ay.node.islandora_object.search_result.yml |    2 -
 ...w_display.node.islandora_object.teaser.yml |   51 +-
 config/sync/core.extension.yml                |   16 +-
 ...ts.facet.creators_and_contributors_swc.yml |   79 -
 .../sync/facets.facet.physical_form_swc.yml   |   79 -
 ...c.yml => facets.facet.resource_type_2.yml} |   21 +-
 config/sync/facets.facet.year.yml             |    7 +-
 config/sync/facets.facet.year_swc.yml         |   67 -
 ...ld.field.media.image.field_media_image.yml |    9 +-
 ...node.collection_object.field_member_of.yml |   11 +-
 ...landora_object.field_alternative_title.yml |   19 -
 ...ode.islandora_object.field_contributor.yml |    2 +-
 ...landora_object.field_digital_publisher.yml |    4 +
 ....node.islandora_object.field_publisher.yml |   10 +
 ...ield.node.islandora_object.field_years.yml |    7 +-
 ...eld.storage.group_content.group_roles.yml} |    8 +-
 .../field.storage.media.field_media_image.yml |    4 -
 config/sync/idc_ui_theme_boots.settings.yml   |    2 +-
 config/sync/islandora.settings.yml            |    2 +-
 ...=> islandora_advanced_search.settings.yml} |    6 -
 .../sync/pathauto.pattern.group_content.yml   |   18 +
 .../pathauto.pattern.group_relationship.yml   |   18 -
 .../search_api.index.default_solr_index.yml   |   76 +-
 ...olr_cache.cache_document_default_9_0_0.yml |   17 -
 ...r_cache.cache_fieldvalue_default_9_0_0.yml |   21 -
 ....solr_cache.cache_filter_default_9_0_0.yml |   21 -
 ...cache.cache_persegfilter_default_9_0_0.yml |   18 -
 ..._cache.cache_queryresult_default_9_0_0.yml |   27 -
 ...lr.solr_field_type.text_edge_und_3_6_0.yml |    5 +-
 ...lr.solr_field_type.text_edge_und_4_5_0.yml |    5 +-
 ...lr.solr_field_type.text_edge_und_6_0_0.yml |    7 +-
 ...lr.solr_field_type.text_edge_und_7_0_0.yml |    9 +-
 ...r_field_type.text_edgestring_und_3_6_0.yml |    1 -
 ...r_field_type.text_edgestring_und_4_5_0.yml |    1 -
 ...r_field_type.text_edgestring_und_6_0_0.yml |    3 +-
 ...api_solr.solr_field_type.text_en_3_6_0.yml |   10 +-
 ...api_solr.solr_field_type.text_en_4_5_0.yml |   10 +-
 ...api_solr.solr_field_type.text_en_6_0_0.yml |   12 +-
 ...api_solr.solr_field_type.text_en_7_0_0.yml |   16 +-
 ...r.solr_field_type.text_ngram_und_3_6_0.yml |    5 +-
 ...r.solr_field_type.text_ngram_und_4_5_0.yml |    5 +-
 ...r.solr_field_type.text_ngram_und_6_0_0.yml |    7 +-
 ...r.solr_field_type.text_ngram_und_7_0_0.yml |    9 +-
 ..._field_type.text_ngramstring_und_3_6_0.yml |    1 -
 ..._field_type.text_ngramstring_und_4_5_0.yml |    1 -
 ..._field_type.text_ngramstring_und_6_0_0.yml |    3 +-
 ...solr_field_type.text_phonetic_en_7_0_0.yml |    7 +-
 ...olr_field_type.text_phonetic_und_7_0_0.yml |    9 +-
 ....solr_field_type.text_string_und_6_0_0.yml |    3 +-
 ...pi_solr.solr_field_type.text_und_3_6_0.yml |    6 +-
 ...pi_solr.solr_field_type.text_und_4_5_0.yml |    6 +-
 ...pi_solr.solr_field_type.text_und_6_0_0.yml |   12 +-
 ...pi_solr.solr_field_type.text_und_7_0_0.yml |   14 +-
 config/sync/system.date.yml                   |    4 +-
 config/sync/system.logging.yml                |    2 +-
 config/sync/views.settings.yml                |    2 +-
 config/sync/views.view.frontpage.yml          |    2 +-
 config/sync/views.view.group_media.yml        |  131 +-
 config/sync/views.view.group_members.yml      |   82 +-
 config/sync/views.view.group_nodes.yml        |   88 +-
 ...ws.view.home_page_featured_collections.yml |    6 +-
 config/sync/views.view.members.yml            |   17 +-
 .../sync/views.view.solr_search_content.yml   |  975 ++--------
 config/sync/views.view.thumbnail.yml          |  308 ----
 .../views.view.thumbnail_of_first_child.yml   |  272 ---
 .../sync/views.view.top_level_collections.yml |  125 +-
 config/sync/views_field_view.settings.yml     |    3 -
 100 files changed, 833 insertions(+), 6036 deletions(-)
 delete mode 100644 config/sync/admin_toolbar_search.settings.yml
 delete mode 100644 config/sync/bibcite.bibcite_csl_style.american_medical_association.yml
 delete mode 100644 config/sync/bibcite.bibcite_csl_style.apa.yml
 delete mode 100644 config/sync/bibcite.bibcite_csl_style.chicago_author_date.yml
 delete mode 100644 config/sync/bibcite.bibcite_csl_style.modern_language_association.yml
 delete mode 100644 config/sync/bibcite.bibcite_csl_style.modern_language_association_8th_edition.yml
 delete mode 100644 config/sync/bibcite.settings.yml
 rename config/sync/{block.block.memberof.yml => block.block.idc_ui_theme_boots_resourcetype_2.yml} (71%)
 rename config/sync/{block.block.solrsearchcontentsearchresultspagerforpage.yml => block.block.idc_ui_theme_boots_solrsearchcontentsearchresultspagerforpage.yml} (66%)
 rename config/sync/{block.block.year.yml => block.block.pagetitle.yml} (73%)
 delete mode 100644 config/sync/block.block.search.yml
 delete mode 100644 config/sync/block.block.solrsearchcontentadvancedsearchforblock.yml
 delete mode 100644 config/sync/block.block.solrsearchcontentadvancedsearchforpage.yml
 delete mode 100644 config/sync/block.block.solrsearchcontentsearchresultspagerforblock.yml
 delete mode 100644 config/sync/block.block.views_block__solr_search_content_block_1.yml
 delete mode 100644 config/sync/block.block.yearswc.yml
 delete mode 100644 config/sync/citation_select.settings.yml
 delete mode 100644 config/sync/facets.facet.creators_and_contributors_swc.yml
 delete mode 100644 config/sync/facets.facet.physical_form_swc.yml
 rename config/sync/{facets.facet.member_of_swc.yml => facets.facet.resource_type_2.yml} (78%)
 delete mode 100644 config/sync/facets.facet.year_swc.yml
 delete mode 100644 config/sync/field.field.node.islandora_object.field_alternative_title.yml
 rename config/sync/{field.storage.group_relationship.group_roles.yml => field.storage.group_content.group_roles.yml} (61%)
 rename config/sync/{advanced_search.settings.yml => islandora_advanced_search.settings.yml} (52%)
 create mode 100644 config/sync/pathauto.pattern.group_content.yml
 delete mode 100644 config/sync/pathauto.pattern.group_relationship.yml
 delete mode 100644 config/sync/search_api_solr.solr_cache.cache_document_default_9_0_0.yml
 delete mode 100644 config/sync/search_api_solr.solr_cache.cache_fieldvalue_default_9_0_0.yml
 delete mode 100644 config/sync/search_api_solr.solr_cache.cache_filter_default_9_0_0.yml
 delete mode 100644 config/sync/search_api_solr.solr_cache.cache_persegfilter_default_9_0_0.yml
 delete mode 100644 config/sync/search_api_solr.solr_cache.cache_queryresult_default_9_0_0.yml
 delete mode 100644 config/sync/views.view.thumbnail.yml
 delete mode 100644 config/sync/views.view.thumbnail_of_first_child.yml
 delete mode 100644 config/sync/views_field_view.settings.yml

diff --git a/config/sync/admin_toolbar_search.settings.yml b/config/sync/admin_toolbar_search.settings.yml
deleted file mode 100644
index 4ae977535..000000000
--- a/config/sync/admin_toolbar_search.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: AAmWcgwzGYbXfR6wfEfMyoi3r5QZwlpxvq5dHbupnJo
-display_menu_item: 0
diff --git a/config/sync/bibcite.bibcite_csl_style.american_medical_association.yml b/config/sync/bibcite.bibcite_csl_style.american_medical_association.yml
deleted file mode 100644
index 4cd6c85f8..000000000
--- a/config/sync/bibcite.bibcite_csl_style.american_medical_association.yml
+++ /dev/null
@@ -1,289 +0,0 @@
-uuid: fe18b2ab-ba61-4ed7-9ae1-53655635268e
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: PWpxQYdw3OW0popF7vCzlSWdG-rM2ol9apgadLTEo5A
-id: american_medical_association
-parent: null
-label: 'American Medical Association 10th edition'
-csl: |
-  <?xml version="1.0" encoding="utf-8"?>
-    <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="expanded" default-locale="en-US">
-    <info>
-    <title>American Medical Association 10th edition</title>
-    <title-short>AMA (10th ed.)</title-short>
-    <id>http://www.zotero.org/styles/american-medical-association-10th-edition</id>
-    <link href="http://www.zotero.org/styles/american-medical-association-10th-edition" rel="self"/>
-    <link href="https://westlibrary.txwes.edu/sites/default/files/pdf/AMACitationStyle.pdf" rel="documentation"/>
-    <author>
-    <name>Julian Onions</name>
-    <email>julian.onions@gmail.com</email>
-    </author>
-    <contributor>
-    <name>Christian Pietsch</name>
-    <uri>http://purl.org/net/pietsch</uri>
-    </contributor>
-    <contributor>
-    <name>Daniel W Chan</name>
-    <email>danwchan@protonmail.com</email>
-    </contributor>
-    <category citation-format="numeric"/>
-    <category field="medicine"/>
-    <summary>The American Medical Association style as used in JAMA.</summary>
-    <updated>2020-05-03T02:23:16+00:00</updated>
-    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    </info>
-    <locale xml:lang="en">
-    <terms>
-    <term name="page-range-delimiter">-</term>
-    </terms>
-    </locale>
-    <macro name="editor">
-    <names variable="editor">
-    <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=", "/>
-    </names>
-    </macro>
-    <macro name="author">
-    <group suffix=".">
-    <names variable="author">
-    <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=", "/>
-    <substitute>
-    <names variable="editor"/>
-    <text macro="title"/>
-    </substitute>
-    </names>
-    </group>
-    </macro>
-    <macro name="access">
-    <choose>
-    <if type="article-newspaper" match="none">
-    <choose>
-    <if variable="DOI">
-    <text value="doi:"/>
-    <text variable="DOI"/>
-    </if>
-    <else-if variable="URL">
-    <group delimiter=". " suffix=".">
-    <text variable="URL"/>
-    <choose>
-    <if type="webpage">
-    <date variable="issued" prefix="Published " form="text"/>
-    </if>
-    </choose>
-    <group>
-    <text term="accessed" text-case="capitalize-first" suffix=" "/>
-    <date variable="accessed">
-    <date-part name="month" suffix=" "/>
-    <date-part name="day" suffix=", "/>
-    <date-part name="year"/>
-    </date>
-    </group>
-    </group>
-    </else-if>
-    </choose>
-    </if>
-    </choose>
-    </macro>
-    <macro name="title">
-    <choose>
-    <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-    <text variable="title" font-style="italic" text-case="title"/>
-    </if>
-    <else>
-    <text variable="title"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="publisher">
-  <group delimiter=": ">
-        <text variable="publisher-place"/>
-                        <text variable="publisher"/>
-    </group>
-    </macro>
-    <macro name="edition">
-    <choose>
-    <if is-numeric="edition">
-    <group delimiter=" ">
-    <number variable="edition" form="ordinal"/>
-    <text term="edition" form="short"/>
-    </group>
-    </if>
-    <else>
-    <text variable="edition" suffix="."/>
-    </else>
-    </choose>
-    </macro>
-    <citation collapse="citation-number">
-    <sort>
-    <key variable="citation-number"/>
-    </sort>
-    <layout delimiter="," vertical-align="sup">
-    <text variable="citation-number"/>
-    <group prefix="(" suffix=")">
-    <label variable="locator" form="short" strip-periods="true"/>
-    <text variable="locator"/>
-    </group>
-    </layout>
-    </citation>
-    <bibliography hanging-indent="false" et-al-min="7" et-al-use-first="3" second-field-align="flush">
-    <layout>
-    <text variable="citation-number" suffix=". "/>
-    <text macro="author"/>
-    <text macro="title" prefix=" " suffix="."/>
-    <choose>
-    <if type="bill book graphic legislation motion_picture report song" match="any">
-    <group suffix="." prefix=" " delimiter=" ">
-    <group delimiter=" ">
-    <text term="volume" form="short" text-case="capitalize-first" strip-periods="true"/>
-    <text variable="volume" suffix="."/>
-    </group>
-    <text macro="edition"/>
-    <text macro="editor" prefix="(" suffix=")"/>
-    </group>
-    <text macro="publisher" prefix=" "/>
-    <group suffix="." prefix="; ">
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    <text variable="page" prefix=":"/>
-    </group>
-    </if>
-    <else-if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
-    <group prefix=" " delimiter=" ">
-    <text term="in" text-case="capitalize-first" suffix=":"/>
-    <text macro="editor"/>
-    <text variable="container-title" font-style="italic" suffix="." text-case="title"/>
-    <group delimiter=" ">
-    <text term="volume" form="short" text-case="capitalize-first" strip-periods="true"/>
-    <text variable="volume" suffix="."/>
-    </group>
-    <text macro="edition"/>
-    <text variable="collection-title" suffix="."/>
-    <group suffix=".">
-    <text macro="publisher"/>
-    <group suffix="." prefix="; ">
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    <text variable="page" prefix=":"/>
-    </group>
-    </group>
-    </group>
-    </else-if>
-    <else-if type="article-newspaper">
-    <text variable="container-title" font-style="italic" prefix=" " suffix=". "/>
-    <choose>
-    <if variable="URL">
-    <group delimiter=". " suffix=".">
-    <text variable="URL"/>
-    <group prefix="Published ">
-    <date variable="issued">
-    <date-part name="month" suffix=" "/>
-    <date-part name="day" suffix=", "/>
-    <date-part name="year"/>
-    </date>
-    </group>
-    <group>
-    <text term="accessed" text-case="capitalize-first" suffix=" "/>
-    <date variable="accessed">
-    <date-part name="month" suffix=" "/>
-    <date-part name="day" suffix=", "/>
-    <date-part name="year"/>
-    </date>
-    </group>
-    </group>
-    </if>
-    <else>
-    <group delimiter=":" suffix=".">
-    <group>
-    <date variable="issued">
-    <date-part name="month" suffix=" "/>
-    <date-part name="day" suffix=", "/>
-    <date-part name="year"/>
-    </date>
-    </group>
-    <text variable="page"/>
-    </group>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="legal_case">
-    <group suffix="," prefix=" " delimiter=" ">
-    <text macro="editor" prefix="(" suffix=")"/>
-    </group>
-    <group prefix=" " delimiter=" ">
-    <text variable="container-title"/>
-    <text variable="volume"/>
-    </group>
-    <text variable="page" prefix=", " suffix=" "/>
-    <group prefix="(" suffix=")." delimiter=" ">
-    <text variable="authority"/>
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    </group>
-    </else-if>
-    <else-if type="webpage">
-    <text variable="container-title" prefix=" " suffix="."/>
-    </else-if>
-    <else-if type="speech">
-    <group prefix=" " suffix=":">
-    <choose>
-    <if variable="genre">
-    <text variable="genre" suffix=" "/>
-    <text term="presented at"/>
-    </if>
-    <else>
-    <text term="presented at" text-case="capitalize-first"/>
-    </else>
-    </choose>
-    </group>
-    <group delimiter="; " prefix=" " suffix=".">
-    <text variable="event"/>
-    <group>
-    <date delimiter=" " variable="issued">
-    <date-part name="month"/>
-    <date-part name="day" suffix=","/>
-    <date-part name="year"/>
-    </date>
-    </group>
-    <text variable="event-place"/>
-    </group>
-    </else-if>
-    <else>
-    <text macro="editor" prefix=" " suffix="."/>
-    <group prefix=" " suffix=".">
-    <text variable="container-title" font-style="italic" form="short" strip-periods="true" suffix="."/>
-    <group delimiter=";" prefix=" ">
-    <choose>
-    <if variable="issue volume" match="any">
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    </if>
-    <else>
-    <date variable="issued">
-    <date-part name="month" suffix=" "/>
-    <date-part name="year"/>
-    </date>
-    </else>
-    </choose>
-    <group>
-    <text variable="volume"/>
-    <text variable="issue" prefix="(" suffix=")"/>
-    </group>
-    </group>
-    <text variable="page" prefix=":"/>
-    </group>
-    </else>
-    </choose>
-    <text prefix=" " macro="access"/>
-    </layout>
-    </bibliography>
-    </style>
-updated: 1588472596
-custom: true
-url_id: 'http://www.zotero.org/styles/american-medical-association-10th-edition'
diff --git a/config/sync/bibcite.bibcite_csl_style.apa.yml b/config/sync/bibcite.bibcite_csl_style.apa.yml
deleted file mode 100644
index 3418ec913..000000000
--- a/config/sync/bibcite.bibcite_csl_style.apa.yml
+++ /dev/null
@@ -1,1581 +0,0 @@
-uuid: 8e672182-4b31-4fcd-ad13-0adc05ed9f9e
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: 5itCumXb5qKQiZx5WTe0z8QzMFFiFAIc9_d8AJCiq0M
-id: apa
-parent: null
-label: 'American Psychological Association 6th edition'
-csl: |
-  <?xml version="1.0" encoding="utf-8"?>
-    <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
-    <info>
-    <title>American Psychological Association 6th edition</title>
-    <title-short>APA (6th ed.)</title-short>
-    <id>http://www.zotero.org/styles/apa-6th-edition</id>
-    <link href="http://www.zotero.org/styles/apa-6th-edition" rel="self"/>
-    <link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
-    <author>
-    <name>Simon Kornblith</name>
-    <email>simon@simonster.com</email>
-    </author>
-    <author>
-    <name> Brenton M. Wiernik</name>
-    <email>zotero@wiernik.org</email>
-    </author>
-    <contributor>
-    <name>Bruce D'Arcus</name>
-    </contributor>
-    <contributor>
-    <name>Curtis M. Humphrey</name>
-    </contributor>
-    <contributor>
-    <name>Richard Karnesky</name>
-    <email>karnesky+zotero@gmail.com</email>
-    <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
-    </contributor>
-    <contributor>
-    <name>Sebastian Karcher</name>
-    </contributor>
-    <category citation-format="author-date"/>
-    <category field="psychology"/>
-    <category field="generic-base"/>
-    <updated>2020-08-07T02:45:06+00:00</updated>
-    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    </info>
-    <locale xml:lang="en">
-    <terms>
-    <term name="editortranslator" form="short">
-    <single>ed. &amp; trans.</single>
-    <multiple>eds. &amp; trans.</multiple>
-    </term>
-    <term name="translator" form="short">trans.</term>
-    <term name="interviewer" form="short">
-    <single>interviewer</single>
-    <multiple>interviewers</multiple>
-    </term>
-    <term name="collection-editor" form="short">
-    <single>series ed.</single>
-    <multiple>series eds.</multiple>
-    </term>
-    <term name="circa" form="short">ca.</term>
-    <term name="bc"> B.C.E.</term>
-    <term name="ad"> C.E.</term>
-    </terms>
-    </locale>
-    <locale xml:lang="es">
-    <terms>
-    <term name="from">de</term>
-    </terms>
-    </locale>
-    <locale xml:lang="de">
-    <terms>
-    <term name="et-al">et al.</term>
-    </terms>
-    </locale>
-    <locale xml:lang="da">
-    <terms>
-    <term name="et-al">et al.</term>
-    </terms>
-    </locale>
-    <locale xml:lang="nn">
-    <terms>
-    <term name="et-al">et al.</term>
-    </terms>
-    </locale>
-    <locale xml:lang="nl">
-    <terms>
-    <term name="et-al">et al.</term>
-    </terms>
-    </locale>
-    <locale xml:lang="nb">
-    <terms>
-    <term name="et-al">et al.</term>
-    </terms>
-    </locale>
-    <locale xml:lang="fr">
-    <terms>
-    <term name="editor" form="short">
-    <single>éd.</single>
-    <multiple>éds.</multiple>
-    </term>
-    </terms>
-    </locale>
-    <macro name="container-contributors-booklike">
-    <choose>
-    <if variable="container-title">
-    <names variable="editor translator" delimiter=", &amp; ">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=" (" text-case="title" suffix=")"/>
-    <substitute>
-    <names variable="editorial-director"/>
-    <names variable="collection-editor"/>
-    <names variable="container-author"/>
-    </substitute>
-    </names>
-    </if>
-    </choose>
-    </macro>
-    <macro name="container-contributors">
-    <choose>
-    <!-- book is here to catch software with container titles -->
-    <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
-    <text macro="container-contributors-booklike"/>
-    </if>
-    <else-if type="paper-conference">
-    <choose>
-    <if variable="collection-editor container-author editor" match="any">
-    <text macro="container-contributors-booklike"/>
-    </if>
-    </choose>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="secondary-contributors-booklike">
-    <group delimiter="; ">
-    <choose>
-    <if variable="title">
-    <names variable="interviewer">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </if>
-    </choose>
-    <choose>
-    <if variable="container-title" match="none">
-    <group delimiter="; ">
-    <names variable="container-author">
-    <label form="verb-short" suffix=" " text-case="title"/>
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    </names>
-    <names variable="editor translator" delimiter="; ">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </group>
-    </if>
-    </choose>
-    </group>
-    </macro>
-    <macro name="secondary-contributors">
-    <choose>
-    <!-- book is here to catch software with container titles -->
-    <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
-    <text macro="secondary-contributors-booklike"/>
-    </if>
-    <else-if type="personal_communication">
-    <group delimiter="; ">
-    <group delimiter=" ">
-    <choose>
-    <if variable="genre" match="any">
-    <text variable="genre" text-case="capitalize-first"/>
-    </if>
-    <else>
-    <text term="letter" text-case="capitalize-first"/>
-    </else>
-    </choose>
-    <names variable="recipient" delimiter=", ">
-    <label form="verb" suffix=" "/>
-    <name and="symbol" delimiter=", "/>
-    </names>
-    </group>
-    <text variable="medium" text-case="capitalize-first"/>
-    <choose>
-    <if variable="container-title" match="none">
-    <names variable="editor translator" delimiter="; ">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </if>
-    </choose>
-    </group>
-    </else-if>
-    <else-if type="song">
-    <choose>
-    <if variable="original-author composer" match="any">
-    <group delimiter="; ">
-    <!-- Replace prefix with performer label as that becomes available -->
-    <names variable="author" prefix="Recorded by ">
-    <label form="verb" text-case="title"/>
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    </names>
-    <names variable="translator">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </group>
-    </if>
-    </choose>
-    </else-if>
-    <else-if type="article-journal article-magazine article-newspaper" match="any">
-    <group delimiter="; ">
-    <choose>
-    <if variable="title">
-    <names variable="interviewer" delimiter="; ">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </if>
-    </choose>
-    <names variable="translator" delimiter="; ">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </group>
-    </else-if>
-    <else-if type="paper-conference">
-    <choose>
-    <if variable="collection-editor editor" match="any">
-    <text macro="secondary-contributors-booklike"/>
-    </if>
-    <else>
-    <group delimiter="; ">
-    <choose>
-    <if variable="title">
-    <names variable="interviewer" delimiter="; ">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </if>
-    </choose>
-    <names variable="translator" delimiter="; ">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </group>
-    </else>
-    </choose>
-    </else-if>
-    <else>
-    <group delimiter="; ">
-    <choose>
-    <if variable="title">
-    <names variable="interviewer">
-    <name and="symbol" initialize-with=". " delimiter="; "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </if>
-    </choose>
-    <names variable="editor translator" delimiter="; ">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </group>
-    </else>
-    </choose>
-    </macro>
-    <macro name="author">
-    <choose>
-    <if type="song">
-    <names variable="composer" delimiter=", ">
-    <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-    <substitute>
-    <names variable="original-author"/>
-    <names variable="author"/>
-    <names variable="translator">
-    <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=" (" suffix=")" text-case="title"/>
-    </names>
-    <group delimiter=" ">
-    <text macro="title"/>
-    <text macro="description"/>
-    <text macro="format"/>
-    </group>
-    </substitute>
-    </names>
-    </if>
-    <else-if type="treaty"/>
-    <else>
-    <names variable="author" delimiter=", ">
-    <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-    <substitute>
-    <names variable="illustrator"/>
-    <names variable="composer"/>
-    <names variable="director">
-    <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="long" prefix=" (" suffix=")" text-case="title"/>
-    </names>
-    <choose>
-    <if variable="container-title">
-    <choose>
-    <if type="book entry entry-dictionary entry-encyclopedia">
-    <text macro="title"/>
-    </if>
-    <else>
-    <names variable="translator"/>
-    </else>
-    </choose>
-    <names variable="translator">
-    <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=" (" suffix=")" text-case="title"/>
-    </names>
-    </if>
-    </choose>
-    <names variable="editor translator" delimiter=", ">
-    <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=" (" suffix=")" text-case="title"/>
-    </names>
-    <names variable="editorial-director">
-    <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=" (" suffix=")" text-case="title"/>
-    </names>
-    <names variable="collection-editor">
-    <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=" (" suffix=")" text-case="title"/>
-    </names>
-    <choose>
-    <if type="report">
-    <text variable="publisher"/>
-    </if>
-    </choose>
-    <group delimiter=" ">
-    <text macro="title"/>
-    <text macro="description"/>
-    <text macro="format"/>
-    </group>
-    </substitute>
-    </names>
-    </else>
-    </choose>
-    </macro>
-    <macro name="author-short">
-    <choose>
-    <if type="patent" variable="number" match="all">
-    <text macro="patent-number"/>
-    </if>
-    <else-if type="treaty">
-    <text variable="title" form="short" text-case="title"/>
-    </else-if>
-    <else-if type="personal_communication">
-    <choose>
-    <if variable="archive DOI publisher URL" match="none">
-    <group delimiter=", ">
-    <names variable="author">
-    <name and="symbol" delimiter=", " initialize-with=". "/>
-    <substitute>
-    <text variable="title" form="short" text-case="title" quotes="true"/>
-    </substitute>
-    </names>
-    <!-- This should be localized -->
-    <text value="personal communication"/>
-    </group>
-    </if>
-    <else>
-    <names variable="author" delimiter=", ">
-    <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
-    <substitute>
-    <names variable="editor"/>
-    <names variable="translator"/>
-    <choose>
-    <if variable="container-title">
-    <text variable="title" form="short" text-case="title" quotes="true"/>
-    </if>
-    <else>
-    <text variable="title" form="short" text-case="title" font-style="italic"/>
-    </else>
-    </choose>
-    <text macro="format-short" prefix="[" suffix="]"/>
-    </substitute>
-    </names>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="song">
-    <names variable="composer" delimiter=", ">
-    <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
-    <substitute>
-    <names variable="original-author"/>
-    <names variable="author"/>
-    <names variable="translator"/>
-    <choose>
-    <if variable="container-title">
-    <text variable="title" form="short" text-case="title" quotes="true"/>
-    </if>
-    <else>
-    <text variable="title" form="short" text-case="title" font-style="italic"/>
-    </else>
-    </choose>
-    <text macro="format-short" prefix="[" suffix="]"/>
-    </substitute>
-    </names>
-    </else-if>
-    <else>
-    <names variable="author" delimiter=", ">
-    <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
-    <substitute>
-    <names variable="illustrator"/>
-    <names variable="composer"/>
-    <names variable="director"/>
-    <choose>
-    <if variable="container-title">
-    <choose>
-    <if type="book entry entry-dictionary entry-encyclopedia">
-    <text variable="title" form="short" text-case="title" quotes="true"/>
-    </if>
-    <else>
-    <names variable="translator"/>
-    </else>
-    </choose>
-    </if>
-    </choose>
-    <names variable="editor"/>
-    <names variable="editorial-director"/>
-    <names variable="translator"/>
-    <choose>
-    <if type="report" variable="publisher" match="all">
-    <text variable="publisher"/>
-    </if>
-    <else-if type="legal_case">
-    <text variable="title" font-style="italic"/>
-    </else-if>
-    <else-if type="bill legislation" match="any">
-    <text variable="title" form="short" text-case="title"/>
-    </else-if>
-    <else-if variable="reviewed-author" type="review review-book" match="any">
-    <text macro="format-short" prefix="[" suffix="]"/>
-    </else-if>
-    <else-if type="post post-weblog webpage" variable="container-title" match="any">
-    <text variable="title" form="short" text-case="title" quotes="true"/>
-    </else-if>
-    <else>
-    <text variable="title" form="short" text-case="title" font-style="italic"/>
-    </else>
-    </choose>
-    <text macro="format-short" prefix="[" suffix="]"/>
-    </substitute>
-    </names>
-    </else>
-    </choose>
-    </macro>
-    <macro name="patent-number">
-  <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
-    <group delimiter=" ">
-    <text variable="authority"/>
-    <choose>
-    <if variable="genre">
-    <text variable="genre" text-case="capitalize-first"/>
-    </if>
-    <else>
-    <!-- This should be localized -->
-    <text value="patent" text-case="capitalize-first"/>
-    </else>
-    </choose>
-    <group delimiter=" ">
-    <text term="issue" form="short" text-case="capitalize-first"/>
-    <text variable="number"/>
-    </group>
-    </group>
-    </macro>
-    <macro name="access">
-    <choose>
-    <if type="bill legal_case legislation" match="any"/>
-    <else-if variable="DOI" match="any">
-    <text variable="DOI" prefix="https://doi.org/"/>
-    </else-if>
-    <else-if variable="URL">
-    <group delimiter=" ">
-    <text term="retrieved" text-case="capitalize-first"/>
-    <choose>
-    <if type="post post-weblog webpage" match="any">
-    <date variable="accessed" form="text" suffix=","/>
-    </if>
-    </choose>
-    <text term="from"/>
-    <choose>
-    <if type="report">
-    <choose>
-    <if variable="author editor translator" match="any">
-    <!-- This should be localized -->
-    <text variable="publisher" suffix=" website:"/>
-    </if>
-    </choose>
-    </if>
-    <else-if type="post post-weblog webpage" match="any">
-    <!-- This should be localized -->
-    <text variable="container-title" suffix=" website:"/>
-    </else-if>
-    </choose>
-    <text variable="URL"/>
-    </group>
-    </else-if>
-    <else-if variable="archive">
-    <choose>
-    <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
-    <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
-    <choose>
-    <if variable="archive-place" match="none">
-    <group delimiter=" ">
-    <text term="retrieved" text-case="capitalize-first"/>
-    <text term="from"/>
-    <text variable="archive" suffix="."/>
-    <text variable="archive_location" prefix="(" suffix=")"/>
-    </group>
-    </if>
-    </choose>
-    </if>
-    </choose>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="title">
-    <choose>
-    <if type="treaty">
-    <group delimiter=", ">
-    <text variable="title" text-case="title"/>
-    <names variable="author">
-    <name initialize-with="." form="short" delimiter="-"/>
-    </names>
-    </group>
-    </if>
-    <else-if type="patent" variable="number" match="all">
-    <text macro="patent-number" font-style="italic"/>
-    </else-if>
-    <else-if variable="title">
-    <choose>
-    <if variable="version" type="book" match="all">
-    <!---This is a hack until we have a software type -->
-    <text variable="title"/>
-    </if>
-    <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-    <choose>
-    <if variable="reviewed-title">
-    <choose>
-    <if type="post post-weblog webpage" variable="container-title" match="any">
-    <text variable="title"/>
-    </if>
-    <else>
-    <text variable="title" font-style="italic"/>
-    </else>
-    </choose>
-    </if>
-    </choose>
-    </else-if>
-    <else-if type="post post-weblog webpage" variable="container-title" match="any">
-    <text variable="title"/>
-    </else-if>
-    <else>
-    <text variable="title" font-style="italic"/>
-    </else>
-    </choose>
-    </else-if>
-    <else-if variable="interviewer" type="interview" match="any">
-    <names variable="interviewer">
-    <label form="verb-short" suffix=" " text-case="capitalize-first"/>
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    </names>
-    </else-if>
-    </choose>
-    </macro>
-  <!-- APA has four descriptive sections following the title: -->
-    <!-- (description), [format], container, event -->
-    <macro name="description">
-    <group prefix="(" suffix=")">
-    <choose>
-    <!-- book is here to catch software with container titles -->
-    <if type="book report" match="any">
-    <choose>
-    <if variable="container-title">
-    <text macro="secondary-contributors"/>
-    </if>
-    <else>
-    <group delimiter="; ">
-    <text macro="description-report"/>
-    <text macro="secondary-contributors"/>
-    </group>
-    </else>
-    </choose>
-    </if>
-    <else-if type="thesis">
-    <group delimiter="; ">
-    <group delimiter=", ">
-    <text variable="genre" text-case="capitalize-first"/>
-    <choose>
-    <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
-    <if variable="DOI URL archive" match="any">
-    <text variable="publisher"/>
-    </if>
-    </choose>
-    </group>
-    <text macro="locators"/>
-    <text macro="secondary-contributors"/>
-    </group>
-    </else-if>
-    <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
-    <group delimiter="; ">
-    <text macro="locators"/>
-    <text macro="secondary-contributors"/>
-    </group>
-    </else-if>
-    <else-if type="song">
-    <choose>
-    <if variable="container-title" match="none">
-    <text macro="locators"/>
-    </if>
-    </choose>
-    </else-if>
-    <else-if type="article dataset figure" match="any">
-    <choose>
-    <if variable="container-title">
-    <text macro="secondary-contributors"/>
-    </if>
-    <else>
-    <group delimiter="; ">
-    <text macro="locators"/>
-    <text macro="secondary-contributors"/>
-    </group>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
-    <text macro="secondary-contributors"/>
-    </else-if>
-    </choose>
-    </group>
-    </macro>
-    <macro name="format">
-    <group prefix="[" suffix="]">
-    <choose>
-    <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-    <group delimiter=", ">
-    <choose>
-    <if variable="genre">
-    <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
-    <group delimiter=", ">
-    <text variable="genre" text-case="capitalize-first"/>
-    <choose>
-    <if variable="reviewed-title">
-    <text variable="reviewed-title" font-style="italic"/>
-    </if>
-    <else>
-    <!-- Assume `title` is title of reviewed work -->
-    <text variable="title" font-style="italic"/>
-    </else>
-    </choose>
-    </group>
-    </if>
-    <else>
-    <!-- This should be localized -->
-    <group delimiter=" ">
-    <text value="Review of"/>
-    <choose>
-    <if variable="reviewed-title">
-    <text variable="reviewed-title" font-style="italic"/>
-    </if>
-    <else>
-    <!-- Assume `title` is title of reviewed work -->
-    <text variable="title" font-style="italic"/>
-    </else>
-    </choose>
-    </group>
-    </else>
-    </choose>
-    <names variable="reviewed-author">
-    <label form="verb-short" suffix=" "/>
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    </names>
-    </group>
-    </if>
-    <else>
-    <text macro="format-short"/>
-    </else>
-    </choose>
-    </group>
-    </macro>
-    <macro name="format-short">
-    <choose>
-    <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-    <choose>
-    <if variable="reviewed-title" match="none">
-    <choose>
-    <if variable="genre">
-    <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
-    <group delimiter=", ">
-    <text variable="genre" text-case="capitalize-first"/>
-    <text variable="title" form="short" text-case="title" font-style="italic"/>
-    </group>
-    </if>
-    <else>
-    <!-- This should be localized -->
-    <group delimiter=" ">
-    <text value="Review of"/>
-    <text variable="title" form="short" text-case="title" font-style="italic"/>
-    </group>
-    </else>
-    </choose>
-    </if>
-    <else>
-    <text variable="title" form="short" text-case="title" quotes="true"/>
-    </else>
-    </choose>
-    </if>
-    <else-if type="speech thesis" match="any">
-    <text variable="medium" text-case="capitalize-first"/>
-    </else-if>
-    <!-- book is here to catch software with container titles -->
-    <else-if type="book report" match="any">
-    <choose>
-    <if variable="container-title" match="none">
-    <text macro="format-report"/>
-    </if>
-    </choose>
-    </else-if>
-    <else-if type="manuscript pamphlet" match="any">
-    <text variable="medium" text-case="capitalize-first"/>
-    </else-if>
-    <else-if type="personal_communication">
-    <text macro="secondary-contributors"/>
-    </else-if>
-    <else-if type="song">
-    <group delimiter="; ">
-    <text macro="secondary-contributors"/>
-    <choose>
-    <if variable="container-title" match="none">
-    <group delimiter=", ">
-    <text variable="genre" text-case="capitalize-first"/>
-    <text variable="medium" text-case="capitalize-first"/>
-    </group>
-    </if>
-    </choose>
-    </group>
-    </else-if>
-    <else-if type="paper-conference">
-    <group delimiter=", ">
-    <choose>
-    <if variable="collection-editor editor issue page volume" match="any">
-    <text variable="genre" text-case="capitalize-first"/>
-    </if>
-    </choose>
-    <text variable="medium" text-case="capitalize-first"/>
-    </group>
-    </else-if>
-    <else-if type="bill legislation legal_case patent treaty" match="none">
-    <choose>
-    <if variable="genre medium" match="any">
-    <group delimiter=", ">
-    <text variable="genre" text-case="capitalize-first"/>
-    <text variable="medium" text-case="capitalize-first"/>
-    </group>
-    </if>
-    <else-if type="dataset">
-    <!-- This should be localized -->
-    <text value="Data set"/>
-    </else-if>
-    </choose>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="description-report">
-    <choose>
-    <if variable="number">
-    <group delimiter="; ">
-    <group delimiter=" ">
-    <text variable="genre" text-case="title"/>
-    <!-- Replace with term="number" if that becomes available -->
-    <text term="issue" form="short" text-case="capitalize-first"/>
-    <text variable="number"/>
-    </group>
-    <text macro="locators"/>
-    </group>
-    </if>
-    <else>
-    <text macro="locators"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="format-report">
-    <choose>
-    <if variable="number">
-    <text variable="medium" text-case="capitalize-first"/>
-    </if>
-    <else>
-    <group delimiter=", ">
-    <text variable="genre" text-case="capitalize-first"/>
-    <text variable="medium" text-case="capitalize-first"/>
-    </group>
-    </else>
-    </choose>
-    </macro>
-    <macro name="title-and-descriptions">
-    <group delimiter=" ">
-    <text macro="title"/>
-    <choose>
-    <if variable="title interviewer" type="interview" match="any">
-    <group delimiter=" ">
-    <text macro="description"/>
-    <text macro="format"/>
-    </group>
-    </if>
-    <else>
-    <group delimiter=" ">
-    <text macro="format"/>
-    <text macro="description"/>
-    </group>
-    </else>
-    </choose>
-    </group>
-    </macro>
-    <macro name="archive">
-    <group delimiter=". ">
-    <group delimiter=", ">
-    <choose>
-    <if type="manuscript">
-    <text variable="genre"/>
-    </if>
-    </choose>
-    <group delimiter=" ">
-    <!-- Replace "archive" with "archive_collection" as that becomes available -->
-    <text variable="archive"/>
-    <text variable="archive_location" prefix="(" suffix=")"/>
-    </group>
-    </group>
-    <group delimiter=", ">
-    <!-- Move "archive" here when "archive_collection" becomes available -->
-    <text variable="archive-place"/>
-    </group>
-    </group>
-    </macro>
-    <macro name="publisher">
-    <choose>
-    <if type="manuscript pamphlet" match="any">
-    <choose>
-    <if variable="archive archive_location archive-place" match="any">
-    <group delimiter=". ">
-  <group delimiter=": ">
-                  <text variable="publisher-place"/>
-                        <text variable="publisher"/>
-    </group>
-    <text macro="archive"/>
-    </group>
-    </if>
-    <else>
-    <group delimiter=", ">
-    <text variable="genre"/>
-    <text variable="publisher"/>
-    <text variable="publisher-place"/>
-    </group>
-    </else>
-    </choose>
-    </if>
-    <else-if type="thesis" match="any">
-    <group delimiter=". ">
-    <group delimiter=", ">
-    <text variable="publisher"/>
-    <text variable="publisher-place"/>
-    </group>
-    <text macro="archive"/>
-    </group>
-    </else-if>
-    <else-if type="patent">
-    <group delimiter=". ">
-  <group delimiter=": ">
-              <text variable="publisher-place"/>
-                        <text variable="publisher"/>
-    </group>
-    <text macro="archive"/>
-    </group>
-    </else-if>
-    <else-if type="article-journal article-magazine article-newspaper" match="any">
-    <text macro="archive"/>
-    </else-if>
-    <else-if type="post post-weblog webpage" match="none">
-    <group delimiter=". ">
-    <choose>
-    <if variable="event">
-    <choose>
-    <!-- Only print publisher info if published in a proceedings -->
-    <if variable="collection-editor editor issue page volume" match="any">
-  <group delimiter=": ">
-                      <text variable="publisher-place"/>
-                        <text variable="publisher"/>
-    </group>
-    </if>
-    </choose>
-    </if>
-    <else>
-  <group delimiter=": ">
-                  <text variable="publisher-place"/>
-                        <text variable="publisher"/>
-    </group>
-    </else>
-    </choose>
-    <text macro="archive"/>
-    </group>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="event">
-    <choose>
-    <if variable="event" type="speech paper-conference" match="any">
-    <choose>
-    <!-- Don't print event info if published in a proceedings -->
-    <if variable="collection-editor editor issue page volume" match="none">
-    <group delimiter=" ">
-    <text variable="genre" text-case="capitalize-first"/>
-    <group delimiter=" ">
-    <choose>
-    <if variable="genre">
-    <text term="presented at"/>
-    </if>
-    <else>
-    <text term="presented at" text-case="capitalize-first"/>
-    </else>
-    </choose>
-    <group delimiter=", ">
-    <text variable="event"/>
-    <text variable="event-place"/>
-    </group>
-    </group>
-    </group>
-    </if>
-    </choose>
-    </if>
-    </choose>
-    </macro>
-    <macro name="issued">
-    <choose>
-    <if type="bill legal_case legislation" match="any"/>
-    <else-if variable="issued">
-    <group>
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    <text variable="year-suffix"/>
-    <choose>
-    <if type="speech">
-    <date variable="issued" delimiter=" ">
-    <date-part prefix=", " name="month"/>
-    </date>
-    </if>
-    <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
-    <date variable="issued">
-    <date-part prefix=", " name="month"/>
-    <date-part prefix=" " name="day"/>
-    </date>
-    </else-if>
-    <else-if type="paper-conference">
-    <choose>
-    <if variable="container-title" match="none">
-    <date variable="issued">
-    <date-part prefix=", " name="month"/>
-    <date-part prefix=" " name="day"/>
-    </date>
-    </if>
-    </choose>
-    </else-if>
-  <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
-    </choose>
-    </group>
-    </else-if>
-    <else-if variable="status">
-    <group>
-    <text variable="status" text-case="lowercase"/>
-    <text variable="year-suffix" prefix="-"/>
-    </group>
-    </else-if>
-    <else>
-    <group>
-    <text term="no date" form="short"/>
-    <text variable="year-suffix" prefix="-"/>
-    </group>
-    </else>
-    </choose>
-    </macro>
-    <macro name="issued-sort">
-    <choose>
-    <if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
-    <date variable="issued">
-    <date-part name="year"/>
-    <date-part name="month"/>
-    <date-part name="day"/>
-    </date>
-    </if>
-    <else>
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    </else>
-    </choose>
-    </macro>
-    <macro name="issued-year">
-    <group>
-    <choose>
-    <if type="personal_communication">
-    <choose>
-    <if variable="archive DOI publisher URL" match="none">
-    <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
-    <date variable="issued" form="text"/>
-    </if>
-    <else>
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    </else>
-    </choose>
-    </if>
-    <else>
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    </else>
-    </choose>
-    <text variable="year-suffix"/>
-    </group>
-    </macro>
-    <macro name="issued-citation">
-    <choose>
-    <if variable="issued">
-    <group delimiter="/">
-    <choose>
-    <if is-uncertain-date="original-date">
-    <group prefix="[" suffix="]" delimiter=" ">
-    <text term="circa" form="short"/>
-    <date variable="original-date">
-    <date-part name="year"/>
-    </date>
-    </group>
-    </if>
-    <else>
-    <date variable="original-date">
-    <date-part name="year"/>
-    </date>
-    </else>
-    </choose>
-    <choose>
-    <if is-uncertain-date="issued">
-    <group prefix="[" suffix="]" delimiter=" ">
-    <text term="circa" form="short"/>
-    <text macro="issued-year"/>
-    </group>
-    </if>
-    <else>
-    <text macro="issued-year"/>
-    </else>
-    </choose>
-    </group>
-    </if>
-    <else-if variable="status">
-    <text variable="status" text-case="lowercase"/>
-    <text variable="year-suffix" prefix="-"/>
-    </else-if>
-    <else>
-    <text term="no date" form="short"/>
-    <text variable="year-suffix" prefix="-"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="original-date">
-    <choose>
-    <if type="bill legal_case legislation" match="any"/>
-    <else-if type="speech">
-    <date variable="original-date" delimiter=" ">
-    <date-part name="month"/>
-    <date-part name="year"/>
-    </date>
-    </else-if>
-    <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
-    <date variable="original-date" form="text"/>
-    </else-if>
-    <else>
-    <date variable="original-date">
-    <date-part name="year"/>
-    </date>
-    </else>
-    </choose>
-    </macro>
-    <macro name="original-published">
-    <!--This should be localized -->
-    <choose>
-    <if type="bill legal_case legislation" match="any"/>
-    <else-if type="interview motion_picture song" match="any">
-    <text value="Original work recorded"/>
-    </else-if>
-    <else-if type="broadcast">
-    <text value="Original work broadcast"/>
-    </else-if>
-    <else>
-    <text value="Original work published"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="edition">
-    <choose>
-    <if is-numeric="edition">
-    <group delimiter=" ">
-    <number variable="edition" form="ordinal"/>
-    <text term="edition" form="short"/>
-    </group>
-    </if>
-    <else>
-    <text variable="edition"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="locators">
-    <choose>
-    <if type="article-journal article-magazine figure review review-book" match="any">
-    <group delimiter=", ">
-    <group>
-    <text variable="volume" font-style="italic"/>
-    <text variable="issue" prefix="(" suffix=")"/>
-    </group>
-    <text variable="page"/>
-    </group>
-    </if>
-    <else-if type="article-newspaper">
-    <group delimiter=" ">
-    <label variable="page" form="short"/>
-    <text variable="page"/>
-    </group>
-    </else-if>
-    <else-if type="paper-conference">
-    <choose>
-    <if variable="collection-editor editor" match="any">
-    <text macro="locators-booklike"/>
-    </if>
-    <else>
-    <group delimiter=", ">
-    <group>
-    <text variable="volume" font-style="italic"/>
-    <text variable="issue" prefix="(" suffix=")"/>
-    </group>
-    <text variable="page"/>
-    </group>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
-    <text macro="locators-booklike"/>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="locators-booklike">
-    <group delimiter=", ">
-    <text macro="edition"/>
-    <group delimiter=" ">
-    <text term="version" text-case="capitalize-first"/>
-    <text variable="version"/>
-    </group>
-    <choose>
-    <if variable="volume" match="any">
-    <choose>
-    <if is-numeric="volume" match="none"/>
-    <else-if variable="collection-title">
-    <choose>
-    <if variable="editor translator" match="none">
-    <choose>
-    <if variable="collection-number">
-    <group>
-    <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-    <number variable="volume" form="numeric"/>
-    </group>
-    </if>
-    </choose>
-    </if>
-    </choose>
-    </else-if>
-    <else>
-    <group>
-    <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-    <number variable="volume" form="numeric"/>
-    </group>
-    </else>
-    </choose>
-    </if>
-    <else>
-    <group>
-    <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-    <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
-    </group>
-    </else>
-    </choose>
-    <group>
-    <label variable="page" form="short" suffix=" "/>
-    <text variable="page"/>
-    </group>
-    </group>
-    </macro>
-    <macro name="citation-locator">
-    <group>
-    <choose>
-    <if locator="chapter">
-    <label variable="locator" text-case="capitalize-first"/>
-    </if>
-    <else>
-    <label variable="locator" form="short"/>
-    </else>
-    </choose>
-    <text variable="locator" prefix=" "/>
-    </group>
-    </macro>
-    <macro name="container">
-    <choose>
-    <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
-    <group delimiter=", ">
-    <text macro="container-title"/>
-    <text macro="locators"/>
-    </group>
-    <choose>
-    <!--for advance online publication-->
-    <if variable="issued">
-    <choose>
-    <if variable="page issue" match="none">
-    <text variable="status" text-case="capitalize-first" prefix=". "/>
-    </if>
-    </choose>
-    </if>
-    </choose>
-    </if>
-    <else-if type="article dataset figure" match="any">
-    <choose>
-    <if variable="container-title">
-    <group delimiter=", ">
-    <text macro="container-title"/>
-    <text macro="locators"/>
-    </group>
-    <choose>
-    <!--for advance online publication-->
-    <if variable="issued">
-    <choose>
-    <if variable="page issue" match="none">
-    <text variable="status" text-case="capitalize-first" prefix=". "/>
-    </if>
-    </choose>
-    </if>
-    </choose>
-    </if>
-    </choose>
-    </else-if>
-    <!-- book is here to catch software with container titles -->
-    <else-if type="book" variable="container-title" match="all">
-    <group delimiter=" ">
-    <text term="in" text-case="capitalize-first" suffix=" "/>
-    <group delimiter=", ">
-    <text macro="container-contributors"/>
-    <group delimiter=" ">
-    <text macro="container-title"/>
-    <text macro="description-report" prefix="(" suffix=")"/>
-    <text macro="format-report" prefix="[" suffix="]"/>
-    </group>
-    </group>
-    </group>
-    </else-if>
-    <else-if type="report" variable="container-title" match="all">
-    <group delimiter=" ">
-    <text term="in" text-case="capitalize-first" suffix=" "/>
-    <group delimiter=", ">
-    <text macro="container-contributors"/>
-    <group delimiter=" ">
-    <text macro="container-title"/>
-    <text macro="description-report" prefix="(" suffix=")"/>
-    <text macro="format-report" prefix="[" suffix="]"/>
-    </group>
-    </group>
-    </group>
-    </else-if>
-    <else-if type="song" variable="container-title" match="all">
-    <group delimiter=" ">
-    <text term="in" text-case="capitalize-first" suffix=" "/>
-    <group delimiter=", ">
-    <text macro="container-contributors"/>
-    <group delimiter=" ">
-    <text macro="container-title"/>
-    <text macro="locators" prefix="(" suffix=")"/>
-    <group delimiter=", " prefix="[" suffix="]">
-    <text variable="genre" text-case="capitalize-first"/>
-    <text variable="medium" text-case="capitalize-first"/>
-    </group>
-    </group>
-    </group>
-    </group>
-    </else-if>
-    <else-if type="paper-conference">
-    <choose>
-    <if variable="editor collection-editor container-author" match="any">
-    <text macro="container-booklike"/>
-    </if>
-    <else>
-    <group delimiter=", ">
-    <text macro="container-title"/>
-    <text macro="locators"/>
-    </group>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="book">
-    <choose>
-    <!-- book and software should not cite collection-title, only container-title -->
-    <if variable="container-title">
-    <text macro="container-booklike"/>
-    </if>
-    </choose>
-    </else-if>
-    <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
-    <text macro="container-booklike"/>
-    </else-if>
-    <else-if type="bill legal_case legislation treaty" match="any">
-    <text macro="legal-cites"/>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="container-booklike">
-    <choose>
-    <if variable="container-title collection-title" match="any">
-    <group delimiter=" ">
-    <text term="in" text-case="capitalize-first"/>
-    <group delimiter=", ">
-    <text macro="container-contributors"/>
-    <choose>
-    <if variable="container-author editor translator" match="none">
-    <group delimiter=". ">
-  <group delimiter=": ">
-                      <text variable="collection-title" font-style="italic" text-case="title"/>
-                        <choose>
-                        <if variable="collection-title">
-                        <group delimiter=" ">
-                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                        <number variable="collection-number" font-style="italic" form="numeric"/>
-                        <choose>
-                        <if variable="collection-number" match="none">
-                        <number variable="volume" font-style="italic" form="numeric"/>
-                        </if>
-                        </choose>
-                        </group>
-                        </if>
-                        </choose>
-    </group>
-    <!-- Replace with volume-title as that becomes available -->
-  <group delimiter=": ">
-                      <text macro="container-title"/>
-                        <choose>
-                        <if variable="collection-title" is-numeric="volume" match="none">
-                        <group delimiter=" ">
-                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                        <text variable="volume" font-style="italic"/>
-                        </group>
-                        </if>
-                        </choose>
-    </group>
-    </group>
-    </if>
-    <else>
-    <!-- Replace with volume-title as that becomes available -->
-  <group delimiter=": ">
-                    <text macro="container-title"/>
-                        <choose>
-                        <if is-numeric="volume" match="none">
-                        <group delimiter=" ">
-                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                        <text variable="volume" font-style="italic"/>
-                        </group>
-                        </if>
-                        </choose>
-    </group>
-    </else>
-    </choose>
-    </group>
-    <group delimiter="; " prefix="(" suffix=")">
-    <text macro="locators"/>
-    <names variable="container-author">
-    <label form="verb-short" suffix=" " text-case="title"/>
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    </names>
-    </group>
-    </group>
-    </if>
-    </choose>
-    </macro>
-    <macro name="container-title">
-    <choose>
-    <if type="article article-journal article-magazine article-newspaper dataset" match="any">
-    <text variable="container-title" font-style="italic" text-case="title"/>
-    </if>
-    <else-if type="paper-conference speech">
-    <choose>
-    <if variable="collection-editor container-author editor" match="any">
-    <text variable="container-title" font-style="italic"/>
-    </if>
-    <else>
-    <text variable="container-title" font-style="italic" text-case="title"/>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="bill legal_case legislation post-weblog webpage" match="none">
-    <text variable="container-title" font-style="italic"/>
-    </else-if>
-    </choose>
-    </macro>
-    <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
-    <macro name="publication-history">
-    <choose>
-    <if type="patent" match="none">
-    <group prefix="(" suffix=")">
-    <choose>
-    <if variable="references">
-    <!-- This provides the option for more elaborate description
-    of publication history, such as full "reprinted" references
-    (example 26) or retracted references -->
-    <text variable="references"/>
-    </if>
-    <else>
-    <choose>
-    <if variable="original-date">
-    <group delimiter=" ">
-    <text macro="original-published"/>
-    <choose>
-    <if is-uncertain-date="original-date">
-    <group prefix="[" suffix="]" delimiter=" ">
-    <text term="circa" form="short"/>
-    <text macro="original-date"/>
-    </group>
-    </if>
-    <else>
-    <text macro="original-date"/>
-    </else>
-    </choose>
-    </group>
-    </if>
-    </choose>
-    </else>
-    </choose>
-    </group>
-    </if>
-    <else>
-    <text variable="references" prefix="(" suffix=")"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="legal-cites">
-    <choose>
-    <if type="legal_case">
-    <group prefix=", " delimiter=" ">
-    <group delimiter=" ">
-    <choose>
-    <if variable="container-title">
-    <text variable="volume"/>
-    <text variable="container-title"/>
-    <group delimiter=" ">
-    <!--change to label variable="section" as that becomes available -->
-    <text term="section" form="symbol"/>
-    <text variable="section"/>
-    </group>
-    <text variable="page"/>
-    </if>
-    <else>
-    <group delimiter=" ">
-    <choose>
-    <if is-numeric="number">
-    <!-- Replace with term="number" if that becomes available -->
-    <text term="issue" form="short" text-case="capitalize-first"/>
-    </if>
-    </choose>
-    <text variable="number"/>
-    </group>
-    </else>
-    </choose>
-    </group>
-    <group prefix="(" suffix=")" delimiter=" ">
-    <text variable="authority"/>
-    <choose>
-    <if variable="container-title" match="any">
-    <!--Only print year for cases published in reporters-->
-    <date variable="issued" form="numeric" date-parts="year"/>
-    </if>
-    <else>
-    <date variable="issued" form="text"/>
-    </else>
-    </choose>
-    </group>
-    </group>
-    </if>
-    <else-if type="bill legislation" match="any">
-    <group prefix=", " delimiter=" ">
-    <group delimiter=", ">
-    <choose>
-    <if variable="number">
-    <!--There's a public law number-->
-    <text variable="number" prefix="Pub. L. No. "/>
-    <group delimiter=" ">
-    <!--change to label variable="section" as that becomes available -->
-    <text term="section" form="symbol"/>
-    <text variable="section"/>
-    </group>
-    <group delimiter=" ">
-    <text variable="volume"/>
-    <text variable="container-title"/>
-    <text variable="page-first"/>
-    </group>
-    </if>
-    <else>
-    <group delimiter=" ">
-    <text variable="volume"/>
-    <text variable="container-title"/>
-    <!--change to label variable="section" as that becomes available -->
-    <text term="section" form="symbol"/>
-    <text variable="section"/>
-    </group>
-    </else>
-    </choose>
-    </group>
-    <date variable="issued" prefix="(" suffix=")">
-    <date-part name="year"/>
-    </date>
-    </group>
-    </else-if>
-    <else-if type="treaty">
-    <group delimiter=" ">
-    <number variable="volume"/>
-    <text variable="container-title"/>
-    <text variable="page"/>
-    </group>
-    </else-if>
-    </choose>
-    </macro>
-    <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
-    <sort>
-    <key macro="author" names-min="8" names-use-first="6"/>
-    <key macro="issued-sort"/>
-    </sort>
-    <layout prefix="(" suffix=")" delimiter="; ">
-    <group delimiter=", ">
-    <text macro="author-short"/>
-    <text macro="issued-citation"/>
-    <text macro="citation-locator"/>
-    </group>
-    </layout>
-    </citation>
-    <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2">
-    <sort>
-    <key macro="author"/>
-    <key macro="issued-sort" sort="ascending"/>
-    <key macro="title"/>
-    </sort>
-    <layout>
-    <group delimiter=" ">
-    <group delimiter=". " suffix=".">
-    <text macro="author"/>
-    <choose>
-    <if is-uncertain-date="issued">
-    <group prefix="[" suffix="]" delimiter=" ">
-    <text term="circa" form="short"/>
-    <text macro="issued"/>
-    </group>
-    </if>
-    <else>
-    <text macro="issued" prefix="(" suffix=")"/>
-    </else>
-    </choose>
-    <text macro="title-and-descriptions"/>
-    <text macro="container"/>
-    <text macro="event"/>
-    <text macro="publisher"/>
-    </group>
-    <text macro="access"/>
-    <text macro="publication-history"/>
-    </group>
-    </layout>
-    </bibliography>
-    </style>
-updated: 1596768306
-custom: true
-url_id: 'http://www.zotero.org/styles/apa-6th-edition'
diff --git a/config/sync/bibcite.bibcite_csl_style.chicago_author_date.yml b/config/sync/bibcite.bibcite_csl_style.chicago_author_date.yml
deleted file mode 100644
index 240747148..000000000
--- a/config/sync/bibcite.bibcite_csl_style.chicago_author_date.yml
+++ /dev/null
@@ -1,670 +0,0 @@
-uuid: 3b0a3238-98e2-47b1-8e6f-0ea403a1faf5
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: uKTD7PvBOSjC4G6K4Cwquf7ds33h_qGDl9x96WCDSoU
-id: chicago_author_date
-parent: null
-label: 'Chicago Manual of Style 16th edition (author-date)'
-csl: |
-  <?xml version="1.0" encoding="utf-8"?>
-    <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="display-and-sort" page-range-format="chicago">
-    <info>
-    <title>Chicago Manual of Style 16th edition (author-date)</title>
-    <id>http://www.zotero.org/styles/chicago-author-date-16th-edition</id>
-    <link href="http://www.zotero.org/styles/chicago-author-date-16th-edition" rel="self"/>
-    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
-    <author>
-    <name>Julian Onions</name>
-    <email>julian.onions@gmail.com</email>
-    </author>
-    <contributor>
-    <name>Sebastian Karcher</name>
-    </contributor>
-    <contributor>
-    <name>Richard Karnesky</name>
-    <email>karnesky+zotero@gmail.com</email>
-    <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
-    </contributor>
-    <contributor>
-    <name>Andrew Dunning</name>
-    <email>andrew.dunning@utoronto.ca</email>
-    </contributor>
-    <contributor>
-    <name>Brenton M. Wiernik</name>
-    </contributor>
-    <category citation-format="author-date"/>
-    <category field="generic-base"/>
-    <summary>The author-date variant of the Chicago style</summary>
-    <updated>2020-04-26T18:22:50+00:00</updated>
-    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    </info>
-    <locale xml:lang="en">
-    <terms>
-    <term name="editor" form="verb-short">ed.</term>
-    <term name="container-author" form="verb">by</term>
-    <term name="translator" form="verb-short">trans.</term>
-    <term name="editortranslator" form="verb">edited and translated by</term>
-    <term name="translator" form="short">trans.</term>
-    </terms>
-    </locale>
-    <macro name="secondary-contributors">
-    <choose>
-    <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
-    <group delimiter=". ">
-    <names variable="editor translator" delimiter=". ">
-    <label form="verb" text-case="capitalize-first" suffix=" "/>
-    <name and="text" delimiter=", "/>
-    </names>
-    <names variable="director" delimiter=". ">
-    <label form="verb" text-case="capitalize-first" suffix=" "/>
-    <name and="text" delimiter=", "/>
-    </names>
-    </group>
-    </if>
-    </choose>
-    </macro>
-    <macro name="container-contributors">
-    <choose>
-    <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
-    <group prefix=", " delimiter=", ">
-    <names variable="container-author" delimiter=", ">
-    <label form="verb" suffix=" "/>
-    <name and="text" delimiter=", "/>
-    </names>
-    <names variable="editor translator" delimiter=", ">
-    <label form="verb" suffix=" "/>
-    <name and="text" delimiter=", "/>
-    </names>
-    </group>
-    </if>
-    </choose>
-    </macro>
-    <macro name="editor">
-    <names variable="editor">
-    <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=", "/>
-    </names>
-    </macro>
-    <macro name="translator">
-    <names variable="translator">
-    <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=", "/>
-    </names>
-    </macro>
-    <macro name="recipient">
-    <choose>
-    <if type="personal_communication">
-    <choose>
-    <if variable="genre">
-    <text variable="genre" text-case="capitalize-first"/>
-    </if>
-    <else>
-    <text term="letter" text-case="capitalize-first"/>
-    </else>
-    </choose>
-    </if>
-    </choose>
-    <names variable="recipient" delimiter=", ">
-    <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-    <name and="text" delimiter=", "/>
-    </names>
-    </macro>
-    <macro name="substitute-title">
-    <choose>
-    <if type="article-magazine article-newspaper review review-book" match="any">
-    <text macro="container-title"/>
-    </if>
-    </choose>
-    </macro>
-    <macro name="contributors">
-    <group delimiter=". ">
-    <names variable="author">
-    <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=", "/>
-    <substitute>
-    <names variable="editor"/>
-    <names variable="translator"/>
-    <names variable="director"/>
-    <text macro="substitute-title"/>
-    <text macro="title"/>
-    </substitute>
-    </names>
-    <text macro="recipient"/>
-    </group>
-    </macro>
-    <macro name="contributors-short">
-    <names variable="author">
-    <name form="short" and="text" delimiter=", " initialize-with=". "/>
-    <substitute>
-    <names variable="editor"/>
-    <names variable="translator"/>
-    <names variable="director"/>
-    <text macro="substitute-title"/>
-    <text macro="title"/>
-    </substitute>
-    </names>
-    </macro>
-    <macro name="interviewer">
-    <names variable="interviewer" delimiter=", ">
-    <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
-    <name and="text" delimiter=", "/>
-    </names>
-    </macro>
-    <macro name="archive">
-    <group delimiter=". ">
-    <text variable="archive_location" text-case="capitalize-first"/>
-    <text variable="archive"/>
-    <text variable="archive-place"/>
-    </group>
-    </macro>
-    <macro name="access">
-    <group delimiter=". ">
-    <choose>
-    <if type="graphic report" match="any">
-    <text macro="archive"/>
-    </if>
-    <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
-    <text macro="archive"/>
-    </else-if>
-    </choose>
-    <choose>
-    <if type="webpage post-weblog" match="any">
-    <date variable="issued" delimiter=" ">
-    <date-part name="month"/>
-    <date-part name="day"/>
-    </date>
-    </if>
-    </choose>
-    <choose>
-    <if variable="issued" match="none">
-    <group delimiter=" ">
-    <text term="accessed" text-case="capitalize-first"/>
-    <date variable="accessed" delimiter=" ">
-    <date-part name="month"/>
-    <date-part name="day"/>
-    </date>
-    </group>
-    </if>
-    </choose>
-    <choose>
-    <if type="legal_case" match="none">
-    <choose>
-    <if variable="DOI">
-    <text variable="DOI" prefix="doi:"/>
-    </if>
-    <else>
-    <text variable="URL"/>
-    </else>
-    </choose>
-    </if>
-    </choose>
-    </group>
-    </macro>
-    <macro name="title">
-    <choose>
-    <if variable="title" match="none">
-    <choose>
-    <if type="personal_communication" match="none">
-    <text variable="genre" text-case="capitalize-first"/>
-    </if>
-    </choose>
-    </if>
-    <else-if type="bill book graphic legislation motion_picture song" match="any">
-    <text variable="title" text-case="title" font-style="italic"/>
-    <group prefix=" (" suffix=")" delimiter=" ">
-    <text term="version"/>
-    <text variable="version"/>
-    </group>
-    </else-if>
-    <else-if variable="reviewed-author">
-    <choose>
-    <if variable="reviewed-title">
-    <group delimiter=". ">
-    <text variable="title" text-case="title" quotes="true"/>
-    <group delimiter=", ">
-    <text variable="reviewed-title" text-case="title" font-style="italic" prefix="Review of "/>
-    <names variable="reviewed-author">
-    <label form="verb-short" text-case="lowercase" suffix=" "/>
-    <name and="text" delimiter=", "/>
-    </names>
-    </group>
-    </group>
-    </if>
-    <else>
-    <group delimiter=", ">
-    <text variable="title" text-case="title" font-style="italic" prefix="Review of "/>
-    <names variable="reviewed-author">
-    <label form="verb-short" text-case="lowercase" suffix=" "/>
-    <name and="text" delimiter=", "/>
-    </names>
-    </group>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="legal_case interview patent" match="any">
-    <text variable="title"/>
-    </else-if>
-    <else>
-    <text variable="title" text-case="title" quotes="true"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="edition">
-    <choose>
-    <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-    <choose>
-    <if is-numeric="edition">
-    <group delimiter=" " prefix=". ">
-    <number variable="edition" form="ordinal"/>
-    <text term="edition" form="short" strip-periods="true"/>
-    </group>
-    </if>
-    <else>
-    <text variable="edition" text-case="capitalize-first" prefix=". "/>
-    </else>
-    </choose>
-    </if>
-    <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
-    <choose>
-    <if is-numeric="edition">
-    <group delimiter=" " prefix=", ">
-    <number variable="edition" form="ordinal"/>
-    <text term="edition" form="short"/>
-    </group>
-    </if>
-    <else>
-    <text variable="edition" prefix=", "/>
-    </else>
-    </choose>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="locators">
-    <choose>
-    <if type="article-journal">
-    <choose>
-    <if variable="volume">
-    <text variable="volume" prefix=" "/>
-    <group prefix=" (" suffix=")">
-    <choose>
-    <if variable="issue">
-    <text variable="issue"/>
-    </if>
-    <else>
-    <date variable="issued">
-    <date-part name="month"/>
-    </date>
-    </else>
-    </choose>
-    </group>
-    </if>
-    <else-if variable="issue">
-    <group delimiter=" " prefix=", ">
-    <text term="issue" form="short"/>
-    <text variable="issue"/>
-    <date variable="issued" prefix="(" suffix=")">
-    <date-part name="month"/>
-    </date>
-    </group>
-    </else-if>
-    <else>
-    <date variable="issued" prefix=", ">
-    <date-part name="month"/>
-    </date>
-    </else>
-    </choose>
-    </if>
-    <else-if type="legal_case">
-    <text variable="volume" prefix=", "/>
-    <text variable="container-title" prefix=" "/>
-    <text variable="page" prefix=" "/>
-    </else-if>
-    <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-    <group prefix=". " delimiter=". ">
-    <group>
-    <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-    <number variable="volume" form="numeric"/>
-    </group>
-    <group>
-    <number variable="number-of-volumes" form="numeric"/>
-    <text term="volume" form="short" prefix=" " plural="true"/>
-    </group>
-    </group>
-    </else-if>
-    <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
-    <choose>
-    <if variable="page" match="none">
-    <group prefix=". ">
-    <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-    <number variable="volume" form="numeric"/>
-    </group>
-    </if>
-    </choose>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="locators-chapter">
-    <choose>
-    <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
-    <choose>
-    <if variable="page">
-    <group prefix=", ">
-    <text variable="volume" suffix=":"/>
-    <text variable="page"/>
-    </group>
-    </if>
-    </choose>
-    </if>
-    </choose>
-    </macro>
-    <macro name="locators-article">
-    <choose>
-    <if type="article-newspaper">
-    <group prefix=", " delimiter=", ">
-    <group delimiter=" ">
-    <text variable="edition"/>
-    <text term="edition"/>
-    </group>
-    <group>
-    <text term="section" form="short" suffix=" "/>
-    <text variable="section"/>
-    </group>
-    </group>
-    </if>
-    <else-if type="article-journal">
-    <choose>
-    <if variable="volume issue" match="any">
-  <text variable="page" prefix=": "/>
-            </if>
-            <else>
-              <text variable="page" prefix=", "/>
-    </else>
-    </choose>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="point-locators">
-    <choose>
-    <if variable="locator">
-    <choose>
-    <if locator="page" match="none">
-    <choose>
-    <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-    <choose>
-    <if variable="volume">
-    <group>
-    <text term="volume" form="short" suffix=" "/>
-    <number variable="volume" form="numeric"/>
-    <label variable="locator" form="short" prefix=", " suffix=" "/>
-    </group>
-    </if>
-    <else>
-    <label variable="locator" form="short" suffix=" "/>
-    </else>
-    </choose>
-    </if>
-    <else>
-    <label variable="locator" form="short" suffix=" "/>
-    </else>
-    </choose>
-    </if>
-    <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-    <number variable="volume" form="numeric" suffix=":"/>
-    </else-if>
-    </choose>
-    <text variable="locator"/>
-    </if>
-    </choose>
-    </macro>
-    <macro name="container-prefix">
-    <text term="in" text-case="capitalize-first"/>
-    </macro>
-    <macro name="container-title">
-    <choose>
-    <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
-    <text macro="container-prefix" suffix=" "/>
-    </if>
-    </choose>
-    <choose>
-    <if type="legal_case" match="none">
-    <text variable="container-title" text-case="title" font-style="italic"/>
-    </if>
-    </choose>
-    </macro>
-    <macro name="publisher">
-  <group delimiter=": ">
-        <text variable="publisher-place"/>
-                        <text variable="publisher"/>
-    </group>
-    </macro>
-    <macro name="date">
-    <choose>
-    <if variable="issued">
-    <group delimiter=" ">
-    <date variable="original-date" form="text" date-parts="year" prefix="(" suffix=")"/>
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    </group>
-    </if>
-    <else-if variable="accessed">
-    <date variable="accessed">
-    <date-part name="year"/>
-    </date>
-    </else-if>
-    <else-if variable="status">
-    <text variable="status" text-case="capitalize-first"/>
-    </else-if>
-    <else>
-    <text term="no date" form="short"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="date-in-text">
-    <choose>
-    <if variable="issued">
-    <group delimiter=" ">
-    <date variable="original-date" form="text" date-parts="year" prefix="[" suffix="]"/>
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    </group>
-    </if>
-    <else-if variable="accessed">
-    <date variable="accessed">
-    <date-part name="year"/>
-    </date>
-    </else-if>
-    <else-if variable="status">
-    <text variable="status"/>
-    </else-if>
-    <else>
-    <text term="no date" form="short"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="day-month">
-    <date variable="issued">
-    <date-part name="month"/>
-    <date-part name="day" prefix=" "/>
-    </date>
-    </macro>
-    <macro name="collection-title">
-    <choose>
-    <if match="none" type="article-journal">
-    <choose>
-    <if match="none" is-numeric="collection-number">
-    <group delimiter=", ">
-    <text variable="collection-title" text-case="title"/>
-    <text variable="collection-number"/>
-    </group>
-    </if>
-    <else>
-    <group delimiter=" ">
-    <text variable="collection-title" text-case="title"/>
-    <text variable="collection-number"/>
-    </group>
-    </else>
-    </choose>
-    </if>
-    </choose>
-    </macro>
-    <macro name="collection-title-journal">
-    <choose>
-    <if type="article-journal">
-    <group delimiter=" ">
-    <text variable="collection-title"/>
-    <text variable="collection-number"/>
-    </group>
-    </if>
-    </choose>
-    </macro>
-    <macro name="event">
-    <group delimiter=" ">
-    <choose>
-    <if variable="genre">
-    <text term="presented at"/>
-    </if>
-    <else>
-    <text term="presented at" text-case="capitalize-first"/>
-    </else>
-    </choose>
-    <text variable="event"/>
-    </group>
-    </macro>
-    <macro name="description">
-    <choose>
-    <if type="interview">
-    <group delimiter=". ">
-    <text macro="interviewer"/>
-    <text variable="medium" text-case="capitalize-first"/>
-    </group>
-    </if>
-    <else-if type="patent">
-    <group delimiter=" " prefix=". ">
-    <text variable="authority"/>
-    <text variable="number"/>
-    </group>
-    </else-if>
-    <else>
-    <text variable="medium" text-case="capitalize-first" prefix=". "/>
-    </else>
-    </choose>
-    <choose>
-    <if variable="title" match="none"/>
-    <else-if type="thesis personal_communication speech" match="any"/>
-    <else>
-    <group delimiter=" " prefix=". ">
-    <text variable="genre" text-case="capitalize-first"/>
-    <choose>
-    <if type="report">
-    <text variable="number"/>
-    </if>
-    </choose>
-    </group>
-    </else>
-    </choose>
-    </macro>
-    <macro name="issue">
-    <choose>
-    <if type="legal_case">
-    <text variable="authority" prefix=". "/>
-    </if>
-    <else-if type="speech">
-    <group prefix=". " delimiter=", ">
-    <group delimiter=" ">
-    <text variable="genre" text-case="capitalize-first"/>
-    <text macro="event"/>
-    </group>
-    <text variable="event-place"/>
-    <text macro="day-month"/>
-    </group>
-    </else-if>
-    <else-if type="article-newspaper article-magazine personal_communication" match="any">
-    <text macro="day-month" prefix=", "/>
-    </else-if>
-    <else-if type="patent">
-    <group delimiter=", " prefix=", ">
-    <group delimiter=" ">
-    <!--Needs Localization-->
-    <text value="filed"/>
-    <date variable="submitted" form="text"/>
-    </group>
-    <group delimiter=" ">
-    <choose>
-    <if variable="issued submitted" match="all">
-    <text term="and"/>
-    </if>
-    </choose>
-    <!--Needs Localization-->
-    <text value="issued"/>
-    <date variable="issued" form="text"/>
-    </group>
-    </group>
-    </else-if>
-    <else>
-    <group prefix=". " delimiter=", ">
-    <choose>
-    <if type="thesis">
-    <text variable="genre" text-case="capitalize-first"/>
-    </if>
-    </choose>
-    <text macro="publisher"/>
-    </group>
-    </else>
-    </choose>
-    </macro>
-    <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year">
-    <layout prefix="(" suffix=")" delimiter="; ">
-    <group delimiter=", ">
-    <choose>
-    <if variable="issued accessed" match="any">
-    <group delimiter=" ">
-    <text macro="contributors-short"/>
-    <text macro="date-in-text"/>
-    </group>
-    </if>
-    <!---comma before forthcoming and n.d.-->
-    <else>
-    <group delimiter=", ">
-    <text macro="contributors-short"/>
-    <text macro="date-in-text"/>
-    </group>
-    </else>
-    </choose>
-    <text macro="point-locators"/>
-    </group>
-    </layout>
-    </citation>
-    <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
-    <sort>
-    <key macro="contributors"/>
-    <key variable="issued"/>
-    <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-    <group delimiter=". ">
-    <text macro="contributors"/>
-    <text macro="date"/>
-    <text macro="title"/>
-    </group>
-    <text macro="description"/>
-    <text macro="secondary-contributors" prefix=". "/>
-    <text macro="container-title" prefix=". "/>
-    <text macro="container-contributors"/>
-    <text macro="edition"/>
-    <text macro="locators-chapter"/>
-    <text macro="collection-title-journal" prefix=", " suffix=", "/>
-    <text macro="locators"/>
-    <text macro="collection-title" prefix=". "/>
-    <text macro="issue"/>
-    <text macro="locators-article"/>
-    <text macro="access" prefix=". "/>
-    </layout>
-    </bibliography>
-    </style>
-updated: 1587925370
-custom: true
-url_id: 'http://www.zotero.org/styles/chicago-author-date-16th-edition'
diff --git a/config/sync/bibcite.bibcite_csl_style.modern_language_association.yml b/config/sync/bibcite.bibcite_csl_style.modern_language_association.yml
deleted file mode 100644
index 5270c3444..000000000
--- a/config/sync/bibcite.bibcite_csl_style.modern_language_association.yml
+++ /dev/null
@@ -1,473 +0,0 @@
-uuid: eb171f45-2f0c-483c-98ee-8abae13a2ebc
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: ZsuK1_nEMKxHCv_L1dmQpr1AceMJkwqOmxVyVEoUJqI
-id: modern_language_association
-parent: null
-label: 'Modern Language Association 7th edition'
-csl: |
-  <?xml version="1.0" encoding="utf-8"?>
-    <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
-    <info>
-    <title>Modern Language Association 7th edition</title>
-    <title-short>MLA</title-short>
-    <id>http://www.zotero.org/styles/modern-language-association-7th-edition</id>
-    <link href="http://www.zotero.org/styles/modern-language-association-7th-edition" rel="self"/>
-    <link href="http://owl.english.purdue.edu/owl/section/2/11/" rel="documentation"/>
-    <author>
-    <name>Ilouise S. Bradford</name>
-    <email>isbradford@gmail.com</email>
-    </author>
-    <contributor>
-    <name>Sarah Ficke</name>
-    <email>sficke@email.unc.edu</email>
-    </contributor>
-    <contributor>
-    <name>Sebastian Karcher</name>
-    <email>karcher@u.northwestern.edu</email>
-    </contributor>
-    <contributor>
-    <name>Christian Werthschulte</name>
-    <email>Christian.Werthschulte@rub.de</email>
-    </contributor>
-    <contributor>
-    <name>Simon Kornblith</name>
-    <email>simon@simonster.com</email>
-    </contributor>
-    <contributor>
-    <name>James Johnston</name>
-    <email>thejamesjohnston@gmail.com</email>
-    </contributor>
-    <category citation-format="author"/>
-    <category field="generic-base"/>
-  <summary>This style adheres to the MLA 7th edition handbook and contains modifications to these types of sources: e-mail, forum posts, interviews, manuscripts, maps, presentations, TV broadcasts, and web pages.</summary>
-    <updated>2017-09-29T03:07:06+00:00</updated>
-    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    </info>
-    <locale xml:lang="en">
-    <terms>
-    <term name="month-01" form="short">Jan.</term>
-    <term name="month-02" form="short">Feb.</term>
-    <term name="month-03" form="short">Mar.</term>
-    <term name="month-04" form="short">Apr.</term>
-    <term name="month-05" form="short">May</term>
-    <term name="month-06" form="short">June</term>
-    <term name="month-07" form="short">July</term>
-    <term name="month-08" form="short">Aug.</term>
-    <term name="month-09" form="short">Sept.</term>
-    <term name="month-10" form="short">Oct.</term>
-    <term name="month-11" form="short">Nov.</term>
-    <term name="month-12" form="short">Dec.</term>
-    <term name="volume" form="short">
-    <single>Vol.</single>
-    <multiple>vols</multiple>
-    </term>
-    <term name="edition" form="short">ed</term>
-    <term name="editor" form="verb-short">ed.</term>
-    <term name="translator" form="verb-short">trans.</term>
-    <term name="translator" form="short">trans.</term>
-    </terms>
-    </locale>
-    <macro name="editor-translator">
-    <names variable="editor translator" delimiter=". ">
-    <label form="verb-short" text-case="capitalize-first" suffix=" "/>
-    <name and="text" delimiter=", "/>
-    </names>
-    </macro>
-    <macro name="author">
-    <names variable="author">
-    <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=", "/>
-    <substitute>
-    <names variable="editor"/>
-    <names variable="translator"/>
-    <text macro="title"/>
-    </substitute>
-    </names>
-    </macro>
-    <macro name="author-short">
-    <names variable="author">
-    <name form="short" and="text" delimiter=", " initialize-with=". "/>
-    <substitute>
-    <names variable="editor"/>
-    <names variable="translator"/>
-    <text macro="title-short"/>
-    </substitute>
-    </names>
-    </macro>
-    <macro name="access">
-    <group delimiter=" ">
-    <date variable="accessed">
-    <date-part name="day" suffix=" "/>
-    <date-part name="month" form="short" suffix=" "/>
-    <date-part name="year"/>
-    </date>
-    </group>
-    </macro>
-    <macro name="issued-full-date">
-    <choose>
-    <if variable="issued">
-    <date variable="issued">
-    <date-part name="day" suffix=" "/>
-    <date-part name="month" form="short" suffix=" " strip-periods="false"/>
-    <date-part name="year"/>
-    </date>
-    </if>
-    <else>
-    <text term="no date" form="short"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="medium">
-    <choose>
-    <if type="motion_picture">
-    <choose>
-    <if variable="medium">
-    <text variable="medium" prefix=" "/>
-    </if>
-    <else>
-    <text value="Film" prefix=" "/>
-    </else>
-    </choose>
-    </if>
-    <else-if type="broadcast">
-    <choose>
-    <if variable="medium">
-    <text variable="medium" prefix=" "/>
-    </if>
-    <else>
-    <text value="Television" prefix=" "/>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="manuscript">
-    <text value=""/>
-    </else-if>
-    <else-if type="personal_communication" match="any">
-    <text value="" prefix=" "/>
-    </else-if>
-    <else-if type="speech" match="any">
-    <text value=""/>
-    </else-if>
-    <else-if type="interview">
-    <text variable="medium" prefix=" "/>
-    </else-if>
-    <else-if type="song">
-    <choose>
-    <if variable="medium">
-    <text variable="medium" prefix=" "/>
-    </if>
-    <else>
-    <text value="Audio Recording" prefix=" "/>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="graphic" variable="medium" match="all">
-    <text variable="medium" prefix=" "/>
-    </else-if>
-    <else>
-    <choose>
-    <if variable="URL DOI" match="any">
-    <text variable="source" prefix=" " suffix="." font-style="italic"/>
-    <group>
-    <text value="Web." prefix=" "/>
-    </group>
-    <text prefix=" " suffix="." macro="access"/>
-    </if>
-    <else>
-    <text value="Print" prefix=" "/>
-    </else>
-    </choose>
-    </else>
-    </choose>
-    </macro>
-    <macro name="title">
-    <choose>
-    <if type="bill book graphic legal_case legislation manuscript motion_picture report song" match="any">
-    <text variable="title" font-style="italic" text-case="title"/>
-    </if>
-    <else-if type="interview personal_communication" match="any">
-    <text variable="title" text-case="title" quotes="false"/>
-    </else-if>
-    <else>
-    <text variable="title" text-case="title" quotes="true"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="title-short">
-    <choose>
-    <if type="bill book graphic legal_case legislation manuscript motion_picture report song" match="any">
-    <text variable="title" text-case="title" form="short" font-style="italic"/>
-    </if>
-    <else>
-    <text variable="title" text-case="title" form="short" quotes="true"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="pages">
-    <choose>
-    <if variable="page">
-    <text variable="page"/>
-    </if>
-    <else-if type="personal_communication interview" match="any">
-    <text value=""/>
-    </else-if>
-    <else>
-    <text value="n. pag"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="edition">
-    <choose>
-    <if is-numeric="edition">
-    <group delimiter=" ">
-    <number variable="edition" form="ordinal"/>
-    <text term="edition" form="short"/>
-    </group>
-    </if>
-    <else>
-    <text variable="edition"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="volume">
-    <choose>
-    <if is-numeric="volume">
-    <group delimiter=" ">
-    <text term="volume" form="short" strip-periods="false"/>
-    <number variable="volume"/>
-    </group>
-    </if>
-    <else>
-    <text variable="volume"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="number-of-volumes-only">
-    <choose>
-    <if variable="volume" match="none">
-    <choose>
-    <if is-numeric="number-of-volumes">
-    <group delimiter=" ">
-    <number variable="number-of-volumes"/>
-    <text term="volume" form="short" plural="true" strip-periods="true"/>
-    </group>
-    </if>
-    <else>
-    <text variable="number-of-volumes"/>
-    </else>
-    </choose>
-    </if>
-    </choose>
-    </macro>
-    <macro name="number-of-volumes-optional">
-    <choose>
-    <if variable="volume">
-    <choose>
-    <if is-numeric="number-of-volumes">
-    <group delimiter=" ">
-    <number variable="number-of-volumes"/>
-    <text term="volume" form="short" plural="true" strip-periods="true"/>
-    </group>
-    </if>
-    <else>
-    <text variable="number-of-volumes"/>
-    </else>
-    </choose>
-    </if>
-    </choose>
-    </macro>
-    <macro name="collection-title">
-    <text variable="collection-title" text-case="title" prefix=" "/>
-    </macro>
-    <macro name="collection-number">
-    <text variable="collection-number" prefix=" " suffix="."/>
-    </macro>
-    <macro name="publisher">
-    <choose>
-    <if variable="publisher">
-    <text variable="publisher"/>
-    </if>
-    <else>
-    <text value="N.p."/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="publisher-year">
-    <group delimiter=", ">
-  <group delimiter=": ">
-          <text variable="publisher-place"/>
-                        <text macro="publisher"/>
-    </group>
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    </group>
-    </macro>
-    <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true">
-    <layout prefix="(" suffix=")" delimiter="; ">
-    <group delimiter=" ">
-    <choose>
-    <if variable="author editor translator" match="any">
-    <group delimiter=", ">
-    <text macro="author-short"/>
-    <choose>
-    <if disambiguate="true">
-    <text macro="title-short"/>
-    </if>
-    </choose>
-    </group>
-    </if>
-    <else>
-    <text macro="title-short"/>
-    </else>
-    </choose>
-    <text variable="locator"/>
-    </group>
-    </layout>
-    </citation>
-    <bibliography hanging-indent="true" et-al-min="4" et-al-use-first="1" line-spacing="2" entry-spacing="0" subsequent-author-substitute="---">
-    <sort>
-    <key macro="author"/>
-    <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-    <text macro="author" suffix="."/>
-    <text macro="title" prefix=" " suffix="."/>
-    <choose>
-    <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-    <text macro="editor-translator" prefix=" " suffix="."/>
-    <text macro="edition" prefix=" " suffix="."/>
-    <text macro="volume" prefix=" " suffix="."/>
-    <text macro="number-of-volumes-only" prefix=" " suffix="."/>
-    <text macro="publisher-year" prefix=" " suffix="."/>
-    </if>
-    <else-if type="chapter paper-conference" match="any">
-    <group>
-    <text variable="container-title" text-case="title" font-style="italic" prefix=" " suffix="."/>
-    <text macro="editor-translator" prefix=" " suffix="."/>
-    <text macro="edition" prefix=" " suffix="."/>
-    <text macro="volume" prefix=" " suffix="."/>
-    <text macro="number-of-volumes-only" prefix=" " suffix="."/>
-    <text macro="publisher-year" prefix=" " suffix="."/>
-    </group>
-    <text variable="page" prefix=" " suffix="."/>
-    </else-if>
-    <else-if type="thesis">
-    <text variable="genre" prefix=" " suffix="."/>
-    <group delimiter=", ">
-    <text macro="publisher" prefix=" "/>
-    <date variable="issued" prefix=" " suffix=".">
-    <date-part name="year"/>
-    </date>
-    </group>
-    <text variable="archive_location" prefix=" " suffix="."/>
-    </else-if>
-    <else-if type="manuscript">
-    <date variable="issued" prefix=" " suffix=".">
-    <date-part name="year"/>
-    </date>
-    <text variable="genre" prefix=" " suffix="."/>
-    <text variable="archive_location" prefix=" " suffix="."/>
-    <text variable="publisher-place" prefix=" "/>
-    </else-if>
-    <else-if type="personal_communication">
-    <date variable="issued" prefix=" " suffix=".">
-    <date-part name="day" suffix=" "/>
-    <date-part name="month" form="short" suffix=" "/>
-    <date-part name="year"/>
-    </date>
-    <choose>
-    <if variable="genre">
-    <text prefix=" " suffix="." variable="genre"/>
-    </if>
-    <else>
-    <text prefix=" " suffix="." value="E-mail"/>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="map">
-    <text variable="genre" prefix=" " suffix="."/>
-    <text variable="publisher-place" prefix=" " suffix=":"/>
-    <text macro="publisher" prefix=" "/>
-    <date variable="issued" prefix=" " suffix=",">
-    <date-part name="year"/>
-    </date>
-    </else-if>
-    <else-if type="speech">
-    <text variable="event" prefix=" " suffix="."/>
-    <text variable="publisher-place" prefix=" " suffix="."/>
-    <date variable="issued" prefix=" " suffix=".">
-    <date-part name="year"/>
-    </date>
-    <text variable="genre" prefix=" " suffix="."/>
-    </else-if>
-    <else-if type="webpage post-weblog" match="any">
-    <text variable="genre" prefix=" " suffix="."/>
-    <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
-    <group delimiter=", " prefix=" ">
-    <text macro="publisher"/>
-    <text macro="issued-full-date" suffix="."/>
-    </group>
-    </else-if>
-    <else-if type="broadcast">
-    <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
-    <text macro="publisher" prefix=" " suffix=","/>
-    <date variable="issued" prefix=" " suffix=".">
-    <date-part name="day" suffix=" "/>
-    <date-part name="month" form="short" suffix=" " strip-periods="false"/>
-    <date-part name="year"/>
-    </date>
-    </else-if>
-    <else>
-  <group prefix=" " suffix="." delimiter=": ">
-              <group delimiter=" ">
-                <text macro="editor-translator" suffix="."/>
-                                              <text variable="container-title" font-style="italic"/>
-                                              <choose>
-                                              <if type="article-journal">
-                                              <group delimiter=" ">
-                                              <group delimiter=".">
-                                              <text variable="volume"/>
-                                              <text variable="issue"/>
-                                              </group>
-                                              <date variable="issued" prefix="(" suffix="):">
-                                              <date-part name="year"/>
-                                              </date>
-                                              </group>
-                                              <text macro="pages" prefix=" "/>
-                                              </if>
-                                              <else>
-                                              <group>
-                                              <date variable="issued">
-                                              <date-part name="day" suffix=" "/>
-                                              <date-part name="month" form="short" suffix=" " strip-periods="false"/>
-                                              <date-part name="year"/>
-                                              </date>
-                                              <choose>
-                                              <if variable="URL DOI" match="any">
-                                              <text variable="page" prefix=": "/>
-                        </if>
-                        <else>
-                          <text macro="pages" prefix=": "/>
-                        </else>
-                      </choose>
-                    </group>
-                  </else>
-                </choose>
-              </group>
-            </group>
-          </else>
-        </choose>
-        <text macro="medium" suffix="."/>
-    <text macro="number-of-volumes-optional" suffix="." prefix=" "/>
-    <text macro="collection-title"/>
-    <text macro="collection-number"/>
-    </layout>
-    </bibliography>
-    </style>
-updated: 1506654426
-custom: true
-url_id: 'http://www.zotero.org/styles/modern-language-association-7th-edition'
diff --git a/config/sync/bibcite.bibcite_csl_style.modern_language_association_8th_edition.yml b/config/sync/bibcite.bibcite_csl_style.modern_language_association_8th_edition.yml
deleted file mode 100644
index 2bc59b60e..000000000
--- a/config/sync/bibcite.bibcite_csl_style.modern_language_association_8th_edition.yml
+++ /dev/null
@@ -1,323 +0,0 @@
-uuid: 3785853e-99d0-44b8-871c-f4c35b5326db
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: QDkjTNcuHQSSZxWLYq0gDDnmCVbuXmpVvMobNde32ME
-id: modern_language_association_8th_edition
-parent: null
-label: 'Modern Language Association 8th edition'
-csl: |
-  <?xml version="1.0" encoding="utf-8"?>
-    <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="minimal-two">
-    <info>
-    <title>Modern Language Association 8th edition</title>
-    <title-short>MLA</title-short>
-    <id>http://www.zotero.org/styles/modern-language-association</id>
-    <link href="http://www.zotero.org/styles/modern-language-association" rel="self"/>
-    <link href="http://style.mla.org" rel="documentation"/>
-    <author>
-    <name>Sebastian Karcher</name>
-    </author>
-    <category citation-format="author"/>
-    <category field="generic-base"/>
-    <summary>This style adheres to the MLA 8th edition handbook. Follows the structure of references as outlined in the MLA Manual closely</summary>
-    <updated>2019-10-11T02:36:27+00:00</updated>
-    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    </info>
-    <locale xml:lang="en">
-    <date form="text">
-    <date-part name="day" suffix=" "/>
-    <date-part name="month" suffix=" " form="short"/>
-    <date-part name="year"/>
-    </date>
-    <terms>
-    <term name="month-01" form="short">Jan.</term>
-    <term name="month-02" form="short">Feb.</term>
-    <term name="month-03" form="short">Mar.</term>
-    <term name="month-04" form="short">Apr.</term>
-    <term name="month-05" form="short">May</term>
-    <term name="month-06" form="short">June</term>
-    <term name="month-07" form="short">July</term>
-    <term name="month-08" form="short">Aug.</term>
-    <term name="month-09" form="short">Sept.</term>
-    <term name="month-10" form="short">Oct.</term>
-    <term name="month-11" form="short">Nov.</term>
-    <term name="month-12" form="short">Dec.</term>
-    <term name="translator" form="short">trans.</term>
-    </terms>
-    </locale>
-    <macro name="author">
-    <names variable="author">
-    <name name-as-sort-order="first" and="text" delimiter-precedes-last="always" delimiter-precedes-et-al="always" initialize="false" initialize-with=". "/>
-    <label form="long" prefix=", "/>
-    <substitute>
-    <names variable="editor"/>
-    <names variable="translator"/>
-    <text macro="title"/>
-    </substitute>
-    </names>
-    </macro>
-    <macro name="author-short">
-    <group delimiter=", ">
-    <names variable="author">
-    <name form="short" initialize-with=". " and="text"/>
-    <substitute>
-    <names variable="editor"/>
-    <names variable="translator"/>
-    <text macro="title-short"/>
-    </substitute>
-    </names>
-    <choose>
-    <if disambiguate="true">
-    <text macro="title-short"/>
-    </if>
-    </choose>
-    </group>
-    </macro>
-    <macro name="title">
-    <choose>
-    <if variable="container-title" match="any">
-    <text variable="title" quotes="true" text-case="title"/>
-    </if>
-    <else>
-    <text variable="title" font-style="italic" text-case="title"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="title-short">
-    <choose>
-    <if variable="container-title" match="any">
-    <text variable="title" form="short" quotes="true" text-case="title"/>
-    </if>
-    <else>
-    <text variable="title" form="short" font-style="italic" text-case="title"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="container-title">
-    <text variable="container-title" font-style="italic" text-case="title"/>
-    </macro>
-    <macro name="other-contributors">
-    <group delimiter=", ">
-    <choose>
-    <if variable="container-title" match="any">
-    <names variable="container-author editor illustrator interviewer translator" delimiter=", ">
-    <label form="verb" suffix=" "/>
-    <name and="text"/>
-    </names>
-    </if>
-    <else>
-    <names variable="container-author editor illustrator interviewer translator" delimiter=", ">
-    <label form="verb" suffix=" " text-case="capitalize-first"/>
-    <name and="text"/>
-    </names>
-    </else>
-    </choose>
-    <names variable="director">
-    <label form="verb" suffix=" " text-case="capitalize-first"/>
-    <name and="text"/>
-    </names>
-    </group>
-    </macro>
-    <macro name="version">
-    <group delimiter=", ">
-    <choose>
-    <if is-numeric="edition">
-    <group delimiter=" ">
-    <number variable="edition" form="ordinal"/>
-    <text term="edition" form="short"/>
-    </group>
-    </if>
-    <else>
-    <text variable="edition" text-case="capitalize-first"/>
-    </else>
-    </choose>
-    <text variable="version"/>
-    </group>
-    </macro>
-    <macro name="volume-lowercase">
-    <group delimiter=" ">
-    <text term="volume" form="short"/>
-    <text variable="volume"/>
-    </group>
-    </macro>
-    <macro name="number">
-    <group delimiter=", ">
-    <group>
-    <choose>
-    <!--lowercase if we have a preceding element-->
-    <if variable="edition container-title" match="any">
-    <text macro="volume-lowercase"/>
-    </if>
-    <!--other contributors preceding the volume-->
-    <else-if variable="author" match="all">
-    <choose>
-    <if variable="editor translator container-author illustrator interviewer director" match="any">
-    <text macro="volume-lowercase"/>
-    </if>
-    </choose>
-    </else-if>
-    <else-if variable="editor" match="all">
-    <choose>
-    <if variable="translator container-author illustrator interviewer director" match="any">
-    <text macro="volume-lowercase"/>
-    </if>
-    </choose>
-    </else-if>
-    <else-if variable="container-author illustrator interviewer director" match="any">
-    <text macro="volume-lowercase"/>
-    </else-if>
-    <else>
-    <group delimiter=" ">
-    <text term="volume" form="short" text-case="capitalize-first"/>
-    <text variable="volume"/>
-    </group>
-    </else>
-    </choose>
-    </group>
-    <group delimiter=" ">
-    <text term="issue" form="short"/>
-    <text variable="issue"/>
-    </group>
-    <choose>
-    <if type="report">
-    <text variable="genre"/>
-    </if>
-    </choose>
-    <text variable="number"/>
-    </group>
-    </macro>
-    <macro name="publisher">
-    <text variable="publisher"/>
-    </macro>
-    <macro name="publication-date">
-    <choose>
-    <if type="book chapter paper-conference motion_picture" match="any">
-    <date variable="issued" form="numeric" date-parts="year"/>
-    </if>
-    <else-if type="article-journal article-magazine" match="any">
-    <date variable="issued" form="text" date-parts="year-month"/>
-    </else-if>
-    <else-if type="speech" match="none">
-    <date variable="issued" form="text"/>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="location">
-    <group delimiter=", ">
-    <group delimiter=" ">
-    <label variable="page" form="short"/>
-    <text variable="page"/>
-    </group>
-    <choose>
-    <if variable="source" match="none">
-    <text macro="URI"/>
-    </if>
-    </choose>
-    </group>
-    </macro>
-    <macro name="container2-title">
-    <group delimiter=", ">
-    <choose>
-    <if type="speech">
-    <text variable="event"/>
-    <date variable="event-date" form="text"/>
-    <text variable="event-place"/>
-    </if>
-    </choose>
-    <text variable="archive"/>
-    <text variable="archive-place"/>
-    <text variable="archive_location"/>
-    </group>
-    </macro>
-    <macro name="container2-location">
-    <choose>
-    <if variable="source">
-    <choose>
-    <if variable="DOI URL" match="any">
-    <group delimiter=", ">
-    <text variable="source" font-style="italic"/>
-    <text macro="URI"/>
-    </group>
-    </if>
-    </choose>
-    </if>
-    </choose>
-    </macro>
-    <macro name="URI">
-    <choose>
-    <if variable="DOI">
-    <text variable="DOI" prefix="doi:"/>
-    </if>
-    <else>
-    <text variable="URL"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="accessed">
-    <!--using accessed where we don't have an issued date; follows recommendation on p. 53 -->
-    <choose>
-    <if variable="issued" match="none">
-    <group delimiter=" ">
-    <text term="accessed" text-case="capitalize-first"/>
-    <date variable="accessed" form="text"/>
-    </group>
-    </if>
-    </choose>
-    </macro>
-    <citation et-al-min="3" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true">
-    <layout prefix="(" suffix=")" delimiter="; ">
-    <choose>
-    <if locator="page line" match="any">
-    <group delimiter=" ">
-    <text macro="author-short"/>
-    <text variable="locator"/>
-    </group>
-    </if>
-    <else>
-    <group delimiter=", ">
-    <text macro="author-short"/>
-    <group>
-    <label variable="locator" form="short"/>
-    <text variable="locator"/>
-    </group>
-    </group>
-    </else>
-    </choose>
-    </layout>
-    </citation>
-    <bibliography hanging-indent="true" et-al-min="3" et-al-use-first="1" line-spacing="2" entry-spacing="0" subsequent-author-substitute="---">
-    <sort>
-    <key macro="author"/>
-    <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-    <group delimiter=". ">
-    <text macro="author"/>
-    <text macro="title"/>
-    <date variable="original-date" form="numeric" date-parts="year"/>
-    <group delimiter=", ">
-    <!---This group corresponds to MLA's "Container 1"-->
-    <text macro="container-title"/>
-    <text macro="other-contributors"/>
-    <text macro="version"/>
-    <text macro="number"/>
-    <text macro="publisher"/>
-    <text macro="publication-date"/>
-    <text macro="location"/>
-    </group>
-    <group delimiter=", ">
-    <!---This group corresponds to MLA's "Container 2"-->
-    <!--currently just using this one for archival info-->
-    <text macro="container2-title"/>
-    <text macro="container2-location"/>
-    </group>
-    <text macro="accessed"/>
-    </group>
-    </layout>
-    </bibliography>
-    </style>
-updated: 1570761387
-custom: true
-url_id: 'http://www.zotero.org/styles/modern-language-association'
diff --git a/config/sync/bibcite.settings.yml b/config/sync/bibcite.settings.yml
deleted file mode 100644
index ededcfd9e..000000000
--- a/config/sync/bibcite.settings.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-_core:
-  default_config_hash: xrKaN_2e7lR23yRaoflUaJktwsTkUG0r5Ux2mKNAiVs
-processor: citeproc-php
-default_style: apa
diff --git a/config/sync/block.block.idc_ui_theme_boots_content.yml b/config/sync/block.block.idc_ui_theme_boots_content.yml
index b864f4e88..bdbe0280a 100644
--- a/config/sync/block.block.idc_ui_theme_boots_content.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_content.yml
@@ -11,7 +11,7 @@ _core:
 id: idc_ui_theme_boots_content
 theme: idc_ui_theme_boots
 region: content
-weight: -14
+weight: -10
 provider: null
 plugin: system_main_block
 settings:
diff --git a/config/sync/block.block.idc_ui_theme_boots_help.yml b/config/sync/block.block.idc_ui_theme_boots_help.yml
index f35cfe409..8953f735a 100644
--- a/config/sync/block.block.idc_ui_theme_boots_help.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_help.yml
@@ -10,8 +10,8 @@ _core:
   default_config_hash: VfPFqqxfkomud5CO8DUijw85QIl9GIxh_nIxLOYESxg
 id: idc_ui_theme_boots_help
 theme: idc_ui_theme_boots
-region: content
-weight: -17
+region: top_header
+weight: -6
 provider: null
 plugin: help_block
 settings:
diff --git a/config/sync/block.block.idc_ui_theme_boots_local_actions.yml b/config/sync/block.block.idc_ui_theme_boots_local_actions.yml
index a8ce93899..2e000372a 100644
--- a/config/sync/block.block.idc_ui_theme_boots_local_actions.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_local_actions.yml
@@ -9,7 +9,7 @@ _core:
 id: idc_ui_theme_boots_local_actions
 theme: idc_ui_theme_boots
 region: content
-weight: -16
+weight: -5
 provider: null
 plugin: local_actions_block
 settings:
diff --git a/config/sync/block.block.idc_ui_theme_boots_local_tasks.yml b/config/sync/block.block.idc_ui_theme_boots_local_tasks.yml
index f26216b04..8b793f6cd 100644
--- a/config/sync/block.block.idc_ui_theme_boots_local_tasks.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_local_tasks.yml
@@ -9,7 +9,7 @@ _core:
 id: idc_ui_theme_boots_local_tasks
 theme: idc_ui_theme_boots
 region: content
-weight: -10
+weight: -7
 provider: null
 plugin: local_tasks_block
 settings:
diff --git a/config/sync/block.block.idc_ui_theme_boots_memberof.yml b/config/sync/block.block.idc_ui_theme_boots_memberof.yml
index bdadf453f..0a129e799 100644
--- a/config/sync/block.block.idc_ui_theme_boots_memberof.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_memberof.yml
@@ -1,6 +1,6 @@
 uuid: 1ba6cb69-c81c-4c9d-b955-b57256008603
 langcode: en
-status: true
+status: false
 dependencies:
   config:
     - facets.facet.member_of
@@ -13,8 +13,8 @@ dependencies:
     - idc_ui_theme_boots
 id: idc_ui_theme_boots_memberof
 theme: idc_ui_theme_boots
-region: sidebar_first
-weight: -7
+region: top_header
+weight: -11
 provider: null
 plugin: 'facet_block:member_of'
 settings:
diff --git a/config/sync/block.block.idc_ui_theme_boots_page_title.yml b/config/sync/block.block.idc_ui_theme_boots_page_title.yml
index e78fcadd1..8570458d7 100644
--- a/config/sync/block.block.idc_ui_theme_boots_page_title.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_page_title.yml
@@ -1,6 +1,6 @@
 uuid: 2d5933d0-c5a8-427c-a8de-fcfb23dfd90d
 langcode: en
-status: true
+status: false
 dependencies:
   module:
     - context
@@ -11,8 +11,8 @@ _core:
   default_config_hash: 6aOgWsNTXjqrDm98TXSAjP6qd2nCijD1xw45MrnbK-Y
 id: idc_ui_theme_boots_page_title
 theme: idc_ui_theme_boots
-region: content
-weight: -18
+region: top_header
+weight: -8
 provider: null
 plugin: page_title_block
 settings:
diff --git a/config/sync/block.block.memberof.yml b/config/sync/block.block.idc_ui_theme_boots_resourcetype_2.yml
similarity index 71%
rename from config/sync/block.block.memberof.yml
rename to config/sync/block.block.idc_ui_theme_boots_resourcetype_2.yml
index 79df50a17..5a6c0f5af 100644
--- a/config/sync/block.block.memberof.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_resourcetype_2.yml
@@ -1,28 +1,29 @@
-uuid: 75be2606-c8db-4b9d-b8f4-fb61551c741b
+uuid: a7c27aee-dbbd-488b-a3e7-82263cae2581
 langcode: en
 status: true
 dependencies:
   config:
-    - facets.facet.member_of
+    - facets.facet.resource_type_2
   module:
     - context
     - facets
     - islandora
+    - system
   theme:
     - idc_ui_theme_boots
-id: memberof
+id: idc_ui_theme_boots_resourcetype_2
 theme: idc_ui_theme_boots
 region: sidebar_first
-weight: -8
+weight: -10
 provider: null
-plugin: 'facet_block:member_of'
+plugin: 'facet_block:resource_type_2'
 settings:
-  id: 'facet_block:member_of'
-  label: 'Member of'
+  id: 'facet_block:resource_type_2'
+  label: 'Resource Type'
   label_display: visible
   provider: facets
   context_mapping: {  }
-  block_id: memberof
+  block_id: resourcetype_2
 visibility:
   context:
     id: context
@@ -48,8 +49,7 @@ visibility:
     negate: false
     context_mapping: {  }
     mimetype: ''
-  view_inclusion:
-    id: view_inclusion
+  request_path:
+    id: request_path
     negate: false
-    view_inclusion:
-      view-solr_search_content-page_1: view-solr_search_content-page_1
+    pages: '/node/*/search'
diff --git a/config/sync/block.block.solrsearchcontentsearchresultspagerforpage.yml b/config/sync/block.block.idc_ui_theme_boots_solrsearchcontentsearchresultspagerforpage.yml
similarity index 66%
rename from config/sync/block.block.solrsearchcontentsearchresultspagerforpage.yml
rename to config/sync/block.block.idc_ui_theme_boots_solrsearchcontentsearchresultspagerforpage.yml
index a456de18b..98ea84c75 100644
--- a/config/sync/block.block.solrsearchcontentsearchresultspagerforpage.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_solrsearchcontentsearchresultspagerforpage.yml
@@ -1,25 +1,29 @@
-uuid: e99d15e7-3690-48bc-8225-bc498c9a3604
+uuid: 01fe32b9-0634-42b8-a075-155a65019be5
 langcode: en
 status: true
 dependencies:
   module:
-    - advanced_search
     - context
     - islandora
+    - islandora_advanced_search
   theme:
     - idc_ui_theme_boots
-id: solrsearchcontentsearchresultspagerforpage
+id: idc_ui_theme_boots_solrsearchcontentsearchresultspagerforpage
 theme: idc_ui_theme_boots
 region: content
-weight: -15
+weight: -11
 provider: null
-plugin: 'advanced_search_result_pager:solr_search_content__page_1'
+plugin: 'islandora_advanced_search_result_pager:solr_search_content__page_1'
 settings:
-  id: 'advanced_search_result_pager:solr_search_content__page_1'
+  id: 'islandora_advanced_search_result_pager:solr_search_content__page_1'
   label: 'Solr search content: Search Results Pager for Page'
-  label_display: '0'
-  provider: advanced_search
+  label_display: visible
+  provider: islandora_advanced_search
 visibility:
+  context:
+    id: context
+    negate: null
+    values: ''
   user_status:
     id: user_status
     negate: false
@@ -31,19 +35,15 @@ visibility:
       own_page_true: '0'
       field_value: '0'
     user_fields: uid
-  view_inclusion:
-    id: view_inclusion
-    negate: false
-    view_inclusion:
-      view-solr_search_content-page_1: view-solr_search_content-page_1
-  context:
-    id: context
-    negate: null
-    values: ''
   context_all:
     id: context_all
     negate: null
     values: ''
+  view_inclusion:
+    id: view_inclusion
+    negate: false
+    view_inclusion:
+      view-collection_children-page_1: view-collection_children-page_1
   media_source_mimetype:
     id: media_source_mimetype
     negate: false
diff --git a/config/sync/block.block.idc_ui_theme_boots_subject.yml b/config/sync/block.block.idc_ui_theme_boots_subject.yml
index 0a50b543b..9252a613b 100644
--- a/config/sync/block.block.idc_ui_theme_boots_subject.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_subject.yml
@@ -14,7 +14,7 @@ _core:
 id: idc_ui_theme_boots_subject
 theme: idc_ui_theme_boots
 region: sidebar_first
-weight: -10
+weight: -9
 provider: null
 plugin: 'facet_block:subject'
 settings:
diff --git a/config/sync/block.block.year.yml b/config/sync/block.block.pagetitle.yml
similarity index 73%
rename from config/sync/block.block.year.yml
rename to config/sync/block.block.pagetitle.yml
index d2ff01700..9e1322057 100644
--- a/config/sync/block.block.year.yml
+++ b/config/sync/block.block.pagetitle.yml
@@ -1,29 +1,28 @@
-uuid: e5f139d7-33fc-4da5-ae00-ffefb45e2816
+uuid: 77c1752b-a3e4-4c4f-820b-e9f32f7a5c57
 langcode: en
-status: true
+status: false
 dependencies:
-  config:
-    - facets.facet.year
   module:
     - context
-    - facets
     - islandora
   theme:
     - idc_ui_theme_boots
-id: year
+id: pagetitle
 theme: idc_ui_theme_boots
-region: sidebar_first
-weight: -6
+region: content
+weight: -8
 provider: null
-plugin: 'facet_block:year'
+plugin: page_title_block
 settings:
-  id: 'facet_block:year'
-  label: Year
-  label_display: visible
-  provider: facets
-  context_mapping: {  }
-  block_id: year
+  id: page_title_block
+  label: 'Page title'
+  label_display: '0'
+  provider: core
 visibility:
+  context_all:
+    id: context_all
+    negate: null
+    values: ''
   context:
     id: context
     negate: null
@@ -39,10 +38,6 @@ visibility:
       own_page_true: '0'
       field_value: '0'
     user_fields: uid
-  context_all:
-    id: context_all
-    negate: null
-    values: ''
   media_source_mimetype:
     id: media_source_mimetype
     negate: false
diff --git a/config/sync/block.block.search.yml b/config/sync/block.block.search.yml
deleted file mode 100644
index 3119fd2b1..000000000
--- a/config/sync/block.block.search.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-uuid: 42d9fb99-0fff-4f1c-a514-c0c6f8091e18
-langcode: en
-status: true
-dependencies:
-  module:
-    - advanced_search
-    - context
-    - islandora
-  theme:
-    - idc_ui_theme_boots
-id: search
-theme: idc_ui_theme_boots
-region: sidebar_first
-weight: 0
-provider: null
-plugin: search_block
-settings:
-  id: search_block
-  label: Search
-  label_display: visible
-  provider: advanced_search
-  block_id: search
-  search_view_machine_name: view.solr_search_content.page_1
-  search_textfield_label: Keyword
-  search_placeholder: ''
-  search_submit_label: Search
-visibility:
-  context_all:
-    id: context_all
-    negate: null
-    values: collection
-  context:
-    id: context
-    negate: null
-    values: ''
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/sync/block.block.solrsearchcontentadvancedsearchforblock.yml b/config/sync/block.block.solrsearchcontentadvancedsearchforblock.yml
deleted file mode 100644
index 3fa9c59fb..000000000
--- a/config/sync/block.block.solrsearchcontentadvancedsearchforblock.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-uuid: e26b17b6-a1f5-4eb8-9ad3-28e7b8f352d2
-langcode: en
-status: true
-dependencies:
-  module:
-    - advanced_search
-    - context
-    - islandora
-  theme:
-    - idc_ui_theme_boots
-id: solrsearchcontentadvancedsearchforblock
-theme: idc_ui_theme_boots
-region: sidebar_first
-weight: -17
-provider: null
-plugin: 'advanced_search_block:solr_search_content__block_1'
-settings:
-  id: 'advanced_search_block:solr_search_content__block_1'
-  label: 'Search within Collection'
-  label_display: visible
-  provider: advanced_search
-  fields: {  }
-  context_filter: field_member_of
-visibility:
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  context:
-    id: context
-    negate: null
-    values: ''
-  context_all:
-    id: context_all
-    negate: null
-    values: collection
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/sync/block.block.solrsearchcontentadvancedsearchforpage.yml b/config/sync/block.block.solrsearchcontentadvancedsearchforpage.yml
deleted file mode 100644
index 515615120..000000000
--- a/config/sync/block.block.solrsearchcontentadvancedsearchforpage.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-uuid: 0224ff66-123d-4d86-94e0-0915b7cc0542
-langcode: en
-status: true
-dependencies:
-  module:
-    - advanced_search
-    - context
-    - islandora
-  theme:
-    - idc_ui_theme_boots
-id: solrsearchcontentadvancedsearchforpage
-theme: idc_ui_theme_boots
-region: sidebar_first
-weight: -9
-provider: null
-plugin: 'advanced_search_block:solr_search_content__page_1'
-settings:
-  id: 'advanced_search_block:solr_search_content__page_1'
-  label: Search
-  label_display: visible
-  provider: advanced_search
-  fields:
-    - title_aggregated_fulltext
-    - abstract_description_fulltext
-    - linked_agent_name_fulltext
-  context_filter: null
-visibility:
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  context:
-    id: context
-    negate: null
-    values: ''
-  context_all:
-    id: context_all
-    negate: null
-    values: ''
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
-  view_inclusion:
-    id: view_inclusion
-    negate: false
-    view_inclusion:
-      view-solr_search_content-page_1: view-solr_search_content-page_1
diff --git a/config/sync/block.block.solrsearchcontentsearchresultspagerforblock.yml b/config/sync/block.block.solrsearchcontentsearchresultspagerforblock.yml
deleted file mode 100644
index 529560958..000000000
--- a/config/sync/block.block.solrsearchcontentsearchresultspagerforblock.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-uuid: 93af8e5e-0844-454f-9bdb-50dee29e52d3
-langcode: en
-status: true
-dependencies:
-  module:
-    - advanced_search
-    - context
-    - islandora
-  theme:
-    - idc_ui_theme_boots
-id: solrsearchcontentsearchresultspagerforblock
-theme: idc_ui_theme_boots
-region: content
-weight: -13
-provider: null
-plugin: 'advanced_search_result_pager:solr_search_content__block_1'
-settings:
-  id: 'advanced_search_result_pager:solr_search_content__block_1'
-  label: 'Solr search content: Search Results Pager for Block'
-  label_display: '0'
-  provider: advanced_search
-visibility:
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  context:
-    id: context
-    negate: null
-    values: ''
-  context_all:
-    id: context_all
-    negate: null
-    values: collection
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/sync/block.block.views_block__solr_search_content_block_1.yml b/config/sync/block.block.views_block__solr_search_content_block_1.yml
deleted file mode 100644
index 8f95acdfe..000000000
--- a/config/sync/block.block.views_block__solr_search_content_block_1.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-uuid: 425638ae-845e-4e36-8928-f590a7e8660d
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.solr_search_content
-  module:
-    - context
-    - islandora
-    - views
-  theme:
-    - idc_ui_theme_boots
-id: views_block__solr_search_content_block_1
-theme: idc_ui_theme_boots
-region: content
-weight: 0
-provider: null
-plugin: 'views_block:solr_search_content-block_1'
-settings:
-  id: 'views_block:solr_search_content-block_1'
-  label: ''
-  label_display: '0'
-  provider: views
-  views_label: ''
-  items_per_page: none
-visibility:
-  context_all:
-    id: context_all
-    negate: null
-    values: collection
-  context:
-    id: context
-    negate: null
-    values: ''
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/sync/block.block.yearswc.yml b/config/sync/block.block.yearswc.yml
deleted file mode 100644
index d413b36d0..000000000
--- a/config/sync/block.block.yearswc.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-uuid: c6a1b124-c1d0-4249-9c5a-3eb0963f25a1
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.year_swc
-  module:
-    - context
-    - facets
-    - islandora
-  theme:
-    - idc_ui_theme_boots
-id: yearswc
-theme: idc_ui_theme_boots
-region: sidebar_first
-weight: -5
-provider: null
-plugin: 'facet_block:year_swc'
-settings:
-  id: 'facet_block:year_swc'
-  label: Year
-  label_display: visible
-  provider: facets
-  context_mapping: {  }
-  block_id: yearswc
-visibility:
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  context:
-    id: context
-    negate: null
-    values: ''
-  context_all:
-    id: context_all
-    negate: null
-    values: collection
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/sync/citation_select.settings.yml b/config/sync/citation_select.settings.yml
deleted file mode 100644
index 1ae0324c5..000000000
--- a/config/sync/citation_select.settings.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-_core:
-  default_config_hash: Hp8pxCkOLxZjIb2VJfTXGKWTUscMK3f3cg0McSzAmKo
-csl_map:
-  title:
-    - title
-  'current url':
-    - URL
-typed_relation_map:
-  'relators:aut': author
-  'relators:ctb': contributor
-  'relators:edt': editor
-  'relators:pbl': publisher
diff --git a/config/sync/context.context.collection.yml b/config/sync/context.context.collection.yml
index 7ef48eebc..c4bef3ee6 100644
--- a/config/sync/context.context.collection.yml
+++ b/config/sync/context.context.collection.yml
@@ -9,7 +9,7 @@ dependencies:
     - views
 _core:
   default_config_hash: vH6Z5udf5Ab9cLW3Zl2-6VCbT0hagmZfalNjb654KVs
-label: 'Collection (members of)'
+label: Collection
 name: collection
 group: Display
 description: 'If a Collection or Compound, display a block of children'
@@ -51,11 +51,11 @@ reactions:
         provider: views
         label_display: visible
         region: content
-        weight: '10'
+        weight: '-10'
         custom_id: views_block_members_block_1
         theme: idc_ui_theme_boots
-        css_class: views_block_members_block_class
-        unique: 1
+        css_class: ''
+        unique: 0
         context_id: collection
         context_mapping: {  }
         views_label: ''
diff --git a/config/sync/core.entity_form_display.node.islandora_object.default.yml b/config/sync/core.entity_form_display.node.islandora_object.default.yml
index 9b31f09df..9f94e9277 100644
--- a/config/sync/core.entity_form_display.node.islandora_object.default.yml
+++ b/config/sync/core.entity_form_display.node.islandora_object.default.yml
@@ -5,7 +5,6 @@ dependencies:
   config:
     - field.field.node.islandora_object.field_abstract
     - field.field.node.islandora_object.field_alt_title
-    - field.field.node.islandora_object.field_alternative_title
     - field.field.node.islandora_object.field_citable_url
     - field.field.node.islandora_object.field_classification
     - field.field.node.islandora_object.field_collection_number
@@ -302,14 +301,6 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  field_alternative_title:
-    type: string_textfield
-    weight: 72
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
   field_citable_url:
     type: link_default
     weight: 46
diff --git a/config/sync/core.entity_view_display.node.collection_object.default.yml b/config/sync/core.entity_view_display.node.collection_object.default.yml
index 22a7a59f1..b885b1b37 100644
--- a/config/sync/core.entity_view_display.node.collection_object.default.yml
+++ b/config/sync/core.entity_view_display.node.collection_object.default.yml
@@ -31,6 +31,7 @@ dependencies:
     - field.field.node.collection_object.field_weight
     - node.type.collection_object
   module:
+    - controlled_access_terms
     - link
     - user
 _core:
@@ -40,6 +41,16 @@ targetEntityType: node
 bundle: collection_object
 mode: default
 content:
+  display_media_entity_view_1:
+    settings: {  }
+    third_party_settings: {  }
+    weight: 30
+    region: content
+  display_media_original_download:
+    settings: {  }
+    third_party_settings: {  }
+    weight: 32
+    region: content
   display_media_thumbnail:
     settings: {  }
     third_party_settings: {  }
@@ -55,14 +66,14 @@ content:
     region: content
   field_collection_contact_email:
     type: basic_string
-    label: inline
+    label: above
     settings: {  }
     third_party_settings: {  }
     weight: 4
     region: content
   field_collection_contact_name:
     type: string
-    label: inline
+    label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
@@ -70,22 +81,120 @@ content:
     region: content
   field_collection_number:
     type: string
-    label: inline
+    label: above
     settings:
-      link_to_entity: true
+      link_to_entity: false
     third_party_settings: {  }
     weight: 6
     region: content
+  field_date_captured:
+    type: edtf_default
+    label: above
+    settings:
+      date_separator: dash
+      date_order: big_endian
+      month_format: mm
+      day_format: dd
+      year_format: 'y'
+    third_party_settings: {  }
+    weight: 16
+    region: content
+  field_date_modified:
+    type: edtf_default
+    label: above
+    settings:
+      date_separator: dash
+      date_order: big_endian
+      month_format: mm
+      day_format: dd
+      year_format: 'y'
+    third_party_settings: {  }
+    weight: 19
+    region: content
+  field_date_valid:
+    type: edtf_default
+    label: above
+    settings:
+      date_separator: dash
+      date_order: big_endian
+      month_format: mm
+      day_format: dd
+      year_format: 'y'
+    third_party_settings: {  }
+    weight: 20
+    region: content
   field_description:
     type: basic_string
-    label: inline
+    label: above
     settings: {  }
     third_party_settings: {  }
     weight: 7
     region: content
+  field_display_hints:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 21
+    region: content
+  field_edtf_date:
+    type: edtf_default
+    label: above
+    settings:
+      date_separator: dash
+      date_order: big_endian
+      month_format: mm
+      day_format: dd
+      year_format: 'y'
+    third_party_settings: {  }
+    weight: 15
+    region: content
+  field_edtf_date_created:
+    type: edtf_default
+    label: above
+    settings:
+      date_separator: dash
+      date_order: big_endian
+      month_format: mm
+      day_format: dd
+      year_format: 'y'
+    third_party_settings: {  }
+    weight: 17
+    region: content
+  field_edtf_date_issued:
+    type: edtf_default
+    label: above
+    settings:
+      date_separator: dash
+      date_order: big_endian
+      month_format: mm
+      day_format: dd
+      year_format: 'y'
+    third_party_settings: {  }
+    weight: 18
+    region: content
+  field_extent:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 22
+    region: content
+  field_featured_item:
+    type: boolean
+    label: above
+    settings:
+      format: default
+      format_custom_false: ''
+      format_custom_true: ''
+    third_party_settings: {  }
+    weight: 8
+    region: content
   field_finding_aid:
     type: link
-    label: inline
+    label: above
     settings:
       trim_length: 80
       url_only: false
@@ -100,51 +209,116 @@ content:
     third_party_settings: {  }
     weight: 2
     region: content
+  field_geographic_subject:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 26
+    region: content
+  field_linked_agent:
+    type: typed_relation_default
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 23
+    region: content
   field_member_of:
     type: entity_reference_label
-    label: inline
+    label: above
     settings:
       link: true
     third_party_settings: {  }
     weight: 11
     region: content
+  field_model:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 10
+    region: content
+  field_resource_type:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 14
+    region: content
+  field_rights:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 24
+    region: content
+  field_subject_general:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 25
+    region: content
+  field_subjects_name:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 27
+    region: content
+  field_temporal_subject:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 28
+    region: content
   field_unique_id:
     type: string
-    label: inline
+    label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
     weight: 12
     region: content
+  field_weight:
+    type: number_integer
+    label: above
+    settings:
+      thousand_separator: ''
+      prefix_suffix: true
+    third_party_settings: {  }
+    weight: 13
+    region: content
+  islandora_fits_checksum:
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  links:
+    settings: {  }
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  openseadragon_media_evas_service_file:
+    settings: {  }
+    third_party_settings: {  }
+    weight: 29
+    region: content
 hidden:
-  display_media_entity_view_1: true
   display_media_entity_view_3: true
-  display_media_original_download: true
   display_media_service_file: true
-  field_date_captured: true
-  field_date_modified: true
-  field_date_valid: true
-  field_display_hints: true
-  field_edtf_date: true
-  field_edtf_date_created: true
-  field_edtf_date_issued: true
-  field_extent: true
-  field_featured_item: true
-  field_geographic_subject: true
-  field_linked_agent: true
-  field_model: true
-  field_resource_type: true
-  field_rights: true
-  field_subject_general: true
-  field_subjects_name: true
-  field_temporal_subject: true
-  field_weight: true
-  islandora_fits_checksum: true
   langcode: true
-  links: true
   openseadragon_media_evas_entity_view_1: true
   openseadragon_media_evas_entity_view_2: true
-  openseadragon_media_evas_service_file: true
   pdfjs_media_evas_entity_view_1: true
   pdfjs_media_evas_entity_view_2: true
   pdfjs_media_evas_service_file: true
diff --git a/config/sync/core.entity_view_display.node.collection_object.teaser.yml b/config/sync/core.entity_view_display.node.collection_object.teaser.yml
index b96248d75..0bd517993 100644
--- a/config/sync/core.entity_view_display.node.collection_object.teaser.yml
+++ b/config/sync/core.entity_view_display.node.collection_object.teaser.yml
@@ -53,6 +53,25 @@ content:
     third_party_settings: {  }
     weight: 3
     region: content
+  field_description:
+    type: basic_string
+    label: inline
+    settings: {  }
+    third_party_settings: {  }
+    weight: 5
+    region: content
+  field_gemini_uri:
+    settings: {  }
+    third_party_settings: {  }
+    weight: 6
+    region: content
+  field_weight:
+    type: number_unformatted
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
 hidden:
   display_media_entity_view_1: true
   display_media_original_download: true
@@ -64,7 +83,6 @@ hidden:
   field_date_captured: true
   field_date_modified: true
   field_date_valid: true
-  field_description: true
   field_display_hints: true
   field_edtf_date: true
   field_edtf_date_created: true
@@ -72,7 +90,6 @@ hidden:
   field_extent: true
   field_featured_item: true
   field_finding_aid: true
-  field_gemini_uri: true
   field_geographic_subject: true
   field_linked_agent: true
   field_member_of: true
@@ -83,7 +100,6 @@ hidden:
   field_subjects_name: true
   field_temporal_subject: true
   field_unique_id: true
-  field_weight: true
   islandora_fits_checksum: true
   langcode: true
   links: true
diff --git a/config/sync/core.entity_view_display.node.islandora_object.binary.yml b/config/sync/core.entity_view_display.node.islandora_object.binary.yml
index 5729ca8e8..32bc03e42 100644
--- a/config/sync/core.entity_view_display.node.islandora_object.binary.yml
+++ b/config/sync/core.entity_view_display.node.islandora_object.binary.yml
@@ -6,7 +6,6 @@ dependencies:
     - core.entity_view_mode.node.binary
     - field.field.node.islandora_object.field_abstract
     - field.field.node.islandora_object.field_alt_title
-    - field.field.node.islandora_object.field_alternative_title
     - field.field.node.islandora_object.field_citable_url
     - field.field.node.islandora_object.field_classification
     - field.field.node.islandora_object.field_collection_number
@@ -372,7 +371,6 @@ hidden:
   display_media_service_file: true
   display_media_thumbnail: true
   field_alt_title: true
-  field_alternative_title: true
   field_citable_url: true
   field_collection_number: true
   field_contributor: true
diff --git a/config/sync/core.entity_view_display.node.islandora_object.default.yml b/config/sync/core.entity_view_display.node.islandora_object.default.yml
index 040f64373..f7f4cb856 100644
--- a/config/sync/core.entity_view_display.node.islandora_object.default.yml
+++ b/config/sync/core.entity_view_display.node.islandora_object.default.yml
@@ -5,7 +5,6 @@ dependencies:
   config:
     - field.field.node.islandora_object.field_abstract
     - field.field.node.islandora_object.field_alt_title
-    - field.field.node.islandora_object.field_alternative_title
     - field.field.node.islandora_object.field_citable_url
     - field.field.node.islandora_object.field_classification
     - field.field.node.islandora_object.field_collection_number
@@ -123,14 +122,6 @@ content:
     third_party_settings: {  }
     weight: 4
     region: content
-  field_alternative_title:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 71
-    region: content
   field_citable_url:
     type: link
     label: above
diff --git a/config/sync/core.entity_view_display.node.islandora_object.open_seadragon.yml b/config/sync/core.entity_view_display.node.islandora_object.open_seadragon.yml
index 5845a919b..5d3d73357 100644
--- a/config/sync/core.entity_view_display.node.islandora_object.open_seadragon.yml
+++ b/config/sync/core.entity_view_display.node.islandora_object.open_seadragon.yml
@@ -6,7 +6,6 @@ dependencies:
     - core.entity_view_mode.node.open_seadragon
     - field.field.node.islandora_object.field_abstract
     - field.field.node.islandora_object.field_alt_title
-    - field.field.node.islandora_object.field_alternative_title
     - field.field.node.islandora_object.field_citable_url
     - field.field.node.islandora_object.field_classification
     - field.field.node.islandora_object.field_collection_number
@@ -373,7 +372,6 @@ hidden:
   display_media_service_file: true
   display_media_thumbnail: true
   field_alt_title: true
-  field_alternative_title: true
   field_citable_url: true
   field_collection_number: true
   field_contributor: true
diff --git a/config/sync/core.entity_view_display.node.islandora_object.pdfjs.yml b/config/sync/core.entity_view_display.node.islandora_object.pdfjs.yml
index bf6dd463f..168584c0a 100644
--- a/config/sync/core.entity_view_display.node.islandora_object.pdfjs.yml
+++ b/config/sync/core.entity_view_display.node.islandora_object.pdfjs.yml
@@ -6,7 +6,6 @@ dependencies:
     - core.entity_view_mode.node.pdfjs
     - field.field.node.islandora_object.field_abstract
     - field.field.node.islandora_object.field_alt_title
-    - field.field.node.islandora_object.field_alternative_title
     - field.field.node.islandora_object.field_citable_url
     - field.field.node.islandora_object.field_classification
     - field.field.node.islandora_object.field_collection_number
@@ -373,7 +372,6 @@ hidden:
   display_media_service_file: true
   display_media_thumbnail: true
   field_alt_title: true
-  field_alternative_title: true
   field_citable_url: true
   field_collection_number: true
   field_contributor: true
diff --git a/config/sync/core.entity_view_display.node.islandora_object.search_index.yml b/config/sync/core.entity_view_display.node.islandora_object.search_index.yml
index 9435f80c0..9c33c3f73 100644
--- a/config/sync/core.entity_view_display.node.islandora_object.search_index.yml
+++ b/config/sync/core.entity_view_display.node.islandora_object.search_index.yml
@@ -6,7 +6,6 @@ dependencies:
     - core.entity_view_mode.node.search_index
     - field.field.node.islandora_object.field_abstract
     - field.field.node.islandora_object.field_alt_title
-    - field.field.node.islandora_object.field_alternative_title
     - field.field.node.islandora_object.field_citable_url
     - field.field.node.islandora_object.field_classification
     - field.field.node.islandora_object.field_collection_number
@@ -460,7 +459,6 @@ content:
 hidden:
   display_media_entity_view_3: true
   display_media_thumbnail: true
-  field_alternative_title: true
   field_citable_url: true
   field_collection_number: true
   field_contributor: true
diff --git a/config/sync/core.entity_view_display.node.islandora_object.search_result.yml b/config/sync/core.entity_view_display.node.islandora_object.search_result.yml
index 40e771035..e1c5f2113 100644
--- a/config/sync/core.entity_view_display.node.islandora_object.search_result.yml
+++ b/config/sync/core.entity_view_display.node.islandora_object.search_result.yml
@@ -6,7 +6,6 @@ dependencies:
     - core.entity_view_mode.node.search_result
     - field.field.node.islandora_object.field_abstract
     - field.field.node.islandora_object.field_alt_title
-    - field.field.node.islandora_object.field_alternative_title
     - field.field.node.islandora_object.field_citable_url
     - field.field.node.islandora_object.field_classification
     - field.field.node.islandora_object.field_collection_number
@@ -196,7 +195,6 @@ hidden:
   display_media_service_file: true
   display_media_thumbnail: true
   field_alt_title: true
-  field_alternative_title: true
   field_citable_url: true
   field_classification: true
   field_collection_number: true
diff --git a/config/sync/core.entity_view_display.node.islandora_object.teaser.yml b/config/sync/core.entity_view_display.node.islandora_object.teaser.yml
index 855ac7bd1..1ddd57da3 100644
--- a/config/sync/core.entity_view_display.node.islandora_object.teaser.yml
+++ b/config/sync/core.entity_view_display.node.islandora_object.teaser.yml
@@ -6,7 +6,6 @@ dependencies:
     - core.entity_view_mode.node.teaser
     - field.field.node.islandora_object.field_abstract
     - field.field.node.islandora_object.field_alt_title
-    - field.field.node.islandora_object.field_alternative_title
     - field.field.node.islandora_object.field_citable_url
     - field.field.node.islandora_object.field_classification
     - field.field.node.islandora_object.field_collection_number
@@ -78,6 +77,7 @@ dependencies:
     - node.type.islandora_object
   module:
     - controlled_access_terms
+    - search_api_solr
     - user
 _core:
   default_config_hash: JknApCSkcV3PzfTMK_yhbY65o6sBHvjIs5J6dJF2YI0
@@ -91,6 +91,22 @@ content:
     third_party_settings: {  }
     weight: 0
     region: content
+  field_abstract:
+    type: solr_highlighted_text_default
+    label: inline
+    settings:
+      prefix: '<strong>'
+      suffix: '</strong>'
+    third_party_settings: {  }
+    weight: 5
+    region: content
+  field_description:
+    type: basic_string
+    label: inline
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
   field_linked_agent:
     type: typed_relation_default
     label: hidden
@@ -99,15 +115,39 @@ content:
     third_party_settings: {  }
     weight: 3
     region: content
+  field_member_of:
+    type: entity_reference_label
+    label: inline
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 7
+    region: content
+  field_model:
+    type: entity_reference_label
+    label: inline
+    settings:
+      link: false
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  islandora_fits_checksum:
+    settings: {  }
+    third_party_settings: {  }
+    weight: 6
+    region: content
+  links:
+    settings: {  }
+    third_party_settings: {  }
+    weight: 2
+    region: content
 hidden:
   display_media_entity_view_1: true
   display_media_entity_view_2: true
   display_media_original_download: true
   display_media_service_file: true
   display_media_thumbnail: true
-  field_abstract: true
   field_alt_title: true
-  field_alternative_title: true
   field_citable_url: true
   field_classification: true
   field_collection_number: true
@@ -124,7 +164,6 @@ hidden:
   field_date_modified: true
   field_date_published: true
   field_date_valid: true
-  field_description: true
   field_dewey_classification: true
   field_digital_identifier: true
   field_digital_publisher: true
@@ -154,9 +193,7 @@ hidden:
   field_lcc_classification: true
   field_library_catalog_link: true
   field_local_identifier: true
-  field_member_of: true
   field_mode_of_issuance: true
-  field_model: true
   field_note: true
   field_oclc_number: true
   field_physical_form: true
@@ -176,9 +213,7 @@ hidden:
   field_unique_id: true
   field_weight: true
   field_years: true
-  islandora_fits_checksum: true
   langcode: true
-  links: true
   members_eva_entity_view_1: true
   openseadragon_media_evas_entity_view_1: true
   openseadragon_media_evas_entity_view_2: true
diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
index cf3cd3815..c5c12428d 100644
--- a/config/sync/core.extension.yml
+++ b/config/sync/core.extension.yml
@@ -3,23 +3,16 @@ _core:
 module:
   action: 0
   admin_toolbar: 0
-  admin_toolbar_search: 0
   admin_toolbar_tools: 0
-  advanced_search: 0
   automated_cron: 0
   basic_auth: 0
-  better_exposed_filters: 0
-  bibcite: 0
   big_pipe: 0
   block: 0
   block_content: 0
   breakpoint: 0
-  citation_select: 0
   ckeditor5: 0
   comment: 0
   config: 0
-  config_delete: 0
-  config_inspector: 0
   config_update: 0
   contact: 0
   context: 0
@@ -50,7 +43,6 @@ module:
   file_replace: 0
   filehash: 0
   filter: 0
-  flexible_permissions: 0
   flysystem: 0
   geolocation: 0
   gnode: 0
@@ -62,6 +54,7 @@ module:
   idc_default_migration: 0
   image: 0
   islandora: 0
+  islandora_advanced_search: 0
   islandora_audio: 0
   islandora_breadcrumbs: 0
   islandora_core_feature: 0
@@ -74,10 +67,7 @@ module:
   islandora_workbench_integration: 0
   jquery_ui: 0
   jquery_ui_autocomplete: 0
-  jquery_ui_datepicker: 0
   jquery_ui_menu: 0
-  jquery_ui_slider: 0
-  jquery_ui_touch_punch: 0
   jsonld: 0
   jwt: 0
   key: 0
@@ -93,7 +83,6 @@ module:
   migrate_tools: 0
   mysql: 0
   node: 0
-  node_title_length: 0
   openseadragon: 0
   options: 0
   page_cache: 0
@@ -117,7 +106,6 @@ module:
   taxonomy: 0
   taxonomy_manager: 0
   text: 0
-  title_length: 0
   token: 0
   toolbar: 0
   tour: 0
@@ -128,8 +116,6 @@ module:
   variationcache: 0
   view_mode_switch: 0
   views_data_export: 0
-  views_field_view: 0
-  views_nested_details: 0
   views_ui: 0
   pathauto: 1
   content_translation: 10
diff --git a/config/sync/facets.facet.creators_and_contributors_swc.yml b/config/sync/facets.facet.creators_and_contributors_swc.yml
deleted file mode 100644
index 92ee3e3cf..000000000
--- a/config/sync/facets.facet.creators_and_contributors_swc.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-uuid: beab2212-f472-470c-bbbf-3f4bcc375ba4
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api.index.default_solr_index
-    - views.view.solr_search_content
-  module:
-    - search_api
-id: creators_and_contributors_swc
-name: 'Creators and Contributors_swc'
-weight: -1
-min_count: 1
-missing: false
-missing_label: others
-url_alias: creators_and_contributors
-facet_source_id: 'search_api:views_block__solr_search_content__block_1'
-field_identifier: field_linked_agent_name
-query_operator: or
-hard_limit: 0
-exclude: false
-use_hierarchy: false
-keep_hierarchy_parents_active: false
-hierarchy:
-  type: taxonomy
-  config: {  }
-expand_hierarchy: false
-enable_parent_when_child_gets_disabled: true
-widget:
-  type: links
-  config:
-    show_numbers: true
-    soft_limit: 10
-    show_reset_link: false
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: false
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-empty_behavior:
-  behavior: none
-only_visible_when_facet_source_is_visible: true
-show_only_one_result: false
-show_title: false
-processor_configs:
-  active_widget_order:
-    processor_id: active_widget_order
-    weights:
-      sort: 20
-    settings:
-      sort: DESC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
-  display_value_widget_order:
-    processor_id: display_value_widget_order
-    weights:
-      sort: 40
-    settings:
-      sort: ASC
-  hide_inactive_siblings_processor:
-    processor_id: hide_inactive_siblings_processor
-    weights:
-      build: 10
-    settings: {  }
-  hierarchy_processor:
-    processor_id: hierarchy_processor
-    weights:
-      build: 100
-    settings: {  }
-  url_processor_handler:
-    processor_id: url_processor_handler
-    weights:
-      pre_query: 50
-      build: 15
-    settings: {  }
diff --git a/config/sync/facets.facet.physical_form_swc.yml b/config/sync/facets.facet.physical_form_swc.yml
deleted file mode 100644
index 8e2d257a1..000000000
--- a/config/sync/facets.facet.physical_form_swc.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-uuid: 379bc639-0f34-4e8f-8c04-366d9eeb5e2c
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api.index.default_solr_index
-    - views.view.solr_search_content
-  module:
-    - search_api
-id: physical_form_swc
-name: 'Physical Form SwC'
-weight: 0
-min_count: 1
-missing: false
-missing_label: others
-url_alias: physical_form_swc
-facet_source_id: 'search_api:views_block__solr_search_content__block_1'
-field_identifier: field_physical_form
-query_operator: or
-hard_limit: 0
-exclude: false
-use_hierarchy: false
-keep_hierarchy_parents_active: false
-hierarchy:
-  type: taxonomy
-  config: {  }
-expand_hierarchy: false
-enable_parent_when_child_gets_disabled: true
-widget:
-  type: links
-  config:
-    show_numbers: true
-    soft_limit: 0
-    show_reset_link: false
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: false
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-empty_behavior:
-  behavior: none
-only_visible_when_facet_source_is_visible: true
-show_only_one_result: false
-show_title: false
-processor_configs:
-  active_widget_order:
-    processor_id: active_widget_order
-    weights:
-      sort: 20
-    settings:
-      sort: DESC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
-  display_value_widget_order:
-    processor_id: display_value_widget_order
-    weights:
-      sort: 40
-    settings:
-      sort: ASC
-  hide_inactive_siblings_processor:
-    processor_id: hide_inactive_siblings_processor
-    weights:
-      build: 10
-    settings: {  }
-  hierarchy_processor:
-    processor_id: hierarchy_processor
-    weights:
-      build: 100
-    settings: {  }
-  url_processor_handler:
-    processor_id: url_processor_handler
-    weights:
-      pre_query: 50
-      build: 15
-    settings: {  }
diff --git a/config/sync/facets.facet.member_of_swc.yml b/config/sync/facets.facet.resource_type_2.yml
similarity index 78%
rename from config/sync/facets.facet.member_of_swc.yml
rename to config/sync/facets.facet.resource_type_2.yml
index 34c4061fd..cb4a3d373 100644
--- a/config/sync/facets.facet.member_of_swc.yml
+++ b/config/sync/facets.facet.resource_type_2.yml
@@ -1,4 +1,4 @@
-uuid: 866fe7f3-0d45-46a5-aa1a-de5873e6888e
+uuid: 4f207cea-7b7f-4df6-b29d-c96897f2419e
 langcode: en
 status: true
 dependencies:
@@ -7,15 +7,15 @@ dependencies:
     - views.view.solr_search_content
   module:
     - search_api
-id: member_of_swc
-name: 'Member Of SwC'
-weight: -2
+id: resource_type_2
+name: 'Resource Type'
+weight: 0
 min_count: 1
 missing: false
 missing_label: others
-url_alias: member_of
-facet_source_id: 'search_api:views_block__solr_search_content__block_1'
-field_identifier: member_of_title
+url_alias: resource_type
+facet_source_id: 'search_api:views_page__solr_search_content__page_2'
+field_identifier: field_resource_type
 query_operator: or
 hard_limit: 0
 exclude: false
@@ -29,7 +29,7 @@ enable_parent_when_child_gets_disabled: true
 widget:
   type: links
   config:
-    show_numbers: true
+    show_numbers: false
     soft_limit: 0
     show_reset_link: false
     reset_text: 'Show all'
@@ -61,11 +61,6 @@ processor_configs:
       sort: 40
     settings:
       sort: ASC
-  hide_inactive_siblings_processor:
-    processor_id: hide_inactive_siblings_processor
-    weights:
-      build: 10
-    settings: {  }
   hierarchy_processor:
     processor_id: hierarchy_processor
     weights:
diff --git a/config/sync/facets.facet.year.yml b/config/sync/facets.facet.year.yml
index ccf0eaa33..f57359f34 100644
--- a/config/sync/facets.facet.year.yml
+++ b/config/sync/facets.facet.year.yml
@@ -9,7 +9,7 @@ dependencies:
     - search_api
 id: year
 name: Year
-weight: 3
+weight: 0
 min_count: 1
 missing: false
 missing_label: others
@@ -49,11 +49,6 @@ processor_configs:
       sort: 40
     settings:
       sort: ASC
-  hide_inactive_siblings_processor:
-    processor_id: hide_inactive_siblings_processor
-    weights:
-      build: 10
-    settings: {  }
   hierarchy_processor:
     processor_id: hierarchy_processor
     weights:
diff --git a/config/sync/facets.facet.year_swc.yml b/config/sync/facets.facet.year_swc.yml
deleted file mode 100644
index 0a27df43f..000000000
--- a/config/sync/facets.facet.year_swc.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-uuid: 3392f222-24f9-4208-8820-7c5d23fac26b
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api.index.default_solr_index
-    - views.view.solr_search_content
-  module:
-    - search_api
-id: year_swc
-name: 'Year SwC'
-weight: 0
-min_count: 1
-missing: false
-missing_label: others
-url_alias: year
-facet_source_id: 'search_api:views_block__solr_search_content__block_1'
-field_identifier: edtf_year
-query_operator: or
-hard_limit: 0
-exclude: false
-use_hierarchy: false
-keep_hierarchy_parents_active: false
-hierarchy:
-  type: taxonomy
-  config: {  }
-expand_hierarchy: false
-enable_parent_when_child_gets_disabled: true
-widget:
-  type: links
-  config:
-    show_numbers: true
-    soft_limit: 0
-    show_reset_link: false
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: false
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-empty_behavior:
-  behavior: none
-only_visible_when_facet_source_is_visible: true
-show_only_one_result: false
-show_title: false
-processor_configs:
-  display_value_widget_order:
-    processor_id: display_value_widget_order
-    weights:
-      sort: 40
-    settings:
-      sort: ASC
-  hide_inactive_siblings_processor:
-    processor_id: hide_inactive_siblings_processor
-    weights:
-      build: 10
-    settings: {  }
-  hierarchy_processor:
-    processor_id: hierarchy_processor
-    weights:
-      build: 100
-    settings: {  }
-  url_processor_handler:
-    processor_id: url_processor_handler
-    weights:
-      pre_query: 50
-      build: 15
-    settings: {  }
diff --git a/config/sync/field.field.media.image.field_media_image.yml b/config/sync/field.field.media.image.field_media_image.yml
index 71b5575d4..8ef0cb953 100644
--- a/config/sync/field.field.media.image.field_media_image.yml
+++ b/config/sync/field.field.media.image.field_media_image.yml
@@ -6,12 +6,7 @@ dependencies:
     - field.storage.media.field_media_image
     - media.type.image
   module:
-    - filehash
     - image
-third_party_settings:
-  filehash:
-    dedupe: 0
-    dedupe_original: false
 _core:
   default_config_hash: idm-WOGrZKncw6SH8HGFJ6IzrgFpS0ifbdaK1x-81SA
 id: media.image.field_media_image
@@ -28,7 +23,7 @@ settings:
   handler: 'default:file'
   handler_settings: {  }
   file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'png gif jpg jpeg webp'
+  file_extensions: 'png gif jpg jpeg'
   max_filesize: ''
   max_resolution: ''
   min_resolution: ''
@@ -37,7 +32,7 @@ settings:
   title_field: false
   title_field_required: false
   default_image:
-    uuid: ''
+    uuid: null
     alt: ''
     title: ''
     width: null
diff --git a/config/sync/field.field.node.collection_object.field_member_of.yml b/config/sync/field.field.node.collection_object.field_member_of.yml
index aa1a57812..ebde985df 100644
--- a/config/sync/field.field.node.collection_object.field_member_of.yml
+++ b/config/sync/field.field.node.collection_object.field_member_of.yml
@@ -5,7 +5,6 @@ dependencies:
   config:
     - field.storage.node.field_member_of
     - node.type.collection_object
-    - node.type.islandora_object
 _core:
   default_config_hash: Y4yKpaHmxm0mkyZa5wCOpNT9ilZcsd1VFvBglMaJaMk
 id: node.collection_object.field_member_of
@@ -20,13 +19,5 @@ default_value: {  }
 default_value_callback: ''
 settings:
   handler: 'default:node'
-  handler_settings:
-    target_bundles:
-      collection_object: collection_object
-      islandora_object: islandora_object
-    sort:
-      field: field_weight
-      direction: ASC
-    auto_create: false
-    auto_create_bundle: collection_object
+  handler_settings: {  }
 field_type: entity_reference
diff --git a/config/sync/field.field.node.islandora_object.field_alternative_title.yml b/config/sync/field.field.node.islandora_object.field_alternative_title.yml
deleted file mode 100644
index b7348f52f..000000000
--- a/config/sync/field.field.node.islandora_object.field_alternative_title.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-uuid: 39afa9fb-01c7-48ad-8e20-6b33d6c9a0b9
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_alternative_title
-    - node.type.islandora_object
-id: node.islandora_object.field_alternative_title
-field_name: field_alternative_title
-entity_type: node
-bundle: islandora_object
-label: 'Alternative Title'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/sync/field.field.node.islandora_object.field_contributor.yml b/config/sync/field.field.node.islandora_object.field_contributor.yml
index 17cad8202..7c7524f84 100644
--- a/config/sync/field.field.node.islandora_object.field_contributor.yml
+++ b/config/sync/field.field.node.islandora_object.field_contributor.yml
@@ -35,7 +35,7 @@ settings:
     sort:
       field: name
       direction: asc
-    auto_create: true
+    auto_create: false
     auto_create_bundle: corporate_body
   rel_types:
     'relators:abr': 'Abridger (abr)'
diff --git a/config/sync/field.field.node.islandora_object.field_digital_publisher.yml b/config/sync/field.field.node.islandora_object.field_digital_publisher.yml
index c9f741c43..3b9a04a74 100644
--- a/config/sync/field.field.node.islandora_object.field_digital_publisher.yml
+++ b/config/sync/field.field.node.islandora_object.field_digital_publisher.yml
@@ -6,6 +6,8 @@ dependencies:
     - field.storage.node.field_digital_publisher
     - node.type.islandora_object
     - taxonomy.vocabulary.corporate_body
+    - taxonomy.vocabulary.family
+    - taxonomy.vocabulary.person
   module:
     - epp
 third_party_settings:
@@ -27,6 +29,8 @@ settings:
   handler_settings:
     target_bundles:
       corporate_body: corporate_body
+      family: family
+      person: person
     sort:
       field: name
       direction: asc
diff --git a/config/sync/field.field.node.islandora_object.field_publisher.yml b/config/sync/field.field.node.islandora_object.field_publisher.yml
index c3905ec50..4eb2d8071 100644
--- a/config/sync/field.field.node.islandora_object.field_publisher.yml
+++ b/config/sync/field.field.node.islandora_object.field_publisher.yml
@@ -6,6 +6,14 @@ dependencies:
     - field.storage.node.field_publisher
     - node.type.islandora_object
     - taxonomy.vocabulary.corporate_body
+    - taxonomy.vocabulary.family
+    - taxonomy.vocabulary.person
+  module:
+    - epp
+third_party_settings:
+  epp:
+    value: ''
+    on_update: 0
 id: node.islandora_object.field_publisher
 field_name: field_publisher
 entity_type: node
@@ -21,6 +29,8 @@ settings:
   handler_settings:
     target_bundles:
       corporate_body: corporate_body
+      family: family
+      person: person
     sort:
       field: name
       direction: asc
diff --git a/config/sync/field.field.node.islandora_object.field_years.yml b/config/sync/field.field.node.islandora_object.field_years.yml
index 24f6b1262..7f83a3e55 100644
--- a/config/sync/field.field.node.islandora_object.field_years.yml
+++ b/config/sync/field.field.node.islandora_object.field_years.yml
@@ -7,13 +7,18 @@ dependencies:
     - node.type.islandora_object
   module:
     - controlled_access_terms
+    - epp
+third_party_settings:
+  epp:
+    value: ''
+    on_update: 0
 id: node.islandora_object.field_years
 field_name: field_years
 entity_type: node
 bundle: islandora_object
 label: Years
 description: "<b>Required.</b> This field is only used for Solr indexing and will not show up to end-users. Enter one year (YYYY) only per field, repeating field if necessary. See full instructions at [link].\r\n"
-required: false
+required: true
 translatable: false
 default_value: {  }
 default_value_callback: ''
diff --git a/config/sync/field.storage.group_relationship.group_roles.yml b/config/sync/field.storage.group_content.group_roles.yml
similarity index 61%
rename from config/sync/field.storage.group_relationship.group_roles.yml
rename to config/sync/field.storage.group_content.group_roles.yml
index dad63d321..696665176 100644
--- a/config/sync/field.storage.group_relationship.group_roles.yml
+++ b/config/sync/field.storage.group_content.group_roles.yml
@@ -1,14 +1,14 @@
-uuid: 8483f840-c7e4-459e-9d97-79646f5be072
+uuid: 4f2c095d-1f6e-47b5-a1ad-33f22b4d108e
 langcode: en
 status: true
 dependencies:
   module:
     - group
 _core:
-  default_config_hash: fflZgd81k910MmV3_gPZaFhuXnV9qflFVT6yo28Xj_Q
-id: group_relationship.group_roles
+  default_config_hash: Sgrm2nHDx7xKvByuR5oGB77nLvI0LikTM8ff3e_YlWY
+id: group_content.group_roles
 field_name: group_roles
-entity_type: group_relationship
+entity_type: group_content
 type: entity_reference
 settings:
   target_type: group_role
diff --git a/config/sync/field.storage.media.field_media_image.yml b/config/sync/field.storage.media.field_media_image.yml
index cd7a69ccc..3b9f5f8d6 100644
--- a/config/sync/field.storage.media.field_media_image.yml
+++ b/config/sync/field.storage.media.field_media_image.yml
@@ -3,13 +3,9 @@ langcode: en
 status: true
 dependencies:
   module:
-    - field_permissions
     - file
     - image
     - media
-third_party_settings:
-  field_permissions:
-    permission_type: public
 _core:
   default_config_hash: NslRY6r63iEhkDXbs8n7v_iOBxPqaKhstX1Sb0HA7x0
 id: media.field_media_image
diff --git a/config/sync/idc_ui_theme_boots.settings.yml b/config/sync/idc_ui_theme_boots.settings.yml
index c6c63cd50..2ace13a82 100644
--- a/config/sync/idc_ui_theme_boots.settings.yml
+++ b/config/sync/idc_ui_theme_boots.settings.yml
@@ -63,7 +63,7 @@ bootstrap_barrio_sidebar_first_offset: 0
 bootstrap_barrio_sidebar_second_width: 3
 bootstrap_barrio_sidebar_second_offset: 0
 bootstrap_barrio_button: 1
-bootstrap_barrio_button_size: btn-sm
+bootstrap_barrio_button_size: ''
 bootstrap_barrio_button_outline: 0
 bootstrap_barrio_navbar_container: '1'
 bootstrap_barrio_navbar_toggle: navbar-toggleable-md
diff --git a/config/sync/islandora.settings.yml b/config/sync/islandora.settings.yml
index 8f068bf42..dc71786a7 100644
--- a/config/sync/islandora.settings.yml
+++ b/config/sync/islandora.settings.yml
@@ -2,7 +2,6 @@ _core:
   default_config_hash: XgeYJpPmZIOwE_nA73tYvFw-Rcj-HtlbNwfktqSVsaQ
 broker_url: 'tcp://activemq:61613'
 jwt_expiry: '+2 hour'
-delete_media_and_files: true
 upload_form_location: ''
 upload_form_allowed_mimetypes: ''
 gemini_url: ''
@@ -13,3 +12,4 @@ gemini_pseudo_bundles:
   'file:media': 'file:media'
   'image:media': 'image:media'
   'video:media': 'video:media'
+delete_media_and_files: true
diff --git a/config/sync/advanced_search.settings.yml b/config/sync/islandora_advanced_search.settings.yml
similarity index 52%
rename from config/sync/advanced_search.settings.yml
rename to config/sync/islandora_advanced_search.settings.yml
index 55a7067da..50cf62950 100644
--- a/config/sync/advanced_search.settings.yml
+++ b/config/sync/islandora_advanced_search.settings.yml
@@ -1,9 +1,3 @@
-lucene_on_off: 1
-lucene_label: Keyword
-all_fields_on_off: 1
-list_on_off: 1
-grid_on_off: 1
-default-display-mode: list
 search_query_parameter: a
 search_recursive_parameter: r
 search_add_operator: +
diff --git a/config/sync/pathauto.pattern.group_content.yml b/config/sync/pathauto.pattern.group_content.yml
new file mode 100644
index 000000000..1dd564d33
--- /dev/null
+++ b/config/sync/pathauto.pattern.group_content.yml
@@ -0,0 +1,18 @@
+uuid: 2cb1c5bb-5890-431c-8199-1281963eb36b
+langcode: en
+status: true
+dependencies:
+  module:
+    - group
+_core:
+  default_config_hash: rk2G0ozgUlKP7ic1RRjMcXUmeZxXUKPV-q-brekIKMc
+id: group_content
+label: 'Group content'
+type: 'canonical_entities:group_content'
+pattern: 'group/[group_content:group:id]/[group_content:pretty-path-key]/[group_content:id]'
+selection_criteria: {  }
+selection_logic: and
+weight: -5
+relationships:
+  'group_content:langcode:language':
+    label: Language
diff --git a/config/sync/pathauto.pattern.group_relationship.yml b/config/sync/pathauto.pattern.group_relationship.yml
deleted file mode 100644
index 868f8c8bf..000000000
--- a/config/sync/pathauto.pattern.group_relationship.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: 2039f835-a370-4ede-8dd3-e44167005f44
-langcode: en
-status: true
-dependencies:
-  module:
-    - group
-_core:
-  default_config_hash: 1tEtbHvVBjy2ChRMYjieiOpb_YY3pH9m3ug1UJOvWrg
-id: group_relationship
-label: 'Group relationship'
-type: 'canonical_entities:group_relationship'
-pattern: 'group/[group_relationship:group:id]/[group_relationship:pretty-path-key]/[group_relationship:id]'
-selection_criteria: {  }
-selection_logic: and
-weight: -5
-relationships:
-  'group_relationship:langcode:language':
-    label: Language
diff --git a/config/sync/search_api.index.default_solr_index.yml b/config/sync/search_api.index.default_solr_index.yml
index bb3d9f0be..bf09a984e 100644
--- a/config/sync/search_api.index.default_solr_index.yml
+++ b/config/sync/search_api.index.default_solr_index.yml
@@ -3,13 +3,12 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.node.field_abstract
     - field.storage.node.field_alt_title
-    - field.storage.node.field_edtf_date_created
     - field.storage.node.field_member_of
     - field.storage.node.field_description
     - field.storage.node.field_dewey_classification
     - field.storage.node.field_edition
+    - field.storage.node.field_edtf_date_created
     - field.storage.node.field_extent
     - field.storage.node.field_full_title
     - field.storage.node.field_isbn
@@ -19,12 +18,12 @@ dependencies:
     - field.storage.node.field_physical_form
     - field.storage.node.field_resource_type
     - field.storage.node.field_rights
+    - field.storage.node.field_tags
     - field.storage.node.field_subject_general
     - field.storage.node.field_geographic_subject
     - field.storage.node.field_subjects_name
     - field.storage.node.field_temporal_subject
     - field.storage.node.field_subject
-    - field.storage.node.field_tags
     - search_api.server.default_solr_server
     - core.entity_view_mode.node.search_index
   module:
@@ -87,18 +86,6 @@ name: 'Default Solr content index'
 description: 'Default content index created by the Solr Search Defaults module'
 read_only: false
 field_settings:
-  abstract_description_fulltext:
-    label: Description
-    property_path: aggregated_field
-    type: text
-    configuration:
-      type: union
-      separator: |+
-
-
-      fields:
-        - 'entity:node/field_abstract'
-        - 'entity:node/field_description'
   author:
     label: 'Author name'
     datasource_id: 'entity:node'
@@ -128,14 +115,6 @@ field_settings:
     label: 'EDTF Creation Date Year'
     property_path: edtf_year
     type: integer
-  field_abstract:
-    label: Abstract
-    datasource_id: 'entity:node'
-    property_path: field_abstract
-    type: text
-    dependencies:
-      config:
-        - field.storage.node.field_abstract
   field_alt_title:
     label: 'Alternative Title'
     datasource_id: 'entity:node'
@@ -231,16 +210,6 @@ field_settings:
         - field.storage.node.field_linked_agent
       module:
         - taxonomy
-  field_member_of:
-    label: 'Member of'
-    datasource_id: 'entity:node'
-    property_path: 'field_member_of:entity:field_member_of'
-    type: integer
-    dependencies:
-      config:
-        - field.storage.node.field_member_of
-      module:
-        - node
   field_oclc_number:
     label: 'OCLC Number'
     datasource_id: 'entity:node'
@@ -295,14 +264,6 @@ field_settings:
         - field.storage.node.field_member_of
       module:
         - node
-  nid:
-    label: ID
-    datasource_id: 'entity:node'
-    property_path: nid
-    type: integer
-    dependencies:
-      module:
-        - node
   node_grants:
     label: 'Node access information'
     property_path: search_api_node_grants
@@ -341,15 +302,12 @@ field_settings:
     dependencies:
       module:
         - node
-  subject_aggregated_fulltext:
-    label: Subjects
+  subject_aggregated:
+    label: 'Subjects (All)'
     property_path: aggregated_field
-    type: text
+    type: string
     configuration:
       type: union
-      separator: |+
-
-
       fields:
         - 'entity:node/field_geographic_subject'
         - 'entity:node/field_subject'
@@ -425,20 +383,6 @@ field_settings:
         - 'entity:node/field_alt_title'
         - 'entity:node/field_full_title'
         - 'entity:node/title'
-  title_aggregated_fulltext:
-    label: Title
-    property_path: aggregated_field
-    type: text
-    configuration:
-      type: union
-      separator: |+
-
-
-      fields:
-        - 'entity:node/field_alt_title'
-        - 'entity:node/field_alternative_title'
-        - 'entity:node/field_full_title'
-        - 'entity:node/title'
   type:
     label: 'Content type'
     datasource_id: 'entity:node'
@@ -477,7 +421,6 @@ processor_settings:
     weights:
       preprocess_index: -6
       preprocess_query: -4
-  custom_value: {  }
   edtf_year_only:
     fields:
       collection_object|field_edtf_date: collection_object|field_edtf_date
@@ -488,9 +431,9 @@ processor_settings:
       islandora_object|field_edtf_date_created: islandora_object|field_edtf_date_created
       islandora_object|field_edtf_date_issued: islandora_object|field_edtf_date_issued
     ignore_undated: 1
-    ignore_open_start: 0
+    ignore_open_start: 1
     open_start_year: '0'
-    ignore_open_end: 0
+    ignore_open_end: 1
     open_end_year: ''
   entity_status:
     weights:
@@ -510,14 +453,9 @@ processor_settings:
     excerpt_always: true
     excerpt_length: 256
     exclude_fields:
-      - abstract_description_fulltext
-      - field_abstract
       - field_description
       - field_full_title
-      - rendered_item
-      - subject_aggregated_fulltext
       - title
-      - title_aggregated_fulltext
     highlight: always
     highlight_partial: true
   html_filter:
diff --git a/config/sync/search_api_solr.solr_cache.cache_document_default_9_0_0.yml b/config/sync/search_api_solr.solr_cache.cache_document_default_9_0_0.yml
deleted file mode 100644
index ed1931002..000000000
--- a/config/sync/search_api_solr.solr_cache.cache_document_default_9_0_0.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-uuid: bd49c3df-3757-4a99-a85e-cf7a9179845c
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: 8US9Yb33EXUGI8LNE2tUeFZGOdYR9ZEQnSmQ9oK_X98
-id: cache_document_default_9_0_0
-label: 'Document Cache'
-minimum_solr_version: 9.0.0
-environments: {  }
-cache:
-  name: document
-  class: solr.CaffeineCache
-  size: 512
-  initialSize: 512
-  autowarmCount: 0
-solr_configs: null
diff --git a/config/sync/search_api_solr.solr_cache.cache_fieldvalue_default_9_0_0.yml b/config/sync/search_api_solr.solr_cache.cache_fieldvalue_default_9_0_0.yml
deleted file mode 100644
index 730a55a3c..000000000
--- a/config/sync/search_api_solr.solr_cache.cache_fieldvalue_default_9_0_0.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 2462125f-9fe6-478d-aa08-22eb16e318f5
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: PpXzcu_b6Wkh_EE_vleOz9EJWVHQISeD0BN8Yrd5cY0
-id: cache_fieldvalue_default_9_0_0
-label: 'Field Value Cache'
-minimum_solr_version: 9.0.0
-environments: {  }
-cache:
-  name: fieldValue
-  class: solr.CaffeineCache
-  size: 512
-  autowarmCount: 128
-  showItems: 32
-solr_configs:
-  query:
-    -
-      name: enableLazyFieldLoading
-      VALUE: 'true'
diff --git a/config/sync/search_api_solr.solr_cache.cache_filter_default_9_0_0.yml b/config/sync/search_api_solr.solr_cache.cache_filter_default_9_0_0.yml
deleted file mode 100644
index 268ec216e..000000000
--- a/config/sync/search_api_solr.solr_cache.cache_filter_default_9_0_0.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 9a908313-f018-4fce-8f56-56724f29c506
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: kPqER5Lz5zFQ-x9Mmadmzp6QuCx8HkqXZaPkTNWoN64
-id: cache_filter_default_9_0_0
-label: 'Filter Cache'
-minimum_solr_version: 9.0.0
-environments: {  }
-cache:
-  name: filter
-  class: solr.CaffeineCache
-  size: 512
-  initialSize: 512
-  autowarmCount: 0
-solr_configs:
-  query:
-    -
-      name: useFilterForSortedQuery
-      VALUE: 'false'
diff --git a/config/sync/search_api_solr.solr_cache.cache_persegfilter_default_9_0_0.yml b/config/sync/search_api_solr.solr_cache.cache_persegfilter_default_9_0_0.yml
deleted file mode 100644
index 998f49f54..000000000
--- a/config/sync/search_api_solr.solr_cache.cache_persegfilter_default_9_0_0.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: a6ec3c3d-686a-4711-8ffb-bf29b0653bbe
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: Dg7CT1jTSkupnhVxZ8Md-1x6rHDP4Z2_E59GpmPXxVM
-id: cache_persegfilter_default_9_0_0
-label: 'Per Segment Filter Cache'
-minimum_solr_version: 9.0.0
-environments: {  }
-cache:
-  name: perSegFilter
-  class: solr.CaffeineCache
-  size: 10
-  initialSize: 0
-  autowarmCount: 10
-  regenerator: solr.NoOpRegenerator
-solr_configs: null
diff --git a/config/sync/search_api_solr.solr_cache.cache_queryresult_default_9_0_0.yml b/config/sync/search_api_solr.solr_cache.cache_queryresult_default_9_0_0.yml
deleted file mode 100644
index dff3bb0a5..000000000
--- a/config/sync/search_api_solr.solr_cache.cache_queryresult_default_9_0_0.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 7f32d949-8042-4845-88fc-5a495c1bdc96
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: ltEiX6t3a_eaBraAs0zu-1Df4H0PfE6RPu2vl8ti3Io
-id: cache_queryresult_default_9_0_0
-label: 'Query Result Cache'
-minimum_solr_version: 9.0.0
-environments: {  }
-cache:
-  name: queryResult
-  class: solr.CaffeineCache
-  size: 512
-  initialSize: 512
-  autowarmCount: 0
-solr_configs:
-  query:
-    -
-      name: queryResultWindowSize
-      VALUE: '20'
-    -
-      name: queryResultMaxDocsCached
-      VALUE: '200'
-    -
-      name: maxBooleanClauses
-      VALUE: '1024'
diff --git a/config/sync/search_api_solr.solr_field_type.text_edge_und_3_6_0.yml b/config/sync/search_api_solr.solr_field_type.text_edge_und_3_6_0.yml
index f8a1bf088..a23c396ad 100644
--- a/config/sync/search_api_solr.solr_field_type.text_edge_und_3_6_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_edge_und_3_6_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -58,7 +58,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.LengthFilterFactory
@@ -68,7 +68,6 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type: null
 collated_field_type: null
diff --git a/config/sync/search_api_solr.solr_field_type.text_edge_und_4_5_0.yml b/config/sync/search_api_solr.solr_field_type.text_edge_und_4_5_0.yml
index 72346c4a8..324882d09 100644
--- a/config/sync/search_api_solr.solr_field_type.text_edge_und_4_5_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_edge_und_4_5_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -57,7 +57,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.LengthFilterFactory
@@ -67,7 +67,6 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type: null
 collated_field_type: null
diff --git a/config/sync/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml
index fa9c4d2d3..d9f287b0d 100644
--- a/config/sync/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: vonycwEIXvilFOrjA0oPt-JLoHRDBx3O-m62cERMQrY
+  default_config_hash: yW20VJKElb-oT85z7mW5B-hMiAUsl4B-UDLZzCZPats
 id: text_edge_und_6_0_0
 label: 'Edge NGram Text Field'
 minimum_solr_version: 6.0.0
@@ -14,7 +14,6 @@ field_type:
   name: text_edge
   class: solr.TextField
   positionIncrementGap: 100
-  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
@@ -23,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -58,7 +57,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.LengthFilterFactory
diff --git a/config/sync/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml
index e48724bbc..53680dd17 100644
--- a/config/sync/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: x7hRmmjSQscuuefTJywoyq2xEywr2XojLNHJEgenImc
+  default_config_hash: edn4g9huIbBonsmj_ZVT_ASjxhb-m9P7qL4zSNgQ_t8
 id: text_edge_und_7_0_0
 label: 'Edge NGram Text Field'
 minimum_solr_version: 7.0.0
@@ -14,7 +14,6 @@ field_type:
   name: text_edge
   class: solr.TextField
   positionIncrementGap: 100
-  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
@@ -23,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -39,8 +38,6 @@ field_type:
           preserveOriginal: 1
           catenateAll: 0
           catenateWords: 1
-        -
-          class: solr.FlattenGraphFilterFactory
         -
           class: solr.LengthFilterFactory
           min: 2
@@ -60,7 +57,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.LengthFilterFactory
diff --git a/config/sync/search_api_solr.solr_field_type.text_edgestring_und_3_6_0.yml b/config/sync/search_api_solr.solr_field_type.text_edgestring_und_3_6_0.yml
index c5df762a8..3139581e5 100644
--- a/config/sync/search_api_solr.solr_field_type.text_edgestring_und_3_6_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_edgestring_und_3_6_0.yml
@@ -37,7 +37,6 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type: null
 collated_field_type: null
diff --git a/config/sync/search_api_solr.solr_field_type.text_edgestring_und_4_5_0.yml b/config/sync/search_api_solr.solr_field_type.text_edgestring_und_4_5_0.yml
index d817c8ed4..03504e3b3 100644
--- a/config/sync/search_api_solr.solr_field_type.text_edgestring_und_4_5_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_edgestring_und_4_5_0.yml
@@ -37,7 +37,6 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type: null
 collated_field_type: null
diff --git a/config/sync/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml
index 073a2add5..588439254 100644
--- a/config/sync/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: bWSErrOZirxgC9CR3TdPlJXHNmex1pARA9RNC--VqY8
+  default_config_hash: iifw_DxebhUOezFaJM3sD9m2rvzGXWkwxPC_g_58nag
 id: text_edgestring_und_6_0_0
 label: 'Edge NGram String Field'
 minimum_solr_version: 6.0.0
@@ -14,7 +14,6 @@ field_type:
   name: text_edgenstring
   class: solr.TextField
   positionIncrementGap: 100
-  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
diff --git a/config/sync/search_api_solr.solr_field_type.text_en_3_6_0.yml b/config/sync/search_api_solr.solr_field_type.text_en_3_6_0.yml
index 90d56b286..4dbc20670 100644
--- a/config/sync/search_api_solr.solr_field_type.text_en_3_6_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_en_3_6_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -58,7 +58,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.SynonymFilterFactory
@@ -92,7 +92,6 @@ field_type:
           language: English
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 unstemmed_field_type:
   name: text_unstemmed_en
   class: solr.TextField
@@ -105,7 +104,7 @@ unstemmed_field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -137,7 +136,7 @@ unstemmed_field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.SynonymFilterFactory
@@ -167,7 +166,6 @@ unstemmed_field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 spellcheck_field_type: null
 collated_field_type: {  }
 solr_configs:
diff --git a/config/sync/search_api_solr.solr_field_type.text_en_4_5_0.yml b/config/sync/search_api_solr.solr_field_type.text_en_4_5_0.yml
index 3d3045374..4be799292 100644
--- a/config/sync/search_api_solr.solr_field_type.text_en_4_5_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_en_4_5_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -57,7 +57,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.SynonymFilterFactory
@@ -90,7 +90,6 @@ field_type:
           language: English
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 unstemmed_field_type:
   name: text_unstemmed_en
   class: solr.TextField
@@ -103,7 +102,7 @@ unstemmed_field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -134,7 +133,7 @@ unstemmed_field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.SynonymFilterFactory
@@ -163,7 +162,6 @@ unstemmed_field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 spellcheck_field_type: null
 collated_field_type:
   name: collated_en
diff --git a/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml
index ada959e58..b5a7c80da 100644
--- a/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -57,7 +57,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.SynonymFilterFactory
@@ -90,7 +90,6 @@ field_type:
           language: English
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 unstemmed_field_type:
   name: text_unstemmed_en
   class: solr.TextField
@@ -103,7 +102,7 @@ unstemmed_field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -134,7 +133,7 @@ unstemmed_field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.SynonymFilterFactory
@@ -163,7 +162,6 @@ unstemmed_field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 spellcheck_field_type: null
 collated_field_type:
   name: collated_en
@@ -243,7 +241,7 @@ solr_configs:
               VALUE: sm_context_tags
             -
               name: buildOnCommit
-              VALUE: 'false'
+              VALUE: 'true'
             -
               name: buildOnStartup
               VALUE: 'false'
diff --git a/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml
index fb198f4c1..606578ad6 100644
--- a/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -38,8 +38,6 @@ field_type:
           preserveOriginal: 1
           catenateAll: 0
           catenateWords: 1
-        -
-          class: solr.FlattenGraphFilterFactory
         -
           class: solr.LengthFilterFactory
           min: 2
@@ -59,7 +57,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.SynonymGraphFilterFactory
@@ -92,7 +90,6 @@ field_type:
           language: English
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 unstemmed_field_type:
   name: text_unstemmed_en
   class: solr.TextField
@@ -105,7 +102,7 @@ unstemmed_field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -121,8 +118,6 @@ unstemmed_field_type:
           preserveOriginal: 1
           catenateAll: 0
           catenateWords: 1
-        -
-          class: solr.FlattenGraphFilterFactory
         -
           class: solr.LengthFilterFactory
           min: 2
@@ -138,7 +133,7 @@ unstemmed_field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.SynonymGraphFilterFactory
@@ -167,7 +162,6 @@ unstemmed_field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 spellcheck_field_type: null
 collated_field_type:
   name: collated_en
@@ -247,7 +241,7 @@ solr_configs:
               VALUE: sm_context_tags
             -
               name: buildOnCommit
-              VALUE: 'false'
+              VALUE: 'true'
             -
               name: buildOnStartup
               VALUE: 'false'
diff --git a/config/sync/search_api_solr.solr_field_type.text_ngram_und_3_6_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngram_und_3_6_0.yml
index b99523066..7c7788042 100644
--- a/config/sync/search_api_solr.solr_field_type.text_ngram_und_3_6_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_ngram_und_3_6_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -58,7 +58,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.LengthFilterFactory
@@ -68,7 +68,6 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type: null
 collated_field_type: null
diff --git a/config/sync/search_api_solr.solr_field_type.text_ngram_und_4_5_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngram_und_4_5_0.yml
index d7a903069..34d1b882b 100644
--- a/config/sync/search_api_solr.solr_field_type.text_ngram_und_4_5_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_ngram_und_4_5_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -57,7 +57,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.LengthFilterFactory
@@ -67,7 +67,6 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type: null
 collated_field_type: null
diff --git a/config/sync/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml
index ec2e4e1c3..85da9d648 100644
--- a/config/sync/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: nQ6v8pgrKN3bzfcel5GP6EO6A1Yo5uRUQId9pOyds6U
+  default_config_hash: R-qv3m6WSi8tTmAcAyQK2adAXRPW4xLrmkIFbqIVmvc
 id: text_ngram_und_6_0_0
 label: 'NGram Text Field'
 minimum_solr_version: 6.0.0
@@ -14,7 +14,6 @@ field_type:
   name: text_ngram
   class: solr.TextField
   positionIncrementGap: 100
-  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
@@ -23,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -58,7 +57,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.LengthFilterFactory
diff --git a/config/sync/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml
index ce2895af1..770a1cff3 100644
--- a/config/sync/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: wr_ZSGx3pe-AgupW-Sz4q3a5tyhG5E0yg6IySnGjwW8
+  default_config_hash: 6uqsWgLopdBAXIzy2SwBKR3p6a2GgNIsdteOAG9K-08
 id: text_ngram_und_7_0_0
 label: 'NGram Text Field'
 minimum_solr_version: 7.0.0
@@ -14,7 +14,6 @@ field_type:
   name: text_ngram
   class: solr.TextField
   positionIncrementGap: 100
-  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
@@ -23,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -39,8 +38,6 @@ field_type:
           preserveOriginal: 1
           catenateAll: 0
           catenateWords: 1
-        -
-          class: solr.FlattenGraphFilterFactory
         -
           class: solr.LengthFilterFactory
           min: 2
@@ -60,7 +57,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.LengthFilterFactory
diff --git a/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_3_6_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_3_6_0.yml
index d33d9e256..d927716e6 100644
--- a/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_3_6_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_3_6_0.yml
@@ -37,7 +37,6 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type: null
 collated_field_type: null
diff --git a/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_4_5_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_4_5_0.yml
index cb90d6514..7a1f4db54 100644
--- a/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_4_5_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_4_5_0.yml
@@ -37,7 +37,6 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type: null
 collated_field_type: null
diff --git a/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml
index 2b5fb2e45..e67b6a06b 100644
--- a/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: yJG5axh8DBXy46CJWBW9DMcFecWKHvppKGxtp92fhKc
+  default_config_hash: uSBOTyeTCtQQUTiAzoF9BQbK5H6RnvAFSII-DlIUcmQ
 id: text_ngramstring_und_6_0_0
 label: 'NGram String Field'
 minimum_solr_version: 6.0.0
@@ -14,7 +14,6 @@ field_type:
   name: text_ngramstring
   class: solr.TextField
   positionIncrementGap: 100
-  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
diff --git a/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml
index 94615ec4a..7e825e96c 100644
--- a/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml
@@ -18,7 +18,7 @@ field_type:
     -
       type: index
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -34,8 +34,6 @@ field_type:
           preserveOriginal: 1
           catenateAll: 0
           catenateWords: 1
-        -
-          class: solr.FlattenGraphFilterFactory
         -
           class: solr.LengthFilterFactory
           min: 2
@@ -53,7 +51,7 @@ field_type:
     -
       type: query
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -83,7 +81,6 @@ field_type:
           concat: true
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type: null
 collated_field_type: null
diff --git a/config/sync/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml
index 60e0cf73f..1633474f4 100644
--- a/config/sync/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: puB8VCKbCpDzJ-dEd9mlRUEShkBB7TQLAPiTBxCYtQs
+  default_config_hash: WpLFwsk7duNa2sQ1G_KO16bKL06d1JVveVjbkG9u5DI
 id: text_phonetic_und_7_0_0
 label: 'Fulltext Phonetic'
 minimum_solr_version: 7.0.0
@@ -14,12 +14,11 @@ field_type:
   name: text_phonetic_und
   class: solr.TextField
   positionIncrementGap: 100
-  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -35,8 +34,6 @@ field_type:
           preserveOriginal: 1
           catenateAll: 0
           catenateWords: 1
-        -
-          class: solr.FlattenGraphFilterFactory
         -
           class: solr.LengthFilterFactory
           min: 2
@@ -54,7 +51,7 @@ field_type:
     -
       type: query
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
diff --git a/config/sync/search_api_solr.solr_field_type.text_string_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_string_und_6_0_0.yml
index ef41c9cc7..dc1c94e75 100644
--- a/config/sync/search_api_solr.solr_field_type.text_string_und_6_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_string_und_6_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: vdoqZyPxL2QPQ0fVwyjjhHZYz9sDDWD62-Ou86DFOs4
+  default_config_hash: FXULm2mt03ExX95R8L1xo0F9iEHVPEfogRZG8oj07Ec
 id: text_string_und_6_0_0
 label: 'Fulltext String Field'
 minimum_solr_version: 6.0.0
@@ -14,7 +14,6 @@ field_type:
   name: text_string
   class: solr.TextField
   positionIncrementGap: 100
-  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
diff --git a/config/sync/search_api_solr.solr_field_type.text_und_3_6_0.yml b/config/sync/search_api_solr.solr_field_type.text_und_3_6_0.yml
index 85e995ef9..366d1a65c 100644
--- a/config/sync/search_api_solr.solr_field_type.text_und_3_6_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_und_3_6_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -54,7 +54,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.SynonymFilterFactory
@@ -84,7 +84,6 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type:
   name: text_spell_und
@@ -106,7 +105,6 @@ spellcheck_field_type:
         class: solr.LowerCaseFilterFactory
       -
         class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 collated_field_type: {  }
 solr_configs:
   searchComponents:
diff --git a/config/sync/search_api_solr.solr_field_type.text_und_4_5_0.yml b/config/sync/search_api_solr.solr_field_type.text_und_4_5_0.yml
index 58348f46e..8a02826aa 100644
--- a/config/sync/search_api_solr.solr_field_type.text_und_4_5_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_und_4_5_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -53,7 +53,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.SynonymFilterFactory
@@ -82,7 +82,6 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type:
   name: text_spell_und
@@ -104,7 +103,6 @@ spellcheck_field_type:
         class: solr.LowerCaseFilterFactory
       -
         class: solr.RemoveDuplicatesTokenFilterFactory
-  storeOffsetsWithPositions: true
 collated_field_type:
   name: collated_und
   class: solr.ICUCollationField
diff --git a/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml
index fac2b30fe..64740da53 100644
--- a/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: ifD-40czfZSDUcZnDyE8YEb7WVu5ZiRcJSAYycpAftA
+  default_config_hash: F_CbvhXxhM5f_yw68hsRDX9ItpKw_4b-wtP8Vkk_gqc
 id: text_und_6_0_0
 label: 'Language Undefined Text Field'
 minimum_solr_version: 6.0.0
@@ -14,7 +14,6 @@ field_type:
   name: text_und
   class: solr.TextField
   positionIncrementGap: 100
-  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
@@ -23,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -54,7 +53,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.SynonymFilterFactory
@@ -88,14 +87,13 @@ spellcheck_field_type:
   name: text_spell_und
   class: solr.TextField
   positionIncrementGap: 100
-  storeOffsetsWithPositions: true
   analyzer:
     charFilters:
       -
         class: solr.MappingCharFilterFactory
         mapping: accents_und.txt
     tokenizer:
-      class: solr.StandardTokenizerFactory
+      class: solr.WhitespaceTokenizerFactory
     filters:
       -
         class: solr.LengthFilterFactory
@@ -183,7 +181,7 @@ solr_configs:
               VALUE: sm_context_tags
             -
               name: buildOnCommit
-              VALUE: 'false'
+              VALUE: 'true'
             -
               name: buildOnStartup
               VALUE: 'false'
diff --git a/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml
index 64bf7087f..07e3e727c 100644
--- a/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: e24uTmPTMM6cwWTSGvotZEasK-TD0RybEtMy3s0qG-U
+  default_config_hash: KJ5-Op1mUfGaQHrBZxF0zXyCaRXmOO-6EGyVPF_muM4
 id: text_und_7_0_0
 label: 'Language Undefined Text Field'
 minimum_solr_version: 7.0.0
@@ -14,7 +14,6 @@ field_type:
   name: text_und
   class: solr.TextField
   positionIncrementGap: 100
-  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
@@ -23,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -39,8 +38,6 @@ field_type:
           preserveOriginal: 1
           catenateAll: 0
           catenateWords: 1
-        -
-          class: solr.FlattenGraphFilterFactory
         -
           class: solr.LengthFilterFactory
           min: 2
@@ -56,7 +53,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.StandardTokenizerFactory
+        class: solr.WhitespaceTokenizerFactory
       filters:
         -
           class: solr.SynonymGraphFilterFactory
@@ -90,14 +87,13 @@ spellcheck_field_type:
   name: text_spell_und
   class: solr.TextField
   positionIncrementGap: 100
-  storeOffsetsWithPositions: true
   analyzer:
     charFilters:
       -
         class: solr.MappingCharFilterFactory
         mapping: accents_und.txt
     tokenizer:
-      class: solr.StandardTokenizerFactory
+      class: solr.WhitespaceTokenizerFactory
     filters:
       -
         class: solr.LengthFilterFactory
@@ -185,7 +181,7 @@ solr_configs:
               VALUE: sm_context_tags
             -
               name: buildOnCommit
-              VALUE: 'false'
+              VALUE: 'true'
             -
               name: buildOnStartup
               VALUE: 'false'
diff --git a/config/sync/system.date.yml b/config/sync/system.date.yml
index aa5b247ab..9fa466be6 100644
--- a/config/sync/system.date.yml
+++ b/config/sync/system.date.yml
@@ -2,9 +2,9 @@ _core:
   default_config_hash: t7clj3mzmOGrXX0HuCH5usf0vEqRtnMTBFVBIEmZ5pc
 first_day: 0
 country:
-  default: US
+  default: ''
 timezone:
-  default: America/New_York
+  default: America/Chicago
   user:
     configurable: true
     default: 0
diff --git a/config/sync/system.logging.yml b/config/sync/system.logging.yml
index 135cce725..d6164de51 100644
--- a/config/sync/system.logging.yml
+++ b/config/sync/system.logging.yml
@@ -1,3 +1,3 @@
 _core:
   default_config_hash: u3-njszl92FaxjrCMiq0yDcjAfcdx72w1zT1O9dx6aA
-error_level: some
+error_level: hide
diff --git a/config/sync/views.settings.yml b/config/sync/views.settings.yml
index d63111f8a..d56d772dc 100644
--- a/config/sync/views.settings.yml
+++ b/config/sync/views.settings.yml
@@ -7,7 +7,7 @@ sql_signature: false
 ui:
   show:
     additional_queries: false
-    advanced_column: true
+    advanced_column: false
     default_display: false
     performance_statistics: false
     preview_information: true
diff --git a/config/sync/views.view.frontpage.yml b/config/sync/views.view.frontpage.yml
index d0c99aca9..772b47fe6 100644
--- a/config/sync/views.view.frontpage.yml
+++ b/config/sync/views.view.frontpage.yml
@@ -80,7 +80,7 @@ display:
           plugin_id: text_custom
           label: ''
           empty: true
-          content: "<div id=\"main-wrapper\" class=\"layout-main-wrapper clearfix\">\r\n  <div class=\"dialog-off-canvas-main-canvas\" data-off-canvas-main-canvas=\"\">\r\n    <div class=\"w-full bg-blue-spirit relative pb-10\">\r\n      <div class=\"container relative\">\r\n        <div class=\"row\">\r\n          <div class=\"col site-title\">\r\n            <h1 class=\"text-5xl font-titling-medium\">\r\n              HOPKINS DIGITAL LIBRARY\r\n            </h1>\r\n            <h2 class=\"text-2xl\">\r\n              Collections and scholarship from Johns Hopkins University\r\n            </h2>\r\n          </div>\r\n        </div>\r\n        <div class=\"row\">\r\n          <div class=\"col w-485\">\r\n            <a\r\n              class=\"flex flex-col sm:w-front-card m-auto w-auto hover:opacity-95 hover:shadow-xl\"\r\n              href=\"/collections\"\r\n              aria-label=\"Library collections\">\r\n              <div>\r\n                <img\r\n                  src=\"themes/contrib/idc_ui_theme_boots/images/chinese-gardens-14.jpg\"\r\n                  alt=\"\"\r\n                  data-entity-type=\"file\"\r\n                  class=\"front_page_images\" />\r\n              </div>\r\n              <div class=\"px-8 shadow-md bg-white h-auto fp_col_text\">\r\n                <h3 class=\"text-2xl font-bold\">Library Collections</h3>\r\n                <p class=\"text-gray-700\">\r\n                  Search digitized historic photographs, advertisements, texts,\r\n                  and more from JHU's unique library collections\r\n                </p>\r\n              </div>\r\n            </a>\r\n          </div>\r\n          <div class=\"col w-485\">\r\n            <a\r\n              class=\"flex flex-col sm:w-front-card m-auto w-auto hover:opacity-95 hover:shadow-xl\"\r\n              href=\"https://jscholarship.library.jhu.edu/\"\r\n              aria-label=\"JHU Scholarship\">\r\n              <div>\r\n                <img\r\n                  src=\"themes/contrib/idc_ui_theme_boots/images/student-writing-on-blc-window.jpg\"\r\n                  alt=\"\"\r\n                  class=\"front_page_images\" />\r\n              </div>\r\n              <div class=\"px-8 shadow-md bg-white h-auto fp_col_text\">\r\n                <h3 class=\"text-2xl font-bold\">JHU Scholarship</h3>\r\n                <p class=\"text-gray-700\">\r\n                  Find publications, theses, and dissertations by JHU faculty\r\n                  and students\r\n                </p>\r\n              </div>\r\n            </a>\r\n          </div>\r\n        </div>\r\n      </div>\r\n      <div id=\"grey_bar\" class=\"w-full\"></div>\r\n    </div>\r\n    <div class=\"container intro_description\">\r\n      <div class=\"row no-gutters\">\r\n        <div class=\"col-12 col-sm-6 col-md-8\">\r\n          <p class=\"mb-6\">\r\n            The Hopkins Digital Library is the institutional repository of Johns\r\n            Hopkins University. It is a service of the\r\n            <a href=\"https://www.library.jhu.edu/\">Sheridan Libraries</a> that\r\n            uses digital technology to collect, preserve, and provide access to\r\n            unique library research collections as well as the intellectual and\r\n            creative outputs of Hopkins faculty, students, and academic staff.\r\n          </p>\r\n          <p>\r\n            The digital materials are freely available to a worldwide audience\r\n            to advance discovery and innovation, and to support the research,\r\n            teaching, and public service missions of Johns Hopkins University\r\n          </p>\r\n        </div>\r\n        <div class=\"col-6 col-md-4\">\r\n          <div class=\"border shadow text-blue-heritage text-center\">\r\n            <h4 class=\"px-8 py-4 text-lg font-bold\">Need more information?</h4>\r\n            <div class=\"bg-gray-200 flex p-6\">\r\n              <a\r\n                class=\"btn btn-primary btn-lg active fa fa-envelope\"\r\n                aria-hidden=\"true\"\r\n                role=\"button\"\r\n                aria-pressed=\"true\"\r\n                href=\"/contact\">\r\n                Contact Us\r\n                <svg\r\n                  class=\"h-5 w-5 ml-1\"\r\n                  xmlns=\"http://www.w3.org/2000/svg\"\r\n                  fill=\"none\"\r\n                  viewBox=\"0 0 24 24\"\r\n                  stroke=\"currentColor\">\r\n                  <path\r\n                    stroke-linecap=\"round\"\r\n                    stroke-linejoin=\"round\"\r\n                    stroke-width=\"2\"\r\n                    d=\"M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z\"></path>\r\n                </svg>\r\n              </a>\r\n            </div>\r\n          </div>\r\n        </div>\r\n      </div>\r\n    </div>\r\n  </div>\r\n</div>"
+          content: "<div id=\"main-wrapper\" class=\"layout-main-wrapper clearfix\">\r\n  <div class=\"dialog-off-canvas-main-canvas\" data-off-canvas-main-canvas=\"\">\r\n    <div class=\"w-full bg-blue-spirit relative pb-10\">\r\n      <div class=\"container relative\">\r\n        <div class=\"row\">\r\n          <div class=\"col\">\r\n            <h1 class=\"text-5xl font-titling-medium\">\r\n              HOPKINS DIGITAL LIBRARY\r\n            </h1>\r\n            <h2 class=\"text-2xl\">\r\n              Collections and scholarship from Johns Hopkins University\r\n            </h2>\r\n          </div>\r\n        </div>\r\n        <div class=\"row\">\r\n          <div class=\"col w-485\">\r\n            <a\r\n              class=\"flex flex-col sm:w-front-card m-auto w-auto hover:opacity-95 hover:shadow-xl\"\r\n              href=\"/collections\"\r\n              aria-label=\"Library collections\">\r\n              <div>\r\n                <img\r\n                  src=\"themes/contrib/idc_ui_theme_boots/images/chinese-gardens-14.jpg\"\r\n                  alt=\"\"\r\n                  data-entity-type=\"file\"\r\n                  class=\"front_page_images\" />\r\n              </div>\r\n              <div class=\"px-8 shadow-md bg-white h-auto fp_col_text\">\r\n                <h3 class=\"text-2xl font-bold\">Library Collections</h3>\r\n                <p class=\"text-gray-700\">\r\n                  Search digitized historic photographs, advertisements, texts,\r\n                  and more from JHU's unique library collections\r\n                </p>\r\n              </div>\r\n            </a>\r\n          </div>\r\n          <div class=\"col w-485\">\r\n            <a\r\n              class=\"flex flex-col sm:w-front-card m-auto w-auto hover:opacity-95 hover:shadow-xl\"\r\n              href=\"https://jscholarship.library.jhu.edu/\"\r\n              aria-label=\"JHU Scholarship\">\r\n              <div>\r\n                <img\r\n                  src=\"themes/contrib/idc_ui_theme_boots/images/student-writing-on-blc-window.jpg\"\r\n                  alt=\"\"\r\n                  class=\"front_page_images\" />\r\n              </div>\r\n              <div class=\"px-8 shadow-md bg-white h-auto fp_col_text\">\r\n                <h3 class=\"text-2xl font-bold\">JHU Scholarship</h3>\r\n                <p class=\"text-gray-700\">\r\n                  Find publications, theses, and dissertations by JHU faculty\r\n                  and students\r\n                </p>\r\n              </div>\r\n            </a>\r\n          </div>\r\n        </div>\r\n      </div>\r\n      <div id=\"grey_bar\" class=\"w-full\"></div>\r\n    </div>\r\n    <div class=\"container intro_description\">\r\n      <div class=\"row no-gutters\">\r\n        <div class=\"col-12 col-sm-6 col-md-8\">\r\n          <p class=\"mb-6\">\r\n            The Hopkins Digital Library is the institutional repository of Johns\r\n            Hopkins University. It is a service of the\r\n            <a href=\"https://www.library.jhu.edu/\">Sheridan Libraries</a> that\r\n            uses digital technology to collect, preserve, and provide access to\r\n            unique library research collections as well as the intellectual and\r\n            creative outputs of Hopkins faculty, students, and academic staff.\r\n          </p>\r\n          <p>\r\n            The digital materials are freely available to a worldwide audience\r\n            to advance discovery and innovation, and to support the research,\r\n            teaching, and public service missions of Johns Hopkins University\r\n          </p>\r\n        </div>\r\n        <div class=\"col-6 col-md-4\">\r\n          <div class=\"border shadow text-blue-heritage text-center\">\r\n            <h4 class=\"px-8 py-4 text-lg font-bold\">Need more information?</h4>\r\n            <div class=\"bg-gray-200 flex p-6\">\r\n              <a\r\n                class=\"btn btn-primary btn-lg active fa fa-envelope\"\r\n                aria-hidden=\"true\"\r\n                role=\"button\"\r\n                aria-pressed=\"true\"\r\n                href=\"/contact\">\r\n                Contact Us\r\n                <svg\r\n                  class=\"h-5 w-5 ml-1\"\r\n                  xmlns=\"http://www.w3.org/2000/svg\"\r\n                  fill=\"none\"\r\n                  viewBox=\"0 0 24 24\"\r\n                  stroke=\"currentColor\">\r\n                  <path\r\n                    stroke-linecap=\"round\"\r\n                    stroke-linejoin=\"round\"\r\n                    stroke-width=\"2\"\r\n                    d=\"M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z\"></path>\r\n                </svg>\r\n              </a>\r\n            </div>\r\n          </div>\r\n        </div>\r\n      </div>\r\n    </div>\r\n  </div>\r\n</div>"
           tokenize: false
         node_listing_empty:
           id: node_listing_empty
diff --git a/config/sync/views.view.group_media.yml b/config/sync/views.view.group_media.yml
index f1f436bca..da57e3553 100644
--- a/config/sync/views.view.group_media.yml
+++ b/config/sync/views.view.group_media.yml
@@ -1,4 +1,4 @@
-uuid: 9a950710-619c-4f7a-ae01-14a92f4e36bb
+uuid: f439f18e-f3bb-413b-89d3-3f5a46ac6591
 langcode: en
 status: true
 dependencies:
@@ -9,7 +9,7 @@ dependencies:
     module:
       - groupmedia
 _core:
-  default_config_hash: a8l4sicTksJULMd2Kv40-t-lfoiFokG413E3TlvkinE
+  default_config_hash: EHwbU77rWxN8VKFLmLexQH4fYbAr6b9AJBTe3_xRBk0
 id: group_media
 label: 'Group Media'
 module: views
@@ -270,16 +270,16 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        edit_media:
-          id: edit_media
-          table: media
-          field: edit_media
-          relationship: none
+        view_group_content:
+          id: view_group_content
+          table: group_content
+          field: view_group_content
+          relationship: group_content
           group_type: group
           admin_label: ''
-          entity_type: media
-          plugin_id: entity_link_edit
-          label: 'Edit media'
+          entity_type: group_content
+          plugin_id: entity_link
+          label: 'View relation link'
           exclude: true
           alter:
             alter_text: false
@@ -320,19 +320,19 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: 'Edit media'
+          text: 'View relation'
           output_url_as_text: false
           absolute: false
-        delete_media:
-          id: delete_media
-          table: media
-          field: delete_media
-          relationship: none
+        edit_group_content:
+          id: edit_group_content
+          table: group_content
+          field: edit_group_content
+          relationship: group_content
           group_type: group
           admin_label: ''
-          entity_type: media
-          plugin_id: entity_link_delete
-          label: 'Delete Media'
+          entity_type: group_content
+          plugin_id: entity_link_edit
+          label: 'Edit relation link'
           exclude: true
           alter:
             alter_text: false
@@ -373,19 +373,17 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: 'Delete media'
-          output_url_as_text: false
-          absolute: false
-        edit_group_relationship:
-          id: edit_group_relationship
-          table: group_relationship
-          field: edit_group_relationship
-          relationship: group_relationship
+          text: 'Edit relation'
+        delete_group_content:
+          id: delete_group_content
+          table: group_content
+          field: delete_group_content
+          relationship: group_content
           group_type: group
           admin_label: ''
-          entity_type: group_relationship
-          plugin_id: entity_link_edit
-          label: 'Link to edit Group relationship'
+          entity_type: group_content
+          plugin_id: entity_link_delete
+          label: 'Delete relation link'
           exclude: true
           alter:
             alter_text: false
@@ -426,19 +424,17 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: 'Edit relationship'
-          output_url_as_text: false
-          absolute: false
-        delete_group_relationship:
-          id: delete_group_relationship
-          table: group_relationship
-          field: delete_group_relationship
-          relationship: group_relationship
+          text: 'Delete relation'
+        edit_media:
+          id: edit_media
+          table: media
+          field: edit_media
+          relationship: none
           group_type: group
           admin_label: ''
-          entity_type: group_relationship
-          plugin_id: entity_link_delete
-          label: 'Delete relationship'
+          entity_type: media
+          plugin_id: entity_link_edit
+          label: 'Edit media'
           exclude: true
           alter:
             alter_text: false
@@ -479,19 +475,17 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: 'Delete relationship'
-          output_url_as_text: false
-          absolute: false
-        view_group_relationship:
-          id: view_group_relationship
-          table: group_relationship
-          field: view_group_relationship
-          relationship: group_relationship
+          text: Edit
+        delete_media:
+          id: delete_media
+          table: media
+          field: delete_media
+          relationship: none
           group_type: group
           admin_label: ''
-          entity_type: group_relationship
-          plugin_id: entity_link
-          label: 'View relationship'
+          entity_type: media
+          plugin_id: entity_link_delete
+          label: 'Delete Media'
           exclude: true
           alter:
             alter_text: false
@@ -532,9 +526,7 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: 'View relationship'
-          output_url_as_text: false
-          absolute: false
+          text: Delete
         dropbutton:
           id: dropbutton
           table: views
@@ -543,7 +535,7 @@ display:
           group_type: group
           admin_label: ''
           plugin_id: dropbutton
-          label: Operations
+          label: Dropbutton
           exclude: false
           alter:
             alter_text: false
@@ -586,15 +578,14 @@ display:
           hide_alter_empty: true
           destination: true
           fields:
+            view_group_content: view_group_content
+            edit_group_content: edit_group_content
+            delete_group_content: delete_group_content
             edit_media: edit_media
             delete_media: delete_media
-            edit_group_relationship: edit_group_relationship
-            delete_group_relationship: delete_group_relationship
-            view_group_relationship: view_group_relationship
             name: '0'
             bundle: '0'
             status: '0'
-            uid: '0'
       pager:
         type: mini
         options:
@@ -635,12 +626,12 @@ display:
       arguments:
         gid:
           id: gid
-          table: group_relationship_field_data
+          table: group_content_field_data
           field: gid
-          relationship: group_relationship
+          relationship: group_content
           group_type: group
           admin_label: ''
-          entity_type: group_relationship
+          entity_type: group_content
           entity_field: gid
           plugin_id: group_id
           default_action: ignore
@@ -868,19 +859,19 @@ display:
           replica: false
           query_tags: {  }
       relationships:
-        group_relationship:
-          id: group_relationship
+        group_content:
+          id: group_content
           table: media_field_data
-          field: group_relationship
+          field: group_content
           relationship: none
           group_type: group
-          admin_label: 'Media group relationship'
+          admin_label: 'Media group content'
           entity_type: media
-          plugin_id: group_relationship_to_entity_reverse
+          plugin_id: group_content_to_entity_reverse
           required: false
-          group_relation_plugins:
+          group_content_plugins:
             'group_media:audio': '0'
-            'group_media:document': '0'
+            'group_media:file': '0'
             'group_media:image': '0'
             'group_media:remote_video': '0'
             'group_media:video': '0'
diff --git a/config/sync/views.view.group_members.yml b/config/sync/views.view.group_members.yml
index 888c8c19f..70140529b 100644
--- a/config/sync/views.view.group_members.yml
+++ b/config/sync/views.view.group_members.yml
@@ -1,4 +1,4 @@
-uuid: 43cb1656-d2d6-4822-b025-78b1efba55f1
+uuid: b7e0decd-0eac-4ece-bb42-f466dc1d48d4
 langcode: en
 status: true
 dependencies:
@@ -6,13 +6,13 @@ dependencies:
     - group
     - user
 _core:
-  default_config_hash: JObBEUBjxiblsPypD-apV4KDHMD6JetwJds-xV_IBs4
+  default_config_hash: zIcnLmbW8inPRIQdPSVbKPuG2o5G5wHGJED4Jlgb2SY
 id: group_members
 label: 'Group members'
 module: group
 description: ''
 tag: ''
-base_table: group_relationship_field_data
+base_table: group_content_field_data
 base_field: id
 display:
   default:
@@ -90,7 +90,7 @@ display:
           field_api_classes: false
         group_roles:
           id: group_roles
-          table: group_relationship__group_roles
+          table: group_content__group_roles
           field: group_roles
           relationship: none
           group_type: group
@@ -133,7 +133,7 @@ display:
           element_wrapper_type: ''
           element_wrapper_class: ''
           element_default_classes: true
-          empty: None
+          empty: '<div class="item-list"><ul><li>&lt;none&gt;</li></ul></div>'
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
@@ -153,12 +153,12 @@ display:
           field_api_classes: false
         changed:
           id: changed
-          table: group_relationship_field_data
+          table: group_content_field_data
           field: changed
           relationship: none
           group_type: group
           admin_label: ''
-          entity_type: group_relationship
+          entity_type: group_content
           entity_field: changed
           plugin_id: field
           label: Updated
@@ -220,12 +220,12 @@ display:
           field_api_classes: false
         created:
           id: created
-          table: group_relationship_field_data
+          table: group_content_field_data
           field: created
           relationship: none
           group_type: group
           admin_label: ''
-          entity_type: group_relationship
+          entity_type: group_content
           entity_field: created
           plugin_id: field
           label: Joined
@@ -285,14 +285,14 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        view_group_relationship:
-          id: view_group_relationship
-          table: group_relationship
-          field: view_group_relationship
+        view_group_content:
+          id: view_group_content
+          table: group_content
+          field: view_group_content
           relationship: none
           group_type: group
           admin_label: 'View member link'
-          entity_type: group_relationship
+          entity_type: group_content
           plugin_id: entity_link
           label: ''
           exclude: true
@@ -338,14 +338,14 @@ display:
           text: 'View member'
           output_url_as_text: false
           absolute: false
-        edit_group_relationship:
-          id: edit_group_relationship
-          table: group_relationship
-          field: edit_group_relationship
+        edit_group_content:
+          id: edit_group_content
+          table: group_content
+          field: edit_group_content
           relationship: none
           group_type: group
           admin_label: 'Edit member link'
-          entity_type: group_relationship
+          entity_type: group_content
           plugin_id: entity_link_edit
           label: ''
           exclude: true
@@ -389,14 +389,14 @@ display:
           empty_zero: false
           hide_alter_empty: true
           text: 'Edit member'
-        delete_group_relationship:
-          id: delete_group_relationship
-          table: group_relationship
-          field: delete_group_relationship
+        delete_group_content:
+          id: delete_group_content
+          table: group_content
+          field: delete_group_content
           relationship: none
           group_type: group
           admin_label: 'Remove member link'
-          entity_type: group_relationship
+          entity_type: group_content
           plugin_id: entity_link_delete
           label: ''
           exclude: true
@@ -491,9 +491,9 @@ display:
           hide_alter_empty: true
           destination: true
           fields:
-            view_group_relationship: view_group_relationship
-            edit_group_relationship: edit_group_relationship
-            delete_group_relationship: delete_group_relationship
+            view_group_content: view_group_content
+            edit_group_content: edit_group_content
+            delete_group_content: delete_group_content
             name: '0'
             group_roles: '0'
             changed: '0'
@@ -552,12 +552,12 @@ display:
       arguments:
         gid:
           id: gid
-          table: group_relationship_field_data
+          table: group_content_field_data
           field: gid
           relationship: none
           group_type: group
           admin_label: ''
-          entity_type: group_relationship
+          entity_type: group_content
           entity_field: gid
           plugin_id: numeric
           default_action: 'access denied'
@@ -599,9 +599,9 @@ display:
             group_roles: group_roles
             changed: changed
             created: created
-            view_group_relationship: view_group_relationship
-            edit_group_relationship: edit_group_relationship
-            delete_group_relationship: delete_group_relationship
+            view_group_content: view_group_content
+            edit_group_content: edit_group_content
+            delete_group_content: delete_group_content
             dropbutton: dropbutton
           default: '-1'
           info:
@@ -631,21 +631,21 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
-            view_group_relationship:
+            view_group_content:
               sortable: false
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
-            edit_group_relationship:
+            edit_group_content:
               sortable: false
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
-            delete_group_relationship:
+            delete_group_content:
               sortable: false
               default_sort_order: asc
               align: ''
@@ -683,15 +683,15 @@ display:
       relationships:
         gc__user:
           id: gc__user
-          table: group_relationship_field_data
+          table: group_content_field_data
           field: gc__user
           relationship: none
           group_type: group
           admin_label: 'Member account'
-          entity_type: group_relationship
-          plugin_id: group_relationship_to_entity
+          entity_type: group_content
+          plugin_id: group_content_to_entity
           required: true
-          group_relation_plugins:
+          group_content_plugins:
             group_membership: group_membership
       header: {  }
       footer: {  }
@@ -706,7 +706,7 @@ display:
         - url.query_args
         - user.group_permissions
       tags:
-        - 'config:field.storage.group_relationship.group_roles'
+        - 'config:field.storage.group_content.group_roles'
   page_1:
     id: page_1
     display_title: Page
@@ -735,4 +735,4 @@ display:
         - url.query_args
         - user.group_permissions
       tags:
-        - 'config:field.storage.group_relationship.group_roles'
+        - 'config:field.storage.group_content.group_roles'
diff --git a/config/sync/views.view.group_nodes.yml b/config/sync/views.view.group_nodes.yml
index a2673325d..cca5979a3 100644
--- a/config/sync/views.view.group_nodes.yml
+++ b/config/sync/views.view.group_nodes.yml
@@ -1,4 +1,4 @@
-uuid: 5fff7cdd-2e7f-41e3-8f7e-0917ee2ce1a9
+uuid: ae302758-422c-4660-933a-8c0c67ac8455
 langcode: en
 status: true
 dependencies:
@@ -7,7 +7,7 @@ dependencies:
     - group
     - node
 _core:
-  default_config_hash: 0bibzgCqmSgspCrEA2qTxfywBYHKOs3E6hju9O0acTw
+  default_config_hash: za6rNdVPn3HsOOwx2Yka3EmWEkXSdUIlaUpT8qOAxG0
 id: group_nodes
 label: 'Group nodes'
 module: gnode
@@ -288,16 +288,16 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        view_group_relationship:
-          id: view_group_relationship
-          table: group_relationship
-          field: view_group_relationship
-          relationship: group_relationship
+        view_group_content:
+          id: view_group_content
+          table: group_content
+          field: view_group_content
+          relationship: group_content
           group_type: group
           admin_label: 'View relation link'
-          entity_type: group_relationship
+          entity_type: group_content
           plugin_id: entity_link
-          label: 'Link to Group relationship'
+          label: 'Link to Group content'
           exclude: true
           alter:
             alter_text: false
@@ -341,16 +341,16 @@ display:
           text: 'View relation'
           output_url_as_text: false
           absolute: false
-        edit_group_relationship:
-          id: edit_group_relationship
-          table: group_relationship
-          field: edit_group_relationship
-          relationship: group_relationship
+        edit_group_content:
+          id: edit_group_content
+          table: group_content
+          field: edit_group_content
+          relationship: group_content
           group_type: group
           admin_label: 'Edit relation link'
-          entity_type: group_relationship
+          entity_type: group_content
           plugin_id: entity_link_edit
-          label: 'Link to edit Group relationship'
+          label: 'Link to edit Group content'
           exclude: true
           alter:
             alter_text: false
@@ -392,16 +392,16 @@ display:
           empty_zero: false
           hide_alter_empty: true
           text: 'Edit relation'
-        delete_group_relationship:
-          id: delete_group_relationship
-          table: group_relationship
-          field: delete_group_relationship
-          relationship: group_relationship
+        delete_group_content:
+          id: delete_group_content
+          table: group_content
+          field: delete_group_content
+          relationship: group_content
           group_type: group
           admin_label: 'Delete relation link'
-          entity_type: group_relationship
+          entity_type: group_content
           plugin_id: entity_link_delete
-          label: 'Link to delete Group relationship'
+          label: 'Link to delete Group content'
           exclude: true
           alter:
             alter_text: false
@@ -596,9 +596,9 @@ display:
           hide_alter_empty: true
           destination: true
           fields:
-            view_group_relationship: view_group_relationship
-            edit_group_relationship: edit_group_relationship
-            delete_group_relationship: delete_group_relationship
+            view_group_content: view_group_content
+            edit_group_content: edit_group_content
+            delete_group_content: delete_group_content
             edit_node: edit_node
             delete_node: delete_node
             title: '0'
@@ -659,12 +659,12 @@ display:
       arguments:
         gid:
           id: gid
-          table: group_relationship_field_data
+          table: group_content_field_data
           field: gid
-          relationship: group_relationship
+          relationship: group_content
           group_type: group
           admin_label: ''
-          entity_type: group_relationship
+          entity_type: group_content
           entity_field: gid
           plugin_id: numeric
           default_action: 'access denied'
@@ -715,6 +715,8 @@ display:
             description: ''
             use_operator: false
             operator: status_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: status
             required: true
             remember: false
@@ -724,8 +726,6 @@ display:
               anonymous: '0'
               administrator: '0'
               group_admin: '0'
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: true
           group_info:
             label: 'Published status'
@@ -766,6 +766,8 @@ display:
             description: ''
             use_operator: false
             operator: type_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: type
             required: false
             remember: false
@@ -776,8 +778,6 @@ display:
               administrator: '0'
               group_admin: '0'
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -801,9 +801,9 @@ display:
             type: type
             status: status
             changed: changed
-            view_group_relationship: view_group_relationship
-            edit_group_relationship: edit_group_relationship
-            delete_group_relationship: delete_group_relationship
+            view_group_content: view_group_content
+            edit_group_content: edit_group_content
+            delete_group_content: delete_group_content
             edit_node: edit_node
             delete_node: delete_node
             dropbutton: dropbutton
@@ -837,21 +837,21 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
-            view_group_relationship:
+            view_group_content:
               sortable: false
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
-            edit_group_relationship:
+            edit_group_content:
               sortable: false
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
-            delete_group_relationship:
+            delete_group_content:
               sortable: false
               default_sort_order: asc
               align: ''
@@ -901,17 +901,17 @@ display:
           replica: false
           query_tags: {  }
       relationships:
-        group_relationship:
-          id: group_relationship
+        group_content:
+          id: group_content
           table: node_field_data
-          field: group_relationship
+          field: group_content
           relationship: none
           group_type: group
           admin_label: 'Content relation'
           entity_type: node
-          plugin_id: group_relationship_to_entity_reverse
+          plugin_id: group_content_to_entity_reverse
           required: true
-          group_relation_plugins: {  }
+          group_content_plugins: {  }
       header: {  }
       footer: {  }
       display_extenders: {  }
diff --git a/config/sync/views.view.home_page_featured_collections.yml b/config/sync/views.view.home_page_featured_collections.yml
index 4bf1563bb..2cdd319f4 100644
--- a/config/sync/views.view.home_page_featured_collections.yml
+++ b/config/sync/views.view.home_page_featured_collections.yml
@@ -1,6 +1,6 @@
 uuid: 64c9b78d-f0d0-46e3-bfcf-b79fd59c5ea8
 langcode: en
-status: false
+status: true
 dependencies:
   config:
     - core.entity_view_mode.node.teaser
@@ -277,7 +277,6 @@ display:
     display_plugin: block
     position: 1
     display_options:
-      enabled: false
       title: 'Home Page'
       filters:
         status:
@@ -428,7 +427,6 @@ display:
     display_plugin: block
     position: 2
     display_options:
-      enabled: false
       title: 'Browse Our Collections'
       defaults:
         title: false
@@ -651,7 +649,7 @@ display:
     display_plugin: page
     position: 2
     display_options:
-      enabled: false
+      enabled: true
       title: 'All Collections'
       defaults:
         title: false
diff --git a/config/sync/views.view.members.yml b/config/sync/views.view.members.yml
index 45a0d1abf..e45625caa 100644
--- a/config/sync/views.view.members.yml
+++ b/config/sync/views.view.members.yml
@@ -109,19 +109,6 @@ display:
         options: {  }
       empty: {  }
       sorts:
-        field_weight_value:
-          id: field_weight_value
-          table: node__field_weight
-          field: field_weight_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: standard
-          order: ASC
-          expose:
-            label: 'Custom Sort Value (field_weight)'
-            field_identifier: field_weight_value
-          exposed: false
         created:
           id: created
           table: node_field_data
@@ -247,9 +234,9 @@ display:
           group_type: group
           admin_label: ''
           plugin_id: text
-          empty: true
+          empty: false
           content:
-            value: ''
+            value: '<p> Here is a listing of the members, or "children," of this collection. This is a Drupal view, which means it can be modified to flexibly display these collection items in a variety of ways. Editing this view will change the way all collections appear. You can also clone and set up collection-specific member views, although this will increase the complexity of maintaining your views.</p>'
             format: basic_html
           tokenize: false
       footer: {  }
diff --git a/config/sync/views.view.solr_search_content.yml b/config/sync/views.view.solr_search_content.yml
index 921c04715..52ac056cb 100644
--- a/config/sync/views.view.solr_search_content.yml
+++ b/config/sync/views.view.solr_search_content.yml
@@ -3,13 +3,12 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.node.field_abstract
-    - field.storage.node.field_description
+    - node.type.islandora_object
     - search_api.index.default_solr_index
   module:
     - search_api
-    - text
-    - views_field_view
+_core:
+  default_config_hash: d-DwLzBXnDh7as84BBK0Pxv16Ypczqg_TF9tjAyNgjU
 id: solr_search_content
 label: 'Solr search content'
 module: views
@@ -26,14 +25,14 @@ display:
     display_options:
       title: 'Search Content'
       fields:
-        title:
-          id: title
+        search_api_rendered_item:
+          id: search_api_rendered_item
           table: search_api_index_default_solr_index
-          field: title
+          field: search_api_rendered_item
           relationship: none
           group_type: group
           admin_label: ''
-          plugin_id: search_api_field
+          plugin_id: search_api_rendered_item
           label: ''
           exclude: false
           alter:
@@ -68,578 +67,30 @@ display:
           element_label_type: ''
           element_label_class: ''
           element_label_colon: false
-          element_wrapper_type: h3
-          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
-          field_rendering: false
-          fallback_handler: search_api
-          fallback_options:
-            link_to_item: true
-            use_highlighting: true
-            multi_type: separator
-            multi_separator: ', '
-        nid:
-          id: nid
-          table: search_api_index_default_solr_index
-          field: nid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api_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: 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_rendering: false
-          fallback_handler: search_api_numeric
-          fallback_options:
-            set_precision: false
-            precision: 0
-            decimal: .
-            separator: ''
-            format_plural: false
-            format_plural_string: !!binary MQNAY291bnQ=
-            prefix: ''
-            suffix: ''
-            link_to_item: false
-            use_highlighting: false
-            multi_type: separator
-            multi_separator: ', '
-            format_plural_values:
-              - '1'
-              - '@count'
-        view:
-          id: view
-          table: views
-          field: view
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: view
-          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: align-right
-          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
-          view: thumbnail
-          display: block_2
-          arguments: '{{ raw_fields.nid }}'
-        field_resource_type:
-          id: field_resource_type
-          table: search_api_index_default_solr_index
-          field: field_resource_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api_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: field__item
-          element_label_type: ''
-          element_label_class: field__label
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: true
-          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
-          field_rendering: false
-          fallback_handler: search_api
-          fallback_options:
-            link_to_item: false
-            use_highlighting: false
-            multi_type: separator
-            multi_separator: ', '
-        edtf_year:
-          id: edtf_year
-          table: search_api_index_default_solr_index
-          field: edtf_year
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api_numeric
-          label: Year
-          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: field__item
-          element_label_type: ''
-          element_label_class: field__label
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: true
-          empty_zero: false
-          hide_alter_empty: true
-          set_precision: false
-          precision: 0
-          decimal: .
-          separator: ''
-          format_plural: false
-          format_plural_string: !!binary Aw==
-          prefix: ''
-          suffix: ''
-          link_to_item: false
-          use_highlighting: true
-          multi_type: separator
-          multi_separator: ', '
-          format_plural_values: {  }
-        member_of_title:
-          id: member_of_title
-          table: search_api_index_default_solr_index
-          field: member_of_title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api_field
-          label: 'Member of'
-          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: field__item
-          element_label_type: ''
-          element_label_class: field__label
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: true
-          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
-          field_rendering: false
-          fallback_handler: search_api
-          fallback_options:
-            link_to_item: false
-            use_highlighting: true
-            multi_type: separator
-            multi_separator: ', '
-        field_linked_agent_name:
-          id: field_linked_agent_name
-          table: search_api_index_default_solr_index
-          field: field_linked_agent_name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api_field
-          label: Names
-          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: field__item
-          element_label_type: ''
-          element_label_class: field__label
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: true
-          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
-          field_rendering: false
-          fallback_handler: search_api
-          fallback_options:
-            link_to_item: false
-            use_highlighting: true
-            multi_type: separator
-            multi_separator: ', '
-        field_description:
-          id: field_description
-          table: search_api_index_default_solr_index
-          field: field_description
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api_field
-          label: Description
-          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: 400
-            word_boundary: true
-            ellipsis: true
-            more_link: true
-            more_link_text: more
-            more_link_path: 'node/{{ nid }}'
-            strip_tags: false
-            trim: true
-            preserve_tags: ''
-            html: true
-          element_type: ''
-          element_class: field__item
-          element_label_type: ''
-          element_label_class: field__label
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: true
-          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
-          field_rendering: false
-          fallback_handler: search_api
-          fallback_options:
-            link_to_item: false
-            use_highlighting: true
-            multi_type: separator
-            multi_separator: ', '
-        field_abstract:
-          id: field_abstract
-          table: search_api_index_default_solr_index
-          field: field_abstract
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api_field
-          label: Abstract
-          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: true
-            max_length: 400
-            word_boundary: true
-            ellipsis: true
-            more_link: true
-            more_link_text: more
-            more_link_path: 'node/{{ nid }}'
-            strip_tags: false
-            trim: true
-            preserve_tags: ''
-            html: true
-          element_type: ''
-          element_class: field__item
-          element_label_type: ''
-          element_label_class: field__label
-          element_label_colon: true
           element_wrapper_type: ''
           element_wrapper_class: ''
           element_default_classes: true
           empty: ''
-          hide_empty: true
+          hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          click_sort_column: value
-          type: text_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_rendering: false
-          fallback_handler: search_api
-          fallback_options:
-            link_to_item: false
-            use_highlighting: true
-            multi_type: separator
-            multi_separator: ', '
+          view_modes:
+            'entity:node':
+              article: teaser
+              islandora_object: teaser
+              page: teaser
+            'entity:taxonomy_term':
+              corporate_body: default
+              family: default
+              genre: default
+              geo_location: default
+              language: default
+              person: default
+              physical_form: default
+              resource_types: default
+              subject: default
+              tags: default
+              temporal: default
         search_api_excerpt:
           id: search_api_excerpt
           table: search_api_index_default_solr_index
@@ -648,7 +99,7 @@ display:
           group_type: group
           admin_label: ''
           plugin_id: search_api
-          label: 'Full Text'
+          label: Excerpt
           exclude: false
           alter:
             alter_text: false
@@ -677,42 +128,42 @@ display:
             trim: false
             preserve_tags: ''
             html: false
-          element_type: ''
-          element_class: field__item
+          element_type: div
+          element_class: node__content
           element_label_type: ''
-          element_label_class: field__label
+          element_label_class: ''
           element_label_colon: true
           element_wrapper_type: ''
           element_wrapper_class: ''
           element_default_classes: true
           empty: ''
-          hide_empty: true
+          hide_empty: false
           empty_zero: false
           hide_alter_empty: true
           link_to_item: false
-          use_highlighting: false
+          use_highlighting: true
           multi_type: separator
           multi_separator: ', '
       pager:
         type: mini
         options:
           offset: 0
-          items_per_page: 15
+          items_per_page: 10
           total_pages: null
           id: 0
           tags:
             next: 'next ›'
             previous: '‹ previous'
           expose:
-            items_per_page: true
+            items_per_page: false
             items_per_page_label: 'Items per page'
-            items_per_page_options: '15,60,120'
+            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
+        type: input_required
         options:
           submit_button: Search
           reset_button: false
@@ -721,26 +172,15 @@ display:
           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: none
         options: {  }
       cache:
         type: none
         options: {  }
-      empty:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text
-          empty: true
-          content:
-            value: '<strong>No results found </strong>'
-            format: basic_html
-          tokenize: false
+      empty: {  }
       sorts:
         search_api_relevance:
           id: search_api_relevance
@@ -750,37 +190,11 @@ display:
           group_type: group
           admin_label: ''
           plugin_id: search_api
-          order: DESC
-          expose:
-            label: Relevance
-            field_identifier: search_api_relevance
-          exposed: true
-        title:
-          id: title
-          table: search_api_index_default_solr_index
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api
           order: ASC
           expose:
-            label: Title
-            field_identifier: title
-          exposed: true
-        edtf_year:
-          id: edtf_year
-          table: search_api_index_default_solr_index
-          field: edtf_year
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api
-          order: DESC
-          expose:
-            label: Year
-            field_identifier: edtf_year
-          exposed: true
+            label: ''
+            field_identifier: search_api_relevance
+          exposed: false
       arguments: {  }
       filters:
         type:
@@ -825,6 +239,54 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           reduce_duplicates: false
+        search_api_fulltext:
+          id: search_api_fulltext
+          table: search_api_index_default_solr_index
+          field: search_api_fulltext
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: search_api_fulltext
+          operator: or
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: search_api_fulltext_op
+            label: ''
+            description: ''
+            use_operator: false
+            operator: search_api_fulltext_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: search_api_fulltext
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              content_editor: '0'
+              administrator: '0'
+              fedoraadmin: '0'
+            expose_fields: false
+            placeholder: ''
+            searched_fields_id: ''
+          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: null
+          fields: {  }
       filter_groups:
         operator: AND
         groups:
@@ -832,21 +294,21 @@ display:
       style:
         type: default
         options:
-          grouping: {  }
-          row_class: clearfix
+          row_class: ''
           default_row_class: true
+          uses_fields: false
       row:
-        type: fields
+        type: search_api
         options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
+          view_modes:
+            'entity:node':
+              article: search_result
+              islandora_object: search_result
+              page: search_result
       query:
         type: search_api_query
         options: {  }
       relationships: {  }
-      use_ajax: true
       header:
         result:
           id: result
@@ -857,98 +319,41 @@ display:
           admin_label: ''
           plugin_id: result
           empty: false
-          content: '<div id="ajax-page-summary" class="pager__summary">Displaying @start - @end of @total</div>'
+          content: 'Displaying results @start - @end of @total'
       footer: {  }
       display_extenders: {  }
     cache_metadata:
       max-age: -1
       contexts:
-        - 'languages:language_content'
         - 'languages:language_interface'
+        - url
         - url.query_args
-        - 'url.query_args:sort_by'
-        - 'url.query_args:sort_order'
         - 'user.node_grants:view'
       tags:
-        - 'config:field.storage.node.field_abstract'
-        - 'config:field.storage.node.field_description'
         - 'config:search_api.index.default_solr_index'
-        - 'search_api_list:default_solr_index'
       cacheable: false
-  block_1:
-    id: block_1
-    display_title: 'Collection Members'
-    display_plugin: block
-    position: 2
+  page_1:
+    id: page_1
+    display_title: Page
+    display_plugin: page
+    position: 1
     display_options:
-      title: 'Search within Collection'
-      arguments:
-        field_member_of:
-          id: field_member_of
-          table: search_api_index_default_solr_index
-          field: field_member_of
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: node
-          default_argument_options: {  }
-          default_argument_skip_url: false
-          summary_options: {  }
-          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
-        field_descendant_of:
-          id: field_descendant_of
-          table: search_api_index_default_solr_index
-          field: field_descendant_of
+      defaults:
+        header: false
+        footer: false
+      header:
+        result:
+          id: result
+          table: views
+          field: result
           relationship: none
           group_type: group
           admin_label: ''
-          plugin_id: search_api
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 1
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options: {  }
-          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_description: 'Searches and lists members of a collection.'
+          plugin_id: result
+          empty: false
+          content: 'Displaying results @start - @end of @total'
+      footer: {  }
+      exposed_block: true
       display_extenders:
         matomo:
           enabled: false
@@ -961,95 +366,76 @@ display:
           category_fallback: ''
           category_facets: {  }
           category_facets_concat_separator: ', '
-      block_description: 'Solr Search Content: Collection Members'
+      path: solr-search/content
     cache_metadata:
       max-age: -1
       contexts:
-        - 'languages:language_content'
         - 'languages:language_interface'
         - url
         - url.query_args
-        - 'url.query_args:sort_by'
-        - 'url.query_args:sort_order'
         - 'user.node_grants:view'
       tags:
-        - 'config:field.storage.node.field_abstract'
-        - 'config:field.storage.node.field_description'
         - 'config:search_api.index.default_solr_index'
-        - 'search_api_list:default_solr_index'
-  page_1:
-    id: page_1
-    display_title: 'Search Page'
+      cacheable: false
+  page_2:
+    id: page_2
+    display_title: 'Search Within Children'
     display_plugin: page
-    position: 1
+    position: 2
     display_options:
-      empty:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text
-          empty: true
-          content:
-            value: '<strong>No results found </strong>'
-            format: basic_html
-          tokenize: false
-      filters:
-        type:
-          id: type
+      title: 'Search within <i>{{ drupal_field(''title'', ''node'', raw_arguments.field_descendant_of) }}</i>'
+      exposed_form:
+        type: basic
+        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
+      arguments:
+        field_descendant_of:
+          id: field_descendant_of
           table: search_api_index_default_solr_index
-          field: type
+          field: field_descendant_of
           relationship: none
           group_type: group
           admin_label: ''
-          plugin_id: search_api_options
-          operator: or
-          value:
-            collection_object: collection_object
-            islandora_object: islandora_object
-          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
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
+          plugin_id: search_api
+          default_action: default
+          exception:
+            value: all
+            title_enable: true
+            title: Search
+          title_enable: false
+          title: ''
+          default_argument_type: node
+          default_argument_options: {  }
+          default_argument_skip_url: true
+          summary_options: {  }
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: true
+          validate:
+            type: 'entity:node'
+            fail: 'not found'
+          validate_options:
+            bundles:
+              islandora_object: islandora_object
+            access: true
+            operation: view
+            multiple: 0
+          break_phrase: false
+          not: false
       defaults:
-        empty: false
-        filters: false
-        filter_groups: false
-      display_description: ''
-      exposed_block: true
+        title: false
+        exposed_form: false
+        arguments: false
+      display_description: 'e.g. within this Collection or Newspaper or Book'
+      exposed_block: false
       display_extenders:
         matomo:
           enabled: false
@@ -1062,19 +448,22 @@ display:
           category_fallback: ''
           category_facets: {  }
           category_facets_concat_separator: ', '
-      path: search
+      path: node/%node/search
+      menu:
+        type: none
+        title: 'Search Within'
+        description: ''
+        weight: 0
+        expanded: false
+        menu_name: main
+        parent: ''
+        context: '0'
     cache_metadata:
       max-age: -1
       contexts:
-        - 'languages:language_content'
         - 'languages:language_interface'
+        - url
         - url.query_args
-        - 'url.query_args:sort_by'
-        - 'url.query_args:sort_order'
         - 'user.node_grants:view'
       tags:
-        - 'config:field.storage.node.field_abstract'
-        - 'config:field.storage.node.field_description'
         - 'config:search_api.index.default_solr_index'
-        - 'search_api_list:default_solr_index'
-      cacheable: false
diff --git a/config/sync/views.view.thumbnail.yml b/config/sync/views.view.thumbnail.yml
deleted file mode 100644
index a9c09f533..000000000
--- a/config/sync/views.view.thumbnail.yml
+++ /dev/null
@@ -1,308 +0,0 @@
-uuid: be161815-2a33-4917-8c71-d07bf65bfc1a
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.thumbnail
-    - views.view.thumbnail_of_first_child
-  module:
-    - media
-    - taxonomy
-    - user
-id: thumbnail
-label: Thumbnail
-module: views
-description: ''
-tag: ''
-base_table: media_field_data
-base_field: mid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Thumbnail with fallback'
-      fields:
-        name:
-          id: name
-          table: media_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: media
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            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
-      pager:
-        type: some
-        options:
-          offset: 0
-          items_per_page: 1
-      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: 'view media'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts:
-        changed:
-          id: changed
-          table: media_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: changed
-          plugin_id: date
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: ''
-          exposed: false
-          granularity: second
-      arguments:
-        field_media_of_target_id:
-          id: field_media_of_target_id
-          table: media__field_media_of
-          field: field_media_of_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: node
-          default_argument_options: {  }
-          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: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_media_use
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://pcdm.org/use#ThumbnailImage'
-          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
-            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: default
-      row:
-        type: 'entity:media'
-        options:
-          relationship: none
-          view_mode: thumbnail
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        field_media_use:
-          id: field_media_use
-          table: media__field_media_use
-          field: field_media_use
-          relationship: none
-          group_type: group
-          admin_label: 'field_media_use: Taxonomy term'
-          plugin_id: standard
-          required: true
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
-  block_1:
-    id: block_1
-    display_title: Thumbnail
-    display_plugin: block
-    position: 1
-    display_options:
-      display_description: ''
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      block_description: Thumbnail
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
-  block_2:
-    id: block_2
-    display_title: 'Thumbnail with fallback'
-    display_plugin: block
-    position: 2
-    display_options:
-      empty:
-        view:
-          id: view
-          table: views
-          field: view
-          relationship: none
-          group_type: group
-          admin_label: 'Thumbnail of First Child'
-          plugin_id: view
-          empty: true
-          view_to_insert: 'thumbnail_of_first_child:block_1'
-          inherit_arguments: true
-      defaults:
-        empty: false
-      display_description: ''
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      block_description: 'Thumbnail with Fallback'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
diff --git a/config/sync/views.view.thumbnail_of_first_child.yml b/config/sync/views.view.thumbnail_of_first_child.yml
deleted file mode 100644
index e0901c147..000000000
--- a/config/sync/views.view.thumbnail_of_first_child.yml
+++ /dev/null
@@ -1,272 +0,0 @@
-uuid: 01d2617f-0190-4afb-8078-0c3501403e37
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-    - user
-    - views_field_view
-id: thumbnail_of_first_child
-label: 'Thumbnail of First Child'
-module: views
-description: ''
-tag: ''
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Thumbnail of First Child'
-      fields:
-        nid:
-          id: nid
-          table: node_field_data
-          field: nid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: nid
-          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: number_integer
-          settings:
-            thousand_separator: ''
-            prefix_suffix: 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
-        view:
-          id: view
-          table: views
-          field: view
-          relationship: none
-          group_type: group
-          admin_label: 'Thumbnail (no fallback)'
-          plugin_id: view
-          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
-          view: thumbnail
-          display: block_1
-          arguments: '{{ raw_fields.nid }}'
-      pager:
-        type: some
-        options:
-          offset: 0
-          items_per_page: 1
-      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: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts:
-        created:
-          id: created
-          table: node_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: created
-          plugin_id: date
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: ''
-          exposed: false
-          granularity: second
-      arguments:
-        field_member_of_target_id:
-          id: field_member_of_target_id
-          table: node__field_member_of
-          field: field_member_of_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: node
-          default_argument_options: {  }
-          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: 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: default
-      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
-        - 'user.node_grants:view'
-        - 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
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
diff --git a/config/sync/views.view.top_level_collections.yml b/config/sync/views.view.top_level_collections.yml
index d28e4bebb..0aa808670 100644
--- a/config/sync/views.view.top_level_collections.yml
+++ b/config/sync/views.view.top_level_collections.yml
@@ -1,12 +1,16 @@
 uuid: 39576d48-0ed7-477f-be71-ad084084c19b
 langcode: en
-status: true
+status: false
 dependencies:
+  config:
+    - field.storage.media.field_media_image
+    - image.style.large
   module:
+    - islandora
+    - media
     - node
     - taxonomy
     - user
-    - views_field_view
 id: top_level_collections
 label: 'Top Level Collections'
 module: views
@@ -23,18 +27,16 @@ display:
     display_options:
       title: 'Top Level Collections'
       fields:
-        nid:
-          id: nid
-          table: node_field_data
-          field: nid
-          relationship: none
+        field_media_image:
+          id: field_media_image
+          table: media__field_media_image
+          field: field_media_image
+          relationship: reverse__media__field_media_of
           group_type: group
           admin_label: ''
-          entity_type: node
-          entity_field: nid
           plugin_id: field
           label: ''
-          exclude: true
+          exclude: false
           alter:
             alter_text: false
             text: ''
@@ -74,12 +76,14 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          click_sort_column: value
-          type: number_integer
+          click_sort_column: target_id
+          type: islandora_image
           settings:
-            thousand_separator: ''
-            prefix_suffix: false
-          group_column: value
+            image_link: content
+            image_style: large
+            image_loading:
+              attribute: lazy
+          group_column: ''
           group_columns: {  }
           group_rows: true
           delta_limit: 0
@@ -89,58 +93,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        view:
-          id: view
-          table: views
-          field: view
-          relationship: none
-          group_type: group
-          admin_label: 'Thumbnail Image'
-          plugin_id: view
-          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
-          view: thumbnail
-          display: block_2
-          arguments: '{{ raw_fields.nid }}'
         title:
           id: title
           table: node_field_data
@@ -370,21 +322,21 @@ display:
             default_group_multiple: {  }
             group_items: {  }
       style:
-        type: html_list
+        type: grid
         options:
           grouping: {  }
-          row_class: row
-          default_row_class: true
-          type: ul
-          wrapper_class: item-group
-          class: list-group-item
+          columns: 4
+          automatic_width: true
+          alignment: horizontal
+          row_class_custom: ''
+          row_class_default: true
+          col_class_custom: ''
+          col_class_default: true
       row:
         type: fields
         options:
           default_field_elements: true
-          inline:
-            view: view
-            title: title
+          inline: {  }
           separator: ''
           hide_empty: false
       query:
@@ -405,6 +357,16 @@ display:
           admin_label: 'field_model: Taxonomy term'
           plugin_id: standard
           required: true
+        reverse__media__field_media_of:
+          id: reverse__media__field_media_of
+          table: node_field_data
+          field: reverse__media__field_media_of
+          relationship: none
+          group_type: group
+          admin_label: field_media_of
+          entity_type: node
+          plugin_id: entity_reverse
+          required: false
       header:
         area:
           id: area
@@ -416,7 +378,7 @@ display:
           plugin_id: text
           empty: false
           content:
-            value: ''
+            value: '<h2>Top-Level Collections</h2>'
             format: basic_html
           tokenize: false
       footer: {  }
@@ -429,7 +391,8 @@ display:
         - url.query_args
         - 'user.node_grants:view'
         - user.permissions
-      tags: {  }
+      tags:
+        - 'config:field.storage.media.field_media_image'
   block_1:
     id: block_1
     display_title: Block
@@ -472,7 +435,8 @@ display:
         - url.query_args
         - 'user.node_grants:view'
         - user.permissions
-      tags: {  }
+      tags:
+        - 'config:field.storage.media.field_media_image'
   page_1:
     id: page_1
     display_title: Page
@@ -503,4 +467,5 @@ display:
         - url.query_args
         - 'user.node_grants:view'
         - user.permissions
-      tags: {  }
+      tags:
+        - 'config:field.storage.media.field_media_image'
diff --git a/config/sync/views_field_view.settings.yml b/config/sync/views_field_view.settings.yml
deleted file mode 100644
index 25f0b1f2c..000000000
--- a/config/sync/views_field_view.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: s3zJAHh3WGp6g2aV1-IhRrq--hHUWGT84i23gVHRi4Y
-evil: false