diff --git a/ccm-sci-bundle/web/themes/foundry/doc/styles/foundry-doc.css b/ccm-sci-bundle/web/themes/foundry/doc/styles/foundry-doc.css
index 03a3bd9e9..91c84a6e4 100644
--- a/ccm-sci-bundle/web/themes/foundry/doc/styles/foundry-doc.css
+++ b/ccm-sci-bundle/web/themes/foundry/doc/styles/foundry-doc.css
@@ -145,12 +145,50 @@ body {
     
     position: relative;
     width: 40em;
+    margin-top: 3em;
+    margin-bottom: 3em;
     margin-left: auto;
     margin-right: auto;
+    
+    font-size: 1em;
 }
 
 main {
-    
+    /*margin-top: 3em;
+    margin-bottom: 3em;*/
+}
+
+header, footer {
+    position: fixed;
+    width: 40em;
+    height: 2em;
+    left: 50%;
+    margin-top: 0;
+    margin-bottom: 0;
+    margin-left: -20em;
+    margin-right: auto;
+    padding: 0.5em 0;
+    background-color: #fff;
+}
+
+header {
+    top: 0;
+}
+
+footer {
+    bottom: 0;
+}
+
+header .border-wrapper {
+    padding-left: 2em;
+    padding-right: 2em;
+    border-bottom: 1px solid #000;
+}
+
+footer .border-wrapper {
+    padding-left: 2em;
+    padding-right: 2em;
+    border-top: 1px solid #000;
 }
 
 nav {
@@ -166,3 +204,41 @@ pre, code {
     font-family: liberation_mono;
 }
 
+div#title-page h1 {
+    text-align: center;
+    font-size: 2.5em;
+    font-weight: bold;
+}
+
+main article h1 {
+    font-size: 2.2em;
+    font-weight: bold;
+}
+
+main article section h1 {
+    font-size: 2em;
+    font-weight: bold;
+}
+
+main article section section h1 {
+    font-size: 1.8em;
+    font-weight: bold;
+}
+
+main article section section section h1 {
+    font-size: 1.6em;
+    font-weight: bold;
+    margin-top: 0.7em;
+    margin-bottom: 0.7em;
+}
+
+main article section section section section h1 {
+    font-size: 1.4em;
+    font-weight: bold;
+    margin-bottom: 0.4em;
+    margin-top: 0.4em;
+}
+
+main article section section section section.template-tag h1 {
+    font-family: liberation_mono;
+}
\ No newline at end of file
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 efd5f10d8..e14e8ede0 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
@@ -31,6 +31,13 @@
                 exclude-result-prefixes="xsl xs bebop cms foundry nav ui"
                 version="2.0">
 
+    <foundry:doc-file>
+        <foundry:doc-file-title>Root template tags</foundry:doc-file-title>
+        <foundry:doc-file-desc>
+            These tags are the root elements of a layout template.
+        </foundry:doc-file-desc>
+    </foundry:doc-file>
+    
     <foundry:doc section="user" type="template-tag">
         <foundry:doc-desc>
             <p>
@@ -87,7 +94,7 @@
         Common helper templates/functions for all templates tags
     -->
 
-    <foundry:doc section="devel">
+    <foundry:doc section="devel" type="function-template">
         <foundry:doc-desc>
             Helper functions for generating the name of the colorset class.
         </foundry:doc-desc>
@@ -101,7 +108,7 @@
         </xsl:for-each>
     </xsl:function>
     
-    <foundry:doc section="devel">
+    <foundry:doc section="devel" type="function-template">
         <foundry:doc-desc>
             Helper functions for retrieving the name of the content type of the current content item
             from the result tree XML.
@@ -111,7 +118,7 @@
         <xsl:value-of select="$data-tree//cms:item/type/label"/>
     </xsl:function>
     
-    <foundry:doc section="devel">
+    <foundry:doc section="devel" type="function-template">
         <foundry:doc-desc>
             Helper template for processing arrows/links for sorting items.
         </foundry:doc-desc>
@@ -161,7 +168,7 @@
         </span>
     </xsl:template>
     
