diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/global-vars.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/global-vars.xsl
index 1e74dc56b..6cc015ef8 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/global-vars.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/global-vars.xsl
@@ -36,10 +36,11 @@ processor, some are read from the configuration files of Foundry and some are de
     <!-- Foundry internal variables -->
     <foundry:doc section="devel">
         <foundry:doc-desc>
-            The version of Foundry.
+            The version of Foundry. Kept in sync with the version of CCM, so the first version
+            will be 2.2.3.
         </foundry:doc-desc>
     </foundry:doc>
-    <xsl:variable name="foundry-version" select="'1.0-SNAPSHOT'"/>
+    <xsl:variable name="foundry-version" select="'2.2.3-SNAPSHOT'"/>
     
     <!-- **************************************************************************** -->
     
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 3d5336bf5..2082b0581 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
@@ -44,7 +44,7 @@
                 <xsl:attribute name="href" select="$data-tree/*[name = ./@href-property]"/>
             </xsl:if>
             <xsl:if test="./@href-static">
-                <xsl:attribute name="href" select=".@href-static"/>
+                <xsl:attribute name="href" select="./@href-static"/>
             </xsl:if>
             <xsl:if test="./@hreflang">
                 <xsl:attribute name="hreflang" select="./@hreflang"/>
@@ -239,6 +239,46 @@
         </header>
     </xsl:template>
 
+    <xsl:template match="img">
+        <img>
+            <xsl:if test="./@href-property">
+                <xsl:attribute name="href" select="$data-tree/*[name = ./@href-property]"/>
+            </xsl:if>
+            <xsl:if test="./@href-static">
+                <xsl:attribute name="href">
+                    <xsl:choose>
+                        <xsl:when test="substring(./@href-static, 1, 7) = 'http://'">
+                            <xsl:value-of select="./@href-static"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="concat($theme-prefix, ./@href-static"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:if test="./@alt">
+                <xsl:attribute name="alt">
+                    <xsl:value-of select="foundry:get-static-text('', ./@alt, 'false')"/>
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:if test="./@title">
+                <xsl:attribute name="title">
+                    <xsl:value-of select="foundry:get-static-text('', ./@title, 'false')"/>
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:if test="width">
+                <xsl:attribute name="width">
+                    <xsl:value-of select="width"/>
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:if test="height">
+                <xsl:attribute name="height">
+                    <xsl:value-of select="height"/>
+                </xsl:attribute>
+            </xsl:if>
+        </img>
+    </xsl:template>
+
     <foundry:doc section="user" type="template-tag">
         <foundry:doc-desc>
             Generates a HTML5 <code>main</code> element.
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 52f784f24..3b345588f 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
@@ -130,7 +130,40 @@
     </xsl:template>
     
     <xsl:template match="load-fancybox">
-        <xsl:call-template name="foundry:load-fancy-box"/>
+        <!-- Add mousewheel plugin (this is optional) -->
+        <script type="text/javascript" 
+                src="{$context-prefix}/assets/fancybox2/lib/jquery.mousewheel-3.0.6.pack.js"/>
+        
+        <!-- Add fancyBox main JS and CSS files -->
+        <script type="text/javascript" 
+                src="{$context-prefix}/assets/fancybox2/source/jquery.fancybox.js"/>
+        <link rel="stylesheet" 
+              href="{$context-prefix}/assets/fancybox2/source/jquery.fancybox.css" 
+              type="text/css" 
+              media="screen"/>
+
+        <!-- Add Button helper (this is optional) -->
+        <link rel="stylesheet" 
+              type="text/css" 
+              href="{$context-prefix}/assets/fancybox2/source/helpers/jquery.fancybox-buttons.css" />
+        <script type="text/javascript"
+                src="{$context-prefix}/assets/fancybox2/source/helpers/jquery.fancybox-buttons.js"/>
+
+        <!-- Add Thumbnail helper (this is optional) -->
+        <link rel="stylesheet" 
+              type="text/css" 
+              href="{$context-prefix}/assets/fancybox2/source/helpers/jquery.fancybox-thumbs.css" />
+        <script type="text/javascript" 
+                src="{$context-prefix}/assets/fancybox2/source/helpers/jquery.fancybox-thumbs.js"/>
+
+        <!-- Add Media helper (this is optional) -->
+        <script type="text/javascript"
+                src="{$context-prefix}/assets/fancybox2/source/helpers/jquery.fancybox-media.js"/>
+        
+        <!-- Apply fancybox -->
+        <script type="text/javascript"
+                src="{$theme-prefix}/scripts/apply-fancybox.js"/>
+        
     </xsl:template>
     
     <xsl:template match="load-jquery">
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl
index 9f2547969..1ff22467d 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl
@@ -275,6 +275,7 @@ EXSLT functions.
     <func:function name="foundry:get-static-text">
         <xsl:param name="module"/>
         <xsl:param name="id"/>
