diff --git a/theme-old/templates/configuration.html.twig b/theme-old/templates/configuration.html.twig
index fe854c16..0eacb9a9 100644
--- a/theme-old/templates/configuration.html.twig
+++ b/theme-old/templates/configuration.html.twig
@@ -7,7 +7,7 @@
         </h1>
 
         {% include 'partials/messages.html.twig' %}
-        {% include 'partials/blueprints.html.twig' with { blueprints: admin.blueprints('system'), data: admin.data('system') } %}
+        {% include 'partials/blueprints.html.twig' with { blueprints: admin.blueprints('config/system'), data: admin.data('system') } %}
     </div>
 {% endblock %}
 
diff --git a/theme-old/templates/pages.html.twig b/theme-old/templates/pages.html.twig
index 9509ee1f..49052cf4 100644
--- a/theme-old/templates/pages.html.twig
+++ b/theme-old/templates/pages.html.twig
@@ -133,7 +133,7 @@
         </h1>
 
         {% include 'partials/messages.html.twig' %}
-        {% include 'partials/blueprints-new.html.twig' with { blueprints: admin.blueprints('page'), data: context } %}
+        {% include 'partials/blueprints-new.html.twig' with { blueprints: admin.blueprints('pages/page'), data: context } %}
     {% elseif context %}
         <h1>
 
@@ -144,7 +144,7 @@
         {% if not uri.param('expert') %}
         {% include 'partials/blueprints.html.twig' with { blueprints: context.blueprints, data: context } %}
         {% else %}
-        {% include 'partials/blueprints-raw.html.twig' with { blueprints: admin.blueprints('page'), data: context } %}
+        {% include 'partials/blueprints-raw.html.twig' with { blueprints: admin.blueprints('pages/page'), data: context } %}
         {% endif %}
     {% else %}
         <h1>Pages</h1>
diff --git a/theme-old/templates/settings.html.twig b/theme-old/templates/settings.html.twig
index f6e516f7..87630295 100644
--- a/theme-old/templates/settings.html.twig
+++ b/theme-old/templates/settings.html.twig
@@ -13,7 +13,7 @@
         </h1>
 
         {% include 'partials/messages.html.twig' %}
-        {% include 'partials/blueprints.html.twig' with { blueprints: admin.blueprints('site'), data: admin.data('site') } %}
+        {% include 'partials/blueprints.html.twig' with { blueprints: admin.blueprints('config/site'), data: admin.data('site') } %}
     </div>
 {% endblock %}
 
diff --git a/themes/grav/templates/configuration.html.twig b/themes/grav/templates/configuration.html.twig
index 71c53e7d..293ec7cd 100644
--- a/themes/grav/templates/configuration.html.twig
+++ b/themes/grav/templates/configuration.html.twig
@@ -15,6 +15,6 @@
 {% endblock %}
 
 {% block content %}
-    {% include 'partials/blueprints.html.twig' with { blueprints: admin.blueprints('system'), data: admin.data('system') } %}
+    {% include 'partials/blueprints.html.twig' with { blueprints: admin.blueprints('config/system'), data: admin.data('system') } %}
 {% endblock %}
 
diff --git a/themes/grav/templates/settings.html.twig b/themes/grav/templates/settings.html.twig
index 0fc7e3e2..7603c422 100644
--- a/themes/grav/templates/settings.html.twig
+++ b/themes/grav/templates/settings.html.twig
@@ -20,6 +20,6 @@
 {% endblock %}
 
 {% block content %}
-    {% include 'partials/blueprints.html.twig' with { blueprints: admin.blueprints('site'), data: admin.data('site') } %}
+    {% include 'partials/blueprints.html.twig' with { blueprints: admin.blueprints('config/site'), data: admin.data('site') } %}
 {% endblock %}