diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-parser.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-parser.xsl
index 47f16527a..6b2976aed 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-parser.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-parser.xsl
@@ -484,28 +484,28 @@
         <xsl:param name="current-layout-node" select="."/>
     
         <xsl:variable name="cond-class">
-            <xsl:if test="$current-layout-node/@classIf">
+            <xsl:if test="$current-layout-node/@class-if">
                 <!-- DE Funktioniert leider nicht in einer Zeile, daher die Hilfsvariable -->
                 <xsl:variable name="key" 
-                              select="substring-before($current-layout-node/@classIf, ',')"/>
+                              select="substring-before($current-layout-node/@class-if, ',')"/>
                 <xsl:variable name="condition">
                     <xsl:apply-templates select="//*[@id=$key]"/>
                 </xsl:variable>
         
                 <xsl:if test="normalize-space($condition)">
-                    <xsl:value-of select="substring-after($current-layout-node/@classIf, ', ')"/>
+                    <xsl:value-of select="substring-after($current-layout-node/@class.if, ', ')"/>
                 </xsl:if>
             </xsl:if>
         </xsl:variable>
     
         <xsl:variable name="type-class">
-            <xsl:if test="$current-layout-node/@setTypeClass='true'">
+            <xsl:if test="$current-layout-node/@set-type-class='true'">
                 <xsl:value-of select="foundry:get-content-type-name()"/>
             </xsl:if>
         </xsl:variable>
     
         <xsl:variable name="color-class">
-            <xsl:if test="$current-layout-node/@withColorset='true'">
+            <xsl:if test="$current-layout-node/@with-colorset='true'">
                 <xsl:value-of select="foundry:get-colorset()"/>
             </xsl:if>
         </xsl:variable>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
index 4254aad5e..b4eb4963a 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
@@ -538,4 +538,26 @@
         </xsl:choose>
     </xsl:template>
 
+    <xsl:template match="content-item-layout//set-contentitem-id">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+
+        <xsl:if test="$contentitem-tree/masterVersion/id 
+                      or $contentitem-tree/nav:attribute[@name = 'masterVersion.id']">
+            <xsl:attribute name="id">
+                <xsl:choose>
+                    <xsl:when test="$contentitem-tree/masterVersion/id">
+                        <xsl:value-of select="concat($contentitem-tree/masterVersion/id, 
+                                                     '_', 
+                                                     $contentitem-tree/name)"/>
+                    </xsl:when>
+                    <xsl:when test="$contentitem-tree/nav:attibute[@name = 'masterVersion.id']">
+                        <xsl:value-of select="concat($contentitem-tree/nav:attibute[@name = 'masterVersion.id'], 
+                                                     '_', 
+                                                     $contentitem-tree/nav:attribute[@name = 'name'])"/>
+                    </xsl:when>
+                </xsl:choose>
+            </xsl:attribute>
+        </xsl:if>
+    </xsl:template>
+
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
index a0280ed46..12ff357e0 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
@@ -131,11 +131,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="a">
+        <xsl:param name="id" select="''"/>
         <xsl:param name="href" select="''" tunnel="yes"/>
         <xsl:param name="hreflang" select="''" tunnel="yes"/>
         <xsl:param name="title" select="''" tunnel="yes"/>
         <xsl:param name="type" select="''" tunnel="yes"/>
-        
+         
         <a>
             <xsl:if test="./@href-property">
                 <xsl:attribute name="href">
@@ -163,6 +164,7 @@
                 </xsl:attribute>
             </xsl:if>
             <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
                 <xsl:with-param name="copy-attributes" 
                                 select="'download rel type'"/>
                 <xsl:with-param name="title" select="$title"/>
@@ -184,8 +186,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="abbr">
+        <xsl:param name="id" select="''"/>
+        
         <abbr>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </abbr>
     </xsl:template>
@@ -205,8 +211,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="address">
+        <xsl:param name="id" select="id"/>
+        
         <address>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </address>
     </xsl:template>
@@ -224,18 +234,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="article">
-        <xsl:param name="article-id" select="''"/>
+        <xsl:param name="id" select="''"/>
         
         <article>
