diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
index f8e08de90..94b2e263b 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
@@ -34,12 +34,15 @@
     <xsl:import href="content-items/contact.xsl"/>
     <xsl:import href="content-items/decisiontree.xsl"/>
     <xsl:import href="content-items/event.xsl"/>
+    <xsl:import href="content-items/generic-orgaunit.xsl"/>
     <xsl:import href="content-items/formitem.xsl"/>
     <xsl:import href="content-items/fsi.xsl"/>
     <xsl:import href="content-items/image.xsl"/>
     <xsl:import href="content-items/mpa.xsl"/>
     <xsl:import href="content-items/news.xsl"/>
     <xsl:import href="content-items/person.xsl"/>
+    <xsl:import href="content-items/sciorga.xsl"/>
+    <xsl:import href="content-items/sciproject.xsl"/>
     <xsl:import href="content-items/siteproxy.xsl"/>
     <xsl:import href="content-items/assets/file-attachments.xsl"/>
     <xsl:import href="content-items/assets/image-attachments.xsl"/>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/contact.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/contact.xsl
index 98ea590b9..22314b883 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/contact.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/contact.xsl
@@ -152,6 +152,14 @@
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[ends-with(name(), 'contact-entries')]//contact-entry//contact-entry-value-as-link">
+        <xsl:param name="value" tunnel="yes"/>
+        
+        <xsl:apply-templates>
+            <xsl:with-param name="href" tunnel="yes" select="$value"/>
+        </xsl:apply-templates>
+    </xsl:template>
 
     <xsl:template match="content-item-layout//contact-address">
         <xsl:param name="contentitem-tree" tunnel="yes"/>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/generic-orgaunit.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/generic-orgaunit.xsl
