diff --git a/src/main/plugins/org.dita.base/xsl/preprocess/mappullImpl.xsl b/src/main/plugins/org.dita.base/xsl/preprocess/mappullImpl.xsl
index 21324ebe86..80275d6173 100644
--- a/src/main/plugins/org.dita.base/xsl/preprocess/mappullImpl.xsl
+++ b/src/main/plugins/org.dita.base/xsl/preprocess/mappullImpl.xsl
@@ -910,6 +910,7 @@ Other modes can be found within the code, and may or may not prove useful for ov
                   <xsl:value-of select="normalize-space($grabbed-value)"/>
                 </xsl:when>
                 <xsl:otherwise>
+                  <!-- TODO: Replace with mode="mappull:linktext-fallback" -->
                   <xsl:call-template name="linktext-fallback"/>
                 </xsl:otherwise>
               </xsl:choose>
@@ -926,6 +927,7 @@ Other modes can be found within the code, and may or may not prove useful for ov
                   <xsl:value-of select="normalize-space($grabbed-value)"/>
                 </xsl:when>
                 <xsl:otherwise>
+                  <!-- TODO: Replace with mode="mappull:linktext-fallback" -->
                   <xsl:call-template name="linktext-fallback"/>
                 </xsl:otherwise>
               </xsl:choose>
diff --git a/src/main/plugins/org.dita.base/xsl/preprocess/topicpullImpl.xsl b/src/main/plugins/org.dita.base/xsl/preprocess/topicpullImpl.xsl
index 0adccd7c13..beab27da20 100644
--- a/src/main/plugins/org.dita.base/xsl/preprocess/topicpullImpl.xsl
+++ b/src/main/plugins/org.dita.base/xsl/preprocess/topicpullImpl.xsl
@@ -1136,6 +1136,7 @@ mode="topicpull:figure-linktext" and mode="topicpull:table-linktext"
     <xsl:param name="linkElement" as="element()" tunnel="yes"/>
     
     <xsl:for-each select="$linkElement">
+      <!-- TODO: Replace with mode="ditamsg:crossref-unordered-listitem" -->
       <xsl:call-template name="topicpull:referenced-invalid-list-item"/>
     </xsl:for-each>
   </xsl:template>
diff --git a/src/main/plugins/org.dita.html5/xsl/cover.xsl b/src/main/plugins/org.dita.html5/xsl/cover.xsl
index a68305fd02..f4280b6ef6 100644
--- a/src/main/plugins/org.dita.html5/xsl/cover.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/cover.xsl
@@ -137,12 +137,16 @@ See the accompanying LICENSE file for applicable license.
       <xsl:apply-templates select="." mode="addAttributesToBody"/>
       <xsl:call-template name="setidaname"/>
       <xsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-startprop ')]" mode="out-of-line"/>
+      <!-- TODO: Replace with mode="generateBreadcrumbs" -->
       <xsl:call-template name="generateBreadcrumbs"/>
+      <!-- TODO: Replace with mode="gen-user-header" -->
       <xsl:call-template name="gen-user-header"/>
+      <!-- TODO: Replace with mode="processHDR" -->
       <xsl:call-template name="processHDR"/>
       <xsl:if test="$INDEXSHOW = 'yes'">
         <xsl:apply-templates select="/*/*[contains(@class, ' map/topicmeta ')]/*[contains(@class, ' topic/keywords ')]/*[contains(@class, ' topic/indexterm ')]"/>
       </xsl:if>
+      <!-- TODO: Replace with mode="gen-user-sidetoc" -->
       <xsl:call-template name="gen-user-sidetoc"/>
       <xsl:choose>
         <xsl:when test="*[contains(@class, ' topic/title ')]">
@@ -156,8 +160,11 @@ See the accompanying LICENSE file for applicable license.
         <xsl:apply-templates select="." mode="normalize-map"/>
       </xsl:variable>
       <xsl:apply-templates select="$map" mode="toc"/>
+      <!-- TODO: Replace with mode="gen-endnotes" -->
       <xsl:call-template name="gen-endnotes"/>
+      <!-- TODO: Replace with mode="gen-user-footer" -->
       <xsl:call-template name="gen-user-footer"/>
+      <!-- TODO: Replace with mode="processFTR" -->
       <xsl:call-template name="processFTR"/>
       <xsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-endprop ')]" mode="out-of-line"/>
     </body>
@@ -165,6 +172,7 @@ See the accompanying LICENSE file for applicable license.
   
   <xsl:template match="*[contains(@class, ' map/map ')]/*[contains(@class, ' topic/title ')]">
     <h1 class="title topictitle1">
+      <!-- TODO: Replace with mode="gen-user-panel-title-pfx" -->
       <xsl:call-template name="gen-user-panel-title-pfx"/>
       <xsl:apply-templates/>
     </h1>
@@ -172,6 +180,7 @@ See the accompanying LICENSE file for applicable license.
   
   <xsl:template match="*[contains(@class, ' map/map ')]/@title">
     <h1 class="title topictitle1">
+      <!-- TODO: Replace with mode="gen-user-panel-title-pfx" -->
       <xsl:call-template name="gen-user-panel-title-pfx"/>
       <xsl:value-of select="."/>
     </h1>
@@ -179,6 +188,7 @@ See the accompanying LICENSE file for applicable license.
   
   <xsl:template match="*[contains(@class,' bookmap/bookmap ')]/*[contains(@class,' bookmap/booktitle ')]" priority="10">
     <h1 class="title topictitle1">
+      <!-- TODO: Replace with mode="gen-user-panel-title-pfx" -->
       <xsl:call-template name="gen-user-panel-title-pfx"/>
       <xsl:apply-templates select="*[contains(@class, ' bookmap/mainbooktitle ')]/node()"/>
     </h1>
@@ -188,14 +198,17 @@ See the accompanying LICENSE file for applicable license.
     <title>
       <xsl:choose>
         <xsl:when test="/*[contains(@class,' bookmap/bookmap ')]/*[contains(@class,' bookmap/booktitle ')]/*[contains(@class, ' bookmap/mainbooktitle ')]">
+          <!-- TODO: Replace with mode="gen-user-panel-title-pfx" -->
           <xsl:call-template name="gen-user-panel-title-pfx"/>
           <xsl:value-of select="/*[contains(@class,' bookmap/bookmap ')]/*[contains(@class,' bookmap/booktitle ')]/*[contains(@class, ' bookmap/mainbooktitle ')]"/>
         </xsl:when>
         <xsl:when test="/*[contains(@class,' map/map ')]/*[contains(@class,' topic/title ')]">
+          <!-- TODO: Replace with mode="gen-user-panel-title-pfx" -->
           <xsl:call-template name="gen-user-panel-title-pfx"/>
           <xsl:value-of select="/*[contains(@class,' map/map ')]/*[contains(@class,' topic/title ')]"/>
         </xsl:when>
         <xsl:when test="/*[contains(@class,' map/map ')]/@title">
+          <!-- TODO: Replace with mode="gen-user-panel-title-pfx" -->
           <xsl:call-template name="gen-user-panel-title-pfx"/>
           <xsl:value-of select="/*[contains(@class,' map/map ')]/@title"/>
         </xsl:when>
diff --git a/src/main/plugins/org.dita.html5/xsl/rel-links.xsl b/src/main/plugins/org.dita.html5/xsl/rel-links.xsl
index 27743fb6f2..7a2db62a1b 100644
--- a/src/main/plugins/org.dita.html5/xsl/rel-links.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/rel-links.xsl
@@ -66,6 +66,7 @@ See the accompanying LICENSE file for applicable license.
                     <!--use xref content-->
                   </xsl:when>
                   <xsl:otherwise>
+                    <!-- TODO: Replace with mode="determine-final-href" -->
                     <xsl:call-template name="href"/><!--use href text-->
                   </xsl:otherwise>
                 </xsl:choose>
@@ -81,6 +82,7 @@ See the accompanying LICENSE file for applicable license.
                   <xsl:value-of select="replace(@href, '^mailto:', '')"/><!--remove mailto: prefix from href text-->
                 </xsl:when>
                 <xsl:otherwise>
+                  <!-- TODO: Replace with mode="determine-final-href" -->
                   <xsl:call-template name="href"/><!--use href text-->
                 </xsl:otherwise>
               </xsl:choose>
@@ -461,6 +463,7 @@ Each child is indented, the linktext is bold, and the shortdesc appears in norma
             </xsl:when>
             <xsl:otherwise>
               <!--use href-->
+              <!-- TODO: Replace with mode="determine-final-href" -->
               <xsl:call-template name="href"/>
             </xsl:otherwise>
           </xsl:choose>
@@ -496,6 +499,7 @@ Each child is indented, the linktext is bold, and the shortdesc appears in norma
           </xsl:when>
           <xsl:otherwise>
             <!--use href-->
+            <!-- TODO: Replace with mode="determine-final-href" -->
             <xsl:call-template name="href"/>
           </xsl:otherwise>
         </xsl:choose>
@@ -570,6 +574,7 @@ Each child is indented, the linktext is bold, and the shortdesc appears in norma
         </xsl:when>
         <xsl:otherwise>
           <!--use href-->
+          <!-- TODO: Replace with mode="determine-final-href" -->
           <xsl:call-template name="href"/>
         </xsl:otherwise>
       </xsl:choose>
@@ -712,6 +717,7 @@ Each child is indented, the linktext is bold, and the shortdesc appears in norma
           <xsl:value-of select="normalize-space(*[contains(@class, ' topic/linktext ')])"/>
         </xsl:when>
         <xsl:otherwise>
+          <!-- TODO: Replace with mode="determine-final-href" -->
           <xsl:call-template name="href"/>
         </xsl:otherwise>
       </xsl:choose>
diff --git a/src/main/plugins/org.dita.html5/xsl/topic.xsl b/src/main/plugins/org.dita.html5/xsl/topic.xsl
index da16b83d70..616da29dd0 100644
--- a/src/main/plugins/org.dita.html5/xsl/topic.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/topic.xsl
@@ -597,6 +597,7 @@ See the accompanying LICENSE file for applicable license.
         <xsl:when test="@href">
           <br/><div><a>
             <xsl:attribute name="href">
+              <!-- TODO: Replace with mode="determine-final-href" -->
               <xsl:call-template name="href"/>
             </xsl:attribute>
             <xsl:choose>
@@ -2328,9 +2329,12 @@ See the accompanying LICENSE file for applicable license.
 
 <xsl:template name="chapter-setup">
 <html>
+  <!-- TODO: Replace with mode="setTopicLanguage" -->
   <xsl:call-template name="setTopicLanguage"/>
+  <!-- TODO: Replace with mode="chapterHead" -->
   <xsl:call-template name="chapterHead"/>
-  <xsl:call-template name="chapterBody"/> 
+  <!-- TODO: Replace with mode="chapterBody" -->
+  <xsl:call-template name="chapterBody"/>
 </html>
 </xsl:template>
 
@@ -2357,16 +2361,25 @@ See the accompanying LICENSE file for applicable license.
   <xsl:template match="*" mode="chapterHead">
     <head>
       <!-- initial meta information -->
