diff --git a/format-master.xml b/format-master.xml
index 8a4c649..1b1ad80 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -162,18 +162,18 @@
 	-->
 	<template name="ellipsis-sign" match="ellipsis-sign|etc|ellipsis|dots">
 		<latex>{\ldots}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8230;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;hellip;</xsl:text></html>
 	</template>
 
 	<!-- Misc typographic symbols -->
 	<template name="endash" match="endash|en-dash">	
 		<latex>--</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8211;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;ndash;</xsl:text></html>
 	</template>
 
 	<template name="emdash" match="emdash|em-dash">
 		<latex>---</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8212;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;mdash;</xsl:text></html>
 	</template>
 	
 	<!-- Use this for literal underscores that appear outside code blocks. Such things cause LaTeX to wig out. -->
@@ -184,7 +184,7 @@
 
 	<template name="apostrophe" match="apostrophe">
 		<latex>'</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8217;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;rsquo;</xsl:text></html>
 	</template>
 
 	<template name="dollar" match="dollar|dollar-sign">
@@ -204,22 +204,22 @@
 
 	<template name="trademark-sign" match="trademark-sign|trademark|TM">
 		<latex>{\texttrademark}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8482;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;trade;</xsl:text></html>
 	</template>
 
 	<template name="copyright-sign" match="copyright-sign">
 		<latex>{\copyright}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#169;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;copy;</xsl:text></html>
 	</template>
 
 	<template name="degree-sign" match="degree-sign|degrees">
 		<latex>\ensuremath{^{\circ}}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#176;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;deg;</xsl:text></html>
 	</template>
 
 	<template name="section-sign" match="section-sign">
 		<latex>{\S}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#167;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;sect;</xsl:text></html>
 	</template>
 
 	<template name="sharp-sign" match="sharp|hash">
@@ -229,7 +229,7 @@
 
 	<template name="paragraph-sign" match="paragraph-sign">
 		<latex>{\P}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#182;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;para;</xsl:text></html>
 	</template>
 
 	<template name="left-curly-bracket" match="left-curly-bracket|left-curly-brace|left-brace">
@@ -246,15 +246,15 @@
 	<!-- Use \ensuremath to resolve the problem. -->
 	<template name="pi" match="pi|project">
 		<latex>\ensuremath{\pi}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#960;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;pi;</xsl:text></html>
 	</template>
 	<template name="sigma" match="sigma|restrict">
 		<latex>\ensuremath{\sigma}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#963;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;sigma;</xsl:text></html>
 	</template>
 	<template name="rho" match="rho|rename">
 		<latex>\ensuremath{\rho}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#961;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;rho;</xsl:text></html>
 	</template>
 	<template name="capital-phi" match="Phi">
 		<latex>\ensuremath{\Phi}</latex>
@@ -263,27 +263,27 @@
 
 	<template name="empty-set-sign" match="empty-set-sign|empty-set|null">
 		<latex>\ensuremath{\emptyset}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8709;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;empty;</xsl:text></html>
 	</template>
 
 	<template name="element-sign" match="element-sign|element|element-of|is-element-of|is-an-element-of">
 		<latex>\ensuremath{\in}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8712;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;isin;</xsl:text></html>
 	</template>
 	
 	<template name="not-element-sign" match="not-element-sign|not-element|not-element-of|is-not-element-of|is-not-an-element-of">
 		<latex>\ensuremath{\not\in}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8713;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;notin;</xsl:text></html>
 	</template>
 	
 	<template name="subset-sign" match="subset-sign|subset|subset-of|is-subset-of|is-a-subset-of">
 		<latex>\ensuremath{\subset}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8834;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;sub;</xsl:text></html>
 	</template>
 
 	<template name="superset-sign" match="superset-sign|superset|superset-of|is-superset-of|is-a-superset-of">
 		<latex>\ensuremath{\supset}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8835;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;sup;</xsl:text></html>
 	</template>
 
 	<template name="join-operator" match="join-operator|join|natural-join">