new file mode 100644
index 000000000..178104dcc
--- /dev/null
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/generic-orgaunit.xsl
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2015 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"
+                exclude-result-prefixes="xsl xs bebop cms foundry nav ui"
+                version="2.0">
+    
+    <xsl:template match="content-item-layout//orgaunit-available-tabs">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:apply-templates>
+            <xsl:with-param name="available-tabs"
+                            tunnel="yes"
+                            select="$contentitem-tree/orgaUnitTabs/availableTabs"/>
+            <xsl:with-param name="orgaunit-type-name" 
+                            tunnel="yes" 
+                            select="$contentitem-tree/type/label"/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//orgaunit-available-tabs//available-tab">
+        <xsl:param name="available-tabs" tunnel="yes"/>
+        
+        <xsl:variable name="selected-classes" select="./@selected-classes"/>
+        <xsl:variable name="layout-tree" select="./*"/>
+                
+        <xsl:for-each select="$available-tabs/availableTab">
+            <xsl:apply-templates select="$layout-tree">
+                <xsl:with-param name="label" 
+                                tunnel="yes" 
+                                select="./@label"/>
+                <xsl:with-param name="selected" 
+                                tunnel="yes" 
+                                select="foundry:boolean(./@selected)"/>
+                <xsl:with-param name="class" select="if(foundry:boolean(./@selected))
+                                                     then $selected-classes
+                                                     else ''"/>
+                <xsl:with-param name="href"
+                                tunnel="yes"
+                                select="foundry:parse-link(concat('?selectedTab=', ./@label))"/>
+            </xsl:apply-templates>
+        </xsl:for-each>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//orgaunit-available-tabs//available-tab//tab-name">
+        <xsl:param name="label" tunnel="yes"/>
+        
+        <xsl:value-of select="$label"/>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//orgaunit-available-tabs//available-tab//tab-label">
+        <xsl:param name="label" tunnel="yes"/>
+        <xsl:param name="orgaunit-type-name" tunnel="yes"/>
+        
+        <xsl:value-of select="foundry:get-static-text(lower-case($orgaunit-type-name), $label)"/>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//orgaunit">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:apply-templates>
+            <xsl:with-param name="orgaunit-data" 
+                            tunnel="yes"
+                            select="$contentitem-tree"/>
+            <xsl:with-param name="orgaunit-type-name"
+                            tunnel="yes"
+                            select="$contentitem-tree/type/label"/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//orgaunit-current-tab">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:variable name="selected-tab" 
+                      select="$contentitem-tree/orgaUnitTabs/availableTabs/availableTab[@selected='true']/@label"/>
+        
+        <xsl:apply-templates select="./tab[@name=$selected-tab]/*">
+            <xsl:with-param name="orgaunit-data" 
+                            tunnel="yes"
+                            select="$contentitem-tree/orgaUnitTabs/selectedTab/*"/>
+            <xsl:with-param name="orgaunit-type-name"
+                            tunnel="yes"
+                            select="$contentitem-tree/type/label"/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//addendum">
+        <xsl:param name="orgaunit-data" tunnel="yes"/>
+        
+        <xsl:value-of select="$orgaunit-data/addendum"/>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//members">
+        <xsl:param name="orgaunit-data" tunnel="yes"/>
+        
+        <xsl:apply-templates>
+            <xsl:with-param name="members" 
+                            tunnel="yes" 
+                            select="$orgaunit-data/members"/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//members//member">
+        <xsl:param name="members" tunnel="yes"/>
+        
+        <xsl:variable name="layout-tree" select="./*"/>
+        
+        <xsl:for-each select="$members/member">
+            <xsl:apply-templates select="$layout-tree">
+                <xsl:with-param name="person" 
+                                tunnel="yes" 
+                                select="."/>
+                <xsl:with-param name="member-role" 
+                                tunnel="yes" 
+                                select="./@role"/>
+                <xsl:with-param name="member-status" 
+                                tunnel="yes" 
+                                select="./@status"/>
+            </xsl:apply-templates>
+        </xsl:for-each>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//members//member//member-status">
+        <xsl:param name="member-status" tunnel="yes"/>
+        <xsl:param name="orgaunit-type-name" tunnel="yes"/>
+        
+        <xsl:if test="string-length($member-status) &gt; 0">
+            <xsl:value-of select="foundry:get-static-text($orgaunit-type-name, lower-case($member-status))"/>
+        </xsl:if>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//members//member//member-role">
+        <xsl:param name="member-role" tunnel="yes"/>
+        <xsl:param name="orgaunit-type-name" tunnel="yes"/>
+        
+        <xsl:if test="string-length($member-role) &gt; 0">
+            <xsl:value-of select="foundry:get-static-text(lower-case($orgaunit-type-name), $member-role)"/>
+        </xsl:if>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//members//member//if-member-role-is">
+        <xsl:param name="member-role" tunnel="yes"/>
+        
+        <xsl:if test="$member-role = ./@role">
+            <xsl:apply-templates/>
+        </xsl:if>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//orgaunit-contact">
+        <xsl:param name="orgaunit-data" tunnel="yes"/>
+        
+        <xsl:if test="$orgaunit-data/contacts/contact[1]">
+            <xsl:apply-templates/>
+        </xsl:if>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//orgaunit-contact//orgaunit-contact-person">
+        <xsl:param name="orgaunit-data" tunnel="yes"/>
+        
+        <xsl:apply-templates>
+            <xsl:with-param name="person" 
+                            tunnel="yes"
+                            select="$orgaunit-data/contacts/contact[1]/person"/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//orgaunit-contact//orgaunit-contact-entries">
+        <xsl:param name="orgaunit-data" tunnel="yes"/>
+        
+        <xsl:if test="$orgaunit-data/contacts/contact[1]/contactentries">
+            <xsl:apply-templates>
+                <xsl:with-param name="contact-entries"
+                                tunnel="yes"
+                                select="$orgaunit-data/contacts/contact[1]/contactentries"/>
+            </xsl:apply-templates>
+        </xsl:if>
+    </xsl:template>
+    
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/person.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/person.xsl
index 9c3a16229..145cb9b22 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/person.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/person.xsl
@@ -38,31 +38,31 @@
         </xsl:apply-templates>
     </xsl:template>
     
-    <xsl:template match="/content-item-layout//*[ends-with(name(), 'person')]//surname">
+    <xsl:template match="/content-item-layout//*[ends-with(name(), 'person') or ends-with(name(), 'member')]//surname">
         <xsl:param name="person" tunnel="yes"/>
         
         <xsl:value-of select="$person/surname"/>
     </xsl:template>
     
-    <xsl:template match="/content-item-layout//*[ends-with(name(), 'person')]//givenname">
+    <xsl:template match="/content-item-layout//*[ends-with(name(), 'person') or ends-with(name(), 'member')]//givenname">
         <xsl:param name="person" tunnel="yes"/>
         
         <xsl:value-of select="$person/givenname"/>
     </xsl:template>
     