+      <!-- TODO: Replace with mode="generateCharset" -->
       <xsl:call-template name="generateCharset"/>   <!-- Set the character set to UTF-8 -->
       <xsl:apply-templates select="." mode="generateDefaultCopyright"/> <!-- Generate a default copyright, if needed -->
+      <!-- TODO: Replace with mode="generateDefaultMeta" -->
       <xsl:call-template name="generateDefaultMeta"/> <!-- Standard meta for security, robots, etc -->
       <xsl:apply-templates select="." mode="getMeta"/> <!-- Process metadata from topic prolog -->
+      <!-- TODO: Replace with mode="copyright" -->
       <xsl:call-template name="copyright"/>         <!-- Generate copyright, if specified manually -->
+      <!-- TODO: Replace with mode="generateChapterTitle" -->
       <xsl:call-template name="generateChapterTitle"/> <!-- Generate the <title> element -->
+      <!-- TODO: Replace with mode="gen-user-head" -->
       <xsl:call-template name="gen-user-head" />    <!-- include user's XSL HEAD processing here -->
+      <!-- TODO: Replace with mode="gen-user-scripts" -->
       <xsl:call-template name="gen-user-scripts" /> <!-- include user's XSL javascripts here -->
+      <!-- TODO: Replace with mode="gen-user-styles" -->
       <xsl:call-template name="gen-user-styles" />  <!-- include user's XSL style element and content here -->
+      <!-- TODO: Replace with mode="processHDF" -->
       <xsl:call-template name="processHDF"/>        <!-- Add user HDF file, if specified -->
+      <!-- TODO: Replace with mode="generateCssLinks" -->
       <xsl:call-template name="generateCssLinks"/>  <!-- Generate links to CSS files -->
     </head>
   </xsl:template>
@@ -2468,6 +2481,7 @@ See the accompanying LICENSE file for applicable license.
   <xsl:template match="/ | @* | node()" mode="generateChapterTitle">
     <!-- Title processing - special handling for short descriptions -->
     <title>
+      <!-- TODO: Replace with mode="gen-user-panel-title-pfx" -->
       <xsl:call-template name="gen-user-panel-title-pfx"/> <!-- hook for a user-XSL title prefix -->
       <xsl:variable name="maintitle"><xsl:apply-templates select="/*[contains(@class, ' topic/topic ')]/*[contains(@class, ' topic/title ')]" mode="text-only"/></xsl:variable>
       <xsl:variable name="ditamaintitle"><xsl:apply-templates select="/dita/*[contains(@class, ' topic/topic ')][1]/*[contains(@class, ' topic/title ')]" mode="text-only"/></xsl:variable>
@@ -2502,6 +2516,7 @@ See the accompanying LICENSE file for applicable license.
       <xsl:apply-templates select="." mode="addHeaderToHtmlBodyElement"/>
 
       <!-- Include a user's XSL call here to generate a toc based on what's a child of topic -->
+      <!-- TODO: Replace with mode="gen-user-sidetoc" -->
       <xsl:call-template name="gen-user-sidetoc"/>
 
       <xsl:apply-templates select="." mode="addContentToHtmlBodyElement"/>
@@ -2539,8 +2554,12 @@ See the accompanying LICENSE file for applicable license.
   <!-- Process <body> content that is appropriate for HTML5 header section. -->
   <xsl:template match="*" mode="addHeaderToHtmlBodyElement">
     <xsl:variable name="header-content" as="node()*">
+      <!-- TODO: Replace with mode="generateBreadcrumbs" -->
       <xsl:call-template name="generateBreadcrumbs"/>
+        <!-- include user's XSL running header here -->
+      <!-- TODO: Replace with mode="gen-user-header" -->
       <xsl:call-template name="gen-user-header"/>  <!-- include user's XSL running header here -->
+      <!-- TODO: Replace with mode="processHDR" -->
       <xsl:call-template name="processHDR"/>
       <xsl:if test="$INDEXSHOW = 'yes'">
         <xsl:apply-templates select="/*/*[contains(@class, ' topic/prolog ')]/*[contains(@class, ' topic/metadata ')]/*[contains(@class, ' topic/keywords ')]/*[contains(@class, ' topic/indexterm ')] |
@@ -2578,6 +2597,7 @@ See the accompanying LICENSE file for applicable license.
                                <!-- followed by body content, again by fall-through in document order -->
                                <!-- followed by related links -->
                                <!-- followed by child topics by fall-through -->
+        <!-- TODO: Replace with mode="gen-endnotes" -->
         <xsl:call-template name="gen-endnotes"/>    <!-- include footnote-endnotes -->
         <xsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-endprop ')]" mode="out-of-line"/>
       </article>
@@ -2591,7 +2611,9 @@ See the accompanying LICENSE file for applicable license.
 
   <xsl:template match="*" mode="addFooterToHtmlBodyElement">
     <xsl:variable name="footer-content" as="node()*">
+      <!-- TODO: Replace with mode="gen-user-footer" -->
       <xsl:call-template name="gen-user-footer"/> <!-- include user's XSL running footer here -->
+      <!-- TODO: Replace with mode="processFTR" -->
       <xsl:call-template name="processFTR"/>      <!-- Include XHTML footer, if specified -->
     </xsl:variable>
     <xsl:if test="exists($footer-content)">
diff --git a/src/main/plugins/org.dita.html5/xsl/ut-d.xsl b/src/main/plugins/org.dita.html5/xsl/ut-d.xsl
index 7d77041cfd..4637815d74 100644
--- a/src/main/plugins/org.dita.html5/xsl/ut-d.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/ut-d.xsl
@@ -114,6 +114,7 @@ See the accompanying LICENSE file for applicable license.
   
   <!-- In the context of XREF - call it's HREF processor -->
   <xsl:template match="*[contains(@class, ' topic/xref ')]" mode="imagemap-xref">
+   <!-- TODO: Replace with mode="determine-final-href" -->
    <xsl:attribute name="href"><xsl:call-template name="href"/></xsl:attribute>
    <xsl:if test="@scope='external' or @type='external' or ((@format='PDF' or @format='pdf') and not(@scope='local'))">
      <xsl:apply-templates select="." mode="external-link"/>
diff --git a/src/main/plugins/org.dita.pdf2.fop/xsl/fo/tables_fop.xsl b/src/main/plugins/org.dita.pdf2.fop/xsl/fo/tables_fop.xsl
index 061fc0c402..d6c7758062 100644
--- a/src/main/plugins/org.dita.pdf2.fop/xsl/fo/tables_fop.xsl
+++ b/src/main/plugins/org.dita.pdf2.fop/xsl/fo/tables_fop.xsl
@@ -15,6 +15,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' topic/dt ')]">
         <fo:block xsl:use-attribute-sets="dlentry.dt__content">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:if test="not(preceding-sibling::*[contains(@class,' topic/dt ')])">
               <xsl:apply-templates select="../@id" mode="dlentry-id-for-fop"/>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/commons.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/commons.xsl
index 774d5ebe39..e61ec0c6d5 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/commons.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/commons.xsl
@@ -254,6 +254,7 @@ See the accompanying LICENSE file for applicable license.
     </xsl:template>
     <xsl:template match="*" mode="processTopicChapterInsideFlow">
         <fo:block xsl:use-attribute-sets="topic">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:variable name="level" as="xs:integer">
               <xsl:apply-templates select="." mode="get-topic-level"/>
@@ -329,6 +330,7 @@ See the accompanying LICENSE file for applicable license.
     </xsl:template>
     <xsl:template match="*" mode="processTopicAppendixInsideFlow">
         <fo:block xsl:use-attribute-sets="topic">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:variable name="level" as="xs:integer">
               <xsl:apply-templates select="." mode="get-topic-level"/>
@@ -406,6 +408,7 @@ See the accompanying LICENSE file for applicable license.
   </xsl:template>
   <xsl:template match="*" mode="processTopicAppendicesInsideFlow">
     <fo:block xsl:use-attribute-sets="topic">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:if test="empty(ancestor::*[contains(@class, ' topic/topic ')])">
         <fo:marker marker-class-name="current-topic-number">
@@ -488,6 +491,7 @@ See the accompanying LICENSE file for applicable license.
     </xsl:template>
     <xsl:template match="*" mode="processTopicPartInsideFlow">
         <fo:block xsl:use-attribute-sets="topic">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:if test="empty(ancestor::*[contains(@class, ' topic/topic ')])">
                 <fo:marker marker-class-name="current-topic-number">
@@ -557,6 +561,7 @@ See the accompanying LICENSE file for applicable license.
             <xsl:call-template name="insertPrefaceStaticContents"/>
             <fo:flow flow-name="xsl-region-body">
                 <fo:block xsl:use-attribute-sets="topic">
+                    <!-- TODO: Replace with mode="commonattributes" -->
                     <xsl:call-template name="commonattributes"/>
                     <xsl:if test="empty(ancestor::*[contains(@class, ' topic/topic ')])">
                         <fo:marker marker-class-name="current-topic-number">
@@ -628,6 +633,7 @@ See the accompanying LICENSE file for applicable license.
     </xsl:template>
     <xsl:template match="*" mode="processTopicFrontMatterInsideFlow">
                  <fo:block xsl:use-attribute-sets="topic">
+                     <!-- TODO: Replace with mode="commonattributes" -->
                      <xsl:call-template name="commonattributes"/>
                      <xsl:if test="not(ancestor::*[contains(@class, ' topic/topic ')])">
                          <fo:marker marker-class-name="current-topic-number">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/concept.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/concept.xsl
index a439fb8879..aaa0afc1b1 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/concept.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/concept.xsl
@@ -61,18 +61,21 @@ See the accompanying LICENSE file for applicable license.
         <xsl:when test="not(node())"/>
         <xsl:when test="$level = 1">
             <fo:block xsl:use-attribute-sets="body__toplevel conbody">
+                <!-- TODO: Replace with mode="commonattributes" -->
                 <xsl:call-template name="commonattributes"/>
                 <xsl:apply-templates/>
             </fo:block>
         </xsl:when>
         <xsl:when test="$level = 2">
             <fo:block xsl:use-attribute-sets="body__secondLevel conbody">
+                <!-- TODO: Replace with mode="commonattributes" -->
                 <xsl:call-template name="commonattributes"/>
                 <xsl:apply-templates/>
             </fo:block>
         </xsl:when>
         <xsl:otherwise>
             <fo:block xsl:use-attribute-sets="conbody">
+                <!-- TODO: Replace with mode="commonattributes" -->
                 <xsl:call-template name="commonattributes"/>
                 <xsl:apply-templates/>
             </fo:block>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/glossary.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/glossary.xsl
index 227da26cbf..d0902e3e32 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/glossary.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/glossary.xsl
@@ -35,6 +35,7 @@ See the accompanying LICENSE file for applicable license.
 
   <xsl:template match="ot-placeholder:glossarylist//*[contains(@class, ' glossentry/glossentry ')]">
     <fo:block>
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <fo:block>
         <xsl:attribute name="id">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/hazard-d.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/hazard-d.xsl
