diff --git a/format-master.xml b/format-master.xml
index c7c996f..bcf0311 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -8,20 +8,25 @@
 	</hyperlink>
 
 	<template name="PaperCode" match="PaperCode">
-		<latex><xsl:text>{\PaperCode}</xsl:text></latex>
-		<html>INFO&#160;321</html>
+		<latex><xsl:value-of select="$department"/>~<xsl:value-of select="$paper"/></latex>
+		<html>
+			<xsl:value-of select="$department"/>
+			<xsl:text disable-output-escaping="yes">&amp;#160;</xsl:text>
+			<xsl:value-of select="$paper"/>
+		</html>
 	</template>
 
 	<template name="OracleServer" match="OracleServer">
-		<latex><xsl:text>{\OracleServer}</xsl:text></latex>
-		<html>Oracle9<I>i</I></html></template>
+		<latex>Oracle9\textit{i}</latex>
+		<html>Oracle9<I>i</I></html>
+	</template>
 
 
 	<template name="paragraph" match="paragraph">
 		<latex><xsl:text>
 
 
-</xsl:text><xsl:if test="@noindent">\noindent </xsl:if><xsl:apply-templates/><xsl:text>
+</xsl:text><xsl:if test="@indent = 'no'">\noindent </xsl:if><xsl:apply-templates/><xsl:text>
 	
 		
 </xsl:text></latex>
@@ -496,13 +501,13 @@
 	</template>
 	
 	
-	<!-- Images. -->
+	<!-- Images. Includes a scaling factor for LaTeX. -->
 	<template match="image[not(@print-version)]">
 		<latex>
-			\includegraphics[width=<xsl:value-of select="width"/>\textwidth]{images/<xsl:value-of select="basename"/>.<xsl:value-of select="$image-format"/>}
+			\includegraphics[scale=<xsl:value-of select="latex-scaling"/>\columnwidth]{images/<xsl:value-of select="basename"/>.<xsl:value-of select="$image-format"/>}
 		</latex>
 		<html>
-			<IMG BORDER="1">
+			<IMG BORDER="0">
 				<xsl:attribute name="SRC">images/<xsl:value-of select="basename"/>.png</xsl:attribute>
 				<xsl:attribute name="ALT"><xsl:apply-templates select="description"/></xsl:attribute>
 			</IMG>
@@ -511,18 +516,68 @@
 
 	<template match="image[@print-version = 'yes']">
 		<latex>
-			\includegraphics[width=<xsl:value-of select="width"/>\textwidth]{images/<xsl:value-of select="basename"/>.<xsl:value-of select="$image-format"/>}
+			\includegraphics[scale=<xsl:value-of select="latex-scaling"/>\columnwidth]{images/<xsl:value-of select="basename"/>.<xsl:value-of select="$image-format"/>}
 		</latex>
 		<html>
 			<A>
 				<xsl:attribute name="HREF">images/<xsl:value-of select="basename"/>-print.png</xsl:attribute>
-				<IMG BORDER="1">
+				<IMG BORDER="0">
 					<xsl:attribute name="SRC">images/<xsl:value-of select="basename"/>.png</xsl:attribute>
 					<xsl:attribute name="ALT"><xsl:apply-templates select="description"/></xsl:attribute>
 				</IMG>
 			</A>
 		</html>
 	</template>
+	
+	
+	<!--
+		Include another document into the current one. The @inline
+		attribute specifies whether the document is to be included
+		inline (note that this really only makes sense for HTML).
+		Possible values: yes, no (default no). If the document is not
+		inlined, then an appropriate link to the document is generated.
+		Inlined files must be document fragments, not standalone
+		documents!
+	 -->
+	<template name="include-noinline" match="include-document[not(@inline) or (@inline = 'no')]">
+		<latex>\input{<xsl:value-of select="@basename"/>}</latex>
+		<html>
+			<P><A>
+				<xsl:attribute name="HREF">
+					<xsl:value-of select="@baseurl"/>
+					<xsl:value-of select="@basename"/>
+					<xsl:text>.html</xsl:text>
+				</xsl:attribute>
+				<xsl:apply-templates/>
+			</A></P>
+		</html>
+	</template>
 
+	<template name="include-inline" match="include-document[@inline = 'yes']">
+		<latex>\input{<xsl:value-of select="@basename"/>}</latex>
+		<html><xsl:copy-of select="document(concat(@basename, '.html'))/html/body/*"/></html>
+	</template>
+	
+	
+	<!--
+		Environment setup. This enables you to load environment settings
+		(e.g., required LaTeX packages, etc.) from an external
+		configuration file. The master style sheet automatically loads a
+		file called "environment.xml"; you don't need to do anything for
+		this file to be loaded. Multiple configuration files may be
+		loaded, as long as they all have different names.
+	-->
+	<template name="environment-file" match="environment[@file]">
+		<xsl:apply-templates select="document(@file)/environment/*"/>
+	</template>
+	
+	<template name="latex-package" match="latex-packages/package">
+		<latex>\usepackage<xsl:if test="@options">[<xsl:value-of select="@options"/>]</xsl:if>{<xsl:value-of select="."/>}</latex>
+	</template>
+		
+	<template name="latex-command" match="latex-packages/command">
+		<latex><xsl:value-of select="."/></latex>
+	</template>
+		
 
 </stylesheet>
