diff --git a/content/links.md b/content/links.md
index cbf4d18..d5d61ef 100644
--- a/content/links.md
+++ b/content/links.md
@@ -5,15 +5,21 @@ path = "links"
 +++
 
 <dl>
-  <dt><a href="https://ily.rs/status">ily.rs/status</a></dt>
-  <dd>Uptime for my services, and some others I track.</dd>
 
-  <dt><a href="https://textonly.website">textonly.website</a></dt>
-  <dd>Collection of text-only personal sites</dd>
+{% link(href="https://ily.rs/status", title="ily.rs/status") %}
+Uptime for my services, and some others I track.
+{% end %}
 
-  <dt><a href="https://t0.vc">t0.vc</a></dt>
-  <dd>Tanner's site. <a href="/g">My guestbook</a> started off as a Rust port of <a href="https://t0.vc/g/">his</a>, and has gone on since to become more of its own thing.</dd>
+{% link(href="https://textonly.website", title="textonly.website") %}
+Collection of text-only personal sites
+{% end %}
+
+{% link(href="https://t0.vc", title="t0.vc") %}
+Tanner's site. [My guestbook](/g) started off as a Rust port of [his](https://t0.vc/g/), and has gone on since to become more of its own thing.
+{% end %}
+
+{% link(href="https://nownownow.com", title="nownownow.com") %}
+Directory of /now pages
+{% end %}
 
-  <dt><a href="https://nownownow.com">nownownow.com</a></dt>
-  <dd>Directory of /now pages</dd>
 </dl>
diff --git a/content/now.md b/content/now.md
index ca0688c..4395aab 100644
--- a/content/now.md
+++ b/content/now.md
@@ -5,13 +5,13 @@ path = "now"
 +++
 
 <dl>
-  <dt>28/04/26</dt>
-  <dd>
-    It's hot now and all my summer clothes are in storage.
-  </dd>
 
-  <dt>26/03/26</dt>
-  <dd>
-    Currently moving house. Offer accepted about 7 months ago.
-  </dd>
+{% update(date="28/04/26") %}
+It's hot now and all my summer clothes are in storage.
+{% end %}
+
+{% update(date="26/03/26") %}
+Currently moving house. Offer accepted about 7 months ago.
+{% end %}
+
 </dl>
diff --git a/templates/shortcodes/link.html b/templates/shortcodes/link.html
new file mode 100644
index 0000000..afce630
--- /dev/null
+++ b/templates/shortcodes/link.html
@@ -0,0 +1,2 @@
+<dt><a href="{{ href }}">{{ title }}</a></dt>
+<dd>{{ body | markdown(inline=true) | safe }}</dd>
diff --git a/templates/shortcodes/update.html b/templates/shortcodes/update.html
new file mode 100644
index 0000000..cfcdd66
--- /dev/null
+++ b/templates/shortcodes/update.html
@@ -0,0 +1,2 @@
+<dt>{{ date }}</dt>
+<dd>{{ body | markdown(inline=true) | safe }}</dd>