index 3554afc362..20272e183b 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/hazard-d.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/hazard-d.xsl
@@ -14,6 +14,7 @@ See the accompanying license.txt file for applicable licenses.
     <xsl:variable name="type" select="(@type, 'caution')[1]" as="xs:string"/>
     <xsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-startprop ')]" mode="outofline"/>
     <fo:table xsl:use-attribute-sets="hazardstatement">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:call-template name="globalAtts"/>
       <xsl:call-template name="displayAtts">
@@ -100,6 +101,7 @@ See the accompanying license.txt file for applicable licenses.
   
   <xsl:template match="*[contains(@class, ' hazard-d/typeofhazard ')]">
     <fo:block xsl:use-attribute-sets="p">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:apply-templates/>
     </fo:block>
@@ -107,6 +109,7 @@ See the accompanying license.txt file for applicable licenses.
 
   <xsl:template match="*[contains(@class, ' hazard-d/consequence ')]">
     <fo:block xsl:use-attribute-sets="p">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:apply-templates/>
     </fo:block>
@@ -114,6 +117,7 @@ See the accompanying license.txt file for applicable licenses.
   
   <xsl:template match="*[contains(@class, ' hazard-d/howtoavoid ')]">
     <fo:block xsl:use-attribute-sets="p">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:apply-templates/>
     </fo:block>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/hi-domain.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/hi-domain.xsl
index 4316ebdcc1..e662fdf9ee 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/hi-domain.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/hi-domain.xsl
@@ -37,6 +37,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' hi-d/b ')]">
         <fo:inline xsl:use-attribute-sets="b">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:inline>
@@ -44,6 +45,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' hi-d/i ')]">
       <fo:inline xsl:use-attribute-sets="i">
+        <!-- TODO: Replace with mode="commonattributes" -->
         <xsl:call-template name="commonattributes"/>
         <xsl:apply-templates/>
       </fo:inline>
@@ -51,6 +53,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' hi-d/u ')]">
       <fo:inline xsl:use-attribute-sets="u">
+        <!-- TODO: Replace with mode="commonattributes" -->
         <xsl:call-template name="commonattributes"/>
         <xsl:apply-templates/>
       </fo:inline>
@@ -58,6 +61,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' hi-d/tt ')]">
       <fo:inline xsl:use-attribute-sets="tt">
+        <!-- TODO: Replace with mode="commonattributes" -->
         <xsl:call-template name="commonattributes"/>
         <xsl:apply-templates/>
       </fo:inline>
@@ -65,6 +69,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' hi-d/sup ')]">
       <fo:inline xsl:use-attribute-sets="sup">
+        <!-- TODO: Replace with mode="commonattributes" -->
         <xsl:call-template name="commonattributes"/>
         <xsl:apply-templates/>
       </fo:inline>
@@ -72,6 +77,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' hi-d/sub ')]">
       <fo:inline xsl:use-attribute-sets="sub">
+        <!-- TODO: Replace with mode="commonattributes" -->
         <xsl:call-template name="commonattributes"/>
         <xsl:apply-templates/>
       </fo:inline>
@@ -79,6 +85,7 @@ See the accompanying LICENSE file for applicable license.
 
   <xsl:template match="*[contains(@class,' hi-d/line-through ')]">
     <fo:inline xsl:use-attribute-sets="line-through">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:apply-templates/>
     </fo:inline>
@@ -86,9 +93,10 @@ See the accompanying LICENSE file for applicable license.
   
   <xsl:template match="*[contains(@class,' hi-d/overline ')]">
     <fo:inline xsl:use-attribute-sets="overline">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:apply-templates/>
     </fo:inline>
   </xsl:template>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/links.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/links.xsl
index cb6ce76529..4c85298ac9 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/links.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/links.xsl
@@ -272,6 +272,7 @@ See the accompanying LICENSE file for applicable license.
     </xsl:variable>
 
     <fo:basic-link xsl:use-attribute-sets="xref">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:call-template name="buildBasicLinkDestination">
         <xsl:with-param name="scope" select="@scope"/>
@@ -339,6 +340,7 @@ See the accompanying LICENSE file for applicable license.
 
   <xsl:template match="*[contains(@class,' topic/xref ')][empty(@href)]" priority="2">
     <fo:inline>
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:apply-templates select="*[not(contains(@class,' topic/desc '))] | text()" />
     </fo:inline>
@@ -420,6 +422,7 @@ See the accompanying LICENSE file for applicable license.
       <fo:list-block xsl:use-attribute-sets="related-links.ul">
         <xsl:for-each select="$children[generate-id(.) = generate-id(key('link', related-links:link(.))[1])]">
           <fo:list-item xsl:use-attribute-sets="related-links.ul.li">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:list-item-label xsl:use-attribute-sets="related-links.ul.li__label">
               <fo:block xsl:use-attribute-sets="related-links.ul.li__label__content">
@@ -449,6 +452,7 @@ See the accompanying LICENSE file for applicable license.
       <fo:list-block xsl:use-attribute-sets="related-links.ol">
         <xsl:for-each select="($children[generate-id(.) = generate-id(key('link', related-links:link(.))[1])])">
           <fo:list-item xsl:use-attribute-sets="related-links.ol.li">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:list-item-label xsl:use-attribute-sets="related-links.ol.li__label">
               <fo:block xsl:use-attribute-sets="related-links.ol.li__label__content">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/lists.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/lists.xsl
index 934da3cf3f..d198259aa9 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/lists.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/lists.xsl
@@ -42,6 +42,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:template match="*[contains(@class, ' topic/ul ')]">
         <xsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-startprop ')]" mode="outofline"/>
         <fo:list-block xsl:use-attribute-sets="ul">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:list-block>
@@ -53,6 +54,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:template match="*[contains(@class, ' topic/ol ')]">
         <xsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-startprop ')]" mode="outofline"/>
         <fo:list-block xsl:use-attribute-sets="ol">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:list-block>
@@ -64,6 +66,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:template match="*[contains(@class, ' topic/ul ')]/*[contains(@class, ' topic/li ')]">
         <xsl:variable name="depth" select="count(ancestor::*[contains(@class, ' topic/ul ')])"/>
         <fo:list-item xsl:use-attribute-sets="ul.li">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:list-item-label xsl:use-attribute-sets="ul.li__label">
                 <fo:block xsl:use-attribute-sets="ul.li__label__content">
@@ -88,6 +91,7 @@ See the accompanying LICENSE file for applicable license.
           </xsl:call-template>
         </xsl:variable>
         <fo:list-item xsl:use-attribute-sets="ol.li">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:list-item-label xsl:use-attribute-sets="ol.li__label">
                 <fo:block xsl:use-attribute-sets="ol.li__label__content">
