diff --git a/archetypes/services.md b/archetypes/services.md
new file mode 100644
index 0000000..994b99c
--- /dev/null
+++ b/archetypes/services.md
@@ -0,0 +1,7 @@
++++
+title = "{{ replace .Name "-" " " | title }}"
+
+description = """
+Lorem ipsum
+"""
++++
diff --git a/content/_index.md b/content/_index.md
index 8b477f5..b27732d 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -1,10 +1,12 @@
-Full list of the services hosted by boba.best:
+Links to all the services (and the software they're using) hosted on boba.best:
-- [Mail](https://mail.boba.best)
-- [PeerTube](https://peertube.boba.best)
-- [Pleroma](https://pleroma.boba.best)
-- [Status Page](https://status.boba.best)
+- [bobatea](https://git.boba.best) - [Gitea](https://gitea.io)
+- [bobamail](https://mail.boba.best) - [Mailcow](https://mailcow.email)
+- [bobatube](https://peertube.boba.best) - [PeerTube](https://joinpeertube.org)
+- [pleroma.boba.best](https://pleroma.boba.best) -
+ [Pleroma](https://pleroma.social)
-See the navigation bar on top for more information about each service.
+See the [Services category]({{< relref "services/" >}}) for more information
+about each service.
boba.best is owned by [bbaovanc](https://bbaovanc.com).
diff --git a/content/services/_index.md b/content/services/_index.md
new file mode 100644
index 0000000..3a47c38
--- /dev/null
+++ b/content/services/_index.md
@@ -0,0 +1,8 @@
++++
+title = "Services"
+menu = "main"
+
+description = """
+Information about each of the services hosted on boba.best.
+"""
++++
diff --git a/content/mail.md b/content/services/bobamail.md
similarity index 99%
rename from content/mail.md
rename to content/services/bobamail.md
index 90a9648..8a5bcb9 100644
--- a/content/mail.md
+++ b/content/services/bobamail.md
@@ -1,6 +1,6 @@
+++
-title = "Mail"
-menu = "main"
+title = "bobamail"
+aliases = ["/mail"]
description = """
bobamail uses Mailcow, a mail server suite which runs on open source software
diff --git a/content/peertube.md b/content/services/bobatube.md
similarity index 97%
rename from content/peertube.md
rename to content/services/bobatube.md
index 38acc95..ddd540b 100644
--- a/content/peertube.md
+++ b/content/services/bobatube.md
@@ -1,6 +1,6 @@
+++
-title = "PeerTube"
-menu = "main"
+title = "bobatube"
+aliases = ["/peertube"]
description = """
PeerTube is a free and decentralized video platform meant as an alternative to
diff --git a/content/pleroma.md b/content/services/pleroma.boba.best.md
similarity index 96%
rename from content/pleroma.md
rename to content/services/pleroma.boba.best.md
index 359e725..12bccc2 100644
--- a/content/pleroma.md
+++ b/content/services/pleroma.boba.best.md
@@ -1,6 +1,6 @@
+++
-title = "Pleroma"
-menu = "main"
+title = "pleroma.boba.best"
+aliases = ["/pleroma"]
description = """
Pleroma is a decentralized and federated microblogging service (similar to
diff --git a/layouts/_default/services.html b/layouts/_default/services.html
new file mode 100644
index 0000000..849bcb6
--- /dev/null
+++ b/layouts/_default/services.html
@@ -0,0 +1,16 @@
+{{ define "main" }}
+Services
+
+ {{ range .Pages }}
+
+
+ + + +
+{{ end }}{{ end }} ++ {{ range (.GetTerms "tags") }} + #{{ .LinkTitle }} + {{ end }} +
+{{ end }}