@@ -395,27 +395,27 @@
 
 	<template name="intersect-operator" match="intersect-operator|intersect|intersection|cap">
 		<latex>\ensuremath{\cap}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8745;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;cap;</xsl:text></html>
 	</template>
 
 	<template name="union-operator" match="union-operator|union|cup">
 		<latex>\ensuremath{\cup}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8746;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;cup;</xsl:text></html>
 	</template>
 
 	<template name="logical-and-operator" match="logical-and-operator|logical-and|and|and-operator|hat|wedge">
 		<latex>\ensuremath{\wedge}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8743;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;and;</xsl:text></html>
 	</template>
 
 	<template name="logical-or-operator" match="logical-or-operator|logical-or|or|or-operator|vee">
 		<latex>\ensuremath{\vee}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8744;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;or;</xsl:text></html>
 	</template>
 
 	<template name="logical-not-operator" match="logical-not-operator|logical-negation-operator|logical-negation|logical-not|not|negation|neg">
 		<latex>\ensuremath{\neg}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#172;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;not;</xsl:text></html>
 	</template>
 
 	<template name="LaTeX" match="LaTeX|latex">
@@ -426,7 +426,7 @@
 	<!-- Note: no equivalent of \triangleright in HTML, use right arrow instead. -->
 	<template name="menu-separator" match="menu-separator|menusep|menu/separator">
 		<latex> \ensuremath{\triangleright} </latex>
-		<html><xsl:text disable-output-escaping="yes"> &amp;#8594; </xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes"> &amp;rarr; </xsl:text></html>
 	</template>
 
 	<template name="menu-item" match="menu/item">
