diff --git a/ccm-sci-bundle/web/themes/foundry/doc/foundry-documentation.html b/ccm-sci-bundle/web/themes/foundry/doc/foundry-documentation.html
index 031bde0ca..e2a01e560 100644
--- a/ccm-sci-bundle/web/themes/foundry/doc/foundry-documentation.html
+++ b/ccm-sci-bundle/web/themes/foundry/doc/foundry-documentation.html
@@ -12,19 +12,19 @@
    </head>
    <body><span id="top"></span><a href="#startcontent" accesskey="S" class="nav-hide" title="">Skip navigation</a><nav>
          <ul class="chapter-list">
-            <li class="chapter-entry"><a href="#overview" title="Overview">Overview</a><ul class="section-list">
+            <li class="chapter-entry"><a href="#overview">Overview</a><ul class="section-list">
                   <li class="section-entry"><a href="#overview" title="Overview">Overview</a></li>
                   <li class="section-entry"><a href="#this-manual" title="This manual">This manual</a></li>
                </ul>
             </li>
-            <li class="chapter-entry"><a href="#user-manual" title="User Manual">User Manual</a><ul class="section-list">
+            <li class="chapter-entry"><a href="#user-manual">User Manual</a><ul class="section-list">
                   <li class="section-entry"><a href="#about-foundry" title="About Foundry">About Foundry</a></li>
                   <li class="section-entry"><a href="#layout-templates" title="Layout templates">Layout templates</a></li>
                   <li class="section-entry"><a href="#css-files" title="CSS files">CSS files</a></li>
                   <li class="section-entry"><a href="#template-tags-reference" title="Templates Tags Reference">Templates Tags Reference</a></li>
                </ul>
             </li>
-            <li class="chapter-entry"><a href="#developer-manual" title="Developer Manual">Developer Manual</a><ul class="section-list">
+            <li class="chapter-entry"><a href="#developer-manual">Developer Manual</a><ul class="section-list">
                   <li class="section-entry"><a href="#foundry-structure" title="The structure of Foundry">The structure of Foundry</a></li>
                   <li class="section-entry"><a href="#coding-style" title="Coding style">Coding style</a></li>
                   <li class="section-entry"><a href="#doc-system" title="The documentation system of Foundry">The documentation system of Foundry</a></li>
@@ -38,6 +38,15 @@
             Foundry Documentation
             
          </h1>
+         <article id="overview">
+            <h1>Overview</h1>
+         </article>
+         <article id="user-manual">
+            <h1>User Manual</h1>
+         </article>
+         <article id="developer-manual">
+            <h1>Developer Manual</h1>
+         </article>
       </main>
    </body>
 </html>
\ No newline at end of file
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 fa5982518..9724f1a7e 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
@@ -6,6 +6,7 @@
     </head>
     <body>
         <h1>Foundry Coding Style</h1>
+    <main>
         <p>
             This document describes the coding conventions for the Foundry theming engine. 
         </p>
@@ -32,8 +33,6 @@
             prefix).
         </p>
 
-
-
         <h2>Indention, line length and formating</h2>
         <p>
             Indention is done using spaces. Indention depth is four (4) spaces per level.
@@ -56,5 +55,6 @@
         <pre>
 &lt;xsl:param name=example-param" select="'example'"/&gt;
         </pre>
-    </body>
+    </main>
+</body>
 </html>
diff --git a/ccm-sci-bundle/web/themes/foundry/doc/static-texts/devel/foundry-doc-system.html b/ccm-sci-bundle/web/themes/foundry/doc/static-texts/devel/foundry-doc-system.html
index cc784f2da..f9c6ca71b 100644
--- a/ccm-sci-bundle/web/themes/foundry/doc/static-texts/devel/foundry-doc-system.html
+++ b/ccm-sci-bundle/web/themes/foundry/doc/static-texts/devel/foundry-doc-system.html
@@ -6,8 +6,8 @@
     </head>
     <body>
         <h1>The documentation system of Foundry</h1>
-        <p>
-            Placeholder
-        </p>
-    </body>
+    <main>
+        Placeholder
+    </main>
+</body>
 </html>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/doc/static-texts/devel/foundry-structure.html b/ccm-sci-bundle/web/themes/foundry/doc/static-texts/devel/foundry-structure.html
index 00f32aa54..9885a266a 100644
--- a/ccm-sci-bundle/web/themes/foundry/doc/static-texts/devel/foundry-structure.html
+++ b/ccm-sci-bundle/web/themes/foundry/doc/static-texts/devel/foundry-structure.html
@@ -6,8 +6,8 @@
     </head>
     <body>
         <h1>The overall structure of foundry</h1>
-        <p>
+        <main>
             Placeholder
-        </p>
+        </main>
     </body>
 </html>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/doc/static-texts/overview-foundry.html b/ccm-sci-bundle/web/themes/foundry/doc/static-texts/overview-foundry.html
