diff --git a/.editorconfig b/.editorconfig
index 9d0c9f8..85e12f3 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,11 +1,16 @@
 root = true
 
-[*.{md,toml}]
+[*]
 end_of_line = lf
 insert_final_newline = true
 indent_style = space
-indent_size = 2
 trim_trailing_whitespace = true
 
+[*.html]
+indent_size = 4
+
+[*.{md,toml,yaml}]
+indent_size = 2
+
 [*.md]
 max_line_length = 80
diff --git a/content/_index.md b/content/_index.md
index d49370f..58911ce 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -1,9 +1,12 @@
-+++
-title = "Home"
-description = "Be your boba best"
+---
 
-images = ["img/boba_mochi.gif"]
-+++
+title: Home
+description: Be your boba best
+
+images:
+  - img/boba_mochi.gif
+
+---
 
 Links to all the services (and the software they're using) hosted on boba.best:
 
diff --git a/content/blog/_index.md b/content/blog/_index.md
index 854f1d7..4fcb394 100644
--- a/content/blog/_index.md
+++ b/content/blog/_index.md
@@ -1,7 +1,8 @@
-+++
-title = "Blog"
+---
 
-description = """
-Blog posts on boba.best
-"""
-+++
+title: Blog
+
+description: >-
+  Blog posts on boba.best
+
+---
diff --git a/content/rules/index.md b/content/rules/index.md
index d66da76..4021b56 100644
--- a/content/rules/index.md
+++ b/content/rules/index.md
@@ -1,11 +1,12 @@
-+++
-title = "Rules"
-menu = "main"
+---
 
-description = """
-General guidelines and rules for boba.best.
-"""
-+++
+title: Rules
+menu: main
+
+description: >-
+  General guidelines and rules for boba.best.
+
+---
 
 ## Generic Guidelines
 
diff --git a/content/services/_index.md b/content/services/_index.md
index 7ed9bf4..1549139 100644
--- a/content/services/_index.md
+++ b/content/services/_index.md
@@ -1,7 +1,8 @@
-+++
-title = "Services"
+---
 
-description = """
-Information about each of the services hosted on boba.best.
-"""
-+++
+title: Services
+
+description: >-
+  Information about each of the services hosted on boba.best.
+
+---
diff --git a/content/services/bobabin/index.md b/content/services/bobabin/index.md
index f60ad31..0e469c3 100644
--- a/content/services/bobabin/index.md
+++ b/content/services/bobabin/index.md
@@ -1,7 +1,9 @@
-+++
-title = "bobabin"
-toc = true
-+++
+---
+
+title: bobabin
+toc: true
+
+---
 
 bobabin runs PrivateBin, a minimalist, open source online pastebin where the
 server has zero knowledge of pasted data.
diff --git a/content/services/bobachat/index.md b/content/services/bobachat/index.md
index 3bc1dc6..04e62ba 100644
--- a/content/services/bobachat/index.md
+++ b/content/services/bobachat/index.md
@@ -1,7 +1,9 @@
-+++
-title = "bobachat"
-toc = true
-+++
+---
+
+title: bobachat
+toc: true
+
+---
 
 bobachat runs Synapse, the Matrix reference homeserver. Matrix is an open
 network for secure and decentralized communication.
diff --git a/content/services/bobamail/index.md b/content/services/bobamail/index.md
index be17102..b35d5dc 100644
--- a/content/services/bobamail/index.md
+++ b/content/services/bobamail/index.md
@@ -1,9 +1,12 @@
-+++
-title = "bobamail"
-toc = true
+---
 
-aliases = ["/mail"]
-+++
+title: bobamail
+toc: true
+
+aliases:
+  - /mail
+
+---
 
 bobamail uses Mailcow, a mail server suite which runs on open source software
 and a modern user interface.
diff --git a/content/services/bobatea/index.md b/content/services/bobatea/index.md
index 0e16542..dd0799e 100644
--- a/content/services/bobatea/index.md
+++ b/content/services/bobatea/index.md
@@ -1,7 +1,9 @@
-+++
-title = "bobatea"
-toc = true
-+++
+---
+
+title: bobatea
+toc: true
+
+---
 
 bobatea runs Gitea, a self-hosted Git service similar to GitHub, GitLab, and
 Bitbucket.
diff --git a/content/services/bobavault/index.md b/content/services/bobavault/index.md
index 4802709..90df6f1 100644
--- a/content/services/bobavault/index.md
+++ b/content/services/bobavault/index.md
@@ -1,7 +1,9 @@
-+++
-title = "bobavault"
-toc = true
-+++
+---
+
+title: bobavault
+toc: true
+
+---
 
 bobavault runs Vaultwarden, a rewrite of the Bitwarden server in Rust.
 
diff --git a/themes/bobatheme b/themes/bobatheme
index 9ff5314..adf5c68 160000
--- a/themes/bobatheme
+++ b/themes/bobatheme
@@ -1 +1 @@
-Subproject commit 9ff5314bc080af220a22b5bb681b84a34e4033ae
+Subproject commit adf5c685bed5af6bbd34e915451e24b390922ddb