diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 771dd5a..37de8f2 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -5,16 +5,19 @@ import "../styles/custom-tailwind.css";
 
 interface Props {
 	meta: {
-		default: boolean;
-		description?: string;
+		description: string;
+		title: string;
+		useDefaultSuffix: boolean;
 	};
 	navbar?: boolean;
 }
 
 const { meta, navbar = true } = Astro.props;
 
-const description =
-	(meta.default ? "The Menix Operating System" : "") + meta.description;
+if (meta.useDefaultSuffix) {
+	meta.description += " | Menix";
+	meta.title += " | Menix";
+}
 ---
 
 <!doctype html>
@@ -24,8 +27,14 @@ const description =
 		<meta name="viewport" content="width=device-width" />
 		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
 		<meta name="generator" content={Astro.generator} />
-		<meta name="description" content={description} />
-		<title>Menix operating system</title>
+		<meta name="description" content={meta.description} />
+		<title>{meta.title}</title>
+
+		<meta property="og:url" content="https://menix-os.org" />
+		<meta property="og:type" content="website" />
+		<meta property="og:title" content={meta.title} />
+		<meta property="og:description" content={meta.description} />
+		<meta property="og:image" content="https://menix-os.org/favicon.svg" />
 	</head>
 	<body
 		class="dark:bg-zinc-950 bg-zinc-50 text-gray-900 dark:text-gray-50 font-rubik"
diff --git a/src/pages/404.astro b/src/pages/404.astro
index ad463be..a1fb1a0 100644
--- a/src/pages/404.astro
+++ b/src/pages/404.astro
@@ -4,7 +4,14 @@ import MenixAnimatedLogo from "../components/reusable/MenixAnimatedLogo.astro";
 import Layout from "../layouts/Layout.astro";
 ---
 
-<Layout meta={{ default: true, description: "404" }} navbar={false}>
+<Layout
+	meta={{
+		description: "Not Found",
+		title: "404",
+		useDefaultSuffix: true,
+	}}
+	navbar={false}
+>
 	<section class="flex items-center justify-center min-h-screen">
 		<div class="flex flex-col gap-10">
 			<div class="flex items-center gap-10">
diff --git a/src/pages/index.astro b/src/pages/index.astro
index b9a39c8..59a82cf 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -3,6 +3,12 @@ import Frontpage from "../components/Frontpage.astro";
 import Layout from "../layouts/Layout.astro";
 ---
 
-<Layout meta={{ default: true }}>
+<Layout
+	meta={{
+		description: "The Menix Operating System",
+		title: "Start",
+		useDefaultSuffix: true,
+	}}
+>
 	<Frontpage />
 </Layout>