-    <xsl:template match="/content-item-layout//*[ends-with(name(), 'person')]//titlepre">
+    <xsl:template match="/content-item-layout//*[ends-with(name(), 'person') or ends-with(name(), 'member')]//titlepre">
         <xsl:param name="person" tunnel="yes"/>
         
         <xsl:value-of select="$person/titlepre"/>
     </xsl:template>
     
-    <xsl:template match="/content-item-layout//*[ends-with(name(), 'person')]//titlepost">
+    <xsl:template match="/content-item-layout//*[ends-with(name(), 'person') or ends-with(name(), 'member')]//titlepost">
         <xsl:param name="person" tunnel="yes"/>
         
         <xsl:value-of select="$person/titlepost"/>
     </xsl:template>
     
-    <xsl:template match="/content-item-layout//*[ends-with(name(), 'person')]//if-surname">
+    <xsl:template match="/content-item-layout//*[ends-with(name(), 'person') or ends-with(name(), 'member')]//if-surname">
         <xsl:param name="person" tunnel="yes"/>
         
         <xsl:if test="string-length($person/surname) &gt; 0">
@@ -70,7 +70,7 @@
         </xsl:if>
     </xsl:template>
     
-    <xsl:template match="/content-item-layout//*[ends-with(name(), 'person')]//if-givenname">
+    <xsl:template match="/content-item-layout//*[ends-with(name(), 'person') or ends-with(name(), 'member')]//if-givenname">
         <xsl:param name="person" tunnel="yes"/>
         
         <xsl:if test="string-length($person/givenname) &gt; 0">
@@ -78,7 +78,7 @@
         </xsl:if>
     </xsl:template>
     
-    <xsl:template match="/content-item-layout//*[ends-with(name(), 'person')]//if-titlepre">
+    <xsl:template match="/content-item-layout//*[ends-with(name(), 'person') or ends-with(name(), 'member')]//if-titlepre">
         <xsl:param name="person" tunnel="yes"/>
         
         <xsl:if test="string-length($person/titlepre) &gt; 0">
@@ -86,7 +86,7 @@
         </xsl:if>
     </xsl:template>
     
-    <xsl:template match="/content-item-layout//*[ends-with(name(), 'person')]//if-titlepost">
+    <xsl:template match="/content-item-layout//*[ends-with(name(), 'person') or ends-with(name(), 'member')]//if-titlepost">
         <xsl:param name="person" tunnel="yes"/>
         
         <xsl:if test="string-length($person/titlepost) &gt; 0">
@@ -94,56 +94,8 @@
         </xsl:if>
     </xsl:template>
     
-    <!--<xsl:template match="/content-item-layout//person-surname">
-        <xsl:param name="contentitem-tree" tunnel="yes"/>
-        
-        <xsl:if test="string-length($contentitem-tree/surname) &gt; 0 and ./@pre">
-            <xsl:value-of select="./@pre"/>
-        </xsl:if>
-        <xsl:value-of select="$contentitem-tree/surname"/>
-        <xsl:if test="string-length($contentitem-tree/surname) &gt; 0 and ./@post">
-            <xsl:value-of select="./@post"/>
-        </xsl:if>
-    </xsl:template>
-    
-    <xsl:template match="/content-item-layout//person-givenname">
-        <xsl:param name="contentitem-tree" tunnel="yes"/>
-        
-        <xsl:if test="string-length($contentitem-tree/givenname) &gt; 0 and ./@pre">
-            <xsl:value-of select="./@pre"/>
-        </xsl:if>
-        <xsl:value-of select="$contentitem-tree/givenname"/>
-        <xsl:if test="string-length($contentitem-tree/givenname) &gt; 0 and ./@post">
-            <xsl:value-of select="./@post"/>
-        </xsl:if>
-    </xsl:template>
-    
-    <xsl:template match="/content-item-layout//person-titlepre">
-        <xsl:param name="contentitem-tree" tunnel="yes"/>
-        
-        <xsl:if test="string-length($contentitem-tree/titlepre) &gt; 0 and ./@pre">
-            <xsl:value-of select="./@pre"/>
-        </xsl:if>
-        <xsl:value-of select="$contentitem-tree/titlepre"/>
-        <xsl:if test="string-length($contentitem-tree/titlepre) &gt; 0 and ./@post">
-            <xsl:value-of select="./@post"/>
-        </xsl:if>
-    </xsl:template>
-    
-    <xsl:template match="/content-item-layout//person-titlepost">
-        <xsl:param name="contentitem-tree" tunnel="yes"/>
-        
-        <xsl:if test="string-length($contentitem-tree/titlepost) &gt; 0 and ./@pre">
-            <xsl:value-of select="./@pre"/>
-        </xsl:if>
-        <xsl:value-of select="$contentitem-tree/titlepost"/>
-        <xsl:if test="string-length($contentitem-tree/titlepost) &gt; 0 and ./@post">
-            <xsl:value-of select="./@post"/>
-        </xsl:if>
-    </xsl:template>-->
-    
-    <xsl:template match="/content-item-layout//person-homepage-link">
-        <xsl:param name="contentitem-tree" tunnel="yes"/>
+    <xsl:template match="/content-item-layout//*[ends-with(name(), 'person') or ends-with(name(), 'member')]//person-homepage-link">
+        <xsl:param name="person" tunnel="yes"/>
        
         <xsl:variable name="homepage-contact-type"
                       select="if (./@contact-type)
