diff --git a/ccm-sci-bundle/web/themes/foundry/conf/bebop-context-bar.xsl b/ccm-sci-bundle/web/themes/foundry/conf/bebop-contextbar.xsl
similarity index 100%
rename from ccm-sci-bundle/web/themes/foundry/conf/bebop-context-bar.xsl
rename to ccm-sci-bundle/web/themes/foundry/conf/bebop-contextbar.xsl
diff --git a/ccm-sci-bundle/web/themes/foundry/conf/bebop.xml b/ccm-sci-bundle/web/themes/foundry/conf/bebop.xml
new file mode 100644
index 000000000..45eba49c9
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/conf/bebop.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<foundry:configuration xmlns:foundry="http://foundry.libreccm.org">
+    <setting id="hint-symbol">&#x24d8;</setting>
+</foundry:configuration>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/conf/cms.xml b/ccm-sci-bundle/web/themes/foundry/conf/cms.xml
new file mode 100644
index 000000000..b913fa4ae
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/conf/cms.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<foundry:configuration xmlns:foundry="http://foundry.libreccm.org">
+    <setting id="content-view-menu/layout">horizontal</setting>
+</foundry:configuration>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/conf/templates.xml b/ccm-sci-bundle/web/themes/foundry/conf/templates.xml
index 35e32c11f..b77f8d791 100644
--- a/ccm-sci-bundle/web/themes/foundry/conf/templates.xml
+++ b/ccm-sci-bundle/web/themes/foundry/conf/templates.xml
@@ -6,6 +6,7 @@
         -->
         <application name="admin" internal="true">admin-layout.xml</application>
         <application name="navigation" class="portalPage">portal-workspace.xml</application>
+        <application name="navigation" class="portalGridPage">portal-workspace-grid.xml</application>
         <application name="none" class="cms-admin" internal="true">admin-layout.xml</application>
         <application name="portal">portal-workspace.xml</application>
         <default>default-layout.xml</default>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/scrumb.png b/ccm-sci-bundle/web/themes/foundry/foundry/images/scrumb.png
new file mode 100755
index 000000000..c4ceca67c
Binary files /dev/null and b/ccm-sci-bundle/web/themes/foundry/foundry/images/scrumb.png differ
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib.xsl
index e6f76b3c3..4808ff65b 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib.xsl
@@ -26,6 +26,7 @@
     <xsl:import href="lib/bebop.xsl"/>
     <xsl:import href="lib/portlets.xsl"/>
     <xsl:import href="lib/global-vars.xsl"/>
+    <!--<xsl:import href="lib/search.xsl"/>-->
     <xsl:import href="lib/template-parser.xsl"/>
     <xsl:import href="lib/template-tags.xsl"/>
     <xsl:import href="lib/utils.xsl"/>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/context-bar.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/context-bar.xsl
index 4ca71e000..d028c31dd 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/context-bar.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/context-bar.xsl
@@ -42,12 +42,12 @@
         <xsl:param name="layout-tree" select="."/>
     
         <xsl:variable name="separator" 
-                      select="foundry:get-setting('bebop-context-bar', 
+                      select="foundry:get-setting('bebop-contextbar', 
                                                   'separator', 
-                                                  '-&gt;', 
-                                                  'separator')"/>
+                                                  ' -&gt; ', 
+                                                  ./@separator)"/>
 
-        <div class="bebop-context-bar">
+        <div class="bebop-contextbar">
             <xsl:apply-templates>
                 <xsl:with-param name="separator">
                     <xsl:value-of select="$separator"/>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/link.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/link.xsl
index 654e5619d..54db60d8c 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/link.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/link.xsl
@@ -76,7 +76,8 @@
         <!-- EN A link with confirmation -->
         <xsl:variable name="confirm">
             <xsl:if test="boolean(@confirm)=true() or starts-with(@onclick, 'return')">
