diff --git a/html_calendar.xsl b/html_calendar.xsl
index bf98738..cb9f915 100755
--- a/html_calendar.xsl
+++ b/html_calendar.xsl
@@ -25,6 +25,40 @@
 		This is the number of columns in the output table.
 	 -->
 	<xsl:variable name="number-of-columns">11</xsl:variable>
+	
+	<!--
+		Draw the borders of a cell by generating an appropriate STYLE
+		attribute. The widths of the border rules are passed as
+		arguments.
+	-->
+	<xsl:template name="cell-borders">
+		<xsl:param name="left-width"/>
+		<xsl:param name="right-width"/>
+		<xsl:param name="top-width"/>
+		<xsl:param name="bottom-width"/>
+		<xsl:attribute name="STYLE">
+			<xsl:if test="$left-width != ''">
+				<xsl:text>border-left:</xsl:text>
+				<xsl:value-of select="$left-width"/>
+				<xsl:text> solid #777777;</xsl:text>
+			</xsl:if>
+			<xsl:if test="$right-width != ''">
+				<xsl:text>border-right:</xsl:text>
+				<xsl:value-of select="$right-width"/>
+				<xsl:text> solid #777777;</xsl:text>
+			</xsl:if>
+			<xsl:if test="$top-width != ''">
+				<xsl:text>border-top:</xsl:text>
+				<xsl:value-of select="$top-width"/>
+				<xsl:text> solid #777777;</xsl:text>
+			</xsl:if>
+			<xsl:if test="$bottom-width != ''">
+				<xsl:text>border-bottom:</xsl:text>
+				<xsl:value-of select="$bottom-width"/>
+				<xsl:text> solid #777777;</xsl:text>
+			</xsl:if>
+		</xsl:attribute>
+	</xsl:template>
 
 	<xsl:template match="/">
 		<xsl:choose>
@@ -80,7 +114,7 @@
 		
 		<!-- The calendar itself. -->
 		<CENTER>
-			<TABLE CLASS="sans" BORDER="1" SUMMARY="Course Calendar with relevant links" CELLSPACING="0">
+			<TABLE CLASS="sans" SUMMARY="Course Calendar with relevant links" CELLSPACING="0">
 				<!--
 					I was going to generate COL elements here, but they
 					don't seem to be supported by all browsers. Damn. The same
@@ -116,6 +150,19 @@
 	-->
 	<xsl:template match="heading|footing">
 		<TH>
+			<xsl:call-template name="cell-borders">
+				<xsl:with-param name="top-width">2px</xsl:with-param>
+				<xsl:with-param name="bottom-width">2px</xsl:with-param>
+				<xsl:with-param name="left-width">
+					<xsl:if test="position() = 1">2px</xsl:if>
+				</xsl:with-param>
+				<xsl:with-param name="right-width">
+					<xsl:choose>
+						<xsl:when test="position() = last()">2px</xsl:when>
+						<xsl:otherwise>1px</xsl:otherwise>
+					</xsl:choose>
+				</xsl:with-param>
+			</xsl:call-template>
 			<xsl:if test="@columns">
 				<xsl:attribute name="COLSPAN">
 					<xsl:value-of select="@columns"/>
@@ -160,6 +207,16 @@
 								<xsl:otherwise>white-center</xsl:otherwise>
 							</xsl:choose>
 						</xsl:attribute>
+						<xsl:call-template name="cell-borders">
+							<xsl:with-param name="left-width">2px</xsl:with-param>
+							<xsl:with-param name="right-width">1px</xsl:with-param>
+							<xsl:with-param name="bottom-width">
+								<xsl:choose>
+									<xsl:when test="count(following::week) = 0">2px</xsl:when>
+									<xsl:otherwise>1px</xsl:otherwise>
+								</xsl:choose>
+							</xsl:with-param>
+						</xsl:call-template>
 						<xsl:attribute name="ROWSPAN">
 							<xsl:value-of select="$rows-per-week"/>
 						</xsl:attribute>
