diff --git a/ccm-sci-bundle/web/themes/foundry/doc/static-texts/devel/coding-style.html b/ccm-sci-bundle/web/themes/foundry/doc/static-texts/devel/coding-style.html
index 9724f1a7e..0b4b43969 100644
--- a/ccm-sci-bundle/web/themes/foundry/doc/static-texts/devel/coding-style.html
+++ b/ccm-sci-bundle/web/themes/foundry/doc/static-texts/devel/coding-style.html
@@ -13,7 +13,7 @@
         <h2>Naming</h2>
         <p>
             The naming rules described here apply to all names: Names of layout elements, 
-            XSL template names, EXSLT functions, files, ids and classes (in the 
+            XSL template names, XSL functions, files, ids and classes (in the 
             <code>class</code> attribute).
         </p>
         <p>
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 9de5dc6be..8de0058ef 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
@@ -30,6 +30,7 @@
                 version="2.0">
     
     <xsl:import href="content-items/article.xsl"/>
+    <xsl:import href="content-items/assets/image-attachments.xsl"/>
     <xsl:import href="content-items/assets/notes.xsl"/>
     <xsl:import href="content-items/assets/related-links.xsl"/>
 
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items/assets/image-attachments.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items/assets/image-attachments.xsl
new file mode 100644
index 000000000..9c28e7f41
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items/assets/image-attachments.xsl
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'>
+                      <!ENTITY shy '&#173;'>]>
+<!--
+    Copyright 2014 Jens Pelzetter for the LibreCCM Foundation
+    
+    This file is part of the Foundry Theme Engine for LibreCCM
+    
+    Foundry is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Foundry is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Foundry  If not, see <http://www.gnu.org/licenses/>.
+
+-->
+<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"
+                xmlns="http://www.w3.org/1999/xhtml"
+                exclude-result-prefixes="xsl bebop cms foundry nav ui"
+                version="2.0">
+    
+    <xsl:template match="image-attachments">
+        <xsl:if test="$data-tree/cms:contentPanel/cms:item/imageAttachments
+                      or $data-tree/nav:greetingItem/cms:item/imageAttachments">
+            <xsl:apply-templates/>
+        </xsl:if>
+    </xsl:template>
+    
+    <xsl:template match="images-attachments//image-attachment">
+        <xsl:variable name="images-layout-tree" select="current()"/>
+        
+        <xsl:variable name="contentitem-tree">
+            <xsl:choose>
+                <xsl:when test="$data-tree/nav:greetingItem">
+                    <xsl:copy-of select="$data-tree/nav:greetingItem/cms:item/*"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:copy-of select="$data-tree/cms:contentPanel/cms:item/*"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        
+        
+        <xsl:variable name="from" as="xs:integer">
+            <xsl:choose>
+                <xsl:when test="..//imageAttachments/@from">
+                    <xsl:value-of select="..//imageAttachments/@from"/>
+                </xsl:when>
+                <xsl:when test="..//imageAttachment/@select">
+                    <xsl:value-of select="..//imageAttachments/@select"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="min($contentitem-tree/imageAttachments/sortKey)"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+                
+        <xsl:variable name="to" as="xs:integer">
+            <xsl:choose>
+                <xsl:when test="..//imageAttachments/@to">
+                    <xsl:value-of select="..//imageAttachments/@to"/>
+                </xsl:when>
+                <xsl:when test="..//imageAttachment/@select">
+                    <xsl:value-of select="..//imageAttachments/@select"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="max($contentitem-tree/imageAttachments/sortKey)"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+                
+        <xsl:for-each select="$contentitem-tree/imageAttachments[sortKey &gt;= from and sortKey &lt;= sortKey]">
+            <xsl:sort select="sortKey"/>
+            
+            <xsl:apply-templates select="$images-layout-tree/*">
+                <xsl:with-param name="src" 
+                                tunnel="yes" 
+                                select="concat('/cms-service/stream/image/?image_id=', ./images/id)"/>
+                <xsl:with-param name="img-width"
+                                tunnel="yes"
+                                select="./image/width"/>
+                <xsl:with-param name="img-height"
+                                tunnel="yes"
+                                select="./images/height"/>
+                <xsl:with-param name="alt"
+                                tunnel="yes">
+                    <xsl:choose>
+                        <xsl:when test="string-length(./caption) &gt; 0">
+                            <xsl:value-of select="./caption"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="./image/displayName"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:with-param>
+            </xsl:apply-templates>
+        </xsl:for-each>
+         
+        
+        
+    </xsl:template>
+    
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl
index 2b8eab292..57be79e7e 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl
@@ -30,7 +30,6 @@
                 version="2.0">
     
     <xsl:template match="related-links">
