diff --git a/config/sync/paragraphs.paragraphs_type.stanford_faq.yml b/config/sync/paragraphs.paragraphs_type.stanford_faq.yml
index 5d77c208e..a0ae5d754 100644
--- a/config/sync/paragraphs.paragraphs_type.stanford_faq.yml
+++ b/config/sync/paragraphs.paragraphs_type.stanford_faq.yml
@@ -5,13 +5,13 @@ dependencies:
   content:
     - 'file:file:f217e716-8074-4122-bd5c-7b0f05aef5a9'
   module:
-    - layout_paragraphs
+    - jumpstart_ui
 id: stanford_faq
 label: 'FAQ - Accordion List'
 icon_uuid: f217e716-8074-4122-bd5c-7b0f05aef5a9
-icon_default: 'data:image/png;base64,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'
+icon_default: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAQAAAAHUWYVAAAEyklEQVR42u3cz29UVQDF8dOKhZQqkBATFkRwYaIJVGPYGSVVpIRYmsDOYGI0Gt25dkNYGne0OmJM+AeMK41dINGFccGGqEFjgrhgIWg0BpNSbJ8L7txgddr32vvmnjv9fu5i6Myb23ffmR8w8zgSAAAAAAAAAAAAgI1rqNHW+/SKDmm3xnLvdiEWdFWfq6NLbUw+one1qIrReCypoy11D3PdZ8iI5nSwHw+qAfWFJjVfZ8N7ak44oxO511S0PdqpT9JNtz++WF3WMd2Xe3XF2KrndTm+cI2nm/hMjGNb7jUWZ1uMZDbdpN0pj+VeXZGm4sM5mZthSl6s1mIsHL1ab+r1/pZVNdoayzU4fsO59xX/RiBmCMQMgZghEDMEYoZAzBCIGQLpbUgvaqbGlw5Dekmzeqqfu9b9qmVjeVmVKv2tZ1bZ7i1VqnRbj/TcIvnx25iBfBBW/ZseWmGrqXh0TvbchkCSOBzX/W3Pj1Uf1Z9hm9+1q+dMBJLIqbjyj//33XaHfgy3L+q5FeYhkESG9VFc+6n/3LpJc/HWN1ech0CSGdOluPrjy257J95ybpUP1vseyHH9mv1km0qVbmg6eSR749puav9d15+Mv/XrVU/y6XsgHnFUqnQ9eSDSQd0Os/+kneG6A5oP111b4c08WyA3sgfRHb+0EIj0epz/gu6VtEvXws/zOpDg+CUPZFrXs0dxJ46pVgKROvF3nNFmfRV/eiHJ8UseyOAb0ZfxKFyMf3q75r0JpAUP6Odlz8dPa5/3SSCteEx/3RXH99pe+54E0pIT8Uj8oYcb3I9AWnNalSotarLRvQikNcN6Q+d0uOG9Ghw/zlzsB85cLBeBmCEQMwRihkDMEIgZAjFDIGYIxEy9QBbC5dbcu1ukbjPMrTob1wvkaricyL22Ij0bLq+km/K98OEYxQHN7dAP8cvfZMa1FCOZopyptjFNxziWtC/l1B1VjHWNmXoHuu4H6lv0mZ7u8+NrkFzQkZRv6tK8JvU+X1GtSaXZunE0/cppXK9qQnu1OfcaC3FLV3ReZ/VN7h0BAGwEzd7UH9drmtCDGsm924Votbd3VB9m/8dVmaOV3t5RzenJvjyqBlPy3t4OBZjrkri394n49PtORzWae3XFaK2392yM4/7cayxOK7293f8efzT36orUQm/vQpiSF6u1oLfXDme/l4tAzBCIGQIxQyBmCMQMgZghEDME0hu9vWbo7TVDb68Zenvt0Ntrht5eO/T2rmvQ2xt4xFGJ3t6A3l6zQOjtNQtk8NHba4feXjv09tqht9cOvb1m6O0dCJy5WC4CMUMgZgjEDIGYIRAzBGKGQMwQiBl6e9tHb68Zenut0NtrhN5e40FvrxV6e43Q22uD3l4AQB/R29smenstB729hujtNUNvrwV6ew3R22uH3l4z9Pba4ez3chGIGQIxQyBmCMQMgZghEDMEYoZAeqO31wy9vWbo7TVDb68denvN0Ntrh97edQ16ewOPOCrR2xvQ22sWCL29ZoEMPnp77dDba4feXjv09tqht9cMvb0DgTMXy0UgZgjEDIGYIRAzBGKGQMwQiBkCMUNvb/vo7TVDb68VenuN0NtrPOjttUJvrxF6e23Q2wsAAAAAAAAAAACgkX8AwDAVYMrdKpUAAAAASUVORK5CYII='
 description: ''
 behavior_plugins:
-  layout_paragraphs:
-    enabled: false
-    available_layouts: {  }
+  faq_accordions:
+    enabled: true
+    heading: h2
diff --git a/src/EventSubscriber/EventSubscriber.php b/src/EventSubscriber/EventSubscriber.php
index f32107f2a..5041ad813 100644
--- a/src/EventSubscriber/EventSubscriber.php
+++ b/src/EventSubscriber/EventSubscriber.php
@@ -113,7 +113,8 @@ public static function onEntityPreSave(EntityPresaveEvent $event) {
     if (
       PHP_SAPI != 'cli' &&
       $entity->getEntityTypeId() == 'config_pages' &&
-      $entity->bundle() == 'stanford_basic_site_settings'
+      $entity->bundle() == 'stanford_basic_site_settings' &&
+      self::redirectUser()
     ) {
       $renewal_date = time() + 60 * 60 * 24 * 365;
       $entity->set('su_site_renewal_due', date(DateTimeItemInterface::DATETIME_STORAGE_FORMAT, $renewal_date));
@@ -136,9 +137,11 @@ public function onKernelRequest(RequestEvent $event) {
       !str_starts_with($current_uri, '/admin/config/system/basic-site-settings') &&
       self::redirectUser()
     ) {
-      $config_page_url = Url::fromRoute('config_pages.stanford_basic_site_settings', [], ['query' => ['destination' => $current_uri]]);
+      $config_page_url = Url::fromRoute('config_pages.stanford_basic_site_settings', [], ['query' => ['destination' => $current_uri]])
+        ->toString(TRUE)
+        ->getGeneratedUrl();
       $this->messenger->addWarning('Please update or verify the site contact information on the "Site Contacts" tab.');
-      $event->setResponse(new RedirectResponse($config_page_url->toString(TRUE)->getGeneratedUrl() . '#contact'));
+      $event->setResponse(new RedirectResponse($config_page_url . '#contact'));
     }
   }
 
@@ -173,8 +176,8 @@ protected static function redirectUser() {
     $site_manager = $current_user->hasPermission('edit stanford_basic_site_settings config page entity') && !in_array('administrator', $current_user->getRoles());
 
     // If the renewal date has passed, they should be redirected.
-    $needs_renewal = !getenv('CI') && $site_manager && (strtotime($renewal_date) - time() < 60 * 60 * 24 * 7);
-    $cache->set('su_renew_site:' . $current_user->id(), $needs_renewal, Cache::PERMANENT, ['site-renew-date']);
+    $needs_renewal = !getenv('CI') && $site_manager && strtotime($renewal_date) < time();
+    $cache->set('su_renew_site:' . $current_user->id(), $needs_renewal, strtotime($renewal_date), ['site-renew-date']);
 
     return $needs_renewal;
   }