@@ -156,11 +108,11 @@
                               else 'homepage'"/>
 
         <xsl:choose>
-            <xsl:when test="$contentitem-tree/contacts/contact[./@contactType = $homepage-contact-type]/contactentries[./keyId = $homepage-contact-entry-key]">
+            <xsl:when test="$person/contacts/contact[./@contactType = $homepage-contact-type]/contactentries[./keyId = $homepage-contact-entry-key]">
                 <xsl:apply-templates>
                     <xsl:with-param name="href"
                                     tunnel="yes"
-                                    select="$contentitem-tree/contacts/contact[@contactType = $homepage-contact-type]/contactentries[./keyId = $homepage-contact-entry-key]/value"/>
+                                    select="$person/contacts/contact[@contactType = $homepage-contact-type]/contactentries[./keyId = $homepage-contact-entry-key]/value"/>
                 </xsl:apply-templates>
             </xsl:when>
             <xsl:otherwise>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/sciorga.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/sciorga.xsl
new file mode 100644
index 000000000..5e8492a3b
--- /dev/null
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/sciorga.xsl
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2015 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"
+                exclude-result-prefixes="xsl xs bebop cms foundry nav ui"
+                version="2.0">
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/sciproject.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/sciproject.xsl
new file mode 100644
index 000000000..3fd794282
--- /dev/null
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/sciproject.xsl
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2015 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"
+                exclude-result-prefixes="xsl xs bebop cms foundry nav ui"
+                version="2.0">
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//sciproject-begin">
+        <xsl:param name="orgaunit-data" tunnel="yes"/>
+        
+        <xsl:choose>
+            <xsl:when test="$orgaunit-data/projectBegin">
+                <xsl:call-template name="foundry:format-date">
+                    <xsl:with-param name="date-elem" 
+                                    select="$orgaunit-data/projectBegin"/>
+                    <xsl:with-param name="date-format" select="./date-format"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:when test="$orgaunit-data/lifeSpan/begin">
+                <xsl:call-template name="foundry:format-date">
+                    <xsl:with-param name="date-elem" 
+                                    select="$orgaunit-data/lifeSpan/begin"/>
+                    <xsl:with-param name="date-format" select="./date-format"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:when test="$orgaunit-data/nav:attribute[@name = 'projectBegin']">
+                <xsl:call-template name="foundry:format-date">
+                    <xsl:with-param name="date-elem" 
+                                    select="$orgaunit-data/nav:attribute[@name = 'projectBegin']"/>
+                    <xsl:with-param name="date-format" select="./date-format"/>
+                </xsl:call-template>
+            </xsl:when>
+        </xsl:choose>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//sciproject-end">
+        <xsl:param name="orgaunit-data" tunnel="yes"/>
+        
+        <xsl:choose>
+            <xsl:when test="$orgaunit-data/projectEnd">
+                <xsl:call-template name="foundry:format-date">
+                    <xsl:with-param name="date-elem" 
+                                    select="$orgaunit-data/projectEnd"/>
+                    <xsl:with-param name="date-format" select="./date-format"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:when test="$orgaunit-data/lifeSpan/end">
+                <xsl:call-template name="foundry:format-date">
+                    <xsl:with-param name="date-elem" 
+                                    select="$orgaunit-data/lifeSpan/end"/>
+                    <xsl:with-param name="date-format" select="./date-format"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:when test="$orgaunit-data/nav:attribute[@name = 'projectEnd']">
+                <xsl:call-template name="foundry:format-date">
+                    <xsl:with-param name="date-elem" 
+                                    select="$orgaunit-data/nav:attribute[@name = 'projectEnd']"/>
+                    <xsl:with-param name="date-format" select="./date-format"/>
+                </xsl:call-template>
+            </xsl:when>
+        </xsl:choose>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//sciproject-desc">
+        <xsl:param name="orgaunit-data" tunnel="yes"/>
+        
+        <xsl:choose>
+            <xsl:when test="$orgaunit-data/projectDesc">
+                <xsl:value-of disable-output-escaping="yes" 
+                              select="$orgaunit-data/projectDesc"/>
+            </xsl:when>
+            <xsl:when test="$orgaunit-data/description">
+                <xsl:value-of disable-output-escaping="yes" 
+                              select="$orgaunit-data/description"/>
+            </xsl:when>
+        </xsl:choose>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//sciproject-shortdesc">
+        <xsl:param name="orgaunit-data" tunnel="yes"/>
+        
+        <xsl:choose>
+            <xsl:when test="$orgaunit-data/projectShortDesc">
+                <xsl:value-of select="$orgaunit-data/projectShortDesc"/>
+            </xsl:when>
+            <xsl:when test="$orgaunit-data/shortDesc">
+                <xsl:value-of select="$orgaunit-data/shortDesc"/>
+            </xsl:when>
+        </xsl:choose>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//sponsors">
+        <xsl:param name="orgaunit-data" tunnel="yes"/>
+        
+        <xsl:if test="$orgaunit-data/sponsors">
+            <xsl:apply-templates/>
+        </xsl:if>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//sponsors//sponsor">
+        <xsl:param name="orgaunit-data" tunnel="yes"/>
+        
+        <xsl:variable name="layout-tree" select="./*"/>
+        
+        <xsl:for-each select="$orgaunit-data/sponsors/sponsor">
+            <xsl:apply-templates select="$layout-tree">
+                <xsl:with-param name="sponsor-name" 
+                                tunnel="yes" 
+                                select="."/>
+                <xsl:with-param name="funding-code" 
+                                tunnel="yes" 
+                                select="./@fundingCode"/>
+            </xsl:apply-templates>
+        </xsl:for-each>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//sponsors//sponsor//sponsor-name">
+        <xsl:param name="sponsor-name" tunnel="yes"/>
+        
+        <xsl:value-of select="$sponsor-name"/>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//sponsors//sponsor//funding-code">
+        <xsl:param name="funding-code" tunnel="yes"/>
+        
+        <xsl:value-of select="$funding-code"/>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//sponsors//sponsor/if-funding-code">
+        <xsl:param name="funding-code" tunnel="yes"/>
+        
+        <xsl:if test="string-length($funding-code) &gt; 0"/>
+    </xsl:template>
+        
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//funding">
+        <xsl:param name="orgaunit-data" tunnel="yes"/>
+        
+        <xsl:value-of select="$orgaunit-data/funding"/>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//funding-volume">
+        <xsl:param name="orgaunit-data" tunnel="yes"/>
+        
+        <xsl:value-of select="$orgaunit-data/fundingVolume"/>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//if-funding">
+        <xsl:param name="orgaunit-data" tunnel="yes"/>
+        
+        <xsl:if test="string-length($orgaunit-data/funding) &gt; 0">
+            <xsl:apply-templates/>
+        </xsl:if>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//*[starts-with(name(), 'orgaunit')]//if-funding-volume">
+        <xsl:param name="orgaunit-data" tunnel="yes"/>
+        
+        <xsl:if test="string-length($orgaunit-data/fundingVolume) &gt; 0">
+            <xsl:apply-templates/>
+        </xsl:if>
+    </xsl:template>
+    
+    
+</xsl:stylesheet>
\ No newline at end of file