-        
         <xsl:if test="$data-tree/cms:contentPanel/cms:item/links
                       or $data-tree/nav:greetingItem/cms:item/links">
             <xsl:apply-templates/>
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 f077e15bd..1b3f4419f 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
@@ -24,6 +24,7 @@
                 xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
                 xmlns:foundry="http://foundry.libreccm.org"
                 xmlns:ui="http://www.arsdigita.com/ui/1.0"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns="http://www.w3.org/1999/xhtml"
                 exclude-result-prefixes="xsl bebop foundry ui"
                 version="2.0">
@@ -352,44 +353,58 @@
         </dd>
     </xsl:template>
     
-    <xsl:template match="h1">
-        <xsl:call-template name="foundry:set-id-and-class"/>
+    <xsl:template name="figcaption">
+        <figcaption>
+            <xsl:call-template name="foundry:set-id-and-class"/>
+            <xsl:apply-templates/>
+        </figcaption>
+    </xsl:template>
+    
+    <xsl:template name="figure">
+        <figure>
+            <xsl:call-template name="foundry:set-id-and-class"/>
+            <xsl:apply-templates/>
+        </figure>
+    </xsl:template>
+    
+    <xsl:template match="h1">        
         <h1>
+            <xsl:call-template name="foundry:set-id-and-class"/>
             <xsl:apply-templates/>
         </h1>
     </xsl:template>
     
     <xsl:template match="h2">
-        <xsl:call-template name="foundry:set-id-and-class"/>
         <h2>
+            <xsl:call-template name="foundry:set-id-and-class"/>
             <xsl:apply-templates/>
         </h2>
     </xsl:template>
     
     <xsl:template match="h3">
-        <xsl:call-template name="foundry:set-id-and-class"/>
         <h3>
+            <xsl:call-template name="foundry:set-id-and-class"/>
             <xsl:apply-templates/>
         </h3>
     </xsl:template>
     
     <xsl:template match="h4">
-        <xsl:call-template name="foundry:set-id-and-class"/>
         <h4>
+            <xsl:call-template name="foundry:set-id-and-class"/>
             <xsl:apply-templates/>
         </h4>
     </xsl:template>
     
     <xsl:template match="h5">
-        <xsl:call-template name="foundry:set-id-and-class"/>
         <h5>
+            <xsl:call-template name="foundry:set-id-and-class"/>
             <xsl:apply-templates/>
         </h5>
     </xsl:template>
     
     <xsl:template match="h6">
-        <xsl:call-template name="foundry:set-id-and-class"/>
         <h6>
+            <xsl:call-template name="foundry:set-id-and-class"/>
             <xsl:apply-templates/>
         </h6>
     </xsl:template>
@@ -476,6 +491,60 @@
         </header>
     </xsl:template>
 
+    <foundry:doc>
+        <foundry:doc-desc>
+            <p>
+                The <code>img</code> tag produces an HTML <code>img</code> in the HTML output.
+                The source URL of the image can either be provided using the attributes 
+                <code>src-static</code> or <code>src-property</code> or by a surrounding tag
+                like <code>image-attachment</code>. If the image URL is provided by an surrouding 
+                tag these tag usally provides values with the orginal width and height of the image.
+            </p>
+            <p>
+                Depending of the format for URL, the URL is modified. There are three possible 
+                cases:
+            </p>
+            <ol>
+                <li>
+                    The URL starts with <code>http://</code> or <code>https://</code>. 
+                    In this case the URL is used literally.
+                </li>
+                <li>
+                    The URL starts with a slash (<code>/</code>). In this case the URL points to
+                    an image provided by CCM (from the database). In this case, the 
+                    <code>dispatcher-prefix</code> is appended before the URL. Also width and 
+                    height parameters are appended to the URL for CCM server side resizing 
+                    function.
+                </li>
+                <li>
+                    Otherwise is is assumed that the image is provided by the theme. In this
+                    cases the <code>theme-prefix</code> is added before the image URL. 
+                </li>
+            </ol>
+        </foundry:doc-desc>
+        <foundry:doc-attributes>
+            <foundry:doc-attribute name="src-static">
+                <p>
+                    An URL to an static image resource. 
+                </p>
+            </foundry:doc-attribute>
+            <foundry:doc-attribute name="src-property">
+                <p>
+                    Name of an XML in the <code>data-tree</code> providing the URL of the image.
+                </p>
+            </foundry:doc-attribute>
+            <foundry:doc-attribute name="width">
+                <p>
+                    The (maximum) width of the image.
+                </p>
+            </foundry:doc-attribute>
+            <foundry:doc-attribute name="height">
+                <p>
+                    The (maximum) height of the image.
+                </p>
+            </foundry:doc-attribute>
+        </foundry:doc-attributes>
+    </foundry:doc>
     <xsl:template match="img">
         <!-- Source URL of the image provided by a surrounding tag. -->
         <xsl:param name="src" tunnel="yes" as="xs:string" select="''"/>
