diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml
index 4b7a00a37..3b6f2ee5b 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml
@@ -9,7 +9,7 @@
                     name="scientificcms" 
               prettyName="Scientific CMS" 
                  version="2.2.0" 
-                 release="SNAPSHOT-r24" 
+                 release="SNAPSHOT-r2482" 
                   webxml="web-sci.xml" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
diff --git a/ccm-sci-bundle/web/themes/mandalay/css/screen/global/admin.css b/ccm-sci-bundle/web/themes/mandalay/css/screen/global/admin.css
index 49e3901e9..7b5bb3cc5 100644
--- a/ccm-sci-bundle/web/themes/mandalay/css/screen/global/admin.css
+++ b/ccm-sci-bundle/web/themes/mandalay/css/screen/global/admin.css
@@ -179,7 +179,7 @@ div#bebopTabbedPane {
 }
 
 div#bebopTabbedPane a {
-  color: #ffffff;
+  color: #ffffff !important;
 }
 
 span.bebopTab {
@@ -386,6 +386,10 @@ div#right div.columnHead {
   font-size: 0.75em;
 }
 
+div#left div.columnContent {
+	height: auto;
+}
+
 div#left div.columnContent,
 div#right div.columnContent {
   position: absolute;
@@ -1304,13 +1308,13 @@ input#draft_search:active {
 /* Links */
 a, a:link, a:visited,
 #content a, #content a:link, #content a:visited {
-	color: #75051d;
+	color: #75051d !important;
 	text-decoration: none;
 }
 
 a:focus, a:hover, a:active,
 #content a:hover,  #content a:focus,  #content a:active {
-	color: #cc0033;
+	color: #cc0033 !important;
   text-decoration: inherit;
 }
 
@@ -1322,6 +1326,7 @@ a:focus, a:hover, a:active,
 	overflow: hidden;
 	margin: 0.3em;
 	padding: 0;
+	color: inherit !important;
 	background-color: #ffffff;
 }
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/css/screen/global/basic.css b/ccm-sci-bundle/web/themes/mandalay/css/screen/global/basic.css
index e78e735d2..c4b4c3b35 100755
--- a/ccm-sci-bundle/web/themes/mandalay/css/screen/global/basic.css
+++ b/ccm-sci-bundle/web/themes/mandalay/css/screen/global/basic.css
@@ -144,7 +144,8 @@ body,
 
 #header a
 { /* helles Hellgrau 1 */
-  color: #e7e6ee;
+  /*color: #e7e6ee;*/
+  color: #77767e;
 }
 
 #itemList ul,
@@ -1651,6 +1652,11 @@ ul.sitemap li.menulevel_2 {
   min-width: 11.4em;
 }
 
+
+form select optgroup option {
+    margin-left: 0.75em;
+}
+
 #content form input:hover,
 #content form select:hover {
   border-color: #0976a0;