-    <foundry:doc section="devel">
+    <foundry:doc section="devel" type="function-template">
         <foundry:doc-desc>
             Helper template for processing additional attributes in the data tree XML. They copied
             literally from the XML the HTML.
@@ -184,7 +191,7 @@
         </xsl:if>
     </xsl:template>
 
-    <foundry:doc section="devel">
+    <foundry:doc section="devel" type="function-template">
         <foundry:doc-param name="template-file"
                            mandantory="yes">
             The name of the template file to process.
@@ -211,7 +218,7 @@
         </xsl:choose>
     </xsl:template>
 
-    <foundry:doc section="devel">
+    <foundry:doc section="devel" type="function-template">
         <foundry:doc-desc>
             Helper template for setting the <code>id</code> and <code>class</code> attributes
             on a HTML element.
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 32ec8427d..9de5dc6be 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
@@ -33,6 +33,16 @@
     <xsl:import href="content-items/assets/notes.xsl"/>
     <xsl:import href="content-items/assets/related-links.xsl"/>
 
+    <foundry:doc-file>
+        <foundry:doc-file-title>Tags for displaying Content Items</foundry:doc-file-title>
+        <foundry:doc-file-desc>
+            <p>
+                These tags are common tags for displaying Content Items. For most Content Types
+                there are special tags provided by other files.
+            </p>
+        </foundry:doc-file-desc>
+    </foundry:doc-file>
+
     <foundry:doc section="user" type="template-tag">
         <foundry:doc-desc>
             <p>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl
index 85c10d992..cc836baa8 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl
@@ -24,6 +24,15 @@
                 exclude-result-prefixes="xsl foundry"
                 version="2.0">
 
+    <foundry:doc-file>
+        <foundry:doc-file-title>Data tags</foundry:doc-file-title>
+        <foundry:doc-file-desc>
+            <p>
+                These tags can be used to display several informations from the XML provided by CCM.
+            </p>
+        </foundry:doc-file-desc>
+    </foundry:doc-file>
+    
     <foundry:doc section="user"
                  type="template-tag">
         <foundry:doc-desc>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/foundry-doc-tags.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/foundry-doc-tags.xsl
index a34e2fb6a..6c3a97b9c 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/foundry-doc-tags.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/foundry-doc-tags.xsl
@@ -21,12 +21,21 @@
 
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+                xmlns:cms="http://www.arsdigita.com/cms/1.0"
                 xmlns:foundry="http://foundry.libreccm.org"
+                xmlns:nav="http://ccm.redhat.com/navigation"
                 xmlns:ui="http://www.arsdigita.com/ui/1.0"
-                exclude-result-prefixes="xsl bebop foundry ui"
+                exclude-result-prefixes="xsl xs bebop cms foundry nav ui"
                 version="2.0">
 
+    <!--
+        These tags are part of the documentation system of Foundry. Therefore there is no file
+        description here. The documentation system, including the tags definied in this file
+        are described in the Developer Manual part in the documentation of Foundry.
+    -->
+    
     <xsl:template match="doc-chapter-list">
         <xsl:apply-templates/>
     </xsl:template>
@@ -182,7 +191,7 @@
             <h1>
                 <xsl:value-of select="document(./@href)/xsl:stylesheet/foundry:doc-file/foundry:doc-file-title"/>
             </h1>
-            <xsl:copy-of select="document(./@href)/xsl:stylesheet/foundry:doc-file/foundry:doc-file-desc"/>
+            <xsl:copy-of select="document(./@href)/xsl:stylesheet/foundry:doc-file/foundry:doc-file-desc/*"/>
             
             <xsl:apply-templates select="document(./@href)//xsl:import" mode="doc">
                 <xsl:sort select="./@href"/>
@@ -194,6 +203,20 @@
         </section>
     </xsl:template>
     