@@ -483,6 +552,8 @@
         <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"/>
+        <!-- Content of the alt attribute if provided by surrounding tag -->
+        <xsl:param name="alt" tunnel="yes" as="xs:string" select="''"/>
         
         <xsl:variable name="src-raw">
             <xsl:choose>
@@ -493,7 +564,7 @@
                     <xsl:value-of select="./@src"/>
                 </xsl:when>
                 <xsl:when test="./@src-property">
-                    <xsl:value-of select="$data-tree/*[name = './@src-property"/>
+                    <xsl:value-of select="$data-tree/*[name = ./@src-property]"/>
                 </xsl:when>
             </xsl:choose>
         </xsl:variable>
@@ -504,7 +575,7 @@
         -->
         <xsl:variable name="max-width" 
                       as="xs:integer" 
-                      select="get-attribute-value(current(), 'width', -1)"/>
+                      select="foundry:get-attribute-value(current(), 'width', -1)"/>
         
         <!--
             Value of the height attriibute of the img element in the layout template if set.
@@ -512,20 +583,20 @@
         -->
         <xsl:variable name="max-height" 
                       as="xs:integer"
-                      select="get-attribute-value(current(), 'height', -1)"/>
+                      select="foundry: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 ">
+                                and $img-height &gt; $max-height ">
                     <xsl:choose>
                         <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:value-of select="round($max-width)"/>
                         </xsl:when>
                     </xsl:choose>
                 </xsl:when>
@@ -579,29 +650,29 @@
             <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:value-of select="$src-raw"/>
                 </xsl:when>
                 <xsl:when test="substring($src-raw, 1, 1) = '/'">
                     <xsl:variable name="img-dimensions" 
-                                  select="concat('width='), $width, '&amp;height=', $height"/>
+                                  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)"/>
+                                                  $src-raw,
+                                                  '&amp;',
+                                                  $img-dimensions)"/>
                         </xsl:when>
                         <xsl:otherwise>
                             <xsl:value-of select="concat($dispatcher-prefix, 
-                                                         $img-raw, 
+                                                         $src-raw, 
                                                          '?', 
                                                          $img-dimensions)"/>
                         </xsl:otherwise>
                     </xsl:choose>
                 </xsl:when>
                 <xsl:otherwise>
-                    <xsl:value-of select="foundry:gen-path($img-raw)"/>
+                    <xsl:value-of select="foundry:gen-path($src-raw)"/>
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:variable>
@@ -610,6 +681,11 @@
             
             <xsl:attribute name="src" select="$img-src"/>
             
+            <xsl:if test="$alt != ''">
+                <xsl:attribute name="alt">
+                    <xsl:value-of select="$alt"/>
+                </xsl:attribute>
+            </xsl:if>
             <xsl:if test="./@alt">
                 <xsl:attribute name="alt">
                     <xsl:value-of select="foundry:get-static-text('', ./@alt, false())"/>
diff --git a/ccm-sci-bundle/web/themes/foundry/templates/default-layout.xml b/ccm-sci-bundle/web/themes/foundry/templates/default-layout.xml
index 730066017..4955fafee 100644
--- a/ccm-sci-bundle/web/themes/foundry/templates/default-layout.xml
+++ b/ccm-sci-bundle/web/themes/foundry/templates/default-layout.xml
@@ -51,6 +51,13 @@
             <div>
                 <content-item/>
             </div>
+            <div>
+                <imageAttachments>
+                    <imageAttachment>
+                        <img/>
+                    </imageAttachment>
+                </imageAttachments>
+            </div>
         </main>
         <aside>
             <related-links>