diff --git a/scripts/theme_excluded_configs.txt b/scripts/theme_excluded_configs.txt
index e441819310..af3c0389b2 100644
--- a/scripts/theme_excluded_configs.txt
+++ b/scripts/theme_excluded_configs.txt
@@ -89,8 +89,6 @@ core.entity_view_mode.webform.token
 core.entity_view_mode.webform_submission.token
 core.extension
 core.menu.static_menu_link_overrides
-crop.settings
-crop.type.focal_point
 dblog.settings
 editor.editor.webform*
 encrypt.settings
@@ -112,7 +110,6 @@ filter.format.plain_text*
 filter.format.restricted_html*
 filter.format.webform_default
 filter.settings
-focal_point.settings
 hal.settings
 honeypot.settings
 image.settings
diff --git a/web/themes/contrib/civictheme/civictheme.info.yml b/web/themes/contrib/civictheme/civictheme.info.yml
index d5ed6eeaaa..f19a819cf6 100644
--- a/web/themes/contrib/civictheme/civictheme.info.yml
+++ b/web/themes/contrib/civictheme/civictheme.info.yml
@@ -645,6 +645,9 @@ config_devel:
     - block.block.civictheme_secondary_navigation
     - block.block.civictheme_side_navigation
     - block.block.civictheme_signup
+    - crop.settings
+    - crop.type.focal_point
+    - focal_point.settings
     - linkit.linkit_profile.civictheme
     - media.settings
     - search_api.index.civictheme_content
diff --git a/web/themes/contrib/civictheme/config/optional/block.block.civictheme_footer_menu_1.yml b/web/themes/contrib/civictheme/config/optional/block.block.civictheme_footer_menu_1.yml
index 5b0b1c6d0d..4ef1cfe6de 100644
--- a/web/themes/contrib/civictheme/config/optional/block.block.civictheme_footer_menu_1.yml
+++ b/web/themes/contrib/civictheme/config/optional/block.block.civictheme_footer_menu_1.yml
@@ -20,11 +20,13 @@ settings:
   provider: menu_block
   follow: false
   follow_parent: child
-  label_link: false
-  label_type: fixed
   level: 1
   depth: 1
   expand_all_items: false
   parent: 'civictheme-footer:menu_link_content:8a251c00-43a4-42c4-b140-3f6b62bdc000'
+  render_parent: false
   suggestion: civictheme_footer
+  label_type: fixed
+  label_link: false
+  hide_on_nonactive: false
 visibility: {  }
diff --git a/web/themes/contrib/civictheme/config/optional/block.block.civictheme_footer_menu_2.yml b/web/themes/contrib/civictheme/config/optional/block.block.civictheme_footer_menu_2.yml
index 7f98dba692..f36567bcf8 100644
--- a/web/themes/contrib/civictheme/config/optional/block.block.civictheme_footer_menu_2.yml
+++ b/web/themes/contrib/civictheme/config/optional/block.block.civictheme_footer_menu_2.yml
@@ -20,11 +20,13 @@ settings:
   provider: menu_block
   follow: false
   follow_parent: child
-  label_link: false
-  label_type: fixed
   level: 1
   depth: 1
   expand_all_items: false
   parent: 'civictheme-footer:menu_link_content:8973fd39-dcfd-4607-a356-f9869a231804'
+  render_parent: false
   suggestion: civictheme_footer
+  label_type: fixed
+  label_link: false
+  hide_on_nonactive: false
 visibility: {  }
diff --git a/web/themes/contrib/civictheme/config/optional/block.block.civictheme_footer_menu_3.yml b/web/themes/contrib/civictheme/config/optional/block.block.civictheme_footer_menu_3.yml
index 08ef209793..e121656760 100644
--- a/web/themes/contrib/civictheme/config/optional/block.block.civictheme_footer_menu_3.yml
+++ b/web/themes/contrib/civictheme/config/optional/block.block.civictheme_footer_menu_3.yml
@@ -20,11 +20,13 @@ settings:
   provider: menu_block
   follow: false
   follow_parent: child
-  label_link: false
-  label_type: fixed
   level: 1
   depth: 1
   expand_all_items: false
   parent: 'civictheme-footer:menu_link_content:49fb8cd6-a1cd-4a47-9b9a-db4685a5f9cd'
+  render_parent: false
   suggestion: civictheme_footer
+  label_type: fixed
+  label_link: false
+  hide_on_nonactive: false
 visibility: {  }
diff --git a/web/themes/contrib/civictheme/config/optional/block.block.civictheme_footer_menu_4.yml b/web/themes/contrib/civictheme/config/optional/block.block.civictheme_footer_menu_4.yml
index d519ea1433..02a449382b 100644
--- a/web/themes/contrib/civictheme/config/optional/block.block.civictheme_footer_menu_4.yml
+++ b/web/themes/contrib/civictheme/config/optional/block.block.civictheme_footer_menu_4.yml
@@ -20,11 +20,13 @@ settings:
   provider: menu_block
   follow: false
   follow_parent: child
