diff --git a/web/themes/contrib/civictheme/civictheme.info.yml b/web/themes/contrib/civictheme/civictheme.info.yml
index f5cb843b8..393a6cd33 100644
--- a/web/themes/contrib/civictheme/civictheme.info.yml
+++ b/web/themes/contrib/civictheme/civictheme.info.yml
@@ -68,29 +68,6 @@ regions:
 features:
   - favicon
 
-components:
-  namespaces:
-    base:
-      - components/00-base
-    atoms:
-      - components/01-atoms
-    molecules:
-      - components/02-molecules
-    organisms:
-      - components/03-organisms
-    templates:
-      - components/04-templates
-    ct-base:
-      - components/00-base
-    ct-atoms:
-      - components/01-atoms
-    ct-molecules:
-      - components/02-molecules
-    ct-organisms:
-      - components/03-organisms
-    ct-templates:
-      - components/04-templates
-
 ckeditor5-stylesheets:
   - dist/civictheme.editor.css
   - dist/civictheme.variables.css
diff --git a/web/themes/contrib/civictheme/civictheme_starter_kit/civictheme_starter_kit.info.yml b/web/themes/contrib/civictheme/civictheme_starter_kit/civictheme_starter_kit.info.yml
index 4e3dbd798..8e7e41a30 100644
--- a/web/themes/contrib/civictheme/civictheme_starter_kit/civictheme_starter_kit.info.yml
+++ b/web/themes/contrib/civictheme/civictheme_starter_kit/civictheme_starter_kit.info.yml
@@ -61,16 +61,3 @@ ckeditor5-stylesheets:
   # below is resolved.
   # @see https://www.drupal.org/project/drupal/issues/3406959
   # - /sites/default/files/css-variables.civictheme_starter_kit.css
-
-components:
-  namespaces:
-    base:
-      - components/00-base
-    atoms:
-      - components/01-atoms
-    molecules:
-      - components/02-molecules
-    organisms:
-      - components/03-organisms
-    templates:
-      - components/04-templates
diff --git a/web/themes/contrib/civictheme/templates/layout/page.html.twig b/web/themes/contrib/civictheme/templates/layout/page.html.twig
index bba131a2b..637662305 100644
--- a/web/themes/contrib/civictheme/templates/layout/page.html.twig
+++ b/web/themes/contrib/civictheme/templates/layout/page.html.twig
@@ -9,7 +9,7 @@
 # variables without the need to change this template.
 #}
 
-{% include '@templates/page/page.twig' %}
+{% include 'civictheme:page' %}
 
 {# Hidden region #}
 {% block hidden_block %}