diff --git a/util/markup.lua b/util/markup.lua
index 346cfe1..0d3b17a 100644
--- a/util/markup.lua
+++ b/util/markup.lua
@@ -44,6 +44,16 @@ function markup.color(fg, bg, text)
   return string.format('<span foreground="%s" background="%s">%s</span>', fg, bg, text)
 end
 
+-- Set font and foreground.
+function markup.fontfg(font, fg, text)
+  return string.format('<span font="%s" foreground="%s">%s</span>', font, fg, text)
+end
+
+-- Set font and background.
+function markup.fontbg(font, bg, text)
+  return string.format('<span font="%s" background="%s">%s</span>', font, bg, text)
+end
+
 -- Set font, foreground and background.
 function markup.fontcolor(font, fg, bg, text)
   return string.format('<span font="%s" foreground="%s" background="%s">%s</span>', font, fg, bg, text)
diff --git a/wiki b/wiki
index 3216fb7..52bb0c1 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 3216fb787a4cb3fbefd8549b2e1323f9412e788e
+Subproject commit 52bb0c1757addd08ca4de6b7c02444b32a9497ef