diff --git a/Justfile b/Justfile
index b79526a..249c73f 100644
--- a/Justfile
+++ b/Justfile
@@ -25,17 +25,17 @@ tools:
 
 # Build the site
 build:
-	PATH="$$PWD/tools:$$PATH" calepin build
+	PATH="$PWD/tools:$PATH" calepin compile site public
 
 # Preview the site locally
 preview:
-	PATH="$$PWD/tools:$$PATH" calepin serve
+	PATH="$PWD/tools:$PATH" calepin serve public
 
 # Watch for changes and preview
 watch:
-	PATH="$$PWD/tools:$$PATH" calepin watch --serve
+	PATH="$PWD/tools:$PATH" calepin watch site public --serve
 
 # Clean the output directory
 clean:
-	rm -rf public tools
+	rm -rf public
 
diff --git a/site/404.typ b/site/404.typ
index c53cded..347e278 100644
--- a/site/404.typ
+++ b/site/404.typ
@@ -1,7 +1,5 @@
 #import "@preview/calepin:0.1.7": *
 
-#show: page-layout.with(title: "Not Found")
-
 = 404
 
 Page not found.
diff --git a/site/homelab/index.typ b/site/homelab/index.typ
index c166549..c22d75e 100644
--- a/site/homelab/index.typ
+++ b/site/homelab/index.typ
@@ -1,4 +1,3 @@
 #import "@preview/calepin:0.1.7": *
-#show: page-layout.with(title: "Homelab")
 
 = Homelab
diff --git a/site/index.typ b/site/index.typ
index 9780d06..860c9e6 100644
--- a/site/index.typ
+++ b/site/index.typ
@@ -1,7 +1,5 @@
 #import "@preview/calepin:0.1.7": *
 
-#show: page-layout.with(title: "Yggdrasil")
-
 = Yggdrasil
 
 Welcome to Yggdrasil, the central knowledge base.
diff --git a/site/security/index.typ b/site/security/index.typ
index e1f0b39..d9703ba 100644
--- a/site/security/index.typ
+++ b/site/security/index.typ
@@ -1,4 +1,3 @@
 #import "@preview/calepin:0.1.7": *
-#show: page-layout.with(title: "Security")
 
 = Security
diff --git a/site/thermo/index.typ b/site/thermo/index.typ
index 7796d82..90f7e92 100644
--- a/site/thermo/index.typ
+++ b/site/thermo/index.typ
@@ -1,4 +1,3 @@
 #import "@preview/calepin:0.1.7": *
-#show: page-layout.with(title: "Thermodynamics")
 
 = Thermodynamics