+    <xsl:template match="foundry:doc-file">
+        <!-- Empty template to avoid that the foundry:doc-file tag is copied to the HTML output -->
+    </xsl:template>
+    
+    <xsl:template match="foundry:doc-title">
+        <!-- Empty template to avoid that the foundry:doc-file-title tag is copied to the HTML 
+        output -->
+    </xsl:template>
+    
+    <xsl:template match="foundry:doc-file-desc">
+        <!-- Empty template to avoid that the foundry:doc-file-desc tag is copied to the HTML 
+        output -->
+    </xsl:template>
+    
     <xsl:template match="foundry:doc[@type='function']" mode="doc">
         <xsl:apply-templates select="document(foundry:gen-path('foundry/templates/doc/function-layout.xml'))">
             <xsl:with-param name="function-name" 
@@ -208,6 +231,11 @@
         </xsl:apply-templates>
     </xsl:template>
     
+    <xsl:template match="foundry:doc-desc">
+        <!-- Empty template to avoid that the foundry:doc-file-desc tag is copied to the HTML 
+        output -->
+    </xsl:template>
+    
     <xsl:template match="doc-function-layout">
         <xsl:param name="function-name" tunnel="yes"/>
         
@@ -225,7 +253,7 @@
     <xsl:template match="doc-function-desc">
         <xsl:param name="doc-desc" tunnel="yes"/>
         
-        <xsl:copy-of select="$doc-desc"/>
+        <xsl:copy-of select="$doc-desc/*"/>
     </xsl:template>
     
     <xsl:template match="doc-function-params">
@@ -339,7 +367,7 @@
     <xsl:template match="doc-template-tag-desc">
         <xsl:param name="doc-desc" tunnel="yes"/>
         
-        <xsl:copy-of select="$doc-desc"/>
+        <xsl:copy-of select="$doc-desc/*"/>
     </xsl:template>
     
     <xsl:template match="doc-template-tag-attributes">
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 9e89f73ab..f077e15bd 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
@@ -477,24 +477,139 @@
     </xsl:template>
 
     <xsl:template match="img">
-        <img>
-            <xsl:if test="./@href-property">
-                <xsl:attribute name="href">
-                    <xsl:value-of select="$data-tree/*[name = ./@href-property]"/>
-                </xsl:attribute>
-            </xsl:if>
-            <xsl:if test="./@href-static">
-                <xsl:attribute name="href">
+        <!-- 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) -->
+        <xsl:param name="img-width" tunnel="yes" as="xs:integer" select="-1"/>
+        <!-- Height of the image the URL the src parameter is pointing to (pixel) -->
+        <xsl:param name="img-height" tunnel="yes" as="xs:integer" select="-1"/>
+        
+        <xsl:variable name="src-raw">
+            <xsl:choose>
+                <xsl:when test="$src != ''">
+                    <xsl:value-of select="src"/>
+                </xsl:when>
+                <xsl:when test="./@src-static">
+                    <xsl:value-of select="./@src"/>
+                </xsl:when>
+                <xsl:when test="./@src-property">
+                    <xsl:value-of select="$data-tree/*[name = './@src-property"/>
+                </xsl:when>
+            </xsl:choose>
+        </xsl:variable>
+        
+        <!-- 
+            Value of width attribute of the img element in the layout template if set. 
+            If there is no width attribute the value is set to -1.
+        -->
+        <xsl:variable name="max-width" 
+                      as="xs:integer" 
+                      select="get-attribute-value(current(), 'width', -1)"/>
+        
+        <!--
+            Value of the height attriibute of the img element in the layout template if set.
+            If there is no attribute the value is set to -1.
+        -->
+        <xsl:variable name="max-height" 
+                      as="xs:integer"
+                      select="get-attribute-value(current(), 'height', -1)"/>
+        
+        <xsl:variable name="width">
+            <xsl:choose>
+                <xsl:when test="$max-width &gt; 0 
+                                and $max-height &gt; 0 
+                                and $img-width &gt; $max-width 
+                                and $height &gt; $max-height ">
                     <xsl:choose>