-            <!-- 
-                We are not using the foundry:process-layout-attributes template here because we
-                have to handle the id attribute in special way here. The id if maybe provided using
-                a XSL parameter.
-            -->
-            <xsl:call-template name="foundry:set-id-and-class">
-                <xsl:with-param name="id" select="$article-id"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
             </xsl:call-template>
-            <xsl:call-template name="foundry:copy-data-attributes"/>
             <xsl:apply-templates/>
         </article>
     </xsl:template>
@@ -253,8 +257,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="aside">
+        <xsl:param name="id" select="''"/>
+        
         <aside>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </aside>
     </xsl:template>
@@ -286,6 +294,7 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="audio">
+        <xsl:param name="id" select="''"/>
         <!-- Source URL of the audio document provided by a surrounding tag -->
         <xsl:param name="src" tunnel="yes" as="xs:string" select="''"/>
         <xsl:param name="title" tunnel="yes" as="xs:string" select="''"/>
@@ -315,6 +324,7 @@
         
         <audio>
             <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
                 <xsl:with-param name="copy-attributes" 
                                 select="'autoplay buffered controls loop muted played preload volume'"/>
                 <xsl:with-param name="title" select="$title"/>
@@ -341,8 +351,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="b">
+        <xsl:param name="id" select="''"/>
+        
         <b>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </b>
     </xsl:template>
@@ -360,8 +374,11 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template name="blockquote">
+        <xsl:param name="id" select="''"/>
+        
         <blockquote>
             <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
                 <xsl:with-param name="copy-attributes" select="'cite'"/>
             </xsl:call-template>
             <xsl:apply-templates/>
@@ -463,7 +480,7 @@
         </body>
     </xsl:template>
 
-    <foundry:doc>    
+    <foundry:doc>
         <foundry:doc-desc>
             <p>
                 Generates a <code>br</code> element.
@@ -492,8 +509,11 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="button">
+        <xsl:param name="id" select="''"/>
+        
         <button>
             <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
                 <xsl:with-param name="copy-attributes" 
                                 select="'autofocus disabled form formaction formenctype formmethod formnovalidate formtarget name type value'"/>
             </xsl:call-template>
@@ -514,8 +534,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="canvas">
+        <xsl:param name="id" select="''"/>
+        
         <canvas>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:if test="./@width">
                 <xsl:attribute name="width" select="./@width"/>
             </xsl:if>
@@ -541,8 +565,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="table//caption">
+        <xsl:param name="id" select="''"/>
+        
         <caption>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </caption>
     </xsl:template>
@@ -560,8 +588,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="cite">
+        <xsl:param name="id" select="''"/>
+        
         <cite>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </cite>
     </xsl:template>
@@ -579,8 +611,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="code">
+        <xsl:param name="id" select="''"/>
+        
         <code>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </code>
     </xsl:template>
@@ -596,8 +632,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="dd">
+        <xsl:param name="id" select="''"/>
+        
         <dd>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </dd>
     </xsl:template>
@@ -613,8 +653,12 @@
         </foundry:doc-link>
     </foundry:doc-see-also>
     <xsl:template match="del">
+        <xsl:param name="id" select="''"/>
+        
         <del>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </del>
     </xsl:template>
@@ -632,8 +676,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="dfn">
+        <xsl:param name="id" select="''"/>
+        
         <dfn>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </dfn>
     </xsl:template>
@@ -650,8 +698,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="div">
+        <xsl:param name="id" select="''"/>
+        
         <div>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </div>
     </xsl:template>
@@ -665,13 +717,17 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="divIfNotEmpty">
+        <xsl:param name="id" select="''"/>
+        
         <xsl:variable name="divContent">
             <xsl:apply-templates/>
         </xsl:variable>
 
         <xsl:if test="normalize-space($divContent)">
             <div>
-                <xsl:call-template name="foundry:set-id-and-class"/>
+                <xsl:call-template name="foundry:set-id-and-class">
+                    <xsl:with-param name="id" select="$id"/>
+                </xsl:call-template>
                 <xsl:apply-templates/>
             </div>
         </xsl:if>
@@ -688,8 +744,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="dl">
+        <xsl:param name="id" select="''"/>
+        
         <dl>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </dl>
     </xsl:template>
