diff --git a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/index-page.html.ftl b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/index-page.html.ftl
index f66d6bc54..ce20c84f9 100644
--- a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/index-page.html.ftl
+++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/index-page.html.ftl
@@ -1,22 +1,14 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <link href="${themeUrl}/styles/librecms.css" rel="stylesheet" />
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <title>Default Template</title>
-    </head>
-    <body>
-        <div class="container">
-            <h1>Index page</h1>
-            <p>This theme works.</p>
-            <dl>
-                <dt>application</dt>
-                <dd>${application}</dd>
-                <dt>themeUrl</dt>
-                <dd>${themeUrl}</dd>
-                <dt>view</dt>
-                <dd>${view!""}</dd>
-            </dl>
-        </div>
-    </body>
-</html>
\ No newline at end of file
+<#import "./main.html.ftl" as main>
+
+<@main.librecms>
+    <h1>Index page</h1>
+    <p>This theme works.</p>
+    <dl>
+        <dt>application</dt>
+        <dd>${application}</dd>
+        <dt>themeUrl</dt>
+        <dd>${themeUrl}</dd>
+        <dt>view</dt>
+        <dd>${view!""}</dd>
+    </dl>
+</@main.librecms>
\ No newline at end of file
diff --git a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/main.html.ftl b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/main.html.ftl
new file mode 100644
index 000000000..cd870c2ad
--- /dev/null
+++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/main.html.ftl
@@ -0,0 +1,15 @@
+<#macro librecms scripts=[]>
+    <!DOCTYPE html>
+    <html>
+        <head>
+            <link href="${themeUrl}/styles/librecms.css" rel="stylesheet" />
+            <meta name="viewport" content="width=device-width, initial-scale=1">
+            <title>Default Template</title>    
+        </head>
+        <body>
+            <div class="container">
+                <#nested>
+            </div>
+        </body>
+    </html>
+</#macro>
\ No newline at end of file
