diff --git a/einnlanda.org b/einnlanda.org
index 6c4595a..c886b7a 100644
--- a/einnlanda.org
+++ b/einnlanda.org
@@ -8,7 +8,7 @@
 #+LATEX_HEADER: \usepackage{tocloft} \setlength{\cftchapnumwidth}{3em}
 #+LATEX_HEADER: \usepackage{allrunes}
 #+MACRO: rune-manual @@latex:\textara{$1}@@ @@html:$2@@
-#+MACRO: rune (eval (if (org-export-derived-backend-p org-export-current-backend 'latex) (concat "\\textarm{" (conlanging//replace-string-by-char "$1" conlanging//einnlanda-latin-to-latex) "}") (conlanging//replace-string-by-char "$1" conlanging//einnlanda-latin-to-runes)))
+#+MACRO: rune (eval (conlanging/einnlanda-org-export-runes "$1"))
 
 #+OPTIONS: H:4 toc:nil ^:{} auto-id:t
 #+TOC: headlines
diff --git a/matter.org b/matter.org
index cc8aad7..bd84a03 100644
--- a/matter.org
+++ b/matter.org
@@ -7,7 +7,7 @@
 #+LATEX_HEADER: \usepackage{allrunes}
 #+OPTIONS: H:4 toc:nil auto-id:t
 #+MACRO: rune-manual @@latex:\textara{$1}@@ @@html:$2@@
-#+MACRO: rune (eval (if (org-export-derived-backend-p org-export-current-backend 'latex) (concat "\\textara{" (conlanging//replace-string-by-char "$1" conlanging//matter-latin-to-latex-runes) "}") (conlanging//replace-string-by-char "$1" conlanging//matter-latin-to-runes)))
+#+MACRO: rune (eval (conlanging/matter-org-export-runes "$1"))
 src_latex{\newpage}
 #+TOC: headlines
 src_latex{\newpage}