@@ -705,8 +765,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="dt">
+        <xsl:param name="id" select="''"/>
+        
         <dt>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </dt>
     </xsl:template>
@@ -724,15 +788,22 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="em">
+        <xsl:param name="id" select="''"/>
+        
         <em>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </em>
     </xsl:template>
     
     <xsl:template match="fieldset">
+        <xsl:param name="id" select="''"/>
+        
         <fieldset>
             <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
                 <xsl:with-param name="copy-attributes" select="'disabled form name'"/>
             </xsl:call-template>
             <xsl:apply-templates/>
@@ -740,15 +811,23 @@
     </xsl:template>
     
     <xsl:template name="figcaption">
+        <xsl:param name="id" select="''"/>
+        
         <figcaption>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </figcaption>
     </xsl:template>
     
     <xsl:template name="figure">
+        <xsl:param name="id" select="''"/>
+        
         <figure>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </figure>
     </xsl:template>
@@ -762,18 +841,24 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="footer">
+        <xsl:param name="id" select="''"/>
+        
         <footer>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </footer>
     </xsl:template>
     
        
     <xsl:template match="form">
+        <xsl:param name="id" select="''"/>
         <xsl:param name="action" tunnel="yes" select="''"/>
         
         <form>
             <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
                 <xsl:with-param name="copy-attributes" select="'method enctype accept name'"/>
             </xsl:call-template>
             
@@ -810,8 +895,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="h1">
+        <xsl:param name="id" select="''"/>
+        
         <h1>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </h1>
     </xsl:template>
@@ -831,8 +920,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="h2">
+        <xsl:param name="id" select="''"/>
+        
         <h2>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </h2>
     </xsl:template>
@@ -852,8 +945,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="h3">
+        <xsl:param name="id" select="''"/>
+        
         <h3>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </h3>
     </xsl:template>
@@ -873,8 +970,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="h4">
+        <xsl:param name="id" select="''"/>
+        
         <h4>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </h4>
     </xsl:template>
@@ -894,8 +995,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="h5">
+        <xsl:param name="id" select="''"/>
+        
         <h5>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </h5>
     </xsl:template>
@@ -915,8 +1020,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="h6">
+        <xsl:param name="id" select="''"/>
+        
         <h6>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </h6>
     </xsl:template>
@@ -993,8 +1102,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="header">
+        <xsl:param name="id" select="''"/>
+        
         <header>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </header>
     </xsl:template>
@@ -1030,8 +1143,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="i">
+        <xsl:param name="id" select="''"/>
+        
         <i>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </i>
     </xsl:template>
@@ -1097,6 +1214,7 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="img">
+        <xsl:param name="id" select="''"/>
         <!-- Source URL of the image provided by a surrounding tag. -->
         <xsl:param name="src" tunnel="yes" as="xs:string" select="''"/>
         <!-- Width of the image the URL the src parameter is pointing to (pixel) -->
@@ -1199,7 +1317,9 @@
         
         <img>
             
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:attribute name="src" select="$img-src"/>
             
             <xsl:if test="$alt != ''">
@@ -1269,10 +1389,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="input">
+        <xsl:param name="id" select="''"/>
         <xsl:param name="value" tunnel="yes" select="''"/>
         
         <input>
             <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
                 <xsl:with-param name="copy-attributes" 
                                 select="'type accept autocomplete autofocus checked disabled multiple name required size spellcheck tabindex'"/>
             </xsl:call-template>
@@ -1300,10 +1422,14 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template name="ins">
-        <br>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+        <xsl:param name="id" select="''"/>
+        
+        <ins>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
-        </br>
+        </ins>
     </xsl:template>
     
     <foundry:doc section="user" type="template-tag">
@@ -1319,8 +1445,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="kbd">
+        <xsl:param name="id" select="''"/>
+        
         <kbd>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </kbd>
     </xsl:template>
@@ -1338,8 +1468,11 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="label">
+        <xsl:param name="id" select="''"/>
+        
         <label>
             <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
                 <xsl:with-param name="copy-attributes" select="'for'"/>
             </xsl:call-template>
             <xsl:apply-templates/>