+        <xsl:param name="html" Select="'true'"/>
         <xsl:param name="lang" select="$lang"/>
         
         <xsl:choose>
@@ -287,23 +288,30 @@ EXSLT functions.
             <xsl:otherwise>
                 <xsl:choose>
                     <xsl:when test="foundry:debugEnabled()">
-                        <func:result>
-                            <span class="foundry-debug-missing-translation">
-                                <span class="foundry-placeholder">
-                                    <xsl:value-of select="$id"/>
-                                </span>
-                                <span class="foundry-missing-translation-path">
-                                    <xsl:choose>
-                                        <xsl:when test="$module = ''">
-                                            <xsl:value-of select="concat($theme-prefix, '/texts/global.xml/foundry:staticTexts/text[@id=', $id, ']/translation[@lang=', $lang, ']'"/>
-                                        </xsl:when>
-                                        <xsl:otherwise>
-                                            <xsl:value-of select="'concat($theme-prefix, '/texts/', $module, '.xml/foundry:staticTexts/text[@id=', $id, ']/translation[@lang=', $lang, ']'"/>
-                                        </xsl:otherwise>
-                                    </xsl:choose>
-                                </span>
-                            </span>
-                        </func:result>
+                        <xsl:choose>
+                            <xsl:when test="$html = 'true'">
+                                <func:result>
+                                    <span class="foundry-debug-missing-translation">
+                                        <span class="foundry-placeholder">
+                                            <xsl:value-of select="$id"/>
+                                        </span>
+                                        <span class="foundry-missing-translation-path">
+                                            <xsl:choose>
+                                                <xsl:when test="$module = ''">
+                                                    <xsl:value-of select="concat($theme-prefix, '/texts/global.xml/foundry:staticTexts/text[@id=', $id, ']/translation[@lang=', $lang, ']'"/>
+                                                </xsl:when>
+                                                <xsl:otherwise>
+                                                    <xsl:value-of select="'concat($theme-prefix, '/texts/', $module, '.xml/foundry:staticTexts/text[@id=', $id, ']/translation[@lang=', $lang, ']'"/>
+                                                </xsl:otherwise>
+                                            </xsl:choose>
+                                        </span>
+                                    </span>
+                                </func:result>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:value-of select="$id"/>
+                            </xsl:otherwise>
+                        </xsl:choose>
                     </xsl:when>
                 </xsl:choose>
             </xsl:otherwise>
@@ -378,7 +386,7 @@ EXSLT functions.
                         <!-- Else use title of CI -->
                         <xsl:otherwise>
                             <xsl:value-of select="foundry:shying($data-tree//cms:contentPanel/cms:item/title)"/>
-                            </xsl:call-template>
+                        </xsl:call-template>
                         </xsl:otherwise>
                     </xsl:choose>
                 </xsl:when>
@@ -396,7 +404,7 @@ EXSLT functions.
                 </xsl:when>
                 <!-- Localited title for sitemap -->
                 <xsl:when test="$data-tree/@id = 'sitemapPage'">
-                     <xsl:value-of select="foundry:get-static-text('layout/page/title/sitemap')"/>
+                    <xsl:value-of select="foundry:get-static-text('layout/page/title/sitemap')"/>
                 </xsl:when>
                 <!-- Title for content section-->
                 <xsl:otherwise>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl
index a38bfdaff..1523fd577 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl
@@ -27,6 +27,7 @@
                 version="1.0">
 
     <xsl:import href="lib.xsl"/>
+    <xsl:import href="../doc/xsl/foundry-documentation.xsl"/>
     
     <xsl:output method="html"
                 indent="yes"
@@ -68,4 +69,42 @@
         
     </xsl:template>
 
+    <fondry:doc section="devel">
+        <foundry:doc-desc>
+            The entry point for creating Foundry documentation.
+        </foundry:doc-desc>
+    </fondry:doc>
+    <xsl:template match="/foundry:documentation">
+        <xsl:value-of select="'&lt;!DOCTYPE HTML&gt;'"
+                      disable-output-escaping="yes" />
+        <html>
+            <head>
+                <meta http-equiv="content-type" 
+                      content="text/html; charset=UTF-8"/>
+                <title>Foundry Theming Engine for LibreCCM - Documentation</title>
+                <style type="text/css">
+                    .missing-static-text {
+                    border: 2px solid red;
+                    color: red;
+                    font-weight: bold;
+                    }
+                </style>
+            </head>
+            <body>
+                <header>
+                    Header
+                </header>
+                <nav>
+                    Navigation
+                </nav>
+                <main>
+                    <xsl:apply-templates/>
+                </main>
+                <footer>
+                    Footer
+                </footer>
+            </body>
+        </html>
+    </xsl:template>
+
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/scripts/apply-fancybox.js b/ccm-sci-bundle/web/themes/foundry/scripts/apply-fancybox.js
new file mode 100644
index 000000000..bce21eaeb
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/scripts/apply-fancybox.js
@@ -0,0 +1,14 @@
+$(document).ready(function() {
+    $("a.imageZoom").fancybox({'type': 'image'});
+    $("a.imageGallery").fancybox({
+        type: 'image',
+        helpers: {
+            title: {
+                type: 'inside',
+            },
+            buttons: {
+                position: 'bottom',
+            }
+        }
+    });
+});
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types/Contact.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types/Contact.xsl
index e5b7677e5..c11a683f8 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/types/Contact.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/types/Contact.xsl
@@ -419,7 +419,7 @@
       </span>
       <span class="value">
         <xsl:choose>