@@ -173,6 +230,15 @@
 						<xsl:attribute name="ROWSPAN">
 							<xsl:value-of select="$rows-per-week"/>
 						</xsl:attribute>
+						<xsl:call-template name="cell-borders">
+							<xsl:with-param name="right-width">1px</xsl:with-param>
+							<xsl:with-param name="bottom-width">
+								<xsl:choose>
+									<xsl:when test="count(following::week) = 0">2px</xsl:when>
+									<xsl:otherwise>1px</xsl:otherwise>
+								</xsl:choose>
+							</xsl:with-param>
+						</xsl:call-template>
 						<DIV CLASS="small">
 							<xsl:apply-templates select="../dates"/>
 						</DIV>
@@ -200,6 +266,16 @@
 	<xsl:template match="week[@holiday]">
 		<TR>
 			<TD CLASS="blue-ou-center">
+				<xsl:call-template name="cell-borders">
+					<xsl:with-param name="left-width">2px</xsl:with-param>
+					<xsl:with-param name="right-width">2px</xsl:with-param>
+					<xsl:with-param name="bottom-width">
+						<xsl:choose>
+							<xsl:when test="count(following::week) = 0">2px</xsl:when>
+							<xsl:otherwise>1px</xsl:otherwise>
+						</xsl:choose>
+					</xsl:with-param>
+				</xsl:call-template>
 				<xsl:attribute name="COLSPAN">
 					<xsl:value-of select="$number-of-columns"/>
 				</xsl:attribute>
@@ -223,11 +299,29 @@
 	-->
 	<xsl:template match="lecture[node() and not(@holiday)]">
 		<TD CLASS="ltgrey-center">
+			<xsl:call-template name="cell-borders">
+				<xsl:with-param name="bottom-width">
+					<xsl:choose>
+						<xsl:when test="count(following::lecture) = 0">2px</xsl:when>
+						<xsl:otherwise>1px</xsl:otherwise>
+					</xsl:choose>
+				</xsl:with-param>
+				<xsl:with-param name="right-width">1px</xsl:with-param>
+			</xsl:call-template>
 			<DIV CLASS="small">
 				<xsl:number value="1 + count(preceding::lecture[node() and not(@holiday)])"/>
 			</DIV>
 		</TD>
 		<TD CLASS="ltgrey-left" ROWSPAN="1">
+			<xsl:call-template name="cell-borders">
+				<xsl:with-param name="bottom-width">
+					<xsl:choose>
+						<xsl:when test="count(following::lecture) = 0">2px</xsl:when>
+						<xsl:otherwise>1px</xsl:otherwise>
+					</xsl:choose>
+				</xsl:with-param>
+				<xsl:with-param name="right-width">1px</xsl:with-param>
+			</xsl:call-template>
 			<DIV CLASS="small"><xsl:apply-templates/></DIV>
 		</TD>
 	</xsl:template>
@@ -238,6 +332,15 @@
 	-->
 	<xsl:template match="lecture[@holiday]">
 		<TD CLASS="blue-ou-center" COLSPAN="2">
+			<xsl:call-template name="cell-borders">
+				<xsl:with-param name="bottom-width">
+					<xsl:choose>
+						<xsl:when test="count(following::lecture) = 0">2px</xsl:when>
+						<xsl:otherwise>1px</xsl:otherwise>
+					</xsl:choose>
+				</xsl:with-param>
+				<xsl:with-param name="right-width">1px</xsl:with-param>
+			</xsl:call-template>
 			<STRONG CLASS="small"><em><xsl:apply-templates/></em></STRONG>
 		</TD>
 	</xsl:template>
@@ -247,6 +350,15 @@
 	-->
 	<xsl:template match="lecture[not(node())]">
 		<TD CLASS="medgrey-center" COLSPAN="2">