@@ -111,6 +115,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' topic/li ')]/*[contains(@class, ' topic/itemgroup ')]">
         <fo:block xsl:use-attribute-sets="li.itemgroup">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:block>
@@ -119,6 +124,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:template match="*[contains(@class, ' topic/sl ')]">
         <xsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-startprop ')]" mode="outofline"/>
         <fo:list-block xsl:use-attribute-sets="sl">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:list-block>
@@ -129,6 +135,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' topic/sl ')]/*[contains(@class, ' topic/sli ')]">
         <fo:list-item xsl:use-attribute-sets="sl.sli">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:list-item-label xsl:use-attribute-sets="sl.sli__label">
                 <fo:block xsl:use-attribute-sets="sl.sli__label__content">
@@ -142,4 +149,4 @@ See the accompanying LICENSE file for applicable license.
         </fo:list-item>
     </xsl:template>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/markup-domain.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/markup-domain.xsl
index 6a96422b76..51065573c3 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/markup-domain.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/markup-domain.xsl
@@ -12,6 +12,7 @@ See the accompanying LICENSE file for applicable license.
   
   <xsl:template match="*[contains(@class, ' markup-d/markupname ')]">
     <fo:inline xsl:use-attribute-sets="markupname">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:apply-templates/>
     </fo:inline>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/pr-domain.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/pr-domain.xsl
index 4b4b179e92..aff3120800 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/pr-domain.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/pr-domain.xsl
@@ -39,6 +39,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/codeph ')]">
         <fo:inline xsl:use-attribute-sets="codeph">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:inline>
@@ -65,6 +66,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:template match="*[contains(@class,' pr-d/codeblock ')]">
         <xsl:call-template name="generateAttrLabel"/>
         <fo:block xsl:use-attribute-sets="codeblock">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:call-template name="setFrame"/>
             <xsl:call-template name="setScale"/>
@@ -222,6 +224,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/var ') or contains(@class,' syntaxdiagram-d/var ')]">
         <fo:inline xsl:use-attribute-sets="var">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:inline>
@@ -235,6 +238,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/synph ') or contains(@class,' syntaxdiagram-d/synph ')]">
         <fo:inline xsl:use-attribute-sets="synph">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:inline>
@@ -242,6 +246,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/oper ') or contains(@class,' syntaxdiagram-d/oper ')]">
         <fo:inline xsl:use-attribute-sets="oper">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:inline>
@@ -249,6 +254,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/delim ') or contains(@class,' syntaxdiagram-d/delim ')]">
         <fo:inline xsl:use-attribute-sets="delim">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:inline>
@@ -256,6 +262,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/sep ') or contains(@class,' syntaxdiagram-d/sep ')]">
         <fo:inline xsl:use-attribute-sets="sep">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:inline>
@@ -270,6 +277,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:template match="*[contains(@class,' pr-d/parml ')]">
         <xsl:call-template name="generateAttrLabel"/>
         <fo:block xsl:use-attribute-sets="parml">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:block>
@@ -277,6 +285,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/plentry ')]">
         <fo:block xsl:use-attribute-sets="plentry">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:block>
@@ -300,6 +309,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/pd ')]">
         <fo:block xsl:use-attribute-sets="pd">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:block>
@@ -307,6 +317,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/synblk ') or contains(@class,' syntaxdiagram-d/synblk ')]">
         <fo:inline xsl:use-attribute-sets="synblk">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:inline>
@@ -314,6 +325,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/synnoteref ') or contains(@class,' syntaxdiagram-d/synnoteref ')]">
         <fo:inline xsl:use-attribute-sets="synnoteref">
+        <!-- TODO: Replace with mode="commonattributes" -->
         <xsl:call-template name="commonattributes"/>
         [<xsl:value-of select="@refid"/>] <!--TODO: synnoteref-->
         </fo:inline>
@@ -321,6 +333,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/synnote ') or contains(@class,' syntaxdiagram-d/synnote ')]">
         <fo:inline xsl:use-attribute-sets="synnote"> <!--TODO: synnote-->
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:choose>
                 <xsl:when test="not(@id='')"> <!-- case of an explicit id -->
@@ -338,6 +351,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/syntaxdiagram ') or contains(@class,' syntaxdiagram-d/syntaxdiagram ')]">
         <fo:block xsl:use-attribute-sets="syntaxdiagram"> <!--TODO: syntaxdiagram-->
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:block>
@@ -345,6 +359,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/fragment ') or contains(@class,' syntaxdiagram-d/fragment ')]">
         <fo:block xsl:use-attribute-sets="fragment">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:value-of select="*[contains(@class,' topic/title ')]"/>
             <xsl:text> </xsl:text>
@@ -354,6 +369,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/syntaxdiagram ') or contains(@class,' syntaxdiagram-d/syntaxdiagram ')]/*[contains(@class,' topic/title ')]">
         <fo:block xsl:use-attribute-sets="syntaxdiagram.title">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates select="." mode="customTitleAnchor"/>
             <xsl:apply-templates/>
@@ -362,6 +378,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/kwd ') or contains(@class,' syntaxdiagram-d/kwd ')]">
         <fo:inline xsl:use-attribute-sets="kwd">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:if test="parent::*[contains(@class,' pr-d/groupchoice ') or contains(@class,' syntaxdiagram-d/groupchoice ')]">
                 <xsl:if test="count(preceding-sibling::*)!=0"> | </xsl:if>
@@ -383,6 +400,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/fragref ')]">
         <fo:inline xsl:use-attribute-sets="fragref">     <!--TODO: fragref-->
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:text>&lt;</xsl:text>
             <xsl:apply-templates/>
@@ -392,6 +410,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/fragment ') or contains(@class,' syntaxdiagram-d/fragment ')]/*[contains(@class,' topic/title ')]">
         <fo:block xsl:use-attribute-sets="fragment.title">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:block>
@@ -399,6 +418,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/fragment ') or contains(@class,' syntaxdiagram-d/fragment ')]/*[contains(@class,' pr-d/groupcomp ') or contains(@class,' syntaxdiagram-d/groupcomp ')]|*[contains(@class,' pr-d/fragment ') or contains(@class,' syntaxdiagram-d/fragment ')]/*[contains(@class,' pr-d/groupchoice ') or contains(@class,' syntaxdiagram-d/groupchoice ')]|*[contains(@class,' pr-d/fragment ') or contains(@class,' syntaxdiagram-d/fragment ')]/*[contains(@class,' pr-d/groupseq ') or contains(@class,' syntaxdiagram-d/groupseq ')]">
         <fo:block xsl:use-attribute-sets="fragment.group">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:call-template name="makeGroup"/>
         </fo:block>
@@ -406,6 +426,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' pr-d/syntaxdiagram ') or contains(@class,' syntaxdiagram-d/syntaxdiagram ')]/*[contains(@class,' pr-d/groupcomp ') or contains(@class,' syntaxdiagram-d/groupcomp ')]|*[contains(@class,' pr-d/syntaxdiagram ') or contains(@class,' syntaxdiagram-d/syntaxdiagram ')]/*[contains(@class,' pr-d/groupseq ') or contains(@class,' syntaxdiagram-d/groupseq ')]|*[contains(@class,' pr-d/syntaxdiagram ') or contains(@class,' syntaxdiagram-d/syntaxdiagram ')]/*[contains(@class,' pr-d/groupchoice ') or contains(@class,' syntaxdiagram-d/groupchoice ')]">
         <fo:block xsl:use-attribute-sets="syntaxdiagram.group">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:call-template name="makeGroup"/>
         </fo:block>
@@ -414,6 +435,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:template match="*[contains(@class,' pr-d/groupcomp ') or contains(@class,' syntaxdiagram-d/groupcomp ') or contains(@class,' pr-d/groupchoice ') or contains(@class,' syntaxdiagram-d/groupchoice ') or contains(@class,' pr-d/groupseq ') or contains(@class,' syntaxdiagram-d/groupseq ')]/
         *[contains(@class,' pr-d/groupcomp ') or contains(@class,' syntaxdiagram-d/groupcomp ') or contains(@class,' pr-d/groupchoice ') or contains(@class,' syntaxdiagram-d/groupchoice ') or contains(@class,' pr-d/groupseq ') or contains(@class,' syntaxdiagram-d/groupseq ')]">
         <fo:inline>
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:call-template name="makeGroup"/>
         </fo:inline>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/preface.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/preface.xsl
index f268a7e826..d5449c3f61 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/preface.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/preface.xsl
@@ -57,6 +57,7 @@ See the accompanying LICENSE file for applicable license.
      </xsl:template>
      <xsl:template match="*" mode="processTopicPrefaceInsideFlow">
          <fo:block xsl:use-attribute-sets="topic">
+             <!-- TODO: Replace with mode="commonattributes" -->
              <xsl:call-template name="commonattributes"/>
              <xsl:if test="not(ancestor::*[contains(@class, ' topic/topic ')])">
                  <fo:marker marker-class-name="current-topic-number">
@@ -81,4 +82,4 @@ See the accompanying LICENSE file for applicable license.
          </fo:block>
      </xsl:template>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/reference-elements.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/reference-elements.xsl
index a10d844bc9..20affb1535 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/reference-elements.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/reference-elements.xsl
@@ -33,18 +33,21 @@ See the accompanying LICENSE file for applicable license.
       <xsl:when test="not(node())"/>
       <xsl:when test="$level = 1">
         <fo:block xsl:use-attribute-sets="body__toplevel refbody">
+          <!-- TODO: Replace with mode="commonattributes" -->
           <xsl:call-template name="commonattributes"/>
           <xsl:apply-templates/>
         </fo:block>
       </xsl:when>
       <xsl:when test="$level = 2">
         <fo:block xsl:use-attribute-sets="body__secondLevel refbody">
+          <!-- TODO: Replace with mode="commonattributes" -->
           <xsl:call-template name="commonattributes"/>
           <xsl:apply-templates/>
         </fo:block>
       </xsl:when>
       <xsl:otherwise>
         <fo:block xsl:use-attribute-sets="refbody">
+          <!-- TODO: Replace with mode="commonattributes" -->
           <xsl:call-template name="commonattributes"/>
           <xsl:apply-templates/>
         </fo:block>
@@ -54,6 +57,7 @@ See the accompanying LICENSE file for applicable license.
 
   <xsl:template match="*[contains(@class, ' reference/refsyn ')]">
     <fo:block xsl:use-attribute-sets="refsyn">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:apply-templates select="." mode="dita2xslfo:section-heading"/>
       <xsl:apply-templates select="*[contains(@class,' topic/title ')]"/>
@@ -71,6 +75,7 @@ See the accompanying LICENSE file for applicable license.
 
   <xsl:template match="*[contains(@class, ' reference/properties ')]">
     <fo:table xsl:use-attribute-sets="properties">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:call-template name="univAttrs"/>
       <xsl:call-template name="globalAtts"/>
@@ -131,6 +136,7 @@ See the accompanying LICENSE file for applicable license.
 
   <xsl:template match="*[contains(@class, ' reference/property ')]">
     <fo:table-row xsl:use-attribute-sets="property">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:variable name="valuePos">
         <xsl:apply-templates select="." mode="get-propvalue-position"/>
@@ -246,6 +252,7 @@ See the accompanying LICENSE file for applicable license.
   <xsl:template match="*[contains(@class, ' reference/proptype ') or contains(@class, ' reference/propvalue ') or contains(@class, ' reference/propdesc ')]">
     <xsl:param name="entryCol"/>
     <fo:table-cell xsl:use-attribute-sets="property.entry">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:variable name="frame">
         <xsl:variable name="f" select="ancestor::*[contains(@class, ' reference/properties ')][1]/@frame"/>
@@ -287,6 +294,7 @@ See the accompanying LICENSE file for applicable license.
 
   <xsl:template match="*[contains(@class, ' reference/prophead ')]">
     <fo:table-header xsl:use-attribute-sets="prophead">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:variable name="frame">
         <xsl:variable name="f" select="ancestor::*[contains(@class, ' reference/properties ')][1]/@frame"/>
@@ -388,6 +396,7 @@ See the accompanying LICENSE file for applicable license.
   <xsl:template match="*[contains(@class, ' reference/proptypehd ') or contains(@class, ' reference/propvaluehd ') or contains(@class, ' reference/propdeschd ')]">
     <xsl:param name="entryCol"/>
     <fo:table-cell xsl:use-attribute-sets="prophead.entry">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:variable name="frame">
         <xsl:variable name="f" select="ancestor::*[contains(@class, ' reference/properties ')][1]/@frame"/>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/root-processing.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/root-processing.xsl
index eae6c38c08..59fe65fff6 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/root-processing.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/root-processing.xsl
@@ -80,6 +80,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:variable name="topicNumbers">
         <xsl:for-each select="//*[contains(@class, ' topic/topic ')]">
             <topic guid="{generate-id()}">
+                <!-- TODO: Replace with mode="commonattributes" -->
                 <xsl:call-template name="commonattributes"/>
             </topic>
         </xsl:for-each>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/sw-domain.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/sw-domain.xsl
index 60c9eea06f..6df4745317 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/sw-domain.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/sw-domain.xsl
@@ -37,6 +37,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' sw-d/msgph ')]">
       <fo:inline xsl:use-attribute-sets="msgph">
+        <!-- TODO: Replace with mode="commonattributes" -->
         <xsl:call-template name="commonattributes"/>
         <xsl:apply-templates/>
       </fo:inline>
@@ -45,6 +46,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:template match="*[contains(@class,' sw-d/msgblock ')]">
       <xsl:call-template name="generateAttrLabel"/>
       <fo:block xsl:use-attribute-sets="msgblock">
+        <!-- TODO: Replace with mode="commonattributes" -->
         <xsl:call-template name="commonattributes"/>
         <xsl:call-template name="setFrame"/>
         <xsl:call-template name="setScale"/>
@@ -73,6 +75,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' sw-d/filepath ')]">
       <fo:inline xsl:use-attribute-sets="filepath">
+        <!-- TODO: Replace with mode="commonattributes" -->
         <xsl:call-template name="commonattributes"/>
         <xsl:apply-templates/>
       </fo:inline>
@@ -80,6 +83,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' sw-d/userinput ')]">
       <fo:inline xsl:use-attribute-sets="userinput">
+        <!-- TODO: Replace with mode="commonattributes" -->
         <xsl:call-template name="commonattributes"/>
         <xsl:apply-templates/>
       </fo:inline>
@@ -87,9 +91,10 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' sw-d/systemoutput ')]">
       <fo:inline xsl:use-attribute-sets="systemoutput">
+        <!-- TODO: Replace with mode="commonattributes" -->
         <xsl:call-template name="commonattributes"/>
         <xsl:apply-templates/>
       </fo:inline>
     </xsl:template>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/tables.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/tables.xsl
index 865817d19d..231c54cc7a 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/tables.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/tables.xsl
@@ -32,6 +32,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:template match="*[contains(@class, ' topic/dl ')]">
         <xsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-startprop ')]" mode="outofline"/>
         <fo:table xsl:use-attribute-sets="dl">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates select="*[contains(@class, ' topic/dlhead ')]"/>
             <fo:table-body xsl:use-attribute-sets="dl__body">
@@ -55,6 +56,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' topic/dl ')]/*[contains(@class, ' topic/dlhead ')]">
         <fo:table-header xsl:use-attribute-sets="dl.dlhead">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:table-row xsl:use-attribute-sets="dl.dlhead__row">
                 <xsl:apply-templates/>
@@ -64,6 +66,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' topic/dlhead ')]/*[contains(@class, ' topic/dthd ')]">
         <fo:table-cell xsl:use-attribute-sets="dlhead.dthd__cell">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:block xsl:use-attribute-sets="dlhead.dthd__content">
                 <xsl:apply-templates select="../*[contains(@class,' ditaot-d/ditaval-startprop ')]" mode="outofline"/>
@@ -74,6 +77,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' topic/dlhead ')]/*[contains(@class, ' topic/ddhd ')]">
         <fo:table-cell xsl:use-attribute-sets="dlhead.ddhd__cell">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:block xsl:use-attribute-sets="dlhead.ddhd__content">
                 <xsl:apply-templates/>
@@ -84,6 +88,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' topic/dlentry ')]">
         <fo:table-row xsl:use-attribute-sets="dlentry">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:table-cell xsl:use-attribute-sets="dlentry.dt">
                 <xsl:apply-templates select="*[contains(@class, ' topic/dt ')]"/>
@@ -107,6 +112,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' topic/dd ')]">
         <fo:block xsl:use-attribute-sets="dlentry.dd__content">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
             <xsl:if test="not(following-sibling::*[contains(@class,' topic/dd ')])">
@@ -280,6 +286,7 @@ See the accompanying LICENSE file for applicable license.
 
         <fo:block-container xsl:use-attribute-sets="table__container">
             <fo:block xsl:use-attribute-sets="table">
+                <!-- TODO: Replace with mode="commonattributes" -->
                 <xsl:call-template name="commonattributes"/>
                 <xsl:if test="not(@id)">
                   <xsl:attribute name="id">
@@ -298,6 +305,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' topic/table ')]/*[contains(@class, ' topic/title ')]">
         <fo:block xsl:use-attribute-sets="table.title">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates select="." mode="customTitleAnchor"/>
             <xsl:call-template name="getVariable">
@@ -333,6 +341,7 @@ See the accompanying LICENSE file for applicable license.
 
         <xsl:variable name="table" as="element()">
             <fo:table xsl:use-attribute-sets="table.tgroup">
+                <!-- TODO: Replace with mode="commonattributes" -->
                 <xsl:call-template name="commonattributes"/>
 
                 <xsl:call-template name="displayAtts">
@@ -391,6 +400,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' topic/thead ')]">
         <fo:table-header xsl:use-attribute-sets="tgroup.thead">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:table-header>
@@ -398,6 +408,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' topic/tbody ')]">
         <fo:table-body xsl:use-attribute-sets="tgroup.tbody">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:table-body>
@@ -405,6 +416,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' topic/thead ')]/*[contains(@class, ' topic/row ')]">
         <fo:table-row xsl:use-attribute-sets="thead.row">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:table-row>
@@ -412,6 +424,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' topic/tbody ')]/*[contains(@class, ' topic/row ')]">
         <fo:table-row xsl:use-attribute-sets="tbody.row">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:table-row>
@@ -428,6 +441,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:template match="*[contains(@class, ' topic/thead ')]/*[contains(@class, ' topic/row ')]/*[contains(@class, ' topic/entry ')]">
         <xsl:apply-templates select="." mode="validate-entry-position"/>
         <fo:table-cell xsl:use-attribute-sets="thead.row.entry">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:call-template name="applySpansAttrs"/>
             <xsl:call-template name="applyAlignAttrs"/>
@@ -471,6 +485,7 @@ See the accompanying LICENSE file for applicable license.
     </xsl:template>
 
     <xsl:template match="*" mode="processTableEntry">
+        <!-- TODO: Replace with mode="commonattributes" -->
         <xsl:call-template name="commonattributes"/>
         <xsl:call-template name="applySpansAttrs"/>
         <xsl:call-template name="applyAlignAttrs"/>
@@ -912,6 +927,7 @@ See the accompanying LICENSE file for applicable license.
         <xsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-startprop ')]" mode="outofline"/>
         <xsl:apply-templates select="*[contains(@class, ' topic/title ')]"/>
         <fo:table xsl:use-attribute-sets="simpletable">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:call-template name="globalAtts"/>
             <xsl:call-template name="displayAtts">
@@ -957,6 +973,7 @@ See the accompanying LICENSE file for applicable license.
   
   <xsl:template match="*[contains(@class, ' topic/simpletable ')]/*[contains(@class, ' topic/title ')]">
     <fo:block xsl:use-attribute-sets="table.title">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:apply-templates select="." mode="customTitleAnchor"/>
       <xsl:call-template name="getVariable">
@@ -1005,6 +1022,7 @@ See the accompanying LICENSE file for applicable license.
         <xsl:for-each select="1 to $fill-in-count">
           <xsl:for-each select="$current">
             <fo:table-cell xsl:use-attribute-sets="strow.stentry">
+                <!-- TODO: Replace with mode="commonattributes" -->
                 <xsl:call-template name="commonattributes"/>
                 <xsl:variable name="frame" as="xs:string" select="(../@frame, $table.frame-default)[1]"/>
                 <xsl:if test="following-sibling::*[contains(@class, ' topic/strow ')]">
@@ -1043,6 +1061,7 @@ See the accompanying LICENSE file for applicable license.
             <xsl:apply-templates select="../*[1]" mode="count-max-simpletable-cells"/>
         </xsl:param>
         <fo:table-header xsl:use-attribute-sets="sthead">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:table-row xsl:use-attribute-sets="sthead__row">
                 <xsl:apply-templates select="*[contains(@class, ' topic/stentry ')]"/>
@@ -1067,6 +1086,7 @@ See the accompanying LICENSE file for applicable license.
             <xsl:apply-templates select="../*[1]" mode="count-max-simpletable-cells"/>
         </xsl:param>
         <fo:table-row xsl:use-attribute-sets="strow">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates select="*[contains(@class, ' topic/stentry ')]"/>
             <!--
@@ -1089,6 +1109,7 @@ See the accompanying LICENSE file for applicable license.
           <xsl:apply-templates select="../.." mode="count-max-simpletable-cells"/>
         </xsl:param>
         <fo:table-cell xsl:use-attribute-sets="sthead.stentry">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:call-template name="simpletableApplySpansAttrs"/>
             <xsl:variable name="entryCol" select="@dita-ot:x"/>
@@ -1135,6 +1156,7 @@ See the accompanying LICENSE file for applicable license.
           <xsl:apply-templates select="../.." mode="count-max-simpletable-cells"/>
         </xsl:param>
         <fo:table-cell xsl:use-attribute-sets="strow.stentry">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:call-template name="simpletableApplySpansAttrs"/>
             <xsl:variable name="entryCol" select="@dita-ot:x"/>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/task-elements.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/task-elements.xsl
index c8197fb7e9..cb724f9fea 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/task-elements.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/task-elements.xsl
@@ -61,6 +61,7 @@ See the accompanying LICENSE file for applicable license.
   
     <xsl:template match="*[contains(@class, ' task/taskbody ')]">
         <fo:block xsl:use-attribute-sets="taskbody">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:block>
@@ -68,6 +69,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' task/prereq ')]">
         <fo:block xsl:use-attribute-sets="prereq">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates select="." mode="dita2xslfo:task-heading">
                   <xsl:with-param name="use-label">
@@ -85,6 +87,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' task/context ')]">
         <fo:block xsl:use-attribute-sets="context">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates select="." mode="dita2xslfo:task-heading">
                 <xsl:with-param name="use-label">
@@ -102,6 +105,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' task/cmd ')]" priority="1">
         <fo:block xsl:use-attribute-sets="cmd">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:if test="../@importance='optional'">
                 <xsl:call-template name="getVariable">
@@ -121,6 +125,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' task/info ')]">
         <fo:block xsl:use-attribute-sets="info">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:block>
@@ -128,6 +133,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' task/tutorialinfo ')]">
         <fo:block xsl:use-attribute-sets="tutorialinfo">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:block>
@@ -135,6 +141,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' task/stepresult ')]">
         <fo:block xsl:use-attribute-sets="stepresult">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:block>
@@ -142,6 +149,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' task/result ')]">
         <fo:block xsl:use-attribute-sets="result">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates select="." mode="dita2xslfo:task-heading">
                 <xsl:with-param name="use-label">
@@ -160,6 +168,7 @@ See the accompanying LICENSE file for applicable license.
     <!-- If example has a title, process it first; otherwise, create default title (if needed) -->
     <xsl:template match="*[contains(@class, ' task/taskbody ')]/*[contains(@class, ' topic/example ')]">
         <fo:block xsl:use-attribute-sets="task.example">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:choose>
               <xsl:when test="*[contains(@class, ' topic/title ')]">
@@ -184,6 +193,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' task/postreq ')]">
         <fo:block xsl:use-attribute-sets="postreq">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates select="." mode="dita2xslfo:task-heading">
                 <xsl:with-param name="use-label">
@@ -201,6 +211,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' task/stepxmp ')]">
         <fo:block xsl:use-attribute-sets="stepxmp">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:block>
@@ -219,12 +230,14 @@ See the accompanying LICENSE file for applicable license.
         <xsl:when test="count(*[contains(@class, ' task/step ')]) eq 1 and
                         not(contains(parent::*/@class, ' task/step '))">
           <fo:block>
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates mode="onestep"/>
           </fo:block>
         </xsl:when>
         <xsl:otherwise>
           <fo:list-block xsl:use-attribute-sets="steps">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
           </fo:list-block>
