diff --git a/templates/404.html.ep b/templates/404.html.ep
index db9a086..c122d82 100644
--- a/templates/404.html.ep
+++ b/templates/404.html.ep
@@ -1,32 +1,7 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>404 Not Found</title>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <style>
-        body {
-            font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-            line-height: 1.6;
-            color: #222;
-            max-width: 600px;
-            margin: 0 auto;
-            padding: 2rem;
-            text-align: center;
-        }
-        h1 {
-            font-size: 3rem;
-            margin-bottom: 0.5rem;
-            color: #444;
-        }
-        p {
-            font-size: 1.1rem;
-            color: #666;
-        }
-    </style>
-</head>
-<body>
+% layout 'default';
+% stash title => '404 Not Found';
+<main class="page page-center">
     <h1>404 Not Found</h1>
     <p>The requested short link was not found.</p>
-</body>
-</html>
+    <a href="/" class="link-home">Back to home</a>
+</main>
diff --git a/templates/500.html.ep b/templates/500.html.ep
index 62a3581..fcffd6a 100644
--- a/templates/500.html.ep
+++ b/templates/500.html.ep
@@ -1,32 +1,7 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>500 Internal Server Error</title>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <style>
-        body {
-            font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-            line-height: 1.6;
-            color: #222;
-            max-width: 600px;
-            margin: 0 auto;
-            padding: 2rem;
-            text-align: center;
-        }
-        h1 {
-            font-size: 3rem;
-            margin-bottom: 0.5rem;
-            color: #444;
-        }
-        p {
-            font-size: 1.1rem;
-            color: #666;
-        }
-    </style>
-</head>
-<body>
+% layout 'default';
+% stash title => '500 Internal Server Error';
+<main class="page page-center">
     <h1>500 Internal Server Error</h1>
     <p>An error occurred while processing your request.</p>
-</body>
-</html>
+    <a href="/" class="link-home">Back to home</a>
+</main>