+			<xsl:call-template name="cell-borders">
+				<xsl:with-param name="bottom-width">
+					<xsl:choose>
+						<xsl:when test="count(following::lecture) = 0">2px</xsl:when>
+						<xsl:otherwise>1px</xsl:otherwise>
+					</xsl:choose>
+				</xsl:with-param>
+				<xsl:with-param name="right-width">1px</xsl:with-param>
+			</xsl:call-template>
 			<xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text>
 		</TD>
 	</xsl:template>
@@ -263,6 +375,15 @@
 			</xsl:if>
 		</xsl:variable>
 		<TD CLASS="ltblue-center">
+			<xsl:call-template name="cell-borders">
+				<xsl:with-param name="bottom-width">
+					<xsl:choose>
+						<xsl:when test="count(following::laboratory) = 0">2px</xsl:when>
+						<xsl:otherwise>1px</xsl:otherwise>
+					</xsl:choose>
+				</xsl:with-param>
+				<xsl:with-param name="right-width">1px</xsl:with-param>
+			</xsl:call-template>
 			<xsl:attribute name="ROWSPAN">
 				<xsl:value-of select="$num-rows"/>
 			</xsl:attribute>
@@ -271,6 +392,15 @@
 			</DIV>
 		</TD>
 		<TD CLASS="ltblue-center">
+			<xsl:call-template name="cell-borders">
+				<xsl:with-param name="bottom-width">
+					<xsl:choose>
+						<xsl:when test="count(following::laboratory) = 0">2px</xsl:when>
+						<xsl:otherwise>1px</xsl:otherwise>
+					</xsl:choose>
+				</xsl:with-param>
+				<xsl:with-param name="right-width">1px</xsl:with-param>
+			</xsl:call-template>
 			<xsl:attribute name="ROWSPAN">
 				<xsl:value-of select="$num-rows"/>
 			</xsl:attribute>
@@ -283,6 +413,15 @@
 	-->
 	<xsl:template match="laboratory[not(node())]">
 		<TD CLASS="medgrey-center" COLSPAN="2">
+			<xsl:call-template name="cell-borders">
+				<xsl:with-param name="bottom-width">
+					<xsl:choose>
+						<xsl:when test="count(following::laboratory) = 0">2px</xsl:when>
+						<xsl:otherwise>1px</xsl:otherwise>
+					</xsl:choose>
+				</xsl:with-param>
+				<xsl:with-param name="right-width">1px</xsl:with-param>
+			</xsl:call-template>
 			<xsl:attribute name="ROWSPAN">
 				<xsl:value-of select="@rows"/>
 				<xsl:if test="not(@rows)">
@@ -305,6 +444,15 @@
 			</xsl:if>
 		</xsl:variable>
 		<TD CLASS="medgreen-center">
+			<xsl:call-template name="cell-borders">
+				<xsl:with-param name="bottom-width">
+					<xsl:choose>
+						<xsl:when test="count(following::tutorial) = 0">2px</xsl:when>
+						<xsl:otherwise>1px</xsl:otherwise>
+					</xsl:choose>
+				</xsl:with-param>
+				<xsl:with-param name="right-width">1px</xsl:with-param>
+			</xsl:call-template>
 			<xsl:attribute name="ROWSPAN">
 				<xsl:value-of select="$num-rows"/>
 			</xsl:attribute>
@@ -313,6 +461,15 @@
 			</DIV>
 		</TD>
 		<TD CLASS="medgreen-center">
+			<xsl:call-template name="cell-borders">
+				<xsl:with-param name="bottom-width">
+					<xsl:choose>
+						<xsl:when test="count(following::tutorial) = 0">2px</xsl:when>
+						<xsl:otherwise>1px</xsl:otherwise>
+					</xsl:choose>
+				</xsl:with-param>
+				<xsl:with-param name="right-width">1px</xsl:with-param>
+			</xsl:call-template>
 			<xsl:attribute name="ROWSPAN">
 				<xsl:value-of select="$num-rows"/>
 			</xsl:attribute>
