diff --git a/format-master.xml b/format-master.xml
index a28a5bd..4e1a773 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -261,7 +261,7 @@
 			just use an image. Scale it to 10x10 pixels (fine as long as
 			font size is set relatively normally).
 			
-			We need to ensure that the path is absolute, becuase we don't
+			We need to ensure that the path is absolute, because we don't
 			necessarily know where the document will end up in the tree.
 		-->
 		<html>
@@ -270,7 +270,7 @@
 					<xsl:text>/</xsl:text>
 					<xsl:value-of select="$department"/>
 					<xsl:value-of select="$paper"/>
-					<xsl:text>/Handbook/Graphics/join-operator-96dpi.png</xsl:text>
+					<xsl:text>/Handbook/join-operator-web.png</xsl:text>
 				</xsl:attribute>
 				<xsl:attribute name="ALT">
 					<xsl:text>Join operator</xsl:text>
@@ -609,19 +609,8 @@
 					Check whether there are actual paragraphs or things that
 					should be treated like paragraphs inside the item. If so,
 					let them worry about inserting the <P> tags.
-					
-					I've added include-document to the list to stop
-					included questions from having extra <p>'s wrapped
-					around them. This seems to work and should be a
-					sensible approach; since you can't predict what an
-					included document might do, it's safer to let it
-					worry about paragraphs. However, I'm not sure what
-					implications this decision might have in general. A
-					longer-term solution would be to move to something
-					that supports XInclude, but this is probably too new
-					yet?
 				-->
-				<xsl:when test="count(paragraph|para|p|question|answer|code-block|include-document) != 0">
+				<xsl:when test="count(paragraph|para|p|question|answer|code-block) != 0">
 					<LI><xsl:apply-templates/></LI>
 				</xsl:when>
 				<!--
@@ -762,19 +751,8 @@
 					Check whether there are actual paragraphs inside the
 					question. If so, let them worry about inserting the
 					<P> tags.
-					
-					I've added include-document to the list to stop
-					included questions from having extra <p>'s wrapped
-					around them. This seems to work and should be a
-					sensible approach; since you can't predict what an
-					included document might do, it's safer to let it
-					worry about paragraphs. However, I'm not sure what
-					implications this decision might have in general. A
-					longer-term solution would be to move to something
-					that supports XInclude, but this is probably too new
-					yet?
 				-->
-				<xsl:when test="count(paragraph|para|p|question|answer|code-block|include-document) != 0">
+				<xsl:when test="count(paragraph|para|p|question|answer|code-block) != 0">
 					<xsl:apply-templates/>
 				</xsl:when>
 				<!--
@@ -1788,7 +1766,7 @@
 	-->
 	
 	<!-- LaTeX images are always handled the same way regardless. -->
-	<template match="image" mode="latex">
+	<template name="latex-image" match="image" mode="latex">
 		<latex>
 			<xsl:text>\includegraphics</xsl:text>
 			<xsl:if test="count(latex-scaling) != 0">
@@ -1798,7 +1776,7 @@
 				<xsl:text>]</xsl:text>
 			</xsl:if>
 			<!-- Adding general-purpose latex pass-through arguments for \includegraphics; this should eventually subsume the "scale"-only handler above. -->