-                        <xsl:when test="substring(./@href-static, 1, 7) = 'http://'">
-                            <xsl:value-of select="./@href-static"/>
+                        <xsl:when test="$max-width div $img-width &gt; $max-height div $img-height">
+                            <xsl:value-of select="round($max-height div $img-height * $img-width)"/>
+                        </xsl:when>
+                        <xsl:when test="$max-height div $img-height &gt;= $max-width div $img-width">
+                            <xsl:value-of select="round($max-width"/>
+                        </xsl:when>
+                    </xsl:choose>
+                </xsl:when>
+                <xsl:when test="$max-width &gt; 0 and $img-width &gt; $max-width">
+                    <xsl:value-of select="$max-width"/>
+                </xsl:when>
+                <xsl:when test="$max-height &gt; 0 and $img-height &gt; $max-height" >
+                    <xsl:value-of select="round($max-height div $img-height * $img-width)"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$img-width"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        
+        <xsl:variable name="height">
+            <xsl:choose>
+                <xsl:when test="$max-width &gt; 0 
+                                and $max-height &gt; 0 
+                                and $img-width &gt; $max-width 
+                                and $img-height &gt; $max-height">
+                    <xsl:choose>
+                        <xsl:when test="$max-height div $img-height &gt; $max-width div $img-width">
+                            <xsl:value-of select="round($max-width div width * height)"/>
+                        </xsl:when>
+                        <xsl:when test="$max-width div $img-width &gt;= $max-height div $img-height">
+                            <xsl:value-of select="$max-height"/>
+                        </xsl:when>
+                    </xsl:choose>
+                </xsl:when>
+                <xsl:when test="$max-height &gt; 0 and $img-height &gt; $max-height">
+                    <xsl:value-of select="$max-height"/>
+                </xsl:when>
+                <xsl:when test="$max-width &gt; 0 and $img-width &gt; $max-width">
+                    <xsl:value-of select="round($max-width div $img-width * $img-height)"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$img-height"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        
+        <!-- 
+            Generate src URL of the image. If the path is not an external path (a path starting
+            with http:// or https://) add the theme-prefix or the dispatcher-prefix. The 
+            dispatcher-prefix is added if the path does start with a slash (/). This indicates 
+            that the image is served from the CCM database. If the path does *not* start with a
+            slash the image is part of the theme and the theme-prefix is added.
+        -->
+        <xsl:variable name="img-src">
+            <xsl:choose>
+                <xsl:when test="substring($src-raw, 1, 7) = 'http://' 
+                                or substring($src-raw, 1, 8) = 'https://'" >
+                    <xsl:value-of select="$img-raw"/>
+                </xsl:when>
+                <xsl:when test="substring($src-raw, 1, 1) = '/'">
+                    <xsl:variable name="img-dimensions" 
+                                  select="concat('width='), $width, '&amp;height=', $height"/>
+                    
+                    <xsl:choose>
+                        <xsl:when test="contains($src-raw, '?')">
+                            <xsl:value-of select="concat($dispatcher-prefix,
+                                                  $img-raw,
+                                                  '&',
+                                                  $img-diemensions)"/>
                         </xsl:when>
                         <xsl:otherwise>
-                            <xsl:value-of select="foundry:gen-path(./@href-static)"/>
+                            <xsl:value-of select="concat($dispatcher-prefix, 
+                                                         $img-raw, 
+                                                         '?', 
+                                                         $img-dimensions)"/>
                         </xsl:otherwise>
                     </xsl:choose>
-                </xsl:attribute>
-            </xsl:if>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="foundry:gen-path($img-raw)"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        
+        <img>
+            
+            <xsl:attribute name="src" select="$img-src"/>
+            
             <xsl:if test="./@alt">
                 <xsl:attribute name="alt">
                     <xsl:value-of select="foundry:get-static-text('', ./@alt, false())"/>
@@ -505,14 +620,14 @@
                     <xsl:value-of select="foundry:get-static-text('', ./@title, false())"/>
                 </xsl:attribute>
             </xsl:if>
-            <xsl:if test="width">
+            <xsl:if test="$width &gt; 0">
                 <xsl:attribute name="width">
-                    <xsl:value-of select="width"/>
+                    <xsl:value-of select="$width"/>
                 </xsl:attribute>
             </xsl:if>
-            <xsl:if test="height">
+            <xsl:if test="$height &gt; 0">
                 <xsl:attribute name="height">