diff --git a/ccm-sci-bundle/web/themes/mandalay/fallback/admin-category-step.xsl b/ccm-sci-bundle/web/themes/mandalay/fallback/admin-category-step.xsl
new file mode 100755
index 000000000..50cdf0d97
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/fallback/admin-category-step.xsl
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;'>]>
+
+<!-- 
+    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/>.
+-->
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+  xmlns:cms="http://www.arsdigita.com/cms/1.0"
+  xmlns:ui="http://www.arsdigita.com/ui/1.0"
+  xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
+  version="1.0" exclude-result-prefixes="bebop cms ui aplaws xsl">
+
+  <xsl:template match="cms:emptyPage[@title='childCategories']">
+    <xsl:apply-templates select="cms:category/cms:category" mode="cms:javascriptCat">
+      <xsl:with-param name="expand" select="'none'"/>
+    </xsl:apply-templates>
+  </xsl:template>
+
+  <xsl:template match="cms:emptyPage[@title='autoCategories']">
+    <xsl:apply-templates select="cms:category" mode="cms:javascriptCat" />
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/fallback/admin-navigation.xsl b/ccm-sci-bundle/web/themes/mandalay/fallback/admin-navigation.xsl
new file mode 100755
index 000000000..96cf43940
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/fallback/admin-navigation.xsl
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;'>]>
+
+<!-- 
+    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/>.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+  <xsl:import href="../../../../../ROOT/__ccm__/apps/navigation/lib/category-panel.xsl"/>
+  <xsl:import href="../../../../../ROOT/__ccm__/apps/navigation/lib/quick-link-form.xsl"/>
+  <xsl:import href="../../../../../ROOT/__ccm__/apps/navigation/lib/quick-link-panel.xsl"/>
+  <xsl:import href="../../../../../ROOT/__ccm__/apps/navigation/lib/quick-link-listing.xsl"/>
+
+</xsl:stylesheet>
+ 
diff --git a/ccm-sci-bundle/web/themes/mandalay/fallback/admin-search.xsl b/ccm-sci-bundle/web/themes/mandalay/fallback/admin-search.xsl
new file mode 100755
index 000000000..7c3426615
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/fallback/admin-search.xsl
@@ -0,0 +1,446 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;'>]>
+
+<!-- 
+    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/>.
+-->
+
+<xsl:stylesheet
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:search="http://rhea.redhat.com/search/1.0"
+  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+  xmlns:mandalay="http://mandalay.quasiweb.de"
+  version="1.0">
+
+  <xsl:import href="../includes/search.xsl"/>
+
+  <!-- DE Zeige das Suchformular für die Admin-Oberfläche an -->
+  <xsl:template match="search:query">
+    <style type="text/css" media="screen">
+      #resultList {display: table; }
+      #resultList .resultListHeader {display: table-row; background-color: #eee; width: 100%; color: #999; font-weight: bold; }
+      #resultList .resultListHeader span {display: table-cell; padding-top: 0.1em; padding-bottom: 0.1em;}
+      #resultList .result {display: table-row; }
+      #resultList .result span {display: table-cell; padding-bottom: 0.7em; padding-right: 1em; }
+      #resultList .result.even {background-color: #f6f6f6;}
+      #search {display: table;}
+      #search .query {display: table-cell; text-align: right; vertical-align: top; font-weight: bold; padding-right: 1em;}
+      #search .terms {display: table-cell; padding-bottom: 1.2em;}
+      #search .filter {display: table-row;}
+      #search .filterName {display: table-cell; text-align: right; vertical-align: top; font-weight: bold; padding-right: 1em;}
+      #search .filterParam {display: table-cell; padding-bottom: 1.2em;}
+    </style>
+    <div id="search">
+      <!-- DE Nicht anzeigen, wenn bereits ein Suchergebnis vorliegt -->
+      <xsl:if test="not(../search:results)">
+        <xsl:apply-templates select="search:*"/>
+      </xsl:if>
+    </div>
+  </xsl:template>
+
+  <!-- DE Zeigt das Ergebnis in der Admin-Oberfläche an -->
+  <xsl:template match="search:results">
+    <xsl:apply-templates select="search:paginator" mode="header"/>
+    <xsl:apply-templates select="search:documents" mode="admin"/>
+    <xsl:apply-templates select="search:paginator" mode="navbar"/>
+  </xsl:template>
+
+  <xsl:template match="search:documents" mode="admin">
+    <div id="resultList">
+      <div class="resultListHeader">
+        <span style="width: 4em;">
+          <xsl:call-template name="mandalay:getStaticText">
+            <xsl:with-param name="module" select="'search'"/>
+            <xsl:with-param name="id" select="'listheader/score'"/>
+          </xsl:call-template>
+        </span>
+        <span>
+          <xsl:call-template name="mandalay:getStaticText">
+            <xsl:with-param name="module" select="'search'"/>
+            <xsl:with-param name="id" select="'listheader/title'"/>
+          </xsl:call-template>
+        </span>
+        <span>
+          <xsl:call-template name="mandalay:getStaticText">
+            <xsl:with-param name="module" select="'search'"/>
+            <xsl:with-param name="id" select="'listheader/summary'"/>
+          </xsl:call-template>
+        </span>
+        <span style="width: 10em;">
+          <xsl:call-template name="mandalay:getStaticText">
+            <xsl:with-param name="module" select="'search'"/>
+            <xsl:with-param name="id" select="'listheader/addlink'"/>
+          </xsl:call-template>
+        </span>
+      </div>
+      <xsl:apply-templates/>
+    </div>
+  </xsl:template>
+
+  <xsl:template match="search:object[@class='jsButton']">
+    <div>
+      <xsl:choose>
+        <xsl:when test="position() mod 2 = 0">
+          <xsl:attribute name="class">result even</xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:attribute name="class">result odd</xsl:attribute>
+        </xsl:otherwise>
+      </xsl:choose>
+      <span style="text-align: center;"><xsl:value-of select="@score"/>%</span>
+      <span><a href="{@url}"><xsl:value-of select="@title"/></a></span>
+      <span><em><xsl:value-of select="@summary"/></em></span>
+      <span>
+        <xsl:value-of disable-output-escaping="yes" select="search:jsAction"/>
+        <a onClick="{search:jsAction/@name}" href="javascript:{search:jsAction/@name}">
+          <img src="/__ccm__/static/cms/admin/action-group/action-generic.png" width="14" height="14" border="0"/>
+          <xsl:call-template name="mandalay:getStaticText">
+            <xsl:with-param name="module" select="'search'"/>
+            <xsl:with-param name="id" select="'resultlist/select'"/>
+          </xsl:call-template>
+        </a>
+      </span>
+    </div>
+  </xsl:template>
+
+  <xsl:template match="search:object[@class='radioButton']">
+    <div>
+      <xsl:choose>
+        <xsl:when test="position() mod 2 = 0">
+          <xsl:attribute name="class">result even</xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:attribute name="class">result odd</xsl:attribute>
+        </xsl:otherwise>
+      </xsl:choose>
+      <span style="text-align: center;"><xsl:value-of select="@score"/>%</span>
+      <span><input type="radio" name="{@field}" value="{@oid}"/><a href="{@url}"><xsl:value-of select="@title"/></a></span>
+      <span><em><xsl:value-of select="@summary"/></em></span>
+      <span>
+        <xsl:value-of disable-output-escaping="yes" select="search:jsAction"/>
+        <a onClick="{search:jsAction/@name}" href="javascript:{search:jsAction/@name}">
+          <img src="/__ccm__/static/cms/admin/action-group/action-generic.png" width="14" height="14" border="0"/>
+          <xsl:call-template name="mandalay:getStaticText">
+            <xsl:with-param name="module" select="'search'"/>
+            <xsl:with-param name="id" select="'resultlist/select'"/>
+          </xsl:call-template>
+        </a>
+      </span>
+    </div>
+  </xsl:template>
+
+  <xsl:template match="search:partyText">
+    <xsl:param name="filterName"/>
+    <div class="filter">
+      <span class="filterName">
+        <xsl:value-of select="$filterName"/>
+      </span>
+      <span class="filterParam">
+        <input size="30">
+          <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
+          <xsl:attribute name="value"><xsl:value-of select="@value"/></xsl:attribute>
+        </input>
+      </span>
+    </div>
+  </xsl:template>
+
+  <!-- ****** -->
+  <!-- Filter -->
+  <!-- ****** -->
+  <xsl:template match="search:filter[@type='contentType']">
+    <div class="filter">
+      <span class="filterName">
+        <xsl:call-template name="mandalay:getStaticText">
+          <xsl:with-param name="module" select="'search'"/>
+          <xsl:with-param name="id" select="'searchfilter/types'"/>
+        </xsl:call-template>
+      </span>
+      <span class="filterParam">
+        <select size="10" name="{@param}" multiple="multiple">
+          <xsl:for-each select="search:contentType">
+            <xsl:sort select="@title"/>
+            <option value="{@name}">
+              <xsl:if test="@isSelected">
+                <xsl:attribute name="selected">selected</xsl:attribute>
+              </xsl:if>
+              <xsl:value-of select="@title"/>
+            </option>
+          </xsl:for-each>
+        </select>
+      </span>
+    </div>
+  </xsl:template>
+
+  <xsl:template match="search:filter[@type='objectType']">
+    <div class="filter">
+      <span class="filterName">
+        <xsl:call-template name="mandalay:getStaticText">
+          <xsl:with-param name="module" select="'search'"/>
+          <xsl:with-param name="id" select="'searchfilter/types'"/>
+        </xsl:call-template>
+      </span>
+      <span class="filterParam">
+        <select size="10" name="{@param}" multiple="multiple">
+          <xsl:for-each select="search:objectType">
+            <xsl:sort select="@name"/>
+            <option value="{@name}">
+              <xsl:if test="@isSelected">
+                <xsl:attribute name="selected">selected</xsl:attribute>
+              </xsl:if>
+              <xsl:value-of select="@name"/>
+            </option>
+          </xsl:for-each>
+        </select>
+      </span>
+    </div>
+  </xsl:template>
+
+  <xsl:template match="search:filter[@type='host']">
+    <div class="filter">
+      <span class="filterName">
+        <xsl:call-template name="mandalay:getStaticText">
+          <xsl:with-param name="module" select="'search'"/>
+          <xsl:with-param name="id" select="'searchfilter/sites'"/>
+        </xsl:call-template>
+      </span>
+      <span class="filterParam">
+        <select size="10" name="{@param}" multiple="multiple">
+          <xsl:for-each select="search:remoteHost">
+            <option value="{@oid}">
+              <xsl:if test="@isSelected">
+                <xsl:attribute name="selected">selected</xsl:attribute>
+              </xsl:if>
+              <xsl:value-of select="@title"/>
+            </option>
+          </xsl:for-each>
+        </select>
+      </span>
+    </div>
+  </xsl:template>
+
+  <xsl:template match="search:filter[@type='category']">
+    <div class="filter">
+      <span class="filterName">
+        <xsl:call-template name="mandalay:getStaticText">
+          <xsl:with-param name="module" select="'search'"/>
+          <xsl:with-param name="id" select="'searchfilter/categories'"/>
+        </xsl:call-template>
+      </span>
+      <span class="filterParam">
+        <select size="10" name="{@param}" multiple="multiple">
+          <xsl:for-each select="search:category">
+            <xsl:sort select="@title"/>
+            <option value="{@oid}">
+              <xsl:if test="@isSelected">
+                <xsl:attribute name="selected">selected</xsl:attribute>
+              </xsl:if>
+              <xsl:value-of select="@title"/>
+            </option>
+          </xsl:for-each>
+        </select>
+        <br/>
+        <input type="checkbox" value="true">
+          <xsl:attribute name="name">
+            <xsl:value-of select="search:includeSubCats/@name"/>
+          </xsl:attribute>
+          <xsl:if test="search:includeSubCats/@value = 'true'">
+            <xsl:attribute name="checked">checked</xsl:attribute>
+          </xsl:if>
+        </input>
+        <xsl:call-template name="mandalay:getStaticText">
+          <xsl:with-param name="module" select="'search'"/>
+          <xsl:with-param name="id" select="'searchfilter/searchRecursiv'"/>
+        </xsl:call-template>
+      </span>
+    </div>
+  </xsl:template>
+
+  <xsl:template match="search:filter[@type='creationUser']">
+    <xsl:apply-templates select="search:partyText">
+      <xsl:with-param name="filterName">
+        <xsl:call-template name="mandalay:getStaticText">
+          <xsl:with-param name="module" select="'search'"/>
+          <xsl:with-param name="id" select="'searchfilter/creationUser'"/>
+        </xsl:call-template>
+      </xsl:with-param>
+    </xsl:apply-templates>
+  </xsl:template>
+
+  <xsl:template match="search:filter[@type='lastModifiedUser']">
+    <xsl:apply-templates select="search:partyText">
+      <xsl:with-param name="filterName">
+        <xsl:call-template name="mandalay:getStaticText">
+          <xsl:with-param name="module" select="'search'"/>
+          <xsl:with-param name="id" select="'searchfilter/lastModUser'"/>
+        </xsl:call-template>
+      </xsl:with-param>
+    </xsl:apply-templates>
+  </xsl:template>
+
+  <xsl:template match="search:filter[@type='launchDate']">
+    <xsl:call-template name="search:dateRangeFilter">
+      <xsl:with-param name="filterName">
+        <xsl:call-template name="mandalay:getStaticText">
+          <xsl:with-param name="module" select="'search'"/>
+          <xsl:with-param name="id" select="'searchfilter/lauchDate'"/>
+        </xsl:call-template>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template match="search:filter[@type='lastModifiedDate']">
+    <xsl:call-template name="search:dateRangeFilter">
+      <xsl:with-param name="filterName">
+        <xsl:call-template name="mandalay:getStaticText">
+          <xsl:with-param name="module" select="'search'"/>
+          <xsl:with-param name="id" select="'searchfilter/lastModDate'"/>
+        </xsl:call-template>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template match="search:filter[@type='creationDate']">
+    <xsl:call-template name="search:dateRangeFilter">
+      <xsl:with-param name="filterName">
+        <xsl:call-template name="mandalay:getStaticText">
+          <xsl:with-param name="module" select="'search'"/>
+          <xsl:with-param name="id" select="'searchfilter/creationDate'"/>
+        </xsl:call-template>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="search:dateRangeFilter">
+    <xsl:param name="filterName"/>
+    <div class="filter">
+      <span class="filterName">
+        <xsl:value-of select="$filterName"/>
+      </span>
+      <span class="filterParam">
+
+        <table>
+          <tr>
+            <td></td>
+            <th>
+              <xsl:call-template name="mandalay:getStaticText">
+                <xsl:with-param name="module" select="'search'"/>
+                <xsl:with-param name="id" select="'searchfilter/dateRange/day'"/>
+              </xsl:call-template>
+            </th>
+            <th>
+              <xsl:call-template name="mandalay:getStaticText">
+                <xsl:with-param name="module" select="'search'"/>
+                <xsl:with-param name="id" select="'searchfilter/dateRange/month'"/>
+              </xsl:call-template>
+            </th>
+            <th>
+              <xsl:call-template name="mandalay:getStaticText">
+                <xsl:with-param name="module" select="'search'"/>
+                <xsl:with-param name="id" select="'searchfilter/dateRange/year'"/>
+              </xsl:call-template>
+            </th>
+          </tr>
+          <tr>
+            <th align="right">
+              <xsl:call-template name="mandalay:getStaticText">
+                <xsl:with-param name="module" select="'search'"/>
+                <xsl:with-param name="id" select="'searchfilter/dateRange/from'"/>
+              </xsl:call-template>
+            </th>
+            <td>
+              <input size="2" type="text" name="{@param}.start.day">
+                <xsl:if test="search:day/@startDay">
+                  <xsl:attribute name="value">
+                    <xsl:value-of select="@search:day/@startDay"/>
+                  </xsl:attribute>
+                </xsl:if>
+              </input>
+            </td>
+            <td>
+              <select name="{@param}.start.month">
+                <xsl:for-each select="search:month">
+                  <option value="{@value}">
+                    <xsl:if test="@startMonth">
+                      <xsl:attribute name="selected">selected</xsl:attribute>
+                    </xsl:if>
+                    <xsl:value-of select="@title"/>
+                  </option>
+                </xsl:for-each>
+              </select>
+            </td>
+            <td>
+              <select name="{@param}.start.year">
+                <xsl:for-each select="search:year">
+                  <option value="{@value}">
+                    <xsl:if test="@startYear">
+                      <xsl:attribute name="selected">selected</xsl:attribute>
+                    </xsl:if>
+                    <xsl:value-of select="@title"/>
+                  </option>
+                </xsl:for-each>
+              </select>
+            </td>
+          </tr>
+          <tr>
+            <th align="right">
+              <xsl:call-template name="mandalay:getStaticText">
+                <xsl:with-param name="module" select="'search'"/>
+                <xsl:with-param name="id" select="'searchfilter/dateRange/to'"/>
+              </xsl:call-template>
+            </th>
+            <td>
+              <input size="2" type="text" name="{@param}.end.day">
+                <xsl:if test="search:day/@endDay">
+                  <xsl:attribute name="value">
+                    <xsl:value-of select="@search:day/@endDay"/>
+                  </xsl:attribute>
+                </xsl:if>
+              </input>
+            </td>
+            <td>
+              <select name="{@param}.end.month">
+                <xsl:for-each select="search:month">
+                  <option value="{@value}">
+                    <xsl:if test="@endMonth">
+                      <xsl:attribute name="selected">selected</xsl:attribute>
+                    </xsl:if>
+                    <xsl:value-of select="@title"/>
+                  </option>
+                </xsl:for-each>
+              </select>
+            </td>
+            <td>
+              <select name="{@param}.end.year">
+                <xsl:for-each select="search:year">
+                  <option value="{@value}">
+                    <xsl:if test="@endYear">
+                      <xsl:attribute name="selected">selected</xsl:attribute>
+                    </xsl:if>
+                    <xsl:value-of select="@title"/>
+                  </option>
+                </xsl:for-each>
+              </select>
+            </td>
+          </tr>
+        </table>
+
+      </span>
+    </div>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/fallback/admin-subsite.xsl b/ccm-sci-bundle/web/themes/mandalay/fallback/admin-subsite.xsl
new file mode 100755
index 000000000..5e0eadf01
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/fallback/admin-subsite.xsl
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;'>]>
+
+<!-- 
+    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/>.
+-->
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+  xmlns:subsite="http://ccm.redhat.com/london/subsite/1.0"
+  version="1.0">
+
+  <xsl:import href="../../../../../ROOT/packages/ui/xsl/ui.xsl"/>
+
+  <xsl:param name="dispatcher-prefix"/>
+
+  <xsl:template match="bebop:form[@class='simpleForm']">
+    <form>
+      <xsl:for-each select="@*[not(self::method)]">
+        <xsl:attribute name="{name()}">
+          <xsl:value-of select="."/>
+        </xsl:attribute>
+        <xsl:attribute name="method">
+          <xsl:choose> 
+            <xsl:when test="string-length(../@method)=0">post</xsl:when>
+            <xsl:otherwise><xsl:value-of select="../@method"/></xsl:otherwise>
+          </xsl:choose> 
+        </xsl:attribute>
+      </xsl:for-each>
+      <table>
+        <xsl:for-each select="*[not(name() = 'bebop:pageState') and not(name() = 'bebop:formWidget' and @type = 'hidden')]">
+          <tr>
+            <th align="right"><xsl:if test="@metadata.title"><xsl:value-of select="@metadata.title"/>:</xsl:if></th>
+            <td><xsl:apply-templates select="."/></td>
+          </tr>
+        </xsl:for-each>
+      </table>
+      <xsl:apply-templates select="bebop:formWidget[@type='hidden']"/>
+      <xsl:apply-templates select="bebop:pageState"/>
+    </form>
+
+  </xsl:template>
+
+  <xsl:template match="subsite:controlCenter">
+    <h3>Subsite listing</h3>
+    <xsl:apply-templates select="subsite:siteListing"/>
+    <xsl:choose>
+      <xsl:when test="subsite:siteListing/@selected">
+        <h3>Edit subsite details</h3>
+      </xsl:when>
+      <xsl:otherwise>
+        <h3>Create new subsite</h3>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates select="bebop:form"/>
+  </xsl:template>
+
+  <xsl:template match="subsite:siteListing">
+    <table>
+      <xsl:for-each select="object">
+        <tr>
+          <td><xsl:value-of select="title"/></td>
+          <td><a title="View the site" href="http://{hostname}/"><xsl:value-of select="hostname"/></a></td>
+          <td><a href="?site={id}">[edit]</a></td>
+        </tr>
+        <tr>
+          <td colspan="3" style="font-size: smaller; font-style: italic; text-indent: 2em"><xsl:value-of select="description"/></td>
+        </tr>
+      </xsl:for-each>
+    </table>
+  </xsl:template>
+
+</xsl:stylesheet>
+ 
diff --git a/ccm-sci-bundle/web/themes/mandalay/fallback/admin-terms.xsl b/ccm-sci-bundle/web/themes/mandalay/fallback/admin-terms.xsl
new file mode 100755
index 000000000..717c83978
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/fallback/admin-terms.xsl
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;'>]>
+
+<!-- 
+    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/>.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+  xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
+  version="1.0">
+
+  <xsl:import href="../../../../../ROOT/packages/ui/xsl/ui.xsl"/>
+
+  <xsl:import href="../../../../../../ccm-ldn-terms/__ccm__/apps/terms/lib/domain-listing.xsl"/>
+  <xsl:import href="../../../../../../ccm-ldn-terms/__ccm__/apps/terms/lib/domain-panel.xsl"/>
+  <xsl:import href="../../../../../../ccm-ldn-terms/__ccm__/apps/terms/lib/domain-form.xsl"/>
+  <xsl:import href="../../../../../../ccm-ldn-terms/__ccm__/apps/terms/lib/domain-details.xsl"/>
+  <xsl:import href="../../../../../../ccm-ldn-terms/__ccm__/apps/terms/lib/domain-usage.xsl"/>
+
+  <xsl:import href="../../../../../../ccm-ldn-terms/__ccm__/apps/terms/lib/term-listing.xsl"/>
+  <xsl:import href="../../../../../../ccm-ldn-terms/__ccm__/apps/terms/lib/term-panel.xsl"/>
+  <xsl:import href="../../../../../../ccm-ldn-terms/__ccm__/apps/terms/lib/term-form.xsl"/>
+  <xsl:import href="../../../../../../ccm-ldn-terms/__ccm__/apps/terms/lib/term-details.xsl"/>
+  <xsl:import href="../../../../../../ccm-ldn-terms/__ccm__/apps/terms/lib/term-picker.xsl"/>
+  <xsl:import href="../../../../../../ccm-ldn-terms/__ccm__/apps/terms/lib/term-name-search.xsl"/>
+
+  <xsl:param name="contextPath"/>
+
+  <xsl:template name="bebop:pageCSS">
+    <xsl:call-template name="bebop:pageCSSMain"/>
+    <xsl:call-template name="terms:pageCSSMain"/>
+  </xsl:template>
+
+  <xsl:template name="terms:pageCSSMain">
+    <link href="{$contextPath}/__ccm__/apps/terms/xsl/index.css" rel="stylesheet" type="text/css"/>
+  </xsl:template>
+</xsl:stylesheet>
+ 
diff --git a/ccm-sci-bundle/web/themes/mandalay/fallback/admin-themes.xsl b/ccm-sci-bundle/web/themes/mandalay/fallback/admin-themes.xsl
new file mode 100755
index 000000000..9ed30f248
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/fallback/admin-themes.xsl
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;'>]>
+
+<!-- 
+    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/>.
+-->
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+  xmlns:theme="http://ccm.redhat.com/london/theme/1.0"
+  version="1.0">
+
+  <xsl:import href="../../../../../ROOT/packages/ui/xsl/ui.xsl"/>
+
+  <xsl:template name="bebop:pageCSS">
+    <xsl:call-template name="bebop:pageCSSMain"/>
+  </xsl:template>
+
+  <xsl:template match="theme:folder|theme:file" name="themeFolder">
+      <tr>
+      <td align="left">
+      <img src="/assets/pix.gif"><xsl:attribute name="width"><xsl:value-of select="@depth"/></xsl:attribute></img>
+      </td>
+
+      <xsl:if test="name()='theme:folder'">
+      <td colspan="4">
+        <i><xsl:value-of select="@name"/></i>      
+      </td>
+      </xsl:if>
+
+      <xsl:if test="name()='theme:file'">
+        <xsl:choose>
+          <xsl:when test="@isDeleted='true' or @inWhiteList!='true'">
+            <td><strike><xsl:value-of select="@name"/></strike></td>
+            <td><strike><xsl:value-of select="@size"/></strike></td>
+            <td><strike><xsl:value-of select="@lastModified"/></strike></td>
+            <td>
+              <xsl:choose>
+                <xsl:when test="@isDeleted='true'">
+                  <font color="red">(scheduled for removal)</font>
+                </xsl:when>
+                <xsl:otherwise>
+                  (ignored)
+                </xsl:otherwise>
+              </xsl:choose>
+            </td>
+          </xsl:when>
+          <xsl:otherwise>
+            <td><xsl:value-of select="@name"/></td>
+            <td><xsl:value-of select="@size"/></td>
+            <td><xsl:value-of select="@lastModified"/></td>
+            <td>
+              <xsl:if test="@removeURL">
+                <a>
+                  <xsl:attribute name="href">
+                    <xsl:value-of select="@removeURL"/>
+                  </xsl:attribute>
+                  <xsl:attribute name="onclick">return confirm('Are you sure?')</xsl:attribute>
+                  Remove
+                </a>
+              </xsl:if>
+            </td>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:if>
+
+      </tr>
+      <xsl:apply-templates select="theme:file">
+         <xsl:sort select="./@name" data-type="text" order="ascending"/>
+      </xsl:apply-templates>
+      <xsl:apply-templates select="theme:folder">
+         <xsl:sort select="./@name" data-type="text" order="ascending"/>
+      </xsl:apply-templates>
+  </xsl:template>                  
+
+  <xsl:template match="theme:fileList">
+      <p/>
+      <b><xsl:value-of select="bebop:label[@class='heading']"/></b>
+      <br/>
+
+      <table border="0">
+      <tr>
+      <th></th>
+      <th align="left">File Name</th>
+      <th align="left">Size</th>
+      <th align="left">Last Modified</th>
+      </tr>
+      <xsl:apply-templates select="theme:folder"/>
+      </table>
+  </xsl:template>
+
+  <xsl:template match="theme:xslWarnings">
+     <p/>
+     <b>Warning Messages:</b><br/>
+     <xsl:apply-templates select="theme:xslErrorInfo"/>
+     <p/>
+  </xsl:template>
+
+  <xsl:template match="theme:xslErrors">
+     <p/>
+     <b>Error Messages:</b><br/>
+     <xsl:apply-templates select="theme:xslErrorInfo"/>
+     <p/>
+  </xsl:template>
+
+  <xsl:template match="theme:xslFatals">
+     <p/>
+     <b>Fatal Messages:</b><br/>
+     <xsl:apply-templates select="theme:xslErrorInfo"/>
+     <p/>
+  </xsl:template>
+
+  <xsl:template match="theme:xslErrorInfo">
+    <b><xsl:value-of select="position()"/>.</b> 
+       <xsl:choose>
+          <xsl:when test="@message"><xsl:value-of select="@message"/></xsl:when>
+          <xsl:otherwise><xsl:value-of select="@location"/></xsl:otherwise>
+       </xsl:choose>
+       <blockquote>
+       <xsl:if test="@message and @location"><b>Location:</b> <xsl:value-of select="@location"/><br/></xsl:if>
+       <xsl:if test="@column and @line and (@column>-1 or @test>-1)">
+       <b>Line:</b> <xsl:value-of select="@line"/> <br/>
+       <b>Column:</b> <xsl:value-of select="@column"/> <br/>
+       </xsl:if>
+       <xsl:choose>
+         <xsl:when test="@causeMessage and not(@causeMessage = @message)">
+            <b>Message From Original Exception:</b> <xsl:value-of select="@causeMessage"/>
+         </xsl:when>
+       </xsl:choose>
+       </blockquote>
+    <br/>
+  </xsl:template>
+
+</xsl:stylesheet>
+ 
diff --git a/ccm-sci-bundle/web/themes/mandalay/fallback/admin.xsl b/ccm-sci-bundle/web/themes/mandalay/fallback/admin.xsl
new file mode 100755
index 000000000..5651343c8
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/fallback/admin.xsl
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;'>]>
+
+<!-- 
+    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/>.
+-->
+
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:admin="http://www.arsdigita.com/admin-ui/1.0"
+                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+                exclude-result-prefixes="admin">
+
+<xsl:import href="../../../../../ROOT/packages/acs-admin/xsl/split-panel.xsl"/>
+
+<!-- Importiert eine Menge anderer XSL-Dateien. Ich bin mir nicht sicher, wofür die gebraucht werden. Daher lasse ich sie erstmal weg.
+<xsl:import href="../../../../../ROOT/packages/content-section/xsl/cms.xsl"/>
+-->
+<!-- Anzeige der Bilder bei AddImage -->
+<xsl:import href="../../../../../ROOT/packages/content-section/xsl/CaptionedImage.xsl"/>
+
+
+  <!-- this rule matches one user -->
+  <xsl:template match="admin:userInfo">
+    
+    <!-- Feature #166221 capitalize form labels -->
+    <ul>
+      <li> Name: <xsl:value-of select="@name"/> </li>
+      <li> Email: 
+	<table>
+	  <xsl:apply-templates select="admin:email" />
+	</table>
+      </li>
+      <li> Screen Name:  <xsl:value-of select="@screenName"/> </li>
+      <li> URL: <a href="{@URI}"><xsl:value-of select="@URI"/> </a> </li>
+      <li> User ID:  <xsl:value-of select="@id"/> </li>
+      <li> Member State: <xsl:value-of select="@memberState"/> 
+      </li>
+    </ul>
+    
+  </xsl:template>
+  
+  <!-- used to format the list of actions available for one user -->
+  <xsl:template match="admin:userActions">
+    
+    <h3>Adminstrative Actions</h3>
+    
+    <ul>
+      <li><a href="password-update?user_id={@id}">Update password</a></li>
+      <li><a href="login?user_id={@id}">Become this user</a></li>
+    </ul>
+    
+  </xsl:template>
+  
+  <!-- used to format the header of the password update page -->
+  <xsl:template match="bebop:label[@class='UserPasswordHeader']">
+    For <xsl:value-of select="text()"/>
+    <hr />
+  </xsl:template>
+  
+  <!-- usage note displayed on the password-update page -->
+  <xsl:template match="admin:PasswordNote">
+    <h4>Note</h4>
+    <p>If this user does not currently have an authentication record,
+      one will be created when you submit this form and the account
+      will be enabled for login to the system.</p>
+  </xsl:template>
+
+  <!-- used to format primary email for display -->
+  <xsl:template match="admin:email[@primary='t']">
+    <tr>
+      <td>
+        <a href="mailto:{@address}"><xsl:value-of select="@address"/></a>
+      </td>
+      <td>
+        (primary)
+      </td>
+    </tr>
+  </xsl:template>
+  
+  <!-- used to format non-primary email for display -->
+  <xsl:template match="admin:email">
+    <tr>
+      <td>
+        <a href="mailto:{@address}"><xsl:value-of select="@address"/></a>
+      </td>
+      <td>
+      </td>
+    </tr>
+  </xsl:template>
+
+
+<!-- Access Denied Page -->
+<xsl:template match="bebop:label[@class='AccessDenied']">
+  <hr />
+  <p>You don't have permission to perform the requested action.</p>
+  <hr />
+</xsl:template>
+
+<!-- Display search error message -->
+<xsl:template match="bebop:list[@class='SearchResultList'][count(bebop:cell)=0]">
+   <p><font color="red">Your search returned no results.</font></p>
+</xsl:template>
+
+<!-- Display search error message -->
+<xsl:template match="bebop:list[@class='SearchResultList'][count(bebop:cell)>0]">
+    <p>Results matching your query:</p>
+    <ul>
+      <xsl:for-each select="bebop:cell">
+        <li><xsl:apply-templates/></li>
+      </xsl:for-each>
+    </ul>
+</xsl:template>
+
+<!-- used to format the basic information and actions available for one group -->
+<xsl:template match="admin:groupInfo">
+
+<ul>
+  <li> Group Name: <xsl:value-of select="@name"/> </li>
+  <li> Primary Email: <xsl:value-of select="@email"/> </li>
+</ul>
+
+</xsl:template>
+
+<xsl:template match="bebop:list[@class='UserGroupsResultList'][count(bebop:cell)=0]">
+   <p><font color="red">None</font></p>
+</xsl:template>
+  
+<xsl:template match="bebop:link[@class='deleteLink']">
+  <xsl:text>&#160;</xsl:text>
+  (<a href="{@href}" onclick="{@onclick}" class="action_link">
+    <xsl:apply-templates/>
+  </a>)
+</xsl:template>
+
+<!-- ContextBar formatting -->
+<xsl:template match="bebop:boxPanel[@class='ContextBar']">
+  <xsl:apply-imports/>
+  <hr />
+</xsl:template>
+
+<!-- Table with alternate color for each column. -->
+ <xsl:template match="bebop:table[@class='AlternateTable']"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <table>
+     <xsl:for-each select="@*">
+       <xsl:attribute name="{name()}">
+         <xsl:value-of select="."/>
+       </xsl:attribute>
+     </xsl:for-each>
+     <xsl:apply-templates select="bebop:thead"/>
+     <xsl:for-each select="bebop:tbody">
+         <xsl:call-template name="AlternateTableBody"/>
+     </xsl:for-each>
+   </table>
+ </xsl:template>
+
+ <xsl:template name="AlternateTableBody"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <tbody>
+     <xsl:for-each select="bebop:trow">
+       <tr>
+         <xsl:attribute name="bgcolor">
+            <xsl:choose>
+               <xsl:when test="position() mod 2">#e1d5b0</xsl:when>
+               <xsl:otherwise>#ffffff</xsl:otherwise>
+            </xsl:choose>
+         </xsl:attribute>
+         <xsl:for-each select="bebop:cell">
+           <td>
+             <xsl:for-each select="@align|@valign|@colspan|@width">
+               <xsl:attribute name="{local-name()}">
+                <xsl:value-of select="."/>
+               </xsl:attribute>
+             </xsl:for-each>
+             <xsl:apply-templates/>
+           </td>
+         </xsl:for-each>
+       </tr>
+     </xsl:for-each>
+   </tbody>
+ </xsl:template>
+
+</xsl:stylesheet>
+ 
diff --git a/ccm-sci-bundle/web/themes/mandalay/fallback/fallbackEntryPoints.xsl b/ccm-sci-bundle/web/themes/mandalay/fallback/fallbackEntryPoints.xsl
new file mode 100755
index 000000000..97fb0b4ef
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/fallback/fallbackEntryPoints.xsl
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;'>]>
+
+<!-- 
+    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/>.
+-->
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+  xmlns:nav="http://ccm.redhat.com/navigation"
+  xmlns:mandalay="http://mandalay.quasiweb.de"
+  xmlns:cms="http://www.arsdigita.com/cms/1.0"
+  xmlns:ui="http://www.arsdigita.com/ui/1.0"
+  xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
+  exclude-result-prefixes="xsl bebop nav cms ui aplaws mandalay"
+  version="1.0">
+
+  <xsl:import href="../../../../../ROOT/packages/content-section/xsl/cms.xsl"/>
+  <xsl:import href="../../../../../ROOT/packages/content-section/xsl/content-center.xsl"/>
+  <xsl:import href="../../../../../ROOT/__ccm__/assets/notes/index.xsl"/>
+
+  <xsl:import href="../fallback/admin.xsl"/>
+  <xsl:import href="../fallback/admin-navigation.xsl"/>
+  <xsl:import href="../fallback/admin-search.xsl"/>
+  <xsl:import href="../fallback/admin-subsite.xsl"/>
+  <xsl:import href="../fallback/admin-terms.xsl"/>
+  <xsl:import href="../fallback/admin-themes.xsl"/>
+
+  <xsl:import href="../fallback/admin-category-step.xsl"/> <!-- Support for AJAXed load-cat.jsp -->
+  <xsl:import href="../../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
+  <xsl:variable name="here"><xsl:value-of select="$static-prefix"/>/cms/admin/page</xsl:variable>
+
+  <!-- DE: Einstiegspunkt -->
+  <xsl:template name="mandalay:fallbackEntryPoint">
+
+    <xsl:choose>
+      <!-- DE Adminoberfläche  -->
+      <xsl:when test="@class='cms-admin'">
+        <xsl:call-template name="mandalay:fallbackAdminLayout"/>
+      </xsl:when>
+
+      <xsl:otherwise>
+        <xsl:call-template name="mandalay:fallbackAplawsPage"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  
+  <!-- DE: Ab hier folgen die "geliehenen" Templates des Standard-Aplaws-Theme -->
+    <xsl:template name="mandalay:fallbackAdminLayout">
+    <html xmlns:deditor="http://www.arsdigita.com/deditor/1.0">
+      <head>
+        <title><xsl:value-of select="bebop:title"/></title>
+        <link rel="stylesheet" type="text/css" href="{$legacy-asset-prefix}/css/acs-master.css"/>
+        <link rel="stylesheet" type="text/css" href="{$static-prefix}/cms/admin/cms-admin.css"/>
+        <xsl:call-template name="mandalay:fallbackHeaderStyleSheets"/>
+      </head>
+      <body>
+        <xsl:call-template name="bebop:dcpJavascript"/>
+        <table id="global-header">
+          <tr>
+            <td id="logo"><img src="{$theme-prefix}/images/aplaws-logo-small.png" height="30" width="30"/></td>
+            <td id="context"><xsl:apply-templates select="bebop:contextBar"/></td>
+            <td style="margin: 0; color: #3f3f3f; border: 0; padding: 0; padding-right: 18px;">Welcome <strong><xsl:value-of select="@name" /></strong></td>
+            <td>
+              <table id="global-links">
+                <tr>
+                  <td class="global-link-icon"><a href="{cms:globalNavigation/cms:workspace/@href}"><img src="{$here}/home.png" height="18" width="18"/></a></td>
+                  <td class="global-link"><a href="{cms:globalNavigation/cms:workspace/@href}">Home</a></td>
+
+                  <td class="global-link-icon"><a href="{cms:globalNavigation/cms:signOut/@href}"><img src="{$here}//lock.png" height="18" width="14"/></a></td>
+                  <td class="global-link"><a href="{cms:globalNavigation/cms:signOut/@href}">Logout</a></td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+        </table>
+        <div id="page-title"><xsl:value-of select="bebop:title"/></div>
+        <xsl:if test="bebop:link[@id = 'preview_link']">
+          <xsl:choose>
+            <xsl:when test="bebop:link[@target]">
+              <div style="float: right; margin-right: 12px"><a target="{bebop:link/@target}" href="{bebop:link[@id = 'preview_link']/@href}"><xsl:value-of select="bebop:link[@id = 'preview_link']/bebop:label"/></a></div>
+            </xsl:when>
+            <xsl:otherwise>
+              <div style="float: right; margin-right: 12px"><a href="{bebop:link[@id = 'preview_link']/@href}"><xsl:value-of select="bebop:link[@id = 'preview_link']/bebop:label"/></a></div>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:if>
+        <div><xsl:apply-templates select="*[@id = 'page-body']"/></div>
+        <xsl:choose>
+          <xsl:when test="bebop:structure">
+            <div><xsl:apply-templates select="bebop:structure"/></div>
+          </xsl:when>
+          <xsl:when test="ui:debugPanel">
+            <div><xsl:apply-templates select="ui:debugPanel"/></div>            
+          </xsl:when>
+        </xsl:choose>
+      </body>
+    </html>
+  </xsl:template>
+
+  <xsl:template name="mandalay:fallbackAplawsPage">
+    <html>
+      <head>
+        <title><xsl:value-of select="/bebop:page/bebop:title"/></title>
+        <meta name="title">
+          <xsl:attribute name="content">
+            <xsl:value-of select="/bebop:page/bebop:title"/>
+          </xsl:attribute>
+        </meta>
+        <link rel="stylesheet" href="{$legacy-asset-prefix}/css/acs-master.css" type="text/css" media="screen"/>
+        <xsl:call-template name="mandalay:fallbackHeaderStyleSheets"/>
+      </head>
+
+      <body style="margin: 0em">
+        <xsl:call-template name="bebop:dcpJavascript"/>
+        <div class="bodyHeader">
+          <xsl:apply-templates select="ui:userBanner"/>
+        </div>
+        <div class="bodyBreadcrumb">
+          <a href="/">APLAWS</a>&gt;<xsl:value-of select="/bebop:page/bebop:title"/>
+        </div>
+        <h1><xsl:value-of select="/bebop:page/bebop:title"/></h1>
+        <div class="bodyContent">
+          <xsl:apply-templates select="*[not(@metadata.tag)]"/>
+        </div>
+        <div class="bodyFooter">
+          <xsl:apply-templates select="ui:siteBanner"/>
+        </div>
+        <div class="bodyDebug">
+          <xsl:apply-templates select="ui:debugPanel"/>
+          <xsl:apply-templates select="bebop:structure"/>
+        </div>
+      </body>
+    </html>
+  </xsl:template>
+
+  <xsl:template name="cat-widget-cat-name">
+    <xsl:value-of select="@name"/>
+
+    <xsl:if test="@pid and @domain='LGSL'">
+        (<xsl:value-of select="@pid"/>)
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="mandalay:fallbackHeaderStyleSheets">
+    <xsl:choose>
+      <xsl:when test="@application='navigation'">
+        <link rel="stylesheet" href="/__ccm__/apps/navigation/xsl/admin.css" type="text/css" media="screen"/>
+      </xsl:when>
+      <xsl:when test="@application='terms'">
+        <link rel="stylesheet" href="/ccm-ldn-terms/__ccm__/apps/terms/xsl/index.css" type="text/css" media="screen"/>
+      </xsl:when>
+<!--
+      <xsl:when test="@application=''">
+        <link rel="stylesheet" href="{$theme-prefix}/css/fallback/terms-index.css" type="text/css" media="screen"/>
+      </xsl:when>
+-->
+    </xsl:choose>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/cssLoader.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/cssLoader.xsl
index 4946fd829..6cc6b80ab 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/cssLoader.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/cssLoader.xsl
@@ -38,9 +38,49 @@ Setting up CSSLoader with browser switch
                 exclude-result-prefixes="xsl bebop cms nav mandalay"
                 version="1.0">
 
