diff --git a/.github/actions/build-container/action.yml b/.github/actions/build-container/action.yml
index 441577959..ba23907af 100644
--- a/.github/actions/build-container/action.yml
+++ b/.github/actions/build-container/action.yml
@@ -39,7 +39,7 @@ runs:
         echo "tag=$clean_tag" >> "$GITHUB_OUTPUT"
     -
       name: Build and push ${{ inputs.image_name }} container
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v7
       with:
         build-args: |
           build_date="${{ steps.build_date.outputs.date }}"
diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
index 2b6ddad0c..2d38e2cc3 100644
--- a/.github/workflows/build-containers.yml
+++ b/.github/workflows/build-containers.yml
@@ -31,10 +31,10 @@ jobs:
         environment: ${{ fromJson(inputs.environments) }}
         service: ${{ fromJson(inputs.services) }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       -
         name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: ${{ secrets.aws_role_to_assume }}
           aws-region: ${{ vars.AWS_REGION }}
@@ -44,7 +44,7 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v2
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v4
       -
         name: Get service config
         id: service
diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml
index 4ee18cca9..a11eee65d 100644
--- a/.github/workflows/lint-and-test.yml
+++ b/.github/workflows/lint-and-test.yml
@@ -10,7 +10,7 @@ jobs:
       BUNDLE_PATH: vendor/bundle
       BUNDLE_WITH: test
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
@@ -19,13 +19,16 @@ jobs:
         run: bundle exec rubocop --format github
 
   test:
-    name: Test
+    name: "Test (Valkyrie enabled: ${{ matrix.hyrax_valkyrie_enabled }})"
     runs-on: ubuntu-latest
     container:
-      image: ruby:2.7.8-slim-bullseye
+      image: ruby:3.2.9-slim-bookworm
       volumes:
         - solr:/tmp/solr
     needs: lint
+    strategy:
+      matrix:
+        hyrax_valkyrie_enabled: [false]
     services:
       database:
         image: postgres:13-alpine
@@ -51,17 +54,21 @@ jobs:
         ports:
           - 6379:6379
       solr:
-        image: solr:8.11.4
+        image: solr:9.10.1
         ports:
           - 8983:8983
         volumes:
-          - solr:/var/solr/data
+          - solr:/var/solr
+        env:
+          SOLR_OPTS: "-Dsolr.config.lib.enabled=true -Dsolr.modules=analysis-extras"
+          SOLR_HOST: solr
     env:
       BUNDLE_PATH: vendor/bundle
       BUNDLE_WITH: test
       CAS_BASE_URL: ''
       CI: 1
       FEDORA_TEST_URL: http://fedora:8080/rest
+      HYRAX_VALKYRIE: ${{ matrix.hyrax_valkyrie_enabled }}
       IIIF_BASE_URL: http://localhost/iiif/2
       NOKOGIRI_USE_SYSTEM_LIBRARIES: true
       PSQL_PASSWORD: spot_test_pw
@@ -70,17 +77,17 @@ jobs:
       PSQL_HOST: database
       RAILS_ENV: test
       SOLR_TEST_URL: http://solr:8983/solr/spot-test
-      SOLR_VERSION: "8.11.4"
+      SOLR_VERSION: "9.10.1"
       URL_HOST: http://localhost:3000
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - name: Copy Solr config to mount
         run: |
-          mkdir -p /tmp/solr/spot-test/data
-          cp -r docker/solr/config/* /tmp/solr/spot-test
-          touch /tmp/solr/spot-test/core.properties
-          chown -R 8983:8983 /tmp/solr/spot-test
+          mkdir -p /tmp/solr/data/spot-test/data
+          cp -r docker/solr/config /tmp/solr/data/spot-test/conf
+          touch /tmp/solr/data/spot-test/core.properties
+          chown -R 8983:8983 /tmp/solr/data/spot-test
       - name: Restart Solr service
         uses: docker://docker
         with:
@@ -88,13 +95,11 @@ jobs:
       -
         name: Install system dependencies from Dockerfile
         run: |
-          apt-get update -y && apt-get install -y --no-install-recommends ca-certificates curl gnupg && \
-          mkdir -p /etc/apt/keyrings && \
-          curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
-          echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
-          apt-get update -y && apt-get install -y \
-            build-essential coreutils curl git libxml2 libxml2-dev libxslt-dev \
-            netcat-openbsd nodejs openssl postgresql-13 ruby-dev tzdata zip \
+          apt-get update -y && apt-get install -y curl && \
+          curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+          apt-get update -y --fix-missing && apt-get install -y --no-install-recommends \
+            awscli build-essential coreutils cron git libpq-dev libxml2 libxml2-dev \
+            libxslt-dev netcat-openbsd nodejs openssl postgresql ruby-dev tzdata zip \
             libasound2 libdbus-glib-1-dev libgtk-3-0 libpq-dev unzip libx11-xcb1
       -
         name: Setup Firefox
diff --git a/.ruby-version b/.ruby-version
index 6a81b4c83..e650c01d9 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7.8
+3.2.9
diff --git a/Dockerfile b/Dockerfile
index 1d78fa408..1e77d05d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,15 +3,13 @@
 # !! This is a builder image. Not for general use !!
 # Use this as the base image for the Rails / Sidekiq services.
 ##
-FROM ruby:2.7.8-slim-bullseye AS spot-base
+FROM ruby:3.2.9-slim-bookworm AS spot-base
 
 RUN apt-get clean && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends ca-certificates curl gnupg && \
-    mkdir -p /etc/apt/keyrings && \
-    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
-    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
-    apt-get update -y && apt-get install -y --no-install-recommends \
+    apt-get update -y && \
+    apt-get install -y curl && \
+    curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+    apt-get update -y --fix-missing && apt-get install -y --no-install-recommends \
         awscli \
         build-essential \
         coreutils \
@@ -24,7 +22,7 @@ RUN apt-get clean && \
         netcat-openbsd \
         nodejs \
         openssl \
-        postgresql-13 \
+        postgresql \
         ruby-dev \
         tzdata \
         zip
@@ -38,10 +36,9 @@ ENV HYRAX_CACHE_PATH=/spot/tmp/cache \
 
 RUN corepack enable
 
-COPY Gemfile.lock /spot/
+COPY Gemfile Gemfile.lock /spot/
 RUN gem install bundler:$(tail -n 1 Gemfile.lock | sed -e 's/\s*//')
 
-COPY Gemfile /spot/
 RUN bundle config unset with && \
     bundle config unset without && \
     bundle config set without "development:test" && \
@@ -137,14 +134,14 @@ ENV MALLOC_ARENA_MAX=2
 # We don't need the entrypoint script to generate an SSL cert
 ENV SKIP_SSL_CERT=true
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-        bash \
+RUN apt-get update -y && \
+    apt-get install -y \
         ffmpeg \
         ghostscript \
         imagemagick \
         libreoffice \
         mediainfo \
-        openjdk-11-jre \
+        openjdk-17-jre \
         perl \
         python3 \
         unzip
diff --git a/Gemfile b/Gemfile
index db585bb3a..622f8ce4c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,16 +9,16 @@ end
 #
 # the base rails stack (installed with 'rails new spot')
 #
-gem 'rails', '~> 5.2.7'
+gem 'rails', '~> 6.1'
 
 # use Puma as the app server
 gem 'puma', '~> 6.4.0'
 
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.1.0'
+gem 'sass-rails', '~> 6.0'
 
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '~> 4.2.0'
+# Use Terser as compressor for JavaScript assets
+gem 'terser', '~> 1.2.7'
 
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
 gem 'turbolinks', '~> 5.2.1'
@@ -29,7 +29,7 @@ gem 'jbuilder', '~> 2.11.5'
 #
 # the hyrax/spot stack
 #
-gem 'hyrax', '~> 3.6.0'
+gem 'hyrax', '~> 5.2.0'
 
 # modularize our javascripts
 gem 'almond-rails', '~> 0.3.0'
@@ -44,16 +44,18 @@ gem 'aws-sdk-s3', '~> 1.142.0'
 gem 'bagit', '~> 0.6.0'
 
 # blacklight plugins for enhanced searching
-gem 'blacklight_advanced_search', '~> 6.4.1'
-gem 'blacklight_oai_provider', '~> 6.0.0'
-gem 'blacklight_range_limit', '~> 6.3.3'
+gem 'blacklight_advanced_search', '~> 7.0.0'
+gem 'blacklight_oai_provider', '~> 7.0.2'
+gem 'blacklight_range_limit', '~> 8.5.0'
 
 # start up the server faster
 gem 'bootsnap', '~> 1.17', require: false
 
+gem 'bootstrap', '~> 4.0'
+
 # Bulkrax for batch ingesting objects
-gem 'browse-everything', '~> 1.1.2'
-gem 'bulkrax', '~> 9.0.2'
+gem 'browse-everything', '~> 1.6.0'
+gem 'bulkrax', '~> 9.3.3'
 
 # This needs to be here if we want to compile our own JS
 # (there's like a single coffee-script file still remaining in hyrax)
@@ -73,7 +75,7 @@ gem 'edtf-humanize', '~> 2.1.0'
 
 # a bunch of samvera gems rely on Faraday already, but we'll
 # require it as we're explicitly using it.
-gem 'faraday', '~> 0.17.6'
+gem 'faraday', '~> 2.0'
 
 # video file resource for getting information on video derivatives
 gem 'ffprober'
@@ -99,7 +101,8 @@ gem 'kaminari', '~> 1.2.2'
 
 # mini_magick is a dependency of hydra-derivatives, but since we're
 # calling it explicitly, we should require it.
-gem 'mini_magick', '~> 4.11'
+# gem 'mini_magick', '~> 4.11'
+gem 'posix-spawn'
 
 # manually add this gem to enable questioning_authority to parse linked-data results
 gem 'linkeddata', '~> 3.1.6'
@@ -116,7 +119,7 @@ gem 'pg', '~> 1.5.4'
 
 # this is bundled somewhere within the hyrax stack, but since we're
 # calling it within our code we shouldn't expect it to always be there
-gem 'rdf-vocab', '~> 3.2.7'
+gem 'rdf-vocab', '~> 3.3.3'
 
 # solr client for interacting with rails (installed w/ hyrax)
 gem 'rsolr', '~> 2.5.0'
@@ -129,7 +132,10 @@ gem 'sidekiq', '~> 5.2.9'
 gem 'sidekiq-cron', '~> 1.9.1'
 
 # using Slack for some of our messaging
-gem 'slack-ruby-client', '~> 0.14.6'
+gem 'slack-ruby-client'
+
+# used in the Hyrax 4 upgrade but not a dependency??
+gem 'twitter-typeahead-rails', '~> 0.11.1'
 
 # now that we're writing es6 javascript of our own (+ not just using the hyrax js)
 # we need to compile it in sprockets.
@@ -148,12 +154,18 @@ gem 'redlock', '>= 0.1.2', '< 2.0'
 # that throws off how forms are built in Hyrax.
 gem 'simple_form', '< 5.2'
 
+# sprockets support gets cagey after 1.0
+gem 'openseadragon', '~> 0.9.0'
+
+# need to be 1.20.1 or higher to avoid an incompatibility with json gem
+gem 'multi_json', '~> 1.20.1'
+
 # development dependencies (not as necessary to lock down versions here)
 group :development do
   # Seed data
   # gem 'ldr-development-seeds', github: 'LafayetteCollegeLibraries/ldr-development-seeds', branch: 'main'
 
-  gem 'listen', '>= 3.0.5', '< 3.8'
+  gem 'listen', '~> 3.9.0'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring', '~> 2.1.1'
   gem 'spring-watcher-listen', '~> 2.0.0'
@@ -177,7 +189,7 @@ group :development, :test do
   gem 'selenium-webdriver'
   gem 'shoulda-matchers', '~> 4'
   gem 'simplecov', '~> 0.22.0', require: false
-  gem 'simplecov-cobertura', '~> 2.1', require: false
+  gem 'simplecov-cobertura', '~> 3', require: false
   gem 'stub_env', '~> 1.0.4'
   gem 'webmock', '~> 3.8'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index f10d88aa4..7a5a540fe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,37 +1,53 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.8.1)
-      actionpack (= 5.2.8.1)
+    actioncable (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.8.1)
-      actionpack (= 5.2.8.1)
-      actionview (= 5.2.8.1)
-      activejob (= 5.2.8.1)
+    actionmailbox (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activejob (= 6.1.7.10)
+      activerecord (= 6.1.7.10)
+      activestorage (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
+      mail (>= 2.7.1)
+    actionmailer (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      actionview (= 6.1.7.10)
+      activejob (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.8.1)
-      actionview (= 5.2.8.1)
-      activesupport (= 5.2.8.1)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.7.10)
+      actionview (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.8.1)
-      activesupport (= 5.2.8.1)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activerecord (= 6.1.7.10)
+      activestorage (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.7.10)
+      activesupport (= 6.1.7.10)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active-fedora (13.3.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    active-fedora (15.0.1)
       active-triples (>= 0.11.0, < 2.0.0)
-      activemodel (>= 5.1)
-      activesupport (>= 5.1)
+      activemodel (>= 6.1)
+      activesupport (>= 6.1)
       deprecation
-      faraday (~> 0.12)
+      faraday (>= 1.0)
       faraday-encoding (>= 0.0.5)
       ldp (>= 0.7.0, < 2)
+      mutex_m
       rsolr (>= 1.1.2, < 3)
       ruby-progressbar (~> 1.0)
     active-triples (1.2.0)
@@ -39,35 +55,38 @@ GEM
       activesupport (>= 3.0.0)
       rdf (>= 2.0.2, < 4.0)
       rdf-vocab (>= 2.0, < 4.0)
-    active_encode (0.8.2)
+    active_encode (1.3.0)
+      addressable (~> 2.8)
       rails
-      sprockets (< 4)
-    activejob (5.2.8.1)
-      activesupport (= 5.2.8.1)
+    activejob (6.1.7.10)
+      activesupport (= 6.1.7.10)
       globalid (>= 0.3.6)
-    activemodel (5.2.8.1)
-      activesupport (= 5.2.8.1)
-    activemodel-serializers-xml (1.0.2)
-      activemodel (> 5.x)
-      activesupport (> 5.x)
+    activemodel (6.1.7.10)
+      activesupport (= 6.1.7.10)
+    activemodel-serializers-xml (1.0.3)
+      activemodel (>= 5.0.0.a)
+      activesupport (>= 5.0.0.a)
       builder (~> 3.1)
-    activerecord (5.2.8.1)
-      activemodel (= 5.2.8.1)
-      activesupport (= 5.2.8.1)
-      arel (>= 9.0)
+    activerecord (6.1.7.10)
+      activemodel (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
     activerecord-import (2.2.0)
       activerecord (>= 4.2)
-    activestorage (5.2.8.1)
-      actionpack (= 5.2.8.1)
-      activerecord (= 5.2.8.1)
-      marcel (~> 1.0.0)
-    activesupport (5.2.8.1)
+    activestorage (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activejob (= 6.1.7.10)
+      activerecord (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.7.10)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
     almond-rails (0.3.0)
       rails (>= 4.2)
     anystyle (1.4.2)
@@ -76,27 +95,29 @@ GEM
       namae (~> 1.0)
       wapiti (~> 2.1)
     anystyle-data (1.3.0)
-    arel (9.0.0)
-    ast (2.4.2)
-    autoprefixer-rails (10.4.13.0)
+    ast (2.4.3)
+    autoprefixer-rails (10.4.21.0)
       execjs (~> 2)
-    awesome_nested_set (3.5.0)
-      activerecord (>= 4.0.0, < 7.1)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.887.0)
-    aws-sdk-core (3.191.0)
+    awesome_nested_set (3.8.0)
+      activerecord (>= 4.0.0, < 8.1)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1172.0)
+    aws-sdk-core (3.233.0)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.77.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
-      aws-sigv4 (~> 1.1)
+      logger
+    aws-sdk-kms (1.113.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
+      aws-sigv4 (~> 1.5)
     aws-sdk-s3 (1.142.0)
       aws-sdk-core (~> 3, >= 3.189.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
-    aws-sigv4 (1.8.0)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
@@ -108,67 +129,70 @@ GEM
     base64 (0.3.0)
     bcp47 (0.3.3)
       i18n
-    bcrypt (3.1.19)
-    bibtex-ruby (6.0.0)
+    bcp47_spec (0.2.1)
+    bcrypt (3.1.20)
+    bibtex-ruby (6.2.0)
       latex-decode (~> 0.0)
+      logger (~> 1.7)
+      racc (~> 1.7)
+    bigdecimal (3.3.1)
     bixby (5.0.2)
       rubocop (= 1.28.2)
       rubocop-ast
       rubocop-performance
       rubocop-rails
       rubocop-rspec
-    blacklight (6.25.0)
-      bootstrap-sass (~> 3.2)
+    blacklight (7.41.0)
       deprecation
       globalid
+      hashdiff
+      i18n (>= 1.7.0)
       jbuilder (~> 2.7)
       kaminari (>= 0.15)
-      nokogiri (~> 1.6)
-      rails (>= 4.2, < 6)
-      rsolr (>= 1.0.6, < 3)
-      twitter-typeahead-rails (= 0.11.1.pre.corejavascript)
-    blacklight-access_controls (0.6.2)
-      blacklight (~> 6.0)
-      cancancan (~> 1.8)
+      ostruct (>= 0.3.2)
+      rails (>= 6.1, < 8.1)
+      view_component (>= 2.74, < 4)
+      zeitwerk
+    blacklight-access_controls (6.1.0)
+      blacklight (> 6.0, < 9)
+      cancancan (>= 1.8)
       deprecation (~> 1.0)
-    blacklight-gallery (0.12.0)
-      blacklight (~> 6.3)
-      bootstrap-sass (~> 3.0)
-      openseadragon (>= 0.2.0)
-      rails
-    blacklight_advanced_search (6.4.1)
-      blacklight (~> 6.0, >= 6.0.1)
+    blacklight-gallery (4.6.4)
+      blacklight (>= 7.17, < 9)
+      rails (>= 6.1, < 9)
+    blacklight_advanced_search (7.0.0)
+      blacklight (~> 7.0)
       parslet
-    blacklight_oai_provider (6.0.0)
-      blacklight (~> 6.0)
-      oai (~> 0.4)
-      rails (>= 4.2, < 6)
-    blacklight_range_limit (6.3.3)
-      blacklight (>= 6.0.2)
-      jquery-rails
-      rails (>= 3.0)
-    bootsnap (1.17.0)
+    blacklight_oai_provider (7.0.2)
+      blacklight (~> 7.0)
+      oai (~> 1.2)
+      rexml
+    blacklight_range_limit (8.5.0)
+      blacklight (>= 7.25.2, < 9)
+      deprecation
+      view_component (>= 2.54, < 4)
+    bootsnap (1.18.6)
       msgpack (~> 1.2)
-    bootstrap-sass (3.4.1)
-      autoprefixer-rails (>= 5.2.1)
-      sassc (>= 2.0.0)
+    bootstrap (4.6.2)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 1.16.1, < 2)
+      sassc-rails (>= 2.0.0)
     bootstrap_form (5.1.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
     breadcrumbs_on_rails (3.0.1)
-    browse-everything (1.1.2)
+    browse-everything (1.6.0)
       addressable (~> 2.5)
       aws-sdk-s3
-      dropbox_api (>= 0.1.10)
-      google-api-client (~> 0.23)
-      google_drive (>= 2.1, < 4)
-      googleauth (>= 0.6.6, < 1.0)
-      rails (>= 4.2, < 7.0)
+      dropbox_api (>= 0.1.20)
+      faraday (~> 2.0)
+      google-apis-drive_v3
+      googleauth (>= 0.6.6, < 2.0)
+      rails (>= 4.2, < 8.1)
       ruby-box
       signet (~> 0.8)
-      typhoeus
-    builder (3.2.4)
-    bulkrax (9.0.2)
+    builder (3.3.0)
+    bulkrax (9.3.3)
       bagit (~> 0.6.0)
       coderay
       denormalize_fields
@@ -180,12 +204,12 @@ GEM
       marcel
       oai (>= 0.4, < 2.x)
       rack (>= 2.0.6)
-      rails (>= 5.1.6)
+      rails (>= 5.1.6, < 8.0.0)
       rdf (>= 2.0.2, < 4.0)
       rubyzip
       simple_form
     byebug (11.1.3)
-    cancancan (1.17.0)
+    cancancan (3.6.1)
     capybara (3.39.2)
       addressable
       matrix
@@ -198,11 +222,13 @@ GEM
     capybara-screenshot (1.0.26)
       capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.3.3)
+    carrierwave (1.3.4)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
       ssrf_filter (~> 1.0, < 1.1.0)
+    childprocess (5.1.0)
+      logger (~> 1.5)
     clipboard-rails (1.7.1)
     coderay (1.1.3)
     coffee-rails (5.0.0)
@@ -212,52 +238,47 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
-    crack (0.4.5)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.5.4)
+    crack (1.0.0)
+      bigdecimal
       rexml
     crass (1.0.6)
     csv (3.3.5)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
-    database_cleaner-active_record (2.1.0)
+    database_cleaner-active_record (2.2.2)
       activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
+      database_cleaner-core (~> 2.0)
     database_cleaner-core (2.0.1)
-    date (3.3.4)
+    date (3.5.1)
     declarative (0.0.20)
-    declarative-builder (0.1.0)
-      declarative-option (< 0.2.0)
-    declarative-option (0.1.0)
     denormalize_fields (1.3.0)
       activerecord (>= 4.1.14, < 8.0.0)
     deprecation (1.1.0)
       activesupport
-    devise (4.9.2)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-guests (0.8.1)
+    devise-guests (0.8.3)
       devise
     devise_cas_authenticatable (2.0.2)
       devise (>= 4.0.0)
       rack-cas
-    diff-lcs (1.5.0)
-    disposable (0.4.7)
+    diff-lcs (1.6.2)
+    disposable (0.6.3)
       declarative (>= 0.0.9, < 1.0.0)
-      declarative-builder (< 0.2.0)
-      declarative-option (< 0.2.0)
-      representable (>= 2.4.0, <= 3.1.0)
-      uber (< 0.2.0)
+      representable (>= 3.1.1, < 4)
     docile (1.4.1)
     docopt (0.5.0)
     dotenv (2.7.6)
     dotenv-rails (2.7.6)
       dotenv (= 2.7.6)
       railties (>= 3.2)
-    draper (4.0.2)
+    draper (4.0.4)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
       activemodel-serializers-xml (>= 1.0)
@@ -267,67 +288,60 @@ GEM
     dropbox_api (0.1.21)
       faraday (< 3.0)
       oauth2 (~> 1.1)
-    dry-configurable (0.16.1)
-      dry-core (~> 0.6)
+    dry-configurable (1.3.0)
+      dry-core (~> 1.1)
       zeitwerk (~> 2.6)
     dry-container (0.11.0)
       concurrent-ruby (~> 1.0)
-    dry-core (0.9.1)
+    dry-core (1.1.0)
       concurrent-ruby (~> 1.0)
+      logger
       zeitwerk (~> 2.6)
-    dry-equalizer (0.3.0)
-    dry-events (0.2.0)
+    dry-events (1.1.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4)
-      dry-equalizer (~> 0.2)
-    dry-inflector (0.3.0)
-    dry-initializer (3.1.1)
-    dry-logic (1.3.0)
+      dry-core (~> 1.1)
+    dry-inflector (1.2.0)
+    dry-initializer (3.2.0)
+    dry-logic (1.6.0)
+      bigdecimal
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.9, >= 0.9)
+      dry-core (~> 1.1)
       zeitwerk (~> 2.6)
-    dry-matcher (0.9.0)
-      dry-core (~> 0.4, >= 0.4.8)
-    dry-monads (1.4.0)
+    dry-monads (1.9.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.7)
-    dry-schema (1.11.3)
+      dry-core (~> 1.1)
+      zeitwerk (~> 2.6)
+    dry-schema (1.14.1)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.16, >= 0.16)
-      dry-core (~> 0.9, >= 0.9)
-      dry-initializer (~> 3.0)
-      dry-logic (~> 1.3)
-      dry-types (~> 1.6)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.1)
+      dry-initializer (~> 3.2)
+      dry-logic (~> 1.5)
+      dry-types (~> 1.8)
       zeitwerk (~> 2.6)
-    dry-struct (1.5.2)
-      dry-core (~> 0.9, >= 0.9)
-      dry-types (~> 1.6)
+    dry-struct (1.8.0)
+      dry-core (~> 1.1)
+      dry-types (~> 1.8, >= 1.8.2)
       ice_nine (~> 0.11)
       zeitwerk (~> 2.6)
-    dry-transaction (0.13.3)
-      dry-container (>= 0.2.8)
-      dry-events (>= 0.1.0)
-      dry-matcher (>= 0.7.0)
-      dry-monads (>= 0.4.0)
-    dry-types (1.6.1)
+    dry-types (1.8.3)
+      bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.9, >= 0.9)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.3, >= 1.3)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    dry-validation (1.9.0)
+    dry-validation (1.11.1)
       concurrent-ruby (~> 1.0)
-      dry-container (~> 0.7, >= 0.7.1)
-      dry-core (~> 0.9, >= 0.9)
-      dry-initializer (~> 3.0)
-      dry-schema (~> 1.11, >= 1.11.0)
+      dry-core (~> 1.1)
+      dry-initializer (~> 3.2)
+      dry-schema (~> 1.14)
       zeitwerk (~> 2.6)
-    ebnf (2.3.5)
+    ebnf (2.4.0)
       htmlentities (~> 4.3)
-      rdf (~> 3.2)
+      rdf (~> 3.3)
       scanf (~> 1.0)
-      sxp (~> 1.2)
+      sxp (~> 1.3)
       unicode-types (~> 1.8)
     edtf (3.1.1)
       activesupport (>= 3.0, < 8.0)
@@ -337,125 +351,154 @@ GEM
       roman (~> 0.2.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    erubi (1.12.0)
-    et-orbi (1.2.7)
+    erubi (1.13.1)
+    et-orbi (1.4.0)
       tzinfo
-    ethon (0.16.0)
-      ffi (>= 1.15.0)
-    execjs (2.8.1)
+    execjs (2.10.0)
     factory_bot (6.4.5)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
-    faraday (0.17.6)
-      multipart-post (>= 1.2, < 3)
-    faraday-encoding (0.0.5)
+    faraday (2.14.0)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-encoding (0.0.6)
       faraday
-    faraday_middleware (0.14.0)
-      faraday (>= 0.7.4, < 1.0)
-    ffi (1.15.5)
+    faraday-follow_redirects (0.4.0)
+      faraday (>= 1, < 3)
+    faraday-mashify (1.0.0)
+      faraday (~> 2.0)
+      hashie
+    faraday-multipart (1.1.1)
+      multipart-post (~> 2.0)
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
+    faraday-retry (2.3.2)
+      faraday (~> 2.0)
+    ffi (1.17.2)
     ffprober (1.0)
       sorbet-runtime
-    flipflop (2.7.1)
+    flipflop (2.8.0)
       activesupport (>= 4.0)
       terminal-table (>= 1.8)
     flot-rails (0.0.7)
       jquery-rails
-    font-awesome-rails (4.7.0.8)
-      railties (>= 3.2, < 8.0)
-    fugit (1.8.1)
-      et-orbi (~> 1, >= 1.2.7)
+    font-awesome-rails (4.7.0.9)
+      railties (>= 3.2, < 9.0)
+    fugit (1.12.1)
+      et-orbi (~> 1.4)
       raabro (~> 1.4)
-    gems (1.2.0)
-    geocoder (1.8.5)
+    gapic-common (1.2.0)
+      faraday (>= 1.9, < 3.a)
+      faraday-retry (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.2)
+      google-logging-utils (~> 0.1)
+      google-protobuf (~> 4.26)
+      googleapis-common-protos (~> 1.6)
+      googleapis-common-protos-types (~> 1.15)
+      googleauth (~> 1.12)
+      grpc (~> 1.66)
+    geocoder (1.8.6)
       base64 (>= 0.1.0)
       csv (>= 3.0.0)
-    gli (2.21.0)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
-    google-api-client (0.53.0)
-      google-apis-core (~> 0.1)
-      google-apis-generator (~> 0.1)
-    google-apis-core (0.11.0)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
-      mini_mime (~> 1.0)
+    gli (2.22.2)
+      ostruct
+    globalid (1.3.0)
+      activesupport (>= 6.1)
+    google-analytics-data (0.7.2)
+      google-analytics-data-v1beta (>= 0.11, < 2.a)
+      google-cloud-core (~> 1.6)
+    google-analytics-data-v1beta (0.19.0)
+      gapic-common (~> 1.2)
+      google-cloud-errors (~> 1.0)
+    google-apis-core (1.0.2)
+      addressable (~> 2.8, >= 2.8.7)
+      faraday (~> 2.13)
+      faraday-follow_redirects (~> 0.3)
+      googleauth (~> 1.14)
+      mini_mime (~> 1.1)
       representable (~> 3.0)
-      retriable (>= 2.0, < 4.a)
-      rexml
-      webrick
-    google-apis-discovery_v1 (0.14.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-drive_v3 (0.42.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-generator (0.12.0)
-      activesupport (>= 5.0)
-      gems (~> 1.2)
-      google-apis-core (>= 0.11.0, < 2.a)
-      google-apis-discovery_v1 (~> 0.5)
-      thor (>= 0.20, < 2.a)
-    google-apis-sheets_v4 (0.24.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google_drive (3.0.7)
-      google-apis-drive_v3 (>= 0.5.0, < 1.0.0)
-      google-apis-sheets_v4 (>= 0.4.0, < 1.0.0)
-      googleauth (>= 0.5.0, < 1.0.0)
-      nokogiri (>= 1.5.3, < 2.0.0)
-    googleauth (0.17.1)
-      faraday (>= 0.17.3, < 2.0)
-      jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
+      retriable (~> 3.1)
+    google-apis-drive_v3 (0.75.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-cloud-core (1.8.0)
+      google-cloud-env (>= 1.0, < 3.a)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (2.3.1)
+      base64 (~> 0.2)
+      faraday (>= 1.0, < 3.a)
+    google-cloud-errors (1.5.0)
+    google-logging-utils (0.2.0)
+    google-protobuf (4.33.0)
+      bigdecimal
+      rake (>= 13)
+    googleapis-common-protos (1.9.0)
+      google-protobuf (~> 4.26)
+      googleapis-common-protos-types (~> 1.21)
+      grpc (~> 1.41)
+    googleapis-common-protos-types (1.22.0)
+      google-protobuf (~> 4.26)
+    googleauth (1.15.1)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.2)
+      google-logging-utils (~> 0.1)
+      jwt (>= 1.4, < 4.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.15)
+      signet (>= 0.16, < 2.a)
+    grpc (1.75.0)
+      google-protobuf (>= 3.25, < 5.0)
+      googleapis-common-protos-types (~> 1.0)
     haml (6.3.0)
       temple (>= 0.8.2)
       thor
       tilt
-    hashdiff (1.0.1)
+    hashdiff (1.2.1)
     hashie (5.0.0)
     hiredis (0.6.3)
     honeybadger (4.12.2)
-    htmlentities (4.3.4)
-    http_logger (0.7.0)
-    httpclient (2.8.3)
-    hydra-access-controls (11.0.7)
+    htmlentities (4.4.2)
+    http_logger (1.0.1)
+    hydra-access-controls (13.1.0)
       active-fedora (>= 10.0.0)
-      activesupport (>= 4, < 6)
-      blacklight (>= 5.16)
-      blacklight-access_controls (~> 0.6.0)
-      cancancan (~> 1.8)
+      activesupport (>= 6.1, < 8.1)
+      blacklight-access_controls (~> 6.0)
+      cancancan (>= 1.8, < 4)
       deprecation (~> 1.0)
-    hydra-core (11.0.7)
-      hydra-access-controls (= 11.0.7)
-      railties (>= 4.0.0, < 6)
-    hydra-derivatives (3.7.0)
-      active-fedora (>= 11.5.6, != 13.2.1, != 13.2.0, != 13.1.3, != 13.1.2, != 13.1.1, != 13.1.0, != 13.0.0, != 12.2.1, != 12.2.0, != 12.1.1, != 12.1.0, != 12.0.3, != 12.0.2, != 12.0.1, != 12.0.0)
-      active_encode (~> 0.1)
-      activesupport (>= 4.0, < 7)
+    hydra-core (13.1.0)
+      hydra-access-controls (= 13.1.0)
+      railties (>= 6.1, < 8.1)
+    hydra-derivatives (4.1.0)
+      active-fedora (>= 14.0)
+      active-triples (>= 1.2)
+      active_encode (~> 1.2)
+      activesupport (>= 4.0, < 9.0)
       addressable (~> 2.5)
       deprecation
       mime-types (> 2.0, < 4.0)
       mini_magick (>= 3.2, < 5)
-    hydra-editor (5.0.5)
+      ruby-vips
+    hydra-editor (7.0.0)
       active-fedora (>= 9.0.0)
-      activerecord (~> 5.0)
+      activerecord (>= 5.2, < 8.0)
       almond-rails (~> 0.1)
-      cancancan (~> 1.8)
-      rails (>= 5, < 6)
-      simple_form (>= 4.1.0, < 6.0)
-      sprockets (~> 3.7)
+      cancancan
+      concurrent-ruby (= 1.3.4)
+      psych (~> 3.3, < 4)
+      rails (>= 5.2, < 8.0)
+      simple_form (>= 4.1.0, < 5.2)
+      sprockets (>= 3.7)
       sprockets-es6
-    hydra-file_characterization (1.1.2)
+    hydra-file_characterization (1.2.0)
       activesupport (>= 3.0.0)
-    hydra-head (11.0.7)
-      hydra-access-controls (= 11.0.7)
-      hydra-core (= 11.0.7)
-      rails (>= 5.2, < 6.1)
-    hydra-pcdm (1.3.0)
-      active-fedora (>= 10, < 15)
+    hydra-head (13.1.0)
+      hydra-access-controls (= 13.1.0)
+      hydra-core (= 13.1.0)
+      rails (>= 6.1, < 8.1)
+    hydra-pcdm (1.4.0)
+      active-fedora (>= 10)
       mime-types (>= 1)
       rdf-vocab
     hydra-role-management (1.1.0)
@@ -465,54 +508,51 @@ GEM
       cancancan
       json (>= 1.8)
       psych (~> 3.0)
-    hydra-works (2.1.0)
-      activesupport (>= 5.2, < 7.1)
-      hydra-derivatives (~> 3.6)
+    hydra-works (2.2.0)
+      activesupport (>= 5.2, < 8.0)
+      hydra-derivatives (>= 3.6)
       hydra-file_characterization (~> 1.0)
       hydra-pcdm (>= 0.9)
-    hyrax (3.6.0)
-      active-fedora (~> 13.1, >= 13.1.2)
+    hyrax (5.2.0)
+      active-fedora (~> 15.0)
       almond-rails (~> 0.1)
       awesome_nested_set (~> 3.1)
-      blacklight (~> 6.14)
-      blacklight-gallery (~> 0.7)
+      blacklight (~> 7.29)
+      blacklight-gallery (~> 4.6.4)
       breadcrumbs_on_rails (~> 3.0)
       browse-everything (>= 0.16, < 2.0)
       carrierwave (~> 1.0)
       clipboard-rails (~> 1.5)
+      concurrent-ruby (= 1.3.4)
+      connection_pool (~> 2.4)
       draper (~> 4.0)
-      dry-equalizer (~> 0.2)
-      dry-events (~> 0.2.0)
-      dry-monads (< 1.5)
-      dry-struct (~> 1.0)
-      dry-transaction (~> 0.11)
-      dry-validation (~> 1.3)
+      dry-container (~> 0.11)
+      dry-events (~> 1.0, >= 1.0.1)
+      dry-logic (~> 1.5)
+      dry-monads (~> 1.6)
+      dry-validation (~> 1.10)
       flipflop (~> 2.3)
       flot-rails (~> 0.0.6)
       font-awesome-rails (~> 4.2)
-      hydra-derivatives (~> 3.3)
-      hydra-editor (~> 5.0, >= 5.0.4)
-      hydra-file_characterization (~> 1.1.2)
-      hydra-head (~> 11.0, >= 11.0.1)
+      google-analytics-data (~> 0.6)
+      hydra-derivatives (~> 4.0)
+      hydra-editor (~> 7.0)
+      hydra-file_characterization (~> 1.1)
+      hydra-head (~> 13.0)
       hydra-works (>= 0.16)
       iiif_manifest (>= 0.3, < 2.0)
-      jquery-datatables-rails (~> 3.4)
-      jquery-ui-rails (~> 6.0)
-      json-ld (< 3.2)
       json-schema
-      kaminari_route_prefix (~> 0.1.1)
       legato (~> 0.3)
       linkeddata
+      listen (~> 3.9)
       mailboxer (~> 0.12)
       nest (~> 3.1)
-      noid-rails (~> 3.0.0)
+      noid-rails (~> 3.0)
       oauth
       oauth2 (~> 1.2)
-      posix-spawn
-      power_converter (~> 0.1, >= 0.1.2)
-      psych (~> 3.3)
+      openseadragon (~> 0.9)
       qa (~> 5.5, >= 5.5.1)
-      rails (~> 5.0)
+      rails (> 6.1, < 8.0)
       rails_autolink (~> 1.1)
       rdf-rdfxml
       rdf-vocab (~> 3.0)
@@ -522,51 +562,50 @@ GEM
       reform (~> 2.3)
       reform-rails (~> 0.2.0)
       retriable (>= 2.9, < 4.0)
-      samvera-nesting_indexer (~> 2.0)
-      sass-rails (~> 5.0)
+      sass-rails (~> 6.0)
       select2-rails (~> 3.5)
       signet
+      sprockets (= 3.7.2)
       tinymce-rails (~> 5.10)
-      valkyrie (~> 2, >= 2.1.1)
+      valkyrie (~> 3.5)
+      view_component (~> 2.74.1)
     hyrax-spec (0.3.2)
       rspec (~> 3.6)
-    i18n (1.14.4)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    iiif_manifest (1.3.1)
+    iiif_manifest (1.6.0)
       activesupport (>= 4)
-    iso-639 (0.3.6)
+    io-console (0.8.2)
+    iso-639 (0.3.8)
+      csv
     iso8601 (0.9.1)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.2)
-    jquery-datatables-rails (3.4.0)
-      actionpack (>= 3.1)
-      jquery-rails
-      railties (>= 3.1)
-      sass-rails
-    jquery-rails (4.6.0)
+    jquery-rails (4.6.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (6.0.1)
-      railties (>= 3.2.16)
-    json (2.6.3)
-    json-canonicalization (0.4.0)
-    json-ld (3.1.10)
+    json (2.18.0)
+    json-canonicalization (1.0.0)
+    json-ld (3.3.2)
       htmlentities (~> 4.3)
-      json-canonicalization (~> 0.2)
+      json-canonicalization (~> 1.0)
       link_header (~> 0.0, >= 0.0.8)
-      multi_json (~> 1.14)
-      rack (~> 2.0)
-      rdf (~> 3.1)
-    json-ld-preloaded (3.1.6)
-      json-ld (~> 3.1)
-      rdf (~> 3.1)
-    json-schema (4.0.0)
-      addressable (>= 2.8)
-    jwt (2.7.1)
+      multi_json (~> 1.15)
+      rack (>= 2.2, < 4)
+      rdf (~> 3.3)
+      rexml (~> 3.2)
+    json-ld-preloaded (3.2.2)
+      json-ld (~> 3.2)
+      rdf (~> 3.2)
+    json-schema (6.0.0)
+      addressable (~> 2.8)
+      bigdecimal (~> 3.1)
+    jwt (2.10.2)
+      base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -579,25 +618,26 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    kaminari_route_prefix (0.1.1)
-      kaminari (~> 1.0)
     language_list (1.2.1)
     latex-decode (0.4.0)
-    launchy (2.5.2)
+    launchy (3.1.1)
       addressable (~> 2.8)
-    ld-patch (3.2.0)
-      ebnf (~> 2.2)
+      childprocess (~> 5.0)
+      logger (~> 1.6)
+    ld-patch (3.2.2)
+      ebnf (~> 2.3)
       rdf (~> 3.2)
       rdf-xsd (~> 3.2)
       sparql (~> 3.2)
       sxp (~> 1.2)
-    ldp (1.0.3)
+    ldp (1.2.0)
       deprecation
-      faraday
+      faraday (>= 1)
       http_logger
-      json-ld
-      rdf (>= 1.1)
+      json-ld (~> 3.2)
+      rdf (~> 3.2)
       rdf-isomorphic
+      rdf-ldp
       rdf-turtle
       rdf-vocab (>= 0.8)
       slop
@@ -608,7 +648,7 @@ GEM
       rdf-vocab (~> 3.0)
     legato (0.7.0)
       multi_json
-    libxml-ruby (5.0.3)
+    libxml-ruby (5.0.5)
     link_header (0.0.8)
     linkeddata (3.1.6)
       equivalent-xml (~> 0.6)
@@ -637,19 +677,20 @@ GEM
       shex (~> 0.6, >= 0.6.4)
       sparql (~> 3.1, >= 3.1.8)
       sparql-client (~> 3.1, >= 3.1.2)
-    listen (3.7.1)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.5.3)
+    logger (1.7.0)
     lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.22.0)
+    loofah (2.25.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mail (2.8.1)
+    mail (2.9.0)
+      logger
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -657,78 +698,87 @@ GEM
     mailboxer (0.15.1)
       carrierwave (>= 0.5.8)
       rails (>= 5.0.0)
-    marcel (1.0.4)
-    matrix (0.4.2)
-    memoist (0.16.2)
-    method_source (1.0.0)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0218.1)
-    mini_magick (4.12.0)
+    marcel (1.1.0)
+    matrix (0.4.3)
+    method_source (1.1.0)
+    mime-types (3.7.0)
+      logger
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2026.0113)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    minitest (5.22.3)
-    msgpack (1.7.1)
-    multi_json (1.15.0)
-    multi_xml (0.6.0)
-    multipart-post (2.4.0)
-    namae (1.1.1)
+    mini_portile2 (2.8.9)
+    minitest (6.0.1)
+      prism (~> 1.5)
+    msgpack (1.8.0)
+    multi_json (1.20.1)
+    multi_xml (0.7.2)
+      bigdecimal (~> 3.1)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
+    namae (1.2.0)
+      racc (~> 1.7)
     nest (3.2.0)
       redic
-    net-http-persistent (4.0.2)
-      connection_pool (~> 2.2)
-    net-imap (0.4.10)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    net-http-persistent (4.0.6)
+      connection_pool (~> 2.2, >= 2.2.4)
+    net-imap (0.6.2)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.1)
       net-protocol
-    nio4r (2.7.0)
+    nio4r (2.7.5)
     noid (0.9.0)
-    noid-rails (3.0.3)
-      actionpack (>= 5.0.0, < 7)
+    noid-rails (3.3.0)
+      actionpack (>= 5.0.0, < 9)
       noid (~> 0.9)
-    nokogiri (1.15.6)
+    nokogiri (1.19.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     non-digest-assets (2.2.0)
       activesupport (>= 5.2, < 7.1)
       sprockets (>= 2.0, < 5.0)
-    oai (0.4.0)
+    oai (1.3.0)
       builder (>= 3.1.0)
-      faraday
-      faraday_middleware
-    oauth (1.1.0)
-      oauth-tty (~> 1.0, >= 1.0.1)
+      faraday (< 3)
+      faraday-follow_redirects (>= 0.3.0, < 2)
+      rexml
+    oauth (1.1.2)
+      oauth-tty (~> 1.0, >= 1.0.6)
       snaky_hash (~> 2.0)
-      version_gem (~> 1.1)
-    oauth-tty (1.0.5)
-      version_gem (~> 1.1, >= 1.1.1)
+      version_gem (~> 1.1, >= 1.1.9)
+    oauth-tty (1.0.6)
+      version_gem (~> 1.1, >= 1.1.9)
     oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
-    okcomputer (1.18.5)
-    openseadragon (0.6.0)
-      rails (> 3.2.0)
+    okcomputer (1.18.6)
+    openseadragon (0.9.0)
+      rails (> 6.1.0)
     orm_adapter (0.5.0)
     os (1.1.4)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    ostruct (0.6.3)
+    parallel (1.27.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
-    pg (1.5.4)
+    pg (1.5.9)
+    popper_js (1.16.1)
     posix-spawn (0.3.15)
-    power_converter (0.1.2)
+    prism (1.5.2)
     psych (3.3.4)
-    public_suffix (5.0.3)
-    puma (6.4.2)
+    public_suffix (7.0.2)
+    puma (6.4.3)
       nio4r (~> 2.0)
     qa (5.15.0)
       activerecord-import
@@ -740,63 +790,74 @@ GEM
       rails (>= 5.0, < 8.1)
       rdf
     raabro (1.4.0)
-    racc (1.7.3)
-    rack (2.2.8.1)
+    racc (1.8.1)
+    rack (2.2.21)
     rack-cas (0.16.1)
       addressable (~> 2.3)
       nokogiri (~> 1.5)
       rack (>= 1.3)
-    rack-protection (3.0.6)
-      rack
-    rack-test (2.1.0)
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
+      rack (~> 2.2, >= 2.2.4)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    rails (5.2.8.1)
-      actioncable (= 5.2.8.1)
-      actionmailer (= 5.2.8.1)
-      actionpack (= 5.2.8.1)
-      actionview (= 5.2.8.1)
-      activejob (= 5.2.8.1)
-      activemodel (= 5.2.8.1)
-      activerecord (= 5.2.8.1)
-      activestorage (= 5.2.8.1)
-      activesupport (= 5.2.8.1)
-      bundler (>= 1.3.0)
-      railties (= 5.2.8.1)
+    rails (6.1.7.10)
+      actioncable (= 6.1.7.10)
+      actionmailbox (= 6.1.7.10)
+      actionmailer (= 6.1.7.10)
+      actionpack (= 6.1.7.10)
+      actiontext (= 6.1.7.10)
+      actionview (= 6.1.7.10)
+      activejob (= 6.1.7.10)
+      activemodel (= 6.1.7.10)
+      activerecord (= 6.1.7.10)
+      activestorage (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
+      bundler (>= 1.15.0)
+      railties (= 6.1.7.10)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.2.0)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails_autolink (1.1.8)
       actionview (> 3.1)
       activesupport (> 3.1)
       railties (> 3.1)
-    railties (5.2.8.1)
-      actionpack (= 5.2.8.1)
-      activesupport (= 5.2.8.1)
+    railties (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.3.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdf (3.2.11)
+    rdf (3.3.4)
+      bcp47_spec (~> 0.2)
+      bigdecimal (~> 3.1, >= 3.1.5)
       link_header (~> 0.0, >= 0.0.8)
+      logger (~> 1.5)
+      ostruct (~> 0.6)
+      readline (~> 0.0)
     rdf-aggregate-repo (3.2.1)
       rdf (~> 3.2)
-    rdf-isomorphic (3.2.1)
-      rdf (~> 3.2)
+    rdf-isomorphic (3.3.0)
+      rdf (~> 3.3)
     rdf-json (3.2.0)
       rdf (~> 3.2)
+    rdf-ldp (0.1.0)
+      deprecation
+      rdf
     rdf-microdata (3.2.1)
       htmlentities (~> 4.3)
       nokogiri (~> 1.13)
@@ -812,7 +873,7 @@ GEM
       rdf (~> 3.2)
     rdf-ordered-repo (3.2.1)
       rdf (~> 3.2, >= 3.2.1)
-    rdf-rdfa (3.2.2)
+    rdf-rdfa (3.2.3)
       haml (>= 5.2, < 7)
       htmlentities (~> 4.3)
       rdf (~> 3.2)
@@ -827,28 +888,30 @@ GEM
     rdf-reasoner (0.8.0)
       rdf (~> 3.2)
       rdf-xsd (~> 3.2)
-    rdf-tabular (3.1.1)
-      addressable (~> 2.3)
+    rdf-tabular (3.2.1)
+      addressable (~> 2.8)
       bcp47 (~> 0.3, >= 0.3.3)
-      json-ld (~> 3.1)
-      rdf (~> 3.1)
-      rdf-vocab (~> 3.1)
-      rdf-xsd (~> 3.1)
-    rdf-trig (3.2.0)
-      ebnf (~> 2.2)
-      rdf (~> 3.2)
-      rdf-turtle (~> 3.2)
+      json-ld (~> 3.2)
+      rdf (~> 3.2, >= 3.2.7)
+      rdf-vocab (~> 3.2)
+      rdf-xsd (~> 3.2)
+    rdf-trig (3.3.0)
+      ebnf (~> 2.4)
+      rdf (~> 3.3)
+      rdf-turtle (~> 3.3)
     rdf-trix (3.2.0)
       rdf (~> 3.2)
       rdf-xsd (~> 3.2)
-    rdf-turtle (3.2.1)
-      ebnf (~> 2.3)
-      rdf (~> 3.2)
-    rdf-vocab (3.2.7)
-      rdf (~> 3.2, >= 3.2.4)
+    rdf-turtle (3.3.0)
+      ebnf (~> 2.4)
+      rdf (~> 3.3)
+    rdf-vocab (3.3.3)
+      rdf (~> 3.3)
     rdf-xsd (3.2.1)
       rdf (~> 3.2)
       rexml (~> 3.2)
+    readline (0.0.4)
+      reline
     redic (1.5.3)
       hiredis
     redis (4.5.1)
@@ -856,44 +919,46 @@ GEM
       redis (>= 4)
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
-    reform (2.5.0)
-      disposable (>= 0.4.2, < 0.5.0)
-      representable (>= 2.4.0, < 3.1.0)
+    reform (2.6.2)
+      disposable (>= 0.5.0, < 1.0.0)
+      representable (>= 3.1.1, < 4)
       uber (< 0.2.0)
-    reform-rails (0.2.5)
+    reform-rails (0.2.6)
       activemodel (>= 5.0)
       reform (>= 2.3.1, < 3.0.0)
-    regexp_parser (2.8.1)
-    representable (3.0.4)
+    regexp_parser (2.11.3)
+    reline (0.6.3)
+      io-console (~> 0.5)
+    representable (3.2.0)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    request_store (1.5.1)
+    request_store (1.7.0)
       rack (>= 1.4)
-    responders (3.1.0)
+    responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
-    rexml (3.2.6)
+    rexml (3.4.4)
     roman (0.2.0)
     rsolr (2.5.0)
       builder (>= 2.1.2)
       faraday (>= 0.9, < 3, != 2.0.0)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec (3.13.1)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-its (1.3.0)
+      rspec-support (~> 3.13.0)
+    rspec-its (1.3.1)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.12.6)
+    rspec-mocks (3.13.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
     rspec-rails (5.1.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
@@ -902,7 +967,7 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.12.1)
+    rspec-support (3.13.6)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (1.28.2)
@@ -914,9 +979,10 @@ GEM
       rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    rubocop-performance (1.18.0)
+    rubocop-ast (1.47.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.15.2)
@@ -931,43 +997,41 @@ GEM
       multipart-post
       oauth2
     ruby-progressbar (1.13.0)
+    ruby-vips (2.3.0)
+      ffi (~> 1.12)
+      logger
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    samvera-nesting_indexer (2.0.0)
-      dry-equalizer
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.1.0)
-      railties (>= 5.2.0)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
+    sass-rails (6.0.0)
+      sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)
       ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     scanf (1.0.0)
     select2-rails (3.5.11)
     selenium-webdriver (4.9.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    shacl (0.1.1)
-      json-ld (~> 3.1, >= 3.1.7)
-      rdf (~> 3.1, >= 3.1.8)
-      sparql (~> 3.1)
-      sxp (~> 1.1)
-    shex (0.6.4)
-      ebnf (~> 2.1, >= 2.2)
+    shacl (0.3.0)
+      json-ld (~> 3.2)
+      rdf (~> 3.2, >= 3.2.8)
+      sparql (~> 3.2, >= 3.2.4)
+      sxp (~> 1.2)
+    shex (0.7.1)
+      ebnf (~> 2.2)
       htmlentities (~> 4.3)
-      json-ld (~> 3.1)
-      json-ld-preloaded (~> 3.1)
-      rdf (~> 3.1)
-      rdf-xsd (~> 3.1)
-      sparql (~> 3.1)
-      sxp (~> 1.1)
+      json-ld (~> 3.2)
+      json-ld-preloaded (~> 3.2)
+      rdf (~> 3.2)
+      rdf-xsd (~> 3.2)
+      sparql (~> 3.2)
+      sxp (~> 1.2)
     shoulda-matchers (4.5.1)
       activesupport (>= 4.2.0)
     sidekiq (5.2.10)
@@ -978,10 +1042,10 @@ GEM
     sidekiq-cron (1.9.1)
       fugit (~> 1.8)
       sidekiq (>= 4.2.1)
-    signet (0.17.0)
+    signet (0.21.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
+      jwt (>= 1.5, < 4.0)
       multi_json (~> 1.10)
     simple_form (5.1.0)
       actionpack (>= 5.2)
@@ -990,35 +1054,35 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-cobertura (2.1.0)
+    simplecov-cobertura (3.1.0)
       rexml
       simplecov (~> 0.19)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    slack-ruby-client (0.14.6)
-      activesupport
-      faraday (>= 0.9)
-      faraday_middleware
+    slack-ruby-client (3.0.0)
+      faraday (>= 2.0.1)
+      faraday-mashify
+      faraday-multipart
       gli
       hashie
-      websocket-driver
+      logger
     slop (4.10.1)
-    snaky_hash (2.0.1)
-      hashie
-      version_gem (~> 1.1, >= 1.1.1)
-    sorbet-runtime (0.5.11463)
-    sparql (3.2.5)
-      builder (~> 3.2)
-      ebnf (~> 2.2, >= 2.3.1)
+    snaky_hash (2.0.3)
+      hashie (>= 0.1.0, < 6)
+      version_gem (>= 1.1.8, < 3)
+    sorbet-runtime (0.5.12443)
+    sparql (3.2.6)
+      builder (~> 3.2, >= 3.2.4)
+      ebnf (~> 2.3, >= 2.3.5)
       logger (~> 1.5)
-      rdf (~> 3.2, >= 3.2.8)
-      rdf-aggregate-repo (~> 3.2)
+      rdf (~> 3.2, >= 3.2.11)
+      rdf-aggregate-repo (~> 3.2, >= 3.2.1)
       rdf-xsd (~> 3.2)
-      sparql-client (~> 3.2, >= 3.2.1)
-      sxp (~> 1.2, >= 1.2.2)
-    sparql-client (3.2.1)
-      net-http-persistent (~> 4.0, >= 4.0.1)
-      rdf (~> 3.2, >= 3.2.6)
+      sparql-client (~> 3.2, >= 3.2.2)
+      sxp (~> 1.2, >= 1.2.4)
+    sparql-client (3.2.2)
+      net-http-persistent (~> 4.0, >= 4.0.2)
+      rdf (~> 3.2, >= 3.2.11)
     spring (2.1.1)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
@@ -1030,50 +1094,48 @@ GEM
       babel-source (>= 5.8.11)
       babel-transpiler
       sprockets (>= 3.0.0)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     ssrf_filter (1.0.8)
     stub_env (1.0.4)
       rspec (>= 2.0, < 4.0)
-    sxp (1.2.4)
+    sxp (1.3.0)
       matrix (~> 0.4)
-      rdf (~> 3.2)
-    temple (0.10.3)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
-    thor (1.3.1)
-    thread_safe (0.3.6)
-    tilt (2.3.0)
-    timeout (0.4.1)
-    tinymce-rails (5.10.7.1)
+      rdf (~> 3.3)
+    temple (0.10.4)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
+    terser (1.2.7)
+      execjs (>= 0.3.0, < 3)
+    thor (1.5.0)
+    tilt (2.6.1)
+    timeout (0.6.0)
+    tinymce-rails (5.10.9)
       railties (>= 3.1.1)
+    trailblazer-option (0.1.2)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    twitter-typeahead-rails (0.11.1.pre.corejavascript)
+    twitter-typeahead-rails (0.11.1)
       actionpack (>= 3.1)
       jquery-rails
       railties (>= 3.1)
-    typhoeus (1.4.0)
-      ethon (>= 0.9.0)
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    uglifier (4.2.0)
-      execjs (>= 0.3.0, < 3)
-    unicode-display_width (2.4.2)
-    unicode-types (1.8.0)
+    unicode-display_width (2.6.0)
+    unicode-types (1.11.0)
+    uri (1.1.1)
     validatable (1.6.7)
-    valkyrie (2.2.0)
+    valkyrie (3.5.0)
       activemodel
       activesupport
-      disposable (~> 0.4.5)
-      draper
       dry-struct
       dry-types (~> 1.0)
-      faraday (< 1.0)
+      faraday (>= 0.9, < 3, != 2.0.0)
+      faraday-multipart
       json
       json-ld
       railties
@@ -1081,24 +1143,28 @@ GEM
       rdf-vocab
       reform (~> 2.2)
       reform-rails
-    version_gem (1.1.3)
+    version_gem (1.1.9)
+    view_component (2.74.1)
+      activesupport (>= 5.0.0, < 8.0)
+      concurrent-ruby (~> 1.0)
+      method_source (~> 1.0)
     wapiti (2.1.0)
       builder (~> 3.2)
       rexml (~> 3.0)
     warden (1.2.9)
       rack (>= 2.0.9)
-    webmock (3.19.1)
+    webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.8.1)
-    websocket (1.2.10)
-    websocket-driver (0.7.6)
+    websocket (1.2.11)
+    websocket-driver (0.8.0)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.13)
+    zeitwerk (2.7.4)
 
 PLATFORMS
   ruby
@@ -1109,12 +1175,13 @@ DEPENDENCIES
   aws-sdk-s3 (~> 1.142.0)
   bagit (~> 0.6.0)
   bixby (~> 5.0.1)
-  blacklight_advanced_search (~> 6.4.1)
-  blacklight_oai_provider (~> 6.0.0)
-  blacklight_range_limit (~> 6.3.3)
+  blacklight_advanced_search (~> 7.0.0)
+  blacklight_oai_provider (~> 7.0.2)
+  blacklight_range_limit (~> 8.5.0)
   bootsnap (~> 1.17)
-  browse-everything (~> 1.1.2)
-  bulkrax (~> 9.0.2)
+  bootstrap (~> 4.0)
+  browse-everything (~> 1.6.0)
+  bulkrax (~> 9.3.3)
   byebug (~> 11.1.3)
   capybara (~> 3.38)
   capybara-screenshot (~> 1.0.26)
@@ -1128,27 +1195,29 @@ DEPENDENCIES
   edtf-humanize (~> 2.1.0)
   equivalent-xml (~> 0.6.0)
   factory_bot_rails (~> 6)
-  faraday (~> 0.17.6)
+  faraday (~> 2.0)
   ffprober
   honeybadger (~> 4.12.1)
   hydra-role-management (~> 1.1.0)
-  hyrax (~> 3.6.0)
+  hyrax (~> 5.2.0)
   hyrax-spec (~> 0.3.2)
   iso-639 (~> 0.3.6)
   jbuilder (~> 2.11.5)
   jquery-rails (~> 4.6.0)
   kaminari (~> 1.2.2)
   linkeddata (~> 3.1.6)
-  listen (>= 3.0.5, < 3.8)
+  listen (~> 3.9.0)
   lograge
-  mini_magick (~> 4.11)
+  multi_json (~> 1.20.1)
   non-digest-assets (~> 2.2.0)
   okcomputer (~> 1.18.5)
+  openseadragon (~> 0.9.0)
   pg (~> 1.5.4)
+  posix-spawn
   puma (~> 6.4.0)
-  rails (~> 5.2.7)
+  rails (~> 6.1)
   rails-controller-testing (~> 1.0.5)
-  rdf-vocab (~> 3.2.7)
+  rdf-vocab (~> 3.3.3)
   redlock (>= 0.1.2, < 2.0)
   rsolr (~> 2.5.0)
   rspec (~> 3.10)
@@ -1156,21 +1225,22 @@ DEPENDENCIES
   rspec-rails (~> 5.1)
   rspec_junit_formatter (~> 0.4.1)
   rubyzip (~> 2.3.2)
-  sass-rails (~> 5.1.0)
+  sass-rails (~> 6.0)
   selenium-webdriver
   shoulda-matchers (~> 4)
   sidekiq (~> 5.2.9)
   sidekiq-cron (~> 1.9.1)
   simple_form (< 5.2)
   simplecov (~> 0.22.0)
-  simplecov-cobertura (~> 2.1)
-  slack-ruby-client (~> 0.14.6)
+  simplecov-cobertura (~> 3)
+  slack-ruby-client
   spring (~> 2.1.1)
   spring-watcher-listen (~> 2.0.0)
   sprockets-es6 (~> 0.9.2)
   stub_env (~> 1.0.4)
+  terser (~> 1.2.7)
   turbolinks (~> 5.2.1)
-  uglifier (~> 4.2.0)
+  twitter-typeahead-rails (~> 0.11.1)
   webmock (~> 3.8)
 
 BUNDLED WITH
diff --git a/app/actors/spot/actors/collections_membership_actor.rb b/app/actors/spot/actors/collections_membership_actor.rb
index 22f414f76..da6102090 100644
--- a/app/actors/spot/actors/collections_membership_actor.rb
+++ b/app/actors/spot/actors/collections_membership_actor.rb
@@ -26,8 +26,6 @@ def add(env, id)
           col = collection_stack.shift
           next if collection_ids.include?(col.id)
 
-          col.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX
-
           collection_ids << col.id
           env.curation_concern.member_of_collections << col
           collection_stack += col.member_of_collections
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index b16e53d6d..75466dd08 100644
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -1,3 +1,5 @@
 //= link_tree ../images
 //= link_directory ../javascripts .js
 //= link_directory ../stylesheets .css
+
+//= link blacklight_gallery/manifest.js
\ No newline at end of file
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 7e6b2f8dc..15718ad85 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,26 +13,34 @@
 //= require turbolinks
 
 // Required by Blacklight
-//= require jquery
+//= require jquery3
+//= require rails-ujs
+
+//= require popper
+//= require twitter/typeahead
+//= require bootstrap
+
+//= require jquery.dataTables
+//= require dataTables.bootstrap4
+//= require blacklight/blacklight
 //= require blacklight_advanced_search
 //= require blacklight_range_limit
-//= require jquery_ujs
-//= require dataTables/jquery.dataTables
-//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
-//= require blacklight/blacklight
 
-// local require that in turn calls a require
-//= require blacklight_gallery
+//= require blacklight_gallery/default
+//= require blacklight_gallery/osd_viewer
+
+// require openseadragon
+//= require openseadragon/openseadragon
+//= require openseadragon/rails
 
-//= require openseadragon
 //= require hyrax
 //= require almond
 
 // Bulkrax
 //= require bulkrax/application
-//= require browse_everything
 
 //= require spot/editor/multi_auth_controlled_vocabulary
+//= require spot/hyrax_overrides
 //= require language-tagged-autocomplete-setup
 //= require multi-auth-input
 //= require workflow-action-form-validation
diff --git a/app/assets/javascripts/blacklight_gallery.js b/app/assets/javascripts/blacklight_gallery.js
deleted file mode 100644
index 992a7d4df..000000000
--- a/app/assets/javascripts/blacklight_gallery.js
+++ /dev/null
@@ -1 +0,0 @@
-//= require blacklight_gallery/default
\ No newline at end of file
diff --git a/app/assets/javascripts/openseadragon.js b/app/assets/javascripts/openseadragon.js
deleted file mode 100644
index 2ab91a9f1..000000000
--- a/app/assets/javascripts/openseadragon.js
+++ /dev/null
@@ -1,2 +0,0 @@
-//= require openseadragon/openseadragon
-//= require openseadragon/rails
\ No newline at end of file
diff --git a/app/assets/javascripts/spot/hyrax_overrides.js b/app/assets/javascripts/spot/hyrax_overrides.js
new file mode 100644
index 000000000..2b1d42a3d
--- /dev/null
+++ b/app/assets/javascripts/spot/hyrax_overrides.js
@@ -0,0 +1,13 @@
+// This file is for overriding defaul hyrax js behavior.
+
+$(document).ready(() => {
+  if ($('#permissions_error_text').text() === '') {
+    $('#permissions_error').attr('hidden', '');
+  }
+
+  $('#file-upload-cancel-btn').attr('hidden', '');
+  
+  $('#fileupload').on('fileuploadstop', () => {
+    $('#file-upload-cancel-btn').attr('hidden', '');
+  })
+});
\ No newline at end of file
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 5e6f25936..e35bc7138 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -15,8 +15,8 @@
 //
 //= require hyrax
 //= require openseadragon
-//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
-//= require 'bulkrax/application'
+//= require dataTables.bootstrap4
+//= require bulkrax/application
 //
 //= require spot
 //= require_self
@@ -27,29 +27,13 @@
   background: #fff image-url("spinner-24.gif") right center no-repeat;
 }
 
-.work-show dd {
-  margin-left: 0;
-}
-
-.work-representative-media {
-  margin-bottom: 1rem;
-  margin-top: 1rem;
-}
-
-.attribute-identifier-with-label {
-  margin-bottom: 0.5rem;
-  margin-top: 0.5rem;
-}
-
-// undoing `max-width: 40em` that hydra-editor sets;
-// scss-lint:disable SelectorFormat
-.multi_value .listing,
-.controlled_vocabulary .listing {
-  max-width: 100%;
-}
-// scss-lint:enable SelectorFormat
-
 .full-text-excerpt {
   font-size: 1.4rem;
   font-style: italic;
 }
+
+// fix for the dashboard Admin Sets subheading, which is just kinda smushed in there
+.main-content #admin_sets .card-subtitle {
+  margin-top: 0.5rem;
+  margin-bottom: 0.5rem;
+}
diff --git a/app/assets/stylesheets/hyrax.scss b/app/assets/stylesheets/hyrax.scss
index 2baaa74e2..bfec41942 100644
--- a/app/assets/stylesheets/hyrax.scss
+++ b/app/assets/stylesheets/hyrax.scss
@@ -1,14 +1,13 @@
 // our own overrides are called _before_ we import hyrax/bootstrap
 @import "spot/variables";
 
-@import "bootstrap-compass";
-@import "bootstrap-sprockets";
+// @import "bootstrap-compass";
 @import "bootstrap-default-overrides";
 @import 'bootstrap';
 @import 'blacklight/blacklight';
 @import "font-awesome";
-@import "blacklight_gallery/gallery";
 @import "blacklight_gallery/masonry";
 @import "blacklight_gallery/slideshow";
 @import "blacklight_gallery/osd_viewer";
+@import "hyrax/blacklight_gallery";
 @import 'hyrax/hyrax';
diff --git a/app/assets/stylesheets/spot.scss b/app/assets/stylesheets/spot.scss
index 7d6e538b3..64508a35c 100644
--- a/app/assets/stylesheets/spot.scss
+++ b/app/assets/stylesheets/spot.scss
@@ -1,140 +1,6 @@
 @import "spot/variables";
-@import "spot/navbar";
+@import "spot/global";
 @import "spot/homepage";
-@import "spot/multi-auth-controlled-vocab";
-@import "spot/audio";
-
-.rights-statement-icon {
-  max-width: 120px;
-}
-
-.panel-heading-slim {
-  padding: 4px 15px;
-  padding-left: 8px; // TODO: this is a magic number; what's the value in bootstrap?
-
-  h5,
-  h6 {
-    margin-bottom: 0;
-    margin-top: 0;
-  }
-}
-
-.splash-image {
-  margin: 0.5em auto;
-}
-
-[role="main"] {
-  margin-top: 1rem;
-  padding-bottom: 10rem;
-}
-
-.dashboard > [role="main"] {
-  margin-top: 0;
-}
-
-.thumbnail.file-set {
-  margin: auto;
-  max-width: 250px;
-}
-
-.ldr-logo img {
-  height: 50px;
-}
-
-// bootstrap is very specific in targeting table cells,
-// so we also need to be that specific to override
-.metadata-table > tbody > tr {
-  > td,
-  > th {
-    vertical-align: middle;
-  }
-}
-
-// collection overrides
-.hyc-banner {
-  min-height: 200px;
-
-  .hyc-title {
-    background-color: $red-light;
-    border-bottom-left-radius: inherit;
-    border-top-right-radius: inherit;
-    bottom: 0;
-    position: absolute;
-  }
-}
-
-.collection-list-item {
-  .thumbnail img {
-    height: 200px;
-  }
-}
-
-// give some breathing room to collection items w/ thumbnails in search results
-.search-result-wrapper {
-  padding-bottom: 1rem;
-}
-
-.site-footer {
-  background-color: $tan-light;
-  height: 20rem;
-}
-
-// duplicating styles from #facet-panel-collapse
-// otherwise the panel will not display
-#admin-facet-panel-collapse {
-  display: block !important;
-  height: auto !important;
-  overflow: visible !important;
-  padding-bottom: 0;
-}
-
-select[multiple] {
-  min-height: 15rem;
-}
-
-// styling the iiif viewer iframe to fill the space
-.viewer-wrapper iframe {
-  height: 100%;
-  width: 100%;
-}
-
-.collection-list-item {
-  .collection-logo-container {
-    background-position: center center;
-    background-repeat: no-repeat;
-    background-size: contain;
-    height: 300px;
-    margin: 1em;
-  }
-
-  .thumbnail .caption {
-    min-height: 2em;
-  }
-
-  .collection-counts-wrapper {
-    margin: 1em auto;
-  }
-
-  .collection-counts-item {
-    background-color: #f5f5f5;
-    color: #666;
-    display: inline-block;
-    font-size: 13px;
-    font-weight: bold;
-    margin-left: 10px;
-    padding: 8px;
-    text-align: center;
-    width: 100%;
-
-    &:first-child {
-      margin-left: 0;
-    }
-
-    span {
-      display: block;
-      font-size: 18px;
-      font-weight: normal;
-      line-height: 1;
-    }
-  }
-}
+@import "spot/works";
+@import "spot/collections";
+@import "spot/forms";
\ No newline at end of file
diff --git a/app/assets/stylesheets/spot/_audio.scss b/app/assets/stylesheets/spot/_audio.scss
deleted file mode 100644
index c2b8c4a0e..000000000
--- a/app/assets/stylesheets/spot/_audio.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-.play-list {
-  .play-list-row {
-    .track-title {
-      .playlist-track {
-        &:hover {
-          text-decoration: underline;
-        }
-        color: #000;
-        text-decoration: none;
-      }
-    }
-    .track-title {
-      .playlist-track {
-        text-decoration: none;
-        &:hover {
-          text-decoration: underline;
-        }
-      }
-    }
-    .track-title.active-track {
-      font-weight: bold;
-    }
-  }
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/spot/_collections.scss b/app/assets/stylesheets/spot/_collections.scss
new file mode 100644
index 000000000..4219bc373
--- /dev/null
+++ b/app/assets/stylesheets/spot/_collections.scss
@@ -0,0 +1,82 @@
+///
+// Collection overrides
+///
+.hyc-banner {
+  min-height: 200px;
+
+  .hyc-title {
+    background-color: $red-light;
+    border-bottom-left-radius: inherit;
+    border-top-right-radius: inherit;
+    bottom: 0;
+    position: absolute;
+  }
+}
+
+.collection-list-item .thumbnail img {
+  height: 200px;
+}
+
+// give some breathing room to collection items w/ thumbnails in search results
+.search-result-wrapper {
+  padding-bottom: 1rem;
+}
+
+// duplicating styles from #facet-panel-collapse
+// otherwise the panel will not display
+#admin-facet-panel-collapse {
+  display: block !important;
+  height: auto !important;
+  overflow: visible !important;
+  padding-bottom: 0;
+}
+
+#accordion .card {
+  margin-bottom: .5rem;
+}
+
+.collection-list-item {
+  .collection-logo-container {
+    background-position: center center;
+    background-repeat: no-repeat;
+    background-size: contain;
+    height: 300px;
+    margin: 1em;
+  }
+
+  .card .card-body {
+    text-align: center;
+
+    .card-title {
+      min-height: 2em;
+      font-size: 24px;
+    }
+  }
+
+  .collection-counts-wrapper {
+    margin: 1em auto;
+  }
+
+  .collection-counts-item {
+    background-color: #f5f5f5;
+    color: #666;
+    display: inline-block;
+    font-size: 13px;
+    font-weight: bold;
+    margin-left: 10px;
+    padding: 8px;
+    text-align: center;
+    width: 100%;
+
+    &:first-child {
+      margin-left: 0;
+    }
+
+    span {
+      display: block;
+      font-size: 18px;
+      font-weight: normal;
+      line-height: 1;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/spot/_forms.scss b/app/assets/stylesheets/spot/_forms.scss
new file mode 100644
index 000000000..68452fcdf
--- /dev/null
+++ b/app/assets/stylesheets/spot/_forms.scss
@@ -0,0 +1,94 @@
+///
+// Form-related stylings
+///
+select[multiple] {
+  min-height: 15rem;
+}
+
+// these are adjustments we need to make to the multi-authority controlled vocabulary
+// inputs so that they resemble their '.multi_value' or '.controlled_vocabulary' siblings.
+.multi_auth_controlled_vocabulary {
+  .listing {
+    margin-bottom: 0;
+    margin-left: 0;
+    max-width: 100%;
+    padding-left: 0;
+  }
+
+  .btn {
+    &.add {
+      padding-left: 0;
+    }
+
+    &.remove {
+      color: #d33a35;
+    }
+
+    &.add,
+    &.remove {
+      text-decoration: underline;
+    }
+  }
+
+  .add .glyphicon-plus,
+  .remove .glyphicon-remove {
+    margin-right: 0.3rem;
+  }
+}
+
+// undoing `max-width: 40em` that hydra-editor sets;
+// scss-lint:disable SelectorFormat
+.multi_value .listing,
+.controlled_vocabulary .listing {
+  max-width: 100%;
+}
+// scss-lint:enable SelectorFormat
+
+.multi_value .listing li:first-of-type { 
+  width: 84%;
+}
+
+.multi_value{
+  &.language_tagged .listing li:first-of-type { 
+    width: 100%;
+  }
+}
+
+.control-label {
+  .required-tag {
+    vertical-align: baseline;
+  }
+}
+
+.language_tagged li.field-wrapper .row {
+  width: 84%;
+}
+
+.language_tagged .row .col-sm-2 {
+  padding-left: 0px;
+}
+
+.language_tagged li.field-wrapper .row .col-sm-2 {
+  padding-left: 0px;
+  padding-right: 0px;
+}
+
+.table caption {
+  caption-side: top;
+}
+
+.controlled_vocabulary .listing li .remove {
+  display: inline-block;
+}
+
+.controlled_vocabulary .listing li:first-of-type .remove {
+  display: none;
+}
+
+.multi_auth_controlled_vocabulary .listing li:first-of-type .remove {
+  display: none;
+}
+
+.controlled_vocabulary .listing li:first-of-type {
+  width: 84%;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/spot/_global.scss b/app/assets/stylesheets/spot/_global.scss
new file mode 100644
index 000000000..9b15a29db
--- /dev/null
+++ b/app/assets/stylesheets/spot/_global.scss
@@ -0,0 +1,73 @@
+///
+// global site overrides
+///
+
+// flip Bootstrap's defaults back to not underlining links unless hovered.
+a {
+  text-decoration: none;
+
+  &:hover { text-decoration: underline; }
+}
+
+// padding-bottom gives us plenty of spacing to prevent the
+// footer from displaying on top of any page content.
+#content-wrapper {
+  margin-top: 2rem;
+  padding-bottom: 10rem !important;
+}
+
+// adjust content-wrapper margin specifically for the dashboard views
+body.dashboard {
+  #content-wrapper {
+    margin-top: -4px;
+  }
+}
+
+///
+// masthead / navbar stylings
+///
+
+#masthead { // scss-lint:disable IdSelector
+  background-color: $red-light;
+  border-bottom: 0;
+  padding: 0.06rem 0.25rem;
+
+  @media(min-width: 768px) {
+    #search-field-header { // scss-lint:disable IdSelector
+      width: 50rem;
+    }
+  }
+}
+
+#user_utility_links a.nav-link {
+  color: $white;
+}
+
+.ldr-logo {
+  margin-left: 0.5rem;
+
+  img {
+    height: 50px;
+  }
+}
+
+///
+//  Footer bits and bobs
+///
+.site-footer {
+  background-color: $tan-light;
+  font-size: 0.85rem;
+  min-height: 180px;
+}
+
+
+///
+// Bootstrap overrides (should these be in a separate file?)
+///
+a.badge {
+  text-decoration: none;
+}
+
+.facets .card {
+  margin-bottom: 5px;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/spot/_homepage.scss b/app/assets/stylesheets/spot/_homepage.scss
index 3e7d25779..b13937810 100644
--- a/app/assets/stylesheets/spot/_homepage.scss
+++ b/app/assets/stylesheets/spot/_homepage.scss
@@ -1,10 +1,15 @@
+///
+//  Styles related to the homepage pieces
+///
+
 $featured-info-bg-color: rgba(0, 0, 0, 0.7);
 $featured-info-text-color: $white;
 
 .welcome-splash {
   background-position: top center;
   background-size: cover;
-  min-height: 50rem;
+  min-height: 32rem;
+  padding-bottom: 4rem;
   position: relative;
 }
 
@@ -12,8 +17,8 @@ $featured-info-text-color: $white;
   background-color: $featured-info-bg-color;
   bottom: 0;
   color: $featured-info-text-color;
-  margin: 4rem;
-  padding: 2rem;
+  margin: 3rem;
+  padding: 1rem;
   position: absolute;
   right: 0;
 
@@ -22,9 +27,13 @@ $featured-info-text-color: $white;
   }
 }
 
+.splash-image {
+  margin: 0.5em auto;
+}
+
 .featured-collection {
   background-size: cover;
-  min-height: 26rem;
+  min-height: 18rem;
   margin: 1rem 0;
   padding-top: 7rem;
   position: relative;
@@ -34,7 +43,7 @@ $featured-info-text-color: $white;
     bottom: 0;
     color: $featured-info-text-color;
     display: block;
-    font-size: 1.75rem;
+    font-size: 1.25rem;
     left: 0;
     margin-top: 0;
     padding: 1rem;
@@ -43,7 +52,7 @@ $featured-info-text-color: $white;
   }
 
   .collection-title {
-    font-size: 3rem;
+    font-size: 2rem;
     font-weight: normal;
     margin: 0.5rem 0;
   }
@@ -66,7 +75,7 @@ $featured-info-text-color: $white;
     background-color: $featured-info-bg-color;
     bottom: 0;
     color: $featured-info-text-color;
-    font-size: 1.5rem;
+    font-size: 1rem;
     height: 33%;
     overflow: hidden;
     padding: 0.5rem;
diff --git a/app/assets/stylesheets/spot/_multi-auth-controlled-vocab.scss b/app/assets/stylesheets/spot/_multi-auth-controlled-vocab.scss
deleted file mode 100644
index 759026c8a..000000000
--- a/app/assets/stylesheets/spot/_multi-auth-controlled-vocab.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-// these are adjustments we need to make to the multi-authority controlled vocabulary
-// inputs so that they resemble their '.multi_value' or '.controlled_vocabulary' siblings.
-.multi_auth_controlled_vocabulary {
-  .listing {
-    margin-bottom: 0;
-    margin-left: 0;
-    max-width: 100%;
-    padding-left: 0;
-  }
-
-  .btn {
-    &.add {
-      padding-left: 0;
-    }
-
-    &.remove {
-      color: #d33a35;
-    }
-
-    &.add,
-    &.remove {
-      text-decoration: underline;
-    }
-  }
-
-  .add .glyphicon-plus,
-  .remove .glyphicon-remove {
-    margin-right: 0.3rem;
-  }
-}
diff --git a/app/assets/stylesheets/spot/_navbar.scss b/app/assets/stylesheets/spot/_navbar.scss
deleted file mode 100644
index 843bc9999..000000000
--- a/app/assets/stylesheets/spot/_navbar.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-// styles applied to the navbar + masthead
-
-#masthead { // scss-lint:disable IdSelector
-  background-color: $red-light;
-  border-bottom: 0;
-
-  @media(min-width: 768px) {
-    #search-field-header { // scss-lint:disable IdSelector
-      width: 50rem;
-    }
-  }
-}
diff --git a/app/assets/stylesheets/spot/_variables.scss b/app/assets/stylesheets/spot/_variables.scss
index 8f202a4a1..9efaa8f4a 100644
--- a/app/assets/stylesheets/spot/_variables.scss
+++ b/app/assets/stylesheets/spot/_variables.scss
@@ -13,5 +13,7 @@ $black: #1e1e1e;
 // bootstrap overrides
 ////
 
+$font-size-base: .9rem;
+
 // navbar / masthead
-$navbar-inverse-link-color: $white;
+$navbar-inverse-link-color: #666;
diff --git a/app/assets/stylesheets/spot/_works.scss b/app/assets/stylesheets/spot/_works.scss
new file mode 100644
index 000000000..2af6ae27c
--- /dev/null
+++ b/app/assets/stylesheets/spot/_works.scss
@@ -0,0 +1,105 @@
+///
+//  Work-Show views
+//  - global metadata for work views
+//  - iiif viewer
+//  - a/v playlists
+
+//
+.tab-content .form-group label {
+  font-weight: bolder;
+}
+
+.panel-heading-slim {
+  padding: 4px 15px;
+  padding-left: 8px; // TODO: this is a magic number; what's the value in bootstrap?
+
+  h5,
+  h6 {
+    margin-bottom: 0;
+    margin-top: 0;
+  }
+}
+
+.rights-statement-icon {
+  max-width: 120px;
+}
+
+.thumbnail.file-set {
+  margin: auto;
+  max-width: 250px;
+}
+
+.thumbnail.file-set.image {
+  width: 100%;
+  height: auto;
+}
+
+.thumbnail.collection-thumb img {
+  max-width: 100%;
+  height: auto;
+  object-fit: contain
+}
+
+// bootstrap is very specific in targeting table cells,
+// so we also need to be that specific to override
+.metadata-table > tbody > tr {
+  > td,
+  > th {
+    vertical-align: middle;
+  }
+}
+
+.work-show dd {
+  margin-left: 0;
+}
+
+.work-representative-media {
+  margin-bottom: 1rem;
+  margin-top: 1rem;
+}
+
+.attribute-identifier-with-label {
+  margin-bottom: 0.5rem;
+  margin-top: 0.5rem;
+}
+
+// styling badges to default to the right on activity-log
+.activity-log {
+  float: right;
+}
+
+///
+// styling the iiif viewer iframe to fill the space
+///
+.viewer-wrapper iframe {
+  height: 100%;
+  width: 100%;
+}
+
+///
+//  a/v playlists
+///
+.play-list {
+  .play-list-row {
+    .track-title {
+      .playlist-track {
+        &:hover {
+          text-decoration: underline;
+        }
+        color: #000;
+        text-decoration: none;
+      }
+    }
+    .track-title {
+      .playlist-track {
+        text-decoration: none;
+        &:hover {
+          text-decoration: underline;
+        }
+      }
+    }
+    .track-title.active-track {
+      font-weight: bold;
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/components/spot/visibility_facet_item_component.rb b/app/components/spot/visibility_facet_item_component.rb
new file mode 100644
index 000000000..7b404fd56
--- /dev/null
+++ b/app/components/spot/visibility_facet_item_component.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+module Spot
+  # Custom ItemComponent for Visibility facets. We want to display the PermissionBadge
+  # for each possibility as opposed to the plain-text value. This was previously accomplished
+  # using a helper method, but wrapping a span badge inside a hyperlink in Bootstrap 4
+  # cuts off the text with a negative indentation. So instead we'll render an unwrapped link.
+  #
+  # @see app/presenters/spot/permission_badge.rb
+  class VisibilityFacetItemComponent < Blacklight::FacetItemComponent
+    def render_facet_value
+      link_to_unless(@suppress_link,
+                     permission_badge.visibility_label,
+                     href,
+                     class: "facet-select badge #{permission_badge.badge_class} px-2 py-1",
+                     rel: 'nofollow') + render_facet_count
+    end
+
+    private
+
+    def permission_badge
+      Spot::PermissionBadge.new(label)
+    end
+  end
+end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index fa502e1f0..4ff144044 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -13,16 +13,13 @@ class ApplicationController < ActionController::Base
 
   before_action :store_user_location!, if: :storable_location?
 
-  # from Blacklight: 'Discarding flash messages on XHR requests is deprecated.'
-  skip_after_action :discard_flash_if_xhr
-
   protect_from_forgery with: :exception
 
-  # @return [Hash]
-  # @todo remove this when supporting multiple locales
-  def default_url_options
-    super.reject { |k, _v| k == :locale }
-  end
+  # # @return [Hash]
+  # # @todo remove this when supporting multiple locales
+  # def default_url_options
+  #   super.reject { |k, _v| k == :locale }
+  # end
 
   # Borrowed from pul's figgy app. Restricts our guests to a single entry
   # in the database, preventing hundreds of fake user accounts from being
diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
index e2ea41762..de44e965b 100644
--- a/app/controllers/catalog_controller.rb
+++ b/app/controllers/catalog_controller.rb
@@ -11,9 +11,12 @@ class CatalogController < ApplicationController
   include Hydra::Controller::ControllerBehavior
 
   # This filter applies the hydra access controls
+  # @todo is this doing anything? we're not using Blacklight/CatalogController for :show views...
   before_action :enforce_show_permissions, only: :show
 
   configure_blacklight do |config|
+    config.http_method = :post
+
     # default advanced config values
     config.advanced_search ||= Blacklight::OpenStructWithHashAccess.new
     # config.advanced_search[:qt] ||= 'advanced'
@@ -49,31 +52,21 @@ class CatalogController < ApplicationController
     config.index.display_type_field = 'has_model_ssim'
     config.index.thumbnail_field = 'thumbnail_path_ss'
 
-    # solr fields that will be treated as facets by the blacklight application
-    #   The ordering of the field names is the order of the display
+    # Field configuration for Facets.
     #
-    # @note: when defining a field (facet, index, show, search), define the
-    #        +:label+ option as a Symbol that refers to the field _without_
-    #        the "solr jargon" (ex. "_tesim", "_ssim", etc) suffix. it _needs_
-    #        to be a Symbol in order for +I18n.translate+ to use it as
-    #        a fall-back when the lookup with the "solr jargon" ultimately fails.
-    #        this will save us from having to provide multiple locale definitions
-    #        for each attribute.
     #
-    #        @example
-    #          config.add_index_field('keyword_ssim', label: :'blacklight.search.fields.keyword')
-
-    config.add_facet_field 'member_of_collections_ssim', label: :'blacklight.search.fields.member_of_collection'
-    config.add_facet_field 'resource_type_sim',          label: :'blacklight.search.fields.resource_type'
-    config.add_facet_field 'creator_sim',                label: :'blacklight.search.fields.creator'
-    config.add_facet_field 'publisher_sim',              label: :'blacklight.search.fields.publisher'
-    config.add_facet_field 'division_sim',               label: :'blacklight.search.fields.division'
-    config.add_facet_field 'academic_department_sim',    label: :'blacklight.search.fields.academic_department'
-    config.add_facet_field 'advisor_label_ssim',         label: :'blacklight.search.fields.advisor_label'
-    config.add_facet_field 'subject_label_sim',          label: :'blacklight.search.fields.subject'
-    config.add_facet_field 'keyword_sim',                label: :'blacklight.search.fields.keyword'
-    config.add_facet_field 'language_label_ssim',        label: :'blacklight.search.fields.language'
-    config.add_facet_field 'location_label_sim',         label: :'blacklight.search.fields.location'
+    #
+    config.add_facet_field 'member_of_collection_ids_ssim', helper_method: :collection_title_by_id
+    config.add_facet_field 'resource_type_sim'
+    config.add_facet_field 'creator_sim'
+    config.add_facet_field 'publisher_sim'
+    config.add_facet_field 'division_sim'
+    config.add_facet_field 'academic_department_sim'
+    config.add_facet_field 'advisor_label_ssim'
+    config.add_facet_field 'subject_label_sim'
+    config.add_facet_field 'keyword_sim'
+    config.add_facet_field 'language_label_ssim'
+    config.add_facet_field 'location_label_sim'
     config.add_facet_field 'years_encompassed_iim',
                            include_in_advanced_search: false,
                            label: :'blacklight.search.fields.years_encompassed',
@@ -86,11 +79,16 @@ class CatalogController < ApplicationController
     #
     config.add_facet_field 'visibility_ssi',
                            label: :'blacklight.search.fields.visibility',
-                           helper_method: :render_catalog_visibility_facet,
-                           admin: true
-    config.add_facet_field 'depositor_ssim', label: :'blacklight.search.fields.depositor', admin: true
-    config.add_facet_field 'proxy_depositor_ssim', label: :'blacklight.search.fields.proxy_depositor', admin: true
-    config.add_facet_field 'admin_set_sim', label: :'blacklight.search.fields.admin_set', admin: true
+                           item_component: Spot::VisibilityFacetItemComponent,
+                           group: :admin
+    config.add_facet_field 'depositor_ssim', label: :'blacklight.search.fields.depositor', group: :admin
+    config.add_facet_field 'proxy_depositor_ssim', label: :'blacklight.search.fields.proxy_depositor', group: :admin
+    config.add_facet_field 'admin_set_sim', label: :'blacklight.search.fields.admin_set', group: :admin
+
+    #
+    # By configuring these fields with `if: false`, we're hiding facets from the sidebar
+    # but allowing them to be used within Works show pages (ex. "Research Assistance" and "Organization" fields)
+    #
 
     # The generic_type isn't displayed on the facet list
     # It's used to give a label to the filter that comes from the user profile
@@ -103,8 +101,10 @@ class CatalogController < ApplicationController
     config.add_facet_field 'research_assistance_ssim', label: :'blacklight.search.fields.research_assistance', if: false
     config.add_facet_field 'organization_sim', label: :'blacklight.search.fields.organization', if: false
 
+    #
     # Blacklight will default a facet's limit to the +blacklight_config.default_facet_limit+ value
     # only if the field config +:limit+ entry is true. This does that.
+    #
     config.facet_fields.each { |(_key, val)| val[:limit] = true }
 
     # Have BL send all facet field names to Solr, which has been the default
diff --git a/app/controllers/concerns/spot/additional_formats_for_controller.rb b/app/controllers/concerns/spot/additional_formats_for_controller.rb
index 25f3ccfea..ca2ef684e 100644
--- a/app/controllers/concerns/spot/additional_formats_for_controller.rb
+++ b/app/controllers/concerns/spot/additional_formats_for_controller.rb
@@ -22,7 +22,7 @@ def csv_filename
 
     # @return [String]
     def work_as_csv
-      Spot::WorkCSVService.new(presenter.solr_document).csv
+      Spot::WorkCsvService.new(presenter.solr_document).csv
     end
   end
 end
diff --git a/app/controllers/concerns/spot/hyrax_dashboard_controller_decorator.rb b/app/controllers/concerns/spot/hyrax_dashboard_controller_decorator.rb
new file mode 100644
index 000000000..882b9bc7e
--- /dev/null
+++ b/app/controllers/concerns/spot/hyrax_dashboard_controller_decorator.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+module Spot
+  # Changing the Hyrax behavior slightly to only display a dashboard
+  # if a user has been assigned to the 'depositor' role.
+  #
+  # @see config/initializers/spot_overrides.rb
+  # @see https://github.com/samvera/hyrax/blob/hyrax-v5.2.0/app/controllers/hyrax/dashboard_controller.rb
+  module HyraxDashboardControllerDecorator
+    extend ActiveSupport::Concern
+
+    prepended do
+      class_attribute :create_work_presenter_class, default: Hyrax::SelectTypeListPresenter
+
+      sidebar_partials[:activity] << 'hyrax/dashboard/sidebar/fixity_checks'
+    end
+
+    def show
+      if can? :read, :admin_dashboard
+        @presenter = Hyrax::Admin::DashboardPresenter.new
+        @admin_set_rows = Hyrax::AdminSetService.new(self).search_results_with_work_count(:read)
+        render 'show_admin'
+
+      # @see {Ability#depositor_abilities}
+      elsif can? :read, :dashboard
+        @presenter = Hyrax::Dashboard::UserPresenter.new(current_user, view_context, params[:since])
+        @create_work_presenter = create_work_presenter_class.new(current_user)
+        render 'show_user'
+      else
+        redirect_to root_path
+      end
+    end
+  end
+end
diff --git a/app/controllers/concerns/spot/works_controller_behavior.rb b/app/controllers/concerns/spot/works_controller_behavior.rb
index 1b8571f24..f12e097a5 100644
--- a/app/controllers/concerns/spot/works_controller_behavior.rb
+++ b/app/controllers/concerns/spot/works_controller_behavior.rb
@@ -26,7 +26,7 @@ module WorksControllerBehavior
     #
     # @return [Spot::IiifManifestPresenter]
     def iiif_manifest_presenter
-      ::Spot::IiifManifestPresenter.new(curation_concern_from_search_results).tap do |p|
+      ::Spot::IiifManifestPresenter.new(search_result_document(id: params[:id], defType: 'lucene')).tap do |p|
         p.hostname = request.hostname
         p.ability = current_ability
       end
diff --git a/app/controllers/handle_controller.rb b/app/controllers/handle_controller.rb
index e43aca06a..b42390ce0 100644
--- a/app/controllers/handle_controller.rb
+++ b/app/controllers/handle_controller.rb
@@ -9,12 +9,11 @@ class HandleController < ApplicationController
   # Displays a 404 (via raised +Blacklight::Exceptions::RecordNotFound+
   # that is handled with +Hydra::Catalog+) if no item is found.
   def show
-    query = query_for_identifier(Spot::Identifier.new('hdl', params[:id]))
-    result, _documents = repository.search(query)
-
-    raise Blacklight::Exceptions::RecordNotFound if result.response['numFound'].zero?
-    document = result.response['docs'].first
+    query_opts = query_for_identifier(Spot::Identifier.new('hdl', params[:id]))
+    service = Hyrax::SolrQueryService.new(query: [query_opts.delete(:q)])
+    document = service.get(**query_opts)['response']['docs'].first
 
+    raise Blacklight::Exceptions::RecordNotFound if document.nil?
     redirect_to redirect_params_for(solr_document: document)
   end
 
@@ -32,7 +31,6 @@ def identifier_solr_field
   # @param id [Spot::Identifier, #to_s] the identifier (with prefix)
   # @return [Hash<Symbol => String>]
   def query_for_identifier(id)
-    { q: "{!terms f=#{identifier_solr_field}}#{id}",
-      defType: 'lucene' }
+    { q: "{!terms f=identifier_ssim}#{id}", defType: 'lucene' }
   end
 end
diff --git a/app/controllers/hyrax/dashboard_controller.rb b/app/controllers/hyrax/dashboard_controller.rb
deleted file mode 100644
index 46ea0d914..000000000
--- a/app/controllers/hyrax/dashboard_controller.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-module Hyrax
-  # Changing the Hyrax behavior slightly to _not_ display a dashboard
-  # if a user has not been assigned to the 'depositor' role.
-  #
-  # NOTE: when migrating to Hyrax@3, be sure to uncomment the definition
-  # of the +:sidebar_partials+ class attribute below!
-  class DashboardController < ApplicationController
-    include Blacklight::Base
-    include Hyrax::Breadcrumbs
-    with_themed_layout 'dashboard'
-    before_action :authenticate_user!
-    before_action :build_breadcrumbs, only: [:show]
-    before_action :set_date_range
-
-    class_attribute :create_work_presenter_class
-    self.create_work_presenter_class = Hyrax::SelectTypeListPresenter
-
-    ##
-    # @!attribute [rw] sidebar_partials
-    #   @return [Hash]
-    #
-    # @example Add a custom partial to the tasks sidebar block
-    #   Hyrax::DashboardController.sidebar_partials[:tasks] << "hyrax/dashboard/sidebar/custom_task"
-    class_attribute :sidebar_partials
-    self.sidebar_partials = { activity: [], configuration: [], repository_content: [], tasks: [] }
-
-    def show
-      if can? :read, :admin_dashboard
-        @presenter = Hyrax::Admin::DashboardPresenter.new
-        @admin_set_rows = Hyrax::AdminSetService.new(self).search_results_with_work_count(:read)
-        render 'show_admin'
-
-      # @see {Ability#depositor_abilities}
-      elsif can? :read, :dashboard
-        @presenter = Dashboard::UserPresenter.new(current_user, view_context, params[:since])
-        @create_work_presenter = create_work_presenter_class.new(current_user)
-        render 'show_user'
-      else
-        redirect_to root_path
-      end
-    end
-
-    private
-
-    def set_date_range
-      @start_date = params[:start_date] || Time.zone.today - 1.month
-      @end_date = params[:end_date] || Time.zone.today + 1.day
-    end
-  end
-end
diff --git a/app/controllers/spot/redirect_controller.rb b/app/controllers/spot/redirect_controller.rb
index 08c293ed9..d70c17005 100644
--- a/app/controllers/spot/redirect_controller.rb
+++ b/app/controllers/spot/redirect_controller.rb
@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require 'uri'
-
 module Spot
   # Controller responsible for redirecting requests from legacy services
   # (in particular, our Islandora instance) to their migrated counterparts.
@@ -28,9 +26,8 @@ def show
     private
 
     def document_params
-      # The only fields we'll need to generate a URL (or url_helper params) is are id and has_model_ssim.
-      result, _documents = repository.search(q: "{!terms f=identifier_ssim}url:#{http_uri}", fl: ['id', 'has_model_ssim'], defType: 'lucene')
-      document = result.response['docs']&.first
+      service = Hyrax::SolrQueryService.new(query: ["{!terms f=identifier_ssim}url:#{http_uri}"])
+      document = service.query_result(fl: ['id', 'has_model_ssim'], defType: 'lucene')['response']['docs'].first
 
       raise Blacklight::Exceptions::RecordNotFound if document.nil?
       redirect_params_for(solr_document: document)
diff --git a/app/factories/concerns/spot/bulkrax_object_factory_find_patch.rb b/app/factories/concerns/spot/bulkrax_object_factory_find_patch.rb
new file mode 100644
index 000000000..e80f08a61
--- /dev/null
+++ b/app/factories/concerns/spot/bulkrax_object_factory_find_patch.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+module Spot
+  # We made this patch because there are two places that the original ‘find’
+  # method in Bulkrax was failing to perform. First, Bulkrax will display a link
+  # to an imported work's record but the ObjectFactory appears to be searching
+  # for a work's 'source_identifier' as the object's ID. The second is that the ‘find’
+  # Method is what is used to match and object with a collection at ingest, also
+  # using 'source_identifier' as the object's ID. We believe that both of these
+  # problems arise from our setup being on Hyrax 3.6.0 and unvalkyrized, and
+  # that we can retire this patch once larger upgrades are made. This patch adds
+  # a new method, ‘find_by_source_identifier’, which is added to the front of the
+  # queue of methods to try in ‘find’. Notably, ‘find_by_source_identifier’ does not
+  # succeed when called during ingest to make the link, but for some reason truly
+  # unknown to us, if this method is called before ‘search_by_identifier’, that
+  # method then succeeds where it would typically fail. The order of those methods
+  # being switched does not produce the same result, both methods fail in that case.
+  # However, once the CreateRelationshipsJob stage is reached,
+  # ‘find_by_source_identifier’ always succeeds where ‘search_by_identifier’ always
+  # fails. Truly incomprehensible. Nonetheless, this order seems to fulfill all desired
+  # functions.
+  #
+  # @see config/initializers/spot_overrides.rb
+  module BulkraxObjectFactoryFindPatch
+    extend ActiveSupport::Concern
+
+    # We have to overwrite this behavior to add 'find_by_source_identifier'
+    # to the queue of methods to try.
+    #
+    # @see https://github.com/samvera/bulkrax/blob/v9.1.0/app/factories/bulkrax/object_factory_interface.rb#L317-L325
+    def find
+      find_by_source_identifier || find_by_id || search_by_identifier || nil
+    end
+
+    def find_by_source_identifier
+      return unless attributes.key?('source_identifier') && attributes['source_identifier'].present?
+      identifier = Array.wrap(attributes['source_identifier']).first
+      id_doc = Hyrax::SolrService.get("source_identifier_ssim:#{identifier}", fl: ['id', 'source_identifier_ssim'], defType: 'lucene')
+      id_doc = id_doc.try(:[], 'response').try(:[], 'docs')&.first
+      return nil if id_doc.nil? || id_doc.try(:[], 'id').nil?
+
+      ActiveFedora::Base.find(id_doc['id'])
+    end
+
+    # We have to implement these for testing purposes.
+    # :nocov:
+    def find_by_id
+      super
+    end
+
+    def search_by_identifier
+      super
+    end
+    # :nocov:
+  end
+end
diff --git a/app/forms/hyrax/student_work_form.rb b/app/forms/hyrax/student_work_form.rb
index 8a0cdff57..92b2976aa 100644
--- a/app/forms/hyrax/student_work_form.rb
+++ b/app/forms/hyrax/student_work_form.rb
@@ -96,7 +96,10 @@ def model_attributes(_form_params)
       def admin_set_id
         Spot::StudentWorkAdminSetCreateService.find_or_create_student_work_admin_set_id
       rescue Ldp::Gone, Hyrax::ObjectNotFoundError
-        AdminSet.find_or_create_default_admin_set_id
+        # :nocov:
+        # test directly interfacing with this case mysteriously does not convey coverage
+        Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id
+        # :nocov:
       end
     end
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d6e957ac4..2b13fd332 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require 'hyrax/version'
+
 module ApplicationHelper
   delegate :advanced_search_path, to: :blacklight_advanced_search_engine
 
@@ -14,6 +16,10 @@ def extracted_text_highlight_values_for(document)
     document.highlight_field('extracted_text_tsimv').reject(&:blank?)
   end
 
+  def hyrax_footer_text
+    "Powered by Hyrax (v#{Hyrax::VERSION})"
+  end
+
   # rubocop:disable Style/ClassVars
   # @return [String, nil]
   def site_last_updated
@@ -23,9 +29,9 @@ def site_last_updated
 
   # @api private
   def generate_site_last_updated
-    return if ENV['SPOT_BUILD_DATE'].blank?
-    Date.parse(ENV['SPOT_BUILD_DATE']).strftime('%B %d, %Y')
-  rescue
+    return '(in development)' if Rails.env.development? || ENV['SPOT_BUILD_DATE'].blank?
+    Date.parse(ENV['SPOT_BUILD_DATE'].to_s).strftime('%B %d, %Y')
+  rescue Date::Error
     ENV['SPOT_BUILD_DATE']
   end
 end
diff --git a/app/helpers/audio_visual_helper.rb b/app/helpers/audio_visual_helper.rb
index 2c7fb9cb6..acb673b91 100644
--- a/app/helpers/audio_visual_helper.rb
+++ b/app/helpers/audio_visual_helper.rb
@@ -56,6 +56,6 @@ def get_derivative_res(derivative)
   # @return the network path to the thumbnail
   # @param [FileSet] file_set of the video
   def transcript_path(file_set)
-    Hyrax::Engine.routes.url_helpers.download_path(file_set.id, file: 'transcript')
+    Hyrax::Engine.routes.url_helpers.download_path(id: file_set.id, file: 'transcript')
   end
 end
diff --git a/app/helpers/hyrax_helper.rb b/app/helpers/hyrax_helper.rb
index c5c6c14a6..784887b00 100644
--- a/app/helpers/hyrax_helper.rb
+++ b/app/helpers/hyrax_helper.rb
@@ -4,6 +4,15 @@ module HyraxHelper
   include Hyrax::BlacklightOverride
   include Hyrax::HyraxHelperBehavior
 
+  # We currently don't offer translations beyond those offered in Hyrax, so we'll default
+  # to English for now. This will hide a translation dropdown in the site's header.
+  #
+  # @see https://github.com/samvera/hyrax/blob/hyrax-v4.0.0/app/views/_user_util_links.html.erb
+  # @see https://github.com/samvera/hyrax/blob/hyrax-v4.0.0/app/helpers/hyrax/hyrax_helper_behavior.rb#L31-L43
+  def available_translations
+    { 'en' => 'English' }
+  end
+
   # @see https://github.com/samvera/hyrax/blob/v2.9.6/app/helpers/hyrax/title_helper.rb#L18-L22
   def default_page_title
     i18n_key = "spot.#{controller_name.underscore}"
diff --git a/app/helpers/spot/catalog_helper.rb b/app/helpers/spot/catalog_helper.rb
index 4ce97de76..2008fcb91 100644
--- a/app/helpers/spot/catalog_helper.rb
+++ b/app/helpers/spot/catalog_helper.rb
@@ -53,5 +53,12 @@ def i18n_key_for_document(document)
         'default_html' # not expecting to get here, but we should have a generic message just in case
       end
     end
+
+    def page_title_for_search_results
+      key = params[:page].present? ? 'spot.catalog.page_title_with_pagination' : 'spot.catalog.page_title'
+      I18n.t(key, query: params[:q] || '""',
+                  page: params[:page]&.to_i,
+                  name: application_name).html_safe
+    end
   end
 end
diff --git a/app/helpers/spot/facet_helper.rb b/app/helpers/spot/facet_helper.rb
deleted file mode 100644
index 9d0743013..000000000
--- a/app/helpers/spot/facet_helper.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-#
-# Helpers to split out facets useful to admins from the regular ("general") ones
-module Spot
-  module FacetHelper
-    # render only the admin facet partials
-    #
-    # @return [String]
-    def render_admin_facet_partials
-      render_facet_partials(admin_facet_names)
-    end
-
-    # Wraps our visibility facets in the Hyrax::PermissionBadge HTML
-    #
-    # @return [String]
-    def render_catalog_visibility_facet(visibility)
-      Hyrax::PermissionBadge.new(visibility).render
-    end
-
-    # render partials for the majority of our partials
-    #
-    # @return [String]
-    def render_general_facet_partials
-      render_facet_partials(general_facet_names)
-    end
-
-    # Returns only the facets where the option +:admin+ is truthy
-    #
-    # @return [Array<String>]
-    def admin_facet_names
-      @admin_facet_names ||=
-        blacklight_config.facet_fields.select { |_facet, opts| opts[:admin] }.values.map(&:field)
-    end
-
-    # Facet names whose configuration does not include a truthy +:admin+ value.
-    #
-    # @return [Array<String>]
-    def general_facet_names
-      facet_field_names - admin_facet_names
-    end
-
-    # @return [true, false]
-    def any_facets?
-      general_facets? || admin_facets?
-    end
-
-    # @return [true, false]
-    def general_facets?
-      has_facet_values?(general_facet_names)
-    end
-
-    # @return [true, false]
-    def admin_facets?
-      return false unless current_user&.admin?
-      return false if admin_facet_names.empty?
-
-      facets_from_request(admin_facet_names).any? { |facet| should_render_facet?(facet) }
-    end
-  end
-end
diff --git a/app/inputs/language_tagged_multi_input_group_input.rb b/app/inputs/language_tagged_multi_input_group_input.rb
index 15e583cbe..078022cde 100644
--- a/app/inputs/language_tagged_multi_input_group_input.rb
+++ b/app/inputs/language_tagged_multi_input_group_input.rb
@@ -22,6 +22,16 @@ def input_type
     'multi_value language_tagged'
   end
 
+  protected
+
+  def inner_wrapper
+    <<-HTML
+      <li class="field-wrapper">
+        #{yield}
+      </li>
+    HTML
+  end
+
   private
 
   # Explicitly state that this is a multi-value property, rather than
diff --git a/app/jobs/spot/repository_fixity_check_job.rb b/app/jobs/spot/repository_fixity_check_job.rb
index 7d94d349f..726553e4c 100644
--- a/app/jobs/spot/repository_fixity_check_job.rb
+++ b/app/jobs/spot/repository_fixity_check_job.rb
@@ -19,14 +19,13 @@ class RepositoryFixityCheckJob < ApplicationJob
 
     # @param [true, false] :force Ignore the 'max days between check' parameter
     def perform(force: false)
+      @count = 0
       opts = { async_jobs: false }
       opts[:max_days_between_fixity_checks] = -1 if force
 
-      @count = 0
-
       ::FileSet.find_each do |file_set|
         @count += 1
-        Hyrax::FileSetFixityCheckService.new(file_set, opts).fixity_check
+        Hyrax::FileSetFixityCheckService.new(file_set, **opts).fixity_check
       end
     end
 
diff --git a/app/models/ability.rb b/app/models/ability.rb
index f28f9d9b2..cf01b3b07 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -27,10 +27,18 @@ def self.preload_roles!
   # @return [void]
   def custom_permissions; end
 
+  # Added by Bulkrax generator
+  #
+  # @return [true, false]
+  # @see https://github.com/samvera/bulkrax/blob/v9.1.0/lib/generators/bulkrax/install_generator.rb#L58-L76
   def can_import_works?
     current_user.admin? || current_user.depositor?
   end
 
+  # Added by Bulkrax generator
+  #
+  # @return [true, false]
+  # @see https://github.com/samvera/bulkrax/blob/v9.1.0/lib/generators/bulkrax/install_generator.rb#L58-L76
   def can_export_works?
     current_user.admin? || current_user.depositor?
   end
diff --git a/app/models/audio_visual_resource.rb b/app/models/audio_visual_resource.rb
new file mode 100644
index 000000000..3cf3507f3
--- /dev/null
+++ b/app/models/audio_visual_resource.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+class AudioVisualResource < ::Hyrax::Work
+  include Hyrax::Schema(:base_metadata, schema_loader: Spot::SimpleSchemaLoader.new)
+  include Hyrax::Schema(:audio_visual_metadata, schema_loader: Spot::SimpleSchemaLoader.new)
+
+  attribute :stored_derivatives, Valkyrie::Types::String
+end
diff --git a/app/models/concerns/hyrax/file_set/derivatives.rb b/app/models/concerns/hyrax/file_set/derivatives.rb
new file mode 100644
index 000000000..ab275d2c3
--- /dev/null
+++ b/app/models/concerns/hyrax/file_set/derivatives.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+module Hyrax
+  class FileSet
+    module Derivatives
+      extend ActiveSupport::Concern
+
+      included do
+        # Custom override of the corresponding Hyrax file to revert Hydra::Derivatives.output_file_service
+        # to Hyrax::PersistDerivatives from Hyrax::ValkyriePersistDerivatives. The latter causes issues in
+        # the current repository. This change should be able to be undone once we're Valkyrized.
+        #
+        # See @https://github.com/samvera/hyrax/blob/main/app/models/concerns/hyrax/file_set/derivatives.rb
+        Hydra::Derivatives.source_file_service = Hyrax::LocalFileService
+        Hydra::Derivatives.output_file_service = Hyrax::PersistDerivatives
+        Hydra::Derivatives::FullTextExtract.output_file_service = Hyrax::PersistDirectlyContainedOutputFileService
+        before_destroy :cleanup_derivatives
+        # This completely overrides the version in Hydra::Works so that we
+        # read and write to a local file. It's important that characterization runs
+        # before derivatives so that we have a credible mime_type field to work with.
+        delegate :cleanup_derivatives, :create_derivatives, to: :file_set_derivatives_service
+      end
+
+      private
+
+      def file_set_derivatives_service
+        Hyrax::DerivativeService.for(self)
+      end
+    end
+  end
+end
diff --git a/app/models/concerns/spot/nested_collection_behavior.rb b/app/models/concerns/spot/nested_collection_behavior.rb
index 631ddb6ba..437695860 100644
--- a/app/models/concerns/spot/nested_collection_behavior.rb
+++ b/app/models/concerns/spot/nested_collection_behavior.rb
@@ -58,7 +58,6 @@ def gather_collections_to_add
       [].tap do |collections|
         until collections_to_check.size.zero?
           col = collections_to_check.shift
-          col.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX
 
           collections << col unless collections.include?(col)
           collections_to_check += col.member_of_collections
diff --git a/app/models/concerns/spot/solr_document_attributes.rb b/app/models/concerns/spot/solr_document_attributes.rb
index 84d37f80f..9f462933d 100644
--- a/app/models/concerns/spot/solr_document_attributes.rb
+++ b/app/models/concerns/spot/solr_document_attributes.rb
@@ -3,10 +3,6 @@ module Spot
   # Various model attributes for the single SolrDocument model. Since that model wraps
   # every kind of Solr document, we need to ensure that _all_ of the models attributes
   # are available.
-  #
-  #
-  #
-  # @todo Remove {.attribute} definition when Hyrax upgrades to Blacklight >=7
   module SolrDocumentAttributes
     extend ActiveSupport::Concern
 
@@ -107,13 +103,5 @@ module SolrDocumentAttributes
       attribute :citation_firstpage,     ::Blacklight::Types::String, 'citation_firstpage_ss'
       attribute :citation_lastpage,      ::Blacklight::Types::String, 'citation_lastpage_ss'
     end
-
-    module ClassMethods
-      def attribute(name, type, field)
-        define_method name do
-          type.coerce(self[field])
-        end
-      end
-    end
   end
 end
diff --git a/app/models/image_resource.rb b/app/models/image_resource.rb
new file mode 100644
index 000000000..9de64fee0
--- /dev/null
+++ b/app/models/image_resource.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+class ImageResource < ::Hyrax::Work
+  include Hyrax::Schema(:base_metadata, schema_loader: Spot::SimpleSchemaLoader.new)
+  include Hyrax::Schema(:image_metadata, schema_loader: Spot::SimpleSchemaLoader.new)
+end
diff --git a/app/models/publication_resource.rb b/app/models/publication_resource.rb
new file mode 100644
index 000000000..5900482b7
--- /dev/null
+++ b/app/models/publication_resource.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+class PublicationResource < ::Hyrax::Work
+  include Hyrax::Schema(:base_metadata, schema_loader: Spot::SimpleSchemaLoader.new)
+  include Hyrax::Schema(:institutional_metadata, schema_loader: Spot::SimpleSchemaLoader.new)
+  include Hyrax::Schema(:publication_metadata, schema_loader: Spot::SimpleSchemaLoader.new)
+end
diff --git a/app/models/solr_document.rb b/app/models/solr_document.rb
index ad4845652..6dc7f5af6 100644
--- a/app/models/solr_document.rb
+++ b/app/models/solr_document.rb
@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-#
-# Generated from +rails generate hyrax:install+
 class SolrDocument
   include Blacklight::Solr::Document
   include BlacklightOaiProvider::SolrDocument
diff --git a/app/models/spot/oai_collection_solr_set.rb b/app/models/spot/oai_collection_solr_set.rb
index bf04ed476..56588a824 100644
--- a/app/models/spot/oai_collection_solr_set.rb
+++ b/app/models/spot/oai_collection_solr_set.rb
@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require 'cgi'
-
 module Spot
   # Subclass of +BlacklightOaiProvider::SolrSet+ that translates
   # spaces to underscores, making the following assumptions:
diff --git a/app/models/student_work_resource.rb b/app/models/student_work_resource.rb
new file mode 100644
index 000000000..316197ce9
--- /dev/null
+++ b/app/models/student_work_resource.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+class StudentWorkResource < ::Hyrax::Work
+  include Hyrax::Schema(:base_metadata, schema_loader: Spot::SimpleSchemaLoader.new)
+  include Hyrax::Schema(:institutional_metadata, schema_loader: Spot::SimpleSchemaLoader.new)
+  include Hyrax::Schema(:student_work_metadata, schema_loader: Spot::SimpleSchemaLoader.new)
+end
diff --git a/app/presenters/spot/base_presenter.rb b/app/presenters/spot/base_presenter.rb
index 0a0190b01..6ba902397 100644
--- a/app/presenters/spot/base_presenter.rb
+++ b/app/presenters/spot/base_presenter.rb
@@ -86,6 +86,13 @@ def page_title
       "#{title.first} // #{I18n.t('hyrax.product_name')}"
     end
 
+    # Replacing Hyrax::PermissionBadge with our own subclass that can handle :metadata visibility
+    #
+    # @return [Spot::PermissionBadge]
+    def permission_badge_class
+      Spot::PermissionBadge
+    end
+
     # @return [Array<Array<String>>]
     def rights_statement_merged
       solr_document.rights_statement.zip(solr_document.rights_statement_label)
diff --git a/app/presenters/spot/permission_badge.rb b/app/presenters/spot/permission_badge.rb
new file mode 100644
index 000000000..6ddad0e73
--- /dev/null
+++ b/app/presenters/spot/permission_badge.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+module Spot
+  class PermissionBadge < Hyrax::PermissionBadge
+    VISIBILITY_LABEL_CLASS = {
+      authenticated: "badge-info",
+      embargo: "badge-warning",
+      lease: "badge-warning",
+      metadata: "badge-info",
+      open: "badge-success",
+      restricted: "badge-danger"
+    }.freeze
+
+    def badge_class
+      dom_label_class
+    end
+
+    def visibility_label
+      text
+    end
+  end
+end
diff --git a/app/renderers/spot/renderers/attribute_renderer.rb b/app/renderers/spot/renderers/attribute_renderer.rb
index 2adb3d8a2..43adf8019 100644
--- a/app/renderers/spot/renderers/attribute_renderer.rb
+++ b/app/renderers/spot/renderers/attribute_renderer.rb
@@ -47,11 +47,11 @@ def render
 
         markup = []
         vals = Array(values)
-        attributes = microdata_object_attributes(field).merge(class: "attribute attribute-#{field}")
+        attributes = microdata_object_attributes(field).merge(class: "p-2 attribute attribute-#{field}")
 
         vals.each_with_index do |value, index|
           markup << '<tr>'
-          markup << %(<th rowspan="#{vals.size}">#{label}</th>) if index.zero?
+          markup << %(<th class="p-2" rowspan="#{vals.size}">#{label}</th>) if index.zero?
           markup << %(<td#{html_attributes(attributes)}>#{attribute_value_to_html(value)}</td>)
           markup << '</tr>'
         end
diff --git a/app/search_builders/spot/catalog_search_builder.rb b/app/search_builders/spot/catalog_search_builder.rb
index b6f5b53d5..400134116 100644
--- a/app/search_builders/spot/catalog_search_builder.rb
+++ b/app/search_builders/spot/catalog_search_builder.rb
@@ -5,7 +5,7 @@ module Spot
   # the Hyrax join query for extracted text, and conditionally (for now)
   # display highlight matches (where present).
   class CatalogSearchBuilder < ::Hyrax::CatalogSearchBuilder
-    include BlacklightAdvancedSearch::AdvancedSearchBuilder
+    # include BlacklightAdvancedSearch::AdvancedSearchBuilder
     include BlacklightRangeLimit::RangeLimitBuilder
 
     self.default_processor_chain -= [:show_works_or_works_that_contain_files]
diff --git a/app/services/concerns/spot/bulkrax_s3_files_matcher.rb b/app/services/concerns/spot/bulkrax_s3_files_matcher.rb
new file mode 100644
index 000000000..1e3361335
--- /dev/null
+++ b/app/services/concerns/spot/bulkrax_s3_files_matcher.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+module Spot
+  # Patch to add an s3 file matcher to remotely fetch files from s3 without a Browse Everything UI.
+  # This is based on the remote files matcher in the application matcher but assumes a file path
+  # (on s3) is provided rather than a url. The url is fetched in the same manner as AV s3 urls.
+  #
+  # @see spec/matchers/bulkrax/application_matcher_spec.rb (for related specs)
+  # @see config/initializers/spot_overrides.rb (for inclusion)
+  # @see https://github.com/samvera/bulkrax/blob/5e85a0760e9cc317ae11dbecd35c508d6882a5b6/app/matchers/bulkrax/application_matcher.rb#L58C5-L63C8
+  module BulkraxS3FilesMatcher
+    extend ActiveSupport::Concern
+
+    def parse_remote_files(src)
+      return if src.blank?
+      src.strip!
+
+      client = Aws::S3::Client.new
+      begin
+        client.head_object(key: src, bucket: ENV['AWS_BULKRAX_IMPORTS_BUCKET'])
+      rescue Aws::S3::Errors::NotFound
+        Rails.logger.warn('S3: Key not found.')
+        return "S3: Key not found."
+      end
+      obj = Aws::S3::Object.new(bucket_name: ENV['AWS_BULKRAX_IMPORTS_BUCKET'], key: src, client: client)
+      url = obj.presigned_url(:get, expires_in: 3600)
+
+      name = src.split('/')[-1]
+      { url: url, file_name: name }
+    end
+  end
+end
diff --git a/app/services/concerns/spot/retrieves_s3_urls.rb b/app/services/concerns/spot/retrieves_s3_urls.rb
index a2c857532..a979b9f2c 100644
--- a/app/services/concerns/spot/retrieves_s3_urls.rb
+++ b/app/services/concerns/spot/retrieves_s3_urls.rb
@@ -22,6 +22,16 @@ def can_retrieve?(uri, headers = {})
         uri_parsed = ::Addressable::URI.parse(uri)
 
         case uri_parsed.scheme
+        when "http"
+          if Rails.env.development?
+            client = Aws::S3::Client.new
+            kv = uri_parsed.path[1..-1].split('/', 2)
+            resp = client.head_object(bucket: kv[0], key: kv[1])
+            return true unless resp.nil?
+            false
+          else
+            super(uri, headers)
+          end
         when "s3"
           client = Aws::S3::Client.new
           resp = client.head_object(bucket: uri_parsed.host, key: uri_parsed.path[1..-1])
diff --git a/app/services/rdf_literal_serializer.rb b/app/services/rdf_literal_serializer.rb
index 093d2640e..4ddcc6370 100644
--- a/app/services/rdf_literal_serializer.rb
+++ b/app/services/rdf_literal_serializer.rb
@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require 'rdf/ntriples'
-
 class RdfLiteralSerializer
   # @return [String]
   def serialize(literal)
diff --git a/app/services/spot/characterization_service.rb b/app/services/spot/characterization_service.rb
index 53de286d6..74e5e9c64 100644
--- a/app/services/spot/characterization_service.rb
+++ b/app/services/spot/characterization_service.rb
@@ -12,7 +12,7 @@ def self.run(characterization_proxy, filepath, opts = {})
       tool = ENV['FITS_SERVLET_URL'].present? ? :fits_servlet : :fits
       opts = { ch12n_tool: tool }.merge(opts)
 
-      super(characterization_proxy, filepath, opts)
+      super(characterization_proxy, filepath, **opts)
     end
   end
 end
diff --git a/app/services/spot/derivatives/audio_derivative_service.rb b/app/services/spot/derivatives/audio_derivative_service.rb
index 6901c6c31..ffdbafa8d 100644
--- a/app/services/spot/derivatives/audio_derivative_service.rb
+++ b/app/services/spot/derivatives/audio_derivative_service.rb
@@ -1,9 +1,4 @@
 # frozen_string_literal: true
-require 'aws-sdk-s3'
-require 'digest/md5'
-require 'fileutils'
-require 'ffprober'
-
 module Spot
   module Derivatives
     # Checks the 'premade_derivatives' property on the associated work. If the property is empty,
diff --git a/app/services/spot/derivatives/audio_visual_base_derivative_service.rb b/app/services/spot/derivatives/audio_visual_base_derivative_service.rb
index aafa15c66..7dfc290b7 100644
--- a/app/services/spot/derivatives/audio_visual_base_derivative_service.rb
+++ b/app/services/spot/derivatives/audio_visual_base_derivative_service.rb
@@ -1,9 +1,4 @@
 # frozen_string_literal: true
-require 'aws-sdk-s3'
-require 'digest/md5'
-require 'fileutils'
-require 'ffprober'
-
 module Spot
   module Derivatives
     # Base file that audio and video derivative services inherit from. Contains functionality common to both.
diff --git a/app/services/spot/derivatives/iiif_access_copy_service.rb b/app/services/spot/derivatives/iiif_access_copy_service.rb
index 704b01329..0484ac792 100644
--- a/app/services/spot/derivatives/iiif_access_copy_service.rb
+++ b/app/services/spot/derivatives/iiif_access_copy_service.rb
@@ -1,8 +1,4 @@
 # frozen_string_literal: true
-require 'aws-sdk-s3'
-require 'digest/md5'
-require 'fileutils'
-
 module Spot
   module Derivatives
     # Creates pyramidal TIFF copies of Images for serving via IIIF. Pyramidal TIFFs contain
diff --git a/app/services/spot/derivatives/video_derivative_service.rb b/app/services/spot/derivatives/video_derivative_service.rb
index 7fb752836..5a2d799c0 100644
--- a/app/services/spot/derivatives/video_derivative_service.rb
+++ b/app/services/spot/derivatives/video_derivative_service.rb
@@ -1,9 +1,4 @@
 # frozen_string_literal: true
-require 'aws-sdk-s3'
-require 'digest/md5'
-require 'fileutils'
-require 'ffprober'
-
 module Spot
   module Derivatives
     # Checks the 'premade_derivatives' property on the associated work. If the property is empty,
diff --git a/app/services/spot/embargo_lease_service.rb b/app/services/spot/embargo_lease_service.rb
index 061262742..45f1cb27a 100644
--- a/app/services/spot/embargo_lease_service.rb
+++ b/app/services/spot/embargo_lease_service.rb
@@ -3,15 +3,15 @@ module Spot
   # A service for dealing with embargoes and leases. Right now, we're just
   # using this to clear out expired items.
   #
-  # @example Clear out all expired values at once
-  #   Spot::EmbargoLeaseService.clear_all_expired
+  # @example Clear out all expired values at once and regenerate thumbnails
+  #   Spot::EmbargoLeaseService.clear_all_expired(regenerate_thumbnails: true)
   #
-  # @example Clear out expired embargoes (and update +date_available+ values)
+  # @example Clear out expired embargoes
   #   Spot::EmbargoLeaseService.clear_expired_embargoes
   #
   # @example Clear out expired leases
   #   Spot::EmbargoLeaseService.clear_expired_leases
-  #
+
   class EmbargoLeaseService
     class << self
       # Convenience method to clear both embargoes and leases
@@ -28,18 +28,7 @@ def clear_all_expired(regenerate_thumbnails: false)
       # @return [void]
       def clear_expired_embargoes(regenerate_thumbnails: false)
         ::Hyrax::EmbargoService.assets_with_expired_embargoes.each do |presenter|
-          item = ActiveFedora::Base.find(presenter.id)
-
-          next if item.under_embargo?
-
-          ::Hyrax::Actors::EmbargoActor.new(item).destroy
-
-          next if item.is_a? FileSet
-
-          item.copy_visibility_to_files
-          item.save!
-
-          RegenerateThumbnailJob.perform_later(item) if regenerate_thumbnails == true
+          release_and_save_for_id(presenter.id, type: :embargo, regenerate_thumbnails: regenerate_thumbnails)
         end
       end
 
@@ -48,17 +37,65 @@ def clear_expired_embargoes(regenerate_thumbnails: false)
       # @return [void]
       def clear_expired_leases(regenerate_thumbnails: false)
         ::Hyrax::LeaseService.assets_with_expired_leases.each do |presenter|
-          item = ActiveFedora::Base.find(presenter.id)
+          release_and_save_for_id(presenter.id, type: :lease, regenerate_thumbnails: regenerate_thumbnails)
+        end
+      end
+
+      private
 
-          next if item.active_lease?
+      # Embargos and Leases behave very similarly and are managed through similar interfaces
+      # in Hyrax, so we'll do the bulk of that work here.
+      #
+      # @param [String] id
+      # @option [:embargo, :lease] :type
+      # @option [true/false] :regenerate_thumbnails
+      # @return [void]
+      def release_and_save_for_id(id, type:, regenerate_thumbnails: false)
+        resource = release_and_save_acl_for(type: type, resource: Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: id))
+        return if resource.nil?
+
+        copy_visibility_to_members!(resource: resource)
+
+        RegenerateThumbnailJob.perform_later(resource) if regenerate_thumbnails == true
+      end
 
-          ::Hyrax::Actors::LeaseActor.new(item).destroy
+      # calling #release! on the managers will raise a +NotReleaseableError+ if
+      # the embargo/lease isn't ready to be deactivated. Since the resource's
+      # visibility hasn't changed, we won't bother to resave the object or enqueue
+      # a thumbnail regeneration job.
+      #
+      # @todo how can we test the `nil` return value for coverage?
+      def release_and_save_acl_for(type:, resource:)
+        manager_class = manager_class_for(type)
+        return if manager_class.nil?
+
+        manager_class.new(resource: resource).release!
+        resource.permission_manager.acl.save
+        resource
+      rescue Hyrax::EmbargoManager::NotReleasableError, Hyrax::LeaseManager::NotReleasableError
+        # :nocov:
+        # This is covered via other tests
+        nil
+        # :nocov:
+      end
 
-          item.copy_visibility_to_files unless item.is_a? FileSet
+      def manager_class_for(type)
+        case type
+        when :embargo
+          Hyrax::EmbargoManager
+        when :lease
+          Hyrax::LeaseManager
+        end
+      end
 
-          RegenerateThumbnailJob.perform_later(item) if regenerate_thumbnails == true
+      # :nocov:
+      # return to this post valkyrization
+      def copy_visibility_to_members!(resource:)
+        Hyrax.query_service.find_members(resource: resource).each do |member|
+          Hyrax::AccessControlList.copy_permissions(source: resource, target: member)
         end
       end
+      # :nocov:
     end
   end
 end
diff --git a/app/services/spot/exporters/work_metadata_exporter.rb b/app/services/spot/exporters/work_metadata_exporter.rb
index 196bfc427..6c5c24124 100644
--- a/app/services/spot/exporters/work_metadata_exporter.rb
+++ b/app/services/spot/exporters/work_metadata_exporter.rb
@@ -55,12 +55,12 @@ def export_for_format(format)
 
       # @return [String]
       def generate_csv_content
-        Spot::WorkCSVService.new(solr_document).csv
+        Spot::WorkCsvService.new(solr_document).csv
       end
 
       # @return [RDF::Graph]
       def graph
-        @graph ||= Hyrax::GraphExporter.new(solr_document, request).fetch
+        @graph ||= Hyrax::GraphExporter.new(solr_document, hostname: request.host).fetch
       end
     end
   end
diff --git a/app/services/spot/exporters/zipped_work_exporter.rb b/app/services/spot/exporters/zipped_work_exporter.rb
index 2b38caa5f..873bcc215 100644
--- a/app/services/spot/exporters/zipped_work_exporter.rb
+++ b/app/services/spot/exporters/zipped_work_exporter.rb
@@ -1,7 +1,4 @@
 # frozen_string_literal: true
-require 'tmpdir'
-require 'fileutils'
-
 module Spot
   module Exporters
     class ZippedWorkExporter
diff --git a/app/services/spot/iiif_service.rb b/app/services/spot/iiif_service.rb
index 46fac8ee3..c0488e906 100644
--- a/app/services/spot/iiif_service.rb
+++ b/app/services/spot/iiif_service.rb
@@ -1,7 +1,4 @@
 # frozen_string_literal: true
-require 'cgi'
-require 'uri'
-
 module Spot
   # Service for generating IIIF urls (via file_ids) for an external Cantaloupe image server.
   # Really, this could be used for _any_ external image server, save for the #download_url
diff --git a/app/services/spot/iso6391.rb b/app/services/spot/iso_6391.rb
similarity index 100%
rename from app/services/spot/iso6391.rb
rename to app/services/spot/iso_6391.rb
diff --git a/app/services/spot/rdf_authority_parser.rb b/app/services/spot/rdf_authority_parser.rb
index 46e9c5791..b476e11ad 100644
--- a/app/services/spot/rdf_authority_parser.rb
+++ b/app/services/spot/rdf_authority_parser.rb
@@ -9,14 +9,14 @@
 #
 # @example
 #
-#   class FrenchRDFAuthorityParser < Spot::RDFAuthorityParser
+#   class FrenchRdfAuthorityParser < Spot::RdfAuthorityParser
 #     self.preferred_language = :fr
 #   end
 #
-#   FrenchRDFAuthorityParser.load_rdf('languages_fr', ['http://id.loc.gov/vocabulary/iso639-1.nt'])
+#   FrenchRdfAuthorityParser.load_rdf('languages_fr', ['http://id.loc.gov/vocabulary/iso639-1.nt'])
 #
 module Spot
-  class RDFAuthorityParser < ::Qa::Services::RDFAuthorityParser
+  class RdfAuthorityParser < ::Qa::Services::RDFAuthorityParser
     class_attribute :preferred_language
     self.preferred_language = :en
 
diff --git a/app/services/spot/simple_schema_loader.rb b/app/services/spot/simple_schema_loader.rb
new file mode 100644
index 000000000..889a8c782
--- /dev/null
+++ b/app/services/spot/simple_schema_loader.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+module Spot
+  # Using our own SchemaLoader for the time being to bypass an issue with the Hyrax loader
+  # where 'type: uri' and 'multiple: true' fields were passing the Dry::Struct interface default
+  # value of +Dry::Types::Unknown+ through, as it responds true to #present?, which was resulting
+  # in new resources having default URI values of 'Unknown'
+  #
+  # @example
+  #   # config/metadata/cool_metadata.yml
+  #   attributes:
+  #     subject:
+  #       type: uri
+  #       multiple: true
+  #
+  #   # app/models/cool_resource.rb
+  #   class CoolResource < Hyrax::Resource
+  #     include Hyrax::Schema(:cool_metadata)
+  #   end
+  #
+  #   CoolResource.new.subject
+  #   => [#<RDF::URI:0x9743c URI:Undefined>]
+  #
+  #   # app/models/better_resource.rb
+  #   class BetterResource < Hyrax::Resource
+  #     include Hyrax::Schema(:cool_metadata, schema_loader: Spot::SimpleSchemaLoader.new)
+  #   end
+  #
+  #   BetterResource.new.subject
+  #   => []
+  #
+  class SimpleSchemaLoader < Hyrax::SimpleSchemaLoader
+    class AttributeDefinition < Hyrax::SimpleSchemaLoader::AttributeDefinition
+      def type
+        collection_type = if config['multiple']
+                            Valkyrie::Types::Array.constructor { |v| Array(v).select { |x| x.present? && x != Dry::Types::Undefined } }
+                          else
+                            Identity
+                          end
+        collection_type.of(type_for(config['type']))
+      end
+    end
+
+    private
+
+    # Map the definitions to use our overloaded AttributeDefinition class.
+    #
+    # @param [#to_s] schema_name
+    # @return [Enumerable<Spot::SimpleSchemaLoader::AttributeDefinition]
+    def definitions(schema_name)
+      super(schema_name).map { |prev| AttributeDefinition.new(prev.name, prev.config) }
+    end
+  end
+end
diff --git a/app/services/spot/student_work_admin_set_create_service.rb b/app/services/spot/student_work_admin_set_create_service.rb
index 015dbc961..9f9399581 100644
--- a/app/services/spot/student_work_admin_set_create_service.rb
+++ b/app/services/spot/student_work_admin_set_create_service.rb
@@ -2,7 +2,7 @@
 module Spot
   # @todo do we need this service anymore?
   class StudentWorkAdminSetCreateService
-    ADMIN_SET_ID = 'admin_set/student_work'
+    ADMIN_SET_ID = 'admin_set_student_work'
     DEFAULT_TITLE = ['Student Work'].freeze
     WORKFLOW_NAME = 'mediated_student_work_deposit'
 
diff --git a/app/services/spot/transcript_download_service.rb b/app/services/spot/transcript_download_service.rb
index 83b96f60f..47b90f0d8 100644
--- a/app/services/spot/transcript_download_service.rb
+++ b/app/services/spot/transcript_download_service.rb
@@ -1,7 +1,4 @@
 # frozen_string_literal: true
-require 'aws-sdk-s3'
-require 'fileutils'
-
 module Spot
   # Service to download transcript files and clean them up after attachment.
   # Calls the FileSetTranscriptAttachmentService.
diff --git a/app/services/spot/work_csv_service.rb b/app/services/spot/work_csv_service.rb
index a0eeae1f4..63e280c70 100644
--- a/app/services/spot/work_csv_service.rb
+++ b/app/services/spot/work_csv_service.rb
@@ -6,7 +6,7 @@
 require 'csv'
 
 module Spot
-  class WorkCSVService
+  class WorkCsvService
     attr_reader :work, :terms, :multi_value_separator, :include_headers
 
     # @param [ActiveFedora::Base,SolrDocument] work
diff --git a/app/services/zip_service.rb b/app/services/zip_service.rb
index d3ad8ba15..57447578e 100644
--- a/app/services/zip_service.rb
+++ b/app/services/zip_service.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
-require 'fileutils'
-require 'zip'
-
+#
 # Abstracting out our zipping/unzipping into its own service so that it's not
 # lumped in with another one.
 #
diff --git a/app/validators/hyrax/has_one_title_validator.rb b/app/validators/hyrax/has_one_title_validator.rb
index 81efaa485..f82d69cff 100644
--- a/app/validators/hyrax/has_one_title_validator.rb
+++ b/app/validators/hyrax/has_one_title_validator.rb
@@ -8,7 +8,7 @@ module Hyrax
   class HasOneTitleValidator < ActiveModel::Validator
     def validate(record)
       return unless record.title.map(&:to_s).reject(&:empty?).empty?
-      record.errors[:title] << "You must provide a title"
+      record.errors.add(:title, :invalid, message: 'You must provide a title')
     end
   end
 end
diff --git a/app/validators/spot/date_issued_validator.rb b/app/validators/spot/date_issued_validator.rb
index 542c9b710..2b1f6371e 100644
--- a/app/validators/spot/date_issued_validator.rb
+++ b/app/validators/spot/date_issued_validator.rb
@@ -15,11 +15,11 @@ class DateIssuedValidator < ::ActiveModel::Validator
     # @param [ActiveFedora::Base] record
     # @return [void]
     def validate(record)
-      record.errors[:date_issued] << 'Date Issued may not be blank' if record.date_issued.empty?
-      record.errors[:date_issued] << 'Date Issued may only contain one value' if record.date_issued.size > 1
+      record.errors.add(:date_issued, :invalid, message: 'Date Issued may not be blank') if record.date_issued.empty?
+      record.errors.add(:date_issued, :invalid, message: 'Date Issued may only contain one value') if record.date_issued.size > 1
 
       record.date_issued.each do |date|
-        record.errors[:date_issued] << 'Date Issued must be in YYYY-MM-DD, YYYY-MM, or YYYY format' unless
+        record.errors.add(:date_issued, :invalid, message: 'Date Issued must be in YYYY-MM-DD, YYYY-MM, or YYYY format') unless
           date.match?(/\A\d{4}(-\d{2}){0,2}\z/)
       end
     end
diff --git a/app/validators/spot/only_urls_validator.rb b/app/validators/spot/only_urls_validator.rb
index d4ee56447..94b46d536 100644
--- a/app/validators/spot/only_urls_validator.rb
+++ b/app/validators/spot/only_urls_validator.rb
@@ -1,8 +1,4 @@
 # frozen_string_literal: true
-#
-#
-require 'uri'
-
 module Spot
   class OnlyUrlsValidator < ActiveModel::Validator
     # @param record [ActiveModel::Base]
@@ -15,7 +11,7 @@ def validate(record)
         next if values.empty?
 
         values.each do |val|
-          record.errors[field] << "#{val} is not a valid URL" unless val.match?(uri_regex)
+          record.errors.add(field, :invalid, message: "#{val} is not a valid URL") unless val.match?(uri_regex)
         end
       end
     end
diff --git a/app/validators/spot/required_local_authority_validator.rb b/app/validators/spot/required_local_authority_validator.rb
index 0296f7898..1448b7eab 100644
--- a/app/validators/spot/required_local_authority_validator.rb
+++ b/app/validators/spot/required_local_authority_validator.rb
@@ -16,13 +16,12 @@ def validate(record)
       authority_name = options[:authority]
       field = options[:field]
       authority = authority_for(authority_name)
-
       values = record.send(field)
-      values = Array.wrap(values) unless values.respond_to?(:each)
+      values = Array.wrap(values) unless values.class < Enumerable
 
       values.each do |v|
         value = v.is_a?(ActiveTriples::Resource) ? v.id : v.to_s
-        record.errors[field] << %("#{value}" is not a valid #{field.to_s.titleize}.) if authority.find(value).empty?
+        record.errors.add(field, :invalid, message: %("#{value}" is not a valid #{field.to_s.titleize}.)) if authority.find(value).empty?
       end
     end
 
diff --git a/app/validators/spot/slug_validator.rb b/app/validators/spot/slug_validator.rb
index aef053501..2d9da5633 100644
--- a/app/validators/spot/slug_validator.rb
+++ b/app/validators/spot/slug_validator.rb
@@ -13,8 +13,8 @@ def validate(record)
         slugs = record.send(field).select { |id| id.start_with? 'slug:' }
         next if slugs.empty?
 
-        record.errors[field] << single_slug_message unless slugs.size == 1
-        record.errors[field] << slug_regex_message unless slug_valid?(slugs.first)
+        record.errors.add(field, :invalid, message: single_slug_message) unless slugs.size == 1
+        record.errors.add(field, :invalid, message: slug_regex_message) unless slug_valid?(slugs.first)
       end
     end
 
diff --git a/app/values/blacklight/types.rb b/app/values/blacklight/types.rb
deleted file mode 100644
index b0751d1fb..000000000
--- a/app/values/blacklight/types.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-#
-# This is copied whole-hog from Blacklight@master and gives us types to use
-# for
-# @todo remove this file when Hyrax upgrades to Blacklight 7.
-module Blacklight
-  # These are data types that blacklight can use to coerce values from the index
-  module Types
-    class Array
-      def self.coerce(input)
-        ::Array.wrap(input)
-      end
-    end
-
-    class String
-      def self.coerce(input)
-        ::Array.wrap(input).first
-      end
-    end
-
-    class Date
-      def self.coerce(input)
-        field = String.coerce(input)
-        return if field.blank?
-
-        begin
-          ::Date.parse(field)
-        rescue ArgumentError
-          Rails.logger.info "Unable to parse date: #{field.first.inspect}"
-        end
-      end
-    end
-  end
-end
diff --git a/app/views/_controls.html.erb b/app/views/_controls.html.erb
index a3695e84b..84f08da0d 100644
--- a/app/views/_controls.html.erb
+++ b/app/views/_controls.html.erb
@@ -1,20 +1,13 @@
-<nav class="navbar navbar-default navbar-static-top" role="navigation">
-  <div class="container-fluid">
-    <div class="row">
-      <ul class="nav navbar-nav col-sm-5">
-        <li <%= 'class="active"' if current_page?(hyrax.about_path) %>>
-          <%= link_to t(:'hyrax.controls.about'), hyrax.about_path, aria: current_page?(hyrax.about_path) ? {current: 'page'} : nil %></li>
-        <li <%= 'class="active"' if current_page?(hyrax.help_path) %>>
-          <%= link_to t(:'hyrax.controls.help'), hyrax.help_path, aria: current_page?(hyrax.help_path) ? {current: 'page'} : nil %></li>
-        <li <%= 'class="active"' if current_page?(hyrax.contact_path) %>>
-          <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path, aria: current_page?(hyrax.contact_path) ? {current: 'page'} : nil %></li>
-        <li <%= 'class="active"' if current_page?(advanced_search_path) %>>
-          <%= link_to t(:'spot.controls.advanced_search'), advanced_search_path, aria: current_page?(advanced_search_path) ? {current: 'page'} : nil %></li>
-      </ul><!-- /.nav -->
-
-      <div class="searchbar-right navbar-right col-sm-7">
-        <%= render partial: 'catalog/search_form' %>
-      </div>
+<nav class="navbar navbar-light bg-light navbar-expand-sm justify-content-between align-items-center px-2 border-bottom" role="navigation" aria-label="Root Menu">
+    <ul class="nav navbar-nav col-sm-5">
+      <li class="nav-item <%= 'active font-weight-bold' if current_page?(hyrax.about_path) %>">
+        <%= link_to t(:'hyrax.controls.about'), hyrax.about_path, class: "nav-link", aria: current_page?(hyrax.about_path) ? {current: 'page'} : nil %></li>
+      <li class="nav-item <%= 'active font-weight-bold' if current_page?(hyrax.help_path) %>">
+        <%= link_to t(:'hyrax.controls.help'), hyrax.help_path, class: "nav-link", aria: current_page?(hyrax.help_path) ? {current: 'page'} : nil %></li>
+      <li class="nav-item <%= 'active font-weight-bold' if current_page?(hyrax.contact_path) %>">
+        <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path, class: "nav-link", aria: current_page?(hyrax.contact_path) ? {current: 'page'} : nil %></li>
+    </ul><!-- /.nav -->
+    <div class="col-sm-7">
+      <%= render partial: 'catalog/search_form' %>
     </div>
-  </div>
-</nav><!-- /.navbar -->
+  </nav><!-- /.navbar -->
\ No newline at end of file
diff --git a/app/views/_masthead.html.erb b/app/views/_masthead.html.erb
index 83c8a9494..c800d77dc 100644
--- a/app/views/_masthead.html.erb
+++ b/app/views/_masthead.html.erb
@@ -1,20 +1,12 @@
-<header>
-  <nav id="masthead" class="navbar navbar-inverse navbar-static-top" role="navigation" aria-label="masthead">
-    <div class="container-fluid">
-      <!-- Brand and toggle get grouped for better mobile display -->
-      <div class="navbar-header">
-        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#top-navbar-collapse" aria-expanded="false">
-          <span class="sr-only">Toggle navigation</span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        <%= render '/logo' %>
-      </div>
-
-      <div class="collapse navbar-collapse" id="top-navbar-collapse">
-        <%= render '/user_util_links' %>
-      </div>
+<header aria-label="header" class="top-header">
+  <nav id="masthead" class="navbar navbar-expand-lg navbar-dark justify-content-between <%= placement_class %>" role="navigation" aria-label="masthead">
+    <h1 class="sr-only navbar-text"><%= application_name %></h1>
+    <%= render '/logo' %>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#top-navbar-collapse" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse justify-content-end" id="top-navbar-collapse">
+      <%= render '/user_util_links' %>
     </div>
   </nav>
-</header>
+</header>
\ No newline at end of file
diff --git a/app/views/_user_util_links.html.erb b/app/views/_user_util_links.html.erb
index c2da425d3..7dd86dca5 100644
--- a/app/views/_user_util_links.html.erb
+++ b/app/views/_user_util_links.html.erb
@@ -1,4 +1,4 @@
-<ul id="user_utility_links" class="nav navbar-nav navbar-right">
+<ul id="user_utility_links" class="navbar-nav navbar-dark">
   <%#
     hyrax has the available locales hardcoded, as opposed to using the options available.
     i'm removing the picker for now just because we only have the community-provided
@@ -7,33 +7,27 @@
   <%# render 'shared/locale_picker' if available_translations.size > 1 %>
 
   <% if user_signed_in? %>
-    <% if current_user.can?(:read, :dashboard) %>
-    <li>
+    <li class="nav-item">
       <%= render_notifications(user: current_user) %>
     </li>
-    <% end %>
-    <li class="dropdown">
-      <%= link_to hyrax.dashboard_profile_path(current_user), role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false, controls: 'user-util-links' } do %>
+    <li class="nav-item dropdown">
+      <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         <span class="sr-only"><%= t("hyrax.toolbar.profile.sr_action") %></span>
-        <span class="hidden-xs">&nbsp;<%= current_user.name %></span>
+        <span><%= current_user.name %></span>
         <span class="sr-only"> <%= t("hyrax.toolbar.profile.sr_target") %></span>
-        <span class="fa fa-user" aria-hidden="true"></span>
-        <span class="caret"></span>
-      <% end %>
-      <ul id="user-util-links" class="dropdown-menu dropdown-menu-right" role="menu">
+      </a>
+      <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
         <% if current_user.can?(:read, :dashboard) %>
-        <li><%= link_to t("hyrax.toolbar.dashboard.menu"), hyrax.dashboard_path %></li>
-
-        <li class="divider"></li>
+          <%= link_to t("hyrax.toolbar.dashboard.menu"), hyrax.dashboard_path(current_user), class: "dropdown-item" %>
         <% end %>
-        <li><%= link_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path %></li>
-      </ul>
-    </li><!-- /.btn-group -->
+        <div class="dropdown-divider"></div>
+        <%= link_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path, class: "dropdown-item" %>
+      </div>
+    </li>
   <% else %>
-    <li>
-      <%= link_to main_app.new_user_session_path do %>
-        <span class="glyphicon glyphicon-log-in"></span>
-        <%= t('spot.log_in') %>
+    <li class="nav-item">
+      <%= link_to main_app.new_user_session_path, class: 'nav-link' do %>
+        <span class="fa fa-sign-in" aria-hidden="true"></span> <%= t("hyrax.toolbar.profile.login") %>
       <% end %>
     </li>
   <% end %>
diff --git a/app/views/bulkrax/importers/_csv_fields.html.erb b/app/views/bulkrax/importers/_csv_fields.html.erb
deleted file mode 100644
index f510462d1..000000000
--- a/app/views/bulkrax/importers/_csv_fields.html.erb
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class='csv_fields'>
-
-  <%= fi.input :visibility,
-    collection: [
-      ['Public', 'open'],
-      ['Private', 'restricted']
-    ],
-    selected: importer.parser_fields['visibility'] || 'open',
-    input_html: { class: 'form-control' }
-  %>
-
-  <% rights_statements = Hyrax.config.rights_statement_service_class.new %>
-  <%= fi.input :rights_statement,
-        collection: rights_statements.select_active_options,
-        selected: importer.parser_fields['rights_statement'],
-        include_blank: true,
-        item_helper: rights_statements.method(:include_current_value),
-        input_html: { class: 'form-control' },
-        required: false
-        %>
-  <%= fi.input :override_rights_statement, as: :boolean, hint: 'If checked, always use the selected rights statment. If unchecked, use rights or rights_statement from the record and only use the provided value if dc:rights is blank.', input_html: { checked: (importer.parser_fields['override_rights_statement'] == "1") } %>
-
-  <h4>Add CSV File to Import:</h4>
-  <%# accept a single file upload; data files and bags will need to be added another way %>
-
-  <%= fi.input 'file', as: :file, input_html: { accept: 'text/csv' } %><br />
-  <% unless BrowseEverything.config.nil? %>
-    <h4>Add Files to Import:</h4>
-    <p>Choose files to upload. The filenames must be unique, and the filenames must be referenced in a column called 'file' in the accompanying CSV file.</p>
-    <%= render 'browse_everything', form: form %>
-  <% end %>
-  <br />
-</div>
\ No newline at end of file
diff --git a/app/views/bulkrax/importers/_form.html.erb b/app/views/bulkrax/importers/_form.html.erb
deleted file mode 100644
index 96c91c0af..000000000
--- a/app/views/bulkrax/importers/_form.html.erb
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="panel-body">
-  <% if importer.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(importer.errors.count, "error") %> prohibited this importer from being saved:</h2>
-
-      <ul>
-        <% importer.errors.full_messages.each do |message| %>
-          <li><%= message %></li>
-        <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <%= form.input :name, input_html: { class: 'form-control' } %>
-
-  <%= form.input :admin_set_id, collection: available_admin_sets if defined?(::Hyrax) %>
-
-  <%= form.hidden_field :user_id, value: current_user.id %>
-
-  <%= form.input :frequency, collection: form.object.class.frequency_enums, input_html: { class: 'form-control' } %>
-
-  <%= form.input :limit, as: :integer, hint: 'leave blank or 0 for all records', input_html: { class: 'form-control'} %>
-
-  <%= form.input :parser_klass, collection: Bulkrax.parsers.map {|p| [p[:name], p[:class_name], {'data-partial' => p[:partial], 'selected' => Bulkrax.parsers.count == 1}]}, label: "Parser", input_html: { class: 'form-control' } %>
-
-  <%= form.fields_for :parser_fields do |fi| %>
-    <div class='parser_fields'>
-      <p>Specific fields for each parser are available only when a parser is selected</p>
-      <% Bulkrax.parsers.map {|p| p[:partial]}.uniq.each do |partial| %>
-        <%= render partial: partial, locals: {form: form, fi: fi, importer: importer} %>
-      <% end %>
-    </div>
-  <% end %>
-
-</div>
\ No newline at end of file
diff --git a/app/views/catalog/_facets.html.erb b/app/views/catalog/_facets.html.erb
index eba387c29..47d440283 100644
--- a/app/views/catalog/_facets.html.erb
+++ b/app/views/catalog/_facets.html.erb
@@ -1,44 +1,9 @@
-<% # main container for facets/limits menu -%>
-<% if general_facets? %>
-<div id="facets" class="facets sidenav">
-
-  <div class="top-panel-heading panel-heading">
-    <button type="button" class="facets-toggle" data-toggle="collapse" data-target="#facet-panel-collapse">
-      <span class="sr-only">Toggle facets</span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-    </button>
-
-    <h2 class='facets-heading'>
-      <%= t('blacklight.search.facets.title') %>
-    </h2>
-  </div>
-
-  <div id="facet-panel-collapse" class="collapse panel-group">
-    <%= render_general_facet_partials %>
-  </div>
-</div>
-<% end %>
-
-<% # display admin facets if the user is an admin + we have some configured %>
-<% if admin_facets? %>
-<div id="admin-facets" class="facets sidenav">
-  <div class="top-panel-heading panel-heading">
-    <button type="button" class="facets-toggle" data-toggle="collapse" data-target="#facet-panel-collapse">
-      <span class="sr-only">Toggle admin facets</span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-    </button>
-
-    <h2 class='facets-heading'>
-      <%= t('blacklight.search.facets.admin.title') %>
-    </h2>
-  </div>
-
-  <div id="admin-facet-panel-collapse" class="collapse panel-group">
-    <%= render_admin_facet_partials %>
-  </div>
-</div>
-<% end %>
+<%# container for facet groups
+  # we need to add a condition to hide admin facets from non-admin users
+  #
+  # @overrides https://github.com/projectblacklight/blacklight/blob/v7.38.0/app/views/catalog/_facets.html.erb
+-%>
+<% Deprecation.silence(Blacklight::Facet) { facet_group_names }.each do |groupname| %>
+  <% next if groupname == :admin && !current_user&.admin? %>
+  <%= render 'facet_group', groupname: groupname %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/catalog/_index_header_list_collection.html.erb b/app/views/catalog/_index_header_list_collection.html.erb
index e8a9e3a20..5dcf0b0a2 100644
--- a/app/views/catalog/_index_header_list_collection.html.erb
+++ b/app/views/catalog/_index_header_list_collection.html.erb
@@ -1,7 +1,5 @@
-<div class="search-results-title-row">
-  <h4 class="search-result-title">
-    <%= link_to document.title_or_label, hyrax.collection_path(document) %>
-  </h4>
+<div class="search-results-title-row col-12 d-flex flex-row align-items-center pb-2">
+  <h3 class="search-result-title mb-0 pr-3"><%= link_to document.title_or_label, [hyrax, document] %></h3>
   <%# hiding the collection-type badge for the moment, as we're only using one type %>
   <%# Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>
 </div>
diff --git a/app/views/catalog/_index_header_list_default.html.erb b/app/views/catalog/_index_header_list_default.html.erb
index cb9b0f0ff..1851dd955 100644
--- a/app/views/catalog/_index_header_list_default.html.erb
+++ b/app/views/catalog/_index_header_list_default.html.erb
@@ -1,5 +1,12 @@
-<div class="search-results-title-row">
-  <h4 class="search-result-title"><%= link_to(document.title_or_label, document) %></h4>
+<% model = document.hydra_model %>
+<div class="search-results-title-row col-12 d-flex flex-row align-items-center pb-2">
+  <% if model == Hyrax::PcdmCollection || model < Hyrax::PcdmCollection %>
+    <h4 class="search-result-title"><%= link_to document.title_or_label, [hyrax, document] %></h4>
+    <%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>
+  <% else %>
+    <h4 class="search-result-title"><%= link_to document.title_or_label, document %></h4>
+  <% end %>
+
   <% if display_info_alert?(document) %>
     <div class="alert alert-warning" style="margin:0; padding:5px;">
       <%= document_access_display_text(document) %>
diff --git a/app/views/catalog/_index_list_collection.html.erb b/app/views/catalog/_index_list_collection.html.erb
index 465485e16..51366ab42 100644
--- a/app/views/catalog/_index_list_collection.html.erb
+++ b/app/views/catalog/_index_list_collection.html.erb
@@ -15,13 +15,13 @@
   <% end %>
 </div>
 
-<div class="col-md-<%= col_count.zero? ? '2' : '4' %>">
+<div class="col-md-<%= col_count.zero? ? '1' : '3' %>">
   <div class="collection-counts-wrapper pull-right">
-    <% unless col_count.zero? %>
+    <%# unless col_count.zero? %>
     <div class="collection-counts-item">
-      <span><%= col_count %></span>Sub-Collections
+      <span><%= col_count %></span>Collections
     </div>
-    <% end %>
+    <%# end %>
     <div class="collection-counts-item">
       <span><%= collection_presenter.total_viewable_works %></span>Items
     </div>
diff --git a/app/views/catalog/_index_list_default.html.erb b/app/views/catalog/_index_list_default.html.erb
index e7c9f7ba7..894b1e3b0 100644
--- a/app/views/catalog/_index_list_default.html.erb
+++ b/app/views/catalog/_index_list_default.html.erb
@@ -1,18 +1,22 @@
-<div class="col-md-10">
+<div class="col-md-9 col-lg-6">
   <div class="metadata">
-    <dl class="dl-horizontal">
-    <% doc_presenter = index_presenter(document) %>
+    <dl>
+    <% doc_presenter = document_presenter(document) %>
     <% index_fields(document).each do |field_name, field| -%>
       <% if should_render_index_field? document, field %>
-          <dt><%= render_index_field_label document, field: field_name %></dt>
-          <dd><%= doc_presenter.field_value field %></dd>
+        <div class="row">
+          <dt class="col-5 text-right" data-solr-field-name="<%= field_name %>"><%= render_index_field_label document, field: field_name %></dt>
+          <dd class="col-7"><%= doc_presenter.field_value field %></dd>
+        </div>
       <% end %>
     <% end %>
     <%# there's probably a better way to do this, but we want to ensure that
         the permalink is always at the bottom when it exists %>
     <% if document.permalink.present? %>
-      <dt><%= t 'blacklight.search.fields.permalink' %></dt>
-      <dd><%= document.permalink %></dd>
+      <div class="row">
+        <dt class="col-5 text-right" data-solr-field-name="permalink_ss"><%= t 'blacklight.search.fields.permalink' %></dt>
+        <dd class="col-7"><%= document.permalink %></dd>
+      </div>
     <% end %>
     </dl>
   </div>
diff --git a/app/views/catalog/_search_form.html.erb b/app/views/catalog/_search_form.html.erb
index 531df7cb1..f63e27360 100644
--- a/app/views/catalog/_search_form.html.erb
+++ b/app/views/catalog/_search_form.html.erb
@@ -1,16 +1,16 @@
-<%= form_tag search_form_action, method: :get, class: "form-horizontal search-form", id: "search-form-header", role: "search" do %>
-  <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
+<%= form_tag search_form_action, method: :get, class: "search-form", id: "search-form-header", role: "search" do %>
+  <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
   <%= hidden_field_tag :search_field, 'all_fields' %>
-  <div class="form-group">
+  <div class="form-group row">
 
-    <label class="control-label col-sm-3" for="search-field-header">
+    <label class="col-sm-3 mb-0" for="search-field-header">
       <%= t("hyrax.search.form.q.label", application_name: application_name) %>
     </label>
 
-    <div class="input-group">
-      <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
+    <div class="input-group col-sm-9">
+      <%= text_field_tag :q, current_search_parameters , 'aria-label': 'Search', class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
 
-      <div class="input-group-btn">
+      <div class="input-group-append">
         <button type="submit" class="btn btn-primary" id="search-submit-header">
           <%= t('hyrax.search.button.html') %>
         </button>
diff --git a/app/views/catalog/index.html.erb b/app/views/catalog/index.html.erb
index 62c013a40..ebf4feb2b 100644
--- a/app/views/catalog/index.html.erb
+++ b/app/views/catalog/index.html.erb
@@ -1,13 +1,17 @@
-<%# copied from hyrax:/app/catalog/index.html.erb solely so we can change the page title %>
-<% content_for(:page_title, t('spot.catalog.index.page_title', name: t('hyrax.product_name'))) %>
+<%# copying this from hyrax as i wasn't able to find a way to modify the page title
+    to include the search parameters.
+    
+    @see app/helpers/spot/catalog_helper.rb
+    @see https://github.com/samvera/hyrax/blob/hyrax-v5.2.0/app/views/catalog/index.html.erb
+%>
+<% provide(:page_title) { page_title_for_search_results } %>
 
-<% result_classes = any_facets? ? 'col-md-9 col-md-push-3 col-sm-8 col-sm-push-4' : 'col-sm-12' %>
-<div id="content" class="<%= result_classes %>">
+<div class="row mt-4">
+  <div id="content" class="order-sm-1 order-md-2 col-md-9 col-sm-12">
     <%= render 'search_results' %>
-</div>
+  </div>
 
-<% if any_facets? %>
-<div id="sidebar" class="col-md-3 col-md-pull-9 col-sm-4 col-sm-pull-8">
-  <%= render 'search_sidebar' %>
+  <div id="sidebar" class="order-sm-2 order-md-1 col-md-3 col-sm-12">
+    <%= render 'search_sidebar' %>
+  </div>
 </div>
-<% end %>
diff --git a/app/views/hyrax/base/_export_options.html.erb b/app/views/hyrax/base/_export_options.html.erb
deleted file mode 100644
index e1ef82cfa..000000000
--- a/app/views/hyrax/base/_export_options.html.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-<div class="btn-group">
-  <button type="button"
-          class="btn btn-default dropdown-toggle"
-          data-toggle="dropdown"
-          aria-haspopup="true"
-          aria-expanded="false">
-    <%= t('spot.work.export.additional_options') %>
-    <span class="caret"></span>
-  </button>
-  <ul class="dropdown-menu">
-    <li class="dropdown-header">
-      <%= t('spot.work.export.dropdown.export_header') %>
-    </li>
-    <li>
-    <%= link_to presenter.export_all_text,
-                main_app.export_path(presenter),
-                data: { turbolinks: false } %>
-    </li>
-    <% if presenter.multiple_members? %>
-      <li class="dropdown-header">
-        <%= t('spot.work.export.dropdown.files_header') %>
-      </li>
-      <li>
-        <%= link_to t('spot.work.export.all_files'),
-                    main_app.export_path(presenter, export_type: :files),
-                    data: { turbolinks: false } %>
-      </li>
-    <% end %>
-
-    <li class="dropdown-header">
-      <%= t('spot.work.export.dropdown.metadata_header') %>
-    </li>
-    <% presenter.export_formats.each do |format| %>
-      <li>
-        <%= link_to main_app.polymorphic_path([presenter], format: format, locale: nil) do %>
-          <%= t "spot.work.export.metadata.#{format}",
-                default: 'spot.work.export.metadata.default',
-                format: format %>
-        <% end %>
-      </li>
-    <% end %>
-  </ul>
-</div>
diff --git a/app/views/hyrax/base/_export_primary_file.html.erb b/app/views/hyrax/base/_export_primary_file.html.erb
deleted file mode 100644
index 73d0787f4..000000000
--- a/app/views/hyrax/base/_export_primary_file.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-  <div class="btn-group">
-    <%= link_to presenter.download_url, class: 'btn btn-success', data: { turbolinks: false } do %>
-      <span class="fa fa-download"></span>
-      <%= t('spot.work.export.primary_file') %>
-    <% end %>
-  </div>
diff --git a/app/views/hyrax/base/_export_tools.html.erb b/app/views/hyrax/base/_export_tools.html.erb
index 174025974..ab15c7f07 100644
--- a/app/views/hyrax/base/_export_tools.html.erb
+++ b/app/views/hyrax/base/_export_tools.html.erb
@@ -1,4 +1,48 @@
-<div class="work-export-tools btn-toolbar" style="margin-bottom:1rem;">
-  <%= render 'export_primary_file', presenter: presenter %>
-  <%= render 'export_options', presenter: presenter %>
-</div>
+<div class="container-fluid p-0 mb-3">
+  <%# "Download this item" button %>
+  <%= link_to presenter.download_url, class: 'btn btn-success', data: { turbolinks: false } do %>
+    <span class="fa fa-download"></span>
+    <%= t('spot.work.export.primary_file') %>
+  <% end %>
+
+  <%# "Additional options" dropdown %>
+  <div class="btn-group">
+    <div class="dropdown">
+      <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+        <%= t('spot.work.export.additional_options') %>
+        <span class="caret"></span>
+      </button>
+      <div class="dropdown-menu">
+        <h6 class="dropdown-header">
+          <%= t('spot.work.export.dropdown.export_header') %>
+        </h6>
+        <%= link_to presenter.export_all_text,
+                    main_app.export_path(presenter),
+                    data: { turbolinks: false },
+                    class: 'dropdown-item' %>
+
+        <% if presenter.multiple_members? %>
+        <h6 class="dropdown-header">
+          <%= t('spot.work.export.dropdown.files_header') %>
+        </h6>
+        <%= link_to t('spot.work.export.all_files'),
+                    main_app.export_path(presenter, export_type: :files),
+                    data: { turbolinks: false },
+                    class: 'dropdown-item' %>
+        <% end %>
+
+        <h6 class="dropdown-header">
+          <%= t('spot.work.export.dropdown.metadata_header') %>
+        </h6>
+
+        <% presenter.export_formats.each do |format| %>
+          <%= link_to main_app.polymorphic_path([presenter], format: format, locale: nil), class: 'dropdown-item' do %>
+            <%= t "spot.work.export.metadata.#{format}",
+                  default: 'spot.work.export.metadata.default',
+                  format: format %>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/hyrax/base/_form_visibility_component.html.erb b/app/views/hyrax/base/_form_visibility_component.html.erb
index 63f4a8250..e478e6dcc 100644
--- a/app/views/hyrax/base/_form_visibility_component.html.erb
+++ b/app/views/hyrax/base/_form_visibility_component.html.erb
@@ -1,11 +1,19 @@
-<%# controls the display of visibility on the base hyrax form %>
-<% if f.object.embargo_release_date %>
+<%# controls the display of visibility on the base hyrax form;
+    we're customizing this add support for "metadata" only visibility options
+
+    @todo Is there a way to add custom visibilities within Hyrax proper?
+ %>
+<% if embargo_enforced?(f.object) %>
   <%= render 'form_permission_under_embargo', f: f %>
-<% elsif f.object.lease_expiration_date %>
+<% elsif lease_enforced?(f.object) %>
   <%= render 'form_permission_under_lease', f: f %>
 <% else %>
     <fieldset>
-      <legend class="legend-save-work">Visibility</legend>
+      <% if local_assigns[:save_work] %>
+        <legend class="legend-save-work"><%= t('.visibility') %></legend>
+      <% else %>
+        <legend><%= t('.visibility') %><%= raw(t('.subtitle_html')) %></legend>
+      <% end %>
       <ul class="visibility">
         <li class="radio">
           <label>
diff --git a/app/views/hyrax/base/_guts4form.html.erb b/app/views/hyrax/base/_guts4form.html.erb
index f5c35be21..713284a4c 100644
--- a/app/views/hyrax/base/_guts4form.html.erb
+++ b/app/views/hyrax/base/_guts4form.html.erb
@@ -7,24 +7,20 @@
 <% # we will yield to content_for for each tab, e.g. :files_tab %>
 <div class="row">
   <div class="col-xs-12 col-sm-8">
-    <div class="panel panel-default tabs" role="main">
+    <div class="tabs" role="main">
       <!-- Nav tabs -->
       <ul class="nav nav-tabs" role="tablist">
         <% (tabs - ['share']).each_with_index do | tab, i | %>
-          <% if i == 0 %>
-            <li role="presentation" class="active">
-          <% else %>
-            <li role="presentation">
-          <% end %>
-              <a href="#<%= tab %>" aria-controls="<%= tab %>" role="tab" data-toggle="tab">
-                <%= form_tab_label_for(form: f.object, tab: tab) %>
-              </a>
-            </li>
+          <li class="nav-item" role="presentation">
+            <a class="nav-link <% if i == 0 %>active<% end %>" href="#<%= tab %>" aria-controls="<%= tab %>" role="tab" data-toggle="tab">
+              <%= form_tab_label_for(form: f.object, tab: tab) %>
+            </a>
+          </li>
         <% end %>
 
         <% if current_user.admin? %>
-        <li role="presentation" id="tab-share" class="hidden">
-          <a href="#share" aria-controls="share" role="tab" data-toggle="tab">
+        <li role="presentation" id="tab-share" class="nav-item">
+          <a href="#share" aria-controls="share" role="tab" data-toggle="tab" class="nav-link">
             <%= form_tab_label_for(form: f.object, tab: 'share') %>
           </a>
         </li>
@@ -32,13 +28,9 @@
       </ul>
 
       <!-- Tab panes -->
-      <div class="tab-content">
+      <div class="tab-content card">
         <% (tabs - ['share']).each_with_index do | tab, i | %>
-          <% if i == 0 %>
-            <div role="tabpanel" class="tab-pane active" id="<%= tab %>">
-          <% else %>
-            <div role="tabpanel" class="tab-pane" id="<%= tab %>">
-          <% end %>
+          <div role="tabpanel" class="tab-pane <%= 'show active' if i == 0 %>" id="<%= tab %>">
             <div class="form-tab-content">
               <% # metadata_tab is sometimes provided %>
               <%= yield "#{tab}_tab".to_sym if content_for? "#{tab}_tab".to_sym %>
diff --git a/app/views/hyrax/base/_items_table.html.erb b/app/views/hyrax/base/_items_table.html.erb
index c88194ced..ebe132add 100644
--- a/app/views/hyrax/base/_items_table.html.erb
+++ b/app/views/hyrax/base/_items_table.html.erb
@@ -1,43 +1,45 @@
-<% members = presenter.member_presenters_for(presenter.list_of_item_ids_to_display) %>
+<% members = presenter.member_presenters %>
 
-<div class="panel panel-default">
-  <div class="panel-heading panel-heading-slim">
+<div class="card">
+  <div class="card-header">
     <h5>Contains</h5>
   </div>
-  <table class="table table-bordered metadata-table">
-    <tbody>
-    <% members.each do |member| %>
-      <% model_name = member.model_name.singular.to_sym %>
-      <% type = %i[file_set file].include?(model_name) ? 'File' : 'Work' %>
-      <% type_class = type == 'File' ? 'default' : 'primary' %>
-      <tr>
-        <td class="text-center">
-          <span class="label label-<%= type_class %>"><%= type %></span>
-          <% if type == 'File' && member.transcript_name != nil %>
-            <br>
-            <span class="label label-<%= type_class %>">Captioned</span>
+  <div class="card-body">
+    <table class="table table-sm table-bordered metadata-table">
+      <tbody>
+      <% members.each do |member| %>
+        <% model_name = member.model_name.singular.to_sym %>
+        <% type = %i[file_set file].include?(model_name) ? 'File' : 'Work' %>
+        <% type_class = type == 'File' ? 'default' : 'primary' %>
+        <tr>
+          <td class="text-center">
+            <span class="badge badge-secondary"><%= type %></span>
+            <% if type == 'File' && member.transcript_name != nil %>
+              <br>
+              <span class="badge badge-secondary">Captioned</span>
+            <% end %>
+          </td>
+          <td>
+            <% if presenter.metadata_only? %>
+              <%= member.first_title %>
+            <% else %>
+              <%= link_to(member.link_name, contextual_path(member, presenter)) %>
+            <% end %>
+          </td>
+          <td>
+            Uploaded <%= member.try(:date_uploaded) %>
+          </td>
+          <td class="text-center">
+            <%= member.permission_badge %>
+          </td>
+          <% if !presenter.metadata_only? && model_name == :file_set -%>
+          <td class="text-center">
+            <%= render "hyrax/file_sets/actions", file_set: member -%>
+          </td>
           <% end %>
-        </td>
-        <td>
-          <% if presenter.metadata_only? %>
-            <%= member.first_title %>
-          <% else %>
-            <%= link_to(member.link_name, contextual_path(member, presenter)) %>
-          <% end %>
-        </td>
-        <td>
-          Uploaded <%= member.try(:date_uploaded) %>
-        </td>
-        <td class="text-center">
-          <%= member.permission_badge %>
-        </td>
-        <% if !presenter.metadata_only? && model_name == :file_set -%>
-        <td class="text-center">
-          <%= render "hyrax/file_sets/actions", file_set: member -%>
-        </td>
-        <% end %>
-      </tr>
-    <% end %>
-    </tbody>
-  </table>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+  </div>
 </div>
diff --git a/app/views/hyrax/base/_metadata_and_viewer_panel.html.erb b/app/views/hyrax/base/_metadata_and_viewer_panel.html.erb
index ae15201e9..5fffa0189 100644
--- a/app/views/hyrax/base/_metadata_and_viewer_panel.html.erb
+++ b/app/views/hyrax/base/_metadata_and_viewer_panel.html.erb
@@ -1,8 +1,8 @@
-<div class="panel panel-default">
-  <div class="panel-heading">
+<div class="card">
+  <div class="card-header">
     <%= render 'work_title', presenter: presenter %>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <div class="row">
       <%= render 'workflow_actions_widget', presenter: presenter %>
       <% if current_ability.can?(:edit, presenter.id) %>
diff --git a/app/views/hyrax/base/_relationships.html.erb b/app/views/hyrax/base/_relationships.html.erb
index cee106682..b9f734288 100644
--- a/app/views/hyrax/base/_relationships.html.erb
+++ b/app/views/hyrax/base/_relationships.html.erb
@@ -25,18 +25,16 @@
         <% url = polymorphic_url([item_type], id: item.id) %>
         <% text = (item.try(:abstract) || item.try(:description) || []).first %>
         <div class="col-md-3">
-          <div class="thumbnail">
-            <%= image_tag(item.thumbnail_path, alt: '') %>
-            <div class="caption">
-              <h3><%= item.title.first %></h3>
+          <div class="card">
+          <img class="card-img-top" src="<%= item.thumbnail_path %>" alt="" />
+            <div class="card-body">
+              <h3 class="card-title mb-1" style="text-align: center; font-size: 1.2rem"><%= item.title.first %></h3>
               <% if text.present? %>
-              <p><%= text %></p>
+              <p class="card-text"><%= text %></p>
               <% end %>
-              <p>
-                <a href="<%= url %>" class="btn btn-info btn-block">
-                  View <%= thing %>
-                </a>
-              </p>
+              <a href="<%= url %>" class="btn btn-info btn-block">
+                View <%= thing %>
+              </a>
             </div>
           </div>
         </div> <%# /col-md-3 %>
diff --git a/app/views/hyrax/base/_repository_metadata.html.erb b/app/views/hyrax/base/_repository_metadata.html.erb
index c1718088a..c63f0f34b 100644
--- a/app/views/hyrax/base/_repository_metadata.html.erb
+++ b/app/views/hyrax/base/_repository_metadata.html.erb
@@ -1,24 +1,26 @@
-<div class="panel panel-default">
-  <div class="panel-heading panel-heading-slim">
+<div class="card">
+  <div class="card-header">
     <h5>Repository History</h5>
   </div>
-  <table class="table table-bordered metadata-table">
-    <tbody>
-      <%= presenter.attribute_to_html(:note) %>
-      <%= presenter.attribute_to_html(:admin_set, render_as: :faceted, search_field: :admin_set_sim) %>
-      <tr>
-        <th>Workflow status</th>
-        <td><%= presenter.workflow.badge %></td>
-      </tr>
-      <%= presenter.attribute_to_html(:embargo_release_date) %>
-      <%= presenter.attribute_to_html(:lease_expiration_date) %>
-      <%= presenter.attribute_to_html(:local_identifier, render_as: :identifier, local: true) %>
-      <%= presenter.attribute_to_html(:source_identifier) %>
-      <%= presenter.attribute_to_html(:depositor, render_as: :faceted, search_field: :depositor_ssim) %>
-      <%= presenter.attribute_to_html(:barcode, render_as: :faceted, search_field: :barcode_ssim) %>
-      <%= presenter.attribute_to_html(:date_created) %>
-      <%= presenter.attribute_to_html(:date_uploaded) %>
-      <%= presenter.attribute_to_html(:date_modified) %>
-    </tbody>
-  </table>
+  <div class="card-body">
+    <table class="table table-sm table-bordered metadata-table">
+      <tbody>
+        <%= presenter.attribute_to_html(:note) %>
+        <%= presenter.attribute_to_html(:admin_set, render_as: :faceted, search_field: :admin_set_sim) %>
+        <tr>
+          <th class="p-2">Workflow status</th>
+          <td class="p-2"><%= presenter.workflow.badge %></td>
+        </tr>
+        <%= presenter.attribute_to_html(:embargo_release_date) %>
+        <%= presenter.attribute_to_html(:lease_expiration_date) %>
+        <%= presenter.attribute_to_html(:local_identifier, render_as: :identifier, local: true) %>
+        <%= presenter.attribute_to_html(:source_identifier) %>
+        <%= presenter.attribute_to_html(:depositor, render_as: :faceted, search_field: :depositor_ssim) %>
+        <%= presenter.attribute_to_html(:barcode, render_as: :faceted, search_field: :barcode_ssim) %>
+        <%= presenter.attribute_to_html(:date_created) %>
+        <%= presenter.attribute_to_html(:date_uploaded) %>
+        <%= presenter.attribute_to_html(:date_modified) %>
+      </tbody>
+    </table>
+  </div>
 </div>
diff --git a/app/views/hyrax/base/_work_title.html.erb b/app/views/hyrax/base/_work_title.html.erb
index d3a06f178..4c0c98353 100644
--- a/app/views/hyrax/base/_work_title.html.erb
+++ b/app/views/hyrax/base/_work_title.html.erb
@@ -1,16 +1,14 @@
 <% presenter.title.each_with_index do |title, index| %>
-  <div class="row">
-    <div class="col-sm-12">
-      <% if index == 0 %>
-        <h2>
-          <%= title %>
-          <% unless presenter.public? %>
-          <small class="text-muted"><%= presenter.permission_badge %></small>
-          <% end %>
-        </h2>
-      <% else %>
-        <h2><%= title %></h2>
-      <% end %>
-    </div>
+  <div class="container">
+    <% if index == 0 %>
+      <h1>
+        <%= title %>
+        <% unless presenter.public? %>
+        <small class="text-muted"><%= presenter.permission_badge %></small>
+        <% end %>
+      </h1>
+    <% else %>
+      <h1><%= title %></h1>
+    <% end %>
   </div>
 <% end %>
diff --git a/app/views/hyrax/base/show.html.erb b/app/views/hyrax/base/show.html.erb
index 667dd07cd..0fee8420e 100644
--- a/app/views/hyrax/base/show.html.erb
+++ b/app/views/hyrax/base/show.html.erb
@@ -2,11 +2,12 @@
 
 <%= render 'shared/citations' %>
 
-<div class="work-type" itemscope itemtype="http://schema.org/CreativeWork">
+<div class="work-type">
   <%= render 'metadata_and_viewer_panel', presenter: @presenter %>
   <%= render 'relationships', presenter: @presenter, polymorphic_url: method(:polymorphic_url) %>
 </div>
 
+
 <script>
   // need to initialize the popovers in the metadata
   $(function () { $('[data-toggle="popover"]').popover() })
diff --git a/app/views/hyrax/dashboard/collections/_form.html.erb b/app/views/hyrax/dashboard/collections/_form.html.erb
deleted file mode 100644
index c5d127d0e..000000000
--- a/app/views/hyrax/dashboard/collections/_form.html.erb
+++ /dev/null
@@ -1,117 +0,0 @@
-<div class="panel panel-default tabs" id="collection-edit-controls">
-  <ul class="nav nav-tabs" role="tablist">
-    <li class="active">
-      <a href="#description" role="tab" data-toggle="tab"><%= t('.tabs.description') %></a>
-    </li>
-    <% if @form.persisted? %>
-      <% if @collection.brandable? %>
-      <li>
-        <a href="#branding" role="tab" data-toggle="tab"><%= t('.tabs.branding') %></a>
-      </li>
-      <% end %>
-      <% if @collection.discoverable? %>
-      <li>
-        <a href="#discovery" role="tab" data-toggle="tab"><%= t('.tabs.discovery') %></a>
-      </li>
-      <% end %>
-      <% if @collection.sharable? %>
-      <li>
-        <a href="#sharing" role="tab" data-toggle="tab"><%= t('.tabs.sharing') %></a>
-      </li>
-      <% end %>
-    <% end %>
-  </ul>
-
-  <%= simple_form_for @form,
-                      url: [hyrax, :dashboard, @form],
-                      html: {
-                        class: 'editor',
-                        data: {
-                          behavior: 'work-form'
-                        }
-                      } do |f| %>
-    <div class="tab-content">
-      <div id="description" class="tab-pane active">
-        <div class="panel panel-default labels">
-          <div class="panel-body">
-
-            <div id="base-terms">
-              <% f.object.primary_terms.each do |term| %>
-                <%= render_edit_field_partial(term, f: f) %>
-              <% end %>
-
-              <% if f.object.persisted? %>
-                <%# we're loading these values dynamically to speed page load %>
-                <%= f.input :thumbnail_id,
-                            input_html: { data: { text: f.object.thumbnail_title } } %>
-              <% end %>
-            </div>
-            <% if f.object.display_additional_fields? %>
-              <%= link_to t('hyrax.collection.form.additional_fields'),
-                      '#extended-terms',
-                      class: 'btn btn-default additional-fields',
-                      data: { toggle: 'collapse' },
-                      role: "button",
-                      'aria-expanded'=> "false",
-                      'aria-controls'=> "extended-terms" %>
-              <div id="extended-terms" class='collapse'>
-                <% f.object.secondary_terms.each do |term| %>
-                  <%= render_edit_field_partial(term, f: f) %>
-                <% end %>
-              </div>
-            <% end %>
-            <%= hidden_field_tag :type, params[:type] %>
-            <%= hidden_field_tag :stay_on_edit, true %>
-            <%= hidden_field_tag :collection_type_gid, @collection.collection_type_gid %>
-            <!-- parent_id may be passed from the nested collections controller to allow a subcollection relationship to be added as collection is created -->
-            <% if params[:parent_id].present? %>
-              <%= hidden_field_tag :parent_id, params[:parent_id] %>
-            <% end %>
-            <% if params[:batch_document_ids].present? %>
-              <% params[:batch_document_ids].each do |batch_item| %>
-                <input type="hidden" name="batch_document_ids[]" value="<%= batch_item %>" />
-              <% end %>
-            <% end %>
-          </div>
-        </div>
-      </div> <!-- end description -->
-
-      <% if @form.persisted? %>
-        <div id="branding" class="tab-pane">
-          <div class="panel panel-default labels">
-            <div class="panel-body">
-              <%= render 'form_branding', f: f %>
-            </div>
-          </div>
-        </div>
-
-        <div id="discovery" class="tab-pane">
-          <div class="panel panel-default labels">
-            <div class="panel-body">
-              <%= render 'form_discovery', f: f %>
-            </div>
-          </div>
-        </div>
-
-        <div id="sharing" class="tab-pane">
-          <div class="panel panel-default labels" id="collection_permissions" data-param-key="<%= f.object.model_name.param_key %>">
-            <div class="panel-body">
-              <%= render 'form_share', f: f %>
-            </div>
-          </div>
-        </div>
-      <% end %>
-
-      <div class="panel-footer">
-        <% if @collection.persisted? %>
-          <%= f.submit t(:'hyrax.collection.select_form.update'), class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "update_submit", name: "update_collection" %>
-          <%= link_to t(:'helpers.action.cancel'), hyrax.dashboard_collection_path(@collection), class: 'btn btn-link' %>
-        <% else %>
-          <%= f.submit t(:'hyrax.collection.select_form.create'), class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "create_submit", name: "create_collection" %>
-          <%= link_to t(:'helpers.action.cancel'), hyrax.my_collections_path, class: 'btn btn-link' %>
-        <% end %>
-      </div>
-    </div> <!-- end tab-content -->
-  <% end # simple_form_for %>
-
-</div> <!-- end collection-controls -->
diff --git a/app/views/hyrax/dashboard/collections/_show_actions.html.erb b/app/views/hyrax/dashboard/collections/_show_actions.html.erb
deleted file mode 100644
index 93dc9de34..000000000
--- a/app/views/hyrax/dashboard/collections/_show_actions.html.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-<h2 class="sr-only"><%= t('hyrax.collection.actions.header') %></h2>
-<% if presenter.collection_featurable? %>
-  <%= link_to 'Feature',
-              main_app.featured_collection_path(presenter, format: :json),
-              data: { behavior: 'feature' },
-              class: presenter.display_unfeature_link? ? 'btn btn-default collapse' : 'btn btn-default' %>
-
-  <%= link_to 'Unfeature',
-              main_app.featured_collection_path(presenter, format: :json),
-              data: { behavior: 'unfeature' },
-              class: presenter.display_feature_link? ? 'btn btn-default collapse' : 'btn btn-default' %>
-<% end %>
-
-<% if can? :edit, presenter.solr_document %>
-    <%= link_to t('hyrax.collection.actions.edit.label'),
-                hyrax.edit_dashboard_collection_path(presenter),
-                title: t('hyrax.collection.actions.edit.desc'),
-                class: 'btn btn-primary' %>
-<% end %>
-
-<% if presenter.collection_type_is_nestable? && presenter.user_can_nest_collection? %>
-<!-- The user should have deposit access to the parent and read access to the child (the collection we are already showing, so no test is necessary). -->
-    <%= button_tag '',
-                  class: 'btn btn-primary add-to-collection',
-                  title: t("hyrax.collection.actions.nested_subcollection.desc"),
-                  type: 'button',
-                  data: { nestable: presenter.collection_type_is_nestable?,
-                          hasaccess: true } do %>
-                  <%= t('hyrax.collection.actions.nested_subcollection.button_label') %>
-                <% end %>
-<% end %>
-
-<% if can? :destroy, presenter.solr_document %>
-    <%= link_to t('hyrax.collection.actions.delete.label'),
-                hyrax.dashboard_collection_path(presenter),
-                title: t('hyrax.collection.actions.delete.desc'),
-                class: 'btn btn-danger',
-                data: { confirm: t('hyrax.collection.actions.delete.confirmation'),
-                        method: :delete } %>
-<% end %>
diff --git a/app/views/hyrax/dashboard/collections/edit.html.erb b/app/views/hyrax/dashboard/collections/edit.html.erb
index 9e0a34f1d..4b1fd3f2b 100644
--- a/app/views/hyrax/dashboard/collections/edit.html.erb
+++ b/app/views/hyrax/dashboard/collections/edit.html.erb
@@ -1,10 +1,14 @@
-<% provide :page_title, construct_page_title( t('.header', type_title: @collection.collection_type.title, title: @form.title) ) %>
+<%#
+  duplicating this from Hyrax to modify the value being passed to the page title/header.
+  when we look at refactoring for valkyrie, there might be a more config-orientated way
+  to achieve singular form fields for multiple valued keys.
+%>
+<% type_title = collection_type_label_for(collection: @collection) %>
+
+<% provide :page_title, construct_page_title( t('.header', type_title: type_title, title: @form.title) ) %>
 
 <% provide :page_header do %>
-  <h1>
-    <span class="fa fa-edit" aria-hidden="true"></span>
-    <%= t('.header', type_title: @collection.collection_type.title, title: @form.title) %>
-  </h1>
+  <h1><span class="fa fa-edit" aria-hidden="true"></span><%= t('.header', type_title: type_title, title: @form.title) %></h1>
 <% end %>
 
 <div class="row">
@@ -12,4 +16,4 @@
     <%= render 'flash_msg' %>
     <%= render 'form' %>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/views/hyrax/dashboard/sidebar/_activity.html.erb b/app/views/hyrax/dashboard/sidebar/_activity.html.erb
deleted file mode 100644
index a30f3762f..000000000
--- a/app/views/hyrax/dashboard/sidebar/_activity.html.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-  <li class="h5"><%= t('hyrax.admin.sidebar.activity') %></li>
-
-  <li>
-    <%= menu.collapsable_section t('hyrax.admin.sidebar.user_activity'),
-                                 icon_class: "fa fa-line-chart",
-                                 id: 'collapseUserActivity',
-                                 open: menu.user_activity_section? do %>
-      <%= menu.nav_link(hyrax.dashboard_profile_path(current_user),
-                        also_active_for: hyrax.edit_dashboard_profile_path(current_user)) do %>
-        <span class="fa fa-id-card" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.profile') %></span>
-      <% end %>
-
-      <%= menu.nav_link(hyrax.notifications_path) do %>
-        <span class="fa fa-bell" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.notifications') %></span>
-      <% end %>
-
-      <%= menu.nav_link(hyrax.transfers_path) do %>
-        <span class="fa fa-arrows-h" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.transfers') %></span>
-      <% end %>
-
-      <% if Flipflop.proxy_deposit? %>
-        <%= menu.nav_link(hyrax.depositors_path) do %>
-          <span class="fa fa-users" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.dashboard.manage_proxies') %></span>
-        <% end %>
-      <% end %>
-    <% end %>
-  </li>
-
-  <% if can? :read, :admin_dashboard %>
-    <%= menu.nav_link(hyrax.admin_stats_path) do %>
-      <span class="fa fa-bar-chart" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.statistics') %></span>
-    <% end %>
-
-    <%= menu.nav_link(main_app.admin_fixity_checks_path) do %>
-      <span class="fa fa-lock" aria-hidden="true"></span>
-      <span class="sidebar-action-text">
-        <%= t('spot.dashboard.fixity.sidebar') %>
-      </span>
-    <% end %>
-  <% end %>
diff --git a/app/views/hyrax/dashboard/sidebar/_configuration.html.erb b/app/views/hyrax/dashboard/sidebar/_configuration.html.erb
index 7c743e23b..73edb2394 100644
--- a/app/views/hyrax/dashboard/sidebar/_configuration.html.erb
+++ b/app/views/hyrax/dashboard/sidebar/_configuration.html.erb
@@ -6,19 +6,19 @@
                                    id: 'collapseSettings',
                                    open: menu.settings_section? do %>
         <% if can?(:manage, :collection_types) %>
-          <%= menu.nav_link(hyrax.admin_collection_types_path) do %>
+          <%= menu.nav_link(hyrax.admin_collection_types_path, class: 'nav-link') do %>
             <span class="fa fa-folder-open" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.collection_types') %></span>
           <% end %>
         <% end %>
         <% if can?(:manage, Hyrax::Feature) %>
-          <%= menu.nav_link(hyrax.admin_features_path) do %>
+          <%= menu.nav_link(hyrax.admin_features_path, class: 'nav-link') do %>
             <span class="fa fa-wrench" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.technical') %></span>
           <% end %>
         <% end %>
       <% end %>
     </li>
     <% if can?(:manage, Sipity::WorkflowResponsibility) %>
-      <%= menu.nav_link(hyrax.admin_workflow_roles_path) do %>
+      <%= menu.nav_link(hyrax.admin_workflow_roles_path, class: 'nav-link') do %>
         <span class="fa fa-users" aria-hidden="true"></span>
         <span class="sidebar-action-text">
           <%= t('hyrax.admin.sidebar.workflow_roles') %>
@@ -26,7 +26,7 @@
       <% end %>
     <% end %>
     <% if can?(:manage, Role) %>
-      <%= menu.nav_link(role_management.roles_path) do %>
+      <%= menu.nav_link(role_management.roles_path, class: 'nav-link') do %>
         <span class="fa fa-user" aria-hidden="true"></span>
         <span class="sidebar-action-text">
           <%= t('role-management.dashboard') %>
@@ -37,7 +37,7 @@
       we won't check if the user can see the system status. we'll assume
       that they're okay because they're able to see the dashboard.
     %>
-    <%= menu.nav_link(main_app.admin_status_path) do %>
+    <%= menu.nav_link(main_app.admin_status_path, class: 'nav-link') do %>
       <span class="fa fa-tachometer" aria-hidden="true"></span>
       <span class="sidebar-action-text">
         <%= t('spot.dashboard.status.sidebar') %>
diff --git a/app/views/hyrax/dashboard/sidebar/_fixity_checks.html.erb b/app/views/hyrax/dashboard/sidebar/_fixity_checks.html.erb
new file mode 100644
index 000000000..08e403da6
--- /dev/null
+++ b/app/views/hyrax/dashboard/sidebar/_fixity_checks.html.erb
@@ -0,0 +1,8 @@
+<% if can? :read, :admin_dashboard %>
+  <%= menu.nav_link(main_app.admin_fixity_checks_path, class: 'nav-link') do %>
+    <span class="fa fa-lock" aria-hidden="true"></span>
+    <span class="sidebar-action-text">
+      <%= t('spot.dashboard.fixity.sidebar') %>
+    </span>
+  <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb b/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb
index 09647c8b5..d34a5f5cd 100644
--- a/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb
+++ b/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb
@@ -1,13 +1,15 @@
-  <li class="h5"><%= t('hyrax.admin.sidebar.repository_objects') %></li>
+  <li class="h5 nav-item"><%= t('hyrax.admin.sidebar.repository_objects') %></li>
 
   <% if current_user.can?(:manage_any?, Collection) %>
   <%= menu.nav_link(hyrax.my_collections_path,
+                    class: 'nav-link',
                     also_active_for: hyrax.dashboard_collections_path) do %>
     <span class="fa fa-folder-open" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.collections') %></span>
   <% end %>
 
   <% end %>
   <%= menu.nav_link(hyrax.my_works_path,
+                    class: 'nav-link',
                     also_active_for: hyrax.dashboard_works_path) do %>
     <span class="fa fa-file" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.works') %></span>
   <% end %>
diff --git a/app/views/hyrax/file_sets/_activity_log.html.erb b/app/views/hyrax/file_sets/_activity_log.html.erb
index 8457bf94e..8a3bec4cc 100644
--- a/app/views/hyrax/file_sets/_activity_log.html.erb
+++ b/app/views/hyrax/file_sets/_activity_log.html.erb
@@ -1,13 +1,13 @@
-<div class="panel panel-default">
-  <div class="panel-heading panel-heading-slim">
-    <h5>Activity Log</h5>
+<div class="card">
+  <div class="card-header py-1">
+    <h5 class="mb-0">Activity Log</h5>
   </div>
 
-  <ul class="list-group">
+  <ul class="list-group list-group-flush">
   <% events.each do |event| %>
   <% time = Time.zone.at event[:timestamp].to_i %>
     <li class="list-group-item">
-      <span class="badge">
+    <span class="badge badge-secondary activity-log">
         <relative-time datetime="<%= time.getutc.iso8601 %>" title="<%= time.to_formatted_s(:standard) %>">
           <%= time.to_formatted_s(:long_ordinal) %>
         </relative-time>
diff --git a/app/views/hyrax/file_sets/_fixity_information.html.erb b/app/views/hyrax/file_sets/_fixity_information.html.erb
index 99fd1a730..98668a43d 100644
--- a/app/views/hyrax/file_sets/_fixity_information.html.erb
+++ b/app/views/hyrax/file_sets/_fixity_information.html.erb
@@ -1,20 +1,20 @@
 <% fixity = Spot::FixityStatusPresenter.new(presenter.id) %>
-<div class="panel panel-default">
-  <div class="panel-heading panel-heading-slim">
-    <h5>Fixity Check</h5>
+<div class="card">
+  <div class="card-header py-1">
+    <h5 class="mb-0">Fixity Check</h5>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <%= fixity.summary %>
   </div>
 
-  <ul class="list-group">
+  <ul class="list-group list-group-flush">  
   <% fixity.log_records.each do |log| %>
     <% lgi_class = ' list-group-item-danger' if log.failed? %>
-    <% label_class = log.failed? ? 'label-danger' : 'label-success' %>
+    <% label_class = log.failed? ? 'badge-danger' : 'badge-success' %>
     <% label_text = log.failed? ? 'Fail' : 'Pass' %>
 
     <li class="list-group-item<%= lgi_class %>">
-      <span class="label <%= label_class %>" style="text-transform: uppercase;"><%= label_text %></span>
+      <span class="badge <%= label_class %>" style="text-transform: uppercase;"><%= label_text %></span>
       Expected result: <code><%= log.expected_result %></code>
     </li>
   <% end %>
diff --git a/app/views/hyrax/file_sets/_show_actions.html.erb b/app/views/hyrax/file_sets/_show_actions.html.erb
index df3633896..fafd03687 100644
--- a/app/views/hyrax/file_sets/_show_actions.html.erb
+++ b/app/views/hyrax/file_sets/_show_actions.html.erb
@@ -1,15 +1,17 @@
-<div class="form-actions well well-sm">
-  <% if Hyrax.config.analytics? %>
-    <%= link_to "Analytics", @presenter.stats_path, id: 'stats', class: 'btn btn-default' %>
-  <% end %>
+<div class="form-actions card bg-light">
+  <div class="card-body p-2">
+    <% if Hyrax.config.analytics? %>
+      <%= link_to "Analytics", @presenter.stats_path, id: 'stats', class: 'btn btn-default' %>
+    <% end %>
 
-  <% if @presenter.editor? %>
-      <%= link_to "Edit This #{@presenter.human_readable_type}", edit_polymorphic_path([main_app, @presenter]),
-                  class: 'btn btn-default' %>
-      <%= link_to "Delete This #{@presenter.human_readable_type}", [main_app, @presenter],
-                  class: 'btn btn-danger', data: { confirm: "Delete this #{@presenter.human_readable_type}?" },
-                  method: :delete %>
-  <% end %>
+    <% if @presenter.editor? %>
+        <%= link_to "Edit This #{@presenter.human_readable_type}", edit_polymorphic_path([main_app, @presenter]),
+                    class: 'btn btn-default' %>
+        <%= link_to "Delete This #{@presenter.human_readable_type}", [main_app, @presenter],
+                    class: 'btn btn-danger', data: { confirm: "Delete this #{@presenter.human_readable_type}?" },
+                    method: :delete %>
+    <% end %>
 
-  <%# render 'social_media' %>
+    <%# render 'social_media' %>
+  </div>
 </div>
diff --git a/app/views/hyrax/file_sets/_show_details.html.erb b/app/views/hyrax/file_sets/_show_details.html.erb
index 07b92339a..6048d0cf6 100644
--- a/app/views/hyrax/file_sets/_show_details.html.erb
+++ b/app/views/hyrax/file_sets/_show_details.html.erb
@@ -1,8 +1,8 @@
-<div class="panel panel-default">
-  <div class="panel-heading panel-heading-slim">
-    <h5>File Details</h5>
+<div class="card">
+  <div class="card-header py-1">
+    <h5 class="mb-0">File Details</h5>
   </div>
-  <table class="table table-bordered">
+  <table class="table table-bordered mb-0">
     <tbody>
       <% if current_user&.admin? %>
       <tr>
diff --git a/app/views/hyrax/file_sets/_thumbnail.html.erb b/app/views/hyrax/file_sets/_thumbnail.html.erb
index ab6a1530c..ebc731fde 100644
--- a/app/views/hyrax/file_sets/_thumbnail.html.erb
+++ b/app/views/hyrax/file_sets/_thumbnail.html.erb
@@ -1,5 +1,5 @@
 <div class="thumbnail file-set">
-  <img src="<%= presenter.solr_document.thumbnail_path %>" />
+  <img class="thumbnail file-set image" src="<%= presenter.solr_document.thumbnail_path %>" />
 
   <div class="caption">
   <%= link_to hyrax.download_path(presenter), class: 'btn btn-success btn-block' do %>
diff --git a/app/views/hyrax/file_sets/edit.html.erb b/app/views/hyrax/file_sets/edit.html.erb
index f4c80f25b..a2c4fffa0 100644
--- a/app/views/hyrax/file_sets/edit.html.erb
+++ b/app/views/hyrax/file_sets/edit.html.erb
@@ -26,19 +26,21 @@
     <%= render 'thumbnail', presenter: @presenter %>
   </div>
   <div class="col-xs-12 col-sm-8">
-    <div class="panel panel-default tabs">
-      <ul class="nav nav-tabs" role="tablist">
-        <li id="edit_descriptions_link" class="active">
-          <a href="#descriptions_display" data-toggle="tab" class="nav-safety-confirm"><i class="fa fa-tags" aria-hidden="true"></i></span> <%= t('.descriptions') %></a>
-        </li>
-        <li id="edit_versioning_link">
-          <a href="#versioning_display" data-toggle="tab" class="nav-safety-confirm"><i class="fa fa-sitemap" aria-hidden="true"></i> <%= t('.versions') %></a>
-        </li>
-        <li id="edit_permissions_link">
-          <a href="#permissions_display" data-toggle="tab" class="nav-safety-confirm"><i class="fa fa-key" aria-hidden="true"></i> <%= t('.permissions') %></a>
-        </li>
-      </ul>
-      <div class="panel-body">
+    <div class="card">
+      <div class="card-header">
+        <ul class="nav nav-tabs card-header-tabs">
+          <li id="edit_descriptions_link" class="nav-item">
+            <a class="nav-link active" href="#descriptions_display" data-toggle="tab" class="nav-safety-confirm"><i class="fa fa-tags" aria-hidden="true"></i></span> <%= t('.descriptions') %></a>
+          </li>
+          <li id="edit_versioning_link" class="nav-item">
+            <a class="nav-link" href="#versioning_display" data-toggle="tab" class="nav-safety-confirm"><i class="fa fa-sitemap" aria-hidden="true"></i> <%= t('.versions') %></a>
+          </li>
+          <li id="edit_permissions_link" class="nav-item">
+            <a class="nav-link" href="#permissions_display" data-toggle="tab" class="nav-safety-confirm"><i class="fa fa-key" aria-hidden="true"></i> <%= t('.permissions') %></a>
+          </li>
+        </ul>
+      </div>
+      <div class="card-body">
         <div class="tab-content">
           <div id="descriptions_display" class="tab-pane active">
             <h2><%= t('.descriptions') %></h2>
diff --git a/app/views/hyrax/images/_metadata.html.erb b/app/views/hyrax/images/_metadata.html.erb
index 6d52ac842..2a2ec0a89 100644
--- a/app/views/hyrax/images/_metadata.html.erb
+++ b/app/views/hyrax/images/_metadata.html.erb
@@ -1,5 +1,5 @@
 <div class="panel panel-default">
-  <table class="table table-bordered work-show <%= dom_class(presenter) %> metadata-table">
+  <table class="table table-sm table-bordered work-show <%= dom_class(presenter) %> metadata-table">
     <tbody>
       <%= presenter.attribute_to_html(:title) %>
       <%= presenter.attribute_to_html(:subtitle) %>
diff --git a/app/views/hyrax/publications/_metadata.html.erb b/app/views/hyrax/publications/_metadata.html.erb
index 38143653b..75357a30d 100644
--- a/app/views/hyrax/publications/_metadata.html.erb
+++ b/app/views/hyrax/publications/_metadata.html.erb
@@ -1,6 +1,6 @@
 <%# overriding the metadata display for Publications %>
 <div class="panel panel-default">
-  <table class="table table-bordered work-show <%= dom_class(presenter) %> metadata-table">
+  <table class="table table-sm table-bordered work-show <%= dom_class(presenter) %> metadata-table">
     <tbody>
       <%= presenter.attribute_to_html(:title) %>
       <%= presenter.attribute_to_html(:subtitle, show_help_text: true) %>
diff --git a/app/views/hyrax/student_works/_metadata.html.erb b/app/views/hyrax/student_works/_metadata.html.erb
index 66d7b7e75..6d38bcf6b 100644
--- a/app/views/hyrax/student_works/_metadata.html.erb
+++ b/app/views/hyrax/student_works/_metadata.html.erb
@@ -1,32 +1,34 @@
-<div class="panel panel-default">
-  <table class="table table-bordered work-show <%= dom_class(presenter) %> metadata-table">
-    <tbody>
-      <%= presenter.attribute_to_html(:title) %>
-      <%= presenter.attribute_to_html(:creator) %>
-      <%= presenter.attribute_to_html(:advisor_label,
-                                      render_as: :faceted,
-                                      search_field: :advisor_label_ssim) %>
-      <%= presenter.attribute_to_html(:academic_department, render_as: :faceted) %>
-      <%= presenter.attribute_to_html(:division, render_as: :faceted) %>
-      <%= presenter.attribute_to_html(:date) %>
-      <%= presenter.attribute_to_html(:date_available) %>
-      <%= presenter.attribute_to_html(:resource_type, render_as: :faceted) %>
-      <%= presenter.attribute_to_html(:language_label,
-                                      render_as: :faceted,
-                                      search_field: :language_label_ssim) %>
-      <%= presenter.attribute_to_html(:related_resource) %>
-      <%= presenter.attribute_to_html(:access_note) %>
-      <%= presenter.attribute_to_html(:organization, render_as: :faceted) %>
-      <%= presenter.attribute_to_html(:subject,
-                                      render_as: :external_authority,
-                                      search_field: :subject_label_sim) %>
-      <%= presenter.attribute_to_html(:keyword, render_as: :faceted) %>
-      <%= presenter.attribute_to_html(:bibliographic_citation) %>
-      <%= presenter.attribute_to_html(:standard_identifier, render_as: :identifier) %>
-      <%= presenter.attribute_to_html(:note) %>
-      <%= presenter.attribute_to_html(:permalink) %>
+<div class="card">
+  <div class="card-body">
+    <table class="table table-sm table-bordered work-show <%= dom_class(presenter) %> metadata-table">
+      <tbody>
+        <%= presenter.attribute_to_html(:title) %>
+        <%= presenter.attribute_to_html(:creator) %>
+        <%= presenter.attribute_to_html(:advisor_label,
+                                        render_as: :faceted,
+                                        search_field: :advisor_label_ssim) %>
+        <%= presenter.attribute_to_html(:academic_department, render_as: :faceted) %>
+        <%= presenter.attribute_to_html(:division, render_as: :faceted) %>
+        <%= presenter.attribute_to_html(:date) %>
+        <%= presenter.attribute_to_html(:date_available) %>
+        <%= presenter.attribute_to_html(:resource_type, render_as: :faceted) %>
+        <%= presenter.attribute_to_html(:language_label,
+                                        render_as: :faceted,
+                                        search_field: :language_label_ssim) %>
+        <%= presenter.attribute_to_html(:related_resource) %>
+        <%= presenter.attribute_to_html(:access_note) %>
+        <%= presenter.attribute_to_html(:organization, render_as: :faceted) %>
+        <%= presenter.attribute_to_html(:subject,
+                                        render_as: :external_authority,
+                                        search_field: :subject_label_sim) %>
+        <%= presenter.attribute_to_html(:keyword, render_as: :faceted) %>
+        <%= presenter.attribute_to_html(:bibliographic_citation) %>
+        <%= presenter.attribute_to_html(:standard_identifier, render_as: :identifier) %>
+        <%= presenter.attribute_to_html(:note) %>
+        <%= presenter.attribute_to_html(:permalink) %>
 
-      <%= render 'shared/metadata/rights_statement', presenter: presenter %>
-    </tbody>
-  </table>
+        <%= render 'shared/metadata/rights_statement', presenter: presenter %>
+      </tbody>
+    </table>
+  </div>
 </div>
diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb
index be9f3f696..0b9d509cf 100644
--- a/app/views/shared/_footer.html.erb
+++ b/app/views/shared/_footer.html.erb
@@ -1,31 +1,43 @@
 <footer class="site-footer">
   <div class="container-fluid">
-    <div class="row">
+    <div class="row justify-content-between">
       <div class="col-sm-4">
         <h4><%= t('hyrax.product_name') %></h4>
+        <ul class="list-unstyled">
         <% if site_last_updated.present? %>
-        <p><a href="https://github.com/LafayetteCollegeLibraries/spot"><%= t('spot.footer.last_updated', date: site_last_updated) %></a></p>
-        <p><a href="https://hyrax.samvera.org/">Powered by Hyrax</a></p>
+          <li>
+            <a href="https://github.com/LafayetteCollegeLibraries/spot">
+              <%= t('spot.footer.last_updated', date: site_last_updated) %>
+            </a>
+          </li>
         <% end %>
+        <li>
+          <a href="https://hyrax.samvera.org/">
+            <%= hyrax_footer_text %>
+          </a>
+        </li>
+        </ul>
       </div>
-      <div class="col-sm-5 col-sm-offset-3">
-        <div class="col-sm-6">
-          <ul>
-            <li><%= link_to 'Learn more about the repository', main_app.about_path %></li>
-            <li><%= link_to 'Get help using the repository', main_app.help_path %></li>
-            <li><%= link_to 'Contact us', hyrax.contact_path %></li>
-            <li><%= link_to 'Terms of Use', main_app.terms_of_use_path %></li>
-          </ul>
-        </div>
-        <div class="col-sm-6">
-          <ul>
-            <li><%= link_to t('spot.links.department.name'), t('spot.links.department.url') %></li>
-            <li><%= link_to t('spot.links.library.name'), t('spot.links.library.url') %></li>
-            <li><%= link_to t('spot.links.lafayette.name'), t('spot.links.lafayette.url') %></li>
-            <li><%= link_to t('spot.links.a18y_remediation.name'), t('spot.links.a18y_remediation.url') %></li>
-          </ul>
+      <div class="col-sm-5">
+        <div class="row">
+          <div class="col-sm-6">
+            <ul>
+              <li><%= link_to 'Learn more about the repository', main_app.about_path %></li>
+              <li><%= link_to 'Get help using the repository', main_app.help_path %></li>
+              <li><%= link_to 'Contact us', hyrax.contact_path %></li>
+              <li><%= link_to 'Terms of Use', main_app.terms_of_use_path %></li>
+            </ul>
+          </div>
+          <div class="col-sm-6">
+            <ul>
+              <li><%= link_to t('spot.links.department.name'), t('spot.links.department.url') %></li>
+              <li><%= link_to t('spot.links.library.name'), t('spot.links.library.url') %></li>
+              <li><%= link_to t('spot.links.lafayette.name'), t('spot.links.lafayette.url') %></li>
+              <li><%= link_to t('spot.links.a18y_remediation.name'), t('spot.links.a18y_remediation.url') %></li>
+            </ul>
+          </div>
         </div>
       </div>
     </div>
   </div>
-</footer>
+</footer>
\ No newline at end of file
diff --git a/app/views/shared/metadata/_rights_statement.html.erb b/app/views/shared/metadata/_rights_statement.html.erb
index 5fdfbd43b..f7f3aa8f7 100644
--- a/app/views/shared/metadata/_rights_statement.html.erb
+++ b/app/views/shared/metadata/_rights_statement.html.erb
@@ -1,11 +1,11 @@
 <%- presenter.rights_statement_merged.each_with_index do |(uri, label), index| -%>
 <tr>
   <% if index.zero? %>
-  <th rowspan="<%= presenter.rights_statement_merged.size %>">
+  <th class="p-2" rowspan="<%= presenter.rights_statement_merged.size %>">
     <%= t('blacklight.search.fields.rights_statement') %>
   </th>
   <% end %>
-  <td>
+  <td class="p-2">
     <%= rights_statement_icon(uri, label) %>
     <%= label %>
   </td>
diff --git a/app/views/spot/collections/_collection_list_item.html.erb b/app/views/spot/collections/_collection_list_item.html.erb
index 4227077b1..a7bd41007 100644
--- a/app/views/spot/collections/_collection_list_item.html.erb
+++ b/app/views/spot/collections/_collection_list_item.html.erb
@@ -3,22 +3,22 @@
 <% item_count = collection.total_items %>
 
 <div class="collection-list-item col-md-4">
-  <div class="thumbnail">
+  <div class="card">
     <div class="collection-logo-container" style="background-image:url('<%= collection_logo_file_path(collection) %>');"></div>
-    <div class="caption">
-      <h3><%= collection.title.first %></h3>
-      <p><%= collection.abstract.first %></p>
+    <div class="card-body">
+      <h3 class="card-title"><%= collection.title.first %></h3>
+      <p class= "card-text"><%= collection.abstract.first %></p>
       <div class="row">
-        <div class="col-sm-10 col-sm-offset-1">
+        <div class="col-sm-10 offset-sm-1">
           <div class="row collection-counts-wrapper">
             <% unless subcollection_count.zero? %>
-            <div class="col-xs-6">
+            <div class="col-6">
               <div class="collection-counts-item">
                 <span><%= subcollection_count %></span><%= 'Collection'.pluralize(subcollection_count) %>
               </div>
             </div>
             <% end %>
-            <div class="col-xs-<%= subcollection_count.zero? ? '12' : '6' %>">
+            <div class="col-<%= subcollection_count.zero? ? '12' : '6' %>">
               <div class="collection-counts-item">
                 <span><%= item_count %></span><%= 'Item'.pluralize(item_count) %>
               </div>
diff --git a/app/views/spot/collections/index.html.erb b/app/views/spot/collections/index.html.erb
index 6b9cc04c0..6c6003796 100644
--- a/app/views/spot/collections/index.html.erb
+++ b/app/views/spot/collections/index.html.erb
@@ -4,31 +4,31 @@
   <h1><%= t('.header') %></h1>
 </div>
 
-<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
-  <div class="panel panel-default">
-    <div class="panel-heading" role="tab" id="headingOne">
-      <h4 class="panel-title">
-        <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="false" aria-controls="collapseOne">
+<div id="accordion">
+  <div class="card">
+    <div class="card-header" id="headingOne">
+      <h5 class="mb-0">
+        <a role="button" data-toggle="collapse" data-parent="#accordion" data-target="#collapseOne" aria-expanded="false" aria-controls="collapseOne" style="color: black;">
           Lafayette Scholarship
         </a>
-      </h4>
+      </h5>
     </div>
-    <div id="collapseOne" class="panel-collapse collapse card" role="tabpanel" aria-labelledby="headingOne">
+    <div id="collapseOne" class="collapse" data-parent="#accordion" aria-labelledby="headingOne">
       <ul class="list-group list-group-flush">
         <li class="list-group-item"><%= link_to 'Faculty Publications', hyrax.collection_path(id: 'faculty-publications') %></li>
         <li class="list-group-item"><%= link_to 'Student Honors Theses', hyrax.collection_path(id: 'honors-theses') %></li>
       </ul>
     </div>
   </div>
-  <div class="panel panel-default">
-    <div class="panel-heading" role="tab" id="headingTwo">
-      <h4 class="panel-title">
-        <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
+  <div class="card">
+    <div class="card-header" id="headingTwo">
+      <h5 class="mb-0">
+        <a role="button" data-toggle="collapse" data-parent="#accordion" data-target="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo" style="color: black;">
           Lafayette College Archives
         </a>
-      </h4>
+      </h5>
     </div>
-    <div id="collapseTwo" class="panel-collapse collapse card" role="tabpanel" aria-labelledby="headingTwo">
+    <div id="collapseTwo" class="collapse" data-parent="#accordion" aria-labelledby="headingTwo">
       <ul class="list-group list-group-flush">
         <li class="list-group-item"><%= link_to 'College Administration', hyrax.collection_path(id: 'college-administration') %></li>
         <li class="list-group-item"><%= link_to 'College Archives Image Collection', hyrax.collection_path(id: 'historical-photos') %></li>
@@ -41,19 +41,20 @@
         <li class="list-group-item"><%= link_to 'Library Newsletters', hyrax.collection_path(id: 'library-newsletters') %></li>
         <li class="list-group-item"><%= link_to 'McKelvy House', hyrax.collection_path(id: 'mckelvy-house') %></li>
         <li class="list-group-item"><%= link_to 'Public Safety', hyrax.collection_path(id: 'public-safety') %></li>
+        <li class="list-group-item"><%= link_to 'Selections from the Lafayette College Songbook', hyrax.collection_path(id: 'college-songbook') %></li>
         <li class="list-group-item"><%= link_to 'Student Publications', hyrax.collection_path(id: 'student-publications') %></li>
       </ul>
     </div>
   </div>
-  <div class="panel panel-default">
-    <div class="panel-heading" role="tab" id="headingThree">
-      <h4 class="panel-title">
-        <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
+  <div class="card">
+    <div class="card-header" id="headingThree">
+      <h5 class="mb-0">
+        <a role="button" data-toggle="collapse" data-parent="#accordion" data-target="#collapseThree" aria-expanded="false" aria-controls="collapseThree" style="color: black;">
           Special Collections
         </a>
-      </h4>
+      </h5>
     </div>
-    <div id="collapseThree" class="panel-collapse collapse card" role="tabpanel" aria-labelledby="headingThree">
+    <div id="collapseThree" class="collapse" data-parent="#accordion" aria-labelledby="headingThree">
       <ul class="list-group list-group-flush">
         <li class="list-group-item"><%= link_to 'Alsace-Lorraine Picture Postcard Collection', hyrax.collection_path(id: 'alsace-images') %></li>
         <li class="list-group-item"><%= link_to 'Dīvān-i Jāmī', hyrax.collection_path(id: 'persian-mss') %></li>
@@ -61,66 +62,71 @@
         <li class="list-group-item"><%= link_to 'Hubbard Collection of Letters from the Marquis de Lafayette to George Washington', hyrax.collection_path(id: 'mdl-letters') %></li>
         <li class="list-group-item"><%= link_to 'Marquis de Lafayette Prints Collection', hyrax.collection_path(id: 'mdl-prints') %></li>
         <li class="list-group-item"><%= link_to 'Shakespeare Bulletin Archive', hyrax.collection_path(id: 'shakespeare-bulletin-archive') %></li>
+        <li class="list-group-item"><%= link_to 'William Baxter Owen Ancient Coin Collection', hyrax.collection_path(id: 'ancient-coins') %></li>
       </ul>
     </div>
   </div>
-  <div class="panel panel-default">
-    <div class="panel-heading" role="tab" id="headingFour">
-      <h4 class="panel-title">
-        <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFour" aria-expanded="false" aria-controls="collapseFour">
+  <div class="card">
+    <div class="card-header" id="headingFour">
+      <h5 class="mb-0">
+        <a role="button" data-toggle="collapse" data-parent="#accordion" data-target="#collapseFour" aria-expanded="false" aria-controls="collapseFour" style="color: black;">
           East Asia Image Collection
         </a>
-      </h4>
+      </h5>
     </div>
-    <div id="collapseFour" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingFour">
+    <div id="collapseFour" class="collapse" data-parent="#accordion" aria-labelledby="headingFour">
       <div class="container-fluid" style="margin-top: 1rem;">
         <div class="row">
           <div class="col-sm-6">
-            <ul class="list-group list-group-flush">
-              <li class="list-group-item"><%= link_to 'Gerald and Rella Warner Dutch East Indies Negatives', hyrax.collection_path(id: 'warner-negs-indonesia') %></li>
-              <li class="list-group-item"><%= link_to 'Gerald and Rella Warner Japan Slides', hyrax.collection_path(id: 'warner-slides-japan') %></li>
-              <li class="list-group-item"><%= link_to 'Gerald and Rella Warner Manchuria Negatives', hyrax.collection_path(id: 'warner-negs-manchuria') %></li>
-              <li class="list-group-item"><%= link_to 'Gerald and Rella Warner Postcards', hyrax.collection_path(id: 'warner-postcards') %></li>
-              <li class="list-group-item"><%= link_to 'Gerald and Rella Warner Souvenirs of Beijing and Tokyo', hyrax.collection_path(id: 'warner-souvenirs') %></li>
-              <li class="list-group-item"><%= link_to 'Gerald and Rella Warner Taiwan Negatives', hyrax.collection_path(id: 'warner-negs-taiwan') %></li>
-              <li class="list-group-item"><%= link_to 'Imperial Postcards', hyrax.collection_path(id: 'imperial-postcards') %></li>
-              <li class="list-group-item"><%= link_to 'Japanese History Study Cards', hyrax.collection_path(id: 'gc-iroha01') %></li>
-              <li class="list-group-item"><%= link_to 'Japanese Imperial House Postcard Album', hyrax.collection_path(id: 'pa-koshitsu') %></li>
-              <li class="list-group-item"><%= link_to 'Lin Chia-Feng Family Postcards', hyrax.collection_path(id: 'lin-postcards') %></li>
-              <li class="list-group-item"><%= link_to 'Michael Lewis Postcards', hyrax.collection_path(id: 'lewis-postcards') %></li>
-            </ul>
+            <div class="card">
+              <ul class="list-group list-group-flush">
+                <li class="list-group-item"><%= link_to 'Gerald and Rella Warner Dutch East Indies Negatives', hyrax.collection_path(id: 'warner-negs-indonesia') %></li>
+                <li class="list-group-item"><%= link_to 'Gerald and Rella Warner Japan Slides', hyrax.collection_path(id: 'warner-slides-japan') %></li>
+                <li class="list-group-item"><%= link_to 'Gerald and Rella Warner Manchuria Negatives', hyrax.collection_path(id: 'warner-negs-manchuria') %></li>
+                <li class="list-group-item"><%= link_to 'Gerald and Rella Warner Postcards', hyrax.collection_path(id: 'warner-postcards') %></li>
+                <li class="list-group-item"><%= link_to 'Gerald and Rella Warner Souvenirs of Beijing and Tokyo', hyrax.collection_path(id: 'warner-souvenirs') %></li>
+                <li class="list-group-item"><%= link_to 'Gerald and Rella Warner Taiwan Negatives', hyrax.collection_path(id: 'warner-negs-taiwan') %></li>
+                <li class="list-group-item"><%= link_to 'Imperial Postcards', hyrax.collection_path(id: 'imperial-postcards') %></li>
+                <li class="list-group-item"><%= link_to 'Japanese History Study Cards', hyrax.collection_path(id: 'gc-iroha01') %></li>
+                <li class="list-group-item"><%= link_to 'Japanese Imperial House Postcard Album', hyrax.collection_path(id: 'pa-koshitsu') %></li>
+                <li class="list-group-item"><%= link_to 'Lin Chia-Feng Family Postcards', hyrax.collection_path(id: 'lin-postcards') %></li>
+                <li class="list-group-item"><%= link_to 'Michael Lewis Postcards', hyrax.collection_path(id: 'lewis-postcards') %></li>
+              </ul>
+            </div>  
           </div>
           <div class="col-sm-6">
-            <ul class="list-group list-group-flush">
-              <li class="list-group-item"><%= link_to 'Pacific War Postcards', hyrax.collection_path(id: 'pacwar-postcards') %></li>
-              <li class="list-group-item"><%= link_to 'Richard Mammana Japanese Empire Postcard Collection', hyrax.collection_path(id: 'mammana-postcards') %></li>
-              <li class="list-group-item"><%= link_to 'Scenic Taiwan Book', hyrax.collection_path(id: 'cpw-nofuko') %></li>
-              <li class="list-group-item"><%= link_to 'Sino-Japanese War Postcard Album 01', hyrax.collection_path(id: 'pa-omitsu01') %></li>
-              <li class="list-group-item"><%= link_to 'Sino-Japanese War Postcard Album 02', hyrax.collection_path(id: 'pa-omitsu02') %></li>
-              <li class="list-group-item"><%= link_to 'Sven Saaler Postcards of Japanese Bronze Statues', hyrax.collection_path(id: 'japan-bronzes') %></li>
-              <li class="list-group-item"><%= link_to 'T.W. Ingersoll Co. Stereoviews of the Siege of Port Arthur', hyrax.collection_path(id: 'rjw-stereo') %></li>
-              <li class="list-group-item"><%= link_to 'Taiwan Photographic Monthly Periodical', hyrax.collection_path(id: 'cpw-shashinkai') %></li>
-              <li class="list-group-item"><%= link_to 'The Truku-Japanese War Commemorative Postcard Collection', hyrax.collection_path(id: 'tjwar-postcards') %></li>
-              <li class="list-group-item"><%= link_to 'Tsubokura Russo-Japanese War Postcard Album', hyrax.collection_path(id: 'pa-tsubokura') %></li>
-              <li class="list-group-item"><%= link_to 'Woodsworth Images', hyrax.collection_path(id: 'woodsworth-images') %></li>
-            </ul>
+            <div class="card">
+              <ul class="list-group list-group-flush">
+                <li class="list-group-item"><%= link_to 'Pacific War Postcards', hyrax.collection_path(id: 'pacwar-postcards') %></li>
+                <li class="list-group-item"><%= link_to 'Richard Mammana Japanese Empire Postcard Collection', hyrax.collection_path(id: 'mammana-postcards') %></li>
+                <li class="list-group-item"><%= link_to 'Scenic Taiwan Book', hyrax.collection_path(id: 'cpw-nofuko') %></li>
+                <li class="list-group-item"><%= link_to 'Sino-Japanese War Postcard Album 01', hyrax.collection_path(id: 'pa-omitsu01') %></li>
+                <li class="list-group-item"><%= link_to 'Sino-Japanese War Postcard Album 02', hyrax.collection_path(id: 'pa-omitsu02') %></li>
+                <li class="list-group-item"><%= link_to 'Sven Saaler Postcards of Japanese Bronze Statues', hyrax.collection_path(id: 'japan-bronzes') %></li>
+                <li class="list-group-item"><%= link_to 'T.W. Ingersoll Co. Stereoviews of the Siege of Port Arthur', hyrax.collection_path(id: 'rjw-stereo') %></li>
+                <li class="list-group-item"><%= link_to 'Taiwan Photographic Monthly Periodical', hyrax.collection_path(id: 'cpw-shashinkai') %></li>
+                <li class="list-group-item"><%= link_to 'The Truku-Japanese War Commemorative Postcard Collection', hyrax.collection_path(id: 'tjwar-postcards') %></li>
+                <li class="list-group-item"><%= link_to 'Tsubokura Russo-Japanese War Postcard Album', hyrax.collection_path(id: 'pa-tsubokura') %></li>
+                <li class="list-group-item"><%= link_to 'Woodsworth Images', hyrax.collection_path(id: 'woodsworth-images') %></li>
+              </ul>
+            </div>
           </div>
         </div>
       </div>
     </div>
   </div>
-  <div class="panel panel-default">
-    <div class="panel-heading" role="tab" id="headingFive">
-      <h4 class="panel-title">
-        <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFive" aria-expanded="false" aria-controls="collapseFive">
+  <div class="card">
+    <div class="card-header" id="headingFive">
+      <h5 class="mb-0">
+        <a role="button" data-toggle="collapse" data-parent="#accordion" data-target="#collapseFive" aria-expanded="false" aria-controls="collapseFive" style="color: black;">
           Academic Partnership Collections
         </a>
-      </h4>
+      </h5>
     </div>
-    <div id="collapseFive" class="panel-collapse collapse card" role="tabpanel" aria-labelledby="headingFive">
+    <div id="collapseFive" class="collapse" data-parent="#accordion" aria-labelledby="headingFive">
       <ul class="list-group list-group-flush">
-        <li class="list-group-item"><%= link_to 'Deep Time Maps', hyrax.collection_path(id: 'time-slice-maps') %> <span class="label label-info">Lafayette College</span></li>
-        <li class="list-group-item"><%= link_to 'John S. Shelton Earth Science Image Collection', hyrax.collection_path(id: 'geology-slides-esi') %> <span class="label label-info">Lafayette College</span></a></li>
+        <li class="list-group-item"><%= link_to 'Deep Time Maps', hyrax.collection_path(id: 'time-slice-maps') %> <span class="badge badge-info">Lafayette College</span></li>
+        <li class="list-group-item"><%= link_to 'John S. Shelton Earth Science Image Collection', hyrax.collection_path(id: 'geology-slides-esi') %> <span class="badge badge-info">Lafayette College</span></a></li>
       </ul>
     </div>
   </div>
diff --git a/app/views/spot/homepage/_featured_collections.html.erb b/app/views/spot/homepage/_featured_collections.html.erb
index 7d9a6a0c7..4d991f474 100644
--- a/app/views/spot/homepage/_featured_collections.html.erb
+++ b/app/views/spot/homepage/_featured_collections.html.erb
@@ -1,11 +1,9 @@
 <% if presenter.featured_collections.present? %>
-<div id="featured-collections" class="container-fluid">
+<div id="featured-collections" class="container-fluid mt-5">
   <h2><%= t(".title_#{presenter.featured_collections.size > 1 ? 'plural' : 'singular'}") %></h2>
   <p class="lead"><%= t('.browse_html', url: browse_collections_path).html_safe %></p>
   <% presenter.featured_collections.each do |collection| %>
     <%= render 'featured_collection_item', collection: collection %>
   <% end %>
 </div>
-
-<hr />
 <% end %>
diff --git a/app/views/spot/homepage/_recent_items.html.erb b/app/views/spot/homepage/_recent_items.html.erb
index 5d9b60544..fa742ae2c 100644
--- a/app/views/spot/homepage/_recent_items.html.erb
+++ b/app/views/spot/homepage/_recent_items.html.erb
@@ -1,4 +1,4 @@
-<div id="recent-items" class="container-fluid">
+<div id="recent-items" class="container-fluid mt-5">
   <h2><%= t('.title') %></h2>
   <div class="row">
     <% presenter.recent_items.each do |item| %>
diff --git a/app/views/spot/homepage/index.html.erb b/app/views/spot/homepage/index.html.erb
index 776ae4554..ac38daeb7 100644
--- a/app/views/spot/homepage/index.html.erb
+++ b/app/views/spot/homepage/index.html.erb
@@ -1,7 +1,6 @@
 <% provide(:page_title) { t('.page_title', name: t('hyrax.product_name')) } %>
 
 <%= render 'splash' %>
-
 <hr />
 
 <% if @presenter.show_senior_honors_thesis_block? %>
@@ -10,4 +9,5 @@
 <% end %>
 
 <%= render 'featured_collections', presenter: @presenter %>
+<hr />
 <%= render 'recent_items', presenter: @presenter unless @presenter.recent_items.empty? %>
diff --git a/config/application.rb b/config/application.rb
index 93921061d..d8d8790f8 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -3,7 +3,6 @@
 
 require 'rails/all'
 require 'sprockets/es6'
-require 'rack-cas/session_store/active_record'
 
 # Some gems in the Samvera stack use the 'deprecation' gem instead of
 # ActiveSupport::Deprecation calls, so we need to also set _that_ gem's
@@ -13,21 +12,18 @@
 if ActiveModel::Type::Boolean.new.cast(ENV.fetch('SPOT_IGNORE_DEPRECATIONS', false))
   require 'deprecation'
 
-  ActiveSupport::Deprecation.silence do
-    Deprecation.default_deprecation_behavior = :silence
-
-    Bundler.require(*Rails.groups)
-  end
-else
-  # Require the gems listed in Gemfile, including any gems
-  # you've limited to :test, :development, or :production.
-  Bundler.require(*Rails.groups)
+  ActiveSupport::Deprecation.silenced = true
+  Deprecation.default_deprecation_behavior = :silence
 end
 
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
 module Spot
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.1
+    config.load_defaults 6.1
 
     # use sidekiq for async jobs
     config.active_job.queue_adapter = :sidekiq
@@ -48,6 +44,12 @@ class Application < Rails::Application
     config.rack_cas.service = ENV['URL_HOST'].present? ? "#{ENV['URL_HOST']}/users/service" : '/users/service'
     config.rack_cas.extra_attributes_filter = %w[uid email givenName surname lnumber eduPersonEntitlement]
 
+    hostname = ENV['APPLICATION_FQDN'] || URI.parse(ENV['URL_HOST'] || '').hostname
+    config.hosts << hostname if hostname.present?
+
+    # add internal IP range so things can communicate in the AWS VPC
+    config.hosts << IPAddr.new('10.0.0.0/24') if Rails.env.production?
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
diff --git a/config/blacklight.yml b/config/blacklight.yml
index c8fb47fd2..56ec67947 100644
--- a/config/blacklight.yml
+++ b/config/blacklight.yml
@@ -2,7 +2,7 @@ development:
   adapter: solr
   url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_DEVELOPMENT_PORT', 8983)}/solr/hydra-development" %>
   ssl:
-    :verify: false
+    verify: false
 test:
   adapter: solr
   url: <%= ENV['SOLR_TEST_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/hydra-test" %>
@@ -10,4 +10,4 @@ production:
   adapter: solr
   url: <%= ENV['SOLR_URL'] %>
   ssl:
-    :verify: false
+    verify: false
diff --git a/config/boot.rb b/config/boot.rb
index b3e08ed18..8b2631ad7 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -2,4 +2,5 @@
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
+require 'logger'
 require 'bootsnap/setup' # Load our app faster w/ Bootsnap
diff --git a/config/browse_everything_providers.yml b/config/browse_everything_providers.yml
deleted file mode 100644
index 308e2f574..000000000
--- a/config/browse_everything_providers.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-s3:
-  bucket: <%= ENV['AWS_BULKRAX_IMPORTS_BUCKET'] %>
-  app_key: <%= ENV['AWS_ACCESS_KEY_ID'] %>
-  app_secret: <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
-  region: us-east-1
-  response_type: s3_uri
diff --git a/config/database.yml b/config/database.yml
index f5381cfa9..5fd648041 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -3,18 +3,27 @@ default: &default
   pool: <%= ENV.fetch('RAILS_MAX_THREADS', 5) %>
   timeout: 5000
   encoding: unicode
-  url: "postgres://<%= ENV.fetch('PSQL_USER', 'spot_dev_user') %>:<%= ENV.fetch('PSQL_PASSWORD', 'spot_dev_pw') %>@<%= ENV.fetch('PSQL_HOST', 'localhost') %>/<%= ENV.fetch('PSQL_DATABASE', 'spot_development') %>"
 
 development:
   <<: *default
+  username: <%= ENV.fetch('PSQL_USER', 'spot_dev_user') %>
+  password: <%= ENV.fetch('PSQL_PASSWORD', 'spot_dev_pw') %>
+  host: <%= ENV.fetch('PSQL_HOST', 'localhost') %>
+  database: <%= ENV.fetch('PSQL_DATABASE', 'spot_development') %>
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  url: "postgres://<%= ENV.fetch('PSQL_USER', 'spot_dev_user') %>:<%= ENV.fetch('PSQL_PASSWORD', 'spot_dev_pw') %>@<%= ENV.fetch('PSQL_HOST', 'localhost') %>/<%= ENV.fetch('PSQL_TEST_DATABASE', 'spot_test') %>"
+  username: <%= ENV.fetch('PSQL_USER', 'spot_dev_user') %>
+  password: <%= ENV.fetch('PSQL_PASSWORD', 'spot_dev_pw') %>
+  host: <%= ENV.fetch('PSQL_HOST', 'localhost') %>
+  database: <%= ENV.fetch('PSQL_DATABASE', 'spot_test') %>
 
 production:
   <<: *default
-
+  username: <%= ENV.fetch('PSQL_USER','spot_user') %>
+  password: <%= ENV.fetch('PSQL_PASSWORD', 'spot_pw') %>
+  host: <%= ENV.fetch('PSQL_HOST', 'localhost') %>
+  database: <%= ENV.fetch('PSQL_DATABASE', 'spot') %>
\ No newline at end of file
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 6ec30402a..2f50811aa 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -9,8 +9,6 @@
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  Rails.logger.debug 'starting with classes cached' if ENV['ENABLE_CLASS_CACHE'] == 'true'
-
   # Rails' default is to not eager_load in development for speed's sake (I think?)
   # but we were encountering a lot of Missing Constant errors in our Sidekiq logs
   # and eager_loding classes seemed to help fix that.
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 2e16e57e3..cb3d05b28 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -27,7 +27,7 @@
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
-  config.assets.js_compressor = Uglifier.new(harmony: true)
+  config.assets.js_compressor = :terser
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 95e55ec62..8e53271cb 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -36,4 +36,9 @@
   config.action_mailer.delivery_method = :test
 
   config.active_job.queue_adapter = :test
+
+  # Additional hosts for tests
+  config.hosts << '127.0.0.1'
+  config.hosts << 'localhost'
+  config.hosts << 'www.example.com'
 end
diff --git a/config/initializers/bulkrax.rb b/config/initializers/bulkrax.rb
index 8a1a251c3..b9ce8165e 100644
--- a/config/initializers/bulkrax.rb
+++ b/config/initializers/bulkrax.rb
@@ -37,6 +37,7 @@
       'model' => { from: ['model', 'work_type'], split: false },
       'premade_derivatives' => { from: ['premade_derivatives'] },
       'stored_derivatives' => { from: ['stored_derivatives'] },
+      'remote_files' => { from: ["s3_file"], parsed: true },
 
       # Descriptive metadata
       'title' => { from: ['title'] },
diff --git a/config/initializers/hyrax.rb b/config/initializers/hyrax.rb
index 0bebd4fc0..1ec742121 100644
--- a/config/initializers/hyrax.rb
+++ b/config/initializers/hyrax.rb
@@ -1,10 +1,18 @@
 # frozen_string_literal: true
+require 'wings'
+
 Hyrax.config do |config|
   config.register_curation_concern :publication, :image, :student_work, :audio_visual
 
   # Can't define this within the Bulkrax initializer as it runs _before_ this
   Bulkrax.default_work_type = Hyrax.config.curation_concerns.first.name
 
+  config.admin_set_model = '::AdminSet'
+  config.collection_model = '::Collection'
+  config.file_set_model = '::FileSet'
+
+  config.solr_default_method = :post
+
   # Register roles that are expected by your implementation.
   # @see Hyrax::RoleRegistry for additional details.
   # @note there are magical roles as defined in Hyrax::RoleRegistry::MAGIC_ROLES
@@ -52,9 +60,6 @@
   # Requires a Google Analytics id and OAuth2 keyfile.  See README for more info
   # config.analytics = false
 
-  # Google Analytics tracking ID to gather usage statistics
-  config.google_analytics_id = ENV.fetch('GOOGLE_ANALYTICS_ID', nil)
-
   # Date you wish to start collecting Google Analytic statistics for
   # Leaving it blank will set the start date to when ever the file was uploaded by
   # NOTE: if you have always sent analytics to GA for downloads and page views leave this commented out
@@ -299,7 +304,7 @@
   # ingest files from the file system that are not part of the BrowseEverything
   # mount point.
   #
-  config.whitelisted_ingest_dirs = [
+  config.registered_ingest_dirs = [
     Rails.root.join('tmp', 'ingest').to_s,
     Rails.root.to_s
   ]
@@ -307,15 +312,17 @@
   config.branding_path = ENV.fetch('HYRAX_COLLECTION_BRANDING_PATH', Rails.root.join('public', 'branding'))
 end
 
-Date::DATE_FORMATS[:standard] = "%m/%d/%Y"
-
-# Hyrax v4 adds a helper method on the Hyrax constant that Bulkrax v9 depends on,
-# so we'll patch it in if it doesn't exist yet. This came up while having issues
-# with Bulkrax exports.
-unless Hyrax.respond_to?(:index_field_mapper)
-  module Hyrax
-    def self.index_field_mapper
-      config.index_field_mapper
+Rails.application.reloader.to_prepare do
+  Date::DATE_FORMATS[:standard] = "%m/%d/%Y"
+
+  # Hyrax v4 adds a helper method on the Hyrax constant that Bulkrax v9 depends on,
+  # so we'll patch it in if it doesn't exist yet. This came up while having issues
+  # with Bulkrax exports.
+  unless Hyrax.respond_to?(:index_field_mapper)
+    module Hyrax
+      def self.index_field_mapper
+        config.index_field_mapper
+      end
     end
   end
 end
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index aa7435fbc..02780b836 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,17 +1,6 @@
 # frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
-
-# Add new inflection rules using the following format. Inflections
-# are locale specific, and you may define rules for as many different
-# locales as you wish. All of these examples are active by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
-#   inflect.uncountable %w( fish sheep )
-# end
-
-# These inflection rules are supported but not enabled by default:
-# ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.acronym 'RESTful'
+#   inflect.acronym 'CSV'
+#   inflect.acronym 'ISO'
 # end
diff --git a/config/initializers/mini_magick.rb b/config/initializers/mini_magick.rb
index 7fc113a30..4c2249a3f 100644
--- a/config/initializers/mini_magick.rb
+++ b/config/initializers/mini_magick.rb
@@ -2,5 +2,5 @@
 require 'mini_magick'
 
 MiniMagick.configure do |config|
-  config.shell_api = "posix-spawn"
+  # config.shell_api = "posix-spawn"
 end
diff --git a/config/initializers/spot_overrides.rb b/config/initializers/spot_overrides.rb
index 8f0d4117c..6e135c407 100644
--- a/config/initializers/spot_overrides.rb
+++ b/config/initializers/spot_overrides.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 #
 # Class attribute updates + monkey-patching customizations for Hyrax.
-Rails.application.config.to_prepare do
+Rails.application.reloader.to_prepare do
   # Bump start the Noid minter in development:
   # Using Bulkrax on a brand-new Hyrax application will wreak havoc with
   # multiple async jobs running MinterState.create! with the same "unique"
@@ -45,42 +45,44 @@
   # I18n key (see also 0717dee, + catalog_controller.rb)
   [Hyrax::My::CollectionsController, Hyrax::Dashboard::CollectionsController].each do |klass|
     klass.class_eval do
-      def self.update_facet_labels!
-        blacklight_config.facet_fields['visibility_ssi'].label = :'hyrax.dashboard.my.heading.visibility'
-        blacklight_config.facet_fields[Hyrax.config.collection_type_index_field].label = :'hyrax.dashboard.my.heading.collection_type'
-        blacklight_config.facet_fields['has_model_ssim'].label = :'hyrax.dashboard.my.heading.collection_type'
-      end
-      update_facet_labels!
+      blacklight_config.facet_fields['visibility_ssi'].label = :'hyrax.dashboard.my.heading.visibility'
+      blacklight_config.facet_fields[Hyrax.config.collection_type_index_field].label = :'hyrax.dashboard.my.heading.collection_type'
+      blacklight_config.facet_fields['has_model_ssim'].label = :'hyrax.dashboard.my.heading.collection_type'
     end
   end
 
   # same as previous: updating facet labels for dashboard works controller
   [Hyrax::My::WorksController, Hyrax::Dashboard::WorksController].each do |klass|
     klass.class_eval do
-      def self.update_facet_labels!
-        blacklight_config.facet_fields['visibility_ssi'].label = :'hyrax.dashboard.my.heading.visibility'
-      end
-      update_facet_labels!
+      blacklight_config.facet_fields['visibility_ssi'].label = :'hyrax.dashboard.my.heading.visibility'
     end
   end
 
+  # Rewrite Hyrax::DashboardController local mods to be a decorator.
+  # @see app/controllers/concerns/spot/hyrax_dashboard_controller_decorator.rb
+  Hyrax::DashboardController.prepend(Spot::HyraxDashboardControllerDecorator)
+
   # We're using an older version of the FITSServlet tool (1.1.3 as of 2019-12-03,
   # anything higher throws an exception that I can't nail down) that predates
   # a change to set the response encoding to UTF-8. So we need to do this as
   # early as possible within the Characterization tool.
-  require 'hydra-file_characterization'
+  module Spot
+    module FitsServletCharacterizerDecorator
+      extend ActiveSupport::Concern
 
-  Hydra::FileCharacterization::Characterizers::FitsServlet.class_eval do
-    # Wrap the datafile= param in quotes to handle filenames with spaces
-    def command
-      %(curl -k -F datafile=@"#{filename}" #{ENV['FITS_SERVLET_URL']}/examine)
-    end
+      # Wrap the datafile= param in quotes to handle filenames with spaces
+      def command
+        %(curl -k -F datafile=@"#{filename}" #{ENV['FITS_SERVLET_URL']}/examine)
+      end
 
-    def output
-      super.encode('UTF-8', invalid: :replace)
+      def output
+        super.encode('UTF-8', invalid: :replace)
+      end
     end
   end
 
+  Hydra::FileCharacterization::Characterizers::FitsServlet.prepend(Spot::FitsServletCharacterizerDecorator)
+
   # Add our SolrSuggestActor to the front of the default actor-stack. This will
   # trigger a build of all of the Solr suggestion dictionaries at the end of
   # each create, update, destroy process (each method calls the next actor and _then_
@@ -99,32 +101,40 @@ def output
   #   # => false
   #
   # @see https://github.com/samvera/hydra-head/blob/v10.7.0/hydra-access-controls/app/models/hydra/access_controls/embargo.rb#L13-L15
-  Hydra::AccessControls::Embargo.class_eval do
-    def active?
-      embargo_release_date.present? && DateTime.current < embargo_release_date
+  module Spot
+    module EmbargoActiveDecorator
+      extend ActiveSupport::Concern
+
+      def active?
+        embargo_release_date.present? && DateTime.current < embargo_release_date
+      end
     end
-  end
 
-  Hydra::AccessControls::Lease.class_eval do
-    def active?
-      lease_expiration_date.present? && DateTime.current < lease_expiration_date
+    module LeaseActiveDecorator
+      extend ActiveSupport::Concern
+
+      def active?
+        lease_expiration_date.present? && DateTime.current < lease_expiration_date
+      end
     end
   end
 
+  Hydra::AccessControls::Embargo.prepend(Spot::EmbargoActiveDecorator)
+  Hydra::AccessControls::Lease.prepend(Spot::LeaseActiveDecorator)
+
   # Updating how SimpleForm generates labels so that we can use the same locales
   # for the form as those for the metadata display.
-  SimpleForm::Inputs::Base.class_eval do
-    protected def raw_label_text
-      options[:label] || I18n.t("blacklight.search.fields.#{attribute_name}", default: label_translation)
+  module Spot
+    module SimpleFormBaseInputDecorator
+      extend ActiveSupport::Concern
+
+      protected def raw_label_text
+        options[:label] || I18n.t("blacklight.search.fields.#{attribute_name}", default: label_translation)
+      end
     end
   end
 
-  # Adding label support for metadata-only records
-  Hyrax::PermissionBadge.class_eval do
-    old_visibility_label_class = Hyrax::PermissionBadge::VISIBILITY_LABEL_CLASS.dup
-    remove_const(:VISIBILITY_LABEL_CLASS) if const_defined?(:VISIBILITY_LABEL_CLASS)
-    const_set(:VISIBILITY_LABEL_CLASS, old_visibility_label_class.tap { |h| h[:metadata] = 'label-info' }.freeze)
-  end
+  SimpleForm::Inputs::Base.prepend(Spot::SimpleFormBaseInputDecorator)
 
   # Define this constant, intended to be similar to AdminSet::DEFAULT_ID
   AdminSet::STUDENT_WORK_ID = Spot::StudentWorkAdminSetCreateService::ADMIN_SET_ID
@@ -145,107 +155,133 @@ class << self
   # wonky one-liner seems to preserve user-selected sorting. ¯\_(ツ)_/¯
   #
   # @see https://github.com/samvera/hyrax/blob/main/app/search_builders/hyrax/collection_search_builder.rb#L36-L42
-  Hyrax::CollectionMemberSearchBuilder.class_eval do
-    def add_sorting_to_solr(solr_parameters)
-      return if solr_parameters[:q]
-      solr_parameters[:sort] ||= (sort || "title_sort_si asc")
-    end
-  end
-
-  # Override to fix Hyrax bug where calling Hyrax::AdminSetCreateService.find_or_create_default_admin_set
-  # will try to load an AdminSet's entire set of members when called.
-  #
-  # @see https://github.com/samvera/hyrax/issues/6171
-  # @see https://github.com/WGBH-MLA/ams/commit/8983c933d7ffaf587ef9dbded74845eaae41ebea
   module Spot
-    module AdminSetCreateServiceDecorator
-      private
+    module CollectionMemberSearchBuilderDecorator
+      extend ActiveSupport::Concern
 
-      def find_default_admin_set
-        AdminSet.first
+      def add_sorting_to_solr(solr_parameters)
+        return if solr_parameters[:q]
+        solr_parameters[:sort] ||= (sort || "title_sort_si asc")
       end
     end
   end
 
-  Hyrax::AdminSetCreateService.singleton_class.send(:prepend, Spot::AdminSetCreateServiceDecorator)
+  Hyrax::CollectionMemberSearchBuilder.prepend(Spot::CollectionMemberSearchBuilderDecorator)
+
+  # Hyrax::AdminSetCreateService.singleton_class.send(:prepend, Spot::AdminSetCreateServiceDecorator)
 
   # Only store entitlements related to us in the session to prevent a cookie overflow.
   #
   # @see https://github.com/biola/rack-cas/blob/v0.16.1/lib/rack/cas.rb#L96-L102
   # rubocop:disable Style/IfUnlessModifier
-  require 'rack/cas'
-  Rack::CAS.class_eval do
-    def store_session(request, user, ticket, extra_attrs = {})
-      if RackCAS.config.extra_attributes_filter?
-        extra_attrs.select! { |key, _val| RackCAS.config.extra_attributes_filter.map(&:to_s).include?(key.to_s) }
-      end
+  module Spot
+    module RackCasEntitlementDecorator
+      extend ActiveSupport::Concern
 
-      if extra_attrs['eduPersonEntitlement'].present?
-        extra_attrs['eduPersonEntitlement'] = Array.wrap(extra_attrs['eduPersonEntitlement']).select do |val|
-          URI.parse(val).host == Spot::CasUserRolesService.entitlement_host
+      def store_session(request, user, ticket, extra_attrs = {})
+        if RackCAS.config.extra_attributes_filter?
+          extra_attrs.select! { |key, _val| RackCAS.config.extra_attributes_filter.map(&:to_s).include?(key.to_s) }
         end
-      end
 
-      request.session['cas'] = { 'user' => user, 'ticket' => ticket, 'extra_attributes' => extra_attrs }
+        if extra_attrs['eduPersonEntitlement'].present?
+          extra_attrs['eduPersonEntitlement'] = Array.wrap(extra_attrs['eduPersonEntitlement']).select do |val|
+            URI.parse(val).host == Spot::CasUserRolesService.entitlement_host
+          end
+        end
+
+        request.session['cas'] = { 'user' => user, 'ticket' => ticket, 'extra_attributes' => extra_attrs }
+      end
     end
   end
 
+  require 'rack/cas' unless Object.const_defined?('Rack::RAS')
+
+  Rack::CAS.prepend(Spot::RackCasEntitlementDecorator)
+
   # Modifying how Questiong Authority returns AssignFAST results by
   # converting fst ids into URLs
-  require 'qa/authorities/assign_fast'
-  Qa::Authorities::AssignFast::GenericAuthority.class_eval do
-    private
-
-    def parse_authority_response(raw_response)
-      raw_response['response']['docs'].map do |doc|
-        index = Qa::Authorities::AssignFast.index_for_authority(subauthority)
-        term = doc[index].first
-        term += " (USE #{doc['auth']})" if doc['type'] == 'alt'
-        fast_id = Array.wrap(doc['idroot']).first
-
-        {
-          fast_id: fast_id,
-          id: "http://id.worldcat.org/fast/#{fast_id.gsub(/^fst/, '')}",
-          label: term,
-          type: doc['type'],
-          value: doc['auth']
-        }
+  module Spot
+    module QaAssignFastGenericAuthorityDecorator
+      extend ActiveSupport::Concern
+
+      private
+
+      def parse_authority_response(raw_response)
+        raw_response['response']['docs'].map do |doc|
+          index = Qa::Authorities::AssignFast.index_for_authority(subauthority)
+          term = doc[index].first
+          term += " (USE #{doc['auth']})" if doc['type'] == 'alt'
+          fast_id = Array.wrap(doc['idroot']).first
+
+          {
+            fast_id: fast_id,
+            id: "http://id.worldcat.org/fast/#{fast_id.gsub(/^fst/, '')}",
+            label: term,
+            type: doc['type'],
+            value: doc['auth']
+          }
+        end
       end
     end
   end
 
-  # In order for us to search assignFAST by FAST IDs, we need to
-  # add the 'idroot' searchIndex as a valid subauthority for AssignFast
-  Qa::Authorities::AssignFastSubauthority.module_eval do
-    def index_for_authority(authority)
-      return authority if authority == 'idroot'
+  Qa::Authorities::AssignFast::GenericAuthority.prepend(Spot::QaAssignFastGenericAuthorityDecorator)
 
-      Qa::Authorities::AssignFastSubauthority::SUBAUTHORITIES[authority]
-    end
+  module Spot
+    module QaAssignFastSubauthorityDecorator
+      extend ActiveSupport::Concern
+
+      def index_for_authority(authority)
+        return authority if authority == 'idroot'
+
+        Qa::Authorities::AssignFastSubauthority::SUBAUTHORITIES[authority]
+      end
 
-    def subauthorities
-      Qa::Authorities::AssignFastSubauthority::SUBAUTHORITIES.keys + ['idroot']
+      def subauthorities
+        Qa::Authorities::AssignFastSubauthority::SUBAUTHORITIES.keys + ['idroot']
+      end
     end
   end
 
+  # In order for us to search assignFAST by FAST IDs, we need to
+  # add the 'idroot' searchIndex as a valid subauthority for AssignFast
+  Qa::Authorities::AssignFastSubauthority.prepend(Spot::QaAssignFastSubauthorityDecorator)
+
   # Modifying the Video Runner for Hydra to use a customized Processor
   # which backports changes from 3.8.0
   #
   # @see https://github.com/samvera/hydra-derivatives/blob/v3.8.0/lib/hydra/derivatives/runners/video_derivatives.rb
-  Hydra::Derivatives::VideoDerivatives.class_eval do
-    def self.processor_class
-      Spot::VideoProcessor
+
+  module Spot
+    module VideoProcessorClassDecorator
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def processor_class
+          Spot::VideoProcessor
+        end
+      end
     end
   end
 
+  Hydra::Derivatives::VideoDerivatives.prepend(Spot::VideoProcessorClassDecorator)
+
   # Add original file names and the transcript flag to presenter for file sets
   #
   # @see https://github.com/samvera/hyrax/blob/e4f8a06aaf1c9ec378f87764da59f73a8adf06d7/app/presenters/hyrax/file_set_presenter.rb
-  Hyrax::FileSetPresenter.class_eval do
-    delegate :original_filenames, :transcript_name,
-             :stored_derivatives, to: :solr_document
+  module Spot
+    module FileSetPresenterDecorator
+      extend ActiveSupport::Concern
+
+      prepended do
+        delegate :original_filenames, :transcript_name,
+                 :stored_derivatives, to: :solr_document
+      end
+    end
   end
 
+  Hyrax::FileSetPresenter.prepend(Spot::FileSetPresenterDecorator)
+
   # Add support for downloading file_set transcripts
   Hyrax::DownloadsController.prepend(Spot::DownloadsControllerBehavior)
 
@@ -253,55 +289,150 @@ def self.processor_class
   #
   # @see https://github.com/samvera/bulkrax/blob/v5.5.1/app/parsers/bulkrax/csv_parser.rb#L258
   #
-  Bulkrax::ImporterJob.class_eval do
-    # checks the file sizes of the download files to match the original files
-    def all_files_completed?(importer)
-      cloud_files = importer.parser_fields['cloud_file_paths']
-      original_files = importer.parser_fields['original_file_paths']
-      return true unless cloud_files.present? && original_files.present?
-
-      imported_file_sizes = cloud_files.map { |_, v| get_file_size_from_s3(v['url']) }
-      original_file_sizes = original_files.map { |imported_file| File.size(imported_file) }
-
-      original_file_sizes == imported_file_sizes
-    end
+  module Spot
+    module BulkraxImporterJobDecorator
+      extend ActiveSupport::Concern
+      # checks the file sizes of the download files to match the original files
+      def all_files_completed?(importer)
+        cloud_files = importer.parser_fields['cloud_file_paths']
+        original_files = importer.parser_fields['original_file_paths']
+        return true unless cloud_files.present? && original_files.present?
+
+        imported_file_sizes = cloud_files.map { |_, v| get_file_size_from_s3(v['url']) }
+        original_file_sizes = original_files.map { |imported_file| File.size(imported_file) }
+
+        original_file_sizes == imported_file_sizes
+      end
 
-    # s3 file size fetch
-    # @todo should we add handling for other types of cloud files?
-    def get_file_size_from_s3(url)
-      uri_parsed = ::Addressable::URI.parse(url)
-      return unless uri_parsed.scheme == 's3'
+      # s3 file size fetch
+      # @todo should we add handling for other types of cloud files?
+      def get_file_size_from_s3(url)
+        uri_parsed = ::Addressable::URI.parse(url)
+        return unless uri_parsed.scheme == 's3'
 
-      client = Aws::S3::Client.new
-      resp = client.head_object(bucket: uri_parsed.host, key: uri_parsed.path[1..-1])
-      resp.content_length
+        client = Aws::S3::Client.new
+        resp = client.head_object(bucket: uri_parsed.host, key: uri_parsed.path[1..-1])
+        resp.content_length
+      end
     end
   end
 
+  Bulkrax::ImporterJob.prepend(Spot::BulkraxImporterJobDecorator)
+
   # Bulkrax's parser replaces any whitespace character with a space, which kills paragraph breaks
   # and newlines. Our patch modifies the base #result method to only replace tabs with
   # spaces and strip lead/trailing spaces.
   #
+  # A secondary patch adds an s3 files matcher to remotely import files without the Browse
+  # Everything UI.
+  #
   # @see app/services/concerns/spot/bulkrax_matcher_whitespace_patch.rb
+  # @see app/services/concerns/spot/bulkrax_s3_files_matcher.rb
   # @see spec/matchers/bulkrax/application_matcher_spec.rb
   Bulkrax::ApplicationMatcher.prepend(Spot::BulkraxMatcherWhitespacePatch)
+  Bulkrax::ApplicationMatcher.prepend(Spot::BulkraxS3FilesMatcher)
 
   # Modifying the Downloads Controller to not send an unauthorized status for requests.
   # The unauthorized status breaks the laf only thumbnail.
   #
   # @see https://github.com/samvera/hyrax/blob/hyrax-v3.6.0/app/controllers/hyrax/downloads_controller.rb#L52-L63
-  Hyrax::DownloadsController.class_eval do
-    # Customize the :read ability in your Ability class, or override this method.
-    # Hydra::Ability#download_permissions can't be used in this case because it assumes
-    # that files are in a LDP basic container, and thus, included in the asset's uri.
-    def authorize_download!
-      authorize! :download, params[asset_param_key]
-      # Deny access if the work containing this file is restricted by a workflow
-      return unless workflow_restriction?(file_set_parent(params[asset_param_key]), ability: current_ability)
-      raise Hyrax::WorkflowAuthorizationException
-    rescue CanCan::AccessDenied, Hyrax::WorkflowAuthorizationException
-      unauthorized_image = Rails.root.join("app", "assets", "images", "unauthorized.png")
-      send_file unauthorized_image
+  module Spot
+    module HyraxDownloadsControllerDecorator
+      extend ActiveSupport::Concern
+      # Customize the :read ability in your Ability class, or override this method.
+      # Hydra::Ability#download_permissions can't be used in this case because it assumes
+      # that files are in a LDP basic container, and thus, included in the asset's uri.
+      def authorize_download!
+        authorize! :download, params[asset_param_key]
+        # Deny access if the work containing this file is restricted by a workflow
+        return unless workflow_restriction?(file_set_parent(params[asset_param_key]), ability: current_ability)
+        raise Hyrax::WorkflowAuthorizationException
+      rescue CanCan::AccessDenied, Hyrax::WorkflowAuthorizationException
+        unauthorized_image = Rails.root.join("app", "assets", "images", "unauthorized.png")
+        send_file unauthorized_image
+      end
+    end
+  end
+
+  Hyrax::DownloadsController.prepend(Spot::HyraxDownloadsControllerDecorator)
+
+  # Encountering an issue where Hyrax::PersistDirectlyContainedOutputFileService.retrieve_file_set requires
+  # Hyrax::UploadedFile#file_set_uri to be an URI but querying for that URI throws an error (ActiveFedora
+  # is appending the base root to the full uri, resulting in errors like:
+  #     Ldp::BadRequest: Path contains empty element! /dev/ht/tp/:/http://fedora:8080/rest/dev/2v/23/vt/36/2v23vt362")
+  # module Spot
+  #   module HyraxUploadedFileDecorator
+  #     def add_file_set!(file_set)
+  #       uri = case file_set
+  #             when ActiveFedora::Base
+  #               file_set.uri
+  #             when Hyrax::Resource
+  #               file_set.id.is_a?(URI::HTTP) ? file_set.id : Hyrax::Base.id_to_uri(file_set.id.to_s)
+  #             end
+
+  #       update!(file_set_uri: uri) if uri.present?
+  #     end
+  #   end
+  # end
+
+  # Hyrax::UploadedFile.prepend(Spot::HyraxUploadedFileDecorator)
+
+  # Changing the call to open to URI.open because exporters could not find files from URIs otherwise
+  #
+  # see @https://github.com/samvera/bulkrax/blob/5e85a0760e9cc317ae11dbecd35c508d6882a5b6/app/parsers/bulkrax/csv_parser.rb
+  # rubocop:disable all
+  module Spot
+    module BulkraxCsvParserDecorator
+      extend ActiveSupport::Concern
+      def store_files(identifier, folder_count)
+        record = Bulkrax.object_factory.find(identifier)
+        return unless record
+
+        file_sets = Array.wrap(record) if record.file_set?
+        if file_sets.nil? # for valkyrie
+          file_sets = record.respond_to?(:file_sets) ? record.file_sets : record.members&.select(&:file_set?)
+        end
+
+        if importerexporter.include_thumbnails?
+          thumbnail = Bulkrax.object_factory.thumbnail_for(resource: record)
+          file_sets << thumbnail if thumbnail.present?
+        end
+
+        file_sets.each do |fs|
+          path = File.join(exporter_export_path, folder_count, 'files')
+          FileUtils.mkdir_p(path) unless File.exist? path
+
+          original_file = Bulkrax.object_factory.original_file(fileset: fs)
+          next if original_file.blank?
+          file = filename(fs)
+
+          io = original_file.respond_to?(:uri) ? URI.open(original_file.uri) : original_file.file.io
+
+          File.open(File.join(path, file), 'wb') do |f|
+            f.write(io.read)
+            f.close
+          end
+        end
+      rescue Ldp::Gone
+        return
+      rescue StandardError => e
+        raise StandardError, "Unable to retrieve files for identifier #{identifier} - #{e.message}"
+      end
     end
   end
+  # rubocop:enable all
+
+  Bulkrax::CsvParser.prepend(Spot::BulkraxCsvParserDecorator)
+
+  # Copied over from Hyrax to overwrite the method in the user concern.
+  # We remove the password parameter since we don't use it.
+  #
+  # @see https://github.com/samvera/hyrax/blob/0af11acf9088cc90c7c9dcf2b4969bd45a101fe2/app/models/concerns/hyrax/user.rb#L183C5-L185C8
+  Hyrax::User.class_eval do
+    def find_or_create_system_user(user_key)
+      User.find_by_user_key(user_key) || User.create!(user_key_field => user_key)
+    end
+  end
+
+  Bulkrax::ObjectFactory.prepend(Spot::BulkraxObjectFactoryFindPatch)
 end
diff --git a/config/initializers/wings.rb b/config/initializers/wings.rb
new file mode 100644
index 000000000..b47bea4bc
--- /dev/null
+++ b/config/initializers/wings.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+#
+# Copied from Dassie example in Hyrax—register our models with Wings so they convert correctly
+#
+# @todo Revisit this when Valkyrizing. This might need to be moved to config/initializers/valkyrie.rb
+# @see https://github.com/samvera/hyrax/blob/hyrax-v5.2.0/.dassie/config/initializers/wings.rb
+Rails.application.config.after_initialize do
+  Wings::ModelRegistry.register(Collection, Collection)
+  Wings::ModelRegistry.register(AdminSet, AdminSet)
+  Wings::ModelRegistry.register(FileSet, FileSet)
+  Wings::ModelRegistry.register(Hyrax::FileSet, FileSet)
+  Wings::ModelRegistry.register(Hydra::PCDM::File, Hydra::PCDM::File)
+  Wings::ModelRegistry.register(Hyrax::FileMetadata, Hydra::PCDM::File)
+
+  Wings::ModelRegistry.register(Publication, PublicationResource)
+  Wings::ModelRegistry.register(Image, ImageResource)
+  Wings::ModelRegistry.register(StudentWork, StudentWorkResource)
+  Wings::ModelRegistry.register(AudioVisual, AudioVisualResource)
+end
diff --git a/config/initializers/zeitwerk.rb b/config/initializers/zeitwerk.rb
new file mode 100644
index 000000000..f7bf74147
--- /dev/null
+++ b/config/initializers/zeitwerk.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+ActiveSupport::Inflector.inflections(:en) do |inflect|
+  inflect.acronym 'ISO'
+end
+
+Rails.autoloaders.each do |autoloader|
+  autoloader.inflector.inflect(
+    'spot/iso_6391' => 'Spot::ISO6391',
+    'spot/rdf_authority_parser' => 'Spot::RDFAuthorityParser',
+    'spot/work_csv_service' => 'Spot::WorkCSVService'
+  )
+end
diff --git a/config/locales/blacklight.en.yml b/config/locales/blacklight.en.yml
index 6fedfce26..424095b2e 100644
--- a/config/locales/blacklight.en.yml
+++ b/config/locales/blacklight.en.yml
@@ -1,14 +1,38 @@
 en:
   blacklight:
+    search_page:
+      page_title:
+        title: 'Search Results: %{constraints} // %{application_name}'
     search:
       facets:
         # We don't want to spell out the OCM acronym on the facet labels,
         # which have limited space available.
         subject_ocm: OCM Classification
-        admin:
-          title: Admin Facets
+      facets-admin:
+        title: Admin Facets
+
       fields:
+        facet:
+          academic_department_sim: Academic Department
+          advisor_label_ssim: Advisor
+          creator_sim: Creator
+          depositor_ssim: Deposited by
+          division_sim: Division
+          language_label_ssim: Language
+          location_label_sim: Location
+          member_of_collections_ssim: Collections
+          member_of_collection_ids_ssim: Collections
+          organization_sim: Organization
+          proxy_depositor_ssim: Proxy Depositor
+          publisher_sim: Publisher
+          resource_type_sim: Type
+          rights_statement_shortcode_ssim: Rights Statement
+          subject_label_sim: Subject
+          subject_ocm_ssim: Outline of Cultural Materials classification
+          years_encompassed_iim: Year
+
         academic_department: Academic Department
+        admin_set_sim: Administrative Set
         advisor_label: Advisor
         author: Author
         barcode: Barcode
@@ -32,6 +56,7 @@ en:
         has_model: LDR Type
         inscription: Inscription
         keyword: Keyword
+        keyword_sim: Keyword
         language: Language
         language_label: Language
         lease_expiration_date: Lease Expiration Date
@@ -54,6 +79,7 @@ en:
         repository_location: Repository Location
         requested_by: Requested By
         research_assistance: Research Assistance
+        research_assistance_ssim: Research Assistance
         resource_type: Type
         rights_holder: Rights Holders
         rights_statement: Rights Statement
@@ -61,6 +87,7 @@ en:
         source: Source
         standard_identifier: Standard Identifier
         subject: Subject
+        subject_label: Subject
         subject_ocm: Outline of Cultural Materials classification
         subtitle: Subtitle
         title: Title
diff --git a/config/locales/spot.en.yml b/config/locales/spot.en.yml
index dc2cf7450..50e677d79 100644
--- a/config/locales/spot.en.yml
+++ b/config/locales/spot.en.yml
@@ -16,8 +16,8 @@ en:
       page_title: 'Advanced Search // %{name}'
 
     catalog:
-      index:
-        page_title: 'Search Results // %{name}'
+      page_title: 'Search Results: %{query} // %{name}'
+      page_title_with_pagination: 'Search Results: %{query} (page %{page}) // %{name}'
 
     collections:
       breadcrumb: Collections
diff --git a/config/metadata/audio_visual_metadata.yaml b/config/metadata/audio_visual_metadata.yaml
new file mode 100644
index 000000000..b7690b6f5
--- /dev/null
+++ b/config/metadata/audio_visual_metadata.yaml
@@ -0,0 +1,67 @@
+attributes:
+  date:
+    predicate: http://purl.org/dc/terms/date
+    type: string
+    multiple: true
+    required: true
+    form:
+      multiple: true
+    index_keys:
+      - date_ssim
+  date_associated:
+    predicate: https://d-nb.info/standards/elementset/gnd#associatedDate
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - date_associated_ssim
+      - date_associated_tesim
+  inscription:
+    predicate: http://dbpedia.org/ontology/inscription
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - inscription_tesim
+  original_item_extent:
+    predicate: http://purl.org/dc/terms/extent
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - original_item_extent_tesim
+  repository_location:
+    predicate: http://purl.org/vra/placeOfRepository
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - repository_location_ssim
+  research_assistance:
+    predicate: http://www.rdaregistry.info/Elements/a/#P50265
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - research_assistance_ssim
+  provenance:
+    predicate: http://purl.org/dc/terms/provenance
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - provenance_tesim
+  barcode:
+    predicate: https://schema.org/Barcode
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - barcode_ssim
diff --git a/config/metadata/base_metadata.yaml b/config/metadata/base_metadata.yaml
new file mode 100644
index 000000000..7e86872ab
--- /dev/null
+++ b/config/metadata/base_metadata.yaml
@@ -0,0 +1,173 @@
+attributes:
+  bibliographic_citation:
+    predicate: http://purl.org/dc/terms/bibliographicCitation
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - bibliographic_citation_tesim
+  contributor:
+    predicate: http://purl.org/dc/elements/1.1/contributor
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - contributor_tesim
+      - contributor_sim
+  creator:
+    predicate: http://purl.org/dc/elements/1.1/creator
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - creator_tesim
+      - creator_sim
+  description:
+    predicate: http://purl.org/dc/elements/1.1/description
+    type: string
+    multiple: true
+    form:
+      multiple: true
+      primary: true
+    index_keys:
+      - description_tesim
+  identifier:
+    predicate: http://purl.org/dc/terms/identifier
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - identifier_ssim
+  keyword:
+    predicate: http://schema.org/keywords
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - keyword_tesim
+      - keyword_sim
+  # @see IndexesLanguageAndLabel mixin for indexing info, uses
+  language:
+    predicate: http://purl.org/dc/elements/1.1/language
+    type: string
+    multiple: true
+    form:
+      multiple: true
+  # @note RDF indexing for :location is set up in app/models/base_resource.rb
+  #       and uses "location_ssim" and "location_label_ssim" keys
+  location:
+    predicate: http://purl.org/dc/terms/spatial
+    type: uri
+    multiple: true
+    form:
+      multiple: true
+  note:
+    predicate: http://www.w3.org/2004/02/skos/core#note
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - note_tesim
+  physical_medium:
+    predicate: http://purl.org/dc/terms/PhysicalMedium
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - physical_medium_tesim
+      - physical_medium_sim
+  publisher:
+    predicate: http://purl.org/dc/elements/1.1/publisher
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - publisher_tesim
+      - publisher_sim
+  related_resource:
+    predicate: http://www.w3.org/2000/01/rdf-schema#seeAlso
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - related_resource_tesim
+      - related_resource_sim
+  resource_type:
+    predicate: 'http://purl.org/dc/terms/type'
+    type: string
+    multiple: true
+    form:
+      multiple: true
+      required: true
+    index_keys:
+      - resource_type_ssim
+  rights_holder:
+    predicate: http://purl.org/dc/terms/rightsHolder
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - rights_holder_tesim
+      - rights_holder_sim
+  rights_statement:
+    predicate: http://www.europeana.eu/schemas/edm/rights
+    type: uri
+    multiple: true
+    form:
+      multiple: false
+      required: true
+    index_keys:
+      - rights_statement_ssim
+  source:
+    predicate: http://purl.org/dc/terms/source
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - source_tesim
+      - source_sim
+  source_identifier:
+    predicate: http://ldr.lafayette.edu/ns#source_identifier
+    type: string
+    multiple: true
+    index_keys:
+      - source_identifier_ssim
+  # @note RDF indexing for :subject is set up in app/models/base_resource.rb
+  #       and uses "subject_ssim" and "subject_label_ssim" keys
+  subject:
+    predicate: http://purl.org/dc/elements/1.1/subject
+    type: uri
+    multiple: true
+    form:
+      multiple: true
+      primary: true
+      default: []
+  subtitle:
+    predicate: http://purl.org/spar/doco/Subtitle
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - subtitle_tesim
+      - subtitle_sim
+  title_alternative:
+    predicate: http://purl.org/dc/terms/alternative
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - title_alternative_tesim
+      - title_alternative_sim
\ No newline at end of file
diff --git a/config/metadata/core_metadata.yaml b/config/metadata/core_metadata.yaml
new file mode 100644
index 000000000..9af3d81a0
--- /dev/null
+++ b/config/metadata/core_metadata.yaml
@@ -0,0 +1,22 @@
+# Included in Hyrax::Work + copied from Hyrax source
+# @see https://github.com/samvera/hyrax/blob/hyrax-v3.6.0/config/metadata/core_metadata.yaml
+attributes:
+  title:
+    predicate: http://purl.org/dc/terms/title
+    type: string
+    multiple: true
+    index_keys:
+      - "title_sim"
+      - "title_tesim"
+    form:
+      multiple: false
+      required: true
+  date_modified:
+    predicate: http://purl.org/dc/terms/modified
+    type: date_time
+  date_uploaded:
+    precicate: http://purl.org/dc/terms/dateSubmitted
+    type: date_time
+  depositor:
+    predicate: http://id.loc.gov/vocabulary/relators/dpt
+    type: string
\ No newline at end of file
diff --git a/config/metadata/image_metadata.yaml b/config/metadata/image_metadata.yaml
new file mode 100644
index 000000000..9e409f5b7
--- /dev/null
+++ b/config/metadata/image_metadata.yaml
@@ -0,0 +1,85 @@
+attributes:
+  # @todo date type? edtf type?
+  date:
+    predicate: http://purl.org/dc/terms/date
+    type: string
+    multiple: true
+    required: true
+    form:
+      multiple: true
+    index_keys:
+      - date_ssim
+  date_associated:
+    predicate: https://d-nb.info/standards/elementset/gnd#associatedDate
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - date_associated_ssim
+      - date_associated_tesim
+  date_scope_note:
+    predicate: http://www.w3.org/2004/02/skos/core#scopeNote
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - date_scope_note_tesim
+  donor:
+    predicate: http://purl.org/dc/terms/provenance
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - donor_ssim
+  inscription:
+    predicate: http://dbpedia.org/ontology/inscription
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - inscription_tesim
+  original_item_extent:
+    predicate: http://purl.org/dc/terms/extent
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - original_item_extent_tesim
+  repository_location:
+    predicate: http://purl.org/vra/placeOfRepository
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - repository_location_ssim
+  requested_by:
+    predicate: http://rdf.myexperiment.org/ontologies/base/has-requester
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - requested_by_ssim
+  research_assistance:
+    predicate: http://www.rdaregistry.info/Elements/a/#P50265
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - research_assistance_ssim
+  subject_ocm:
+    predicate: https://hraf.yale.edu/resources/reference/outline-of-cultural-materials
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - subject_ocm_tesim
+      - subject_ocm_ssim
diff --git a/config/metadata/institutional_metadata.yaml b/config/metadata/institutional_metadata.yaml
new file mode 100644
index 000000000..5e3e9ea44
--- /dev/null
+++ b/config/metadata/institutional_metadata.yaml
@@ -0,0 +1,28 @@
+attributes:
+  academic_department:
+    predicate: http://vivoweb.org/ontology/core#AcademicDepartment
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - academic_department_tesim
+      - academic_department_sim
+  division:
+    predicate: http://vivoweb.org/ontology/core#Division
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - division_tesim
+      - division_sim
+  organization:
+    predicate: http://vivoweb.org/ontology/core#Organization
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - organization_tesim
+      - organization_sim
\ No newline at end of file
diff --git a/config/metadata/publication_metadata.yaml b/config/metadata/publication_metadata.yaml
new file mode 100644
index 000000000..d4c6fe2fc
--- /dev/null
+++ b/config/metadata/publication_metadata.yaml
@@ -0,0 +1,42 @@
+attributes:
+  abstract:
+    predicate: http://purl.org/dc/terms/abstract
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - abstract_tesim
+  date_issued:
+    predicate: http://purl.org/dc/terms/issued
+    type: string
+    multiple: true
+    form:
+      multiple: false
+      required: true
+    index_keys:
+      - date_issued_ssim
+  # @todo should this be a date field?
+  date_available:
+    predicate: http://purl.org/dc/terms/available
+    type: string
+    multiple: true
+    form:
+      multiple: false
+    index_keys:
+      - date_available_ssim
+  editor:
+    predicate: http://purl.org/ontology/bibo/editor
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - editor_sim
+      - editor_tesim
+  license:
+    predicate: http://purl.org/dc/terms/license
+    type: string
+    multiple: true
+    index_keys:
+      - license_tsm
diff --git a/config/metadata/student_work_metadata.yaml b/config/metadata/student_work_metadata.yaml
new file mode 100644
index 000000000..39c697708
--- /dev/null
+++ b/config/metadata/student_work_metadata.yaml
@@ -0,0 +1,43 @@
+attributes:
+  abstract:
+    predicate: http://purl.org/dc/terms/abstract
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - abstract_tesim
+  access_note:
+    predicate: http://purl.org/dc/terms/accessRights
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - access_note_tesim
+  advisor:
+    predicate: http://id.loc.gov/vocabulary/relators/ths
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - advisor_ssim
+  # dates are edtf values, is there a way we can make this a type?
+  date:
+    predicate: http://purl.org/dc/terms/date
+    type: string
+    multiple: true
+    required: true
+    form:
+      multiple: true
+    index_keys:
+      - date_ssim
+  date_available:
+    predicate: http://purl.org/dc/terms/available
+    type: string
+    multiple: true
+    form:
+      multiple: true
+    index_keys:
+      - date_available_ssim
diff --git a/config/routes.rb b/config/routes.rb
index 614a15e60..897955471 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,7 +9,7 @@
   ##
 
   # user routes
-  devise_for :users
+  devise_for :users, sign_out_via: :get
 
   # need to call `root` before mounting our engines
   root 'spot/homepage#index'
@@ -46,7 +46,6 @@
   mount Sidekiq::Web => '/sidekiq'
   mount Qa::Engine => '/authorities'
   mount Bulkrax::Engine, at: '/'
-  mount BrowseEverything::Engine => '/browse'
 
   concern :exportable, Blacklight::Routes::Exportable.new
   concern :oai_provider, BlacklightOaiProvider::Routes.new
diff --git a/config/storage.yml b/config/storage.yml
new file mode 100644
index 000000000..74490077e
--- /dev/null
+++ b/config/storage.yml
@@ -0,0 +1,26 @@
+# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
+# amazon:
+#   service: S3
+#   access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
+#   secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
+#   region: us-east-1
+#   bucket: your_own_bucket
+
+# Remember not to checkin your GCS keyfile to a repository
+# google:
+#   service: GCS
+#   project: your_project
+#   credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
+#   bucket: your_own_bucket
+
+# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
+# microsoft:
+#   service: AzureStorage
+#   storage_account_name: your_account_name
+#   storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
+#   container: your_container_name
+
+# mirror:
+#   service: Mirror
+#   primary: local
+#   mirrors: [ amazon, google, microsoft ]
diff --git a/db/seeds.rb b/db/seeds.rb
index 46726dbae..6fe22b1d7 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,15 +1,36 @@
-# seed the application w/ some essentials
+# frozen_string_literal: true
+#
+# Copying seeds from Hyrax, adding additional LDR steps after
+# @see https://github.com/samvera/hyrax/blob/hyrax-v5.2.0/db/seeds.rb
+ActiveFedora.fedora.connection.send(:init_base_path)
 
-# essential hyrax setup
-Rake::Task['hyrax:workflow:load'].invoke
-Rake::Task['hyrax:default_collection_types:create'].invoke
-Rake::Task['hyrax:default_admin_set:create'].invoke
+puts "\n== Creating default collection types"
+Hyrax::CollectionType.find_or_create_default_collection_type
+Hyrax::CollectionType.find_or_create_admin_set_type
 
-# local set up: create roles, deposit user, + admin_sets
+puts "\n== Loading workflows"
+Hyrax::Workflow::WorkflowImporter.load_workflows
+errors = Hyrax::Workflow::WorkflowImporter.load_errors
+abort("Failed to process all workflows:\n  #{errors.join('\n  ')}") unless errors.empty?
+
+puts "\n== Creating default admin set"
+admin_set_id = Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s
+
+puts "\n== Ensuring the found or created admin set is indexed"
+AdminSet.find(admin_set_id).update_index
+
+# Legacy seeding done by Rake tasks
+# @see lib/tasks/spot
+
+# create roles, deposit user, + admin_sets
 Rake::Task['spot:roles:default'].invoke
 Rake::Task['spot:create_deposit_user'].invoke
 Rake::Task['spot:student_work_admin_set:create'].invoke
 
+# Pass dev admin users via environment variable,separate with commas
+# @example
+#   DEV_ADMIN_USERS="malantoa@lafayette.edu,facultyuser@lafayette.edu"
+#
 if ENV['DEV_ADMIN_USERS'].present?
   admin = Role.find_by(name: 'admin')
 
diff --git a/db/structure.sql b/db/structure.sql
index 62de3c249..84033ac74 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1,3 +1,8 @@
+\restrict zGnP9xNrj5vXJP6eZcBchqhC4KoF4Tbn1lTESweMCy6CGbvkCQR9hwyeVf05jRP
+
+-- Dumped from database version 15.15
+-- Dumped by pg_dump version 15.14 (Debian 15.14-0+deb12u1)
+
 SET statement_timeout = 0;
 SET lock_timeout = 0;
 SET idle_in_transaction_session_timeout = 0;
@@ -20,8 +25,8 @@ SET default_table_access_method = heap;
 CREATE TABLE public.ar_internal_metadata (
     key character varying NOT NULL,
     value character varying,
-    created_at timestamp without time zone NOT NULL,
-    updated_at timestamp without time zone NOT NULL
+    created_at timestamp(6) without time zone NOT NULL,
+    updated_at timestamp(6) without time zone NOT NULL
 );
 
 
@@ -46,6 +51,7 @@ CREATE TABLE public.bookmarks (
 --
 
 CREATE SEQUENCE public.bookmarks_id_seq
+    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -60,6 +66,296 @@ CREATE SEQUENCE public.bookmarks_id_seq
 ALTER SEQUENCE public.bookmarks_id_seq OWNED BY public.bookmarks.id;
 
 
+--
+-- Name: bulkrax_entries; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.bulkrax_entries (
+    id bigint NOT NULL,
+    identifier character varying,
+    collection_ids character varying,
+    type character varying,
+    importerexporter_id bigint,
+    raw_metadata text,
+    parsed_metadata text,
+    created_at timestamp without time zone NOT NULL,
+    updated_at timestamp without time zone NOT NULL,
+    last_error_at timestamp without time zone,
+    last_succeeded_at timestamp without time zone,
+    importerexporter_type character varying DEFAULT 'Bulkrax::Importer'::character varying,
+    import_attempts integer DEFAULT 0,
+    status_message character varying DEFAULT 'Pending'::character varying,
+    error_class character varying
+);
+
+
+--
+-- Name: bulkrax_entries_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE public.bulkrax_entries_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: bulkrax_entries_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE public.bulkrax_entries_id_seq OWNED BY public.bulkrax_entries.id;
+
+
+--
+-- Name: bulkrax_exporter_runs; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.bulkrax_exporter_runs (
+    id bigint NOT NULL,
+    exporter_id bigint,
+    total_work_entries integer DEFAULT 0,
+    enqueued_records integer DEFAULT 0,
+    processed_records integer DEFAULT 0,
+    deleted_records integer DEFAULT 0,
+    failed_records integer DEFAULT 0
+);
+
+
+--
+-- Name: bulkrax_exporter_runs_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE public.bulkrax_exporter_runs_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: bulkrax_exporter_runs_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE public.bulkrax_exporter_runs_id_seq OWNED BY public.bulkrax_exporter_runs.id;
+
+
+--
+-- Name: bulkrax_exporters; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.bulkrax_exporters (
+    id bigint NOT NULL,
+    name character varying,
+    user_id bigint,
+    parser_klass character varying,
+    "limit" integer,
+    parser_fields text,
+    field_mapping text,
+    export_source character varying,
+    export_from character varying,
+    export_type character varying,
+    created_at timestamp without time zone NOT NULL,
+    updated_at timestamp without time zone NOT NULL,
+    last_error_at timestamp without time zone,
+    last_succeeded_at timestamp without time zone,
+    start_date date,
+    finish_date date,
+    work_visibility character varying,
+    workflow_status character varying,
+    include_thumbnails boolean DEFAULT false,
+    generated_metadata boolean DEFAULT false,
+    status_message character varying DEFAULT 'Pending'::character varying,
+    error_class character varying
+);
+
+
+--
+-- Name: bulkrax_exporters_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE public.bulkrax_exporters_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: bulkrax_exporters_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE public.bulkrax_exporters_id_seq OWNED BY public.bulkrax_exporters.id;
+
+
+--
+-- Name: bulkrax_importer_runs; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.bulkrax_importer_runs (
+    id bigint NOT NULL,
+    importer_id bigint,
+    total_work_entries integer DEFAULT 0,
+    enqueued_records integer DEFAULT 0,
+    processed_records integer DEFAULT 0,
+    deleted_records integer DEFAULT 0,
+    failed_records integer DEFAULT 0,
+    created_at timestamp without time zone NOT NULL,
+    updated_at timestamp without time zone NOT NULL,
+    processed_collections integer DEFAULT 0,
+    failed_collections integer DEFAULT 0,
+    total_collection_entries integer DEFAULT 0,
+    processed_relationships integer DEFAULT 0,
+    failed_relationships integer DEFAULT 0,
+    invalid_records text,
+    processed_file_sets integer DEFAULT 0,
+    failed_file_sets integer DEFAULT 0,
+    total_file_set_entries integer DEFAULT 0,
+    processed_works integer DEFAULT 0,
+    failed_works integer DEFAULT 0
+);
+
+
+--
+-- Name: bulkrax_importer_runs_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE public.bulkrax_importer_runs_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: bulkrax_importer_runs_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE public.bulkrax_importer_runs_id_seq OWNED BY public.bulkrax_importer_runs.id;
+
+
+--
+-- Name: bulkrax_importers; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.bulkrax_importers (
+    id bigint NOT NULL,
+    name character varying,
+    admin_set_id character varying,
+    user_id bigint,
+    frequency character varying,
+    parser_klass character varying,
+    "limit" integer,
+    parser_fields text,
+    field_mapping text,
+    created_at timestamp without time zone NOT NULL,
+    updated_at timestamp without time zone NOT NULL,
+    validate_only boolean,
+    last_error_at timestamp without time zone,
+    last_succeeded_at timestamp without time zone,
+    status_message character varying DEFAULT 'Pending'::character varying,
+    last_imported_at timestamp without time zone,
+    next_import_at timestamp without time zone,
+    error_class character varying
+);
+
+
+--
+-- Name: bulkrax_importers_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE public.bulkrax_importers_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: bulkrax_importers_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE public.bulkrax_importers_id_seq OWNED BY public.bulkrax_importers.id;
+
+
+--
+-- Name: bulkrax_pending_relationships; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.bulkrax_pending_relationships (
+    id bigint NOT NULL,
+    importer_run_id bigint NOT NULL,
+    parent_id character varying NOT NULL,
+    child_id character varying NOT NULL,
+    created_at timestamp without time zone NOT NULL,
+    updated_at timestamp without time zone NOT NULL,
+    "order" integer DEFAULT 0,
+    status_message character varying DEFAULT 'Pending'::character varying
+);
+
+
+--
+-- Name: bulkrax_pending_relationships_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE public.bulkrax_pending_relationships_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: bulkrax_pending_relationships_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE public.bulkrax_pending_relationships_id_seq OWNED BY public.bulkrax_pending_relationships.id;
+
+
+--
+-- Name: bulkrax_statuses; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.bulkrax_statuses (
+    id bigint NOT NULL,
+    status_message character varying,
+    error_class character varying,
+    error_message text,
+    error_backtrace text,
+    statusable_id integer,
+    statusable_type character varying,
+    runnable_id integer,
+    runnable_type character varying,
+    created_at timestamp without time zone NOT NULL,
+    updated_at timestamp without time zone NOT NULL
+);
+
+
+--
+-- Name: bulkrax_statuses_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE public.bulkrax_statuses_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: bulkrax_statuses_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE public.bulkrax_statuses_id_seq OWNED BY public.bulkrax_statuses.id;
+
+
 --
 -- Name: checksum_audit_logs; Type: TABLE; Schema: public; Owner: -
 --
@@ -532,6 +828,7 @@ CREATE TABLE public.mailboxer_conversation_opt_outs (
 --
 
 CREATE SEQUENCE public.mailboxer_conversation_opt_outs_id_seq
+    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -563,6 +860,7 @@ CREATE TABLE public.mailboxer_conversations (
 --
 
 CREATE SEQUENCE public.mailboxer_conversations_id_seq
+    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -606,6 +904,7 @@ CREATE TABLE public.mailboxer_notifications (
 --
 
 CREATE SEQUENCE public.mailboxer_notifications_id_seq
+    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -646,6 +945,7 @@ CREATE TABLE public.mailboxer_receipts (
 --
 
 CREATE SEQUENCE public.mailboxer_receipts_id_seq
+    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -681,6 +981,7 @@ CREATE TABLE public.minter_states (
 --
 
 CREATE SEQUENCE public.minter_states_id_seq
+    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -944,6 +1245,7 @@ CREATE TABLE public.roles (
 --
 
 CREATE SEQUENCE public.roles_id_seq
+    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -996,6 +1298,7 @@ CREATE TABLE public.searches (
 --
 
 CREATE SEQUENCE public.searches_id_seq
+    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -1674,7 +1977,8 @@ CREATE TABLE public.uploaded_files (
     user_id bigint,
     file_set_uri character varying,
     created_at timestamp without time zone NOT NULL,
-    updated_at timestamp without time zone NOT NULL
+    updated_at timestamp without time zone NOT NULL,
+    filename character varying
 );
 
 
@@ -1868,6 +2172,55 @@ ALTER SEQUENCE public.work_view_stats_id_seq OWNED BY public.work_view_stats.id;
 ALTER TABLE ONLY public.bookmarks ALTER COLUMN id SET DEFAULT nextval('public.bookmarks_id_seq'::regclass);
 
 
+--
+-- Name: bulkrax_entries id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.bulkrax_entries ALTER COLUMN id SET DEFAULT nextval('public.bulkrax_entries_id_seq'::regclass);
+
+
+--
+-- Name: bulkrax_exporter_runs id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.bulkrax_exporter_runs ALTER COLUMN id SET DEFAULT nextval('public.bulkrax_exporter_runs_id_seq'::regclass);
+
+
+--
+-- Name: bulkrax_exporters id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.bulkrax_exporters ALTER COLUMN id SET DEFAULT nextval('public.bulkrax_exporters_id_seq'::regclass);
+
+
+--
+-- Name: bulkrax_importer_runs id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.bulkrax_importer_runs ALTER COLUMN id SET DEFAULT nextval('public.bulkrax_importer_runs_id_seq'::regclass);
+
+
+--
+-- Name: bulkrax_importers id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.bulkrax_importers ALTER COLUMN id SET DEFAULT nextval('public.bulkrax_importers_id_seq'::regclass);
+
+
+--
+-- Name: bulkrax_pending_relationships id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.bulkrax_pending_relationships ALTER COLUMN id SET DEFAULT nextval('public.bulkrax_pending_relationships_id_seq'::regclass);
+
+
+--
+-- Name: bulkrax_statuses id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.bulkrax_statuses ALTER COLUMN id SET DEFAULT nextval('public.bulkrax_statuses_id_seq'::regclass);
+
+
 --
 -- Name: checksum_audit_logs id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -2248,6 +2601,62 @@ ALTER TABLE ONLY public.bookmarks
     ADD CONSTRAINT bookmarks_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: bulkrax_entries bulkrax_entries_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.bulkrax_entries
+    ADD CONSTRAINT bulkrax_entries_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: bulkrax_exporter_runs bulkrax_exporter_runs_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.bulkrax_exporter_runs
+    ADD CONSTRAINT bulkrax_exporter_runs_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: bulkrax_exporters bulkrax_exporters_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.bulkrax_exporters
+    ADD CONSTRAINT bulkrax_exporters_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: bulkrax_importer_runs bulkrax_importer_runs_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.bulkrax_importer_runs
+    ADD CONSTRAINT bulkrax_importer_runs_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: bulkrax_importers bulkrax_importers_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.bulkrax_importers
+    ADD CONSTRAINT bulkrax_importers_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: bulkrax_pending_relationships bulkrax_pending_relationships_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.bulkrax_pending_relationships
+    ADD CONSTRAINT bulkrax_pending_relationships_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: bulkrax_statuses bulkrax_statuses_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.bulkrax_statuses
+    ADD CONSTRAINT bulkrax_statuses_pkey PRIMARY KEY (id);
+
+
 --
 -- Name: checksum_audit_logs checksum_audit_logs_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
@@ -2672,6 +3081,34 @@ ALTER TABLE ONLY public.work_view_stats
     ADD CONSTRAINT work_view_stats_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: bulkrax_entries_importerexporter_idx; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX bulkrax_entries_importerexporter_idx ON public.bulkrax_entries USING btree (importerexporter_id, importerexporter_type);
+
+
+--
+-- Name: bulkrax_identifier_idx; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX bulkrax_identifier_idx ON public.bulkrax_entries USING btree (identifier, importerexporter_id, importerexporter_type);
+
+
+--
+-- Name: bulkrax_statuses_runnable_idx; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX bulkrax_statuses_runnable_idx ON public.bulkrax_statuses USING btree (runnable_id, runnable_type);
+
+
+--
+-- Name: bulkrax_statuses_statusable_idx; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX bulkrax_statuses_statusable_idx ON public.bulkrax_statuses USING btree (statusable_id, statusable_type);
+
+
 --
 -- Name: by_file_set_id_and_file_id; Type: INDEX; Schema: public; Owner: -
 --
@@ -2700,6 +3137,76 @@ CREATE INDEX index_bookmarks_on_document_id ON public.bookmarks USING btree (doc
 CREATE INDEX index_bookmarks_on_user_id ON public.bookmarks USING btree (user_id);
 
 
+--
+-- Name: index_bulkrax_entries_on_importerexporter_id_type_and_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_bulkrax_entries_on_importerexporter_id_type_and_id ON public.bulkrax_entries USING btree (importerexporter_id, importerexporter_type, id);
+
+
+--
+-- Name: index_bulkrax_entries_on_type; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_bulkrax_entries_on_type ON public.bulkrax_entries USING btree (type);
+
+
+--
+-- Name: index_bulkrax_exporter_runs_on_exporter_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_bulkrax_exporter_runs_on_exporter_id ON public.bulkrax_exporter_runs USING btree (exporter_id);
+
+
+--
+-- Name: index_bulkrax_exporters_on_user_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_bulkrax_exporters_on_user_id ON public.bulkrax_exporters USING btree (user_id);
+
+
+--
+-- Name: index_bulkrax_importer_runs_on_importer_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_bulkrax_importer_runs_on_importer_id ON public.bulkrax_importer_runs USING btree (importer_id);
+
+
+--
+-- Name: index_bulkrax_importers_on_user_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_bulkrax_importers_on_user_id ON public.bulkrax_importers USING btree (user_id);
+
+
+--
+-- Name: index_bulkrax_pending_relationships_on_child_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_bulkrax_pending_relationships_on_child_id ON public.bulkrax_pending_relationships USING btree (child_id);
+
+
+--
+-- Name: index_bulkrax_pending_relationships_on_importer_run_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_bulkrax_pending_relationships_on_importer_run_id ON public.bulkrax_pending_relationships USING btree (importer_run_id);
+
+
+--
+-- Name: index_bulkrax_pending_relationships_on_parent_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_bulkrax_pending_relationships_on_parent_id ON public.bulkrax_pending_relationships USING btree (parent_id);
+
+
+--
+-- Name: index_bulkrax_statuses_on_error_class; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_bulkrax_statuses_on_error_class ON public.bulkrax_statuses USING btree (error_class);
+
+
 --
 -- Name: index_checksum_audit_logs_on_checked_uri; Type: INDEX; Schema: public; Owner: -
 --
@@ -3282,6 +3789,14 @@ ALTER TABLE ONLY public.collection_type_participants
     ADD CONSTRAINT fk_rails_2da4e10612 FOREIGN KEY (hyrax_collection_type_id) REFERENCES public.hyrax_collection_types(id);
 
 
+--
+-- Name: bulkrax_importer_runs fk_rails_3690e86fd3; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.bulkrax_importer_runs
+    ADD CONSTRAINT fk_rails_3690e86fd3 FOREIGN KEY (importer_id) REFERENCES public.bulkrax_importers(id);
+
+
 --
 -- Name: curation_concerns_operations fk_rails_3c63b420e5; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -3290,6 +3805,14 @@ ALTER TABLE ONLY public.curation_concerns_operations
     ADD CONSTRAINT fk_rails_3c63b420e5 FOREIGN KEY (user_id) REFERENCES public.users(id);
 
 
+--
+-- Name: bulkrax_pending_relationships fk_rails_96929c1edc; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.bulkrax_pending_relationships
+    ADD CONSTRAINT fk_rails_96929c1edc FOREIGN KEY (importer_run_id) REFERENCES public.bulkrax_importer_runs(id);
+
+
 --
 -- Name: permission_template_accesses fk_rails_9c1ccdc6d5; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -3298,6 +3821,14 @@ ALTER TABLE ONLY public.permission_template_accesses
     ADD CONSTRAINT fk_rails_9c1ccdc6d5 FOREIGN KEY (permission_template_id) REFERENCES public.permission_templates(id);
 
 
+--
+-- Name: bulkrax_exporter_runs fk_rails_b9767c6c02; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.bulkrax_exporter_runs
+    ADD CONSTRAINT fk_rails_b9767c6c02 FOREIGN KEY (exporter_id) REFERENCES public.bulkrax_exporters(id);
+
+
 --
 -- Name: qa_local_authority_entries fk_rails_cee742275b; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -3342,6 +3873,8 @@ ALTER TABLE ONLY public.mailboxer_receipts
 -- PostgreSQL database dump complete
 --
 
+\unrestrict zGnP9xNrj5vXJP6eZcBchqhC4KoF4Tbn1lTESweMCy6CGbvkCQR9hwyeVf05jRP
+
 SET search_path TO "$user", public;
 
 INSERT INTO "schema_migrations" (version) VALUES
@@ -3409,17 +3942,61 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20180427181339'),
 ('20180427181340'),
 ('20180427181341'),
+('20181011230201'),
+('20181011230228'),
 ('20181101155934'),
 ('20190220133607'),
 ('20190315143022'),
+('20190325183136'),
 ('20190327194742'),
+('20190601221109'),
+('20190715161939'),
+('20190715162044'),
+('20190729124607'),
+('20190729134158'),
+('20190731114016'),
+('20191203225129'),
+('20191204191623'),
+('20191204223857'),
+('20191212155530'),
+('20200108194557'),
 ('20200128221650'),
+('20200301232856'),
+('20200312190638'),
+('20200326235838'),
+('20200601204556'),
+('20200818055819'),
+('20200819054016'),
+('20201106014204'),
+('20201117220007'),
+('20210806044408'),
+('20210806065737'),
+('20211004170708'),
+('20211203195233'),
 ('20211206185043'),
+('20211220195027'),
+('20220118001339'),
+('20220119213325'),
+('20220301001839'),
+('20220303212810'),
 ('20220317170657'),
 ('20220318162758'),
 ('20220322165644'),
 ('20220412135003'),
 ('20220412135004'),
-('20230309145101');
+('20220412233954'),
+('20220413180915'),
+('20220609001128'),
+('20230309145101'),
+('20230608153601'),
+('20240208005801'),
+('20240209070952'),
+('20240307053156'),
+('20240806161142'),
+('20240823173525'),
+('20240916182737'),
+('20240916182823'),
+('20241203010707'),
+('20241205212513');
 
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 20f86f87e..18d609f8b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -39,7 +39,7 @@ services:
     restart: unless-stopped
 
   db:
-    image: postgres:13-alpine
+    image: postgres:15-alpine
     volumes:
       - db:/var/lib/postgresql/data
       - ./bin/create-dev-dbs.sql:/docker-entrypoint-initdb.d/10-create-dev-dbs.sql
@@ -132,7 +132,7 @@ services:
     build:
       context: ./docker/solr
     volumes:
-      - solr:/var/solr/data
+      - solr:/var/solr
     ports:
       - "8983:8983"
     environment:
diff --git a/docker/solr/Dockerfile b/docker/solr/Dockerfile
index 39ab5366c..8ad641e11 100644
--- a/docker/solr/Dockerfile
+++ b/docker/solr/Dockerfile
@@ -1,23 +1,33 @@
-FROM solr:8.11.4
+FROM solr:9.10.1
 
 USER root
-RUN apt-get update && apt-get upgrade -y
+RUN apt-get update -y && apt-get upgrade -y
 USER $SOLR_UID
 
-ENV SOLR_CORES=spot
-ENV SOLR_CORE_CONF_DIR=/spot-config
-ENV SOLR_HOST=localhost
-ENV SOLR_INCLUDE=/usr/local/share/solr/solr.in.sh
+ENV SOLR_CORES="spot"
+ENV SOLR_CORE_CONF_DIR="/spot-config"
+ENV SOLR_HOST="localhost"
+ENV SOLR_INCLUDE="/usr/local/share/solr/solr.in.sh"
+
+# As of Solr 9.8, we need to enable the use directives in lib/
+# This also enables the analysis-extras module which is needed
+# for some of the configured types.
+ENV SOLR_OPTS="-Dsolr.config.lib.enabled=true -Dsolr.modules=analysis-extras"
 
 # store config in a conf/ subdirectory so solr uses it consistently
 # (core was being created + configured to use memory store)
 # see: https://stackoverflow.com/a/67536331
-COPY --chown=solr:root config $SOLR_CORE_CONF_DIR/conf
+COPY --chown=solr:solr config $SOLR_CORE_CONF_DIR/conf
 
 # custom scripts to be run on solr inits
-COPY --chown=solr:root scripts/*.sh /docker-entrypoint-initdb.d/
+COPY --chown=solr:solr scripts/*.sh /docker-entrypoint-initdb.d/
 
 # custom env settings
-COPY --chown=solr:root assets/solr.in.sh $SOLR_INCLUDE
+COPY --chown=solr:solr assets/solr.in.sh $SOLR_INCLUDE
+
+ENTRYPOINT ["docker-entrypoint.sh"]
+
+# add '--user-managed' flag to disable cloud mode while we use the single server approach
+CMD ["solr-foreground", "--user-managed"]
 
 HEALTHCHECK CMD curl http://localhost:8983/solr/ || exit 1
diff --git a/docker/solr/config/schema.xml b/docker/solr/config/schema.xml
index ff1220c2b..b9a6a5d6f 100644
--- a/docker/solr/config/schema.xml
+++ b/docker/solr/config/schema.xml
@@ -95,8 +95,12 @@
      -->
     <fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
 
+    <!-- 2026-04-15 am
+          Commenting out configuration for LatLongType (no longer supported
+          on Solr 9 and not used by us.)-->
+
     <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
-    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
+    <!-- <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/> -->
 
     <!-- An alternative geospatial field type new to Solr 4.  It supports multiValued and polygon shapes.
       For more information about this and other Spatial fields new to Solr 4, see:
@@ -313,12 +317,14 @@
     <dynamicField name="*_coordinate" type="tdouble" indexed="true"  stored="false" />
 
     <!-- location (_ll...) -->
+    <!--
     <dynamicField name="*_lli" type="location" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_llim" type="location" stored="false" indexed="true" multiValued="true"/>
     <dynamicField name="*_lls" type="location" stored="true" indexed="false" multiValued="false"/>
     <dynamicField name="*_llsm" type="location" stored="true" indexed="false" multiValued="true"/>
     <dynamicField name="*_llsi" type="location" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_llsim" type="location" stored="true" indexed="true" multiValued="true"/>
+    -->
 
     <dynamicField name="*_suggest" type="textSuggest" indexed="true" stored="false" multiValued="true" />
   </fields>
diff --git a/lib/tasks/spot/import_rdf_terms.rake b/lib/tasks/spot/import_rdf_terms.rake
index 90cd83ee3..b361f1720 100644
--- a/lib/tasks/spot/import_rdf_terms.rake
+++ b/lib/tasks/spot/import_rdf_terms.rake
@@ -4,7 +4,7 @@ namespace :spot do
     desc 'Loads remote RDF terms locally'
     task :load, [:name, :uri] => [:environment] do |_t, args|
       abort 'Need to provide [name, uri] parameters' unless args[:name] && args[:uri]
-      Spot::RDFAuthorityParser.import_rdf(args[:name], Array(args[:uri]))
+      Spot::RdfAuthorityParser.import_rdf(args[:name], Array(args[:uri]))
     end
   end
 end
diff --git a/spec/actors/components/spot/visibility_facet_item_component_spec.rb b/spec/actors/components/spot/visibility_facet_item_component_spec.rb
new file mode 100644
index 000000000..061370491
--- /dev/null
+++ b/spec/actors/components/spot/visibility_facet_item_component_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+RSpec.describe Spot::VisibilityFacetItemComponent, type: :component do
+  subject(:rendered) { Capybara::Node::Simple.new(rendered_html.to_s) }
+  let(:rendered_html) { render_inline(described_class.new(facet_item: facet_item)) }
+  let(:visibility) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
+
+  let(:facet_item) do
+    instance_double(
+      Blacklight::FacetItemPresenter,
+      facet_config: Blacklight::Configuration::FacetField.new,
+      label: visibility,
+      hits: 10,
+      href: '/catalog?f=x',
+      selected?: false
+    )
+  end
+
+  it 'renders the value as a PermissionBadge' do
+    expect(rendered).to have_selector 'li'
+    expect(rendered).to have_selector 'a.facet-select.badge.badge-danger'
+    expect(rendered).to have_text 'Private'
+  end
+end
diff --git a/spec/actors/concerns/deserializes_rdf_literals_spec.rb b/spec/actors/concerns/deserializes_rdf_literals_spec.rb
index e56d8787d..a4a9a2624 100644
--- a/spec/actors/concerns/deserializes_rdf_literals_spec.rb
+++ b/spec/actors/concerns/deserializes_rdf_literals_spec.rb
@@ -1,36 +1,37 @@
 # frozen_string_literal: true
 RSpec.describe DeserializesRdfLiterals do
   before do
-    class WorkType < ActiveFedora::Base
+    class TestWorkType < ActiveFedora::Base
       property :title, predicate: ::RDF::Vocab::DC.title, multiple: false
       property :description, predicate: ::RDF::Vocab::DC.description
     end
 
-    # need to define this to be able to access the `language_tagged_fields` array
-    class Hyrax::WorkTypeForm < Hyrax::Forms::WorkForm
-      include LanguageTaggedFormFields
-      transforms_language_tags_for :title, :description
+    class TestWorkTypeActor < Hyrax::Actors::AbstractActor
+      include DeserializesRdfLiterals
     end
 
-    class WorkTypeActor < Hyrax::Actors::AbstractActor
-      include DeserializesRdfLiterals
+    # This is all incredibly messy because the Actor mixin is relying on a class attribute
+    # for a form based on naming conventions, hence this silly unused Form class and exposing
+    # the test classes to the Object namespace (as opposed to `let(:work_type_class) { Class.new(ActiveFedora::Base) }`)
+    class Hyrax::TestWorkTypeForm < ::Spot::Forms::WorkForm
+      include LanguageTaggedFormFields
+      transforms_language_tags_for :title, :description
     end
   end
 
   after do
-    Object.send(:remove_const, :WorkType)
-    Object.send(:remove_const, :WorkTypeActor)
-    Hyrax.send(:remove_const, :WorkTypeForm)
+    Object.send(:remove_const, :TestWorkType)
+    Object.send(:remove_const, :TestWorkTypeActor)
+    Hyrax.send(:remove_const, :TestWorkTypeForm)
   end
 
-  let(:work) { WorkType.new }
-  let(:ability) { Ability.new(build(:user)) }
-  let(:env) { Hyrax::Actors::Environment.new(work, ability, attributes) }
-  let(:actor) { WorkTypeActor.new(Hyrax::Actors::Terminator.new) }
+  let(:work) { TestWorkType.new }
+  let(:ability) { Ability.new(create(:user)) }
+  let(:actor) { TestWorkTypeActor.new(Hyrax::Actors::Terminator.new) }
 
   # when the actor receives the form attributes, it should have already
   # been run through the serializer
-  let(:attributes) do
+  let(:string_attributes) do
     {
       title: '"Cool Beans"@en',
       description: ['"A work of importance"']
@@ -44,57 +45,71 @@ class WorkTypeActor < Hyrax::Actors::AbstractActor
     }
   end
 
-  shared_examples 'it transforms fields' do
-    it 'transforms single fields' do
-      expect(env.attributes[:title]).to eq RDF::Literal('Cool Beans', language: :en)
-    end
-
-    it 'transforms multiple fields' do
-      expect(env.attributes[:description]).to eq [RDF::Literal('A work of importance')]
-    end
-  end
-
   describe '#create' do
-    before { actor.create(env) }
+    context 'with string values' do
+      let(:env) { Hyrax::Actors::Environment.new(work, ability, string_attributes) }
+
+      it 'transforms single fields' do
+        expect { actor.create(env) }
+          .to change { env.attributes[:title] }
+          .from(string_attributes[:title])
+          .to(literal_attributes[:title])
+      end
+
+      it 'transforms multiple fields' do
+        expect { actor.create(env) }
+          .to change { env.attributes[:title] }
+          .from(string_attributes[:title])
+          .to(literal_attributes[:title])
+      end
+    end
 
-    it_behaves_like 'it transforms fields'
+    context 'with literal values' do
+      let(:env) { Hyrax::Actors::Environment.new(work, ability, literal_attributes) }
 
-    context 'when attributes are already RDF::Literals (from ingest)' do
-      let(:attributes) { literal_attributes }
+      it 'transforms single fields' do
+        expect { actor.create(env) }
+          .not_to change { env.attributes[:title] }
+      end
 
-      it_behaves_like 'it transforms fields'
+      it 'transforms multiple fields' do
+        expect { actor.create(env) }
+          .not_to change { env.attributes[:title] }
+      end
     end
   end
 
   describe '#update' do
-    before { actor.update(env) }
-
-    it_behaves_like 'it transforms fields'
-
-    context 'when attributes are already RDF::Literals (from ingest)' do
-      let(:attributes) { literal_attributes }
-
-      it_behaves_like 'it transforms fields'
+    context 'with string values' do
+      let(:env) { Hyrax::Actors::Environment.new(work, ability, string_attributes) }
+
+      it 'transforms single fields' do
+        expect { actor.update(env) }
+          .to change { env.attributes[:title] }
+          .from(string_attributes[:title])
+          .to(literal_attributes[:title])
+      end
+
+      it 'transforms multiple fields' do
+        expect { actor.update(env) }
+          .to change { env.attributes[:title] }
+          .from(string_attributes[:title])
+          .to(literal_attributes[:title])
+      end
     end
-  end
 
-  # because of how the the create/update tests are set up, testing this case in each
-  # causes a race between their +before+ blocks, which call the methods, and this
-  # +before+ block, which invalidates the fields method. having it run as a shared_example
-  # causes the parent +before+ block to run first, which runs the attributes through
-  # the transformation, and then invalidates the method, which then does nothing.
-  # we can make the logical jump from this test -- when there's no method on the
-  # form, are we getting back an empty array of fields? -- to the inference that
-  # no forms are iterated through.
-  describe '#tagged_fields (private)' do
-    subject { actor.send(:tagged_fields) }
-
-    before do
-      allow(Hyrax::WorkTypeForm).to receive(:language_tagged_fields).and_raise(NoMethodError)
-    end
+    context 'with literal values' do
+      let(:env) { Hyrax::Actors::Environment.new(work, ability, literal_attributes) }
+
+      it 'transforms single fields' do
+        expect { actor.update(env) }
+          .not_to change { env.attributes[:title] }
+      end
 
-    context 'when language tagged fields are not defined on the form' do
-      it { is_expected.to be_empty }
+      it 'transforms multiple fields' do
+        expect { actor.update(env) }
+          .not_to change { env.attributes[:title] }
+      end
     end
   end
 end
diff --git a/spec/actors/spot/actors/collections_membership_actor_spec.rb b/spec/actors/spot/actors/collections_membership_actor_spec.rb
index 99882397f..3c71ade00 100644
--- a/spec/actors/spot/actors/collections_membership_actor_spec.rb
+++ b/spec/actors/spot/actors/collections_membership_actor_spec.rb
@@ -1,16 +1,17 @@
 # frozen_string_literal: true
-RSpec.describe Spot::Actors::CollectionsMembershipActor do
+RSpec.describe Spot::Actors::CollectionsMembershipActor, actor_stack: true do
   before do
     allow(Collection).to receive(:find).with(parent_collection.id).and_return(parent_collection)
     allow(Collection).to receive(:find).with(child_collection.id).and_return(child_collection)
 
-    allow(parent_collection).to receive(:share_applies_to_new_works?).and_return true
-    allow(child_collection).to receive(:share_applies_to_new_works?).and_return true
+    allow(Hyrax::CollectionType).to receive(:for).with(collection: parent_collection).and_return(mock_collection_type)
+    allow(Hyrax::CollectionType).to receive(:for).with(collection: child_collection).and_return(mock_collection_type)
 
     work.member_of_collections.clear
     child_collection.member_of_collections.clear
   end
 
+  let(:mock_collection_type) { instance_double(Hyrax::CollectionType, share_applies_to_new_works?: true) }
   let(:stack) { described_class.new(Hyrax::Actors::Terminator.new) }
   let(:env) { Hyrax::Actors::Environment.new(work, ability, attributes) }
 
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index 616b699c5..69e6a3ce9 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -3,7 +3,7 @@
   describe '#default_url_options' do
     subject(:options) { described_class.new.default_url_options }
 
-    it { is_expected.not_to include :locale }
+    it { is_expected.to include :locale }
   end
 
   describe '#render_bookmarks_control?' do
diff --git a/spec/controllers/handle_controller_spec.rb b/spec/controllers/handle_controller_spec.rb
index 1baaa22cc..70eb6d746 100644
--- a/spec/controllers/handle_controller_spec.rb
+++ b/spec/controllers/handle_controller_spec.rb
@@ -2,7 +2,7 @@
 
 RSpec.describe HandleController do
   describe '#show' do
-    subject { get :show, params: { id: handle } }
+    subject(:make_request) { get :show, params: { id: handle } }
 
     let(:solr_service) { ActiveFedora::SolrService }
 
@@ -86,7 +86,9 @@
 
       let(:solr_data) { { id: 'unrelated' } }
 
-      it { is_expected.to have_http_status :not_found }
+      it 'raises a Blacklight::Exceptions::RecordNotFound error' do
+        expect { make_request }.to raise_error Blacklight::Exceptions::RecordNotFound
+      end
     end
   end
 end
diff --git a/spec/controllers/spot/export_controller_spec.rb b/spec/controllers/spot/export_controller_spec.rb
index d8faa05d6..2f0cebd8b 100644
--- a/spec/controllers/spot/export_controller_spec.rb
+++ b/spec/controllers/spot/export_controller_spec.rb
@@ -59,7 +59,7 @@
 
       it 'redirects to login' do
         expect(response)
-          .to redirect_to(Rails.application.routes.url_helpers.new_user_session_path)
+          .to redirect_to(Rails.application.routes.url_helpers.new_user_session_path + "?locale=en")
       end
     end
 
diff --git a/spec/controllers/spot/redirect_controller_spec.rb b/spec/controllers/spot/redirect_controller_spec.rb
index 277e040dc..dee27a9fa 100644
--- a/spec/controllers/spot/redirect_controller_spec.rb
+++ b/spec/controllers/spot/redirect_controller_spec.rb
@@ -3,9 +3,9 @@
   routes { Rails.application.routes }
 
   describe '#show' do
-    subject { get :show, params: { url: url } }
+    subject(:make_request) { get :show, params: { url: url } }
 
-    let(:solr_service) { ActiveFedora::SolrService }
+    let(:solr_service) { Hyrax::SolrService }
     let(:solr_data) { { id: 'solr-object' } }
 
     before do
@@ -54,7 +54,9 @@
         }
       end
 
-      it { is_expected.to have_http_status :not_found }
+      it 'raises a Blacklight::Exceptions::RecordNotFound error' do
+        expect { make_request }.to raise_error Blacklight::Exceptions::RecordNotFound
+      end
     end
 
     context 'when the item is a collection' do
@@ -73,7 +75,9 @@
     context 'when the URL is an old Islandora search' do
       let(:url) { 'http://digital.lafayette.edu/collections/browsef[0]=cdm.Relation.IsPartOf%3A%22East%20Asia%20Image%20Collection%22&f[1]=cdm.Relation.IsPartOf%3A%22Japanese%20History%20Study%20Cards%22&f[2]=eastasia.Subject.OCM%3A%22870%20EDUCATION%22' }
 
-      it { is_expected.to have_http_status :not_found }
+      it 'raises a Blacklight::Exceptions::RecordNotFound error' do
+        expect { make_request }.to raise_error Blacklight::Exceptions::RecordNotFound
+      end
     end
   end
 end
diff --git a/spec/factories/audio_visual_resource.rb b/spec/factories/audio_visual_resource.rb
new file mode 100644
index 000000000..82e9fa428
--- /dev/null
+++ b/spec/factories/audio_visual_resource.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+FactoryBot.define do
+  factory :audio_visual_resource_with_required_fields_only, parent: :base_work_resource, class: 'AudioVisualResource' do
+    date { [Time.zone.now.strftime('%Y-%m-%d')] }
+    resource_type { ['Other'] }
+    rights_statement { ['http://creativecommons.org/publicdomain/mark/1.0/'] }
+  end
+
+  factory :audio_visual_resource,
+          parent: :audio_visual_resource_with_required_fields_only,
+          traits: [:base_metadata, :audio_visual_metadata]
+end
diff --git a/spec/factories/base_resource.rb b/spec/factories/base_resource.rb
new file mode 100644
index 000000000..d4b3ec837
--- /dev/null
+++ b/spec/factories/base_resource.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+#
+# Abstracts common resource traits into a separate factory for inheritance, namely visibility
+# settings. Works should inherit from :base_work_resource (@see spec/factories/base_work_resource.rb)
+# which adds support for attaching `Hyrax::FileSet`s to works.
+#
+# @see https://github.com/samvera/hyrax/blob/hyrax-v3.6.0/spec/factories/hyrax_work.rb
+FactoryBot.define do
+  factory :base_resource, traits: [:core_metadata], class: 'Hyrax::Resource' do
+    transient do
+      with_index { true }
+      visibility_setting { nil }
+    end
+
+    after :build do |work, evaluator|
+      work.visibility = evaluator.visibility_setting if evaluator.visibility_setting
+    end
+
+    after :create do |work, evaluator|
+      if evaluator.visibility_setting
+        work.visibility = evaluator.visibility_setting
+        work.permission_manager.acl.save
+      end
+
+      Hyrax.index_adapter.save(resource: work) if evaluator.with_index
+    end
+
+    trait :public do
+      transient do
+        visibility_setting { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
+      end
+    end
+
+    trait :lafayette_only do
+      transient do
+        visibility_setting { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED }
+      end
+    end
+
+    # @todo does this work?
+    trait :metadata_only do
+      transient do
+        visibility_setting { 'metadata' }
+      end
+    end
+
+    trait :private do
+      transient do
+        visibility_setting { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
+      end
+    end
+  end
+end
diff --git a/spec/factories/base_work_resource.rb b/spec/factories/base_work_resource.rb
new file mode 100644
index 000000000..df9dc75de
--- /dev/null
+++ b/spec/factories/base_work_resource.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+#
+# Common traits for work-classes (file_set handling in particular). It's recommended to
+# inherit work resource factories from this factory, rather than :base_resource. Exposes
+# an :include_file_sets trait that can either be `true` or an
+#
+#
+# @example
+#  FactoryBot.define do
+#    factory :book_resource, parent: :base_work_resource, class: 'BookResource' do
+#      # ...
+#    end
+#  end
+#
+# @example Creating a work with a file_set (depositor is new user)
+#   RSpec.describe do
+#     let(:work_with_file_set) { FactoryBot.valkyrie_create(:work_resource, include_file_sets: true) }
+#   end
+#
+# @example Creating a work with a specific file
+#   RSpec.describe do
+#     let(:fixture_path) { Rails.root.join('spec', 'fixtures', 'a_fixture.pdf') }
+#     let(:work_with_file_set) { FactoryBot.valkryie_create(:work_resource, include_file_sets: [fixture_path]) }
+#   end
+#
+FactoryBot.define do
+  factory :base_work_resource, parent: :base_resource, class: 'Hyrax::Work' do
+    transient do
+      include_file_sets { nil }
+    end
+
+    trait :with_file_set do
+      include_file_sets { true }
+    end
+
+    after(:create) do |work, evaluator|
+      next unless evaluator.include_file_sets
+
+      fixture_path = Rails.root.join('spec', 'fixtures', 'image_transcript.vtt') # @todo we need a more universal name for this file
+      files = evaluator.include_file_sets == true ? Array.wrap(fixture_path) : Array.wrap(evaluator.include_file_sets)
+      depositor = User.find_by(email: work.depositor) || FactoryBot.create(:user)
+
+      files.each do |path|
+        uploaded_file = Hyrax::UploadedFile.create!(file: File.open(path), user: depositor)
+        AttachFilesToWorkJob.perform_now(work, [uploaded_file])
+      end
+    end
+  end
+end
diff --git a/spec/factories/embargo_and_lease.rb b/spec/factories/embargo_and_lease.rb
new file mode 100644
index 000000000..4ce99f78e
--- /dev/null
+++ b/spec/factories/embargo_and_lease.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+FactoryBot.define do
+  factory :embargo, class: 'Hyrax::Embargo' do
+    visibility_during_embargo { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
+    visibility_after_embargo { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
+    embargo_release_date { DateTime.now.utc + 1.day }
+  end
+
+  factory :lease, class: 'Hyrax::Lease' do
+    visibility_during_lease { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
+    visibility_after_lease { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
+    lease_expiration_date { DateTime.now.utc + 1.day }
+  end
+end
diff --git a/spec/factories/file_set.rb b/spec/factories/file_set.rb
index 66b75b04e..c567d1d62 100644
--- a/spec/factories/file_set.rb
+++ b/spec/factories/file_set.rb
@@ -7,6 +7,7 @@
     transient do
       user { create(:user) }
       content { nil }
+      original_file { nil }
       visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
     end
 
diff --git a/spec/factories/hyrax/admin_sets.rb b/spec/factories/hyrax/admin_sets.rb
new file mode 100644
index 000000000..b59784939
--- /dev/null
+++ b/spec/factories/hyrax/admin_sets.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+#
+# Borrowing factories from Hyrax source, as the files aren't available in the gem.
+#
+# @todo When upgrading to Hyrax 5.1.0, remove the files in spec/factories/hyrax and replace them
+#       with relevant calls to `require 'hyrax/specs/shared_specs/factories/factory.rb` in spec_helper.rb
+FactoryBot.define do
+  factory :admin_set do
+    sequence(:title) { |n| ["Title #{n}"] }
+
+    # Given the relationship between permission template and admin set, when
+    # an admin set is created via a factory, I believe it is appropriate to go ahead and
+    # create the corresponding permission template
+    #
+    # This way, we can go ahead
+    after(:create) do |admin_set, evaluator|
+      if evaluator.with_permission_template
+        attributes = { source_id: admin_set.id }
+        attributes = evaluator.with_permission_template.merge(attributes) if evaluator.with_permission_template.respond_to?(:merge)
+        # There is a unique constraint on permission_templates.source_id; I don't want to
+        # create a permission template if one already exists for this admin_set
+        create(:permission_template, attributes) unless Hyrax::PermissionTemplate.find_by(source_id: admin_set.id)
+      end
+    end
+
+    transient do
+      # false, true, or Hash with keys for permission_template
+      with_permission_template { false }
+    end
+
+    factory :complete_admin_set do
+      alternative_title { ['alternative admin set title'] }
+      creator           { ['moomin', 'snufkin'] }
+      description       { ['Before a revolution happens', 'it is perceived as impossible'] }
+    end
+  end
+end
diff --git a/spec/factories/hyrax/administrative_sets.rb b/spec/factories/hyrax/administrative_sets.rb
new file mode 100644
index 000000000..52ac00236
--- /dev/null
+++ b/spec/factories/hyrax/administrative_sets.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+#
+# Borrowing factories from Hyrax source, as the files aren't available in the gem.
+#
+# @todo When upgrading to Hyrax 5.1.0, remove the files in spec/factories/hyrax and replace them
+#       with relevant calls to `require 'hyrax/specs/shared_specs/factories/factory.rb` in spec_helper.rb
+FactoryBot.define do
+  factory :hyrax_admin_set, class: 'Hyrax::AdministrativeSet' do
+    title { ['My Admin Set'] }
+
+    transient do
+      with_permission_template { false }
+      user { create(:user) }
+      access_grants { [] }
+      with_index { true }
+    end
+
+    after(:build) do |adminset, evaluator|
+      adminset.creator = [evaluator.user.user_key]
+    end
+
+    after(:create) do |admin_set, evaluator|
+      if evaluator.with_permission_template
+        template = Hyrax::PermissionTemplate.find_or_create_by(source_id: admin_set.id.to_s)
+        evaluator.access_grants.each do |grant|
+          Hyrax::PermissionTemplateAccess.find_or_create_by(permission_template_id: template.id,
+                                                            agent_type: grant[:agent_type],
+                                                            agent_id: grant[:agent_id],
+                                                            access: grant[:access])
+        end
+        Hyrax::PermissionTemplateAccess.find_or_create_by(permission_template_id: template.id,
+                                                          agent_type: Hyrax::PermissionTemplateAccess::USER,
+                                                          agent_id: evaluator.user.user_key,
+                                                          access: Hyrax::PermissionTemplateAccess::MANAGE)
+        template.reset_access_controls_for(collection: admin_set)
+      end
+      Hyrax.index_adapter.save(resource: admin_set) if evaluator.with_index
+    end
+  end
+
+  factory :invalid_hyrax_admin_set, class: 'Hyrax::AdministrativeSet' do
+    # Title is required.  Without title, the admin set is invalid.
+  end
+
+  factory :default_hyrax_admin_set, class: 'Hyrax::AdministrativeSet' do
+    id { Hyrax::AdminSetCreateService::DEFAULT_ID }
+    title { Hyrax::AdminSetCreateService::DEFAULT_TITLE }
+
+    transient do
+      with_persisted_default_id { true }
+    end
+
+    after(:create) do |admin_set, evaluator|
+      Hyrax::DefaultAdministrativeSet.update(default_admin_set_id: admin_set.id) if
+        evaluator.with_persisted_default_id
+    end
+  end
+end
diff --git a/spec/factories/hyrax/object_id.rb b/spec/factories/hyrax/object_id.rb
new file mode 100644
index 000000000..56a408aa9
--- /dev/null
+++ b/spec/factories/hyrax/object_id.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+#
+# Borrowing factories from Hyrax source, as the files aren't available in the gem.
+#
+# @todo When upgrading to Hyrax 5.1.0, remove the files in spec/factories/hyrax and replace them
+#       with relevant calls to `require 'hyrax/specs/shared_specs/factories/factory.rb` in spec_helper.rb
+#
+# Defines a new sequence
+FactoryBot.define do
+  sequence :object_id do |n|
+    "object_id_#{n}"
+  end
+end
diff --git a/spec/factories/hyrax/permission_template_accesses.rb b/spec/factories/hyrax/permission_template_accesses.rb
new file mode 100644
index 000000000..b6f1adc94
--- /dev/null
+++ b/spec/factories/hyrax/permission_template_accesses.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+#
+# Borrowing factories from Hyrax source, as the files aren't available in the gem.
+#
+# @todo When upgrading to Hyrax 5.1.0, remove the files in spec/factories/hyrax and replace them
+#       with relevant calls to `require 'hyrax/specs/shared_specs/factories/factory.rb` in spec_helper.rb
+FactoryBot.define do
+  factory :permission_template_access, class: Hyrax::PermissionTemplateAccess do
+    permission_template
+    trait :manage do
+      access { 'manage' }
+    end
+
+    trait :deposit do
+      access { 'deposit' }
+    end
+
+    trait :view do
+      access { 'view' }
+    end
+  end
+end
diff --git a/spec/factories/hyrax/permission_templates.rb b/spec/factories/hyrax/permission_templates.rb
new file mode 100644
index 000000000..f9c768ac1
--- /dev/null
+++ b/spec/factories/hyrax/permission_templates.rb
@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+#
+# Borrowing factories from Hyrax source, as the files aren't available in the gem.
+#
+# @todo When upgrading to Hyrax 5.1.0, remove the files in spec/factories/hyrax and replace them
+#       with relevant calls to `require 'hyrax/specs/shared_specs/factories/factory.rb` in spec_helper.rb
+FactoryBot.define do
+  factory :permission_template, class: Hyrax::PermissionTemplate do
+    # Given that there is a one to one strong relation between permission_template and admin_set,
+    # with a unique index on the source_id, I don't want to have duplication in source_id
+    sequence(:source_id) { |n| format("%010d", n) }
+
+    trait :with_immediate_release do
+      release_period { Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY }
+    end
+
+    trait :with_delayed_release do
+      release_period { Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_6_MONTHS }
+    end
+
+    before(:create) do |permission_template, evaluator|
+      if evaluator.with_admin_set
+        source_id = permission_template.source_id
+        admin_set = SourceFinder.find_or_create_admin_set(source_id)
+        permission_template.source_id = admin_set.id
+      elsif evaluator.with_collection
+        source_id = permission_template.source_id
+        collection =
+          if source_id.present?
+            begin
+              Collection.find(source_id)
+            rescue ActiveFedora::ObjectNotFoundError
+              create(:collection, id: source_id)
+            end
+          else
+            create(:collection)
+          end
+        permission_template.source_id = collection.id
+      end
+    end
+
+    after(:create) do |permission_template, evaluator|
+      if evaluator.with_workflows
+        Hyrax::Workflow::WorkflowImporter.load_workflow_for(permission_template: permission_template)
+        Sipity::Workflow.activate!(permission_template: permission_template, workflow_id: permission_template.available_workflows.pick(:id))
+      end
+      if evaluator.with_active_workflow
+        workflow = create(:workflow, active: true, permission_template: permission_template)
+        create(:workflow_action, workflow: workflow) # Need to create a single action that can be taken
+      end
+      AccessHelper.create_access(permission_template, 'user', :manage, evaluator.manage_users) if evaluator.manage_users.present?
+      AccessHelper.create_access(permission_template, 'group', :manage, evaluator.manage_groups) if evaluator.manage_groups.present?
+      AccessHelper.create_access(permission_template, 'user', :deposit, evaluator.deposit_users) if evaluator.deposit_users.present?
+      AccessHelper.create_access(permission_template, 'group', :deposit, evaluator.deposit_groups) if evaluator.deposit_groups.present?
+      AccessHelper.create_access(permission_template, 'user', :view, evaluator.view_users) if evaluator.view_users.present?
+      AccessHelper.create_access(permission_template, 'group', :view, evaluator.view_groups) if evaluator.view_groups.present?
+    end
+
+    transient do
+      with_admin_set { false }
+      with_collection { false }
+      with_workflows { false }
+      with_active_workflow { false }
+      manage_users { nil }
+      manage_groups { nil }
+      deposit_users { nil }
+      deposit_groups { nil }
+      view_users { nil }
+      view_groups { nil }
+    end
+  end
+
+  class AccessHelper
+    def self.create_access(permission_template_id, agent_type, access, agent_ids)
+      agent_ids.each do |agent_id|
+        FactoryBot.create(:permission_template_access,
+                          access,
+                          permission_template: permission_template_id,
+                          agent_type: agent_type,
+                          agent_id: agent_id)
+      end
+    end
+  end
+
+  class SourceFinder
+    def self.find_or_create_admin_set(source_id)
+      Hyrax.config.use_valkyrie? ? find_or_create_admin_set_valkyrie(source_id) : find_or_create_admin_set_active_fedora(source_id)
+    end
+
+    def self.find_or_create_admin_set_active_fedora(source_id)
+      if source_id.present?
+        begin
+          AdminSet.find(source_id)
+        rescue ActiveFedora::ObjectNotFoundError
+          FactoryBot.create(:admin_set, id: source_id)
+        end
+      else
+        FactoryBot.create(:admin_set)
+      end
+    end
+
+    def self.find_or_create_admin_set_valkyrie(source_id)
+      if source_id.present?
+        begin
+          Hyrax.query_service.find_by(id: source_id)
+        rescue Valkyrie::Persistence::ObjectNotFoundError
+          # Creating an Administrative set with a pre-determined id will not work for all adapters
+          # so we're letting the adapter assign the id
+          FactoryBot.valkyrie_create(:hyrax_admin_set)
+        end
+      else
+        FactoryBot.valkyrie_create(:hyrax_admin_set)
+      end
+    end
+  end
+end
diff --git a/spec/factories/hyrax/workflow_actions.rb b/spec/factories/hyrax/workflow_actions.rb
new file mode 100644
index 000000000..4132584cd
--- /dev/null
+++ b/spec/factories/hyrax/workflow_actions.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+#
+# Borrowing factories from Hyrax source, as the files aren't available in the gem.
+#
+# @todo When upgrading to Hyrax 5.1.0, remove the files in spec/factories/hyrax and replace them
+#       with relevant calls to `require 'hyrax/specs/shared_specs/factories/factory.rb` in spec_helper.rb
+FactoryBot.define do
+  factory :workflow_action, class: Sipity::WorkflowAction do
+    workflow
+    name { 'submit' }
+  end
+end
diff --git a/spec/factories/hyrax/workflow_states.rb b/spec/factories/hyrax/workflow_states.rb
new file mode 100644
index 000000000..823130363
--- /dev/null
+++ b/spec/factories/hyrax/workflow_states.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+#
+# Borrowing factories from Hyrax source, as the files aren't available in the gem.
+#
+# @todo When upgrading to Hyrax 5.1.0, remove the files in spec/factories/hyrax and replace them
+#       with relevant calls to `require 'hyrax/specs/shared_specs/factories/factory.rb` in spec_helper.rb
+FactoryBot.define do
+  factory :workflow_state, class: Sipity::WorkflowState do
+    workflow
+    name { 'initial' }
+  end
+end
diff --git a/spec/factories/hyrax/workflows.rb b/spec/factories/hyrax/workflows.rb
new file mode 100644
index 000000000..2dc0775f8
--- /dev/null
+++ b/spec/factories/hyrax/workflows.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+#
+# Borrowing factories from Hyrax source, as the files aren't available in the gem.
+#
+# @todo When upgrading to Hyrax 5.1.0, remove the files in spec/factories/hyrax and replace them
+#       with relevant calls to `require 'hyrax/specs/shared_specs/factories/factory.rb` in spec_helper.rb
+FactoryBot.define do
+  factory :workflow, class: Sipity::Workflow do
+    sequence(:name) { |n| "generic_work-#{n}" }
+    permission_template
+  end
+end
diff --git a/spec/factories/image_resource.rb b/spec/factories/image_resource.rb
new file mode 100644
index 000000000..dcfd84441
--- /dev/null
+++ b/spec/factories/image_resource.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+FactoryBot.define do
+  factory :image_resource_with_required_fields_only, parent: :base_work_resource, class: 'ImageResource' do
+    date { [Time.zone.now.strftime('%Y-%m-%d')] }
+    resource_type { ['Other'] }
+    rights_statement { ['http://creativecommons.org/publicdomain/mark/1.0/'] }
+  end
+
+  factory :image_resource,
+          parent: :image_resource_with_required_fields_only,
+          traits: [:base_metadata, :image_metadata]
+end
diff --git a/spec/factories/publication_resource.rb b/spec/factories/publication_resource.rb
new file mode 100644
index 000000000..5ed74868a
--- /dev/null
+++ b/spec/factories/publication_resource.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+FactoryBot.define do
+  factory :publication_resource_with_required_fields_only, parent: :base_work_resource, class: 'PublicationResource' do
+    date_issued { [Time.zone.now.strftime('%Y-%m-%d')] }
+    resource_type { ['Other'] }
+    rights_statement { ['http://creativecommons.org/publicdomain/mark/1.0/'] }
+  end
+
+  factory :publication_resource,
+          parent: :publication_resource_with_required_fields_only,
+          traits: [:base_metadata, :institutional_metadata, :publication_metadata] do
+  end
+end
diff --git a/spec/factories/schema_traits.rb b/spec/factories/schema_traits.rb
new file mode 100644
index 000000000..6ab8d5ea7
--- /dev/null
+++ b/spec/factories/schema_traits.rb
@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+#
+# Mixin traits to use when building factories for resources.
+# Each trait mirrors the attributes of the respective schema
+# in `config/metadata/{schema}.yaml`
+FactoryBot.define do
+  trait :base_metadata do
+    bibliographic_citation { ['Lastname, First. Title of piece.'] }
+    contributor { ['Contributor, First-Name', 'Person, Another'] }
+    creator { ['Creator, Anne'] }
+    description { ['An account of the resource'] }
+    identifier { ['hdl:10385/abc123'] }
+    keyword { ['photo'] }
+    language { ['en'] }
+    location { ['http://sws.geonames.org/5188140/'] }
+    note { ['Some staff-side information'] }
+    physical_medium { ['Photograph'] }
+    publisher { ['Lafayette College'] }
+    related_resource { ['http://another-resource.com'] }
+    resource_type { ['Other'] }
+    rights_holder { ['Holder, R.'] }
+    rights_statement { ['http://creativecommons.org/publicdomain/mark/1.0/'] }
+    source { ['Lafayette College'] }
+    source_identifier { [] }
+    subject { ['http://id.worldcat.org/fast/1061714'] }
+    subtitle { ['An object to view'] }
+    title { ['A Fabulous Work'] }
+    title_alternative { ['An alternative title for the work.'] }
+  end
+
+  trait :core_metadata do
+    title { |n| ["Title of work (#{n})"] }
+    date_modified { Time.now.utc }
+    date_uploaded { Time.now.utc }
+    depositor { 'repository@lafayette.edu' }
+    alternate_ids { [] }
+  end
+
+  trait :image_metadata do
+    date { ['2024-11'] }
+    date_associated { ['2024'] }
+    date_scope_note { ['Printed information on the backs of postcards that provides information relevent to dating the postcard itself (not the image).'] }
+    donor { ['Alumnus, Anne Esteemed'] }
+    inscription { ['hey look over here'] }
+    original_item_extent { ['24 x 19.5 cm.'] }
+    repository_location { ['On that one shelf in the back'] }
+    requested_by { ['Requester, Jennifer Q.'] }
+    research_assistance { ['Student, Ashley'] }
+    subject_ocm { ['000 VALUE'] }
+  end
+
+  trait :institutional_metadata do
+    academic_department { ['Art'] }
+    division { ['Humanities'] }
+    organization { ['Lafayette College'] }
+  end
+
+  trait :publication_metadata do
+    abstract { ['A short description of the thing'] }
+    date_issued { [Time.zone.now.strftime('%Y-%m-%d')] }
+    date_available { ['2024-11-08'] }
+    editor { ['Sweeney, Mary'] }
+    license { ['This is some licensing text'] }
+  end
+
+  trait :student_work_metadata do
+    abstract { ['A short description of the thing'] }
+    access_note { ['Here is how to access the thing'] }
+    advisor { ['Smartfellow, Jane'] }
+    date { ['2024-11-08'] }
+    date_available { ['2024-11-08'] }
+  end
+
+  trait :audio_visual_metadata do
+    date { ['2024-11'] }
+    date_associated { ['2024'] }
+    inscription { ['hey look over here'] }
+    original_item_extent { ['24 x 19.5 cm.'] }
+    repository_location { ['On that one shelf in the back'] }
+    research_assistance { ['Student, Ashley'] }
+    provenance { ['Owner Information'] }
+    barcode { ['abc123'] }
+  end
+end
diff --git a/spec/factories/student_work_resource.rb b/spec/factories/student_work_resource.rb
new file mode 100644
index 000000000..e79f7ceef
--- /dev/null
+++ b/spec/factories/student_work_resource.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+FactoryBot.define do
+  factory :student_work_resource_with_required_fields_only, parent: :base_resource, class: 'StudentWorkResource' do
+    academic_department { ['Libraries'] }
+    advisor { ['Professor, Anne Esteemed'] }
+    creator { ['Creator, A.'] }
+    description { ['Description of StudentWork'] }
+    date { [Time.zone.now.strftime('%Y-%m-%d')] }
+    resource_type { ['Other'] }
+    rights_statement { ['http://creativecommons.org/publicdomain/mark/1.0/'] }
+  end
+
+  factory :student_work_resource,
+          parent: :student_work_resource_with_required_fields_only,
+          traits: [:base_metadata, :institutional_metadata, :student_work_metadata] do
+  end
+end
diff --git a/spec/features/create_audio_visual_spec.rb b/spec/features/create_audio_visual_spec.rb
index b2eb37cf2..4f2ad1dd8 100644
--- a/spec/features/create_audio_visual_spec.rb
+++ b/spec/features/create_audio_visual_spec.rb
@@ -8,7 +8,6 @@
     # (h/t: https://github.com/curationexperts/mahonia/blob/89b036c/spec/features/access_etd_spec.rb#L9-L10)
     ActiveJob::Base.queue_adapter.filter = [IngestJob]
 
-    AdminSet.find_or_create_default_admin_set_id
     login_as user
   end
 
@@ -21,14 +20,7 @@
 
     describe 'can fill out and submit a new Audio Visual' do
       scenario do
-        visit '/dashboard'
-        click_link 'Works'
-        click_link 'Add New Work'
-
-        sleep 1
-
-        choose 'Audio Visual'
-        click_button 'Create work'
+        visit Rails.application.routes.url_helpers.new_hyrax_audio_visual_path
 
         expect(page).to have_content "Add New #{i18n_term}"
 
diff --git a/spec/features/create_image_spec.rb b/spec/features/create_image_spec.rb
index fe03c14e5..782d32a7f 100644
--- a/spec/features/create_image_spec.rb
+++ b/spec/features/create_image_spec.rb
@@ -9,7 +9,6 @@
     # (h/t: https://github.com/curationexperts/mahonia/blob/89b036c/spec/features/access_etd_spec.rb#L9-L10)
     ActiveJob::Base.queue_adapter.filter = [IngestJob]
 
-    AdminSet.find_or_create_default_admin_set_id
     login_as user
   end
 
@@ -28,14 +27,7 @@
     # to uncomment the block below
     describe 'can fill out and submit a new Image' do
       scenario do
-        visit '/dashboard'
-        click_link 'Works'
-        click_link 'Add New Work'
-
-        sleep 1
-
-        choose 'Image'
-        click_button 'Create work'
+        visit Rails.application.routes.url_helpers.new_hyrax_image_path
 
         expect(page).to have_content "Add New #{i18n_term}"
 
diff --git a/spec/features/create_publication_spec.rb b/spec/features/create_publication_spec.rb
index c0bcb8633..242b5638d 100644
--- a/spec/features/create_publication_spec.rb
+++ b/spec/features/create_publication_spec.rb
@@ -8,7 +8,6 @@
     # (h/t: https://github.com/curationexperts/mahonia/blob/89b036c/spec/features/access_etd_spec.rb#L9-L10)
     ActiveJob::Base.queue_adapter.filter = [IngestJob]
 
-    AdminSet.find_or_create_default_admin_set_id
     login_as user
   end
 
@@ -25,14 +24,7 @@
 
     describe 'can fill out and submit a new Publication' do
       scenario do
-        visit '/dashboard'
-        click_link 'Works'
-        click_link 'Add New Work'
-
-        sleep 1
-
-        choose 'Publication'
-        click_button 'Create work'
+        visit Rails.application.routes.url_helpers.new_hyrax_publication_path
 
         expect(page).to have_content "Add New #{i18n_term}"
 
diff --git a/spec/features/create_student_work_spec.rb b/spec/features/create_student_work_spec.rb
index a53526b10..c4af47aa5 100644
--- a/spec/features/create_student_work_spec.rb
+++ b/spec/features/create_student_work_spec.rb
@@ -8,7 +8,6 @@
     # (h/t: https://github.com/curationexperts/mahonia/blob/89b036c/spec/features/access_etd_spec.rb#L9-L10)
     ActiveJob::Base.queue_adapter.filter = [IngestJob]
 
-    AdminSet.find_or_create_default_admin_set_id
     login_as user
   end
 
@@ -22,16 +21,7 @@
     let(:user) { create(:admin_user) }
 
     scenario 'can fill out and submit a new StudentWork' do
-      visit '/dashboard'
-
-      click_link 'Works'
-      sleep 1
-      click_link 'Add New Work'
-
-      sleep 1
-
-      choose 'Student Work'
-      click_button 'Create work'
+      visit Rails.application.routes.url_helpers.new_hyrax_student_work_path
 
       expect(page).to have_content "Add New #{i18n_term}"
 
diff --git a/spec/forms/hyrax/student_work_form_spec.rb b/spec/forms/hyrax/student_work_form_spec.rb
index a42cf9298..012effc0a 100644
--- a/spec/forms/hyrax/student_work_form_spec.rb
+++ b/spec/forms/hyrax/student_work_form_spec.rb
@@ -123,13 +123,22 @@
         end
 
         context 'when the StudentWork AdminSet no longer exists' do
+          let(:mock_admin_set) { instance_double(AdminSet) }
+
           before do
             allow(Spot::StudentWorkAdminSetCreateService)
               .to receive(:find_or_create_student_work_admin_set_id)
               .and_raise(Ldp::Gone)
+            allow(Hyrax::AdminSetCreateService)
+              .to receive(:find_or_create_default_admin_set)
+              .and_return(mock_admin_set)
+            allow(mock_admin_set).to receive(:id).and_return(AdminSet::DEFAULT_ID)
           end
 
           it 'uses the default admin_set id' do
+            expect(Hyrax::AdminSetCreateService)
+              .to have_received(:find_or_create_default_admin_set)
+            expect(mock_admin_set).to have_recieved(:id)
             expect(attributes[:admin_set_id]).to eq AdminSet::DEFAULT_ID
           end
         end
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 1ce5f0bfa..75754bf85 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -72,7 +72,7 @@
         stub_env('SPOT_BUILD_DATE', '')
       end
 
-      it { is_expected.to be nil }
+      it { is_expected.to be '(in development)' }
     end
   end
 end
diff --git a/spec/helpers/audio_visual_helper_spec.rb b/spec/helpers/audio_visual_helper_spec.rb
index 7100b0fc0..665c8c04d 100644
--- a/spec/helpers/audio_visual_helper_spec.rb
+++ b/spec/helpers/audio_visual_helper_spec.rb
@@ -152,7 +152,10 @@
 
     before do
       allow(file_set).to receive(:id).and_return('0')
-      allow(Hyrax::Engine.routes.url_helpers).to receive(:download_path).with(id: '0', file: 'transcript')
+      allow(Hyrax::Engine.routes.url_helpers)
+        .to receive(:download_path)
+        .with(id: '0', file: 'transcript')
+        .and_call_original
     end
 
     it { is_expected.to eq "/downloads/0?file=transcript" }
diff --git a/spec/helpers/hyrax_helper_spec.rb b/spec/helpers/hyrax_helper_spec.rb
new file mode 100644
index 000000000..2ae762546
--- /dev/null
+++ b/spec/helpers/hyrax_helper_spec.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+RSpec.describe HyraxHelper do
+  describe '#available_translations' do
+    subject { helper.available_translations }
+
+    let(:sample_translations) { { 'en' => 'English' } }
+
+    it { is_expected.to eq sample_translations }
+  end
+end
diff --git a/spec/helpers/spot/facet_helper_spec.rb b/spec/helpers/spot/facet_helper_spec.rb
deleted file mode 100644
index 790412190..000000000
--- a/spec/helpers/spot/facet_helper_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-RSpec.describe Spot::FacetHelper, type: :helper do
-  before do
-    allow(helper).to receive(:blacklight_config).and_return blacklight_config
-  end
-
-  let(:blacklight_config) do
-    Blacklight::Configuration.new do |config|
-      config.add_facet_field 'creator_ssim'
-      config.add_facet_field 'subject_ssim'
-      config.add_facet_field 'depositor_ssim', admin: true
-      config.add_facet_field 'admin_set_ssim', admin: true
-    end
-  end
-
-  describe '.general_facet_names' do
-    subject { helper.general_facet_names }
-
-    it { is_expected.to eq ['creator_ssim', 'subject_ssim'] }
-  end
-
-  describe '.render_general_facet_partials' do
-    before do
-      allow(helper).to receive(:render_facet_partials)
-      helper.render_general_facet_partials
-    end
-
-    it 'calls render_facet_partials with the general facet names' do
-      expect(helper)
-        .to have_received(:render_facet_partials)
-        .with(helper.general_facet_names)
-    end
-  end
-
-  describe '.admin_facet_names' do
-    subject { helper.admin_facet_names }
-
-    it { is_expected.to eq ['depositor_ssim', 'admin_set_ssim'] }
-  end
-
-  describe '.render_admin_facet_partials' do
-    before do
-      allow(helper).to receive(:render_facet_partials)
-      helper.render_admin_facet_partials
-    end
-
-    it 'calls render_facet_partials with the admin facet names' do
-      expect(helper)
-        .to have_received(:render_facet_partials)
-        .with(helper.admin_facet_names)
-    end
-  end
-
-  describe '.render_catalog_visibility_facet' do
-    subject { helper.render_catalog_visibility_facet(visibility) }
-
-    let(:visibility) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
-
-    it { is_expected.to eq '<span class="label label-success">Public</span>' }
-  end
-end
diff --git a/spec/indexers/spot/file_set_indexer_spec.rb b/spec/indexers/spot/file_set_indexer_spec.rb
index 22a2d2a33..0ab8844df 100644
--- a/spec/indexers/spot/file_set_indexer_spec.rb
+++ b/spec/indexers/spot/file_set_indexer_spec.rb
@@ -4,7 +4,7 @@
 
   let(:indexer) { described_class.new(file_set) }
   let(:file_set) { build(:file_set, label: 'file_set_object') }
-  let(:mock_file) { instance_double(Hydra::PCDM::File) }
+  let(:mock_file) { instance_double(Hydra::PCDM::File, id: 'file_id', versions: []) }
 
   before do
     allow(file_set).to receive(:extracted_text).and_return(mock_file)
diff --git a/spec/indexers/student_work_indexer_spec.rb b/spec/indexers/student_work_indexer_spec.rb
index 09a53fdd4..b0f85e231 100644
--- a/spec/indexers/student_work_indexer_spec.rb
+++ b/spec/indexers/student_work_indexer_spec.rb
@@ -15,7 +15,9 @@
       it { is_expected.to eq [advisor_email] }
     end
 
-    context 'when WDS key is present' do
+    # @note skipping for now, as this service hasn't ever worked in production.
+    #       2025-11-10
+    skip 'when WDS key is present' do
       let(:wds_service) { instance_double('Spot::LafayetteWdsService') }
       let(:person_payload) do
         { 'FIRST_NAME' => 'Anna', 'LAST_NAME' => 'Malantonio', 'EMAIL' => 'MALANTOA@LAFAYETTE.EDU' }
diff --git a/spec/jobs/spot/repository_fixity_check_job_spec.rb b/spec/jobs/spot/repository_fixity_check_job_spec.rb
index ce6ecc503..b34f79963 100644
--- a/spec/jobs/spot/repository_fixity_check_job_spec.rb
+++ b/spec/jobs/spot/repository_fixity_check_job_spec.rb
@@ -1,39 +1,30 @@
 # frozen_string_literal: true
 RSpec.describe Spot::RepositoryFixityCheckJob do
-  subject(:perform_job!) { described_class.perform_now(job_opts) }
-
   let(:service_double) { instance_double(Hyrax::FileSetFixityCheckService) }
   let(:fs) { instance_double(FileSet, id: 'abc123') }
   let(:job_opts) { {} }
 
   before do
-    allow(Hyrax::FileSetFixityCheckService).to receive(:new).and_return(service_double)
+    allow(Hyrax::FileSetFixityCheckService).to receive(:new).with(fs, **fixity_opts).and_return(service_double)
     allow(service_double).to receive(:fixity_check)
     allow(FileSet).to receive(:find_each).and_yield(fs)
-    perform_job!
+
+    described_class.perform_now(**job_opts)
   end
 
   context 'default implementation' do
-    let(:opts) { { async_jobs: false } }
+    let(:fixity_opts) { { async_jobs: false } }
 
     it 'calls the Hyrax::FileSetFixityCheckService without async_jobs' do
-      expect(Hyrax::FileSetFixityCheckService)
-        .to have_received(:new)
-        .with(fs, opts)
-
       expect(service_double).to have_received(:fixity_check).at_least(1).times
     end
   end
 
   context 'with force: true' do
-    let(:opts) { { async_jobs: false, max_days_between_fixity_checks: -1 } }
+    let(:fixity_opts) { { async_jobs: false, max_days_between_fixity_checks: -1 } }
     let(:job_opts) { { force: true } }
 
     it do
-      expect(Hyrax::FileSetFixityCheckService)
-        .to have_received(:new)
-        .with(fs, opts)
-
       expect(service_double).to have_received(:fixity_check).at_least(1).times
     end
   end
diff --git a/spec/models/collection_spec.rb b/spec/models/collection_spec.rb
index 4cfea7f52..8561122c2 100644
--- a/spec/models/collection_spec.rb
+++ b/spec/models/collection_spec.rb
@@ -7,7 +7,7 @@
   let(:params) { base_params }
   let(:base_params) { { title: ['ok'], collection_type_gid: collection_type_gid } }
   let(:collection_type) { Hyrax::CollectionType.find_or_create_by(title: 'a cool collection type') }
-  let(:collection_type_gid) { collection_type.gid }
+  let(:collection_type_gid) { collection_type.to_global_id }
 
   it_behaves_like 'a model with hyrax core metadata'
 
diff --git a/spec/models/file_set_spec.rb b/spec/models/file_set_spec.rb
index 0eb9fab5c..bd8fab2af 100644
--- a/spec/models/file_set_spec.rb
+++ b/spec/models/file_set_spec.rb
@@ -2,4 +2,17 @@
 RSpec.describe FileSet do
   it_behaves_like 'a model with hyrax core metadata'
   it_behaves_like 'it accepts "metadata" as a visibility'
+
+  describe "#file_set_derivatives_service" do
+    subject(:file_set) { described_class.new }
+
+    before do
+      allow(Hyrax::DerivativeService).to receive(:for).with(file_set)
+    end
+
+    it 'fetches derivative services for itself' do
+      file_set.send(:file_set_derivatives_service)
+      expect(Hyrax::DerivativeService).to have_received(:for).with(file_set)
+    end
+  end
 end
diff --git a/spec/models/spot/controlled_vocabularies/base_spec.rb b/spec/models/spot/controlled_vocabularies/base_spec.rb
index de08b405d..1324350ab 100644
--- a/spec/models/spot/controlled_vocabularies/base_spec.rb
+++ b/spec/models/spot/controlled_vocabularies/base_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 RSpec.describe Spot::ControlledVocabularies::Base do
   let(:resource) { described_class.new(uri) }
-  let(:uri) { RDF::URI('http://id.loc.gov/authorities/subjects/sh85062079') }
+  let(:uri) { RDF::URI('http://id.loc.gov/authorities/subjects/sh85062079').to_s }
   let(:label_en) { RDF::Literal('Horror in art', language: :en) }
   let(:label_de) { RDF::Literal('Schrecken <Motiv>', language: :de) }
   let(:labels) { [label_en, label_de] }
@@ -34,8 +34,6 @@
         # 3 tries, minus the first try
         expect(resource).to have_received(:sleep).exactly(2).times
       end
-
-      it_behaves_like 'it logs a warning'
     end
 
     context 'when a label has not been cached but others exist' do
diff --git a/spec/overrides/bulkrax_object_factory_spec.rb b/spec/overrides/bulkrax_object_factory_spec.rb
new file mode 100644
index 000000000..8a7b8e96a
--- /dev/null
+++ b/spec/overrides/bulkrax_object_factory_spec.rb
@@ -0,0 +1,150 @@
+# frozen_string_literal: true
+RSpec.describe Bulkrax::ObjectFactory do
+  subject(:factory) do
+    described_class.new(
+      attributes: {},
+      source_identifier_value: :source_identifier,
+      work_identifier: :source_identifier,
+      work_identifier_search_field: 'source_identifier_ssim'
+    )
+  end
+
+  let(:mock_user) { instance_double(User) }
+
+  before do
+    allow(User).to receive(:find_or_create_system_user).and_return(mock_user)
+  end
+
+  describe '#find' do
+    subject { factory.find }
+    let(:mock_work) { instance_double(Hyrax::Work) }
+
+    context "'find_by_source_identifier' returns the object" do
+      before do
+        allow(factory).to receive(:find_by_source_identifier).and_return(mock_work)
+      end
+
+      it "runs the first method only and returns the object" do
+        expect(factory).to receive(:find_by_source_identifier)
+        expect(factory).to_not receive(:find_by_id)
+        expect(factory).to_not receive(:search_by_identifier)
+        is_expected.to eq mock_work
+      end
+    end
+
+    context "'find_by_id' returns the object" do
+      before do
+        allow(factory).to receive(:find_by_source_identifier).and_return(nil)
+        allow(factory).to receive(:find_by_id).and_return(mock_work)
+      end
+
+      it "runs the first two methods only and returns the object" do
+        expect(factory).to receive(:find_by_source_identifier)
+        expect(factory).to receive(:find_by_id)
+        expect(factory).to_not receive(:search_by_identifier)
+        is_expected.to eq mock_work
+      end
+    end
+
+    context "'search_by_identifier' returns the object" do
+      before do
+        allow(factory).to receive(:find_by_source_identifier).and_return(nil)
+        allow(factory).to receive(:find_by_id).and_return(nil)
+        allow(factory).to receive(:search_by_identifier).and_return(mock_work)
+      end
+
+      it "runs all methods and returns the object" do
+        expect(factory).to receive(:find_by_source_identifier)
+        expect(factory).to receive(:find_by_id)
+        expect(factory).to receive(:search_by_identifier)
+        is_expected.to eq mock_work
+      end
+    end
+
+    context "all methods return nil" do
+      before do
+        allow(factory).to receive(:find_by_source_identifier).and_return(nil)
+        allow(factory).to receive(:find_by_id).and_return(nil)
+        allow(factory).to receive(:search_by_identifier).and_return(nil)
+      end
+
+      it "runs all methods and returns nil" do
+        expect(factory).to receive(:find_by_source_identifier)
+        expect(factory).to receive(:find_by_id)
+        expect(factory).to receive(:search_by_identifier)
+        is_expected.to eq nil
+      end
+    end
+  end
+
+  describe '#find_by_source_identifier' do
+    subject { factory.find_by_source_identifier }
+
+    let(:mock_attributes) { instance_double(ActiveSupport::HashWithIndifferentAccess) }
+
+    before(:each) { factory.instance_variable_set(:@attributes, mock_attributes) }
+
+    context "there is no source_identifier" do
+      before do
+        allow(mock_attributes).to receive(:key?).with('source_identifier').and_return(false)
+      end
+
+      it { is_expected.to eq nil }
+    end
+
+    context "source_identifier is nil" do
+      before do
+        allow(mock_attributes).to receive(:key?).with('source_identifier').and_return(true)
+        allow(mock_attributes).to receive(:[]).with('source_identifier').and_return(nil)
+      end
+
+      it { is_expected.to eq nil }
+    end
+
+    context "there is a source_identifier" do
+      let(:identifier) { "test_0_0" }
+
+      before do
+        allow(mock_attributes).to receive(:key?).with('source_identifier').and_return(true)
+        allow(mock_attributes).to receive(:[]).with('source_identifier').and_return([identifier])
+      end
+
+      context "the solr query does not match with an object" do
+        before do
+          allow(Hyrax::SolrService).to receive(:get).with("source_identifier_ssim:#{identifier}", fl: ['id', 'source_identifier_ssim'], defType: 'lucene').and_return(nil)
+        end
+
+        it { is_expected.to eq nil }
+      end
+
+      context "the solr query matches with an object" do
+        context "the id is empty" do
+          let(:id_doc) { { "response" => { "docs" => [{ "id" => nil }] } } }
+
+          before do
+            allow(Hyrax::SolrService).to receive(:get).with("source_identifier_ssim:#{identifier}", fl: ['id', 'source_identifier_ssim'], defType: 'lucene').and_return(id_doc)
+          end
+
+          it { is_expected.to eq nil }
+        end
+
+        context "the id is not empty" do
+          let(:id) { "0a0a0a0a" }
+          let(:id_doc) { { "response" => { "docs" => [{ "id" => id }] } } }
+          let(:mock_work) { instance_double(Hyrax::Work) }
+
+          before do
+            allow(Hyrax::SolrService).to receive(:get).with("source_identifier_ssim:#{identifier}", fl: ['id', 'source_identifier_ssim'], defType: 'lucene').and_return(id_doc)
+            allow(ActiveFedora::Base).to receive(:find).with(id).and_return(mock_work)
+          end
+
+          it "searches for and returns the object" do
+            expect(Hyrax::SolrService).to receive(:get).with("source_identifier_ssim:#{identifier}", fl: ['id', 'source_identifier_ssim'], defType: 'lucene')
+            expect(ActiveFedora::Base).to receive(:find).with(id)
+            is_expected.to eq mock_work
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/overrides/bulkrax_s3_files_matcher_spec.rb b/spec/overrides/bulkrax_s3_files_matcher_spec.rb
new file mode 100644
index 000000000..a61d986d8
--- /dev/null
+++ b/spec/overrides/bulkrax_s3_files_matcher_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+# Tests to make sure that browse everything can read s3 urls
+# Test format is copied from original Browse Everything tests
+#
+RSpec.describe Bulkrax::ApplicationMatcher do
+  subject(:matcher) { described_class.new(split: false) }
+
+  describe '#parse_remote_files' do
+    context 'src is empty' do
+      let(:src) { '' }
+
+      it 'returns nil' do
+        expect(matcher.parse_remote_files(src)).to eq nil
+      end
+    end
+
+    context 'src is not empty' do
+      let(:src) { 'project/file.jpg'.dup }
+      let(:key) { src }
+      let(:s3_bucket) { 'ldr-imports' }
+      let(:mock_s3_client) { instance_double(Aws::S3::Client) }
+      let(:mock_s3_object) { instance_double(Aws::S3::Object) }
+      let(:url) { "s3://#{s3_bucket}/#{key}" }
+      let(:ret_val) { { url: url, file_name: name } }
+
+      before do
+        stub_env('AWS_BULKRAX_IMPORTS_BUCKET', s3_bucket)
+        allow(Aws::S3::Client).to receive(:new).and_return(mock_s3_client)
+        allow(Aws::S3::Object).to receive(:new).with(bucket_name: s3_bucket, key: src, client: mock_s3_client).and_return(mock_s3_object)
+        allow(mock_s3_object).to receive(:presigned_url).with(:get, expires_in: 3600).and_return(url)
+      end
+
+      context 'the object does not exist' do
+        before do
+          allow(mock_s3_client).to receive(:head_object).with(bucket: s3_bucket, key: key).and_raise(Aws::S3::Errors::NotFound.new(nil, nil))
+          allow(Rails.logger).to receive(:warn).with('S3: Key not found.')
+        end
+
+        it 'logs a warning and returns the empty string' do
+          expect(matcher.parse_remote_files(src)).to eq "S3: Key not found."
+          expect(Rails.logger).to have_received(:warn)
+            .with('S3: Key not found.')
+        end
+      end
+
+      context 'the object exists' do
+        let(:mock_s3_head) { instance_double(Aws::S3::Types::HeadObjectOutput) }
+        let(:name) { 'file.jpg' }
+
+        before do
+          allow(mock_s3_client).to receive(:head_object).with(key: key, bucket: s3_bucket).and_return(mock_s3_head)
+        end
+
+        it 'returns the name and url' do
+          expect(matcher.parse_remote_files(src)).to eq ret_val
+        end
+      end
+    end
+  end
+end
diff --git a/spec/overrides/hyrax_permission_badge_spec.rb b/spec/overrides/hyrax_permission_badge_spec.rb
deleted file mode 100644
index d1bf18229..000000000
--- a/spec/overrides/hyrax_permission_badge_spec.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-RSpec.describe Hyrax::PermissionBadge do
-  it 'adds ":metadata" to the Hash of visibility labels' do
-    expect(Hyrax::PermissionBadge::VISIBILITY_LABEL_CLASS).to include(:metadata)
-  end
-end
diff --git a/spec/presenters/spot/permission_badge_spec.rb b/spec/presenters/spot/permission_badge_spec.rb
new file mode 100644
index 000000000..2f29a3fe3
--- /dev/null
+++ b/spec/presenters/spot/permission_badge_spec.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+RSpec.describe Spot::PermissionBadge do
+  it 'renders a span badge' do
+    expect(described_class.new('metadata').render.to_s).to eq '<span class="badge badge-info">Metadata Only</span>'
+  end
+
+  it 'returns the correct badge_class' do
+    expect(described_class.new('metadata').badge_class.to_s).to eq 'badge-info'
+  end
+
+  it 'returns the correct visibility_label' do
+    expect(described_class.new('metadata').visibility_label.to_s).to eq 'Metadata Only'
+  end
+end
diff --git a/spec/renderers/spot/renderers/attribute_renderer_spec.rb b/spec/renderers/spot/renderers/attribute_renderer_spec.rb
index ecfaf0eaa..aeb81df5f 100644
--- a/spec/renderers/spot/renderers/attribute_renderer_spec.rb
+++ b/spec/renderers/spot/renderers/attribute_renderer_spec.rb
@@ -14,8 +14,8 @@
       let(:values) { 'Emotion' }
 
       let(:html_result) do
-        '<tr><th rowspan="1">Title</th>' \
-        '<td class="attribute attribute-title">' \
+        '<tr><th class="p-2" rowspan="1">Title</th>' \
+        '<td class="p-2 attribute attribute-title">' \
         '<span itemprop="name">Emotion</span>' \
         '</td></tr>'
       end
@@ -27,11 +27,11 @@
       let(:values) { ['Party for One', 'Cut to the Feeling'] }
 
       let(:html_result) do
-        '<tr><th rowspan="2">Title</th>' \
-        '<td class="attribute attribute-title">' \
+        '<tr><th class="p-2" rowspan="2">Title</th>' \
+        '<td class="p-2 attribute attribute-title">' \
         '<span itemprop="name">Party for One</span>' \
         '</td></tr>' \
-        '<tr><td class="attribute attribute-title">' \
+        '<tr><td class="p-2 attribute attribute-title">' \
         '<span itemprop="name">Cut to the Feeling</span>' \
         '</td></tr>'
       end
@@ -47,8 +47,8 @@
       end
 
       let(:html_result) do
-        '<tr><th rowspan="1">Title</th>' \
-        '<td class="attribute attribute-title">Run Away With Me</td></tr>'
+        '<tr><th class="p-2" rowspan="1">Title</th>' \
+        '<td class="p-2 attribute attribute-title">Run Away With Me</td></tr>'
       end
 
       it { is_expected.to be_equivalent_to expected }
@@ -57,10 +57,10 @@
     context 'options[:show_help_text]' do
       before do
         allow(I18n).to receive(:translate)
-          .with(:'simple_form.hints.defaults.title', default: [], raise: true)
+          .with(:'simple_form.hints.defaults.title', anything)
           .and_return(help_text)
         allow(I18n).to receive(:translate)
-          .with(:'blacklight.search.fields.default.show.title', raise: true)
+          .with(:'blacklight.search.fields.default.show.title', anything)
           .and_return('Title')
       end
 
@@ -69,7 +69,7 @@
 
       let(:html_result) do
         %(<tr>
-          <th rowspan="1">Title
+          <th class="p-2" rowspan="1">Title
             <span
               class="fa fa-question-circle-o"
               data-html="true"
@@ -78,7 +78,7 @@
               data-content="#{help_text}"
             ></span>
           </th>
-          <td class="attribute attribute-title">
+          <td class="p-2 attribute attribute-title">
             <span itemprop="name">Run Away With Me</span>
           </td>
         </tr>)
diff --git a/spec/renderers/spot/renderers/external_authority_attribute_renderer_spec.rb b/spec/renderers/spot/renderers/external_authority_attribute_renderer_spec.rb
index d45db710d..e7458676d 100644
--- a/spec/renderers/spot/renderers/external_authority_attribute_renderer_spec.rb
+++ b/spec/renderers/spot/renderers/external_authority_attribute_renderer_spec.rb
@@ -15,8 +15,8 @@
     end
 
     let(:html_result) do
-      '<tr><th rowspan="1">Creator</th>' \
-      '<td itemprop="creator" itemscope itemtype="http://schema.org/Person" class="attribute attribute-creator">' \
+      '<tr><th class="p-2" rowspan="1">Creator</th>' \
+      '<td itemprop="creator" itemscope itemtype="http://schema.org/Person" class="p-2 attribute attribute-creator">' \
       '<span itemprop="name">' \
       "<a href=\"#{search_path}\">Carly Rae Jepsen</a> (" \
         '<a target="_blank" rel="noopener" href="https://www.carlyraemusic.com/">' \
diff --git a/spec/renderers/spot/renderers/faceted_attribute_renderer_spec.rb b/spec/renderers/spot/renderers/faceted_attribute_renderer_spec.rb
index 04b562db2..137fcb928 100644
--- a/spec/renderers/spot/renderers/faceted_attribute_renderer_spec.rb
+++ b/spec/renderers/spot/renderers/faceted_attribute_renderer_spec.rb
@@ -6,8 +6,8 @@
   let(:renderer) { described_class.new(field, value, options) }
   let(:helpers) { Rails.application.routes.url_helpers }
   let(:html_result) do
-    '<tr><th rowspan="1">Keyword</th>' \
-    '<td class="attribute attribute-keyword">' \
+    '<tr><th class="p-2" rowspan="1">Keyword</th>' \
+    '<td class="p-2 attribute attribute-keyword">' \
     '<span itemprop="keywords">' \
     "<a href=\"#{url}\">emotion</a>" \
     '</span></td></tr>'
diff --git a/spec/renderers/spot/renderers/identifier_attribute_renderer_spec.rb b/spec/renderers/spot/renderers/identifier_attribute_renderer_spec.rb
index 7748d7dda..fc05bf8e9 100644
--- a/spec/renderers/spot/renderers/identifier_attribute_renderer_spec.rb
+++ b/spec/renderers/spot/renderers/identifier_attribute_renderer_spec.rb
@@ -14,8 +14,8 @@
 
     context 'when a prefix is present' do
       let(:html_result) do
-        '<tr><th rowspan="1">Standard Identifier</th>' \
-        '<td class="attribute attribute-standard_identifier">' \
+        '<tr><th class="p-2" rowspan="1">Standard Identifier</th>' \
+        '<td class="p-2 attribute attribute-standard_identifier">' \
         '<span class="label label-default">ISBN</span> ' \
         '978-1467715478</td></tr>'
       end
@@ -26,8 +26,8 @@
     context 'when a prefix is not present' do
       let(:value) { local_value }
       let(:html_result) do
-        '<tr><th rowspan="1">Standard Identifier</th>' \
-        '<td class="attribute attribute-standard_identifier">B0023882-01</td></tr>'
+        '<tr><th class="p-2" rowspan="1">Standard Identifier</th>' \
+        '<td class="p-2 attribute attribute-standard_identifier">B0023882-01</td></tr>'
       end
 
       it { is_expected.to be_equivalent_to expected }
@@ -38,8 +38,8 @@
       let(:opts) { { local: true } }
 
       let(:html_result) do
-        '<tr><th rowspan="1">Standard Identifier</th>' \
-        '<td class="attribute attribute-standard_identifier">' \
+        '<tr><th class="p-2" rowspan="1">Standard Identifier</th>' \
+        '<td class="p-2 attribute attribute-standard_identifier">' \
         '<code>isbn:978-1467715478</code></td></tr>'
       end
 
diff --git a/spec/search_builders/spot/catalog_search_builder_spec.rb b/spec/search_builders/spot/catalog_search_builder_spec.rb
index b7194a9d1..567354dab 100644
--- a/spec/search_builders/spot/catalog_search_builder_spec.rb
+++ b/spec/search_builders/spot/catalog_search_builder_spec.rb
@@ -11,7 +11,8 @@
   describe '#add_full_text_context' do
     subject(:context_query) { builder.add_full_text_context(params) }
 
-    let(:builder) { described_class.new([]).with(blacklight_params) }
+    let(:builder) { described_class.new([], scope_double).with(blacklight_params) }
+    let(:scope_double) { double('scope', blacklight_config: {}) }
     let(:blacklight_params) { { q: 'a cool query' } }
     let(:feature_available) { true }
     let(:params) { {} }
diff --git a/spec/search_builders/spot/work_and_file_set_search_builder_spec.rb b/spec/search_builders/spot/work_and_file_set_search_builder_spec.rb
index fe3a95345..cd0a7dd7c 100644
--- a/spec/search_builders/spot/work_and_file_set_search_builder_spec.rb
+++ b/spec/search_builders/spot/work_and_file_set_search_builder_spec.rb
@@ -1,17 +1,16 @@
 # frozen_string_literal: true
 RSpec.describe Spot::WorkAndFileSetSearchBuilder do
-  let(:builder) { described_class.new([]) }
+  let(:builder) { described_class.new(processor_chain, scope) }
+  let(:processor_chain) { [] }
+  let(:scope) { double('scope', blacklight_config: {}) }
 
   describe '#filter_models' do
     subject(:params) { {} }
 
     before { builder.filter_models(params) }
 
-    it 'adds a :fq key' do
+    it 'adds a :fq key that is an array' do
       expect(params).to include :fq
-    end
-
-    it 'is an array' do
       expect(params[:fq]).to be_an Array
     end
 
diff --git a/spec/services/spot/characterization_service_spec.rb b/spec/services/spot/characterization_service_spec.rb
index 80bb2166c..bcdad7d0f 100644
--- a/spec/services/spot/characterization_service_spec.rb
+++ b/spec/services/spot/characterization_service_spec.rb
@@ -9,7 +9,7 @@
 
   before do
     allow(described_class).to receive(:run).with(proxy, filename).and_call_original
-    allow(described_class).to receive(:new).with(proxy, filename, ch12n_tool: tool).and_return(service_double)
+    allow(described_class).to receive(:new).with(proxy, filename, { ch12n_tool: tool }).and_return(service_double)
   end
 
   it 'is set to be the service for CharacterizeJob' do
@@ -24,7 +24,7 @@
     it 'passes the :fits_servlet tool to the initializer' do
       described_class.run(proxy, filename)
 
-      expect(described_class).to have_received(:new).with(proxy, filename, ch12n_tool: tool)
+      expect(described_class).to have_received(:new).with(proxy, filename, { ch12n_tool: tool })
     end
   end
 
@@ -34,7 +34,7 @@
     it 'passes the :fits tool to the initializer' do
       described_class.run(proxy, filename)
 
-      expect(described_class).to have_received(:new).with(proxy, filename, ch12n_tool: tool)
+      expect(described_class).to have_received(:new).with(proxy, filename, { ch12n_tool: tool })
     end
   end
 
@@ -42,13 +42,13 @@
     let(:tool) { :some_advanced_tool }
 
     before do
-      allow(described_class).to receive(:run).with(proxy, filename, ch12n_tool: tool).and_call_original
+      allow(described_class).to receive(:run).with(proxy, filename, { ch12n_tool: tool }).and_call_original
     end
 
     it 'uses the provided tool' do
-      described_class.run(proxy, filename, ch12n_tool: tool)
+      described_class.run(proxy, filename, { ch12n_tool: tool })
 
-      expect(described_class).to have_received(:new).with(proxy, filename, ch12n_tool: tool)
+      expect(described_class).to have_received(:new).with(proxy, filename, { ch12n_tool: tool })
     end
   end
 end
diff --git a/spec/services/spot/embargo_lease_service_spec.rb b/spec/services/spot/embargo_lease_service_spec.rb
index 26ed38460..480942316 100644
--- a/spec/services/spot/embargo_lease_service_spec.rb
+++ b/spec/services/spot/embargo_lease_service_spec.rb
@@ -1,137 +1,114 @@
 # frozen_string_literal: true
-RSpec.describe Spot::EmbargoLeaseService do
-  let(:publication) { create(:publication) }
-  let(:attributes) do
-    { title: ['example item with an embargo'], date_issued: ['2020-01'],
-      rights_statement: ['http://creativecommons.org/publicdomain/mark/1.0/'],
-      resource_type: ['Other'], admin_set_id: AdminSet.find_or_create_default_admin_set_id }
-  end
-
-  describe '.clear_expired_embargoes' do
-    let(:visibility_during_embargo) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
-    let(:visibility_after_embargo) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
-
-    before do
-      publication.apply_embargo(Date.tomorrow.to_s, visibility_during_embargo, visibility_after_embargo)
-      publication.embargo_release_date = release_date
+RSpec.describe Spot::EmbargoLeaseService, valkyrization: true do
+  # testing on a Publication, but theoretically this should behave the same on all resources.
+  # since we're not validating the resources, we don't really need metadata.
+  let(:original_resource) { FactoryBot.valkyrie_create(:publication_resource_with_required_fields_only) }
+  let(:resource) { Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: original_resource.id) }
+  let(:embargo) { FactoryBot.valkyrie_create(:embargo, embargo_release_date: embargo_release_date) }
+  let(:lease) { FactoryBot.valkyrie_create(:lease, lease_expiration_date: lease_expiration_date) }
+  let(:embargo_release_date) { DateTime.now.utc + 1.day }
+  let(:lease_expiration_date) { DateTime.now.utc + 1.day }
 
-      # need to skip validation so that we can back-date the embargo
-      publication.save(validate: false)
-    end
-
-    context 'with an expired embargo' do
-      let(:release_date) { Date.yesterday.to_s }
+  describe '.clear_all_expired' do
+    describe 'embargoes' do
+      # @note In Hyrax < 5.0.1 there's not a way to use the Wings persister without triggering
+      #       ActiveFedora validations (which will ultimately not allow an Embargo to be applied
+      #       with a date in the past), so instead we'll cast the Resource + Embargo/Leases to
+      #       ActiveFedora objects and assign the Embargo/Lease that way, allowing us to call
+      #       #save(validate: false).
+      #
+      # @todo When we upgrade to Hyrax 5.0.1, we should be able to replace this block with:
+      #       before do
+      #         resource.embargo = embargo
+      #         Hyrax.persister.save(resource: resource, perform_af_validation: false)
+      #       end
+      before do
+        af_resource = Hyrax.persister.resource_factory.from_resource(resource: resource)
+        af_embargo = Hyrax.persister.resource_factory.from_resource(resource: embargo)
+        af_resource.visibility = af_embargo.visibility_during_embargo
+        af_resource.embargo = af_embargo
+        af_resource.save(validate: false)
+      end
 
-      it "updates the item's visibility" do
-        expect(publication.visibility).to eq visibility_during_embargo
+      after do
+        Hyrax.persister.delete(resource: original_resource)
+      end
 
-        described_class.clear_expired_embargoes
+      context 'with an active embargo' do
+        let(:embargo_release_date) { DateTime.now.utc + 1.day }
 
-        # the same as +publication.reload+ but should be compatible with Wings
-        expect(Publication.find(publication.id).visibility).to eq visibility_after_embargo
+        it 'does nothing' do
+          expect { described_class.clear_all_expired }
+            .not_to change { Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: resource.id).visibility }
+        end
       end
-    end
 
-    context 'with an active embargo' do
-      let(:release_date) { Date.tomorrow.to_s }
+      context 'with an expired embargo' do
+        let(:embargo_release_date) { DateTime.now.utc - 1.day }
 
-      it 'does nothing' do
-        expect(publication.visibility).to eq visibility_during_embargo
+        it "updates the item's visibility" do
+          expect { described_class.clear_all_expired }
+            .to change { Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: resource.id).visibility }
+            .from(embargo.visibility_during_embargo)
+            .to(embargo.visibility_after_embargo)
+        end
 
-        described_class.clear_expired_embargoes
+        context 'for a resource with children' do
+          let(:resource) { Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: original_resource.id) }
+          let(:child) { FactoryBot.valkyrie_create(:publication_resource_with_required_fields_only) }
+          let(:child_resource) { Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: child.id) }
 
-        pub = Publication.find(publication.id)
-        expect(pub.visibility).not_to eq visibility_after_embargo
-        expect(pub.visibility).to eq visibility_during_embargo
-      end
-    end
-  end
+          before do
+            allow(Hyrax::AccessControlList).to receive(:copy_permissions)
 
-  describe '.clear_expired_leases' do
-    let(:visibility_during_lease) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
-    let(:visibility_after_lease) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
+            resource.member_ids << child_resource.id
+            Hyrax.persister.save(resource: resource)
+          end
 
-    before do
-      publication.apply_lease(Date.tomorrow.to_s, visibility_during_lease, visibility_after_lease)
-      publication.lease_expiration_date = release_date
-      publication.save(validate: false)
-    end
-
-    context 'with an expired embargo' do
-      let(:release_date) { Date.yesterday.to_s }
-
-      it "updates the item's visibility" do
-        expect(publication.visibility).to eq visibility_during_lease
+          # @todo having difficulty getting children to save reliably to test?
+          skip 'calls Hyrax::AccessControlList.copy_permissions for each child' do
+            expect(Hyrax.query_service.find_members(resource: resource).count).not_to be_zero
 
-        described_class.clear_expired_leases
+            described_class.clear_all_expired
 
-        expect(Publication.find(publication.id).visibility).to eq visibility_after_lease
+            expect(Hyrax::AccessControlList)
+              .to have_received(:copy_permissions)
+              .with(source: resource, target: child_resource)
+              .exactly(1).time
+          end
+        end
       end
     end
 
-    context "when a lease isn't expired yet" do
-      let(:release_date) { Date.tomorrow.to_s }
-
-      it 'does nothing' do
-        expect(publication.visibility).to eq visibility_during_lease
+    describe 'leases' do
+      # @see above before block
+      before do
+        af_resource = Hyrax.persister.resource_factory.from_resource(resource: resource)
+        af_lease = Hyrax.persister.resource_factory.from_resource(resource: lease)
+        af_resource.lease = af_lease
+        af_resource.visibility = af_lease.visibility_during_lease
+        af_resource.save(validate: false)
+      end
 
-        described_class.clear_expired_leases
+      context 'with an expired lease' do
+        let(:lease_expiration_date) { DateTime.now.utc - 1.day }
 
-        pub = Publication.find(publication.id)
-        expect(pub.visibility).not_to eq visibility_after_lease
-        expect(pub.visibility).to eq visibility_during_lease
+        it "updates the item's visibility" do
+          expect { described_class.clear_all_expired }
+            .to change { Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: resource.id).visibility }
+            .from(lease.visibility_during_lease)
+            .to(lease.visibility_after_lease)
+        end
       end
-    end
-  end
 
-  # we just want to be sure that the methods are being called, so
-  # let's just mock everything
-  describe '.clear_all_expired' do
-    let(:embargoed_presenter) { instance_double(Hyrax::WorkShowPresenter, id: 'abc123def') }
-    let(:leased_presenter) { instance_double(Hyrax::WorkShowPresenter, id: 'def456ghi') }
-    let(:publication_double) { instance_double(Publication, copy_visibility_to_files: true, save!: true) }
-    let(:embargoed_actor_double) { instance_double(Hyrax::Actors::EmbargoActor, destroy: true) }
-    let(:leased_actor_double) { instance_double(Hyrax::Actors::LeaseActor, destroy: true) }
-    let(:todays_date) { Time.zone.now.strftime('%Y-%m-%d') }
-
-    before do
-      allow(Hyrax::EmbargoService)
-        .to receive(:assets_with_expired_embargoes)
-        .and_return([embargoed_presenter])
-
-      allow(Hyrax::LeaseService)
-        .to receive(:assets_with_expired_leases)
-        .and_return([leased_presenter])
-
-      allow(ActiveFedora::Base)
-        .to receive(:find)
-        .with(embargoed_presenter.id)
-        .and_return(publication_double)
-
-      allow(ActiveFedora::Base)
-        .to receive(:find)
-        .with(leased_presenter.id)
-        .and_return(publication_double)
-
-      allow(publication_double).to receive(:under_embargo?)
-      allow(publication_double).to receive(:active_lease?)
-
-      allow(Hyrax::Actors::EmbargoActor)
-        .to receive(:new)
-        .with(publication_double)
-        .and_return(embargoed_actor_double)
-
-      allow(Hyrax::Actors::LeaseActor)
-        .to receive(:new)
-        .with(publication_double)
-        .and_return(leased_actor_double)
-    end
+      context 'with an active lease' do
+        let(:lease_expiration_date) { DateTime.now.utc + 1.day }
 
-    it 'calls destroy on both the embargo + lease actors' do
-      described_class.clear_all_expired
-
-      expect(embargoed_actor_double).to have_received(:destroy).exactly(1).time
-      expect(leased_actor_double).to have_received(:destroy).exactly(1).time
+        it 'does nothing' do
+          expect { described_class.clear_all_expired }
+            .not_to change { Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: resource.id).visibility }
+        end
+      end
     end
   end
 end
diff --git a/spec/services/spot/exporters/work_members_exporter_spec.rb b/spec/services/spot/exporters/work_members_exporter_spec.rb
index ac2210d7f..bbc89f6a0 100644
--- a/spec/services/spot/exporters/work_members_exporter_spec.rb
+++ b/spec/services/spot/exporters/work_members_exporter_spec.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
-require 'fileutils'
-
+#
 # Is this too much mocking? I didn't want to go down the rabbit hole
 # of generating a full item just for this spec.
 RSpec.describe Spot::Exporters::WorkMembersExporter, perform_enqueued: true do
diff --git a/spec/services/spot/exporters/work_metadata_exporter_spec.rb b/spec/services/spot/exporters/work_metadata_exporter_spec.rb
index 2e0846616..0a2c56004 100644
--- a/spec/services/spot/exporters/work_metadata_exporter_spec.rb
+++ b/spec/services/spot/exporters/work_metadata_exporter_spec.rb
@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require 'fileutils'
-
 RSpec.describe Spot::Exporters::WorkMetadataExporter do
   let(:exporter) { described_class.new(solr_document, request) }
   let(:work_id) { 'spot-work_metadata_exporter_spec-obj' }
diff --git a/spec/services/spot/exporters/zipped_work_exporter_spec.rb b/spec/services/spot/exporters/zipped_work_exporter_spec.rb
index 812934bc4..80b228ff9 100644
--- a/spec/services/spot/exporters/zipped_work_exporter_spec.rb
+++ b/spec/services/spot/exporters/zipped_work_exporter_spec.rb
@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require 'fileutils'
-
 RSpec.describe Spot::Exporters::ZippedWorkExporter do
   let(:exporter) { described_class.new(work, request) }
   let(:path_to_file) { Rails.root.join('spec', 'fixtures', 'image.png') }
diff --git a/spec/services/spot/handle_service_spec.rb b/spec/services/spot/handle_service_spec.rb
index 5ced89292..ee8ad3482 100644
--- a/spec/services/spot/handle_service_spec.rb
+++ b/spec/services/spot/handle_service_spec.rb
@@ -2,10 +2,23 @@
 RSpec.describe Spot::HandleService do
   subject(:service) { described_class.new(work) }
 
+  # @note This isn't a real-world example of a working Handle server URL,
+  #       but WebMock requires a mocked URL to resolve to a real host/port
+  #       combination, and this will get tests passing.
+  # @see https://github.com/bblimke/webmock/issues/955
+  let(:handle_server_url) { 'http://hdl.handle.net' }
+
   let(:work) { instance_double(Publication, id: 'abc123def', identifier: identifiers) }
   let(:identifiers) { [] }
-  let(:handle_server_url) { 'http://handle-service:8000' }
   let(:handle_prefix) { '10385' }
+  let(:stubbed_env) do
+    {
+      'HANDLE_SERVER_URL' => handle_server_url,
+      'HANDLE_PREFIX' => handle_prefix,
+      'HANDLE_CLIENT_CERT_PEM' => 'client_cert',
+      'HANDLE_CLIENT_KEY_PEM' => 'client_key'
+    }
+  end
 
   before do
     stub_env('URL_HOST', 'http://localhost')
@@ -16,16 +29,17 @@
 
     context 'when all values are provided' do
       before do
-        stub_env('HANDLE_SERVER_URL', handle_server_url)
-        stub_env('HANDLE_PREFIX', handle_prefix)
-        stub_env('HANDLE_CLIENT_CERT_PEM', 'client_cert')
-        stub_env('HANDLE_CLIENT_KEY_PEM', 'client_key')
+        stubbed_env.each_pair { |(key, val)| stub_env(key, val) }
       end
 
       it { is_expected.to be true }
     end
 
     context 'when not all values are provided' do
+      before do
+        stubbed_env.keys.each { |key| stub_env(key, nil) }
+      end
+
       it { is_expected.to be false }
     end
   end
diff --git a/spec/services/spot/lafayette_instructors_authority_service_spec.rb b/spec/services/spot/lafayette_instructors_authority_service_spec.rb
index 7c3c3e4ad..fa8cdee56 100644
--- a/spec/services/spot/lafayette_instructors_authority_service_spec.rb
+++ b/spec/services/spot/lafayette_instructors_authority_service_spec.rb
@@ -18,6 +18,7 @@
       allow(wds_service).to receive(:person).with(email: email).and_return(wds_response)
     end
 
+    let(:user) { create(:user, given_name: first_name, surname: last_name, email: email) }
     let(:email) { 'malantoa@lafayette.edu' }
     let(:last_name) { 'Malantonio' }
     let(:first_name) { 'Anna' }
@@ -47,8 +48,6 @@
     context 'when a QA entry exists in the database' do
       before { described_class.label_for(email: user.email) }
 
-      let(:user) { create(:user, given_name: first_name, surname: last_name, email: email) }
-
       it { is_expected.to eq user.authority_name }
 
       it 'does not call the wds_service' do
diff --git a/spec/services/spot/rdf_authority_parser_spec.rb b/spec/services/spot/rdf_authority_parser_spec.rb
index eb94b5b29..97f27409d 100644
--- a/spec/services/spot/rdf_authority_parser_spec.rb
+++ b/spec/services/spot/rdf_authority_parser_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # borrows heavily from
 # samvera/questioning_authority:spec/lib/services/rdf_authority_parser_spec.rb
-RSpec.describe Spot::RDFAuthorityParser do
+RSpec.describe Spot::RdfAuthorityParser do
   let(:source) { [Rails.root.join('spec', 'fixtures', 'iso639-1-en.nt')] }
   let(:format) { :ntriples }
   let(:predicate) { ::RDF::Vocab::SKOS.prefLabel }
diff --git a/spec/services/spot/video_processor_spec.rb b/spec/services/spot/video_processor_spec.rb
index 964c85cec..46e191ec5 100644
--- a/spec/services/spot/video_processor_spec.rb
+++ b/spec/services/spot/video_processor_spec.rb
@@ -11,14 +11,19 @@
     end
 
     after { described_class.config = @original_config }
-    let(:directives) { { label: :thumb, format: "mp4", url: 'http://localhost:8983/fedora/rest/dev/1234/thumbnail' } }
 
+    let(:directives) { { label: :thumb, format: "mp4", url: 'http://localhost:8983/fedora/rest/dev/1234/thumbnail' } }
+    let(:opts) do
+      {
+        Hydra::Derivatives::Processors::Ffmpeg::OUTPUT_OPTIONS => "-s 320x240 -vcodec mpeg4 -acodec aac -strict -2 -g 30 -b:v 345k -ac 2 -ab 96k -ar 44100",
+        Hydra::Derivatives::Processors::Ffmpeg::INPUT_OPTIONS => ""
+      }
+    end
     it "is configurable" do
       expect(subject)
         .to receive(:encode_file)
-        .with("mp4",
-          Hydra::Derivatives::Processors::Ffmpeg::OUTPUT_OPTIONS => "-s 320x240 -vcodec mpeg4 -acodec aac -strict -2 -g 30 -b:v 345k -ac 2 -ab 96k -ar 44100",
-          Hydra::Derivatives::Processors::Ffmpeg::INPUT_OPTIONS => "")
+        .with("mp4", opts)
+
       subject.process
     end
   end
@@ -26,13 +31,16 @@
   context "when arguments are passed as a hash" do
     context "when a video format is requested" do
       let(:directives) { { label: :thumb, format: 'webm', url: 'http://localhost:8983/fedora/rest/dev/1234/thumbnail' } }
-
+      let(:opts) do
+        {
+          Hydra::Derivatives::Processors::Ffmpeg::OUTPUT_OPTIONS => "-s 320x240 -vcodec libvpx -acodec libvorbis -g 30 -b:v 345k -ac 2 -ab 96k -ar 44100",
+          Hydra::Derivatives::Processors::Ffmpeg::INPUT_OPTIONS => ""
+        }
+      end
       it "creates a fedora resource and infers the name" do
         expect(subject)
           .to receive(:encode_file)
-          .with("webm",
-            Hydra::Derivatives::Processors::Ffmpeg::OUTPUT_OPTIONS => "-s 320x240 -vcodec libvpx -acodec libvorbis -g 30 -b:v 345k -ac 2 -ab 96k -ar 44100",
-            Hydra::Derivatives::Processors::Ffmpeg::INPUT_OPTIONS => "")
+          .with("webm", opts)
         subject.process
       end
     end
@@ -41,7 +49,7 @@
       let(:directives) { { label: :thumb, format: 'jpg', url: 'http://localhost:8983/fedora/rest/dev/1234/thumbnail' } }
 
       it "creates a fedora resource and infers the name" do
-        expect(subject).to receive(:encode_file).with("jpg", output_options: "-s 320x240 -vcodec mjpeg -vframes 1 -an -f rawvideo", input_options: " -itsoffset -2")
+        expect(subject).to receive(:encode_file).with("jpg", { output_options: "-s 320x240 -vcodec mjpeg -vframes 1 -an -f rawvideo", input_options: " -itsoffset -2" })
         subject.process
       end
     end
@@ -49,26 +57,34 @@
     context "when an mkv is requested" do
       context "input options present" do
         let(:directives) { { label: :thumb, format: 'mkv', url: 'http://localhost:8983/fedora/rest/dev/1234/thumbnail', input_options: 'test_input_options' } }
-
+        let(:opts) do
+          {
+            Hydra::Derivatives::Processors::Ffmpeg::OUTPUT_OPTIONS => "-s 320x240 -vcodec ffv1 -g 30 -b:v 345k -ac 2 -ab 96k -ar 44100",
+            Hydra::Derivatives::Processors::Ffmpeg::INPUT_OPTIONS => "test_input_options"
+          }
+        end
         it "creates a fedora resource and infers the name" do
           expect(subject)
             .to receive(:encode_file)
-            .with("mkv",
-              Hydra::Derivatives::Processors::Ffmpeg::OUTPUT_OPTIONS => "-s 320x240 -vcodec ffv1 -g 30 -b:v 345k -ac 2 -ab 96k -ar 44100",
-              Hydra::Derivatives::Processors::Ffmpeg::INPUT_OPTIONS => "test_input_options")
+            .with("mkv", opts)
+
           subject.process
         end
       end
 
       context "input options not present" do
         let(:directives) { { label: :thumb, format: 'mkv', url: 'http://localhost:8983/fedora/rest/dev/1234/thumbnail' } }
-
+        let(:opts) do
+          {
+            Hydra::Derivatives::Processors::Ffmpeg::OUTPUT_OPTIONS => "-s 320x240 -vcodec ffv1 -g 30 -b:v 345k -ac 2 -ab 96k -ar 44100",
+            Hydra::Derivatives::Processors::Ffmpeg::INPUT_OPTIONS => ""
+          }
+        end
         it "creates a fedora resource and infers the name" do
           expect(subject)
             .to receive(:encode_file)
-            .with("mkv",
-              Hydra::Derivatives::Processors::Ffmpeg::OUTPUT_OPTIONS => "-s 320x240 -vcodec ffv1 -g 30 -b:v 345k -ac 2 -ab 96k -ar 44100",
-              Hydra::Derivatives::Processors::Ffmpeg::INPUT_OPTIONS => "")
+            .with("mkv", opts)
+
           subject.process
         end
       end
diff --git a/spec/services/spot/work_csv_service_spec.rb b/spec/services/spot/work_csv_service_spec.rb
index 22546fc4b..a9303a5d7 100644
--- a/spec/services/spot/work_csv_service_spec.rb
+++ b/spec/services/spot/work_csv_service_spec.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
-require 'tmpdir'
-
-RSpec.describe Spot::WorkCSVService do
+RSpec.describe Spot::WorkCsvService do
   let(:service) { described_class.new(work, terms: terms) }
   let(:work) { build(:publication, id: 'abc123', title: ['one title', 'two titles']) }
   let(:terms) { %i[id title creator] }
diff --git a/spec/services/spot/workflow/grant_sipity_role_to_advisor_spec.rb b/spec/services/spot/workflow/grant_sipity_role_to_advisor_spec.rb
index 99bfd1621..b86212c62 100644
--- a/spec/services/spot/workflow/grant_sipity_role_to_advisor_spec.rb
+++ b/spec/services/spot/workflow/grant_sipity_role_to_advisor_spec.rb
@@ -2,7 +2,7 @@
 RSpec.describe Spot::Workflow::GrantSipityRoleToAdvisor do
   let(:workflow_role) { Sipity::WorkflowRole.find_or_create_by!(role: Sipity::Role[:advising], workflow: permission_template.active_workflow) }
   let(:advisors) { [create(:user), create(:user)] }
-  let(:admin_set) { AdminSet.find(AdminSet.find_or_create_default_admin_set_id) }
+  let(:admin_set) { AdminSet.find(Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id) }
   let(:default_access_grants) do
     [{ agent_type: 'group', agent_id: ::Ability.admin_group_name, access: Hyrax::PermissionTemplateAccess::MANAGE }]
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9976ad1c0..2628b90c6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -36,6 +36,12 @@
 require 'equivalent-xml'
 require 'equivalent-xml/rspec_matchers'
 require 'mail'
+require 'view_component/test_helpers'
+
+# FactoryBot setup borrowed from Hyrax
+# @see https://github.com/samvera/hyrax/blob/hyrax-v3.6.0/spec/spec_helper.rb#L83-L88
+require 'hyrax/specs/shared_specs/factories/strategies/valkyrie_resource'
+FactoryBot.register_strategy(:valkyrie_create, ValkyrieCreateStrategy)
 
 Capybara.register_driver :selenium_firefox_headless do |app|
   browser_options = ::Selenium::WebDriver::Firefox::Options.new
@@ -112,8 +118,10 @@
   config.include FactoryBot::Syntax::Methods
   config.include StubEnv::Helpers
   config.include ControllerHelpers, type: :helper
+  config.include FeatureSpecHelpers, type: :feature
   config.include Select2Helpers, type: :feature
   config.include Mail::Matchers, type: :mailer
+  config.include ViewComponent::TestHelpers, type: :component
 
   config.use_transactional_fixtures = false
   config.render_views = true
@@ -132,24 +140,34 @@
     Hyrax.config.enable_noids = false
   end
 
-  config.before do
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.start
+  config.before do |example|
+    if example.metadata[:type] == :feature && Capybara.current_driver != :rack_test
+      DatabaseCleaner.strategy = :truncation
+    else
+      DatabaseCleaner.strategy = :transaction
+      DatabaseCleaner.start
+    end
   end
 
   config.after do
     DatabaseCleaner.clean
   end
 
+  # @see https://github.com/samvera/hyrax/blob/hyrax-v4.0.0/spec/spec_helper.rb#L121-L126
+  # @see https://github.com/samvera/hyrax/blob/hyrax-v4.0.0/spec/spec_helper.rb#L259-L265
   config.before clean: true do
-    DatabaseCleaner.clean
-    ActiveFedora::Cleaner.clean!
-  end
+    unless Hyrax.config.disable_wings
+      ActiveFedora::Cleaner.clean!
+      ActiveFedora.fedora.connection.send(:init_base_path)
+    end
 
-  config.after clean: true do
-    DatabaseCleaner.clean
+    Hyrax::SolrService.wipe! if Hyrax.config.query_index_from_valkyrie
   end
 
+  # config.after clean: true do
+  #   DatabaseCleaner.clean
+  # end
+
   config.before js: true do
     DatabaseCleaner.strategy = :truncation
   end
diff --git a/spec/support/feature_spec_helpers.rb b/spec/support/feature_spec_helpers.rb
new file mode 100644
index 000000000..ed2a1806c
--- /dev/null
+++ b/spec/support/feature_spec_helpers.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+module FeatureSpecHelpers
+  # Ensures that the provided user is able to deposit into the default admin_set
+  #
+  # @param [User] user
+  # @return [Hyrax::PermissionTemplateAccess]
+  def ensure_deposit_access_for(user)
+    default_admin_set_id = Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id
+    permission_template = Hyrax::PermissionTemplate.find_or_create_by!(source_id: default_admin_set_id)
+
+    Hyrax::PermissionTemplateAccess.find_or_create_by!(
+      permission_template: permission_template,
+      agent_type: 'user',
+      agent_id: user.email,
+      access: 'deposit'
+    )
+  end
+end
diff --git a/spec/support/shared_examples/logs_a_warning.rb b/spec/support/shared_examples/logs_a_warning.rb
deleted file mode 100644
index f076279c2..000000000
--- a/spec/support/shared_examples/logs_a_warning.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-shared_examples 'it logs a warning' do
-  before do
-    @original_logger = Rails.logger
-
-    class FakeLogger < Logger
-      attr_reader :messages
-      def initialize(*)
-        super(File::NULL)
-        @messages = []
-      end
-
-      def add(*args)
-        @messages << args
-        super(*args)
-      end
-    end
-
-    Rails.logger = logger
-  end
-
-  after do
-    Rails.logger = @original_logger
-    Object.send(:remove_const, :FakeLogger)
-  end
-
-  let(:logger) { FakeLogger.new(File::NULL) }
-
-  it do
-    # we need to call the subject, otherwise nothing will happen
-    # and +logger.messages+ will be empty
-    subject
-
-    expect(logger.messages).not_to be_empty
-    expect(logger.messages.first.first).to eq Logger::WARN
-  end
-end
diff --git a/spec/support/shared_examples/spot_presenter.rb b/spec/support/shared_examples/spot_presenter.rb
index def44d7ae..35de46d42 100644
--- a/spec/support/shared_examples/spot_presenter.rb
+++ b/spec/support/shared_examples/spot_presenter.rb
@@ -90,8 +90,8 @@
     let(:_solr_data) { {} }
 
     # `metadata_only?` calls `can?(:read, solr_document)` so the data needs to be persisted
-    before { ActiveFedora::SolrService.add(solr_data, commit: true) }
-    after { ActiveFedora::SolrService.delete(solr_data[:id]) }
+    before { Hyrax::SolrService.add(solr_data, commit: true) }
+    after { Hyrax::SolrService.delete(solr_data[:id]) }
 
     context 'when the ability is admin' do
       let(:ability) { admin_ability }
diff --git a/spec/values/blacklight/types_spec.rb b/spec/values/blacklight/types_spec.rb
deleted file mode 100644
index 420257808..000000000
--- a/spec/values/blacklight/types_spec.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-RSpec.describe Blacklight::Types do
-  describe 'Array' do
-    subject { described_class::Array.coerce(value) }
-
-    context 'when an Array' do
-      let(:value) { ['a value'] }
-
-      it { is_expected.to eq value }
-    end
-
-    context 'when another value' do
-      let(:value) { 'a value' }
-
-      it { is_expected.to eq [value] }
-    end
-  end
-
-  describe 'String' do
-    subject { described_class::String.coerce(value) }
-
-    context 'when a single value' do
-      let(:value) { 'a single value' }
-
-      it { is_expected.to eq value }
-    end
-
-    context 'when an array' do
-      let(:value) { ['one', 'two'] }
-
-      it { is_expected.to eq value.first }
-    end
-  end
-
-  describe 'Date' do
-    subject { described_class::Date.coerce(value) }
-
-    context 'when a parseable date' do
-      let(:value) { Time.now.utc.to_s }
-
-      it { is_expected.to be_a Date }
-    end
-
-    context 'when not parseable' do
-      let(:value) { 'not today' }
-
-      it { is_expected.to be true }
-    end
-  end
-end