diff --git a/format-master.xml b/format-master.xml
index bc75d0d..a43d946 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -371,73 +371,9 @@
 			<xsl:call-template name="right-curly-bracket" />
 		</common>
 	</template>
-
-	<!-- I think the pi symbol is only available in LaTeX in math mode, but if we're already in math mode, the extra $ signs will mess things up... -->
-	<!-- Use \ensuremath to resolve the problem. -->
-	<template name="epsilon" match="epsilon|greek-small-letter-epsilon">
-		<common formats="/latex/xelatex/">\ensuremath{\epsilon}</common>
-		<html><xsl:text disable-output-escaping="yes">&amp;epsilon;</xsl:text></html>
-		<!-- U+03B5 GREEK SMALL LETTER EPSILON -->
-		<xhtml><span class="unicode"><xsl:text>ε</xsl:text></span></xhtml>
-	</template>
-
-	<template name="epsilon-strip" match="epsilon|greek-small-letter-epsilon" mode="strip">
-		<common formats="/html/xhtml/">
-			<xsl:call-template name="epsilon" />
-		</common>
-	</template>
-
-	<template name="pi" match="pi|greek-small-letter-pi">
-		<common formats="/latex/xelatex/">\ensuremath{\pi}</common>
-		<html><xsl:text disable-output-escaping="yes">&amp;pi;</xsl:text></html>
-		<!-- U+03C0 GREEK SMALL LETTER PI -->
-		<xhtml><span class="unicode"><xsl:text>π</xsl:text></span></xhtml>
-	</template>
-
-	<template name="pi-strip" match="pi|greek-small-letter-pi" mode="strip">
-		<common formats="/html/xhtml/">
-			<xsl:call-template name="pi" />
-		</common>
-	</template>
-
-	<template name="rho" match="rho|greek-small-letter-rho">
-		<common formats="/latex/xelatex/">\ensuremath{\rho}</common>
-		<html><xsl:text disable-output-escaping="yes">&amp;rho;</xsl:text></html>
-		<!-- U+03C1 GREEK SMALL LETTER RHO -->
-		<xhtml><span class="unicode"><xsl:text>ρ</xsl:text></span></xhtml>
-	</template>
-
-	<template name="rho-strip" match="rho|greek-small-letter-rho" mode="strip">
-		<common formats="/html/xhtml/">
-			<xsl:call-template name="rho" />
-		</common>
-	</template>
-
-	<template name="sigma" match="sigma|greek-small-letter-sigma">
-		<common formats="/latex/xelatex/">\ensuremath{\sigma}</common>
-		<html><xsl:text disable-output-escaping="yes">&amp;sigma;</xsl:text></html>
-		<!-- U+03C3 GREEK SMALL LETTER SIGMA -->
-		<xhtml><span class="unicode"><xsl:text>σ</xsl:text></span></xhtml>
-	</template>
-
-	<template name="sigma-strip" match="sigma|greek-small-letter-sigma" mode="strip">
-		<common formats="/html/xhtml/">
-			<xsl:call-template name="sigma" />
-		</common>
-	</template>
-
-	<template name="capital-phi" match="Phi|greek-capital-letter-phi">
-		<common formats="/latex/xelatex/">\ensuremath{\Phi}</common>
-		<html><xsl:text disable-output-escaping="yes">&amp;Phi;</xsl:text></html>
-		<!-- U+03A6 GREEK CAPITAL LETTER PHI -->
-		<xhtml><span class="unicode"><xsl:text>Φ</xsl:text></span></xhtml>
-	</template>
 	
-	<template name="capital-phi-strip" match="Phi|greek-capital-letter-phi" mode="strip">
-		<common formats="/html/xhtml/">
-			<xsl:call-template name="capital-phi" />
-		</common>
-	</template>
+	<!-- Greek characters. -->
+	<include href="modules/greek-characters.xml" />
 
 	<template name="empty-set-sign" match="empty-set-sign|empty-set|null">
 		<common formats="/latex/xelatex/">\ensuremath{\emptyset}</common>
