+ {/if}
-
\ No newline at end of file
+
+{/include}
\ No newline at end of file
diff --git a/src/main/resources/templates/AuthResource/authenticated.html b/src/main/resources/templates/AuthResource/authenticated.html
index 38e56bf..794f3a6 100644
--- a/src/main/resources/templates/AuthResource/authenticated.html
+++ b/src/main/resources/templates/AuthResource/authenticated.html
@@ -1,2 +1,6 @@
-
+{/include}
\ No newline at end of file
diff --git a/src/main/resources/templates/AuthResource/register.html b/src/main/resources/templates/AuthResource/register.html
index 8a371c2..61e2c91 100644
--- a/src/main/resources/templates/AuthResource/register.html
+++ b/src/main/resources/templates/AuthResource/register.html
@@ -1,13 +1,17 @@
-
+ {/if}
-
\ No newline at end of file
+
+{/include}
\ No newline at end of file
diff --git a/src/main/resources/templates/EditResource/create.html b/src/main/resources/templates/EditResource/create.html
index 92cd5ae..6ba7d47 100644
--- a/src/main/resources/templates/EditResource/create.html
+++ b/src/main/resources/templates/EditResource/create.html
@@ -1,17 +1,19 @@
-
Creating a page
+{#include layout}
+ {#pageTitle}Create a page{/pageTitle}
-
Editing as {user:name}
+
Editing as {user:name}
-
+
-{#if http:param("error") != null}
-
Error: {http:param("error")}
-{/if}
\ No newline at end of file
+ {#if http:param("error") != null}
+
Error: {http:param("error")}
+ {/if}
+{/include}
\ No newline at end of file
diff --git a/src/main/resources/templates/EditResource/edit.html b/src/main/resources/templates/EditResource/edit.html
index 90ff250..268e02d 100644
--- a/src/main/resources/templates/EditResource/edit.html
+++ b/src/main/resources/templates/EditResource/edit.html
@@ -1,14 +1,16 @@
-
+{/include}
\ No newline at end of file
diff --git a/src/main/resources/templates/HistoryResource/notFound.html b/src/main/resources/templates/HistoryResource/notFound.html
index d0e1f52..84d8460 100644
--- a/src/main/resources/templates/HistoryResource/notFound.html
+++ b/src/main/resources/templates/HistoryResource/notFound.html
@@ -1,8 +1,10 @@
-
{title}
+{#include layout}
+ {#pageTitle}{title}{/pageTitle}
-Page titled "{title}" doesn't exist. There's no history to show.
+ Page titled "{title}" doesn't exist. There's no history to show.
-
+ {/if}
+
-Running TalkPages version {config:["quarkus.application.version"]}
\ No newline at end of file
+ Running TalkPages version {config:["quarkus.application.version"]}
+{/include}
\ No newline at end of file
diff --git a/src/main/resources/templates/PageResource/notFound.html b/src/main/resources/templates/PageResource/notFound.html
index 2751302..c8d5761 100644
--- a/src/main/resources/templates/PageResource/notFound.html
+++ b/src/main/resources/templates/PageResource/notFound.html
@@ -1,18 +1,20 @@
-
- You are viewing an outdated revision #{revision.getIndex} of this page from {revision.getTimestamp.toString()}, authored by {revision.getAuthor.getName}.
-
- See current version
-
-{#else}
-
This is the current revision #{revision.index} authored by {revision.author.name}.
+ You are viewing an outdated revision #{revision.getIndex} of this page from {revision.getTimestamp.toString()}, authored by {revision.getAuthor.getName}.
+
+ See current version
+
+ {#else}
+
This is the current revision #{revision.index} authored by {revision.author.name}.
-Modified {revision.timestamp.toString()} | Full history | Edit
- {#if !page.title.startsWith("Talk:")} | Talk{/if}
\ No newline at end of file
+ Modified {revision.timestamp.toString()} | Full history | Edit
+ {#if !page.title.startsWith("Talk:")} | Talk{/if}
+{/include}
\ No newline at end of file
diff --git a/src/main/resources/templates/PageResource/revisionNotFound.html b/src/main/resources/templates/PageResource/revisionNotFound.html
index 9069e2b..7e16407 100644
--- a/src/main/resources/templates/PageResource/revisionNotFound.html
+++ b/src/main/resources/templates/PageResource/revisionNotFound.html
@@ -1,7 +1,9 @@
-
{page.getTitle}
+{#include layout}
+ {#pageTitle}{page.getTitle}{/pageTitle}
-There is no revision #{revisionId}.
-