@@ -729,17 +729,17 @@
 	<template name="single-quote" match="quote[@single='yes']|q[@single='yes']">
 		<latex>`<xsl:apply-templates />'</latex>
 		<html>
-			<xsl:text disable-output-escaping="yes">&amp;#8216;</xsl:text>
+			<xsl:text disable-output-escaping="yes">&amp;lsquo;</xsl:text>
 			<xsl:apply-templates />
-			<xsl:text disable-output-escaping="yes">&amp;#8217;</xsl:text>
+			<xsl:text disable-output-escaping="yes">&amp;rsquo;</xsl:text>
 		</html>
 	</template>
 	<template name="double-quote" match="quote|qq">
 		<latex>``<xsl:apply-templates />''</latex>
 		<html>
-			<xsl:text disable-output-escaping="yes">&amp;#8220;</xsl:text>
+			<xsl:text disable-output-escaping="yes">&amp;ldquo;</xsl:text>
 			<xsl:apply-templates />
-			<xsl:text disable-output-escaping="yes">&amp;#8221;</xsl:text>
+			<xsl:text disable-output-escaping="yes">&amp;rdquo;</xsl:text>
 		</html>
 	</template>
 	<!--
@@ -1821,7 +1821,7 @@
 		<!-- It's probably more consistent to just use \ref* and insert "Section" ourselves rather than let LaTeX do it. -->
 		<latex>Section~\ref*{<xsl:value-of select="@label" />}</latex>
 		<html>
-			<xsl:text disable-output-escaping="yes">Section&amp;#160;</xsl:text>
+			<xsl:text disable-output-escaping="yes">Section&amp;nbsp;</xsl:text>
 			<xsl:number count="section" level="multiple" format="1.1.1.1.1.1" />
 		</html>
 	</template>
@@ -1829,7 +1829,7 @@
 	<template name="figure-reference" match="figure" mode="reference">
 		<latex>Figure~\ref*{<xsl:value-of select="@label" />}</latex>
 		<html>
-			<xsl:text disable-output-escaping="yes">Figure&amp;#160;</xsl:text>
+			<xsl:text disable-output-escaping="yes">Figure&amp;nbsp;</xsl:text>
 			<xsl:choose>
 				<xsl:when test="$showanswers='yes'">
 					<xsl:number count="figure" level="any" format="1" />
@@ -1844,7 +1844,7 @@
 	<template name="table-reference" match="table" mode="reference">
 		<latex>Table~\ref*{<xsl:value-of select="@label" />}</latex>
 		<html>
-			<xsl:text disable-output-escaping="yes">Table&amp;#160;</xsl:text>
+			<xsl:text disable-output-escaping="yes">Table&amp;nbsp;</xsl:text>
 			<xsl:choose>
 				<xsl:when test="$showanswers='yes'">
 					<xsl:number count="table" level="any" format="1" />
@@ -2479,12 +2479,12 @@
 	
 	<template name="minus-operator" match="minus">
 		<latex>\ensuremath{-}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8722;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;minus;</xsl:text></html>
 	</template>
 	
 	<template name="times-operator" match="times">
 		<latex>\ensuremath{\times}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#215;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;times;</xsl:text></html>
 	</template>
 	
 	<template name="divide-operator" match="divide">
@@ -2499,36 +2499,36 @@
 	<template name="not-equals-operator" match="not-equals|ne">
 		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
 		<latex>\ensuremath{\neq}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8800;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;ne;</xsl:text></html>
 	</template>
 
 	<template name="greater-than-operator" match="greater-than|gt">
 		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
 		<latex> \ensuremath{&gt;} </latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#62;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;gt;</xsl:text></html>
 	</template>
 
 	<template name="greater-equals-operator" match="greater-equals|ge">
 		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
 		<latex> \ensuremath{\geq} </latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8805;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;ge;</xsl:text></html>
 	</template>
 
 	<template name="less-than-operator" match="less-than|lt">
 		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
 		<latex> \ensuremath{&lt;} </latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#60;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;lt;</xsl:text></html>
 	</template>
 
 	<template name="less-equals-operator" match="less-equals|le">
 		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
 		<latex> \ensuremath{\leq} </latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8804;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;le;</xsl:text></html>
 	</template>
 
 	<template name="approximately-equals-operator" match="approximately-equals|approximately-equal-to|approx">
 		<latex>\ensuremath{\approx}</latex>
-		<html><xsl:text disable-output-escaping="yes">&amp;#8776;</xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;asymp;</xsl:text></html>
 	</template>
 	
 	<template name="right-arrow" match="right-arrow|rightarrow|implies|rarr|rarrow">
@@ -2543,10 +2543,10 @@
 		<html>
 			<xsl:choose>
 				<xsl:when test="@weight='double'">
-					<xsl:text disable-output-escaping="yes">&amp;#8658;</xsl:text>
+					<xsl:text disable-output-escaping="yes">&amp;rArr;</xsl:text>
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:text disable-output-escaping="yes">&amp;#8594;</xsl:text>
+					<xsl:text disable-output-escaping="yes">&amp;rarr;</xsl:text>
 				</xsl:otherwise>
 			</xsl:choose>
 		</html>
@@ -2564,10 +2564,10 @@
 		<html>
 			<xsl:choose>
 				<xsl:when test="@weight='double'">
-					<xsl:text disable-output-escaping="yes">&amp;#8656;</xsl:text>
+					<xsl:text disable-output-escaping="yes">&amp;lArr;</xsl:text>
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:text disable-output-escaping="yes">&amp;#8592;</xsl:text>
+					<xsl:text disable-output-escaping="yes">&amp;larr;</xsl:text>
 				</xsl:otherwise>
 			</xsl:choose>
 		</html>
@@ -2597,7 +2597,7 @@
 		<latex>\ensuremath{\frac{<xsl:apply-templates select="numerator" />}{<xsl:apply-templates select="denominator" />}}</latex>
 		<html>
 			<SUP><xsl:apply-templates select="numerator" /></SUP>
-			<xsl:text disable-output-escaping="yes">&amp;#8260;</xsl:text>
+			<xsl:text disable-output-escaping="yes">&amp;frasl;</xsl:text>
 			<SUB><xsl:apply-templates select="denominator" /></SUB>
 		</html>
 	</template>