@@ -1359,8 +1492,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="legend">
+        <xsl:param name="id" select="''"/>
+        
         <legend>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </legend>
     </xsl:template>
@@ -1378,8 +1515,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="li">
+        <xsl:param name="id" select="''"/>
+        
         <li>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </li>
     </xsl:template>
@@ -1395,8 +1536,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="main">
+        <xsl:param name="id" select="''"/>
+        
         <main>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </main>
     </xsl:template>
@@ -1444,8 +1589,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="nav">
+        <xsl:param name="id" select="''"/>
+        
         <nav>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </nav>
     </xsl:template>
@@ -1461,8 +1610,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="noscript">
+        <xsl:param name="id" select="''"/>
+        
         <noscript>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </noscript>
     </xsl:template>
@@ -1480,8 +1633,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="ol">
+        <xsl:param name="id" select="''"/>
+        
         <ol>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </ol>
     </xsl:template>
@@ -1512,11 +1669,14 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="optgroup">
+        <xsl:param name="id" select="''"/>
         <xsl:param name="disabled" as="xs:boolean" tunnel="yes" select="false()"/>
         <xsl:param name="label" as="xs:string" tunnel="yes" select="''"/>
         
         <optgroup>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:if test="$disabled = true()">
                 <xsl:attribute name="disabled" select="'disabled'"/>
             </xsl:if>
@@ -1564,13 +1724,16 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="option">
+        <xsl:param name="id" select="''"/>
         <xsl:param name="disabled" as="xs:boolean" tunnel="yes" select="false()"/>
         <xsl:param name="label" as="xs:string" tunnel="yes" select="''"/>
         <xsl:param name="selected" as="xs:boolean" tunnel="yes" select="false()"/>
         <xsl:param name="value" as="xs:string" tunnel="yes" select="''"/>
         
         <option>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:if test="$disabled = true()">
                 <xsl:attribute name="disabled" select="'disabled'"/>
             </xsl:if>
@@ -1600,8 +1763,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="p">
+        <xsl:param name="id" select="''"/>
+        
         <p>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </p>
     </xsl:template>
@@ -1619,8 +1786,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="pre">
+        <xsl:param name="id" select="''"/>
+        
         <pre>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </pre>
     </xsl:template>
@@ -1638,8 +1809,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="q">
+        <xsl:param name="id" select="''"/>
+        
         <q>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </q>
     </xsl:template>
@@ -1657,8 +1832,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="s">
+        <xsl:param name="id" select="''"/>
+        
         <s>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </s>
     </xsl:template>
@@ -1676,8 +1855,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="samp">
+        <xsl:param name="id" select="''"/>
+        
         <samp>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </samp>
     </xsl:template>
@@ -1768,11 +1951,11 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="section">
-        <xsl:param name="section-id" select="''"/>
+        <xsl:param name="id" select="''"/>
         
         <section>
             <xsl:call-template name="foundry:process-layouttree-attributes">
-                <xsl:with-param name="id" select="$section-id"/>
+                <xsl:with-param name="id" select="$id"/>
             </xsl:call-template>
             <xsl:apply-templates/>
         </section>
@@ -1805,11 +1988,13 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="select">
+        <xsl:param name="id" select="''"/>
         <xsl:param name="name" as="xs:string" tunnel="yes" select="''"/>
         <xsl:param name="disabled" as="xs:boolean" tunnel="yes" select="false()"/>
         
         <select>
             <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
                 <xsl:with-param name="copy-attributes" 
                                 select="'autofocus disabled multiple required size'"/>
             </xsl:call-template>
@@ -1836,8 +2021,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="small">
+        <xsl:param name="id" select="''"/>
+        
         <small>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </small>
     </xsl:template>
@@ -1878,6 +2067,7 @@
         </foundry:doc-attributes>
     </foundry:doc>
     <xsl:template match="source">
+        <xsl:param name="id" select="''"/>
         <xsl:param name="src" as="xs:string" tunnel="yes" select="''"/>
         <xsl:param name="type" as="xs:string" tunnel="yes" select="''"/>
         
@@ -1899,6 +2089,7 @@
         
         <source>
             <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
                 <xsl:with-param name="copy-attributes" select="'type'"/>
             </xsl:call-template>
             <xsl:attribute name="src" select="$src-processed"/>
