diff --git a/forest.xsl b/forest.xsl
index 7ecda6b..eb78b23 100644
--- a/forest.xsl
+++ b/forest.xsl
@@ -204,11 +204,13 @@
             <xsl:text>#tree-</xsl:text>
             <xsl:value-of select="anchor" />
           </xsl:attribute>
-          <span class="toc-item-label">
+          <span class="taxon toc-item-label">
             <xsl:apply-templates select="taxon" />
-            <xsl:apply-templates select="trail" />
-            <xsl:if test="trail/crumb">
-              <xsl:text>. </xsl:text>
+            <xsl:if test="../@numbered='true' and ../@toc='true'">
+              <xsl:number format=" 1.1" count="tree[@toc='true' and @numbered='true']" level="multiple" />
+            </xsl:if>
+            <xsl:if test="taxon or (../@numbered='true' and ../@toc='true')">
+              <xsl:text>.&#160;</xsl:text>
             </xsl:if>
           </span>
           <xsl:apply-templates select="title" />
@@ -329,38 +331,21 @@
   </xsl:template>
 
   <xsl:template match="tree/frontmatter/taxon">
-    <span class="taxon">
-      <xsl:value-of select="." />
-      <xsl:if test="not(../trail/crumb)">
-        <xsl:text>. </xsl:text>
-      </xsl:if>
-    </span>
-  </xsl:template>
-
-  <xsl:template match="trail">
-    <xsl:text>&#160;</xsl:text>
-    <xsl:if test="crumb">
-      <xsl:for-each select="crumb">
-        <xsl:apply-templates />
-        <xsl:if test="position()!=last()">
-          <xsl:text>.</xsl:text>
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="crumb">
     <xsl:value-of select="." />
   </xsl:template>
 
   <xsl:template match="tree/frontmatter">
     <header>
       <h1>
-        <xsl:apply-templates select="taxon" />
-        <xsl:apply-templates select="trail" />
-        <xsl:if test="trail/crumb">
-          <xsl:text>. </xsl:text>
-        </xsl:if>
+        <span class="taxon">
+          <xsl:apply-templates select="taxon" />
+          <xsl:if test="../@numbered='true' and ../@toc='true'">
+            <xsl:number format=" 1.1" count="tree[@toc='true' and @numbered='true']" level="multiple" />
+          </xsl:if>
+          <xsl:if test="taxon or (../@numbered='true' and ../@toc='true')">
+            <xsl:text>.&#160;</xsl:text>
+          </xsl:if>
+        </span>
 
         <xsl:apply-templates select="title" />
         <xsl:text>&#032;</xsl:text>