-                <xsl:value-of select="replace(./@onclick, '\', '')"/>
+                <!-- We have to replace escaped quotes with the correct ones -->
+                <xsl:value-of select="replace(./@onclick, '&#x005C;\&apos;, '')"/>
             </xsl:if>
         </xsl:variable>
     
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/search.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/search.xsl
new file mode 100644
index 000000000..4d5f90064
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/search.xsl
@@ -0,0 +1,35 @@
+<?xml version="1.0"  encoding="utf-8"?>
+<!DOCTYPE stylesheet>
+<!--
+    Copyright 2014 Jens Pelzetter for the LibreCCM Foundation
+    
+    This file is part of the Foundry Theme Engine for LibreCCM
+    
+    Foundry is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Foundry is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Foundry  If not, see <http://www.gnu.org/licenses/>.
+
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                exclude-result-prefixes="xsl"
+                version="2.0">
+
+    <xsl:import href="search/filterControls.xsl"/>
+    <xsl:import href="search/searchDocuments.xsl"/>
+    <xsl:import href="search/searchFilter.xsl"/>
+    <xsl:import href="search/searchObject.xsl"/>
+    <xsl:import href="search/searchPartyText.xsl"/>
+    <xsl:import href="search/searchQuery.xsl"/>
+    <xsl:import href="search/searchResults.xsl"/>
+    <xsl:import href="search/searchTerms.xsl"/>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/filterControls.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/filterControls.xsl
new file mode 100644
index 000000000..758475455
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/filterControls.xsl
@@ -0,0 +1,429 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'> <!ENTITY Cross '&#10799;'>]>
+
+<!-- 
+    Copyright: 2014 Jens Pelzetter
+  
+    This file is part of Foundry.
+
+    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/>.
+-->
+
+<!-- This file was copied from Mandalay and edited to work with Foundry. -->
+
+<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:foundry="http://foundry.libreccm.org"
+    xmlns:nav="http://ccm.redhat.com/navigation"
+    exclude-result-prefixes="xsl bebop cms foundry nav"
+    version="2.0">
+
+    <xsl:template match="filterControls"
+                  name="foundry:filter-controls">
+        <form action=".">
+            <xsl:attribute name="accept-charset">UTF-8</xsl:attribute>
+            <xsl:if test="string-length(./@show) &gt; 0">
+                <input type="hidden" name="show">	    
+                    <xsl:attribute name="value">
+                        <xsl:value-of select="./@show"/>
+                    </xsl:attribute>
+                </input>
+            </xsl:if>
+            <xsl:choose>
+                <xsl:when test="string-length=(./@customName) &gt; 0">
+                    <xsl:attribute name="class" 
+                                   select="concat('filter-controls ', 
+                                                  ./@customName, 
+                                                  'FilterControls')"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:attribute name="class" select="'filter-controls'"/>
+                </xsl:otherwise>
+            </xsl:choose>
+            <xsl:variable name="sort-and-filter-list-text" 
+                          select="foundry:get-static-text('filter-controls', 
+                                                          concat(./@customName, 'sortAndFilterList')"/>
+            <xsl:choose>
+                <xsl:when test="string-length($sort-and-filter-list-text) > 0">
+                    <fieldset>
+                        <legend>
+                            <xsl:value-of select="$sort-and-filter-list-text"/>
+                        </legend>
+                        <xsl:call-template name="filterControlsFiltersBody"/>
+                        <xsl:call-template name="filterControlsSortFieldsBody"/>
+                    </fieldset>
+                </xsl:when>
+                <xsl:otherwise>
+                    <div>
+                        <xsl:call-template name="filterControlsFiltersBody"/>
+                        <xsl:call-template name="filterControlsSortFieldsBody"/>
+                    </div>
+                </xsl:otherwise>
+            </xsl:choose>
+        </form>
+    </xsl:template>
+
+    <xsl:template match="filterControls/filters"
+                  name="filterControlsFiltersBody">    
+        <fieldset>
+            <legend>
+                <xsl:value-of select="foundry:get-static-text('filterControls',
+                                                              concat(./@customName, 'filterList'))"/>
+            </legend>
+            <xsl:call-template name="filterControlsFilters"/>
+            <input type="submit" class="submit">
+                <xsl:attribute name="value" 
+                               select="foundry:get-static-text('filter-controls', 
+                                                               concat(./@customName, 'SubmitFilters'))"/>
+            </input>
+        </fieldset>
+    </xsl:template>
+
+
+    <xsl:template match="filterControls/sortFields"
+                  name="filterControlsSortFieldsBody">
+        <xsl:if test="count(./sortFields/sortField) &gt; 1">
+            <fieldset>
+                <legend>
+                    <xsl:value-of select="foundry:get-static-text('filter-controls', 
+                                                                  concat(./@customName, 'sortList')"/>
+                </legend>
+                <xsl:call-template name="filterControlsSortFields"/>
+                <input type="submit" class="submit">
+                    <xsl:attribute name="value" 
+                                   select="foundry:get-static-text('filter-controls',
+                                                                   concat(./@customName, 'SortList'))"/>
+                </input>
+            </fieldset>
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template name="filterControlsFilters">
+        <!--<code>Current node: <xsl:value-of select="name()"/></code>-->
+        <xsl:for-each select="./filters/filter">
+            <!--<code><xsl:value-of select="name()"/></code>
+            <p><code><xsl:value-of select="./@type"/></code></p>-->
+            <xsl:choose>
+                <xsl:when test="./@type='text'">
+                    <span>
+                        <xsl:attribute name="class">
+                            <xsl:value-of select="'textFilter'"/>
+                        </xsl:attribute>
+                        <xsl:attribute name="id">
+                            <xsl:value-of select="concat(../../@customName, ./@label, 'Filter')"/>
+                        </xsl:attribute>
+                        <label>
+                            <xsl:attribute name="for">
+                                <xsl:value-of select="concat(./@label, 'Filter')"/>
+                            </xsl:attribute>
+                            <xsl:value-of select="foundry:get-static-text('filter-controls',
+                                                                          concat(../../@customName, ./@label))"/>
+                        </label>
+                        <xsl:element name="input">
+                            <xsl:attribute name="type">text</xsl:attribute>
+                            <xsl:attribute name="size">20</xsl:attribute>
+                            <xsl:attribute name="maxlength">512</xsl:attribute>
+                            <xsl:attribute name="id">
+                                <xsl:value-of select="concat(./@label, 'Filter')"/>
+                            </xsl:attribute>
+                            <xsl:attribute name="name">
+                                <xsl:value-of select="./@label"/>
+                            </xsl:attribute>
+                            <xsl:attribute name="value">
+                                <xsl:value-of select="./@value"/>
+                            </xsl:attribute>
+                        </xsl:element>
+                    </span>
+                </xsl:when>
+                <xsl:when test="(./@type='select') or (./@type='compare')">
+                    <span>
+                        <xsl:attribute name="class">
+                            <xsl:value-of select="'selectFilter'"/>
+                        </xsl:attribute>
+                        <xsl:attribute name="id">
+                            <xsl:value-of select="concat(../../@customName, ./@label, 'Filter')"/>
+                        </xsl:attribute>
+                        <label>
+                            <xsl:attribute name="for">
+                                <xsl:value-of select="concat(./@label, 'Filter')"/>
+                            </xsl:attribute>
+                            <xsl:value-of select="foundry:get-static-text('filter-controls',
+                                                                          concat(../../@customName, ./@label))"/>
+                        </label>
+                        <xsl:element name="select">
+                            <xsl:attribute name="size">1</xsl:attribute>
+                            <xsl:attribute name="id">
+                                <xsl:value-of select="concat(./@label, 'Filter')"/>
+                            </xsl:attribute>
+                            <xsl:attribute name="name">
+                                <xsl:value-of select="./@label"/>
+                            </xsl:attribute>
+                            <xsl:for-each select="./option">
+                                <xsl:element name="option">
+                                    <xsl:attribute name="value">
+                                        <xsl:value-of select="./@label"/>
+                                    </xsl:attribute>
+                                    <xsl:if test="./@label = ../@selected">
+                                        <xsl:attribute name="selected">selected</xsl:attribute>
+                                    </xsl:if>
+                                    <xsl:choose>
+                                        <xsl:when test="./@label='--ALL--'">
+                                            <xsl:value-of select="foundry:get-static-text('filter-controls',
+                                                                                          concat(../../../@customName, ../@label, 'All'))"/>
+                                        </xsl:when>
+                                        <xsl:otherwise>
+                                            <xsl:choose>
+                                                <xsl:when test="(../@type='compare') or (./@valueType = 'text')">
+                                                    <xsl:value-of select="foundry:get-static-text('filter-controls',
+                                                                                          concat(../../../@customName, ../@label, ./@label))"/>
+                                                </xsl:when>
+                                                <xsl:otherwise>
+                                                    <xsl:value-of select="./@label"/>
+                                                </xsl:otherwise>
+                                            </xsl:choose>
+                                        </xsl:otherwise>
+                                    </xsl:choose>
+                                </xsl:element>
+                            </xsl:for-each>
+                        </xsl:element>
+                    </span>
+                </xsl:when>
+                <xsl:when test="(./@type='categoryFilter')">
+                    <xsl:variable name="filterId">
+                        <xsl:value-of select="concat(../../@customName, ./@label, 'Filter')"/>
+                    </xsl:variable>
+                    <span>
+                        <xsl:attribute name="class">
+                            <xsl:value-of select="'categoryFilter'"/>
+                        </xsl:attribute>
+                        <xsl:attribute name="id">
+                            <xsl:value-of select="$filterId"/>
+                        </xsl:attribute>
+                        <script type="text/javascript">
+                            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" + selectedCategoryId);
+                            elem.append(selectedCategory);
+                            var closeElem = $(document.createElement('a'));
+                            closeElem.attr("href", "#");
+                            closeElem.append("&Cross;");
+                            closeElem.click(function() {
+                            removeSelectedCategory(elem, catFilterId, selectedCategoryId);
+                            });
+                            elem.append(closeElem);
+                                
+                            $("#" + catFilterId + " span.selectedCategories").append(elem);
+                                
+                            var newVal = $("#" + catFilterId + " input.selectedCategories").val() + selectedCategoryId + ";";
+                            $("#" + catFilterId + " input.selectedCategories").val(newVal);
+                            }
+                            
+                            function removeSelectedCategory(elem, catFilterId, category) {
+                            //alert("close\ncatFilterId = " + catFilterId);
+                                
+                            //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);
+                                
+                            elem.remove();
+                            return false;
+                            }
+                        </script>
+                        <label>
+                            <xsl:attribute name="for">
+                                <xsl:value-of select="concat(./@label, 'Filter')"/>
+                            </xsl:attribute>
+                            <xsl:value-of select="foundry:get-static-text('filter-controls',
+                                                                          concat(../../@customName, ./@label))"/>
+                        </label>
+                        <xsl:choose>
+                            <xsl:when test="./multiple = 'true'">
+                                <xsl:element name="input">
+                                    <xsl:attribute name="type">text</xsl:attribute>
+                                    <xsl:attribute name="size">42</xsl:attribute>
+                                    <xsl:attribute name="class">selectedCategories</xsl:attribute>
+                                    <xsl:attribute name="maxlength">1024</xsl:attribute>
+                                    <xsl:attribute name="id">
+                                        <xsl:value-of select="concat(./@label, 'Filter')"/>
+                                    </xsl:attribute>
+                                    <xsl:attribute name="name">
+                                        <xsl:value-of select="./@label"/>
+                                    </xsl:attribute>
+                                    <xsl:attribute name="value">
+                                        <xsl:value-of select="./searchString"/>
+                                    </xsl:attribute>
+                                    <xsl:attribute name="style">
+                                        <xsl:value-of select="'display:none'"/>
+                                    </xsl:attribute>
+                                </xsl:element>
+                                <span class="selectedCategories">
+                                    <xsl:attribute name="id">
+                                        <xsl:value-of select="concat(./@label, 'SelectedKeywords')"/>
+                                    </xsl:attribute>
+                                    <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($filterId, 'Selected', @id)"/>
+                                            </xsl:attribute>
+                                            <xsl:value-of select="."/>
+                                            <a>
+                                                <xsl:attribute name="href">
+                                                    <xsl:value-of select="'#'"/>
+                                                </xsl:attribute>
+                                                <xsl:text>&Cross;</xsl:text>
+                                            </a>
+                                            <script type="text/javascript">
+                                                $("#<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>
+                                        </span>
+                                    </xsl:for-each>
+                                </span>
+                                <select size="1" class="availableCategories">
+                                    <xsl:attribute name="id">
+                                        <xsl:value-of select="concat(./@label, 'AvailableCategories')"/>
+                                    </xsl:attribute>
+                                    <option value=""></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="$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, selectedCategoryId);
+                                        
+                                    $("#<xsl:value-of select="concat(./@label, 'AvailableCategories')"/>").val("");
+                                    });
+                                    
+                                </script>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <select size="1">
+                                    <xsl:attribute name="id">
+                                        <xsl:value-of select="concat(./@label, 'Filter')"/>
+                                    </xsl:attribute>
+                                    <xsl:attribute name="name">
+                                        <xsl:value-of select="./@label"/>
+                                    </xsl:attribute>
+                                    <option value="">
+                                        <xsl:value-of select="foundry:get-static-text('filter-controls',
+                                                                                       concat(../../@customName,./@label,'All'))"/>
+                                    </option>
+                                    <xsl:for-each select="./categories/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>
+                                </select>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                        
+                    </span>
+                </xsl:when>
+            </xsl:choose>
+        </xsl:for-each>
+    </xsl:template>
+
+    
+
+    <xsl:template name="filterControlsSortFields">
+        <!-- <xsl:if test="count(./controls/sortFields/sortField) &gt; 1">-->
+        <!--   <code>sortFields</code>-->
+        <span>
+            <label>	
+                <xsl:attribute name="for">
+                    <xsl:value-of select="concat(../../@customName, 'SortBy')"/>
+                </xsl:attribute>
+                <xsl:value-of select="foundry:get-static-text('filter-controls',
+                                                               concat(./@customName, 'SortBy'))"/>
+            </label>
+            <select>
+                <xsl:attribute name="size">1</xsl:attribute>
+                <xsl:attribute name="id">
+                    <xsl:value-of select="concat(../../@customName, 'SortBy')"/>
+                </xsl:attribute>
+                <xsl:attribute name="name">sort</xsl:attribute>	     
+                <xsl:for-each select="./sortFields">
+                    <xsl:for-each select="./sortField">
+                        <xsl:element name="option">
+                            <xsl:attribute name="value">
+                                <xsl:value-of select="./@label"/>
+                            </xsl:attribute>
+                            <xsl:if test="./@label = ../@sortBy">
+                                <xsl:attribute name="selected">selected</xsl:attribute>
+                            </xsl:if>
+                            <xsl:value-of select="foundry:get-static-text('filter-controls',
+                                                                          concat(../../@customName, 'SortBy', ./@label))"/>
+                        </xsl:element>
+                    </xsl:for-each>
+                </xsl:for-each>
+            </select>
+        </span>
+        <!-- </xsl:if> -->
+    </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchDocuments.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchDocuments.xsl
new file mode 100644
index 000000000..7d9dd0015
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchDocuments.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/>.
+-->
+
+<!-- This file was copied from Mandalay and edited to work with Foundry. -->
+
+<!-- EN
+  Processing search results
+-->
+
+<!-- Autor: Sören Bernstein -->
+
+<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:foundry="http://foundry.libreccm.org" 
+                xmlns:nav="http://ccm.redhat.com/navigation" 
+                xmlns:search="http://rhea.redhat.com/search/1.0"
+                exclude-result-prefixes="xsl bebop cms foundry nav" 
+                version="2.0">
+  
+    <!-- DE Suchergebisse für die Webseiten werden als UL dargestellt -->
+    <!-- EN Search result for webpages are translated to a ul -->
+    <xsl:template match="search:documents">
+        <xsl:param name="layout-tree" select="."/>
+    
+        <ul>
+            <xsl:apply-templates>
+                <xsl:with-param name="layout-tree" select="$layout-tree"/>
+            </xsl:apply-templates>
+        </ul>
+    </xsl:template>
+  
+    <!-- DE Zeige das Suchergebis für die Admin-Oberfläche an -->
+    <!-- EN Show search result for the admin pages -->
+    <xsl:template match="search:documents" mode="admin">
+        <xsl:param name="layout-tree" select="."/>
+    
+        <!-- DE Hole alle benötigten Einstellungen-->
+        <!-- EN Getting all needed setting-->
+        <xsl:variable name="show-summary" 
+                      select="foundry:get-setting('search', 
+                                                  'show-summary', 
+                                                  'true', $layout-tree/show-summary)"/>
+        <xsl:variable name="admin-result-mode" 
+                  select="foundry:get-setting('search', 
+                                              'admin-result-mode', 
+                                              'table', 
+                                              $layout-tree/admin-result-mode)"/>
+    
+        <xsl:choose>
+            <xsl:when test="$admin-result-mode = 'table'">
+                <!-- DE Erzeuge Tabellenkopf für die Suchergebnisse -->
+                <!-- EN Create table header for search results -->
+                <table id="result-list">
+                    <tr class="result-list-header">
+                        <th>
+                            <xsl:call-template name="mandalay:getStaticText">
+                                <xsl:with-param name="module" select="'search'"/>
+                                <xsl:with-param name="id" select="'listheader/score'"/>
+                            </xsl:call-template>
+                        </th>
+                        <th>
+                            <xsl:call-template name="mandalay:getStaticText">
+                                <xsl:with-param name="module" select="'search'"/>
+                                <xsl:with-param name="id" select="'listheader/title'"/>
+                            </xsl:call-template>
+                        </th>
+                        <xsl:if test="$show-summary = 'true'">
+                            <th class="summary">
+                                <xsl:call-template name="mandalay:getStaticText">
+                                    <xsl:with-param name="module" select="'search'"/>
+                                    <xsl:with-param name="id" select="'listheader/summary'"/>
+                                </xsl:call-template>
+                            </th>
+                        </xsl:if>
+                        <th 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>
+                        </th>
+                    </tr>
+                    <xsl:apply-templates mode="admin"/>
+                </table>
+
+                <!-- Alternative Version ohne Tabellen. Funktioniert noch nicht
+                        <div class="result-list-header">
+                          <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:when>
+            <xsl:when test="$admin-result-mode = 'list'">
+                <div id="result-list">
+                    <div class="result-list-header">
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'search'"/>
+                            <xsl:with-param name="id" select="'resultlist/header'"/>
+                        </xsl:call-template>
+                    </div>
+                    <ul>
+                        <xsl:apply-templates mode="admin"/>
+                    </ul>
+                </div>
+            </xsl:when>
+        </xsl:choose>
+    </xsl:template>
+  
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchFilter.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchFilter.xsl
new file mode 100644
index 000000000..358a98def
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchFilter.xsl
@@ -0,0 +1,637 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'>]>
+
+<!-- 
+    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/>.
+-->
+
+<!-- DE
+  Hier werden die Suchfilter verarbeitet 
+-->
+
+<!-- EN
+  Processing search filter
+-->
+
+<!-- Autor: Sören Bernstein -->
+
+<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:nav="http://ccm.redhat.com/navigation" 
+  xmlns:search="http://rhea.redhat.com/search/1.0"
+  xmlns:mandalay="http://mandalay.quasiweb.de"
+  exclude-result-prefixes="xsl bebop cms nav mandalay" 
+  version="1.0">
+  
+  <!-- DE Suchfilter für Content Typ -->
+  <!-- EN Search filter for content type -->
+  <xsl:template match="search:filter[@type='contentType']">
+    <xsl:param name="layoutTree" select="."/>
+    
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setContentType">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setContentType"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'filter/setContentType'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    
+    <xsl:if test="$setContentType = 'true'">
+      <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:if>
+  </xsl:template>
+  
+  <!-- DE Suchfilter für Object Typ -->
+  <!-- EN Search filter for object type -->
+  <xsl:template match="search:filter[@type='objectType']">
+    <xsl:param name="layoutTree" select="."/>
+    
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setObjectType">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setObjectType"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'filter/setObjectType'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    
+    <xsl:if test="$setObjectType = 'true'">
+      <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:if>
+  </xsl:template>
+  
+  <!-- DE Suchfilter für Host -->
+  <!-- EN Search filter for host -->
+  <xsl:template match="search:filter[@type='host']">
+    <xsl:param name="layoutTree" select="."/>
+    
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setHost">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setHost"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'filter/setHost'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    
+    <xsl:if test="$setHost = 'true'">
+      <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:if>
+  </xsl:template>
+  
+  <!-- DE Suchfilter für Kategorie -->
+  <!-- EN Search filter for category -->
+  <xsl:template match="search:filter[@type='category']">
+    <xsl:param name="layoutTree" select="."/>
+    
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setCategory">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setCategory"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'filter/setCategory'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    
+    <xsl:if test="$setCategory = 'true'">
+      <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:if>
+  </xsl:template>
+  
+  <!-- DE Suchfilter für Autor -->
+  <!-- EN Search filter for author -->
+  <xsl:template match="search:filter[@type='creationUser']">
+    <xsl:param name="layoutTree" select="."/>
+    
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setCreationUser">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setCreationUser"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'filter/setCreationUser'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    
+    <xsl:if test="$setCreationUser = 'true'">
+      <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:if>
+  </xsl:template>
+  
+  <!-- DE Suchfilter für letzten Editor -->
+  <!-- EN Search filter for last dditor -->
+  <xsl:template match="search:filter[@type='lastModifiedUser']">
+    <xsl:param name="layoutTree" select="."/>
+    
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setLastModifiedUser">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setLastModifiedUser"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'filter/setLastModifiedUser'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    
+    <xsl:if test="$setLastModifiedUser = 'true'">
+      <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:if>
+  </xsl:template>
+  
+  <!-- DE Suchfilter für Veröffentlichungsdatum -->
+  <!-- EN Search filter for lauch date -->
+  <xsl:template match="search:filter[@type='launchDate']">
+    <xsl:param name="layoutTree" select="."/>
+    
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setLaunchDate">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setLaunchDate"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'filter/setLaunchDate'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    
+    <xsl:if test="$setLaunchDate">
+      <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:if>
+  </xsl:template>
+  
+  <!-- DE Suchfilter für Datum der letzten Änderung -->
+  <!-- EN Search filter for last modified date -->
+  <xsl:template match="search:filter[@type='lastModifiedDate']">
+    <xsl:param name="layoutTree" select="."/>
+    
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setLastModifiedDate">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setLastModifiedDate"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'filter/setLastModifiedDate'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    
+    <xsl:if test="$setLastModifiedDate = 'true'">
+      <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:if>
+  </xsl:template>
+  
+  <!-- DE Suchfilter für Erzeugungsdatum -->
+  <!-- EN Search filter for creation date -->
+  <xsl:template match="search:filter[@type='creationDate']">
+    <xsl:param name="layoutTree" select="."/>
+    
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setCreationDate">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setCreationDate"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'filter/setCreationDate'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    
+    <xsl:if test="$setCreationDate = 'true'">
+      <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:if>
+  </xsl:template>
+  
+  <!-- DE Erzeuge Eingabefelder für ein Zeitraum-Filter -->
+  <!-- EN Create widgets for a date range filter -->
+  <xsl:template name="search:dateRangeFilter">
+    <xsl:param name="filterName"/>
+    <div class="filter">
+      <span class="filterName">
+        <xsl:value-of select="$filterName"/>
+      </span>
+      <span class="filterParam">
+        <xsl:choose>
+          <xsl:when test="@format">
+            <xsl:call-template name="search:newStyleDateRangeFilter"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="search:oldStyleDateRangeFilter"/>
+          </xsl:otherwise>
+        </xsl:choose>
+        
+        
+      </span>
+    </div>
+  </xsl:template>
+
+  <xsl:template name="search:newStyleDateRangeFilter">  
+    <xsl:variable name="fragment1">
+      <xsl:value-of select="substring-before(@format, ' ')"/>
+    </xsl:variable>
+    <xsl:variable name="fragment2">
+      <xsl:value-of select="substring-before(substring-after(@format, concat($fragment1, ' ')), ' ')"/>
+    </xsl:variable>
+    <xsl:variable name="fragment3">
+      <xsl:value-of select="substring-after(@format, concat($fragment1, ' ', $fragment2, ' '))"/>
+    </xsl:variable>
+    <table>
+      <tr>
+        <td/>
+        <th>
+          <xsl:call-template name="mandalay:getStaticText">
+            <xsl:with-param name="module" select="'search'"/>
+            <xsl:with-param name="id" select="concat('searchfilter/dateRange/', $fragment1)"/>
+          </xsl:call-template>
+        </th>
+        <th>
+          <xsl:call-template name="mandalay:getStaticText">
+            <xsl:with-param name="module" select="'search'"/>
+            <xsl:with-param name="id" select="concat('searchfilter/dateRange/', $fragment2)"/>
+          </xsl:call-template>
+        </th>
+        <th>
+          <xsl:call-template name="mandalay:getStaticText">
+            <xsl:with-param name="module" select="'search'"/>
+            <xsl:with-param name="id" select="concat('searchfilter/dateRange/', $fragment3)"/>
+          </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>
+        <xsl:call-template name="search:dateRangeFragment">
+          <xsl:with-param name="fragment" select="$fragment1"/>
+          <xsl:with-param name="mode" select="'start'"/>
+        </xsl:call-template>
+        <xsl:call-template name="search:dateRangeFragment">
+          <xsl:with-param name="fragment" select="$fragment2"/>
+          <xsl:with-param name="mode" select="'start'"/>
+        </xsl:call-template>
+        <xsl:call-template name="search:dateRangeFragment">
+          <xsl:with-param name="fragment" select="$fragment3"/>
+          <xsl:with-param name="mode" select="'start'"/>
+        </xsl:call-template>
+      </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>
+        <xsl:call-template name="search:dateRangeFragment">
+          <xsl:with-param name="fragment" select="$fragment1"/>
+          <xsl:with-param name="mode" select="'end'"/>
+        </xsl:call-template>
+        <xsl:call-template name="search:dateRangeFragment">
+          <xsl:with-param name="fragment" select="$fragment2"/>
+          <xsl:with-param name="mode" select="'end'"/>
+        </xsl:call-template>
+        <xsl:call-template name="search:dateRangeFragment">
+          <xsl:with-param name="fragment" select="$fragment3"/>
+          <xsl:with-param name="mode" select="'end'"/>
+        </xsl:call-template>
+      </tr>
+    </table>
+  </xsl:template>
+  
+  <xsl:template name="search:dateRangeFragment">
+    <xsl:param name="fragment" select="''"/>
+    <xsl:param name="mode" select="''"/>
+    
+    <xsl:choose>
+      
+      <xsl:when test="$fragment = 'day'">
+        <td>
+          <input size="2" type="text" name="{@param}.start.day">
+            <xsl:choose>
+              <xsl:when test="$mode = 'start' and search:day/@startDay">
+                <xsl:attribute name="value">
+                  <xsl:value-of select="@search:day/@startDay"/>
+                </xsl:attribute>
+              </xsl:when>
+              <xsl:when test="$mode = 'end' and search:day/@endDay">
+                <xsl:attribute name="value">
+                  <xsl:value-of select="@search:day/@endDay"/>
+                </xsl:attribute>
+              </xsl:when>
+              <xsl:otherwise/>
+            </xsl:choose>
+          </input>
+        </td>
+      </xsl:when>
+      
+      <xsl:when test="$fragment = 'month'">
+        <td>
+          <select name="{@param}.start.month">
+            <xsl:for-each select="search:month">
+              <option value="{@value}">
+                <xsl:choose>
+                  <xsl:when test="$mode = 'start' and @startMonth">
+                    <xsl:attribute name="selected">selected</xsl:attribute>
+                  </xsl:when>
+                  <xsl:when test="$mode = 'end' and @endMonth">
+                    <xsl:attribute name="selected">selected</xsl:attribute>
+                  </xsl:when>
+                  <xsl:otherwise/>
+                </xsl:choose>
+                <xsl:value-of select="@title"/>
+              </option>
+            </xsl:for-each>
+          </select>
+        </td>
+      </xsl:when>
+
+      <xsl:when test="$fragment = 'year'">
+        <td>
+          <select name="{@param}.start.year">
+            <xsl:for-each select="search:year">
+              <option value="{@value}">
+                <xsl:choose>
+                  <xsl:when test="$mode = 'start' and @startYear">
+                    <xsl:attribute name="selected">selected</xsl:attribute>
+                  </xsl:when>
+                  <xsl:when test="$mode = 'end' and @endYear">
+                    <xsl:attribute name="selected">selected</xsl:attribute>
+                  </xsl:when>
+                  <xsl:otherwise/>
+                </xsl:choose>
+                <xsl:value-of select="@title"/>
+              </option>
+            </xsl:for-each>
+          </select>
+        </td>
+      </xsl:when>
+      <xsl:otherwise/>
+    </xsl:choose>
+
+  </xsl:template>
+  
+  <xsl:template name="search:oldStyleDateRangeFilter">
+    <table>
+      <tr>
+        <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>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchObject.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchObject.xsl
new file mode 100644
index 000000000..b32d081e9
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchObject.xsl
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'>]>
+
+<!-- 
+    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/>.
+-->
+
+<!-- DE
+  Hier werden die  verarbeitet 
+-->
+
+<!-- EN
+  Processing 
+-->
+
+<!-- Autor: Sören Bernstein -->
+
+<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:nav="http://ccm.redhat.com/navigation" 
+  xmlns:search="http://rhea.redhat.com/search/1.0"
+  xmlns:mandalay="http://mandalay.quasiweb.de"
+  exclude-result-prefixes="xsl bebop cms nav mandalay" 
+  version="1.0">
+  
+  <!-- DE Zeige die Suchergebnisse an -->
+  <!-- EN Show the search results -->
+  <xsl:template match="search:object">
+    <xsl:param name="layoutTree" select="."/>
+    
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setScore">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setScore"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'setScore'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setGraphicScore">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setGraphicScore"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'setGraphicScore'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setGraphicScoreWidth">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setGraphicScoreWidth"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'setGraphicScoreWidth'"/>
+        <xsl:with-param name="default" select="'50'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setGraphicScoreHeight">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setGraphicScoreHeight"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'setGraphicScoreHeight'"/>
+        <xsl:with-param name="default" select="'10'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setGraphicScoreEmptyImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="setGraphicScoreEmptyImage"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'setGraphicScoreEmptyImage'"/>
+        <xsl:with-param name="default" select="'images/search/scoreEmpty.gif'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setGraphicScoreFullImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setGraphicScoreFullImage"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'setGraphicScoreFullImage'"/>
+        <xsl:with-param name="default" select="'images/search/scoreFull.gif'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setSummary">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setSummary"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'setSummary'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    
+    <li>
+      <span class="re">
+        <xsl:if test="$setScore = 'true'">
+          <div class="score">
+            <xsl:choose>
+              <xsl:when test="$setGraphicScore = 'true'">
+                <xsl:attribute name="style">
+                  <xsl:text>background-image: url(</xsl:text>
+                  <xsl:call-template name="mandalay:linkParser">
+                    <xsl:with-param name="link" select="$setGraphicScoreEmptyImage"/>
+                    <xsl:with-param name="prefix" select="$theme-prefix"/>
+                  </xsl:call-template>
+                  <xsl:text>); background-repeat: no-repeat; width: </xsl:text>
+                  <xsl:value-of select="$setGraphicScoreWidth"/>
+                  <xsl:text>px;</xsl:text>
+                </xsl:attribute>
+                <div class="imgFull">
+                  <xsl:attribute name="style">font-size: 0px; overflow: hidden; width: <xsl:value-of select="@score"/>%; height: <xsl:value-of select="$setGraphicScoreHeight"/>px;</xsl:attribute>
+                  <img>
+                    <xsl:attribute name="src">
+                      <xsl:call-template name="mandalay:linkParser">
+                        <xsl:with-param name="link" select="$setGraphicScoreFullImage"/>
+                        <xsl:with-param name="prefix" select="$theme-prefix"/>
+                      </xsl:call-template>
+                    </xsl:attribute>
+                    <xsl:attribute name="alt"><xsl:value-of select="@score"/>%</xsl:attribute>
+                    <xsl:attribute name="title"><xsl:value-of select="@score"/>%</xsl:attribute>
+                  </img>
+                </div>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:value-of select="@score"/>%&nbsp;
+              </xsl:otherwise>
+            </xsl:choose>
+          </div>
+        </xsl:if>
+        <span>
+          <a href="{@url}"><xsl:value-of select="@title"/></a>
+        </span>
+      </span>
+      <xsl:if test="$setSummary = 'true'">
+        <br />
+        <span class="summary">
+          <xsl:value-of select="@summary" disable-output-escaping="yes"/>
+        </span>
+      </xsl:if>
+    </li>
+  </xsl:template>
+  
+  <!-- DE Zeige die Suchergebnisse in der Admin-Oberfläche an. Die braucht noch Tabellen,
+          daher eine gesonderte Behandlung. -->
+  <!-- EN Show search results for admin pages. These a still using tables, so there is a
+          special processing for the results. -->
+  <xsl:template match="search:object" mode="admin">
+    <xsl:param name="layoutTree" select="."/>
+    
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setScore">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setScore"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'setScore'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setGraphicScore">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setGraphicScore"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'setGraphicScore'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setGraphicScoreWidth">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setGraphicScoreWidth"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'setGraphicScoreWidth'"/>
+        <xsl:with-param name="default" select="'50'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setGraphicScoreHeight">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setGraphicScoreHeight"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'setGraphicScoreheight'"/>
+        <xsl:with-param name="default" select="'10'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setGraphicScoreEmptyImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setGraphicScoreEmptyImage"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'setGraphicScoreEmptyImage'"/>
+        <xsl:with-param name="default" select="'images/search/scoreEmpty.gif'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setGraphicScoreFullImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setGraphicScoreFullImage"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'setGraphicScoreFullImage'"/>
+        <xsl:with-param name="default" select="'images/search/scoreFull.gif'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setActionImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setActionImage"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'setActionImage'"/>
+        <xsl:with-param name="default" select="'images/search/action.png'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setSummary">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setSummary"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'setSummary'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+  
+    <div class="searchResults">
+      <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>
+      <xsl:if test="$setScore = 'true'">
+        <span class="score">
+          <xsl:choose>
+            <xsl:when test="$setGraphicScore = 'true'">
+              <div class="score">
+                <xsl:attribute name="style">
+                  <xsl:text>background-image: url(</xsl:text>
+                  <xsl:call-template name="mandalay:linkParser">
+                    <xsl:with-param name="link" select="$setGraphicScoreEmptyImage"/>
+                    <xsl:with-param name="prefix" select="$theme-prefix"/>
+                  </xsl:call-template>
+                  <xsl:text>); background-repeat: no-repeat; width: </xsl:text>
+                  <xsl:value-of select="$setGraphicScoreWidth"/>
+                  <xsl:text>px;</xsl:text>
+                </xsl:attribute>
+                <div class="imgFull">
+                  <xsl:attribute name="style">font-size: 0px; overflow: hidden; width: <xsl:value-of select="@score"/>%; height: <xsl:value-of select="$setGraphicScoreHeight"/>px;</xsl:attribute>
+                  <img>
+                    <xsl:attribute name="src">
+                      <xsl:call-template name="mandalay:linkParser">
+                        <xsl:with-param name="link" select="$setGraphicScoreFullImage"/>
+                        <xsl:with-param name="prefix" select="$theme-prefix"/>
+                      </xsl:call-template>
+                    </xsl:attribute>
+                    <xsl:attribute name="alt"><xsl:value-of select="@score"/>%</xsl:attribute>
+                    <xsl:attribute name="title"><xsl:value-of select="@score"/>%</xsl:attribute>
+                  </img>
+                </div>
+              </div>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="@score"/>%
+            </xsl:otherwise>
+          </xsl:choose>
+        </span>
+      </xsl:if>
+      <span>
+        <a href="{@url}&amp;context=draft">
+          <xsl:value-of select="concat(@title, ' (', @locale, ')')"/>
+        </a>
+      </span>
+      <xsl:if test="$setSummary = 'true'">
+        <span><em><xsl:value-of select="@summary"/></em></span>
+      </xsl:if>
+      <xsl:if test="@class='jsButton' or @class='radioButton'">
+        <span>
+          <xsl:value-of disable-output-escaping="yes" select="search:jsAction"/>
+          <a onClick="{search:jsAction/@name}" href="javascript:{search:jsAction/@name}">
+            <img>
+              <xsl:attribute name="src">
+                <xsl:call-template name="mandalay:linkParser">
+                  <xsl:with-param name="link" select="$setActionImage"/>
+                  <xsl:with-param name="prefix" select="$theme-prefix"/>
+                </xsl:call-template>
+              </xsl:attribute>
+              <xsl:attribute name="alt">
+                <xsl:call-template name="mandalay:getStaticText">
+                  <xsl:with-param name="module" select="'search'"/>
+                  <xsl:with-param name="id" select="'resultlist/select'"/>
+                </xsl:call-template>
+              </xsl:attribute>
+              <xsl:attribute name="title">
+                <xsl:call-template name="mandalay:getStaticText">
+                  <xsl:with-param name="module" select="'search'"/>
+                  <xsl:with-param name="id" select="'resultlist/select'"/>
+                </xsl:call-template>
+              </xsl:attribute>
+            </img>
+            <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>
+      </xsl:if>
+    </div>
+  </xsl:template>
+  
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchPartyText.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchPartyText.xsl
new file mode 100644
index 000000000..b17fa327d
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchPartyText.xsl
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'>]>
+
+<!-- 
+    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/>.
+-->
+
+<!-- DE
+  Hier wird die Anzeige der verwendeten Filter verarbeitet 
+-->
+
+<!-- EN
+  Processing search party text
+-->
+
+<!-- Autor: Sören Bernstein -->
+
+<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:nav="http://ccm.redhat.com/navigation" 
+  xmlns:search="http://rhea.redhat.com/search/1.0"
+  xmlns:mandalay="http://mandalay.quasiweb.de"
+  exclude-result-prefixes="xsl bebop cms nav mandalay" 
+  version="1.0">
+  
+  <!-- DE Zeige die gesetzten Filter an -->
+  <!-- EN Show all enabled filters -->
+  <xsl:template match="search:partyText">
+    <xsl:param name="filterName"/>
+    <xsl:param name="layoutTree" select="."/>
+    
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="showPartyText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/showPartyText"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'filter/showPartyText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    
+    <xsl:if test="$filterName = 'true'">
+      <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:if>
+  </xsl:template>
+  
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchQuery.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchQuery.xsl
new file mode 100644
index 000000000..c8b075c98
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchQuery.xsl
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'>]>
+
+<!-- 
+    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/>.
+-->
+
+<!-- DE
+  Hier werden die Suchanfragen verarbeitet 
+-->
+
+<!-- EN
+  Processing search queries
+-->
+
+<!-- Autor: Sören Bernstein -->
+
+<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:nav="http://ccm.redhat.com/navigation" 
+  xmlns:search="http://rhea.redhat.com/search/1.0"
+  xmlns:mandalay="http://mandalay.quasiweb.de"
+  exclude-result-prefixes="xsl bebop cms nav mandalay" 
+  version="1.0">
+  
+  <!-- DE Zeige das Suchformular für die Admin-Oberfläche an -->
+  <!-- EN Show the search queries for the admin pages -->
+  <xsl:template match="search:query">
+    <xsl:param name="layoutTree" select="."/>
+    
+    <xsl:variable name="setSearchFormInResultList">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setSearchFormInResultList"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'setSearchFormInResultList'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setAdditionFilter">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setAdditionFilter"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'setAdditionFilter'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    
+    <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 fieldset {display: table-row;}
+      #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;}
+-->
+      <xsl:choose>
+        <xsl:when test="'false'">
+        </xsl:when>
+        <xsl:otherwise>
+        </xsl:otherwise>
+      </xsl:choose>
+    </style>
+    <div id="search">
+      <!-- DE Nicht anzeigen, wenn bereits ein Suchergebnis vorliegt -->
+      <!-- EN Don't show, if there is already a search result -->
+      <xsl:if test="$setSearchFormInResultList = 'true' or not(../search:results)">
+        <xsl:apply-templates select="search:terms"/>
+      </xsl:if>
+      <xsl:if test="search:*[not(self::search:terms)] and $setAdditionFilter = 'true'">
+        <fieldset class="advancedSearch">
+          <legend onclick="javascript:parent.display('none');">
+            <xsl:call-template name="mandalay:getStaticText">
+              <xsl:with-param name="module" select="'search'"/>
+              <xsl:with-param name="id" select="'additionalFilters'"/>
+            </xsl:call-template>
+          </legend>
+          <xsl:apply-templates select="search:*[not(self::search:terms)]"/>
+        </fieldset>
+      </xsl:if>
+    </div>
+  </xsl:template>
+  
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchResults.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchResults.xsl
new file mode 100644
index 000000000..900a968f8
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchResults.xsl
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'>]>
+
+<!-- 
+    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/>.
+-->
+
+<!-- DE
+  Hier werden die Suchergebnisse verarbeitet 
+-->
+
+<!-- EN
+  Processing search results
+-->
+
+<!-- Autor: Sören Bernstein -->
+
+<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:nav="http://ccm.redhat.com/navigation" 
+  xmlns:search="http://rhea.redhat.com/search/1.0"
+  xmlns:mandalay="http://mandalay.quasiweb.de"
+  exclude-result-prefixes="xsl bebop cms nav mandalay" 
+  version="1.0">
+  
+  <!-- DE Zeigt das Ergebnis in der Admin-Oberfläche an -->
+  <!-- EN Show the result on admin pages -->
+  <xsl:template match="search:results">
+    <xsl:choose>
+      <xsl:when test="../search:query/bebop:formWidget[@name='draft_search']">
+        <xsl:apply-templates select="search:documents" mode="admin"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates select="search:documents | info"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  
+  <xsl:template match="info">
+    <div class="info">
+      <xsl:value-of select="."/>
+    </div>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchTerms.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchTerms.xsl
new file mode 100644
index 000000000..70fdb9450
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/search/searchTerms.xsl
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'>]>
+
+<!-- 
+    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/>.
+-->
+
+<!-- DE
+  Hier werden die Suchwörter verarbeitet 
+-->
+
+<!-- EN
+  Processing search terms
+-->
+
+<!-- Autor: Sören Bernstein -->
+
+<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:nav="http://ccm.redhat.com/navigation" 
+  xmlns:search="http://rhea.redhat.com/search/1.0"
+  xmlns:mandalay="http://mandalay.quasiweb.de"
+  exclude-result-prefixes="xsl bebop cms nav mandalay" 
+  version="1.0">
+  
+  <!-- DE Erzeuge das Eingabefeld für die Suchwörter -->
+  <!-- EN Create a widget for the search terms -->
+  <xsl:template match="search:terms">
+    <xsl:param name="layoutTree" select="."/>
+    
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setQueryPrefix">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="node"  select="$layoutTree/setQueryPrefix"/>
+        <xsl:with-param name="module"  select="'search'"/>
+        <xsl:with-param name="setting" select="'setQueryPrefix'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    
+    <xsl:if test="$setQueryPrefix = 'true'">
+      <span class="query">
+        <xsl:call-template name="mandalay:getStaticText">
+          <xsl:with-param name="module" select="'search'"/>
+          <xsl:with-param name="id" select="'query'"/>
+        </xsl:call-template>
+      </span>
+    </xsl:if>
+    <span class="terms">
+      <input size="30" type="text" name="{@param}" value="{@value}" title="Enter one or more search terms"/>
+      <xsl:apply-templates select="../bebop:formWidget"/>
+    </span>
+  </xsl:template>
+  
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags.xsl
index abfe67402..2e0063a88 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags.xsl
@@ -31,6 +31,7 @@
     <xsl:import href="template-tags/loaders.xsl"/>
     <xsl:import href="template-tags/navigation.xsl"/>
     <xsl:import href="template-tags/portal-workspace.xsl"/>