+  <xsl:template name="mandalay:cssLoaderNew">
+    <xsl:variable name="application">
+      <xsl:choose>
+        <xsl:when test="$resultTree/@application">
+          <xsl:value-of select="$resultTree/@application"/>
+        </xsl:when>
+        <xsl:when test="$resultTree/@class">
+          <xsl:value-of select="$resultTree/@class"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="'none'"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    
+    <xsl:variable name="cssfiles">
+      <xsl:choose>
+        <xsl:test when="document(concat($theme-prefix, '/settings/css-files.xml'))/css-files/application/@name=$application">
+          <xsl:value-of select="document(concat($theme-prefix, '/settings/css-files.xml'))/css-files/application/@name=$application"/>
+        </xsl:test>
+        <xsl:otherwise>
+          <xsl:value-of select="document(concat($theme-prefix, '/settings/css-files.xml'))/css-files/default"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    
+    <xsl:for-each select="$cssfiles/css-file">
+      
+    </xsl:for-each>
+    
+    <!-- Iterate over the defined files and create link elements for them-->
+    
+    <!-- if an iehacks file is included and the ie version is 7 or lower include this file -->
+    
+    
+    
+    <xsl:call-template name="mandalay:cssLoader"/>
+  </xsl:template>
+  
+  
   <!-- DE Lade die CSS-Dateien abhänging von Media, Contenttype, Browsertyp und useContext (admin) -->
   <!-- EN Load CSS files by media, contenttype, browser and context (admin) -->
