diff --git a/src/assets/views/auth/account/account.svelte b/src/assets/views/auth/account/account.svelte
index a8d2fbf..dcb0329 100644
--- a/src/assets/views/auth/account/account.svelte
+++ b/src/assets/views/auth/account/account.svelte
@@ -1,6 +1,6 @@
 <script>
     import {locals} from "../../../ts/stores";
-    import BaseLayout from "../../layouts/BaseLayout.svelte";
+    import BaseTemplate from "../../templates/BaseTemplate.svelte";
     import Message from "../../components/Message.svelte";
     import NamePanel from "./NamePanel.svelte";
     import PasswordPanel from "./PasswordPanel.svelte";
@@ -14,7 +14,7 @@
     const emails = $locals.emails || [];
 </script>
 
-<BaseLayout title="Account" description="Manage your account settings and data.">
+<BaseTemplate title="Account" description="Manage your account settings and data.">
     <div class="container">
         <div class="panel">
             <h2><Icon name="user"/> Personal information</h2>
@@ -101,4 +101,4 @@
             {/if}
         </section>
     </div>
-</BaseLayout>
+</BaseTemplate>
diff --git a/src/assets/views/auth/auth.svelte b/src/assets/views/auth/auth.svelte
index db3f8d4..c34d380 100644
--- a/src/assets/views/auth/auth.svelte
+++ b/src/assets/views/auth/auth.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import {locals} from "../../ts/stores.js";
-    import BaseLayout from "../layouts/BaseLayout.svelte";
+    import BaseTemplate from "../templates/BaseTemplate.svelte";
     import Form from "../utils/Form.svelte";
     import Field from "../utils/Field.svelte";
     import Icon from "../utils/Icon.svelte";
@@ -18,9 +18,9 @@
     }
 </script>
 
-<BaseLayout title="Authentication / Registration"
-            description="Join {$locals.app.name} and share your files!"
-            h1="Authentication and registration">
+<BaseTemplate title="Authentication / Registration"
+              description="Join {$locals.app.name} and share your files!"
+              h1="Authentication and registration">
 
     <div class="container">
         {#if hasRoute('login')}
@@ -74,4 +74,4 @@
         </section>
         {/if}
     </div>
-</BaseLayout>
+</BaseTemplate>
diff --git a/src/assets/views/backend/accounts_approval.svelte b/src/assets/views/backend/accounts_approval.svelte
index dd9cbc2..1eff009 100644
--- a/src/assets/views/backend/accounts_approval.svelte
+++ b/src/assets/views/backend/accounts_approval.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import {locals} from "../../ts/stores";
-    import BaseLayout from "../layouts/BaseLayout.svelte";
+    import BaseTemplate from "../templates/BaseTemplate.svelte";
     import Pagination from "../components/Pagination.svelte";
     import Form from "../utils/Form.svelte";
     import Field from "../utils/Field.svelte";
@@ -16,7 +16,7 @@
     }
 </style>
 