-                    <xsl:value-of select="height"/>
+                    <xsl:value-of select="$height"/>
                 </xsl:attribute>
             </xsl:if>
         </img>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/loaders.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/loaders.xsl
index 88c3194e8..3fe2ee43b 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/loaders.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/loaders.xsl
@@ -28,6 +28,16 @@
                 exclude-result-prefixes="xsl bebop foundry ui"
                 version="2.0">
     
+    <foundry:doc-file>
+        <foundry:doc-file-title>Loaders</foundry:doc-file-title>
+        <foundry:doc-file-desc>
+            <p>
+                This tags are used to load resources required by the generated HTML documents,
+                for example CSS files and JavaScript files.
+            </p>
+        </foundry:doc-file-desc>
+    </foundry:doc-file>
+    
     <foundry:doc section="user"
                  type="template-tag">
         <foundry:doc-desc>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/navigation.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
index 30a8c59a9..17e45f9e7 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
@@ -7,6 +7,17 @@
                 xmlns:nav="http://ccm.redhat.com/navigation"
                 exclude-result-prefixes="xsl bebop foundry nav"
                 version="1.0">
+    
+    <foundry:doc-file>
+        <foundry:doc-file-title>Tags for ccm-navigation</foundry:doc-file-title>
+        <foundry:doc-file-desc>
+            <p>
+                These tags are used to output data provided by the <em>ccm-navigation</em> module.
+                More excalty the navigation menu(s) and the breadcrumbs on a site are generated
+                using these tags.
+            </p>
+        </foundry:doc-file-desc>
+    </foundry:doc-file>
 
     <xsl:template match="breadcrumbs">
         <xsl:apply-templates select="./*[not(name = 'breadcrumb-separator')]">
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/subsite.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/subsite.xsl
index 0d1e7ea42..1fca9d6a6 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/subsite.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/subsite.xsl
@@ -9,6 +9,16 @@
                 exclude-result-prefixes="xsl bebop cms foundry ui"
                 version="2.0">
 
+    <foundry:doc-file>
+        <foundry:doc-file-title>Subsite tags</foundry:doc-file-title>
+        <foundry:doc-file-desc>
+            <p>
+                These tags can be used to show informations about the current subsite in
+                the generated HTML document.
+            </p>
+        </foundry:doc-file-desc>
+    </foundry:doc-file>
+    
     <xsl:template match="subsite-name">
         <xsl:variable name="subsite-banner-text">
             <xsl:value-of select="foundry:get-static-text('subsite-banner', $data-tree//ui:siteBanner[@bebop:classname='com.arsdigita.subsite.ui.SubSiteBanner']/@sitename)"/>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/templates/doc/foundry-documentation.xml b/ccm-sci-bundle/web/themes/foundry/foundry/templates/doc/foundry-documentation.xml
index 1730b760c..2f1f3b001 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/templates/doc/foundry-documentation.xml
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/templates/doc/foundry-documentation.xml
@@ -11,11 +11,13 @@
     </head>
     <body>
         <header>
-            The Foundry Theming Engine for LibreCCM
+            <div class="border-wrapper">
+                The Foundry Theming Engine for LibreCCM
+            </div>
         </header>
-        <div>
-            <h1>The Foundry Theming Enine for LibreCCM</h1>
-            <p>Jens Pelzetter</p>
+        <div id="title-page">
+            <h1>The Foundry Theming Engine for LibreCCM</h1>
+            <!--<p class="authors">Jens Pelzetter</p>-->
         </div>
         <nav>
             <doc-chapter-list>
@@ -42,15 +44,15 @@
             </doc-chapter-list>
         </nav>
         <main id="startcontent">
-            <h1>
+            <!--<h1>
                 Foundry Documentation
-            </h1>
+            </h1>-->
             <doc-chapters/>
         </main>
         <footer>
-            <p>
-                (c) 2014 Jens Pelzetter.
-            </p>
+            <div class="border-wrapper">
+                (c) 2014 LibreCCM Foundation
+            </div>
         </footer>
     </body>
 </page-layout>
\ No newline at end of file