-          <xsl:when test="(substring(value, 1, 7) = 'http://') or (substring(value, 1, 3) = 'www') or (contains(value, '@'))">
+          <xsl:when test="(substring(value, 1, 7) = 'http://') or (substring(value, 1, 3) = 'www') or (substring(value, 1, 1) = '/' ) or (contains(value, '@'))">
             <a>
               <xsl:attribute name="href">
                 <xsl:choose>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types/GenericContact.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types/GenericContact.xsl
index 47fe6e986..082112d3d 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/types/GenericContact.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/types/GenericContact.xsl
@@ -421,7 +421,7 @@
         </span>
         <span class="value">
           <xsl:choose>
-            <xsl:when test="(substring(value, 1, 7) = 'http://') or (substring(value, 1, 3) = 'www') or (contains(value, '@'))">
+            <xsl:when test="(substring(value, 1, 7) = 'http://') or (substring(value, 1, 3) = 'www')  or (substring(value, 1, 1) = '/' )  or (contains(value, '@'))">
               <a>
                 <xsl:attribute name="href">
                   <xsl:choose>
diff --git a/ccm-sci-bundle/web/themes/mandalay/layout/terms.xml b/ccm-sci-bundle/web/themes/mandalay/layout/terms.xml
new file mode 100644
index 000000000..ad5789280
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/layout/terms.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 
+    Copyright: 2006, 2007, 2008 Sören Bernstein
+  
+    This file is part of Mandalay.
+
+    Mandalay 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.
+
+    Mandalay 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 Mandalay.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<pageLayout>
+    <head>
+        <title>
+            <separator> : </separator>
+            <showText>
+                <line>layout/page/head/title</line>
+            </showText>
+            <usePageTitle/>
+        </title>
+        <useCSSLoader/>
+    </head>
+    <body id="cmsPage">
+        <div id="cmsHeader" class="headerHeight">
+            <div class="minWidth">
+                <showImage class="logo">
+                    <src>images/scientificcms_logo.png</src>
+                    <alt>header/logo/alt</alt>
+                    <name>header/logo/name</name>
+                    <link>/navigation/</link>
+                </showImage>
+                <!--
+                        <div id="quicksearchwidget">
+                          Quicksearch Widget
+                        </div>
+                -->
+                <div id="userwidget" class="cmsHeaderMenu">
+                    <showCMSGreeting/>
+                    <showCMSGlobalNavigation>
+                        <useChangePasswordLink/>
+                        <useLogoutLink/>
+                    </showCMSGlobalNavigation>
+                </div>
+                
+            </div>
+        </div>
+        <div id="cmsBreadcrumbs" class="minWidth">
+            <showBebopContextBar>
+                <separator> > </separator>
+            </showBebopContextBar>
+        </div>
+        <div id="tabs">
+            <showTabbedPane class="minWidth"/>
+        </div>
+        <div id="cmsContent" class="minWidth headerHeight">
+            <div id="left">
+                <div class="columnHead">
+                    <showContentType/>
+                    <span id="workflowwidget">
+                        <!--
+                                          Workflow Widget
+                        -->
+                    </span>
+                </div>
+                <div class="columnContent">
+                    <showLeftColumn/>
+                </div>
+            </div>
+            <div id="right">
+                <div class="columnHead">
+                    <div class="contenttitle">
+                        <showBebopPageTitle/>
+                    </div>
+                    <div id="contentlanguagewidget">
+                        <!--
+                                          Sprache
+                        -->
+                    </div>
+                    <div id="contentviewmenu">
+                        <showCMSContentViewMenu/>
+                        <showCMSGlobalNavigation>
+                            <usePreviewLink/>
+                        </showCMSGlobalNavigation>
+                    </div>
+                </div>
+                <div id="content" class="columnContent">
+                    <useContent/>
+                </div>
+            </div>
+            <div class="endFloat"/>
+        </div>
+
+        <div id="cmsFooter">
+            <div class="minWidth">
+                <showSystemInformation/>
+                <showCMSGlobalNavigation>
+                    <useContentCenterLink/>
+                    <useWorkspaceLink/>
+                    <useAdminCenterLink/>
+                </showCMSGlobalNavigation>
+                <showCMSGlobalNavigation>
+                    <useHelpLink/>
+                </showCMSGlobalNavigation>
+            </div>
+        </div>
+    </body>
+</pageLayout>