diff --git a/module/VuFind/src/VuFind/Theme.php b/module/VuFind/src/VuFind/Theme.php
index b2486b819fa1d126797c21efd4dacb657da80424..1369cc30aefb4276e274012c8aba9abd8dcb96e0 100644
--- a/module/VuFind/src/VuFind/Theme.php
+++ b/module/VuFind/src/VuFind/Theme.php
@@ -390,9 +390,8 @@ class Theme
                 );
             }
 
-            // Add template and layout paths:
+            // Add template path:
             $templatePathStack[] = $this->baseDir . "/$key/templates";
-            $templatePathStack[] = $this->baseDir . "/$key/layouts";
 
             // Add CSS and JS dependencies:
             if ($css = $currentThemeInfo->get('css')) {
diff --git a/themes/vufind/blueprint/layouts/layout.phtml b/themes/vufind/blueprint/templates/layout/layout.phtml
similarity index 100%
rename from themes/vufind/blueprint/layouts/layout.phtml
rename to themes/vufind/blueprint/templates/layout/layout.phtml
diff --git a/themes/vufind/blueprint/layouts/lightbox.phtml b/themes/vufind/blueprint/templates/layout/lightbox.phtml
similarity index 100%
rename from themes/vufind/blueprint/layouts/lightbox.phtml
rename to themes/vufind/blueprint/templates/layout/lightbox.phtml
diff --git a/themes/vufind/jquerymobile/layouts/layout.phtml b/themes/vufind/jquerymobile/templates/layout/layout.phtml
similarity index 100%
rename from themes/vufind/jquerymobile/layouts/layout.phtml
rename to themes/vufind/jquerymobile/templates/layout/layout.phtml
diff --git a/themes/vufind/root/layouts/help.phtml b/themes/vufind/root/templates/layout/help.phtml
similarity index 100%
rename from themes/vufind/root/layouts/help.phtml
rename to themes/vufind/root/templates/layout/help.phtml