+    <xsl:import href="template-tags/portal-workspace-grid.xsl"/>
     <xsl:import href="template-tags/subsite.xsl"/>
     
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/portal-workspace-grid.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/portal-workspace-grid.xsl
new file mode 100644
index 000000000..d38e4e509
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/portal-workspace-grid.xsl
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'>]>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                xmlns:foundry="http://foundry.libreccm.org"
+                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+                xmlns:nav="http://ccm.redhat.com/navigation"
+                xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
+                xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
+                xmlns="http://www.w3.org/1999/xhtml"
+                exclude-result-prefixes="xsl xs bebop foundry nav portal portlet"
+                version="2.0">
+
+    <foundry:doc-file>
+        <foundry:doc-file-title>Tags for portal-workspace-grid</foundry:doc-file-title>
+        <foundry:doc-file-desc>
+            <p>ToDo</p>
+        </foundry:doc-file-desc>
+    </foundry:doc-file>
+    
+    <xsl:template match="portal-grid-workspace">
+        <!--<pre>grid-workspace</pre>-->
+        
+        <xsl:apply-templates>
+            <xsl:with-param name="use-default-styles" 
+                            tunnel="yes"
+                            select="foundry:boolean(./@use-default-styles)"/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
+    <xsl:template match="portal-grid-workspace//portal-grid-workspace-rows">
+        <!--<pre>grid-workspace-rows</pre>-->
+        
+        <xsl:apply-templates/>
+    </xsl:template>
+    
+    <xsl:template match="portal-grid-workspace//portal-grid-workspace-rows//portal-grid-workspace-row">
+        <xsl:param name="use-default-styles" 
+                   as="xs:boolean" 
+                   tunnel="yes" 
+                   select="true()"/>
+        
+        <xsl:variable name="class">
+            <xsl:choose>
+                <xsl:when test="./@class">
+                    <xsl:value-of select="./@class"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="''"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        
+        <xsl:variable name="row-layout-tree"> 
+            <xsl:copy-of select="./*"/>
+        </xsl:variable>
+        
+        <xsl:for-each select="$data-tree/portal:gridWorkspace/portal:rows/portal:row">
+            <!--<pre>grid-workspace-row</pre>-->
+            <!--<pre><xsl:value-of select="concat('layout = ', ./@layout)"/></pre>-->
+            <div>
+                <xsl:if test="$use-default-styles">
+                    <!-- Nothing at the moment -->
+                </xsl:if>
+                <xsl:if test="$class != ''">
+                    <xsl:attribute name="class" select="$class"/>
+                </xsl:if>
+                
+                <xsl:apply-templates select="$row-layout-tree/*">
+                    <xsl:with-param name="row-data-tree" tunnel="yes" select="current()"/>
+                </xsl:apply-templates>
+            </div>
+        </xsl:for-each>
+    </xsl:template>
+    
+    <xsl:template match="portal-grid-workspace-columns">
+        <!--<pre>grid-workspace-row-columns</pre>-->
+        <xsl:apply-templates/>
+    </xsl:template>
+    
+    <xsl:template match="portal-grid-workspace-columns//portal-grid-workspace-column">
+        <xsl:param name="use-default-styles"
+                   as="xs:boolean"
+                   tunnel="yes"
+                   select="true()"/>
+        <xsl:param name="row-data-tree" tunnel="yes"/>
+        
+        <xsl:variable name="class">
+            <xsl:choose>
+                <xsl:when test="./@class">
+                    <xsl:value-of select="./@class"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="''"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        
+        <xsl:variable name="column-layout-tree" select="./*"/>
+        
+        <!--<pre>
+            <xsl:value-of select="concat('count(row-data-tree/*) = ', count($row-data-tree/*))"/>
+        </pre>
+        <pre>
+            <xsl:value-of select="count($row-data-tree/portal:portlets)"/>
+        </pre>
+        <pre>
+            <xsl:value-of select="concat('cols = ', $row-data-tree/@layout)"/>
+        </pre>-->
+        
+        <xsl:for-each select="tokenize($row-data-tree/@layout, ',')">
+            <!--<pre>grid-workspace-row-column</pre>-->
+            <div>
+                <xsl:if test="$use-default-styles">
+                    <xsl:attribute name="style" 
+                                   select="concat('float:left; width = ', current(), ';')"/>
+                </xsl:if>
+                <xsl:if test="$class != ''">
+                    <xsl:attribute name="class" select="$class"/>
+                </xsl:if>
+                    
+                <xsl:variable name="col-number" select="position()"/>
+                    
+                <xsl:apply-templates select="$column-layout-tree">
+                    <xsl:with-param name="column-portlets"
+                                    tunnel="yes"
+                                    select="$row-data-tree/portal:portlets/bebop:portlet[@cellNumber = $col-number]"/>
+                </xsl:apply-templates>
+            </div>
+        </xsl:for-each>
+        
+        <xsl:if test="$use-default-styles">
+            <div style="clear:both"/>
+        </xsl:if>
+    </xsl:template>
+    
+    <xsl:template match="portal-grid-workspace-columns//portal-grid-workspace-column//portal-grid-workspace-column-portlets">
+        <xsl:param name="column-portlets" tunnel="yes"/>
+        
+        <xsl:apply-templates select="$column-portlets"/>
+    </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/portal-workspace.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/portal-workspace.xsl
index 2723eecdb..e85b5610c 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/portal-workspace.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/portal-workspace.xsl
@@ -142,7 +142,7 @@
         <xsl:apply-templates>
             <xsl:with-param name="use-default-styles"
                             tunnel="yes"