-  <xsl:template name="mandalay:cssLoader">
+  <xsl:template name="mandalay:cssLoaderOld">
 
     <!-- DE Unterscheide Browser und speichere das Ergebnis -->
     <!-- EN Get the browser type-->
@@ -89,53 +129,53 @@ Setting up CSSLoader with browser switch
            ca_notes and com.arsdigita.cms.ReusableImageAsset are not treated as contenttypes. Styling will be made vie css-files
            of contenttypes.
       -->
-<!-- ????????????????????????????????????????????????????????????????????????? -->
-<!--      <xsl:for-each select="'global' | //objectType[. != 'com.arsdigita.cms.ReusableImageAsset'] | //nav:item/nav:attribute[@name='objectType']"> -->
+      <!-- ????????????????????????????????????????????????????????????????????????? -->
+      <!--      <xsl:for-each select="'global' | //objectType[. != 'com.arsdigita.cms.ReusableImageAsset'] | //nav:item/nav:attribute[@name='objectType']"> -->
 
-        <!-- DE Binde CSS-Dateien ein -->
-        <!-- EN Loading CSS files -->
-        <xsl:call-template name="mandalay:loadCSSFile">
+      <!-- DE Binde CSS-Dateien ein -->
+      <!-- EN Loading CSS files -->
+      <xsl:call-template name="mandalay:loadCSSFile">
 
