diff --git a/guide.md b/guide.md
index 39a02b3..82ea6be 100644
--- a/guide.md
+++ b/guide.md
@@ -738,10 +738,10 @@ To typeset complex equations with multi-character identifiers (such as the funct
 we recommend using the functions `\mathit` (for functions) and `\mathrm` (for identifiers). This avoids strange kerning issues like in @q:hmac-iso-bad-kerning:
 
 ```md
-$$ \mathit{HMAC}(K, "text") \coloneq H((\bar{K} \oplus OPAD) \Vert H((\bar{K} \oplus IPAD) \Vert "text")) $$ {#eq:hmac-iso-bad-kerning}
+$$ HMAC(K, "text") \coloneq H((\bar{K} \oplus OPAD) \Vert H((\bar{K} \oplus IPAD) \Vert "text")) $$ {#eq:hmac-iso-bad-kerning}
 ```
 
-$$ \mathit{HMAC}(K, "text") \coloneq H((\bar{K} \oplus OPAD) \Vert H((\bar{K} \oplus IPAD) \Vert "text")) $$ {#eq:hmac-iso-bad-kerning}
+$$ HMAC(K, "text") \coloneq H((\bar{K} \oplus OPAD) \Vert H((\bar{K} \oplus IPAD) \Vert "text")) $$ {#eq:hmac-iso-bad-kerning}
 
 
 \beginappendices
diff --git a/template/eisvogel.latex b/template/eisvogel.latex
index 6d316e4..4b31218 100644
--- a/template/eisvogel.latex
+++ b/template/eisvogel.latex
@@ -385,16 +385,10 @@ $endif$
   skipabove=\parskip,
   nobreak=true]{customcodeblock}
 
-\usepackage{fontspec}
+\usepackage[no-math]{fontspec}
 \setmainfont{Arial}
 \setsansfont{Arial}
-\setmathsf{Arial}
-
 \setmonofont{Noto Sans Mono}
-\setmathtt{Noto Sans Mono}
-
-% TODO: Understand the redundancy with the unicode-math font setting above.
-\setmathrm{Latin Modern Math}
 
 \usepackage{newunicodechar}
 % Use Arial Unicode to display various unicode symbols that might be present