diff --git a/build.sh b/build.sh
index 3003f72..f577fb7 100755
--- a/build.sh
+++ b/build.sh
@@ -1,3 +1,3 @@
#!/bin/sh
-find . -iname "*.md" -type f -exec sh -c 'pandoc -s -f commonmark -t html --template=src/template.html -o "${0%.md}.html" "${0}"' {} \;
+find . -iname "*.md" -type f -exec sh -c 'pandoc -s -f markdown -t html --template=src/template.html -o "${0%.md}.html" "${0}"' {} \;
diff --git a/src/blog/gpg/index.md b/src/blog/gpg/index.md
index 962de89..6e9145a 100644
--- a/src/blog/gpg/index.md
+++ b/src/blog/gpg/index.md
@@ -1,4 +1,6 @@
-# Managing stripped GPG keys
+---
+title: Managing stripped GPG keys
+...
*2017-12-03*
diff --git a/src/blog/home-layout/index.md b/src/blog/home-layout/index.md
index 2f12aee..f0d37d3 100644
--- a/src/blog/home-layout/index.md
+++ b/src/blog/home-layout/index.md
@@ -1,4 +1,6 @@
-# My $HOME
+---
+title: My $HOME
+...
*2018-09-03*
diff --git a/src/blog/index.md b/src/blog/index.md
index fe7187d..e0f52db 100644
--- a/src/blog/index.md
+++ b/src/blog/index.md
@@ -1,4 +1,6 @@
-# Blogs
+---
+title: Blogs
+...
- [Managing stripped GPG keys](gpg/)
- [My $HOME](home-layout/)
diff --git a/src/index.md b/src/index.md
index 1d05ed4..0795308 100644
--- a/src/index.md
+++ b/src/index.md
@@ -1,4 +1,6 @@
-# dadada
+---
+title: dadada
+...
**Welcome to my personal homepage ;-)**
diff --git a/src/projects/index.md b/src/projects/index.md
index 17c29e4..f5b8266 100644
--- a/src/projects/index.md
+++ b/src/projects/index.md
@@ -1,4 +1,6 @@
-# Projects
+---
+title: Projects
+...
See also my [GitHub](https://github.com/dadada) and [Gitlab](https://gitlab.com/dadada_).
diff --git a/src/talks/index.md b/src/talks/index.md
index 726a500..60ae01b 100644
--- a/src/talks/index.md
+++ b/src/talks/index.md
@@ -1,3 +1,5 @@
-# Talks
+---
+title: Talks
+...
- [systemd.generator(7)](systemd.generator/)
diff --git a/src/talks/systemd.generator/index.md b/src/talks/systemd.generator/index.md
index 8954dbf..bc92dc4 100644
--- a/src/talks/systemd.generator/index.md
+++ b/src/talks/systemd.generator/index.md
@@ -1,4 +1,6 @@
-# systemd.generator(7)
+---
+title: systemd.generator(7)
+...
*2019-03-14*
diff --git a/src/template.html b/src/template.html
index 6cddb40..c0f53c3 100644
--- a/src/template.html
+++ b/src/template.html
@@ -3,9 +3,12 @@
- dadada
+ $if(title-prefix)$$title-prefix$ – $endif$$pagetitle$
+ $if(title)$
+ $title$
+ $endif$
$body$