diff --git a/format-master.xml b/format-master.xml
index ec589a4..18cc125 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -73,7 +73,20 @@
 		</latex>
 		<!-- HTML is weird about what things you cannot include inside paragraphs (e.g. lists of any kind).  However, the end P tag is optional, so one option might simply be not to output it. -->
 		<html>
+			<!--
+				The HTMLStyle parameter is an Ugly Hack(tm) to ensure
+				that paragraphs are indented correctly inside definition
+				lists in HTML. I tried modes first, but they didn't work
+				correctly. Fortunately this only needs to be done with
+				paragraphs, so this will work fine.
+			-->
+			<xsl:param name="HTMLStyle"/>
 			<P>
+				<xsl:if test="$HTMLStyle">
+					<xsl:attribute name="CLASS">
+						<xsl:value-of select="$HTMLStyle"/>
+					</xsl:attribute>
+				</xsl:if>
 				<xsl:if test="@align">
 					<xsl:attribute name="ALIGN">
 						<xsl:value-of select="@align"/>
@@ -534,13 +547,13 @@
 	<template name="itemised-list" match="itemised-list|itemize|unordered-list|bulleted-list|bullet-list|bullet-points|UL|ul">
 		<latex>
 			\begin{itemize}
-				<xsl:apply-templates/>
+				<xsl:apply-templates select="item" mode="normal"/>
 			\end{itemize}
 			
 		</latex>
 		<html>
 			<UL>
-				<xsl:apply-templates/>
+				<xsl:apply-templates select="item" mode="normal"/>
 			</UL>
 		</html>
 	</template>
@@ -551,13 +564,13 @@
 	<template name="enumerated-list" match="enumerated-list|enumerate|ordered-list|numbered-list|question-list|OL|ol">
 		<latex>
 			\begin{enumerate}
-				<xsl:apply-templates/>
+				<xsl:apply-templates select="item" mode="normal"/>
 			\end{enumerate}
 			
 		</latex>
 		<html>
 			<OL>
-				<xsl:apply-templates/>
+				<xsl:apply-templates select="item" mode="normal"/>
 			</OL>
 		</html>
 	</template>
@@ -567,7 +580,7 @@
 	<template name="definition-list" match="definition-list|description-list|DL|dl">
 		<latex>
 			\begin{description}
-				<xsl:apply-templates mode="definition-list"/>
+				<xsl:apply-templates select="item" mode="definition-list"/>
 			\end{description}
 			
 		</latex>
@@ -582,13 +595,13 @@
 				<description-list>. The clever details are handled in
 				the "definition-item" template.
 			-->
-			<xsl:apply-templates mode="definition-list"/>
+			<xsl:apply-templates select="item" mode="definition-list"/>
 		</html>
 	</template>
 
 
 	<!-- List elements -->
-	<template name="list-item" match="item">
+	<template name="list-item" match="item" mode="normal">
 		<latex><xsl:text>\item </xsl:text><xsl:apply-templates/></latex>
 		<html>
 			<xsl:choose>
@@ -621,62 +634,88 @@
 		<html>
 			<!--
 				We have to be a little clever here, because we're
-				transforming multiple embedded elements (potentially
-				with embedded <paragraph>s) into one or more <P> tags in
-				the HTML.
+				transforming potentially multiple embedded elements
+				(embedded <paragraph>s in particular) into one or more
+				<P> tags in the HTML. We need to ensure that:
+				
+					(a) we don't end up with nested <P> tags,
+					    
+					(b) all paragraphs are correctly indented, and
+					
+					(c) if the first thing following the <definition>
+						is a <paragraph> or text node, it gets
+						positioned correctly relative to the <keyword>.
 
 				We know that the <keyword> won't have embedded
 				<paragraph>s (it doesn't really make sense, not that we
-				actually check :)  We therefore only need to check the
-				<definition> element for embedded <paragraph>s:
+				actually check :)  The only thing we therefore need to
+				check for is <paragraph> elements inside the
+				<definition> element.
 			-->
 			<xsl:choose>
 				<!--