-                            select="./@use-default-styles = 'true'"/>
+                            select="foundry:boolean(./@use-default-styles)"/>
         </xsl:apply-templates>
     </xsl:template>
     
@@ -152,29 +152,28 @@
                    tunnel="yes"
                    select="true()"/>
         
+        <xsl:variable name="class">
+            <xsl:choose>
+                <xsl:when test="./@class">
+                    <xsl:value-of select="./@class"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="''"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        
         <xsl:variable name="column-layout-tree" select="./*"/>
         
-        <!--<pre>
-            <xsl:value-of select="concat('cell-number per split(layout) = ', 
-                                                    count(tokenize($data-tree/portal:workspace/portal:portal/@layout, ',')))"/>
-        </pre>
-        <pre>
-            <xsl:value-of select="concat('cell-number per max(cellNumber) = ', 
-                                                    max($data-tree/portal:workspace/portal:portal/bebop:portlet/@cellNumber))"/>
-        </pre>
-        
-        <xsl:for-each select="tokenize($data-tree/portal:workspace/portal:portal/@layout, ',')">
-            <pre>
-                <xsl:value-of select="concat('column: ', position(), '; width = ', current())"/>
-            </pre>
-        </xsl:for-each>-->
-        
         <xsl:for-each select="tokenize($data-tree/portal:workspace/portal:portal/@layout, ',')">
             <div>
                 <xsl:if test="$use-default-styles">
                     <xsl:attribute name="style" 
                                    select="concat('float:left; width = ', current(), ';')"/>
                 </xsl:if>