-  label_link: false
-  label_type: fixed
   level: 1
   depth: 1
   expand_all_items: false
   parent: 'civictheme-footer:menu_link_content:35be8705-b50e-4506-9a61-568ef0986318'
+  render_parent: false
   suggestion: civictheme_footer
+  label_type: fixed
+  label_link: false
+  hide_on_nonactive: false
 visibility: {  }
diff --git a/web/themes/contrib/civictheme/config/optional/block.block.civictheme_primary_navigation.yml b/web/themes/contrib/civictheme/config/optional/block.block.civictheme_primary_navigation.yml
index 09119cad3f..2f3594fa60 100644
--- a/web/themes/contrib/civictheme/config/optional/block.block.civictheme_primary_navigation.yml
+++ b/web/themes/contrib/civictheme/config/optional/block.block.civictheme_primary_navigation.yml
@@ -20,11 +20,13 @@ settings:
   provider: menu_block
   follow: false
   follow_parent: child
-  label_link: false
-  label_type: block
   level: 1
   depth: 3
   expand_all_items: false
   parent: 'civictheme-primary-navigation:'
+  render_parent: false
   suggestion: civictheme_primary_navigation
+  label_type: block
+  label_link: false
+  hide_on_nonactive: false
 visibility: {  }
diff --git a/web/themes/contrib/civictheme/config/optional/block.block.civictheme_secondary_navigation.yml b/web/themes/contrib/civictheme/config/optional/block.block.civictheme_secondary_navigation.yml
index 9f38387520..19a2c13a60 100644
--- a/web/themes/contrib/civictheme/config/optional/block.block.civictheme_secondary_navigation.yml
+++ b/web/themes/contrib/civictheme/config/optional/block.block.civictheme_secondary_navigation.yml
@@ -20,11 +20,13 @@ settings:
   provider: menu_block
   follow: false
   follow_parent: child
-  label_link: false
-  label_type: block
   level: 1
   depth: 0
   expand_all_items: false
   parent: 'civictheme-secondary-navigation:'
+  render_parent: false
   suggestion: civictheme_secondary_navigation
+  label_type: block
+  label_link: false
+  hide_on_nonactive: false
 visibility: {  }
diff --git a/web/themes/contrib/civictheme/config/optional/block.block.civictheme_side_navigation.yml b/web/themes/contrib/civictheme/config/optional/block.block.civictheme_side_navigation.yml
index fb16a3d2e8..8d78f58cec 100644
--- a/web/themes/contrib/civictheme/config/optional/block.block.civictheme_side_navigation.yml
+++ b/web/themes/contrib/civictheme/config/optional/block.block.civictheme_side_navigation.yml
@@ -21,13 +21,15 @@ settings:
   provider: menu_block
   follow: false
   follow_parent: child
-  label_link: false
-  label_type: block
   level: 1
   depth: 3
   expand_all_items: false
   parent: 'civictheme-primary-navigation:'
+  render_parent: false
   suggestion: civictheme_primary_navigation
+  label_type: block
+  label_link: false
+  hide_on_nonactive: false
 visibility:
   request_path:
     id: request_path
diff --git a/web/themes/contrib/civictheme/config/optional/crop.settings.yml b/web/themes/contrib/civictheme/config/optional/crop.settings.yml
new file mode 100644
index 0000000000..3e0d6450c6
--- /dev/null
+++ b/web/themes/contrib/civictheme/config/optional/crop.settings.yml
@@ -0,0 +1 @@
+flush_derivative_images: true
diff --git a/web/themes/contrib/civictheme/config/optional/crop.type.focal_point.yml b/web/themes/contrib/civictheme/config/optional/crop.type.focal_point.yml
new file mode 100644
index 0000000000..208d049310
--- /dev/null
+++ b/web/themes/contrib/civictheme/config/optional/crop.type.focal_point.yml
@@ -0,0 +1,11 @@
+langcode: en
+status: true
+dependencies: {  }
+id: focal_point
+label: 'Focal point'
+description: 'Crop type used by Focal point module.'
+aspect_ratio: ''
+soft_limit_width: null
+soft_limit_height: null
+hard_limit_width: null
+hard_limit_height: null
diff --git a/web/themes/contrib/civictheme/config/optional/focal_point.settings.yml b/web/themes/contrib/civictheme/config/optional/focal_point.settings.yml
new file mode 100644
index 0000000000..d794c54fb2
--- /dev/null
+++ b/web/themes/contrib/civictheme/config/optional/focal_point.settings.yml
@@ -0,0 +1,2 @@
+crop_type: focal_point
+default_value: '50,50'