@@ -1919,8 +2110,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="span">
+        <xsl:param name="id" select="''"/>
+        
         <span>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </span>
     </xsl:template>
@@ -1936,8 +2131,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="strong">
+        <xsl:param name="id" select="''"/>
+        
         <strong>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </strong>
     </xsl:template>
@@ -1955,8 +2154,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="sub">
+        <xsl:param name="id" select="''"/>
+        
         <sub>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </sub>
     </xsl:template>
@@ -1974,8 +2177,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="sup">
+        <xsl:param name="id" select="''"/>
+        
         <sup>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </sup>
     </xsl:template>
@@ -1993,8 +2200,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="table">
+        <xsl:param name="id" select="''"/>
+        
         <table>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </table>
     </xsl:template>
@@ -2012,8 +2223,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="tbody">
+        <xsl:param name="id" select="''"/>
+        
         <tbody>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </tbody>
     </xsl:template>
@@ -2031,8 +2246,11 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="td">
+        <xsl:param name="id" select="''"/>
+        
         <td>
             <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
                 <xsl:with-param name="copy-attributes" select="'colspan headers rowspan'"/>
             </xsl:call-template>
             <xsl:apply-templates/>
@@ -2073,10 +2291,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="textarea">
+        <xsl:param name="id" select="''"/>
         <xsl:param name="value" tunnel="yes" select="''"/>
         
         <textarea>
             <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
                 <xsl:with-param name="copy-attributes" 
                                 select="'autocomplete autofocus cols disabled maxlength minlength multiple name readonly required rows wrap'"/>
             </xsl:call-template>
@@ -2104,8 +2324,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="tfoot">
+        <xsl:param name="id" select="''"/>
+        
         <tfoot>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </tfoot>
     </xsl:template>
@@ -2123,8 +2347,11 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="th">
+        <xsl:param name="id" select="''"/>
+        
         <th>
             <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
                 <xsl:with-param name="copy-attributes" select="'colspan headers rowspan scope'"/>
             </xsl:call-template>
             <xsl:apply-templates/>
@@ -2144,8 +2371,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="thead">
+        <xsl:param name="id" select="''"/>
+        
         <thead>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </thead>
     </xsl:template>
@@ -2163,8 +2394,11 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="time">
+        <xsl:param name="id" select="''"/>
+        
         <time>
             <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
                 <xsl:with-param name="copy-attributes" select="'datatime'"/>
             </xsl:call-template>
             <xsl:apply-templates/>
@@ -2226,8 +2460,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="tr">
+        <xsl:param name="id" select="''"/>
+        
         <tr>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </tr>
     </xsl:template>
@@ -2245,6 +2483,7 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="track">
+        <xsl:param name="id" select="''"/>
         <xsl:param name="default" as="xs:boolean" tunnel="yes" select="false()"/>
         <xsl:param name="kind" as="xs:string" tunnel="yes" select="''"/>
         <xsl:param name="label" as="xs:string" tunnel="yes" select="''"/>
@@ -2269,6 +2508,7 @@
         
         <track>
             <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
                 <xsl:with-param name="copy-attributes" select="'default kind label srclang'"/>
             </xsl:call-template>
             <xsl:if test="$default = true()">
@@ -2301,8 +2541,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="u">
+        <xsl:param name="id" select="''"/>
+        
         <u>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </u>
     </xsl:template>
@@ -2320,8 +2564,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="ul">
+        <xsl:param name="id" select="''"/>
+        
         <ul>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </ul>
     </xsl:template>
@@ -2339,8 +2587,12 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="var">
+        <xsl:param name="id" select="''"/>
+        
         <var>
-            <xsl:call-template name="foundry:process-layouttree-attributes"/>
+            <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:call-template>
             <xsl:apply-templates/>
         </var>
     </xsl:template>
@@ -2355,12 +2607,12 @@
         </foundry:doc-desc>
         <foundry:doc-attributes>
             <foundry:doc-attribute name="src-static">
-                 <p>
+                <p>
                     A static URL for the source of the video file
                 </p>
             </foundry:doc-attribute>
             <foundry:doc-attribute name="src-property">