@@ -325,6 +482,15 @@
 	-->
 	<xsl:template match="tutorial[not(node())]">
 		<TD CLASS="medgrey-center" COLSPAN="2">
+			<xsl:call-template name="cell-borders">
+				<xsl:with-param name="bottom-width">
+					<xsl:choose>
+						<xsl:when test="count(following::tutorial) = 0">2px</xsl:when>
+						<xsl:otherwise>1px</xsl:otherwise>
+					</xsl:choose>
+				</xsl:with-param>
+				<xsl:with-param name="right-width">1px</xsl:with-param>
+			</xsl:call-template>
 			<xsl:attribute name="ROWSPAN">
 				<xsl:value-of select="@rows"/>
 				<xsl:if test="not(@rows)">
@@ -341,6 +507,16 @@
 	-->
 	<xsl:template match="section[node()]|reading[node()]">
 		<TD CLASS="white-center">
+			<xsl:call-template name="cell-borders">
+				<xsl:with-param name="bottom-width">
+					<xsl:choose>
+						<xsl:when test="self::section and (count(following::section) = 0)">2px</xsl:when>
+						<xsl:when test="self::reading and (count(following::reading) = 0)">2px</xsl:when>
+						<xsl:otherwise>1px</xsl:otherwise>
+					</xsl:choose>
+				</xsl:with-param>
+				<xsl:with-param name="right-width">1px</xsl:with-param>
+			</xsl:call-template>
 			<xsl:attribute name="ROWSPAN">
 				<xsl:value-of select="@rows"/>
 				<xsl:if test="not(@rows)">
@@ -356,6 +532,16 @@
 	-->
 	<xsl:template match="section[not(node())]|reading[not(node())]">
 		<TD CLASS="medgrey-center">
+			<xsl:call-template name="cell-borders">
+				<xsl:with-param name="bottom-width">
+					<xsl:choose>
+						<xsl:when test="self::section and (count(following::section) = 0)">2px</xsl:when>
+						<xsl:when test="self::reading and (count(following::reading) = 0)">2px</xsl:when>
+						<xsl:otherwise>1px</xsl:otherwise>
+					</xsl:choose>
+				</xsl:with-param>
+				<xsl:with-param name="right-width">1px</xsl:with-param>
+			</xsl:call-template>
 			<xsl:attribute name="ROWSPAN">
 				<xsl:value-of select="@rows"/>
 				<xsl:if test="not(@rows)">
@@ -371,6 +557,15 @@
 	-->
 	<xsl:template match="assessment[node()]">
 		<TD CLASS="blue-bb-center">
+			<xsl:call-template name="cell-borders">
+				<xsl:with-param name="bottom-width">
+					<xsl:choose>
+						<xsl:when test="count(following::assessment) = 0">2px</xsl:when>
+						<xsl:otherwise>1px</xsl:otherwise>
+					</xsl:choose>
+				</xsl:with-param>
+				<xsl:with-param name="right-width">2px</xsl:with-param>
+			</xsl:call-template>
 			<xsl:attribute name="ROWSPAN">
 				<xsl:value-of select="@rows"/>
 				<xsl:if test="not(@rows)">
@@ -386,6 +581,15 @@
 	-->
 	<xsl:template match="assessment[not(node())]">
 		<TD CLASS="medgrey-center">
+			<xsl:call-template name="cell-borders">
+				<xsl:with-param name="bottom-width">
+					<xsl:choose>
+						<xsl:when test="count(following::assessment) = 0">2px</xsl:when>
+						<xsl:otherwise>1px</xsl:otherwise>
+					</xsl:choose>
+				</xsl:with-param>
+				<xsl:with-param name="right-width">2px</xsl:with-param>
+			</xsl:call-template>
 			<xsl:attribute name="ROWSPAN">
 				<xsl:value-of select="@rows"/>
 				<xsl:if test="not(@rows)">