-			<!-- If providing multiple arguments, these should be comma-separated in the source XML, but no not need the enclosing square brackets. -->
+			<!-- If providing multiple arguments, these should be comma-separated in the source XML, but do not need the enclosing square brackets. -->
 			<xsl:if test="@latex-options">
 				<xsl:text>[</xsl:text>
 				<xsl:value-of select="@latex-options"/>
@@ -1807,28 +1785,16 @@
 			<xsl:text>{</xsl:text>
 			<!--
 				Work out the full path specification for the file
-				to be included = base-path + location + basename.
+				to be included = base-path + location (if specified) + basename.
 			-->
 			<xsl:value-of select="$base-path"/>
-			<xsl:text>/</xsl:text>			
-
-			<!-- Use whatever standard image folder is appropriate for the context. -->
-			<xsl:choose>
-				<!-- Could possibly change this to test="/document/@class = 'tutorial'" or similar? -->
-				<!-- Sounds nicer...I think ideally the XSL processor would automatically figure out the path to the graphics based on the path to the source XML file.  Can this be done? -->
-				<xsl:when test="name(/child::node()[1])='tutorial' or /document/@class = 'tutorial' or name(/child::node()[1])='laboratory' or /document/@class = 'laboratory'">
-					<xsl:text>Graphics</xsl:text>
-				</xsl:when>
-				<!-- Allow the author to specify a non-standard image location on the fly. -->
-				<xsl:when test="@location">
-					<xsl:value-of select="@location"/>
-				</xsl:when>
-				<!-- new style in progress... -->
-				<xsl:otherwise>
-					<xsl:text>images</xsl:text>
-				</xsl:otherwise>
-			</xsl:choose>
-			<xsl:text>/</xsl:text>
+			<xsl:text>/</xsl:text>	
+			
+			<!-- Check whether the location attribute is included. -->
+			<xsl:if test="@location">
+				<xsl:value-of select="@location"/>
+				<xsl:text>/</xsl:text>
+			</xsl:if>
 
 			<!-- need to phase out "basename" as an element and switch to using an attribute -->
 			<xsl:if test="count(basename) != 0">
@@ -1838,12 +1804,12 @@
 			<xsl:if test="@basename">
 				<xsl:value-of select="@basename"/>
 			</xsl:if>
-			<xsl:text>.</xsl:text>
+			<xsl:text>-print.</xsl:text>
 			
 			<!-- Figure out the image format. -->
 			<xsl:choose>
 				<xsl:when test="count(format) != 0">
-					<xsl:message terminate="no">&lt;format&gt; element is deprecated in &lt;image&gt;; please use basename attribute instead.</xsl:message>
+					<xsl:message terminate="no">&lt;format&gt; element is deprecated in &lt;image&gt;; please use format attribute instead.</xsl:message>
 					<xsl:value-of select="format"/>
 				</xsl:when>
 				<xsl:otherwise>
@@ -1854,37 +1820,35 @@
 		</latex>
 	</template>
 	
-	<template match="image[count(provide-large-version) = 0]">
+	<template name="normal-image" match="image[count(provide-large-version) = 0]">
 		<latex><xsl:apply-templates select="." mode="latex"/></latex>
 		<html>
 			<IMG CLASS="padded" BORDER="0">
 				<xsl:attribute name="SRC">
-					<xsl:choose>
-						<xsl:when test="(name(/child::node()[1])='tutorial') or (name(/child::node()[1])='laboratory') or /document/@class = 'tutorial' or /document/@class = 'laboratory' ">
-							<xsl:text>Graphics/</xsl:text>
-							<xsl:value-of select="basename|@basename"/>
-							<xsl:text>-96dpi</xsl:text>
-						</xsl:when>
-						<!-- Allow the author to specify a non-standard image location on the fly. -->
-						<xsl:when test="@location">
-							<xsl:value-of select="@location"/>
-							<xsl:text>/</xsl:text>
-							<xsl:value-of select="basename|@basename"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:text>images/</xsl:text>
-							<xsl:value-of select="basename|@basename"/>
-						</xsl:otherwise>
-					</xsl:choose>
-					<xsl:text>.</xsl:text>
+					<!--
+						Work out the full path specification for the file
+						to be included = base-path + location (if specified) + basename.
+					-->
+					<xsl:value-of select="$base-path"/>
+					<xsl:text>/</xsl:text>	
+					
+					<!-- Check whether the location attribute is included. -->
+					<xsl:if test="@location">
+						<xsl:value-of select="@location"/>
+						<xsl:text>/</xsl:text>
+					</xsl:if>
+
+					<xsl:value-of select="basename|@basename"/>
+					<xsl:text>-web.</xsl:text>
+
 					<xsl:choose>
 						<!-- CME: oops, I'd originally used the "format" tag to identify the format used in the LaTeX version, not the HTML! -->
 						<xsl:when test="count(format) != 0">
-							<xsl:message terminate="no">&lt;format&gt; element is deprecated in &lt;image&gt;; please use basename attribute instead.</xsl:message>
+							<xsl:message terminate="no">&lt;format&gt; element is deprecated in &lt;image&gt;; please use format attribute instead.</xsl:message>
 							<xsl:value-of select="format"/>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:text>png</xsl:text>
+							<xsl:value-of select="$image-format"/>
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:attribute>
@@ -1893,54 +1857,64 @@
 		</html>
 	</template>
 
-	<template match="image[count(provide-large-version) != 0]">
+	<template name="zoomable-image" match="image[count(provide-large-version) != 0]">
 		<latex><xsl:apply-templates select="." mode="latex"/></latex>
 		<html>
 			<A>
 				<xsl:attribute name="HREF">
-					<!-- This first bit needs to be updated to match the rest, particularly
-					     with regards to non-standard image directories.
+					<!--
+						Work out the full path specification for the file
+						to be included = base-path + location (if specified) + basename.
 					-->
-					<xsl:text>images/</xsl:text>
+					<xsl:value-of select="$base-path"/>
+					<xsl:text>/</xsl:text>	
+					
+					<!-- Check whether the location attribute is included. -->
+					<xsl:if test="@location">
+						<xsl:value-of select="@location"/>
+						<xsl:text>/</xsl:text>
+					</xsl:if>
+
 					<xsl:value-of select="basename|@basename"/>
-					<xsl:text>-zoom.</xsl:text>
+					<xsl:text>-web-zoom.</xsl:text>
+					
 					<xsl:choose>
+						<!-- CME: oops, I'd originally used the "format" tag to identify the format used in the LaTeX version, not the HTML! -->
 						<xsl:when test="count(format) != 0">
+							<xsl:message terminate="no">&lt;format&gt; element is deprecated in &lt;image&gt;; please use format attribute instead.</xsl:message>
 							<xsl:value-of select="format"/>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:text>png</xsl:text>
+							<xsl:value-of select="$image-format"/>
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:attribute>
 				<IMG CLASS="padded" BORDER="0">
 					<xsl:attribute name="SRC">
-						<xsl:choose>
-							<xsl:when test="(name(/child::node()[1])='tutorial') or (name(/child::node()[1])='laboratory') or /document/@class = 'tutorial' or /document/@class = 'laboratory' ">
-								<xsl:text>Graphics/</xsl:text>
-								<xsl:value-of select="basename|@basename"/>
-								<xsl:text>-96dpi</xsl:text>
-							</xsl:when>
-							<!-- Allow the author to specify a non-standard image location on the fly. -->
-							<xsl:when test="@location">
-								<xsl:value-of select="@location"/>
-								<xsl:text>/</xsl:text>
-								<xsl:value-of select="basename|@basename"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:text>images/</xsl:text>
-								<xsl:value-of select="basename|@basename"/>
-							</xsl:otherwise>
-						</xsl:choose>
-						<xsl:text>.</xsl:text>
+						<!--
+							Work out the full path specification for the file
+							to be included = base-path + location (if specified) + basename.
+						-->
+						<xsl:value-of select="$base-path"/>
+						<xsl:text>/</xsl:text>	
+						
+						<!-- Check whether the location attribute is included. -->
+						<xsl:if test="@location">
+							<xsl:value-of select="@location"/>
+							<xsl:text>/</xsl:text>
+						</xsl:if>
+	
+						<xsl:value-of select="basename|@basename"/>
+						<xsl:text>-web.</xsl:text>
+						
 						<xsl:choose>
 							<!-- CME: oops, I'd originally used the "format" tag to identify the format used in the LaTeX version, not the HTML! -->
 							<xsl:when test="count(format) != 0">
-								<xsl:message terminate="no">&lt;format&gt; element is deprecated in &lt;image&gt;; please use basename attribute instead.</xsl:message>
+								<xsl:message terminate="no">&lt;format&gt; element is deprecated in &lt;image&gt;; please use format attribute instead.</xsl:message>
 								<xsl:value-of select="format"/>
 							</xsl:when>
 							<xsl:otherwise>
-								<xsl:text>png</xsl:text>
+								<xsl:value-of select="$image-format"/>
 							</xsl:otherwise>
 						</xsl:choose>
 					</xsl:attribute>
@@ -1980,7 +1954,7 @@
 			"xml"
 			"html" [default for HTML]
 			"latex" [default for LaTeX]
-			"text"
+			"plain" (as in text/plain)
 		
 		@basename: Name of file to include (including suffix!).
 		[required]
@@ -2044,7 +2018,7 @@
 				Note that input text files are currently verbatim'd in
 				LaTeX. We may want to change this in future?
 			-->
-			<xsl:if test="@type = 'text'">
+			<xsl:if test="@type = 'plain'">
 				<xsl:text>verbatim</xsl:text>
 			</xsl:if>
 			<xsl:text>input{</xsl:text>
@@ -2053,6 +2027,13 @@
 		</latex>
 	</template>
 	
+	<!--
+		Note that including XML documents is currently problematic,
+		as the document() function expects a valid XML document. 
+		Including XML fragments is impossible. XInclude will fix this,
+		once it is widely supported (not yet). Best to avoid this
+		completely for now.
+	-->
 	<template name="include-xml" match="include-document[@type='xml']">
 		<common>
 			<xsl:variable name="file">