-                 <p>
+                <p>
                     Name of property in the data tree containing the source URL.
                 </p>
             </foundry:doc-attribute>
@@ -2382,6 +2634,7 @@
         </foundry:doc-see-also>
     </foundry:doc>
     <xsl:template match="video">
+        <xsl:param name="id" select="''"/>
         <xsl:param name="src" as="xs:string" tunnel="yes" select="''"/>
         <xsl:param name="poster" as="xs:string" tunnel="yes" select="''"/>
         
@@ -2417,6 +2670,7 @@
         
         <video>
             <xsl:call-template name="foundry:process-layouttree-attributes">
+                <xsl:with-param name="id" select="$id"/>
                 <xsl:with-param name="copy-attributes" 
                                 select="'autoplay buffered controls loop muted played preload'"/>
             </xsl:call-template>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/object-list.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/object-list.xsl
index a1ba4c034..bcdb0975d 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/object-list.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/object-list.xsl
@@ -88,9 +88,266 @@
         <xsl:for-each select="$object-list-datatree/nav:objectList/nav:item">
             <xsl:apply-templates select="$object-list-item-layouttree/*">
                 <xsl:with-param name="contentitem-tree" tunnel="yes" select="current()"/>
+                <xsl:with-param name="id"
+                                select="concat(./nav:attribute[@name = 'masterVersion.id'], 
+                                               '_', 
+                                               nav:attribute[@name = 'name'])"/>
             </xsl:apply-templates>
         </xsl:for-each>
         
     </xsl:template>
