diff --git a/src/pages/about.mdx b/src/pages/about.mdx
new file mode 100644
index 0000000..c3cad64
--- /dev/null
+++ b/src/pages/about.mdx
@@ -0,0 +1,9 @@
+---
+layout: ../layouts/PageLayout.astro
+title: About
+---
+
+import { mapping } from '../mdx-components.ts';
+export const components = mapping;
+
+About Page
diff --git a/src/pages/colophon.mdx b/src/pages/colophon.mdx
new file mode 100644
index 0000000..98b61ac
--- /dev/null
+++ b/src/pages/colophon.mdx
@@ -0,0 +1,9 @@
+---
+layout: ../layouts/PageLayout.astro
+title: Colophon
+---
+
+import { mapping } from '../mdx-components.ts';
+export const components = mapping;
+
+Colophon Page
diff --git a/src/pages/imprint.mdx b/src/pages/imprint.mdx
new file mode 100644
index 0000000..56b0d38
--- /dev/null
+++ b/src/pages/imprint.mdx
@@ -0,0 +1,9 @@
+---
+layout: ../layouts/PageLayout.astro
+title: Imprint
+---
+
+import { mapping } from '../mdx-components.ts';
+export const components = mapping;
+
+Imprint Page
diff --git a/src/pages/index.astro b/src/pages/index.astro
index d43e473..95744f7 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,8 +1,8 @@
 ---
-import Layout from '../layouts/Layout.astro';
-import Headline from '../components/Headline.astro';
+import BaseLayout from '../layouts/BaseLayout.astro';
+import { Headline } from '../components';
 ---
 
-<Layout title="Homepage">
+<BaseLayout title="Homepage">
 	<Headline>Homepage</Headline>
-</Layout>
+</BaseLayout>
diff --git a/src/pages/now.mdx b/src/pages/now.mdx
new file mode 100644
index 0000000..440a530
--- /dev/null
+++ b/src/pages/now.mdx
@@ -0,0 +1,9 @@
+---
+layout: ../layouts/PageLayout.astro
+title: Now
+---
+
+import { mapping } from '../mdx-components.ts';
+export const components = mapping;
+
+Now Page
diff --git a/src/pages/tools.mdx b/src/pages/tools.mdx
new file mode 100644
index 0000000..2c3415f
--- /dev/null
+++ b/src/pages/tools.mdx
@@ -0,0 +1,9 @@
+---
+layout: ../layouts/PageLayout.astro
+title: Tools
+---
+
+import { mapping } from '../mdx-components.ts';
+export const components = mapping;
+
+Tools Page