-          <!-- DE Setze den Mediantyp -->
-          <!-- EN Set mediatype -->
-          <xsl:with-param name="media" select="$media"/>
+        <!-- DE Setze den Mediantyp -->
+        <!-- EN Set mediatype -->
+        <xsl:with-param name="media" select="$media"/>
 
-          <!-- DE Setze den Contenttyp -->
-          <!-- EN Set content type -->
-          <xsl:with-param name="content">
-            <xsl:text>global</xsl:text>
-            <!--
-            <xsl:call-template name="concat('mandalay:CT_', substring-after(., 'contenttypes.'),'_getCSSPath')"/>
-            -->
-<!--
-            <xsl:call-template name="mandalay:getSetting">
-              <xsl:with-param name="module" select="substring-after(., 'contenttypes.')"/>
-              <xsl:with-param name="setting" select="'csspath'"/>
-            </xsl:call-template>
--->
-          </xsl:with-param>
+        <!-- DE Setze den Contenttyp -->
+        <!-- EN Set content type -->
+        <xsl:with-param name="content">
+          <xsl:text>global</xsl:text>
+          <!--
+          <xsl:call-template name="concat('mandalay:CT_', substring-after(., 'contenttypes.'),'_getCSSPath')"/>
+          -->
+          <!--
+                      <xsl:call-template name="mandalay:getSetting">
+                        <xsl:with-param name="module" select="substring-after(., 'contenttypes.')"/>
+                        <xsl:with-param name="setting" select="'csspath'"/>
+                      </xsl:call-template>
+          -->
+        </xsl:with-param>
 
-          <!-- DE Setze Modus -->
-          <!-- EN Set mode -->
-          <xsl:with-param name="mode" select="$mode"/>
+        <!-- DE Setze Modus -->
+        <!-- EN Set mode -->
+        <xsl:with-param name="mode" select="$mode"/>
 
-          <!-- DE Lade admin.css bei Bedarf (useContext) -->
-          <!-- EN Load admin.css if needed (useContext) -->
+        <!-- DE Lade admin.css bei Bedarf (useContext) -->
+        <!-- EN Load admin.css if needed (useContext) -->
 
-          <xsl:with-param name="admin">
-            <xsl:choose>
-              <xsl:when test="$resultTree/@class = 'cms-admin' or $resultTree/@application = 'admin' or $resultTree/@application = 'terms' or $resultTree/@application = 'sitemap'">
-                <xsl:text>true</xsl:text>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:text>false</xsl:text>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
+        <xsl:with-param name="admin">
+          <xsl:choose>
+            <xsl:when test="$resultTree/@class = 'cms-admin' or $resultTree/@application = 'admin' or $resultTree/@application = 'terms' or $resultTree/@application = 'sitemap'">
+              <xsl:text>true</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text>false</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:with-param>
 
-        </xsl:call-template>
+      </xsl:call-template>
 
-<!--      </xsl:for-each>-->
+      <!--      </xsl:for-each>-->
     </xsl:for-each>
   </xsl:template>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/globalVars.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/globalVars.xsl
index cff5f1892..63ba734ac 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/globalVars.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/globalVars.xsl
@@ -123,7 +123,7 @@ zum anderen Variablen und Einstellungen speziell für das Mandalay-Theme.
   <!-- DE Speichere den Result-Tree, damit ich später darauf zugreifen kann. Wird durch den LayoutParser nötig -->
   <!-- EN Saving the result tree for access later on. This is needed because of the layoutParser -->
   <xsl:variable name="resultTree" select="/bebop:page"/>
-
+  
   <!-- DE Speichere den Usernamen des eingelogten User. Wird auch als Test-Variable verwendet -->
   <!-- EN Setting loggedin users name. Also used as test variable -->
   <xsl:variable name="userName">
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/moreButton.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/moreButton.xsl
index b173322a5..547785fe6 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/moreButton.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/moreButton.xsl
@@ -29,6 +29,7 @@
 -->
 
 <!-- Autor: Sören Bernstein -->
+<!-- Jens Pelzetter -->
 
 <xsl:stylesheet 
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -47,8 +48,15 @@
       <xsl:text> </xsl:text>
       <a>
         <xsl:attribute name="href">
+            <xsl:choose>
+                <xsl:when test="starts-with($href, '/')">
+                    <xsl:value-of select="$href"/>            
+                </xsl:when>
+                <xsl:otherwise>    
           <xsl:text>/redirect/?oid=</xsl:text>
           <xsl:value-of select="$href"/>
+                </xsl:otherwise>
+            </xsl:choose>
         </xsl:attribute>
         <xsl:attribute name="title">
           <xsl:call-template name="mandalay:getStaticText">
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/search/filterControls.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/search/filterControls.xsl
index 3a66ee948..097bcdee3 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/search/filterControls.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/search/filterControls.xsl
@@ -210,22 +210,22 @@
                             <xsl:value-of select="$filterId"/>
                         </xsl:attribute>
                         <script type="text/javascript">