+    
+    <foundry:doc section="user" type="template-tag">
+        <foundry:doc-desc>
+            <p>
+                Root element for creating the paginator for an object list. Provides the paginator
+                data for the elements enclosed by this element via XSL parameters. The content is
+                of this element is only processed if the number of pages is greater than one or
+                if the <code>show</code> attribute is set to <code>always</code>.
+            </p>
+        </foundry:doc-desc>
+        <foundry:doc-attributes>
+            <foundry:doc-attribute name="show">
+                <p>
+                    If set to <code>always</code> the paginator is shown even if there is only one
+                    page.
+                </p>
+            </foundry:doc-attribute>
+        </foundry:doc-attributes>
+    </foundry:doc>
+    <xsl:template match="object-list//paginator">
+        <xsl:param name="object-list-datatree" tunnel="yes"/>
+        
+        <xsl:if test="($object-list-datatree/nav:objectList/nav:paginator/@pageCount &gt; 1)
+                       or ./@show = 'always'">
+            <xsl:apply-templates>
+                <xsl:with-param name="paginator-baseurl"
+                                tunnel="yes">
+                    <xsl:choose>
+                        <xsl:when test="contains($object-list-datatree/nav:objectList/nav:paginator/@baseURL, '?')">
+                            <xsl:value-of select="concat($object-list-datatree/nav:objectList/nav:paginator/@baseURL, '&amp;')"/>
+                        </xsl:when>
+                        <xsl:when test="not(contains($object-list-datatree/nav:objectList/nav:paginator/@baseURL, '?'))">
+                            <xsl:value-of select="concat($object-list-datatree/nav:objectList/nav:paginator/@baseURL, '?')"/>
+                        </xsl:when>
+                    </xsl:choose>
+                </xsl:with-param>
+                <xsl:with-param name="paginator-object-begin"
+                                tunnel="yes"
+                                select="$object-list-datatree/nav:objectList/nav:paginator/@objectBegin"/>
+                <xsl:with-param name="paginator-object-count"
+                                tunnel="yes"
+                                select="$object-list-datatree/nav:objectList/nav:paginator/@objectCount"/>
+                <xsl:with-param name="paginator-object-end"
+                                tunnel="yes"
+                                select="$object-list-datatree/nav:objectList/nav:paginator/@objectEnd"/>
+                <xsl:with-param name="paginator-page-count" 
+                                tunnel="yes"
+                                select="$object-list-datatree/nav:objectList/nav:paginator/@pageCount"/>
+                <xsl:with-param name="paginator-page-number" 
+                                tunnel="yes"
+                                select="$object-list-datatree/nav:objectList/nav:paginator/@pageNumber"/>
+                <xsl:with-param name="paginator-page-param" 
+                                tunnel="yes"
+                                select="$object-list-datatree/nav:objectList/nav:paginator/@pageParam"/>
+                <xsl:with-param name="paginator-page-size" 
+                                tunnel="yes"
+                                select="$object-list-datatree/nav:objectList/nav:paginator/@pageSize"/>
+            </xsl:apply-templates>
+        </xsl:if>
+    </xsl:template>
+
+    <foundry:doc section="user" type="template-tag">
+        <foundry:doc-desc>
+            <p>
+                Outputs the index of the first object shown on the current page. The value is 
+                provided by the surrounding <code>paginator</code> element via a XSL parameter.
+            </p>
+        </foundry:doc-desc>
+    </foundry:doc>
+    <xsl:template match="object-list//paginator//object-begin">
+        <xsl:param name="paginator-object-begin" tunnel="yes" select="''"/>
+        
+        <xsl:if test="$paginator-object-begin != ''">
+            <xsl:value-of select="$paginator-object-begin"/>
+        </xsl:if>
+    </xsl:template>
+    
+    <foundry:doc section="user" type="template-tag">
+        <foundry:doc-desc>
+            <p>
+                Outputs the index of the last object shown on the current page. The value is 
+                provided by the surrounding <code>paginator</code> element via a XSL parameter.
+            </p>
+        </foundry:doc-desc>
+    </foundry:doc>
+    <xsl:template match="object-list//paginator//object-end">
+        <xsl:param name="paginator-object-end" tunnel="yes" select="''"/>
+        
+        <xsl:if test="$paginator-object-end != ''">
+            <xsl:value-of select="$paginator-object-end"/>
+        </xsl:if>
+    </xsl:template>
+    
+    <foundry:doc section="user" type="template-tag">
+        <foundry:doc-desc>
+            <p>
+                Outputs the number of elements in list.
+            </p>
+        </foundry:doc-desc>
+    </foundry:doc>
+    <xsl:template match="object-list//paginator//object-count">
+        <xsl:param name="paginator-object-count" tunnel="yes" select="''"/>
+        
+        <xsl:if test="$paginator-object-count != ''">
+            <xsl:value-of select="$paginator-object-count"/>
+        </xsl:if>
+    </xsl:template>
+
+    <foundry:doc section="user" type="template-tag">
+        <foundry:doc-desc>
+            <p>
+                Outputs the number of pages.
+            </p>
+        </foundry:doc-desc>
+    </foundry:doc>
+    <xsl:template match="object-list//paginator//page-count">
+        <xsl:param name="paginator-page-count" tunnel="yes" select="''"/>
+        
+        <xsl:if test="$paginator-page-count != ''">
+            <xsl:value-of select="$paginator-page-count"/>
+        </xsl:if>
+    </xsl:template>
+    
+    <foundry:doc section="user" type="template-tag">
+        <foundry:doc-desc>
+            <p>
+                Outputs the number of the current page.
+            </p>
+        </foundry:doc-desc>
+    </foundry:doc>
+    <xsl:template match="object-list//paginator//current-page">
+        <xsl:param name="paginator-page-number" tunnel="yes" select="''"/>
+        
+        <xsl:if test="$paginator-page-number != ''">
+            <xsl:value-of select="$paginator-page-number"/>
+        </xsl:if>
+    </xsl:template>
+    
+    <foundry:doc section="user" type="template-tag">
+        <foundry:doc-desc>
+            <p>
+                Outputs the size of page (the number of items on each page).
+            </p>
+        </foundry:doc-desc>
+    </foundry:doc>
+    <xsl:template match="object-list//paginator//page-size">
+        <xsl:param name="paginator-page-size" tunnel="yes" select="''"/>
+        
+        <xsl:if test="$paginator-page-size != ''">
+            <xsl:value-of select="$paginator-page-size"/>
+        </xsl:if>
+    </xsl:template>
+    
+    <foundry:doc section="user" type="template-tag">
+        <foundry:doc-desc>
+            <p>
+                Provides the URL to the previous page of the list for an enclosed <code>a</code> 
+                element.
+            </p>
+        </foundry:doc-desc>
+    </foundry:doc>
+    <xsl:template match="object-list//paginator//prev-page-link">
+        <xsl:param name="paginator-page-number" tunnel="yes" select="''"/>
+        <xsl:param name="paginator-baseurl" tunnel="yes" select="''"/>
+        <xsl:param name="paginator-page-param" tunnel="yes" select="''"/>
+        
+        <xsl:if test="($paginator-page-number != '') and ($paginator-page-number &gt; 1)">
+            <xsl:apply-templates>
+                <xsl:with-param name="href" 
+                                tunnel="yes"
+                                select="concat($paginator-baseurl, 
+                                               $paginator-page-param, 
+                                               '=', 
+                                               $paginator-page-number -1)"/>
+            </xsl:apply-templates>
+        </xsl:if>
+    </xsl:template>
+    
+    <foundry:doc section="user" type="template-tag">
+        <foundry:doc-desc>
+            <p>
+                 Provides the URL to the next page of the list for an enclosed <code>a</code> 
+                element.
+            </p>
+        </foundry:doc-desc>
+    </foundry:doc>
+    <xsl:template match="object-list//paginator//next-page-link">
+        <xsl:param name="paginator-page-number" tunnel="yes" select="''"/>
+        <xsl:param name="paginator-page-count" tunnel="yes" select="''"/>
+        <xsl:param name="paginator-baseurl" tunnel="yes" select="''"/>
+        <xsl:param name="paginator-page-param" tunnel="yes" select="''"/>
+        
+        <xsl:if test="($paginator-page-number != '') 
+                      and ($paginator-page-number &lt; $paginator-page-count)">
+            <xsl:apply-templates>
+                <xsl:with-param name="href"
+                                tunnel="yes"
+                                select="concat($paginator-baseurl, 
+                                               $paginator-page-param, 
+                                               '=', 
+                                               $paginator-page-number + 1)"/>
+            </xsl:apply-templates>
+        </xsl:if>
+    </xsl:template>
+    
+    <foundry:doc section="user" type="template-tag">
+        <foundry:doc-desc>
+            <p>
+                 Provides the URL to the first page of the list for an enclosed <code>a</code> 
+                element.
+            </p>
+        </foundry:doc-desc>
+    </foundry:doc>
+    <xsl:template match="object-list//paginator//first-page-link">
+        <xsl:param name="paginator-page-number" tunnel="yes" select="''"/>
+        <xsl:param name="paginator-baseurl" tunnel="yes" select="''"/>
+        <xsl:param name="paginator-page-param" tunnel="yes" select="''"/>
+        
+        <xsl:if test="($paginator-page-number != '') and ($paginator-page-number &gt; 1)">
+            <xsl:apply-templates>
+                <xsl:with-param name="href" 
+                                tunnel="yes"
+                                select="concat($paginator-baseurl, $paginator-page-param, '=1')"/>
+            </xsl:apply-templates>
+        </xsl:if>
+    </xsl:template>
+    
+    <foundry:doc section="user" type="template-tag">
+        <foundry:doc-desc>
+            <p>
+                 Provides the URL to the last page of the list for an enclosed <code>a</code> 
+                element.
+            </p>
+        </foundry:doc-desc>
+    </foundry:doc>
+    <xsl:template match="object-list//paginator//last-page-link">
+        <xsl:param name="paginator-page-number" tunnel="yes" select="''"/>
+        <xsl:param name="paginator-page-count" tunnel="yes" select="''"/>
+        <xsl:param name="paginator-baseurl" tunnel="yes" select="''"/>
+        <xsl:param name="paginator-page-param" tunnel="yes" select="''"/>
+        
+        <xsl:if test="($paginator-page-number != '') 
+                      and ($paginator-page-number &lt; $paginator-page-count)">
+            <xsl:apply-templates>
+                <xsl:with-param name="href"
+                                tunnel="yes"
+                                select="concat($paginator-baseurl, 
+                                               $paginator-page-param, 
+                                               '=', 
+                                               $paginator-page-count)"/>
+            </xsl:apply-templates>
+        </xsl:if>
+    </xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file