-					If there are none, just wrap the <keyword> and
-					<definition> within a <P> with a hanging indent and
-					finish. Note the use of child::node[2], because we
-					don't necessarily know what the <definition> is
-					going to be called, but we know that it will
-					(should) always be the second child of the <item>.
+					If the first sub-node of the <definition> is a text
+					node, then the whole thing should be just simple
+					text and contain only basic formatting elements, if
+					anything (i.e., no lists!). We therefore just wrap
+					the <keyword> and <definition> within a <P> with a
+					hanging indent and finish. Note the use of
+					child::node[1|2], because we don't necessarily know
+					what variants of <keyword> and <definition> have
+					actually been used, but we know that they will
+					(should!) always be the first and second children of
+					the <item> respectively.
 					
-					This is the most common case, so test for it first.
+					This probably is the most common case, so test for
+					it first.
 				-->
-				<xsl:when test="count(child::node()[2]/paragraph|child::node()[2]/p) = 0">
+				<xsl:when test="not(name(child::node()[2]/node()[1]))">
 					<P CLASS="definition1">
-						<xsl:apply-templates select="keyword|topic|DT|dt"/>
+						<xsl:apply-templates select="child::node()[1]"/>
 						<xsl:text> </xsl:text>
-						<xsl:apply-templates select="definition|description|discourse|DD|dd"/>
+						<xsl:apply-templates select="child::node()[2]"/>
 					</P>
 				</xsl:when>
 				<!--
-					If there is exactly one, do the same, except skip
-					over the processing of the embedded <paragraph> to
-					avoid nested <P>s in the output.
+					If the first sub-node of the <definition> is a <p>
+					or <paragraph>, then we need to skip over the
+					processing of this element to avoid nested <P>s in
+					the output. Any remaining sub-nodes are processed
+					normally, except that we pass in the HTMLStyle
+					parameter to ensure that any remaining paragraph
+					elements are correctly indented. I would have used
+					modes for this, but it killed embedded <itemize>s,
+					because there isn't an <itemize> template with the
+					appropriate mode (nor is there a need for one). Grr.
 				-->
-				<xsl:when test="count(child::node()[2]/paragraph|child::node()[2]/p) = 1">
+				<xsl:when test="(name(child::node()[2]/child::node()[1]) = 'p') or (name(child::node()[2]/child::node()[1]) = 'paragraph')">
 					<P CLASS="definition1">
-						<xsl:apply-templates select="keyword|topic|DT|dt"/>
+						<xsl:apply-templates select="child::node()[1]"/>
 						<xsl:text> </xsl:text>
-						<xsl:apply-templates select="child::node()[2]/paragraph[1]/node()|child::node()[2]/p[1]/node()"/>
+						<xsl:apply-templates select="child::node()[2]/child::node()[1]/node()"/>
 					</P>
+					<xsl:apply-templates select="child::node()[2]/*[position() > 1]">
+						<xsl:with-param name="HTMLStyle">definition2</xsl:with-param>
+					</xsl:apply-templates>
 				</xsl:when>
 				<!--
-					If there is more than one, wrap the <keyword> and
+					In all other cases, dump out the keyword in its own
+					paragraph, then zip through the list of sub-nodes
+					and process them normally, with the addition of the
+					HTMLStyle parameter, as noted above.
+					
+					If there are more than one, wrap the <keyword> and
 					the first <paragraph> of the <definition> in a
 					hanging <P>, then wrap the remainder in indented,
 					non-hanging <P>s.
 				-->
 				<xsl:otherwise>
 					<P CLASS="definition1">
-						<xsl:apply-templates select="keyword|topic|DT|dt"/>
-						<xsl:text> </xsl:text>
-						<xsl:apply-templates select="child::node()[2]/paragraph[1]/node()|child::node()[2]/p[1]/node()"/>
+						<xsl:apply-templates select="child::node()[1]"/>
 					</P>
-					<xsl:for-each select="child::node()[2]/paragraph[position() > 1]|child::node()[2]/p[position() > 1]">
-						<P CLASS="definition2">
-							<xsl:apply-templates select="node()"/>
-						</P>
-					</xsl:for-each>
+					<xsl:apply-templates select="child::node()[2]/*">
+						<xsl:with-param name="HTMLStyle">definition2</xsl:with-param>
+					</xsl:apply-templates>
 				</xsl:otherwise>
 			</xsl:choose>
 		</html>