new file mode 100644
index 000000000..708254c0f
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/doc/static-texts/overview-foundry.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Foundry Documentation - CSS files</title>
+        <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+    </head>
+    <body>
+        <h1>Foundry Overview</h1>
+        <main>
+            Placeholder
+        </main>
+    </body>
+</html>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/doc/static-texts/this-manual.html b/ccm-sci-bundle/web/themes/foundry/doc/static-texts/this-manual.html
new file mode 100644
index 000000000..3007e243e
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/doc/static-texts/this-manual.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Foundry Documentation - CSS files</title>
+        <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+    </head>
+    <body>
+        <h1>About this manual</h1>
+        <main>
+            Placeholder
+        </main>
+    </body>
+</html>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/doc/static-texts/user/about-foundry.html b/ccm-sci-bundle/web/themes/foundry/doc/static-texts/user/about-foundry.html
index 86f553bf5..96569dec0 100644
--- a/ccm-sci-bundle/web/themes/foundry/doc/static-texts/user/about-foundry.html
+++ b/ccm-sci-bundle/web/themes/foundry/doc/static-texts/user/about-foundry.html
@@ -6,8 +6,8 @@
     </head>
     <body>
         <h1>About Foundry</h1>
-        <p>
+        <main>
             Placeholder
-        </p>
+        </main>
     </body>
 </html>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/doc/static-texts/user/css-files.html b/ccm-sci-bundle/web/themes/foundry/doc/static-texts/user/css-files.html
index 29e013362..e102015f7 100644
--- a/ccm-sci-bundle/web/themes/foundry/doc/static-texts/user/css-files.html
+++ b/ccm-sci-bundle/web/themes/foundry/doc/static-texts/user/css-files.html
@@ -6,8 +6,8 @@
     </head>
     <body>
         <h1>CSS files</h1>
-        <p>
+        <main>
             Placeholder
-        </p>
+        </main>
     </body>
 </html>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/doc/static-texts/user/layout-templates.html b/ccm-sci-bundle/web/themes/foundry/doc/static-texts/user/layout-templates.html
index a5fe8e88c..26d75a903 100644
--- a/ccm-sci-bundle/web/themes/foundry/doc/static-texts/user/layout-templates.html
+++ b/ccm-sci-bundle/web/themes/foundry/doc/static-texts/user/layout-templates.html
@@ -6,8 +6,8 @@
     </head>
     <body>
         <h1>Layout templates</h1>
-        <p>
+        <main>
             Placeholder
-        </p>
+        </main>
     </body>
 </html>
\ No newline at end of file
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 3aab6f16a..0404f67ec 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
@@ -37,7 +37,7 @@
         <xsl:for-each select="$foundry-doc-tree/foundry:doc-chapter">
             <xsl:apply-templates select="$doc-chapter-entry-tree">
                 <xsl:with-param name="href" tunnel="yes" select="concat('#', ./@id)"/>
-                <xsl:with-param name="title" tunnel="yes" select="./@title"/>
+                <xsl:with-param name="chapter-title" tunnel="yes" select="./@title"/>
                 <xsl:with-param name="doc-sections" 
                                 tunnel="yes" 
                                 select="./foundry:doc-section"/>
@@ -46,9 +46,9 @@
     </xsl:template>
     
     <xsl:template match="doc-chapter-title">
-        <xsl:param name="title" tunnel="yes" select="''"/>
+        <xsl:param name="chapter-title" tunnel="yes" select="''"/>
         
-        <xsl:value-of select="$title"/>
+        <xsl:value-of select="$chapter-title"/>
     </xsl:template>
 
     <xsl:template match="doc-section-list">
@@ -74,4 +74,27 @@
         <xsl:value-of select="$title"/>
     </xsl:template>
     
+    <xsl:template match="doc-chapters">
+        <xsl:for-each select="$foundry-doc-tree/foundry:doc-chapter">
+            
+            <xsl:apply-templates select="document('../../templates/doc/foundry-doc-chapter.xml')/*">
+                <xsl:with-param name="chapter-id" tunnel="yes" select="./@id"/>
+                <xsl:with-param name="chapter-title" tunnel="yes" select="./@title"/>
+                <xsl:with-param name="doc-chapter-tree" tunnel="yes" select="./*"/>
+            </xsl:apply-templates>
+        </xsl:for-each>
+    </xsl:template>
+    
+    <xsl:template match="doc-chapter-layout">
+        <xsl:apply-templates/>
+    </xsl:template>
+    
+    <xsl:template match="doc-chapter-id">
+        <xsl:param name="chapter-id" tunnel="yes"/>
+        
+        <xsl:attribute name="id">
+            <xsl:value-of select="$chapter-id"/>
+        </xsl:attribute>
+    </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 b7104dd92..40ac39207 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
@@ -115,6 +115,23 @@
         </a>
     </xsl:template>
     
+    <foundry:doc>
+        <foundry:doc-desc>
+            <p>
+                Generates the HTML5 <code>article</code> element.
+            </p>
+        </foundry:doc-desc>
+        <foundry:doc-see-also>
+            <foundry:doc-link href="http://www.w3.org/TR/html5/sections.html#the-article-element"/>
+        </foundry:doc-see-also>
+    </foundry:doc>
+    <xsl:template match="article">
+        <article>
+            <xsl:call-template name="foundry:set-id-and-class"/>
+            <xsl:apply-templates/>
+        </article>
+    </xsl:template>
+    
     <foundry:doc  section="user" type="template-tag">
         <foundry:doc-desc>
             Generates a HTML5 <code>aside</code> element. 
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/templates/doc/foundry-doc-chapter.xml b/ccm-sci-bundle/web/themes/foundry/foundry/templates/doc/foundry-doc-chapter.xml
index d5996919a..4e165aed9 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/templates/doc/foundry-doc-chapter.xml
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/templates/doc/foundry-doc-chapter.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <doc-chapter-layout>
     <article>
+        <doc-chapter-id/>
         <h1>
             <doc-chapter-title/>
         </h1>