@@ -242,6 +255,7 @@ See the accompanying LICENSE file for applicable license.
       </xsl:with-param>
     </xsl:apply-templates>
     <fo:list-block xsl:use-attribute-sets="steps-unordered">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:apply-templates/>
     </fo:list-block>
@@ -255,6 +269,7 @@ See the accompanying LICENSE file for applicable license.
           </xsl:call-template>
         </xsl:variable>
         <fo:list-item xsl:use-attribute-sets="steps.step">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:list-item-label xsl:use-attribute-sets="steps.step__label">
                 <fo:block xsl:use-attribute-sets="steps.step__label__content">
@@ -283,6 +298,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' task/steps-unordered ')]/*[contains(@class, ' task/step ')]">
         <fo:list-item xsl:use-attribute-sets="steps-unordered.step">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:list-item-label xsl:use-attribute-sets="steps-unordered.step__label">
                 <fo:block xsl:use-attribute-sets="steps-unordered.step__label__content">
@@ -303,6 +319,7 @@ See the accompanying LICENSE file for applicable license.
 
   <xsl:template match="*[contains(@class, ' task/step ')]" mode="onestep">
     <fo:block xsl:use-attribute-sets="steps.step__content--onestep">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:apply-templates/>
     </fo:block>
@@ -311,6 +328,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' task/stepsection ')]">
         <fo:list-item xsl:use-attribute-sets="stepsection">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:list-item-label xsl:use-attribute-sets="stepsection__label">
               <fo:block xsl:use-attribute-sets="stepsection__label__content">
@@ -331,6 +349,7 @@ See the accompanying LICENSE file for applicable license.
   
     <xsl:template match="*[contains(@class, ' task/substeps ')]">
         <fo:list-block xsl:use-attribute-sets="substeps">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:list-block>
@@ -343,6 +362,7 @@ See the accompanying LICENSE file for applicable license.
           </xsl:call-template>
         </xsl:variable>
         <fo:list-item xsl:use-attribute-sets="substeps.substep">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:list-item-label xsl:use-attribute-sets="substeps.substep__label">
                 <fo:block xsl:use-attribute-sets="substeps.substep__label__content">
@@ -368,6 +388,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:template match="*[contains(@class, ' task/choices ')][empty(*[contains(@class,' task/choice ')])]" priority="10"/>
     <xsl:template match="*[contains(@class, ' task/choices ')]">
         <fo:list-block xsl:use-attribute-sets="choices">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:list-block>
@@ -375,6 +396,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' task/choice ')]">
         <fo:list-item xsl:use-attribute-sets="choices.choice">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:list-item-label xsl:use-attribute-sets="choices.choice__label">
                 <fo:block xsl:use-attribute-sets="choices.choice__label__content">
@@ -398,6 +420,7 @@ See the accompanying LICENSE file for applicable license.
     [empty(*[contains(@class,' task/choption ') or contains(@class,' task/chdesc ')])]" priority="10"/>
   <xsl:template match="*[contains(@class, ' task/choicetable ')]">
     <fo:table xsl:use-attribute-sets="choicetable">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:call-template name="univAttrs"/>
       <xsl:call-template name="globalAtts"/>
@@ -464,6 +487,7 @@ See the accompanying LICENSE file for applicable license.
 
   <xsl:template match="*[contains(@class, ' task/chhead ')]">
     <fo:table-header xsl:use-attribute-sets="chhead">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <fo:table-row xsl:use-attribute-sets="chhead__row">
         <xsl:if test="empty(*[contains(@class,' task/choptionhd ')])">
@@ -479,6 +503,7 @@ See the accompanying LICENSE file for applicable license.
 
   <xsl:template match="*[contains(@class, ' task/chrow ')]">
     <fo:table-row xsl:use-attribute-sets="chrow">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:apply-templates/>
     </fo:table-row>
@@ -486,6 +511,7 @@ See the accompanying LICENSE file for applicable license.
 
   <xsl:template match="*[contains(@class, ' task/chhead ')]/*[contains(@class, ' task/choptionhd ')]">
     <fo:table-cell xsl:use-attribute-sets="chhead.choptionhd">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:apply-templates select="." mode="simpletableHorizontalBorders"/>
       <xsl:apply-templates select="." mode="simpletableTopBorder"/>
@@ -498,6 +524,7 @@ See the accompanying LICENSE file for applicable license.
 
   <xsl:template match="*[contains(@class, ' task/chhead ')]/*[contains(@class, ' task/chdeschd ')]">
     <fo:table-cell xsl:use-attribute-sets="chhead.chdeschd">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:apply-templates select="." mode="simpletableHorizontalBorders"/>
       <xsl:apply-templates select="." mode="simpletableTopBorder"/>
@@ -510,6 +537,7 @@ See the accompanying LICENSE file for applicable license.
   <xsl:template match="*[contains(@class, ' task/chrow ')]/*[contains(@class, ' task/choption ')]">
     <xsl:variable name="keyCol" select="ancestor::*[contains(@class, ' task/choicetable ')][1]/@keycol"/>
     <fo:table-cell xsl:use-attribute-sets="chrow.choption">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:if test="../following-sibling::*[contains(@class, ' task/chrow ')]">
         <xsl:apply-templates select="." mode="simpletableHorizontalBorders"/>
@@ -533,6 +561,7 @@ See the accompanying LICENSE file for applicable license.
   <xsl:template match="*[contains(@class, ' task/chrow ')]/*[contains(@class, ' task/chdesc ')]">
     <xsl:variable name="keyCol" select="number(ancestor::*[contains(@class, ' task/choicetable ')][1]/@keycol)"/>
     <fo:table-cell xsl:use-attribute-sets="chrow.chdesc">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:if test="../following-sibling::*[contains(@class, ' task/chrow ')]">
         <xsl:apply-templates select="." mode="simpletableHorizontalBorders"/>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/topic.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/topic.xsl
index 0c0a6108d7..660e523c0e 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/topic.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/topic.xsl
@@ -76,6 +76,7 @@ See the accompanying LICENSE file for applicable license.
             </xsl:apply-templates>
         </xsl:variable>
         <fo:block>
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:call-template name="get-attributes">
               <xsl:with-param name="element" as="element()">
@@ -195,6 +196,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/section ')]/*[contains(@class,' topic/title ')]">
         <fo:block xsl:use-attribute-sets="section.title">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates select="." mode="customTitleAnchor"/>
             <xsl:apply-templates select="." mode="getTitle"/>
@@ -203,6 +205,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/example ')]/*[contains(@class,' topic/title ')]">
         <fo:block xsl:use-attribute-sets="example.title">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates select="." mode="customTitleAnchor"/>
             <xsl:apply-templates/>
@@ -211,6 +214,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/fig ')]/*[contains(@class,' topic/title ')]">
         <fo:block xsl:use-attribute-sets="fig.title">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates select="." mode="customTitleAnchor"/>
             <xsl:call-template name="getVariable">
@@ -236,6 +240,7 @@ See the accompanying LICENSE file for applicable license.
         <xsl:apply-templates select="." mode="tm-scope"/>
       </xsl:variable>
         <fo:inline xsl:use-attribute-sets="tm">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
             <xsl:choose>
@@ -275,6 +280,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:choose>
       <xsl:when test="$keys and @href and not($topicref/ancestor-or-self::*[@linking][1]/@linking = ('none', 'sourceonly'))">
         <fo:basic-link xsl:use-attribute-sets="xref term">
+          <!-- TODO: Replace with mode="commonattributes" -->
           <xsl:call-template name="commonattributes"/>
           <xsl:call-template name="buildBasicLinkDestination"/>
           <xsl:copy-of select="$contents"/>
@@ -282,6 +288,7 @@ See the accompanying LICENSE file for applicable license.
       </xsl:when>
       <xsl:otherwise>
         <fo:inline xsl:use-attribute-sets="term">
+          <!-- TODO: Replace with mode="commonattributes" -->
           <xsl:call-template name="commonattributes"/>
           <xsl:copy-of select="$contents"/>
         </fo:inline>
@@ -527,6 +534,7 @@ See the accompanying LICENSE file for applicable license.
       <xsl:if test="$DRAFT='yes'">
         <xsl:if test="*">
           <fo:block xsl:use-attribute-sets="titlealts">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
           </fo:block>
@@ -536,6 +544,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/navtitle ')]">
         <fo:block xsl:use-attribute-sets="navtitle">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:inline xsl:use-attribute-sets="navtitle__label">
                 <xsl:call-template name="getVariable">
@@ -549,6 +558,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/titlealts ')]/*[dita-ot:matches-searchtitle-class(@class)]">
         <fo:block xsl:use-attribute-sets="searchtitle">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:inline xsl:use-attribute-sets="searchtitle__label">
                 <xsl:call-template name="getVariable">
@@ -562,6 +572,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/abstract ')]">
         <fo:block xsl:use-attribute-sets="abstract">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:block>
@@ -614,6 +625,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:template match="*" mode="format-shortdesc-as-block">
         <!--compare the length of shortdesc with the got max chars-->
         <fo:block xsl:use-attribute-sets="topic__shortdesc">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <!-- If the shortdesc is sufficiently short, add keep-with-next. -->
             <xsl:if test="string-length(.) lt $maxCharsInShortDesc">
@@ -629,6 +641,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*" mode="format-shortdesc-as-inline">
         <fo:inline xsl:use-attribute-sets="shortdesc">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:if test="preceding-sibling::* | preceding-sibling::text()">
                 <xsl:text> </xsl:text>
@@ -706,6 +719,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/bodydiv ')]">
         <fo:block>
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:block>
@@ -716,6 +730,7 @@ See the accompanying LICENSE file for applicable license.
                 mode="dita2xslfo:section-heading"
                 priority="10">
     <fo:block xsl:use-attribute-sets="section.title">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:variable name="spectitleValue" as="xs:string" select="string(@spectitle)"/>
       <xsl:variable name="resolvedVariable">
@@ -738,6 +753,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/section ')]">
         <fo:block xsl:use-attribute-sets="section">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates select="." mode="dita2xslfo:section-heading"/>
             <xsl:apply-templates select="*[contains(@class,' topic/title ')]"/>
@@ -749,6 +765,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/sectiondiv ')]">
         <fo:block>
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:block>
@@ -756,6 +773,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/example ')]">
         <fo:block xsl:use-attribute-sets="example">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates select="*[contains(@class,' topic/title ')]"/>
             <fo:block xsl:use-attribute-sets="example__content">
@@ -766,6 +784,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/desc ')]">
         <fo:inline xsl:use-attribute-sets="desc">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:inline>
@@ -818,6 +837,7 @@ See the accompanying LICENSE file for applicable license.
 
   <xsl:template match="*[contains(@class, ' topic/div ')]">
     <fo:block xsl:use-attribute-sets="div">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:apply-templates/>
     </fo:block>
@@ -825,6 +845,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class, ' topic/p ')]">
         <fo:block xsl:use-attribute-sets="p">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:block>
@@ -832,6 +853,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*" mode="placeNoteContent">
         <fo:block xsl:use-attribute-sets="note">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:inline xsl:use-attribute-sets="note__label">
                 <xsl:choose>
@@ -991,6 +1013,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/lq ')]">
         <fo:block xsl:use-attribute-sets="lq">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:choose>
                 <xsl:when test="@href or @reftitle">
@@ -1047,6 +1070,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/q ')]">
         <fo:inline xsl:use-attribute-sets="q">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:call-template name="getVariable">
                 <xsl:with-param name="id" select="'#quote-start'"/>
@@ -1060,6 +1084,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/fig ')]">
         <fo:block xsl:use-attribute-sets="fig">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:call-template name="setFrame"/>
             <xsl:call-template name="setExpanse"/>
@@ -1076,6 +1101,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/figgroup ')]">
         <fo:block xsl:use-attribute-sets="figgroup">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:block>
@@ -1084,6 +1110,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:template match="*[contains(@class,' topic/pre ')]">
         <xsl:call-template name="setSpecTitle"/>
         <fo:block xsl:use-attribute-sets="pre">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:call-template name="setFrame"/>
             <xsl:call-template name="setScale"/>
@@ -1155,6 +1182,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:template match="*[contains(@class,' topic/lines ')]">
         <xsl:call-template name="setSpecTitle"/>
         <fo:block xsl:use-attribute-sets="lines">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:call-template name="setFrame"/>
             <xsl:call-template name="setScale"/>
@@ -1166,6 +1194,7 @@ See the accompanying LICENSE file for applicable license.
     <!-- The text element has no default semantics or formatting -->
     <xsl:template match="*[contains(@class,' topic/text ')]">
         <fo:inline>
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:inline>
@@ -1191,6 +1220,7 @@ See the accompanying LICENSE file for applicable license.
       <xsl:when test="$keys and @href and not($topicref/ancestor-or-self::*[@linking][1]/@linking = ('none', 'sourceonly'))">
         <fo:basic-link xsl:use-attribute-sets="xref">
           <xsl:sequence select="$copyAttributes/@*"/>
+          <!-- TODO: Replace with mode="commonattributes" -->
           <xsl:call-template name="commonattributes"/>
           <xsl:call-template name="buildBasicLinkDestination"/>
           <xsl:copy-of select="$contents"/>
@@ -1199,6 +1229,7 @@ See the accompanying LICENSE file for applicable license.
       <xsl:otherwise>
         <fo:inline>
           <xsl:sequence select="$copyAttributes/@*"/>
+          <!-- TODO: Replace with mode="commonattributes" -->
           <xsl:call-template name="commonattributes"/>
           <xsl:copy-of select="$contents"/>
         </fo:inline>
@@ -1220,6 +1251,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/boolean ')]">
         <fo:inline xsl:use-attribute-sets="boolean">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:value-of select="name()"/>
             <xsl:text>: </xsl:text>
@@ -1229,6 +1261,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/state ')]">
         <fo:inline xsl:use-attribute-sets="state">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:value-of select="name()"/>
             <xsl:text>: </xsl:text>
@@ -1247,6 +1280,7 @@ See the accompanying LICENSE file for applicable license.
             <xsl:when test="empty(@href)"/>
             <xsl:when test="@placement = 'break'">
                     <fo:block xsl:use-attribute-sets="image__block">
+                        <!-- TODO: Replace with mode="commonattributes" -->
                         <xsl:call-template name="commonattributes"/>
                         <xsl:apply-templates select="." mode="placeImage">
                             <xsl:with-param name="imageAlign" select="@align"/>
@@ -1275,6 +1309,7 @@ See the accompanying LICENSE file for applicable license.
             </xsl:when>
             <xsl:otherwise>
                 <fo:inline xsl:use-attribute-sets="image__inline">
+                    <!-- TODO: Replace with mode="commonattributes" -->
                     <xsl:call-template name="commonattributes"/>
                     <xsl:apply-templates select="." mode="placeImage">
                         <xsl:with-param name="imageAlign" select="@align"/>
@@ -1422,12 +1457,14 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/object ')]">
         <fo:inline xsl:use-attribute-sets="object">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
         </fo:inline>
     </xsl:template>
 
     <xsl:template match="*[contains(@class,' topic/param ')]">
         <fo:inline xsl:use-attribute-sets="param">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
         </fo:inline>
     </xsl:template>
@@ -1438,6 +1475,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:template match="*[contains(@class,' topic/draft-comment ')]">
         <xsl:if test="$publishRequiredCleanup = 'yes' or $DRAFT='yes'">
             <fo:block xsl:use-attribute-sets="draft-comment">
+                <!-- TODO: Replace with mode="commonattributes" -->
                 <xsl:call-template name="commonattributes"/>
                 <fo:block xsl:use-attribute-sets="draft-comment__label">
                     <xsl:text>Disposition: </xsl:text>
@@ -1454,6 +1492,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:template match="*[contains(@class,' topic/required-cleanup ')]">
         <xsl:if test="$publishRequiredCleanup = 'yes' or $DRAFT='yes'">
             <fo:inline xsl:use-attribute-sets="required-cleanup">
+                <!-- TODO: Replace with mode="commonattributes" -->
                 <xsl:call-template name="commonattributes"/>
                 <fo:inline xsl:use-attribute-sets="required-cleanup__label">
                     <xsl:call-template name="getVariable">
@@ -1534,6 +1573,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' topic/indextermref ')]">
         <fo:inline xsl:use-attribute-sets="indextermref">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:inline>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/ui-domain.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/ui-domain.xsl
index 76758301e7..7dcf3423fd 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/ui-domain.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/ui-domain.xsl
@@ -58,6 +58,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' ui-d/menucascade ')]">
         <fo:inline xsl:use-attribute-sets="menucascade">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates select="* | processing-instruction() | comment()"/>
         </fo:inline>
@@ -65,6 +66,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' ui-d/shortcut ')]">
         <fo:inline xsl:use-attribute-sets="shortcut">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:apply-templates/>
         </fo:inline>
@@ -73,6 +75,7 @@ See the accompanying LICENSE file for applicable license.
     <xsl:template match="*[contains(@class,' ui-d/screen ')]">
         <xsl:call-template name="generateAttrLabel"/>
         <fo:block xsl:use-attribute-sets="screen">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <xsl:call-template name="setFrame"/>
             <xsl:call-template name="setScale"/>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/ut-domain.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/ut-domain.xsl
index 10e90530b7..2b0015a711 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/ut-domain.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/ut-domain.xsl
@@ -11,6 +11,7 @@ See the accompanying LICENSE file for applicable license.
     version="3.0">
 
     <xsl:template match="*[contains(@class,' ut-d/imagemap ')]">
+        <!-- TODO: Replace with mode="commonattributes" -->
         <xsl:variable name="attributes" as="attribute()*"><xsl:call-template name="commonattributes"/></xsl:variable>
         <xsl:if test="exists($attributes)">
             <fo:inline><xsl:sequence select="$attributes"/></fo:inline>
@@ -23,6 +24,7 @@ See the accompanying LICENSE file for applicable license.
 
     <xsl:template match="*[contains(@class,' ut-d/area ')]">
         <fo:list-item xsl:use-attribute-sets="ol.li">
+            <!-- TODO: Replace with mode="commonattributes" -->
             <xsl:call-template name="commonattributes"/>
             <fo:list-item-label xsl:use-attribute-sets="ol.li__label">
                 <fo:block xsl:use-attribute-sets="ol.li__label__content">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/xml-domain.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/xml-domain.xsl
index 2f4fcd1212..893b5809c9 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/xml-domain.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/xml-domain.xsl
@@ -12,6 +12,7 @@ See the accompanying LICENSE file for applicable license.
   
   <xsl:template match="*[contains(@class, ' xml-d/xmlelement ')]">
     <fo:inline xsl:use-attribute-sets="xmlelement">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:text>&lt;</xsl:text>
       <xsl:apply-templates/>
@@ -21,6 +22,7 @@ See the accompanying LICENSE file for applicable license.
   
   <xsl:template match="*[contains(@class, ' xml-d/xmlatt ')]">
     <fo:inline xsl:use-attribute-sets="xmlatt">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:text>@</xsl:text>
       <xsl:apply-templates/>
@@ -29,6 +31,7 @@ See the accompanying LICENSE file for applicable license.
   
   <xsl:template match="*[contains(@class, ' xml-d/textentity ')]">
     <fo:inline xsl:use-attribute-sets="textentity">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:text>&amp;</xsl:text>
       <xsl:apply-templates/>
@@ -38,6 +41,7 @@ See the accompanying LICENSE file for applicable license.
   
   <xsl:template match="*[contains(@class, ' xml-d/parameterentity ')]">
     <fo:inline xsl:use-attribute-sets="parameterentity">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:text>%</xsl:text>
       <xsl:apply-templates/>
@@ -47,6 +51,7 @@ See the accompanying LICENSE file for applicable license.
   
   <xsl:template match="*[contains(@class, ' xml-d/numcharref ')]">
     <fo:inline xsl:use-attribute-sets="numcharref">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:text>&amp;#</xsl:text>
       <xsl:apply-templates/>
@@ -56,6 +61,7 @@ See the accompanying LICENSE file for applicable license.
   
   <xsl:template match="*[contains(@class, ' xml-d/xmlnsname ')]">
     <fo:inline xsl:use-attribute-sets="xmlnsname">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:apply-templates/>
     </fo:inline>
@@ -63,6 +69,7 @@ See the accompanying LICENSE file for applicable license.
   
   <xsl:template match="*[contains(@class, ' xml-d/xmlpi ')]">
     <fo:inline xsl:use-attribute-sets="xmlpi">
+      <!-- TODO: Replace with mode="commonattributes" -->
       <xsl:call-template name="commonattributes"/>
       <xsl:text>&lt;?</xsl:text>
       <xsl:apply-templates/>
diff --git a/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmlcoverImpl.xsl b/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmlcoverImpl.xsl
index acabb3f439..24548477ef 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmlcoverImpl.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmlcoverImpl.xsl
@@ -30,11 +30,13 @@ See the accompanying LICENSE file for applicable license.
       <xsl:call-template name="setidaname"/>
       <xsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-startprop ')]" mode="out-of-line"/>
       <xsl:call-template name="generateBreadcrumbs"/>
+      <!-- TODO: Replace with mode="gen-user-header" -->
       <xsl:call-template name="gen-user-header"/>
       <xsl:call-template name="processHDR"/>
       <xsl:if test="$INDEXSHOW = 'yes'">
         <xsl:apply-templates select="/*/*[contains(@class, ' map/topicmeta ')]/*[contains(@class, ' topic/keywords ')]/*[contains(@class, ' topic/indexterm ')]"/>
       </xsl:if>
+      <!-- TODO: Replace with mode="gen-user-sidetoc" -->
       <xsl:call-template name="gen-user-sidetoc"/>
       <xsl:choose>
         <xsl:when test="*[contains(@class, ' topic/title ')]">
@@ -49,6 +51,7 @@ See the accompanying LICENSE file for applicable license.
       </xsl:variable>
       <xsl:apply-templates select="$map" mode="toc"/>
       <xsl:call-template name="gen-endnotes"/>
+      <!-- TODO: Replace with mode="gen-user-footer" -->
       <xsl:call-template name="gen-user-footer"/>
       <xsl:call-template name="processFTR"/>
       <xsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-endprop ')]" mode="out-of-line"/>
@@ -57,6 +60,7 @@ See the accompanying LICENSE file for applicable license.
 
   <xsl:template match="*[contains(@class, ' map/map ')]/*[contains(@class, ' topic/title ')]">
     <h1 class="title topictitle1">
+      <!-- TODO: Replace with mode="gen-user-panel-title-pfx" -->
       <xsl:call-template name="gen-user-panel-title-pfx"/>
       <xsl:apply-templates/>
     </h1>
@@ -64,6 +68,7 @@ See the accompanying LICENSE file for applicable license.
 
   <xsl:template match="*[contains(@class, ' map/map ')]/@title">
     <h1 class="title topictitle1">
+      <!-- TODO: Replace with mode="gen-user-panel-title-pfx" -->
       <xsl:call-template name="gen-user-panel-title-pfx"/>
       <xsl:value-of select="."/>
     </h1>
@@ -71,6 +76,7 @@ See the accompanying LICENSE file for applicable license.
 
   <xsl:template match="*[contains(@class,' bookmap/bookmap ')]/*[contains(@class,' bookmap/booktitle ')]" priority="10">
     <h1 class="title topictitle1">
+      <!-- TODO: Replace with mode="gen-user-panel-title-pfx" -->
       <xsl:call-template name="gen-user-panel-title-pfx"/>
       <xsl:apply-templates select="*[contains(@class, ' bookmap/mainbooktitle ')]/node()"/>
     </h1>
@@ -80,14 +86,17 @@ See the accompanying LICENSE file for applicable license.
     <title>
       <xsl:choose>
         <xsl:when test="/*[contains(@class,' bookmap/bookmap ')]/*[contains(@class,' bookmap/booktitle ')]/*[contains(@class, ' bookmap/mainbooktitle ')]">
+          <!-- TODO: Replace with mode="gen-user-panel-title-pfx" -->
           <xsl:call-template name="gen-user-panel-title-pfx"/>
           <xsl:value-of select="/*[contains(@class,' bookmap/bookmap ')]/*[contains(@class,' bookmap/booktitle ')]/*[contains(@class, ' bookmap/mainbooktitle ')]"/>
         </xsl:when>
         <xsl:when test="/*[contains(@class,' map/map ')]/*[contains(@class,' topic/title ')]">
+          <!-- TODO: Replace with mode="gen-user-panel-title-pfx" -->
           <xsl:call-template name="gen-user-panel-title-pfx"/>
           <xsl:value-of select="/*[contains(@class,' map/map ')]/*[contains(@class,' topic/title ')]"/>
         </xsl:when>
         <xsl:when test="/*[contains(@class,' map/map ')]/@title">
+          <!-- TODO: Replace with mode="gen-user-panel-title-pfx" -->
           <xsl:call-template name="gen-user-panel-title-pfx"/>
           <xsl:value-of select="/*[contains(@class,' map/map ')]/@title"/>
         </xsl:when>
diff --git a/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmtocImpl.xsl b/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmtocImpl.xsl
index ed8a267663..6127845142 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmtocImpl.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmtocImpl.xsl
@@ -50,8 +50,11 @@ See the accompanying LICENSE file for applicable license.
     <xsl:call-template name="copyright"/>         <!-- Generate copyright, if specified manually -->
     <xsl:call-template name="generateCssLinks"/>  <!-- Generate links to CSS files -->
     <xsl:call-template name="generateMapTitle"/> <!-- Generate the <title> element -->
+    <!-- TODO: Replace with mode="gen-user-head" -->
     <xsl:call-template name="gen-user-head" />    <!-- include user's XSL HEAD processing here -->
+    <!-- TODO: Replace with mode="gen-user-scripts" -->
     <xsl:call-template name="gen-user-scripts" /> <!-- include user's XSL javascripts here -->
+    <!-- TODO: Replace with mode="gen-user-styles" -->
     <xsl:call-template name="gen-user-styles" />  <!-- include user's XSL style element and content here -->
   </head><xsl:value-of select="$newline"/>
 
@@ -112,6 +115,7 @@ See the accompanying LICENSE file for applicable license.
   <!-- Title processing - special handling for short descriptions -->
   <xsl:if test="/*[contains(@class,' map/map ')]/*[contains(@class,' topic/title ')] or /*[contains(@class,' map/map ')]/@title">
   <title>
+    <!-- TODO: Replace with mode="gen-user-panel-title-pfx" -->
     <xsl:call-template name="gen-user-panel-title-pfx"/> <!-- hook for a user-XSL title prefix -->
     <xsl:choose>
       <xsl:when test="/*[contains(@class,' map/map ')]/*[contains(@class,' topic/title ')]">
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/dita2htmlImpl.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/dita2htmlImpl.xsl
index c2e3ef9568..e66316d018 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/dita2htmlImpl.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/dita2htmlImpl.xsl
@@ -745,6 +745,7 @@ See the accompanying LICENSE file for applicable license.
       <xsl:when test="@href">
         <br/><div style="text-align:right"><a>
           <xsl:attribute name="href">
+            <!-- TODO: Replace with mode="determine-final-href" -->
             <xsl:call-template name="href"/>
           </xsl:attribute>
           <xsl:choose>
@@ -1107,6 +1108,7 @@ See the accompanying LICENSE file for applicable license.
 
     <!-- Test for TM area's language -->
     <xsl:variable name="tmtest">
+      <!-- TODO: Replace with mode="mark-tm-in-this-area" -->
       <xsl:call-template name="tm-area"/>
     </xsl:variable>
 
@@ -2562,8 +2564,10 @@ See the accompanying LICENSE file for applicable license.
 <html>
   <xsl:call-template name="setTopicLanguage"/>
   <xsl:value-of select="$newline"/>
+  <!-- TODO: Replace with mode="chapterHead" -->
   <xsl:call-template name="chapterHead"/>
-  <xsl:call-template name="chapterBody"/> 
+  <!-- TODO: Replace with mode="chapterBody" -->
+  <xsl:call-template name="chapterBody"/>
 </html>
 </xsl:template>
 
@@ -2597,8 +2601,11 @@ See the accompanying LICENSE file for applicable license.
       <xsl:call-template name="copyright"/>         <!-- Generate copyright, if specified manually -->
       <xsl:call-template name="generateCssLinks"/>  <!-- Generate links to CSS files -->
       <xsl:call-template name="generateChapterTitle"/> <!-- Generate the <title> element -->
+      <!-- TODO: Replace with mode="gen-user-head" -->
       <xsl:call-template name="gen-user-head" />    <!-- include user's XSL HEAD processing here -->
+      <!-- TODO: Replace with mode="gen-user-scripts" -->
       <xsl:call-template name="gen-user-scripts" /> <!-- include user's XSL javascripts here -->
+      <!-- TODO: Replace with mode="gen-user-styles" -->
       <xsl:call-template name="gen-user-styles" />  <!-- include user's XSL style element and content here -->
       <xsl:call-template name="processHDF"/>        <!-- Add user HDF file, if specified -->
     </head>
@@ -2698,6 +2705,7 @@ See the accompanying LICENSE file for applicable license.
   <xsl:template name="generateChapterTitle">
     <!-- Title processing - special handling for short descriptions -->
     <title>
+      <!-- TODO: Replace with mode="gen-user-panel-title-pfx" -->
       <xsl:call-template name="gen-user-panel-title-pfx"/> <!-- hook for a user-XSL title prefix -->
       <xsl:variable name="maintitle"><xsl:apply-templates select="/*[contains(@class, ' topic/topic ')]/*[contains(@class, ' topic/title ')]" mode="text-only"/></xsl:variable>
       <xsl:variable name="ditamaintitle"><xsl:apply-templates select="/dita/*[contains(@class, ' topic/topic ')][1]/*[contains(@class, ' topic/title ')]" mode="text-only"/></xsl:variable>
@@ -2729,6 +2737,7 @@ See the accompanying LICENSE file for applicable license.
       <xsl:apply-templates select="." mode="addHeaderToHtmlBodyElement"/>
 
       <!-- Include a user's XSL call here to generate a toc based on what's a child of topic -->
+      <!-- TODO: Replace with mode="gen-user-sidetoc" -->
       <xsl:call-template name="gen-user-sidetoc"/>
 
       <xsl:apply-templates select="." mode="addContentToHtmlBodyElement"/>
@@ -2764,6 +2773,8 @@ See the accompanying LICENSE file for applicable license.
   <xsl:template match="*" mode="addHeaderToHtmlBodyElement">
     <xsl:variable name="header-content" as="node()*">
       <xsl:call-template name="generateBreadcrumbs"/>
+        <!-- include user's XSL running header here -->
+      <!-- TODO: Replace with mode="gen-user-header" -->
       <xsl:call-template name="gen-user-header"/>  <!-- include user's XSL running header here -->
       <xsl:call-template name="processHDR"/>
       <xsl:if test="$INDEXSHOW = 'yes'">
@@ -2801,6 +2812,7 @@ See the accompanying LICENSE file for applicable license.
 
   <xsl:template match="*" mode="addFooterToHtmlBodyElement">
     <xsl:variable name="footer-content" as="node()*">
+      <!-- TODO: Replace with mode="gen-user-footer" -->
       <xsl:call-template name="gen-user-footer"/> <!-- include user's XSL running footer here -->
       <xsl:call-template name="processFTR"/>      <!-- Include XHTML footer, if specified -->
     </xsl:variable>
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/rel-links.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/rel-links.xsl
index fac0c6b983..723ecdc3ed 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/rel-links.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/rel-links.xsl
@@ -70,6 +70,7 @@ See the accompanying LICENSE file for applicable license.
                     <xsl:value-of select="replace(@href, '^mailto:', '')"/><!--remove mailto: prefix from href text-->
                   </xsl:when>
                   <xsl:otherwise>
+                    <!-- TODO: Replace with mode="determine-final-href" -->
                     <xsl:call-template name="href"/><!--use href text-->
                   </xsl:otherwise>
                 </xsl:choose>
@@ -82,6 +83,7 @@ See the accompanying LICENSE file for applicable license.
                   <!--use xref content-->
                 </xsl:when>
                 <xsl:otherwise>
+                  <!-- TODO: Replace with mode="determine-final-href" -->
                   <xsl:call-template name="href"/><!--use href text-->
                 </xsl:otherwise>
               </xsl:choose>
@@ -472,6 +474,7 @@ Each child is indented, the linktext is bold, and the shortdesc appears in norma
             </xsl:when>
             <xsl:otherwise>
               <!--use href-->
+              <!-- TODO: Replace with mode="determine-final-href" -->
               <xsl:call-template name="href"/>
             </xsl:otherwise>
           </xsl:choose>
@@ -509,6 +512,7 @@ Each child is indented, the linktext is bold, and the shortdesc appears in norma
           </xsl:when>
           <xsl:otherwise>
             <!--use href-->
+            <!-- TODO: Replace with mode="determine-final-href" -->
             <xsl:call-template name="href"/>
           </xsl:otherwise>
         </xsl:choose>
@@ -588,6 +592,7 @@ Each child is indented, the linktext is bold, and the shortdesc appears in norma
         </xsl:when>
         <xsl:otherwise>
           <!--use href-->
+          <!-- TODO: Replace with mode="determine-final-href" -->
           <xsl:call-template name="href"/>
         </xsl:otherwise>
       </xsl:choose>
@@ -737,6 +742,7 @@ Each child is indented, the linktext is bold, and the shortdesc appears in norma
           <xsl:value-of select="normalize-space(*[contains(@class, ' topic/linktext ')])"/>
         </xsl:when>
         <xsl:otherwise>
+          <!-- TODO: Replace with mode="determine-final-href" -->
           <xsl:call-template name="href"/>
         </xsl:otherwise>
       </xsl:choose>
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/ut-d.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/ut-d.xsl
index b10d3fdf17..68b984ca90 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/ut-d.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/ut-d.xsl
@@ -124,6 +124,8 @@ See the accompanying LICENSE file for applicable license.
 
 <!-- In the context of XREF - call it's HREF processor -->
 <xsl:template match="*[contains(@class, ' topic/xref ')]" mode="imagemap-xref">
+ <!-- TODO: Replace with mode="determine-final-href" -->
+
  <xsl:attribute name="href"><xsl:call-template name="href"/></xsl:attribute>
  <xsl:if test="@scope='external' or @type='external' or ((@format='PDF' or @format='pdf') and not(@scope='local'))">
   <xsl:attribute name="target">_blank</xsl:attribute>