-<BaseLayout title="{$locals.app.name} - Review accounts" h1={false}>
+<BaseTemplate title="{$locals.app.name} - Review accounts" h1={false}>
     {#if hasRoute('backend')}
     <Breadcrumb currentPageTitle="Accounts pending review" pages={[
         {link: route('backend'), title:'Backend'},
@@ -78,4 +78,4 @@
     </div>
 
     <Pagination pagination={$locals.pagination} routeName="accounts-approval" contextSize="3" />
-</BaseLayout>
+</BaseTemplate>
diff --git a/src/assets/views/backend/index.svelte b/src/assets/views/backend/index.svelte
index fba4ee8..6ad2f95 100644
--- a/src/assets/views/backend/index.svelte
+++ b/src/assets/views/backend/index.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
     import {locals} from "../../ts/stores.js";
-    import BaseLayout from "../layouts/BaseLayout.svelte";
+    import BaseTemplate from "../templates/BaseTemplate.svelte";
     import Breadcrumb from "../components/Breadcrumb.svelte";
     import Icon from "../utils/Icon.svelte";
 
     const menu = $locals.menu || [];
 </script>
 
-<BaseLayout title="{$locals.app.name} backend" h1={false}>
+<BaseTemplate title="{$locals.app.name} backend" h1={false}>
     <div class="container">
         <Breadcrumb currentPageTitle="Backend"/>
 
@@ -30,4 +30,4 @@
             </nav>
         </div>
     </div>
-</BaseLayout>
+</BaseTemplate>
diff --git a/src/assets/views/errors/400.svelte b/src/assets/views/errors/400.svelte
index 5ad9f17..26064ed 100644
--- a/src/assets/views/errors/400.svelte
+++ b/src/assets/views/errors/400.svelte
@@ -1,5 +1,5 @@
 <script>
-    import Error from "./Error.svelte";
+    import ErrorTemplate from "../templates/ErrorTemplate.svelte";
 </script>
 
-<Error code={400} message="Bad request." />
+<ErrorTemplate code={400} message="Bad request." />
diff --git a/src/assets/views/errors/401.svelte b/src/assets/views/errors/401.svelte
index a6d9d83..516d82a 100644
--- a/src/assets/views/errors/401.svelte
+++ b/src/assets/views/errors/401.svelte
@@ -1,5 +1,5 @@
 <script>
-    import Error from "./Error.svelte";
+    import ErrorTemplate from "../templates/ErrorTemplate.svelte";
 </script>
 
-<Error code={401} message="Unauthorized." />
+<ErrorTemplate code={401} message="Unauthorized." />
diff --git a/src/assets/views/errors/403.svelte b/src/assets/views/errors/403.svelte
index 98a397f..489c6b5 100644
--- a/src/assets/views/errors/403.svelte
+++ b/src/assets/views/errors/403.svelte
@@ -1,5 +1,5 @@
 <script>
-    import Error from "./Error.svelte";
+    import ErrorTemplate from "../templates/ErrorTemplate.svelte";
 </script>
 
-<Error code={403} message="Forbidden" />
+<ErrorTemplate code={403} message="Forbidden" />
diff --git a/src/assets/views/errors/404.svelte b/src/assets/views/errors/404.svelte
index 69c414d..1e526bb 100644
--- a/src/assets/views/errors/404.svelte
+++ b/src/assets/views/errors/404.svelte
@@ -1,5 +1,5 @@
 <script>
-    import Error from "./Error.svelte";
+    import ErrorTemplate from "../templates/ErrorTemplate.svelte";
 </script>
 
-<Error code={404} message="Page not found." />
+<ErrorTemplate code={404} message="Page not found." />
diff --git a/src/assets/views/errors/429.svelte b/src/assets/views/errors/429.svelte
index cd0e471..04ef391 100644
--- a/src/assets/views/errors/429.svelte
+++ b/src/assets/views/errors/429.svelte
@@ -1,5 +1,5 @@
 <script>
-    import Error from "./Error.svelte";
+    import ErrorTemplate from "../templates/ErrorTemplate.svelte";
 </script>
 
-<Error code={429} message="Too many requests." />
+<ErrorTemplate code={429} message="Too many requests." />
diff --git a/src/assets/views/errors/500.svelte b/src/assets/views/errors/500.svelte
index 4682025..ab3ccd4 100644
--- a/src/assets/views/errors/500.svelte
+++ b/src/assets/views/errors/500.svelte
@@ -1,5 +1,5 @@
 <script>
-    import Error from "./Error.svelte";
+    import ErrorTemplate from "../templates/ErrorTemplate.svelte";
 </script>
 
-<Error code={500} message="Internal server error." />
+<ErrorTemplate code={500} message="Internal server error." />
diff --git a/src/assets/views/errors/503.svelte b/src/assets/views/errors/503.svelte
index 47e7f5b..4f7ceef 100644
--- a/src/assets/views/errors/503.svelte
+++ b/src/assets/views/errors/503.svelte
@@ -1,5 +1,5 @@
 <script>
-    import Error from "./Error.svelte";
+    import ErrorTemplate from "../templates/ErrorTemplate.svelte";
 </script>
 
-<Error code={503} message="Service unavailable." />
+<ErrorTemplate code={503} message="Service unavailable." />
diff --git a/src/assets/views/home.svelte b/src/assets/views/home.svelte
index b03826a..ac6c4c3 100644
--- a/src/assets/views/home.svelte
+++ b/src/assets/views/home.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
     import {locals} from "../ts/stores";
     import {route, hasRoute, hasAnyRoute} from "../../common/Routing";
-    import BaseLayout from "./layouts/BaseLayout.svelte";
+    import BaseTemplate from "./templates/BaseTemplate.svelte";
 </script>
 
-<BaseLayout title="{$locals.app.name}" h1={false}>
+<BaseTemplate title="{$locals.app.name}" h1={false}>
     <div class="panel">
         <h1>swaf - Svelte Web Application Framework</h1>
         <p>Welcome to {$locals.app.name}!</p>
@@ -22,4 +22,4 @@
         </nav>
         {/if}
     </div>
-</BaseLayout>
+</BaseTemplate>
diff --git a/src/assets/views/magic_link.svelte b/src/assets/views/magic_link.svelte
index d764927..fc3346b 100644
--- a/src/assets/views/magic_link.svelte
+++ b/src/assets/views/magic_link.svelte
@@ -1,13 +1,13 @@
 <script>
     import {locals} from "../ts/stores";
-    import BaseLayout from "./layouts/BaseLayout.svelte";
+    import BaseTemplate from "./templates/BaseTemplate.svelte";
     import Message from "./components/Message.svelte";
 
     const actionType = $locals.magicLink?.action_type;
     const h1 = 'Magic Link' + (actionType ? (' - ' + actionType) : '');
 </script>
 
-<BaseLayout title="{$locals.app.name} {h1}" {h1}>
+<BaseTemplate title="{$locals.app.name} {h1}" {h1}>
     <div class="container">
         <div class="panel">
             {#if $locals.err}
@@ -18,4 +18,4 @@
             {/if}
         </div>
     </div>
-</BaseLayout>
+</BaseTemplate>
diff --git a/src/assets/views/magic_link_lobby.svelte b/src/assets/views/magic_link_lobby.svelte
index b82e291..21b8eb9 100644
--- a/src/assets/views/magic_link_lobby.svelte
+++ b/src/assets/views/magic_link_lobby.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import {locals} from "../ts/stores.js";
-    import BaseLayout from "./layouts/BaseLayout.svelte";
+    import BaseTemplate from "./templates/BaseTemplate.svelte";
     import Message from "./components/Message.svelte";
     import WebsocketClient from "../ts/WebsocketClient.js";
     import {Time} from "../../common/Time.js";
@@ -37,7 +37,7 @@
     });
 </script>
 
-<BaseLayout h1="Authentication lobby" title="{$locals.app.name} authentication lobby">
+<BaseTemplate h1="Authentication lobby" title="{$locals.app.name} authentication lobby">
     <div class="container">
         <div class="panel">
             <Message type="success" sticky
@@ -48,4 +48,4 @@
             <p class="center">Waiting for you to open the link...</p>
         </div>
     </div>
-</BaseLayout>
+</BaseTemplate>
diff --git a/src/assets/views/layouts/BaseLayout.svelte b/src/assets/views/templates/BaseTemplate.svelte
similarity index 100%
rename from src/assets/views/layouts/BaseLayout.svelte
rename to src/assets/views/templates/BaseTemplate.svelte
diff --git a/src/assets/views/errors/Error.svelte b/src/assets/views/templates/ErrorTemplate.svelte
similarity index 100%
rename from src/assets/views/errors/Error.svelte
rename to src/assets/views/templates/ErrorTemplate.svelte
diff --git a/src/assets/views/layouts/base/BaseFooter.svelte b/src/assets/views/templates/base/BaseFooter.svelte
similarity index 100%
rename from src/assets/views/layouts/base/BaseFooter.svelte
rename to src/assets/views/templates/base/BaseFooter.svelte
diff --git a/src/assets/views/layouts/base/BaseHeader.svelte b/src/assets/views/templates/base/BaseHeader.svelte
similarity index 100%
rename from src/assets/views/layouts/base/BaseHeader.svelte
rename to src/assets/views/templates/base/BaseHeader.svelte
diff --git a/src/assets/views/layouts/base/BaseHeaderLogo.svelte b/src/assets/views/templates/base/BaseHeaderLogo.svelte
similarity index 100%
rename from src/assets/views/layouts/base/BaseHeaderLogo.svelte
rename to src/assets/views/templates/base/BaseHeaderLogo.svelte
diff --git a/src/assets/views/layouts/base/BaseNavMenuAuth.svelte b/src/assets/views/templates/base/BaseNavMenuAuth.svelte
similarity index 100%
rename from src/assets/views/layouts/base/BaseNavMenuAuth.svelte
rename to src/assets/views/templates/base/BaseNavMenuAuth.svelte
diff --git a/src/assets/views/layouts/base/BaseNavMenuLinks.svelte b/src/assets/views/templates/base/BaseNavMenuLinks.svelte
similarity index 100%
rename from src/assets/views/layouts/base/BaseNavMenuLinks.svelte
rename to src/assets/views/templates/base/BaseNavMenuLinks.svelte
diff --git a/src/assets/views/layouts/svelte_layout.html b/src/assets/views/templates/svelte_template.html
similarity index 100%
rename from src/assets/views/layouts/svelte_layout.html
rename to src/assets/views/templates/svelte_template.html
diff --git a/src/frontend/SvelteViewEngine.ts b/src/frontend/SvelteViewEngine.ts
index 58bda91..e267b90 100644
--- a/src/frontend/SvelteViewEngine.ts
+++ b/src/frontend/SvelteViewEngine.ts
@@ -64,7 +64,7 @@ export default class SvelteViewEngine extends ViewEngine {
         const view = await this.fileCache.get(actualFile, !config.get<boolean>('view.cache'));
 
         // Root template
-        const templateFile = await this.resolveFileFromCanonicalNameOrFail('layouts/svelte_layout.html');
+        const templateFile = await this.resolveFileFromCanonicalNameOrFail('templates/svelte_template.html');
         const rawOutput = await this.fileCache.get(templateFile, !config.get<boolean>('view.cache'));
 
         // Pre-compiled parts
diff --git a/test/assets/views/design.svelte b/test/assets/views/design.svelte
index 7986e35..f672b3a 100644
--- a/test/assets/views/design.svelte
+++ b/test/assets/views/design.svelte
@@ -1,6 +1,6 @@
 <script>
     import {route} from "../../common/Routing";
-    import BaseLayout from "./layouts/BaseLayout.svelte";
+    import BaseTemplate from "./templates/BaseTemplate.svelte";
     import Message from "./components/Message.svelte";
     import Form from "./utils/Form.svelte";
     import Field from "./utils/Field.svelte";
@@ -13,7 +13,7 @@
     const paginationData = new PaginationData(20, 20, 1000).serialize();
 </script>
 
-<BaseLayout title="Design test">
+<BaseTemplate title="Design test">
     <DesignButtons/>
 
     <div class="panel">
@@ -114,6 +114,6 @@
             {link: route('design'), title: 'self'},
         ]}/>
     </div>
-</BaseLayout>
+</BaseTemplate>
 
 
diff --git a/test/assets/views/tests.svelte b/test/assets/views/tests.svelte
index a2821f4..705f159 100644
--- a/test/assets/views/tests.svelte
+++ b/test/assets/views/tests.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import AllTests from "./AllTests.svelte";
-    import BaseLayout from "./layouts/BaseLayout.svelte";
+    import BaseLayout from "./templates/BaseTemplate.svelte";
 </script>
 
 <BaseLayout title="Frontend tests">