+                <xsl:if test="$class != ''">
+                    <xsl:attribute name="class" select="$class"/>
+                </xsl:if>
                 
                 <xsl:variable name="col-number" select="position()"/>
                 
@@ -186,6 +185,9 @@
             </div>
         </xsl:for-each>
         
+        <xsl:if test="$use-default-styles">
+            <div style="clear:both"/>
+        </xsl:if>
     </xsl:template>
     
     <xsl:template match="portal-workspace//portal-workspace-columns/portal-workspace-column//portal-workspace-portlets">
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/styles/admin.css b/ccm-sci-bundle/web/themes/foundry/foundry/styles/admin.css
index f6600323a..b65ebe639 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/styles/admin.css
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/styles/admin.css
@@ -459,7 +459,7 @@ div.bebop-contextbar span.bebop-contextbar-seperator {
     margin-left: 5px;
     border-left: 1px solid #a4a4a4;
     color: transparent; 
-    background-image:url('../../images/scrumb.png');
+    background-image:url('../images/scrumb.png');
     background-repeat:no-repeat;
     background-position: center;
 }
@@ -1078,7 +1078,7 @@ div.bebop-segment {
     border-bottom: 1px solid rgba(102, 102, 102, 0.5);
 }
 
-#left div.bebop-segmentBody {
+#left div.bebop-segment-body {
     padding-left: 10px;
 }
 