-                            function addSelectedCategory(catFilterId, selectedCategory) {
-                            //Add span to selected catagories aream, including close/remove function
+                            function addSelectedCategory(catFilterId, selectedCategory, selectedCategoryId) {
+                            //Add span to selected catagories area, including close/remove function
                             var elem = $(document.createElement('span'));
-                            elem.attr("id", catFilterId + "Selected" + selectedCategory.replace(" ", "_"));
+                            elem.attr("id", catFilterId + "Selected" + selectedCategoryId);
                             elem.append(selectedCategory);
                             var closeElem = $(document.createElement('a'));
                             closeElem.attr("href", "#");
                             closeElem.append("&Cross;");
                             closeElem.click(function() {
-                            removeSelectedCategory(elem, catFilterId, selectedCategory);
+                            removeSelectedCategory(elem, catFilterId, selectedCategoryId);
                             });
                             elem.append(closeElem);
                                 
                             $("#" + catFilterId + " span.selectedCategories").append(elem);
                                 
-                            var newVal = $("#" + catFilterId + " input.selectedCategories").val() + selectedCategory + ";";
+                            var newVal = $("#" + catFilterId + " input.selectedCategories").val() + selectedCategoryId + ";";
                             $("#" + catFilterId + " input.selectedCategories").val(newVal);
                             }
                             
@@ -235,11 +235,11 @@
                             //var category = $(elem.text();
                                 
                             //alert("category =" + category);
-                                
+                            
+                            //alert("catFilterId = " + catFilterId); 
                             //alert("oldVal = '" + $("#" + catFilterId + " input.selectedCategories").val() + "'\n"
                             //    + "newVal = '" + $("#" + catFilterId + " input.selectedCategories").val().replace(category + ";", "") + "'");
                                
-                                
                             var newVal = $("#" + catFilterId + " input.selectedCategories").val().replace(category + ";", "");
                             $("#" + catFilterId + " input.selectedCategories").val(newVal);
                                 
@@ -280,10 +280,11 @@
                                     <xsl:attribute name="id">
                                         <xsl:value-of select="concat(./@label, 'SelectedKeywords')"/>
                                     </xsl:attribute>
-                                    <xsl:for-each select="./categories/category[@selected='selected']">
+                                    <xsl:for-each select="./categories//category[@selected='selected']">
                                         <span>
                                             <xsl:attribute name="id">
-                                                <xsl:value-of select="concat(../../../../@customName, ../../@label, 'Filter', 'Selected', translate(current(), ' ', '_'))"/>
+                                                <!--<xsl:value-of select="concat(../../../../@customName, ../../@label, 'Filter', 'Selected', translate(current(), ' ', '_'))"/>-->
+                                                <xsl:value-of select="concat($filterId, 'Selected', @id)"/>
                                             </xsl:attribute>
                                             <xsl:value-of select="."/>
                                             <a>
@@ -293,10 +294,10 @@
                                                 <xsl:text>&Cross;</xsl:text>
                                             </a>
                                             <script type="text/javascript">
-                                                $("#<xsl:value-of select="concat(../../../../@customName, ../../@label, 'Filter', 'Selected', translate(current(), ' ', '_'))"/>").click(function() {
-                                                removeSelectedCategory($("#<xsl:value-of select="concat(../../../../@customName, ../../@label, 'Filter', 'Selected', translate(current(), ' ', '_'))"/>"), 
-                                                "<xsl:value-of select="concat(../../../../@customName, ../../@label, 'Filter')"/>", 
-                                                "<xsl:value-of select="concat(., ../separator)"/>");
+                                                $("#<xsl:value-of select="concat($filterId, 'Selected', @id)"/>").click(function() {
+                                                removeSelectedCategory($("#<xsl:value-of select="concat($filterId, 'Selected', @id)"/>"), 
+                                                "<xsl:value-of select="$filterId"/>", 
+                                                "<xsl:value-of select="concat(@id, ../separator)"/>");
                                                 return false;
                                                 });
                                             </script>
@@ -308,22 +309,45 @@
                                         <xsl:value-of select="concat(./@label, 'AvailableCategories')"/>
                                     </xsl:attribute>
                                     <option value=""></option>
-                                    <xsl:for-each select="./categories/category">
-                                        <option>
-                                            <xsl:attribute name="value">
-                                                <xsl:value-of select="./@id"/>
-                                            </xsl:attribute>
-                                            <xsl:value-of select="."/>
-                                        </option>
+                                    <xsl:for-each select="./categories/*">
+                                        <xsl:choose>
+                                            <xsl:when test="name() = 'categoryGroup'">
+                                                <optgroup>
+                                                    <xsl:attribute name="label">
+                                                        <xsl:value-of select="./@label"/>
+                                                    </xsl:attribute>
+                                                    <xsl:for-each select="./category">
+                                                        <option>
+                                                            <xsl:if test="./@selected = 'selected'">
+                                                                <xsl:attribute name="selected">selected</xsl:attribute>
+                                                            </xsl:if>
+                                                            <xsl:attribute name="value">
+                                                                <xsl:value-of select="./@id"/>
+                                                            </xsl:attribute>
+                                                            <xsl:value-of select="."/>
+                                                        </option>
+                                                    </xsl:for-each>
+                                                </optgroup>
+                                            </xsl:when>
+                                            <xsl:otherwise>
+                                                <option>
+                                                    <xsl:attribute name="value">
+                                                        <xsl:value-of select="./@id"/>
+                                                    </xsl:attribute>
+                                                    <xsl:value-of select="."/>
+                                                </option>
+                                            </xsl:otherwise>
+                                        </xsl:choose>
                                     </xsl:for-each>
                                 </select>
                                 
                                 <script type="text/javascript">
                                     $("#<xsl:value-of select="concat(./@label, 'AvailableCategories')"/>").change(function() {
-                                    var catFilterId = "<xsl:value-of select="concat(../../@customName, ./@label, 'Filter')"/>";
-                                    var selectedCategory = $("#<xsl:value-of select="concat(./@label, 'AvailableCategories')"/> option:selected").text()
+                                    var catFilterId = "<xsl:value-of select="$filterId"/>";
+                                    var selectedCategory = $("#<xsl:value-of select="concat(./@label, 'AvailableCategories')"/> option:selected").text();
+                                    var selectedCategoryId = $("#<xsl:value-of select="concat(./@label, 'AvailableCategories')"/> option:selected").attr("value");
                                     
-                                    addSelectedCategory(catFilterId, selectedCategory);
+                                    addSelectedCategory(catFilterId, selectedCategory, selectedCategoryId);
                                         
                                     $("#<xsl:value-of select="concat(./@label, 'AvailableCategories')"/>").val("");
                                     });
@@ -367,6 +391,8 @@
         </xsl:for-each>
     </xsl:template>
 
+    
+
     <xsl:template name="filterControlsSortFields">
         <!-- <xsl:if test="count(./controls/sortFields/sortField) &gt; 1">-->
         <!--   <code>sortFields</code>-->
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types/GenericPerson.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types/GenericPerson.xsl
index 20025e0fc..fb27baa4f 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/types/GenericPerson.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/types/GenericPerson.xsl
@@ -22,12 +22,12 @@
 
 <xsl:stylesheet 
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-	xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-	xmlns:cms="http://www.arsdigita.com/cms/1.0"
+  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+  xmlns:cms="http://www.arsdigita.com/cms/1.0"
   xmlns:nav="http://ccm.redhat.com/navigation"
-	xmlns:mandalay="http://mandalay.quasiweb.de"
-	exclude-result-prefixes="xsl bebop cms"
-	version="1.0">
+  xmlns:mandalay="http://mandalay.quasiweb.de"
+  exclude-result-prefixes="xsl bebop cms"
+  version="1.0">
 
   <!-- DE Leadtext -->
   <!-- EN lead text view -->
@@ -172,7 +172,9 @@
 
     <xsl:if test="$setImage = 'true' and nav:attribute[@name='imageAttachments.image.id']">
       <a>
-        <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+        <xsl:attribute name="href">
+          <xsl:value-of select="nav:path"/>
+        </xsl:attribute>
         <xsl:attribute name="title">
           <xsl:call-template name="mandalay:shying">
             <xsl:with-param name="title">
@@ -186,8 +188,12 @@
           <img>
             <xsl:attribute name="src">/ccm/cms-service/stream/image/?image_id=<xsl:value-of select="nav:attribute[@name='imageAttachments.image.id']"/>&amp;maxWidth=150&amp;maxHeight=100</xsl:attribute>
             <xsl:if test="nav:attribute[@name='imageAttachments.caption']">
-              <xsl:attribute name="alt"><xsl:value-of select="nav:attribute[@name='imageAttachments.caption']"/></xsl:attribute>
-              <xsl:attribute name="title"><xsl:value-of select="nav:attribute[@name='imageAttachments.caption']"/></xsl:attribute>
+              <xsl:attribute name="alt">
+                <xsl:value-of select="nav:attribute[@name='imageAttachments.caption']"/>
+              </xsl:attribute>
+              <xsl:attribute name="title">
+                <xsl:value-of select="nav:attribute[@name='imageAttachments.caption']"/>
+              </xsl:attribute>
             </xsl:if>
           </img>
         </div>
@@ -195,7 +201,9 @@
     </xsl:if>
 
     <a class="CIname">
-      <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+      <xsl:attribute name="href">
+        <xsl:value-of select="nav:path"/>
+      </xsl:attribute>
       <xsl:attribute name="title">
         <xsl:call-template name="mandalay:shying">
           <xsl:with-param name="title">
@@ -225,7 +233,9 @@
               <xsl:if test="$setMoreButton = 'true'">
                 <span class="moreButton">
                   <a>
-                    <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
+                    <xsl:attribute name="href">
+                      <xsl:value-of select="nav:path"/>
+                    </xsl:attribute>
                     <xsl:attribute name="title">
                       <xsl:call-template name="mandalay:getStaticText">
                         <xsl:with-param name="module" select="'GenericPerson'"/>
@@ -311,7 +321,10 @@
     <!-- EN -->
     <xsl:if test="./targetItem/imageAttachments and $setImage = 'true'">
       <a class="CIname">
-        <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
+        <xsl:attribute name="href">
+          <xsl:text>/redirect/?oid=</xsl:text>
+          <xsl:value-of select="./targetItem/@oid"/>
+        </xsl:attribute>
         <xsl:attribute name="title">
           <xsl:call-template name="mandalay:shying">
             <xsl:with-param name="title">
@@ -331,7 +344,10 @@
     </xsl:if>
     <xsl:if test="$setImageAndText = 'true' or not(./targetItem/imageAttachments) or $setImage = 'false'">
       <a class="CIname">
-        <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
+        <xsl:attribute name="href">
+          <xsl:text>/redirect/?oid=</xsl:text>
+          <xsl:value-of select="./targetItem/@oid"/>
+        </xsl:attribute>
         <xsl:attribute name="title">
           <xsl:call-template name="mandalay:shying">
             <xsl:with-param name="title">
@@ -383,53 +399,59 @@
     <xsl:param name="setBirthdate" select="'false'"/>
     <xsl:param name="setHomepage" select="'true'"/>
 
-   <xsl:if test="$setFullname = 'true'">
+    <xsl:if test="$setFullname = 'true'">
       <div class="personFullName">
-	<xsl:choose>
-	  <xsl:when test="($setHomepage = 'true') and (string-length(../contactentries[keyId = 'homepage']/value) &gt; 1)">
-	    <a>
-	      <xsl:attribute name="href">
-		<xsl:value-of select="../contactentries[keyId='homepage']/value"/>
-	      </xsl:attribute>
-        <xsl:if test="string-length(normalize-space(./titlepre)) &gt; 0">
-          <xsl:value-of select="./titlepre"/><xsl:text> </xsl:text>
-        </xsl:if>
-        <xsl:value-of select="./givenname"/><xsl:text> </xsl:text>
-        <xsl:value-of select="surname"/> 
-        <xsl:if test="string-length(normalize-space(./titlepost)) &gt; 0">
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="titlepost"/>
-        </xsl:if>
-	    </a>
-	  </xsl:when>
-	  <xsl:when test="($setHomepage = 'true') and string-length((./contacts/contact[@contactType='commonContact']/contactentries[keyId='homepage']/value) &gt; 1)">
-	    <a>
-	      <xsl:attribute name="href">
-		<xsl:value-of select="./contacts/contact[@contactType='commonContact']/contactentries[keyId='homepage']/value"/>
-	      </xsl:attribute>
-	      <xsl:if test="string-length(normalize-space(./titlepre)) &gt; 0">
-		<xsl:value-of select="./titlepre"/><xsl:text> </xsl:text>
-	      </xsl:if>
-	      <xsl:value-of select="./givenname"/><xsl:text> </xsl:text>
-	      <xsl:value-of select="surname"/> 
-	      <xsl:if test="string-length(normalize-space(./titlepost)) &gt; 0">
-		<xsl:text> </xsl:text>
-		<xsl:value-of select="titlepost"/>
-	      </xsl:if>	      	      
-	    </a>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:if test="string-length(normalize-space(./titlepre)) &gt; 0">
-	      <xsl:value-of select="./titlepre"/><xsl:text> </xsl:text>
-	    </xsl:if>
-	    <xsl:value-of select="./givenname"/><xsl:text> </xsl:text>
-	    <xsl:value-of select="surname"/> 
-	    <xsl:if test="string-length(normalize-space(./titlepost)) &gt; 0">
-	      <xsl:text> </xsl:text>
-	      <xsl:value-of select="titlepost"/>
-	    </xsl:if>
-	  </xsl:otherwise>
-	</xsl:choose>
+        <xsl:choose>
+          <xsl:when test="($setHomepage = 'true') and (string-length(../contactentries[keyId = 'homepage']/value) &gt; 1)">
+            <a>
+              <xsl:attribute name="href">
+                <xsl:value-of select="../contactentries[keyId='homepage']/value"/>
+              </xsl:attribute>
+              <xsl:if test="string-length(normalize-space(./titlepre)) &gt; 0">
+                <xsl:value-of select="./titlepre"/>
+                <xsl:text> </xsl:text>
+              </xsl:if>
+              <xsl:value-of select="./givenname"/>
+              <xsl:text> </xsl:text>
+              <xsl:value-of select="surname"/> 
+              <xsl:if test="string-length(normalize-space(./titlepost)) &gt; 0">
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="titlepost"/>
+              </xsl:if>
+            </a>
+          </xsl:when>
+          <xsl:when test="($setHomepage = 'true') and string-length((./contacts/contact[@contactType='commonContact']/contactentries[keyId='homepage']/value) &gt; 1)">
+            <a>
+              <xsl:attribute name="href">
+                <xsl:value-of select="./contacts/contact[@contactType='commonContact']/contactentries[keyId='homepage']/value"/>
+              </xsl:attribute>
+              <xsl:if test="string-length(normalize-space(./titlepre)) &gt; 0">
+                <xsl:value-of select="./titlepre"/>
+                <xsl:text> </xsl:text>
+              </xsl:if>
+              <xsl:value-of select="./givenname"/>
+              <xsl:text> </xsl:text>
+              <xsl:value-of select="surname"/> 
+              <xsl:if test="string-length(normalize-space(./titlepost)) &gt; 0">
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="titlepost"/>
+              </xsl:if>
+            </a>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:if test="string-length(normalize-space(./titlepre)) &gt; 0">
+              <xsl:value-of select="./titlepre"/>
+              <xsl:text> </xsl:text>
+            </xsl:if>
+            <xsl:value-of select="./givenname"/>
+            <xsl:text> </xsl:text>
+            <xsl:value-of select="surname"/> 
+            <xsl:if test="string-length(normalize-space(./titlepost)) &gt; 0">
+              <xsl:text> </xsl:text>
+              <xsl:value-of select="titlepost"/>
+            </xsl:if>
+          </xsl:otherwise>
+        </xsl:choose>
       </div>
     </xsl:if>
 
@@ -450,7 +472,7 @@
         <span class="personSurname">
           <xsl:value-of select="surname"/>
         </span>
-        <xsl:if test="(string-length(surname) &gt; 0) and (string-length(titlepost) &gt;0 )">
+        <xsl:if test="(string-length(surname) &gt; 0) and (string-length(titlepost) &gt; 0)">
           <xsl:text>, </xsl:text>
         </xsl:if>
         <span class="personTitlePost">
@@ -500,7 +522,7 @@
         <span class="value">
           <xsl:value-of select="titlepost"/>
         </span>
-      </div> 
+      </div>
     </xsl:if> 
     <xsl:if test="$setGender = 'true'">
       <div>
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/en/GenericPerson.xml b/ccm-sci-bundle/web/themes/mandalay/lang/en/GenericPerson.xml
new file mode 100644
index 000000000..f3afbbda9
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/en/GenericPerson.xml
@@ -0,0 +1,36 @@
+<?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/>.
+-->
+
+<translations>
+  <line id="lang">English</line>
+  <line id="version">0.9</line>
+
+  <line id="titlepre">Acad. Degree: </line>
+  <line id="givenname">Given name: </line>
+  <line id="surname">Surname: </line>
+  <line id="titlepost">Name suffix: </line>
+  <line id="gender">Gender: </line>
+  <line id="birthdate">Birthday: </line>
+
+  <line id="moreButton">more »</line>
+  <line id="moreButtonTitle">read more</line>
+  <line id=""></line>
+</translations>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/SciPublications.xml b/ccm-sci-bundle/web/themes/mandalay/settings/SciPublications.xml
index 2f6f13f63..4baa6df05 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/SciPublications.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/SciPublications.xml
@@ -20,6 +20,7 @@
 -->
 
 <settings>
+  
   <setting id="setImage">true</setting>
   <setting id="setImageCaption">true</setting>
   <setting id="setImageMaxHeight">300</setting>
@@ -29,10 +30,13 @@
 
   <setting id="formatDefFile">SciPublicationsDefaultFormat.xml</setting>
 
+  <setting id="detailView/linkAuthors">true</setting>
+
   <setting id="listView/setLinkToDetails">false</setting>
   <setting id="listView/setLeadText">true</setting>
   <setting id="listView/setLeadTextLength">440</setting>
   <setting id="listView/setMoreButton">true</setting>
+  <setting id="listView/linkAuthor">false</setting>
 
   <setting id="linkView/setLinkToDetails">false</setting>
   <setting id="linkView/setImageAndText">true</setting>
@@ -107,6 +111,7 @@
   <setting id="collectedVolume/setUrl">true</setting>
   <setting id="collectedVolume/setVolume">true</setting>
   <setting id="collectedVolume/setYear">true</setting>
+  <setting id="collectedVolume/setArticles">true</setting>
 
   <!-- Settings for the  detail view of an expertise -->
   <setting id="expertise/setImage">true</setting>
@@ -277,10 +282,13 @@
   <setting id="workingPaper/setNumber">true</setting>
   <setting id="workingPaper/setNumberOfPages">true</setting>
   <setting id="workingPaper/setPages">true</setting>
+  <setting id="workingPaper/setOrganization">true</setting>
   <setting id="workingPaper/setPlace">true</setting>
   <setting id="workingPaper/setSeries">true</setting>
   <setting id="workingPaper/setSeriesLink">true</setting>
   <setting id="workingPaper/setSeriesVolume">true</setting>
   <setting id="workingPaper/setYear">true</setting>
 
+  <setting id="sciAuthor/setNameDetails">false</setting>
+
 </settings>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications.xsl
index dd5c4558d..da430b3a0 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications.xsl
@@ -54,4 +54,4 @@
   <xsl:import href="SciPublications/UnPublished.xsl"/>
   <xsl:import href="SciPublications/WorkingPaper.xsl"/>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInCollectedVolume.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInCollectedVolume.xsl
index 5df5598a6..c97aa88c0 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInCollectedVolume.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInCollectedVolume.xsl
@@ -45,7 +45,7 @@
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.ArticleInCollectedVolume']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'articleInCollectedVolume/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
@@ -66,28 +66,28 @@
     <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'articleInCollectedVolume/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'articleInCollectedVolume/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'articleInCollectedVolume/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageCaption">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'articleInCollectedVolume/setImageCaption'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInJournal.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInJournal.xsl
index 0843581ea..df1a19279 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInJournal.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInJournal.xsl
@@ -46,7 +46,7 @@
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.ArticleInJournal']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'articleInJournal/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
@@ -67,28 +67,28 @@
     <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'articleInJournal/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'articleInJournal/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'articleInJournal/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageCaption">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'articleInJournal/setImageCaption'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl
index 154d2e367..8678d0dca 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl
@@ -45,7 +45,7 @@
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.CollectedVolume']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'collectedVolume/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
@@ -66,28 +66,28 @@
     <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'collectedVolume/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'collectedVolume/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'collectedVolume/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageCaption">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'collectedVolume/setImageCaption'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Expertise.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Expertise.xsl
index 4c0c0fc31..9df7ec76f 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Expertise.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Expertise.xsl
@@ -45,7 +45,7 @@
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Expertise']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'expertise/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
@@ -66,28 +66,28 @@
     <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'expertise/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'expertise/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'expertise/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageCaption">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'expertise/setImageCaption'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/GreyLiterature.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/GreyLiterature.xsl
index 776d59c83..8a64b35b2 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/GreyLiterature.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/GreyLiterature.xsl
@@ -45,7 +45,7 @@
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.GreyLiterature']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'greyLiterature/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
@@ -66,28 +66,28 @@
     <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'greyLiterature/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'greyLiterature/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'greyLiterature/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageCaption">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'greyLiterature/setImageCaption'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InProceedings.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InProceedings.xsl
index 9f281386b..b6a5661d5 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InProceedings.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InProceedings.xsl
@@ -45,7 +45,7 @@
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.InProceedings']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'inProceedings/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
@@ -66,28 +66,28 @@
     <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'inProceedings/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'inProceedings/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'inProceedings/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageCaption">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'inProceedings/setImageCaption'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InternetArticle.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InternetArticle.xsl
index 9b92fab3e..dce05f1cb 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InternetArticle.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InternetArticle.xsl
@@ -46,7 +46,7 @@
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.InternetArticle']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'internetArticle/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
@@ -67,28 +67,28 @@
     <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'internetArticle/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'internetArticle/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'internetArticle/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageCaption">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'internetArticle/setImageCaption'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Journal.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Journal.xsl
index 525bfa405..0ce2fbb45 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Journal.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Journal.xsl
@@ -46,7 +46,7 @@
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Journal']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'journal/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
@@ -67,28 +67,28 @@
     <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'journal/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'journal/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'journal/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageCaption">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'journal/setImageCaption'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Monograph.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Monograph.xsl
index 5974bb8e4..7c2eb4740 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Monograph.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Monograph.xsl
@@ -45,7 +45,7 @@
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Monograph']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'monograph/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
@@ -66,28 +66,28 @@
     <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'monograph/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'monograph/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'monograph/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageCaption">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'monograph/setImageCaption'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Proceedings.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Proceedings.xsl
index 882a1968b..8fc437a8a 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Proceedings.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Proceedings.xsl
@@ -45,7 +45,7 @@
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Proceedings']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'proceedings/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
@@ -66,28 +66,28 @@
     <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'proceedings/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'proceedings/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'proceedings/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageCaption">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'proceedings/setImageCaption'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Publisher.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Publisher.xsl
index f13b066ab..ba0c1a14c 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Publisher.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Publisher.xsl
@@ -40,7 +40,7 @@
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Publisher']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'publisher/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
@@ -61,28 +61,28 @@
     <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'publisher/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'publisher/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'publisher/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageCaption">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'publisher/setImageCaption'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ResearchReport.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ResearchReport.xsl
index 22b847c7e..7e40671f0 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ResearchReport.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ResearchReport.xsl
@@ -46,7 +46,7 @@
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.ResearchReport']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'researchReport/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
@@ -67,28 +67,28 @@
     <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'researchReport/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'researchReport/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'researchReport/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageCaption">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'researchReport/setImageCaption'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Review.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Review.xsl
index 0f25087a0..26bb2254a 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Review.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Review.xsl
@@ -46,7 +46,7 @@
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Review']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'review/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
@@ -67,28 +67,28 @@
     <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'review/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'review/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'review/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageCaption">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'review/setImageCaption'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/SciAuthor.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/SciAuthor.xsl
index ec5cf8292..c99c2074a 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/SciAuthor.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/SciAuthor.xsl
@@ -36,7 +36,7 @@
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciAuthor']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'sciAuthor/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
@@ -57,28 +57,28 @@
     <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'sciAuthor/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'sciAuthor/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'sciAuthor/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageCaption">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'sciAuthor/setImageCaption'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
@@ -99,36 +99,36 @@
     <!-- EN Getting all needed setting-->
     <xsl:variable name="setFullname">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciAuthor'"/>
-        <xsl:with-param name="setting" select="'setFullname'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="setting" select="'sciAuthor/setFullname'"/>
         <xsl:with-param name="default" select="'false'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setNameDetails">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciAuthor'"/>
-        <xsl:with-param name="setting" select="'setNameDetails'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="setting" select="'sciAuthor/setNameDetails'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setBirthdate">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciAuthor'"/>
-        <xsl:with-param name="setting" select="'setBirthdate'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="setting" select="'sciAuthor/setBirthdate'"/>
         <xsl:with-param name="default" select="'false'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setGender">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciAuthor'"/>
-        <xsl:with-param name="setting" select="'setGender'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="setting" select="'sciAuthor/setGender'"/>
         <xsl:with-param name="default" select="'false'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setDescription">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciAuthor'"/>
-        <xsl:with-param name="setting" select="'setDescription'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="setting" select="'sciAuthor/setDescription'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Series.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Series.xsl
index 7a4f94218..ea2ff51d6 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Series.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Series.xsl
@@ -47,7 +47,7 @@
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Series']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'series/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
@@ -68,28 +68,28 @@
     <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'series/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'series/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'series/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageCaption">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'series/setImageCaption'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
@@ -182,7 +182,7 @@
         </h3>
         
         <xsl:if test="./filters">
-            <form action="" method="get" accept-charset="UTF-8">
+            <form action="" method="get" class="filterControls SciPublicationsListFilterControls" accept-charset="UTF-8">
                 <fieldset>
                     <legend>
                         <xsl:call-template name="mandalay:getStaticText">
@@ -194,6 +194,7 @@
                     <xsl:for-each select="./filters/filter">
                         <xsl:choose>
                             <xsl:when test="./@type = 'select'">
+                                <span class="selectFilter">
                                 <label>
                                     <xsl:attribute name="for">
                                         <xsl:value-of select="./@label"/>
@@ -235,8 +236,10 @@
                                         </option>
                                     </xsl:for-each>
                                 </select>                                
+                            </span>
                             </xsl:when>
                             <xsl:when test="./@type = 'text'">
+                                <span class="textFilter">
                                 <label>
                                     <xsl:attribute name="for">
                                         <xsl:value-of select="./@label"/>                                        
@@ -273,6 +276,7 @@
                                         </xsl:attribute>
                                     </xsl:if>
                                 </input>
+                                </span>
                             </xsl:when>
                         </xsl:choose>
                     </xsl:for-each>
@@ -286,13 +290,13 @@
                                 </xsl:call-template>
                             </xsl:attribute>
                         </input>
-                        <a class="completeResetButtonLink">
+                        <!--<a class="completeResetButtonLink">
                             <xsl:attribute name="href">?</xsl:attribute>
                             <xsl:call-template name="mandalay:getStaticText">
                                 <xsl:with-param name="module" select="'SciInstitute'"/>
                                 <xsl:with-param name="id" select="'projectsTab/filters/reset'"/>
                             </xsl:call-template>                            
-                        </a>
+                        </a>-->
                     </div>
                     
                 </fieldset>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/WorkingPaper.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/WorkingPaper.xsl
index a55163788..0c3a47eed 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/WorkingPaper.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/WorkingPaper.xsl
@@ -46,7 +46,7 @@
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.WorkingPaper']" mode="lead">
     <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="module"  select="'SciPublications'"/>
         <xsl:with-param name="setting" select="'workingPaper/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/common.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/common.xsl
index 083d6bd07..fbcb410e5 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/common.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/common.xsl
@@ -2,7 +2,7 @@
 <!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'>]>
 
 <!-- 
-     Copyright 2010, Jens Pelzetter
+     Copyright 2010, 2011, 2012, 2013, 2014 Jens Pelzetter
 
          
      This file is part of Mandalay.
@@ -108,7 +108,6 @@
       </xsl:otherwise>
     </xsl:choose>
     <xsl:if test="nav:attribute[@name='lead'] and $setLeadText = 'true'">
-
       <br />
       <span class="intro">
         <xsl:choose>
@@ -120,10 +119,7 @@
             <xsl:value-of disable-output-escaping="yes"
             select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
             <xsl:if test="string-length(nav:attribute[@name='lead']) &gt; $setLeadTextLength">
-
-              <xsl:text>
-...
-</xsl:text>
+              <xsl:text>...</xsl:text>
               <xsl:if test="$setMoreButton = 'true'">
                 <span class="moreButton">
                   <a>
@@ -132,7 +128,6 @@
                     </xsl:attribute>
                     <xsl:attribute name="title">
                       <xsl:call-template name="mandalay:getStaticText">
-
                         <xsl:with-param name="module"
                         select="'SciPublications'" />
                         <xsl:with-param name="id"
@@ -140,7 +135,6 @@
                       </xsl:call-template>
                     </xsl:attribute>
                     <xsl:call-template name="mandalay:getStaticText">
-
                       <xsl:with-param name="module"
                       select="'SciPublications'" />
                       <xsl:with-param name="id"
@@ -212,7 +206,6 @@
 
     <xsl:choose>
       <xsl:when test="$setLinkToDetails = 'true' or (string-length(nav:attribute[@name='lead']) &gt; $setLeadTextLength and $setLeadTextLength != '0')">
-
         <a>
           <xsl:attribute name="href">
             <xsl:value-of select="nav:path" />
@@ -240,7 +233,6 @@
       </xsl:otherwise>
     </xsl:choose>
     <xsl:if test="nav:attribute[@name='lead'] and $setLeadText = 'true'">
-
       <br />
       <span class="intro">
         <xsl:choose>
@@ -252,10 +244,7 @@
             <xsl:value-of disable-output-escaping="yes"
             select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
             <xsl:if test="string-length(nav:attribute[@name='lead']) &gt; $setLeadTextLength">
-
-              <xsl:text>
-...
-</xsl:text>
+              <xsl:text>...</xsl:text>
               <xsl:if test="$setMoreButton = 'true'">
                 <span class="moreButton">
                   <a>
@@ -447,7 +436,8 @@
         <xsl:otherwise>
           <a>
             <xsl:attribute name="href">/redirect/?oid=
-            <xsl:value-of select="./targetItem/@oid" /></xsl:attribute>
+              <xsl:value-of select="./targetItem/@oid" />
+            </xsl:attribute>
             <xsl:call-template name="mandalay:shying">
               <xsl:with-param name="title">
                 <xsl:value-of disable-output-escaping="yes"
@@ -469,17 +459,12 @@
             <xsl:value-of disable-output-escaping="yes"
             select="substring(./linkDescription, 1, $setDescriptionLength)" />
             <xsl:if test="string-length(./linkDescription) &gt; $setDescriptionLength">
-
-              <xsl:text>
-...
-</xsl:text>
+              <xsl:text>...</xsl:text>
               <xsl:if test="$setMoreButton = 'true'">
                 <span class="moreButton">
                   <a>
                     <xsl:attribute name="href">
-                      <xsl:text>
-/redirect/?oid=
-</xsl:text>
+                      <xsl:text>/redirect/?oid=</xsl:text>
                       <xsl:value-of select="./targetItem/@oid" />
                     </xsl:attribute>
                     <xsl:attribute name="title">
@@ -707,7 +692,10 @@
               <xsl:if test="$setMoreButton = 'true'">
                 <span class="moreButton">
                   <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
+                    <xsl:attribute name="href">
+                      <xsl:text>/redirect/?oid=</xsl:text>
+                      <xsl:value-of select="./targetItem/@oid"/>
+                    </xsl:attribute>
                     <xsl:attribute name="title">
                       <xsl:call-template name="mandalay:getStaticText">
                         <xsl:with-param name="module" select="'SciPublications_Publisher'"/>
@@ -750,6 +738,14 @@
       </xsl:call-template>
     </xsl:variable>
     
+    <xsl:variable name="linkAuthors">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module" select="'SciPublications'" />
+        <xsl:with-param name="setting" select="'detailView/linkAuthors'" />
+        <xsl:with-param name="default" select="'false'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    
     <dt>
       <xsl:choose>
         <xsl:when test="count($authors) &gt; 1">
@@ -768,11 +764,9 @@
               <xsl:sort select="@order" data-type="number" />
               <li>
                 <xsl:apply-templates select="document(concat($theme-prefix, '/settings/', $formatDefFile))/bibrefFormat/bibrefAuthorFormat">
-
-                  <xsl:with-param name="surname"
-                  select="./surname" />
-                  <xsl:with-param name="givenName"
-                  select="./givenname" />
+                  <xsl:with-param name="surname" select="./surname" />
+                  <xsl:with-param name="givenName" select="./givenname" />
+                  <xsl:with-param name="oid" select="./@oid" />
                   <xsl:with-param name="isEditor">
 					<xsl:choose>
 						<xsl:when test="(@isEditor = 'true') and ($setEditorText = 'true')">true</xsl:when>
@@ -782,6 +776,7 @@
                   <xsl:with-param name="authorCount"
                   select="'1'" />
                   <xsl:with-param name="position" select="'1'" />
+                  <xsl:with-param name="linkAuthor" select="$linkAuthors" />
                 </xsl:apply-templates>
               </li>
             </xsl:for-each>
@@ -793,20 +788,18 @@
             <span>
               <xsl:apply-templates select="document(concat($theme-prefix, '/settings/', $formatDefFile))/bibrefFormat/bibrefAuthorFormat">
 
-                <xsl:with-param name="surname"
-                select="./surname" />
-                <xsl:with-param name="givenName"
-                select="./givenname" />
+                <xsl:with-param name="surname" select="./surname" />
+                <xsl:with-param name="givenName" select="./givenname" />
+                <xsl:with-param name="oid" select="./@oid" />
                 <xsl:with-param name="isEditor">
 					<xsl:choose>
 						<xsl:when test="(@isEditor = 'true') and ($setEditorText = 'true')">true</xsl:when>
 						<xsl:otherwise>false</xsl:otherwise>
 					</xsl:choose>
                   </xsl:with-param>
-                <xsl:with-param name="authorsCount"
-                select="count($authors)" />
-                <xsl:with-param name="position"
-                select="position()" />
+                <xsl:with-param name="authorsCount" select="count($authors)" />
+                <xsl:with-param name="position" select="position()" />
+                <xsl:with-param name="linkAuthor" select="$linkAuthors" />
               </xsl:apply-templates>
             </span>
           </xsl:for-each>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/formatParser.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/formatParser.xsl
index b5902b602..bdbf70156 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/formatParser.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/formatParser.xsl
@@ -2227,8 +2227,10 @@
     <xsl:param name="surname" />
     <xsl:param name="givenName" />
     <xsl:param name="isEditor" />
+    <xsl:param name="oid" select="''" />
     <xsl:param name="authorsCount" />
     <xsl:param name="position" />
+    <xsl:param name="linkAuthor" select="'false'" />
     <!-- 
          If this is not the first author, put the definied separator before
          the author
@@ -2268,7 +2270,20 @@
         </xsl:apply-templates>
       </span>
     </xsl:variable>
+    
+    <xsl:choose>
+        <xsl:when test="$linkAuthor = 'true' and string-length($oid) &gt; 0">
+            <a>
+                <xsl:attribute name="href">
+                    <xsl:value-of select="concat('/redirect/?oid=', $oid)" />
+                </xsl:attribute>
     <xsl:value-of select="normalize-space($author)" />
+            </a>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of select="normalize-space($author)" />
+        </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 
   <!-- Processes the surname of an author -->