diff --git a/src/generator/com/elovirta/pdf/toc.xsl b/src/generator/com/elovirta/pdf/toc.xsl
index 76e7098..af4735a 100644
--- a/src/generator/com/elovirta/pdf/toc.xsl
+++ b/src/generator/com/elovirta/pdf/toc.xsl
@@ -466,20 +466,59 @@
         </axsl:attribute>
       </axsl:attribute-set>
 
-      <axsl:attribute-set name="__toc__part__content" use-attribute-sets="__toc__topic__content">
-        <xsl:call-template name="generate-attribute-set">
-          <xsl:with-param name="prefix" select="'style-toc-part'"/>
-          <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
-        </xsl:call-template>
+      <axsl:attribute-set name="__toc__part__content">
+        <xsl:choose>
+          <xsl:when test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-part')">
+            <xsl:call-template name="generate-attribute-set">
+              <xsl:with-param name="prefix" select="'style-toc-part'"/>
+              <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
+            </xsl:call-template>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="generate-attribute-set">
+              <xsl:with-param name="prefix" select="'style-toc-1'"/>
+              <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
+            </xsl:call-template>
+          </xsl:otherwise>
+        </xsl:choose>
         <!-- Override PDF2 default -->
         <axsl:attribute name="padding-top">inherit</axsl:attribute>
       </axsl:attribute-set>
 
-      <axsl:attribute-set name="__toc__chapter__content" use-attribute-sets="__toc__topic__content">
-        <xsl:call-template name="generate-attribute-set">
-          <xsl:with-param name="prefix" select="'style-toc-chapter'"/>
-          <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
-        </xsl:call-template>
+      <axsl:attribute-set name="__toc__chapter__content">
+        <xsl:choose>
+          <xsl:when test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-chapter')">
+            <xsl:call-template name="generate-attribute-set">
+              <xsl:with-param name="prefix" select="'style-toc-chapter'"/>
+              <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
+            </xsl:call-template>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="generate-attribute-set">
+              <xsl:with-param name="prefix" select="'style-toc-1'"/>
+              <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
+            </xsl:call-template>
+          </xsl:otherwise>
+        </xsl:choose>
+        <!-- Override PDF2 default -->
+        <axsl:attribute name="padding-top">inherit</axsl:attribute>
+      </axsl:attribute-set>
+
+      <axsl:attribute-set name="__toc__appendix__content">
+        <xsl:choose>
+          <xsl:when test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-appendix')">
+            <xsl:call-template name="generate-attribute-set">
+              <xsl:with-param name="prefix" select="'style-toc-appendix'"/>
+              <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
+            </xsl:call-template>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="generate-attribute-set">
+              <xsl:with-param name="prefix" select="'style-toc-1'"/>
+              <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
+            </xsl:call-template>
+          </xsl:otherwise>
+        </xsl:choose>
         <!-- Override PDF2 default -->
         <axsl:attribute name="padding-top">inherit</axsl:attribute>
       </axsl:attribute-set>
@@ -513,27 +552,6 @@
       </axsl:attribute-set>
 
       <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-1')">
-        <axsl:attribute-set name="__toc__chapter__content">
-          <xsl:call-template name="generate-attribute-set">
-            <xsl:with-param name="prefix" select="'style-toc-1'"/>
-            <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
-          </xsl:call-template>
-        </axsl:attribute-set>
-
-        <axsl:attribute-set name="__toc__appendix__content">
-          <xsl:call-template name="generate-attribute-set">
-            <xsl:with-param name="prefix" select="'style-toc-1'"/>
-            <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
-          </xsl:call-template>
-        </axsl:attribute-set>
-
-        <axsl:attribute-set name="__toc__part__content">
-          <xsl:call-template name="generate-attribute-set">
-            <xsl:with-param name="prefix" select="'style-toc-1'"/>
-            <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
-          </xsl:call-template>
-        </axsl:attribute-set>
-
         <axsl:attribute-set name="__toc__preface__content">
           <xsl:call-template name="generate-attribute-set">
             <xsl:with-param name="prefix" select="'style-toc-1'"/>