@@ -1100,14 +1100,14 @@ div.bebop-panel-row textarea{
     width:100%;
 }
 
-div.bebop-segment div.bebop-segement-header { 
+div.bebop-segment div.bebop-segment-header { 
     padding-left:1em;
     border-bottom:1px solid #cacaca;
     font-weight:bold;
     color:#808080;
 }
 
-div.bebop-segmentBody ul li ul li{
+div.bebop-segment-body ul li ul li{
     padding-left:.5em;
 
 }
@@ -1151,7 +1151,7 @@ div .bebop-body ul li{
     margin-top: 5px;
 }
 
-h3.bebop-segement-header{ 
+h3.bebop-segment-header{ 
     margin-bottom:0.15em;
     margin-top: 15px;
     color: #0776A0;
@@ -1347,7 +1347,7 @@ table.AlternateTable th + th, table.AlternateTable td + td {
     padding: 0em 0.5em;
 }
 /*edit pardis*/
-div.bebop-body div.bebop-segment h3.bebop-segement-header {
+div.bebop-body div.bebop-segment h3.bebop-segment-header {
     padding-bottom: 0.5em;
     text-decoration: underline;
 }
@@ -1669,7 +1669,7 @@ div.bebop-grid-panel{
 }
 
 div.action-link span.hint,
-h3.bebop-segement-header span.hint,
+h3.bebop-segment-header span.hint,
 table span.hint{
     display: none;
 }
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/texts/filter-controls.xml b/ccm-sci-bundle/web/themes/foundry/foundry/texts/filter-controls.xml
new file mode 100644
index 000000000..08cbfd6a3
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/texts/filter-controls.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<foundry:static-texts xmlns:foundry="http://foundry.libreccm.org">
+    <text id="SubmitFilters">
+        <translation lang="de">Anwenden</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sortAndListFilterList">
+        <translation lang="de">Liste filtern und sortieren</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="filterList">
+        <translation lang="de">Liste filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    
+    <text id="keywords">
+        <translation lang="de">Schlagworte</translation>
+        <translation lang="en"></translation>
+    </text>
+    
+    <text id="memberListsortAndFilterList">
+        <translation lang="de">Mitgliederliste filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="memberListfilterList">
+        <translation lang="de">Mitgliederliste filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="memberListSubmitFilters">
+        <translation lang="de">Fitern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="memberListsurname">
+        <translation lang="de">Familienname</translation>
+        <translation lang="en"></translation>
+    </text>
+    
+    <text id="SciPublicationsListsortAndFilterList">
+        <translation lang="de">Publikationen filtern und sortieren</translation>
+        <translation lang="en">Publikationen filtern und sortieren</translation>
+    </text>
+    <text id="SciPublicationsListfilterList">
+        <translation lang="de">Publikationen filtern</translation>
+        <translation lang="en">Filter publications</translation>
+    </text>
+    <text id="SciPublicationsListsortList">
+        <translation lang="de">Publikationen sortieren</translation>
+        <translation lang="en">Sort publications</translation>
+    </text>
+    <text id="SciPublicationsListSubmitFilters">
+        <translation lang="de">Publikationen filtern</translation>
+        <translation lang="en">Filter publications</translation>
+    </text>
+    <text id="SciPublicationsListSortList">
+        <translation lang="de">Publikationen sortieren</translation>
+        <translation lang="en">Sort publications</translation>
+    </text>
+    <text id="SciPublicationsListtitle">
+        <translation lang="de">Nach Titel filtern</translation>
+        <translation lang="en">Filter by title</translation>
+    </text>
+    <text id="SciPublicationsListauthorsStr">
+        <translation lang="de">Nach Autor filtern</translation>
+        <translation lang="en">Filter by author</translation>
+    </text>
+    <text id="SciPublicationsListyearOfPublication">
+        <translation lang="de">Erscheinungsjahr</translation>
+        <translation lang="en">Year</translation>
+    </text>
+    <text id="SciPublicationsListyearOfPublicationAll">
+        <translation lang="de">Alle</translation>
+        <translation lang="en">All</translation>
+    </text>
+    <text id="SciPublicationsListSortBy">
+        <translation lang="de">Sortieren nach</translation>
+        <translation lang="en">Sort by</translation>
+    </text>
+    <text id="SciPublicationsListSortBytitle">
+        <translation lang="de">Titel</translation>
+        <translation lang="en">Title</translation>
+    </text>
+    <text id="SciPublicationsListSortByyearAsc">
+        <translation lang="de">Jahr (aufsteigend)</translation>
+        <translation lang="en">Year (ascending)</translation>
+    </text>
+    <text id="SciPublicationsListSortByyearDesc">
+        <translation lang="de">Jahr (absteigend)</translation>
+        <translation lang="en">Year (descending)</translation>
+    </text>
+    <text id="SciPublicationsListSortByauthors">
+        <translation lang="de">Autoren</translation>
+        <translation lang="en">Authors</translation>
+    </text>
+    <text id="SciPublicationsListkeywords">
+        <translation lang="de">Schlagwörter</translation>
+        <translation lang="en">Keywords</translation>
+    </text>
+    
+    <text id="SciProjectListsortAndFilterList">
+        <translation lang="de">Projekte filtern und sortieren</translation>
+        <translation lang="en">Filter and sort projects</translation>
+    </text>
+    <text id="SciProjectListfilterList">
+        <translation lang="de">Projekte filtern</translation>
+        <translation lang="en">Filter projects</translation>
+    </text>
+    <text id="SciProjectListsortList">
+        <translation lang="de">Projekte sortieren</translation>
+        <translation lang="en">Sort projects</translation>
+    </text>
+    <text id="SciProjectListSubmitFilters">
+        <translation lang="de">Projekte filtern</translation>
+        <translation lang="en">Filter projects</translation>
+    </text>
+    <text id="SciProjectListSortList">
+        <translation lang="de">Projekte sortieren</translation>
+        <translation lang="en">Sort projects</translation>
+    </text>
+    <text id="SciProjectListtitle">
+        <translation lang="de">Nach Titel filtern</translation>
+        <translation lang="en">Filter by title</translation>
+    </text>
+    <text id="SciProjectListprojectstatus">
+        <translation lang="de">Nach Status filtern</translation>
+        <translation lang="en">Filter by status</translation>
+    </text>
+    <text id="SciProjectListprojectstatusongoing">
+        <translation lang="de">Laufende Projekte</translation>
+        <translation lang="en">Current projects</translation>
+    </text>
+    <text id="SciProjectListprojectstatusfinished">
+        <translation lang="de">Abgeschlossene Projekte</translation>
+        <translation lang="en">Finished projects</translation>
+    </text>
+    <text id="SciProjectListprojectstatusAll">
+        <translation lang="de">Alle Projekte</translation>
+        <translation lang="en">All projects</translation>
+    </text>
+    <text id="SciProjectListSortBytitle">
+        <translation lang="de">Titel</translation>
+        <translation lang="en">Title</translation>
+    </text>
+
+    <text id="projectListsortAndFilterList">
+        <translation lang="de">Projekt filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="projectListfilterList">
+        <translation lang="de"> </translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="projectListtitle">
+        <translation lang="de">Titel des Projektes</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="projectListresearchfield">
+        <translation lang="de">Forschungsfeld</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="projectListSubmitFilters">
+        <translation lang="de">Filter anwenden</translation>
+        <translation lang="en"></translation>
+    </text>
+
+    <text id="sciOrganizationPublicationssortAndFilterList">
+        <translation lang="de"></translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationsfilterList">
+        <translation lang="de">Publikationen filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationssortList">
+        <translation lang="de">Publikationen sortieren</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationsSubmitFilters">
+        <translation lang="de">Publikationen filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationstitle">
+        <translation lang="de">Nach Titel filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationsauthors">
+        <translation lang="de">Nach Autor filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationsyearOfPublication">
+        <translation lang="de">Nach Erscheinungjahr filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationsyearOfPublicationAll">
+        <translation lang="de">Alle</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationsSortBy">
+        <translation lang="de">Sortieren nach</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationsSortBytitle">
+        <translation lang="de">Titel</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationsSortByyearAsc">
+        <translation lang="de">Jahr (aufsteigend)</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationsSortByyearDesc">
+        <translation lang="de">Jahr (absteigend)</translation>
+        <translation lang="en"></translation>
+    </text>    
+    <text id="sciOrganizationPublicationsSortList">
+        <translation lang="de">Publikationen sortieren</translation>
+        <translation lang="en"></translation>
+    </text>    
+
+    <text id="sciOrganizationProjectssortAndFilterList">
+        <translation lang="de">Projekte filtern und sortieren</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationProjectsfilterList">
+        <translation lang="de">Projekte filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationProjectssortList">
+        <translation lang="de">Projekte sortieren</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationProjectsSubmitFilters">
+        <translation lang="de">Projekte filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationProjectsSortList">
+        <translation lang="de">Projekte sortieren</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationProjectstitle">
+        <translation lang="de">Nach Titel filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationProjectsprojectstatus">
+        <translation lang="de">Nach Status filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationProjectsprojectstatusongoing">
+        <translation lang="de">Laufende Projekte</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationProjectsprojectstatusfinished">
+        <translation lang="de">Abgeschlossene Projekte</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationProjectsprojectstatusAll">
+        <translation lang="de">Alle Projekte</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationProjectsSortBytitle">
+        <translation lang="de">Titel</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationstypeAll">
+        <translation lang="de">Alle</translation>
+    </text>
+    <text id="sciOrganizationPublicationstypecom.arsdigita.cms.contenttypes.CollectedVolume">
+        <translation lang="de">Sammelband</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationstypecom.arsdigita.cms.contenttypes.GreyLiterature">
+        <translation lang="de">Sonstiges</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationstypecom.arsdigita.cms.contenttypes.Monograph">
+        <translation lang="de">Monographie</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationstypecom.arsdigita.cms.contenttypes.WorkingPaper">
+        <translation lang="de">Arbeitspapier</translation>
+        <translation lang="en"></translation>
+    </text>
+
+    <text id="sciOrganizationPublicationstypecom.arsdigita.cms.contenttypes.ArticleInJournal">
+        <translation lang="de">Zeitschriftenbeitrag</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationstypecom.arsdigita.cms.contenttypes.CollectedVolume">
+        <translation lang="de">Sammelband</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationstypecom.arsdigita.cms.contenttypes.GreyLiterature">
+        <translation lang="de">Sonstiges</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationstypecom.arsdigita.cms.contenttypes.Monograph">
+        <translation lang="de">Monographie</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciOrganizationPublicationstypecom.arsdigita.cms.contenttypes.WorkingPaper">
+        <translation lang="de">Arbeitspapier</translation>
+        <translation lang="en"></translation>
+    </text>
+
+    <text id="sciDepartmentPublicationssortAndFilterList">
+        <translation lang="de"></translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentPublicationsfilterList">
+        <translation lang="de">Publikationen filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentPublicationssortList">
+        <translation lang="de">Publikationen sortieren</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentPublicationsSubmitFilters">
+        <translation lang="de">Publikationen filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentPublicationstitle">
+        <translation lang="de">Nach Titel filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentPublicationsauthors">
+        <translation lang="de">Nach Autor filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentPublicationsyearOfPublication">
+        <translation lang="de">Nach Erscheinungjahr filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentPublicationsyearOfPublicationAll">
+        <translation lang="de">Alle</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentPublicationsSortBy">
+        <translation lang="de">Sortieren nach</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentPublicationsSortBytitle">
+        <translation lang="de">Titel</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentPublicationsSortByyearAsc">
+        <translation lang="de">Jahr (aufsteigend)</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentPublicationsSortByyearDesc">
+        <translation lang="de">Jahr (absteigend)</translation>
+        <translation lang="en"></translation>
+    </text>    
+    <text id="sciDepartmentPublicationsSortList">
+        <translation lang="de">Publikationen sortieren</translation>
+        <translation lang="en"></translation>
+    </text>    
+
+    <text id="sciDepartmentProjectssortAndFilterList">
+        <translation lang="de">Projekte filtern und sortieren</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentProjectsfilterList">
+        <translation lang="de">Projekte filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentProjectssortList">
+        <translation lang="de">Projekte sortieren</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentProjectsSubmitFilters">
+        <translation lang="de">Projekte filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentProjectsSortList">
+        <translation lang="de">Projekte sortieren</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentProjectstitle">
+        <translation lang="de">Nach Titel filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentProjectsprojectstatus">
+        <translation lang="de">Nach Status filtern</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentProjectsprojectstatusongoing">
+        <translation lang="de">Laufende Projekte</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentProjectsprojectstatusfinished">
+        <translation lang="de">Abgeschlossene Projekte</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentProjectsprojectstatusAll">
+        <translation lang="de">Alle Projekte</translation>
+        <translation lang="en"></translation>
+    </text>
+    <text id="sciDepartmentProjectsSortBytitle">
+        <translation lang="de">Titel</translation>
+        <translation lang="en"></translation>
+    </text>
+
+</foundry:static-texts>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/templates/portal-workspace-grid.xml b/ccm-sci-bundle/web/themes/foundry/templates/portal-workspace-grid.xml
new file mode 100644
index 000000000..7296e0415
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/templates/portal-workspace-grid.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page-layout>
+    <head>
+        <title>
+            <separator>: </separator>
+            <show-text>layout/page/head/title</show-text>
+            <show-page-title/>
+        </title>
+        <load-css-files/>
+    </head>
+    <body>
+        <nav>
+            <navigation-home-link>
+                <a>
+                    <navigation-title/>
+                </a>
+            </navigation-home-link>
+            <h1>
+                <show-text>layout/page/head/title</show-text>: <show-page-title/>
+            </h1>
+            <navigation>
+                <div class="nav-wrapper">
+                    <navigation-links>
+                        <ul>
+                            <navigation-link>
+                                <li>
+                                    <a>
+                                        <navigation-link-label/>
+                                    </a>
+                                    <navigation-sublinks/>
+                                </li>
+                            </navigation-link>
+                        </ul>
+                    </navigation-links>
+                </div>
+            </navigation>
+            <breadcrumbs>
+                <div id="breadcrumbs">
+                    <breadcrumb-link>
+                        <a>
+                            <breadcrumb-label mode="mark"/>
+                        </a>
+                    </breadcrumb-link>
+                </div>
+                <breadcrumb-separator>
+                    <span class="breadcrumb-separator">/</span>
+                </breadcrumb-separator>
+            </breadcrumbs>
+        </nav>
+        <main>
+            <portal-grid-workspace use-default-styles="true">
+                <portal-grid-workspace-rows>
+                    <portal-grid-workspace-row>
+                        <portal-grid-workspace-columns>
+                            <portal-grid-workspace-column>
+                                <portal-grid-workspace-column-portlets/>
+                            </portal-grid-workspace-column>
+                        </portal-grid-workspace-columns>
+                    </portal-grid-workspace-row>
+                </portal-grid-workspace-rows>
+            </portal-grid-workspace>
+        </main>
+    </body>
+</page-layout>
\ No newline at end of file