diff --git a/ccm-core/web/themes/foundry-base/conf/search.xml b/ccm-core/web/themes/foundry-base/conf/search.xml
new file mode 100644
index 000000000..3605495d1
--- /dev/null
+++ b/ccm-core/web/themes/foundry-base/conf/search.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<foundry:configuration xmlns:foundry="http://foundry.libreccm.org">
+    
+    <setting id="graphic-score-width">50</setting>
+    <setting id="graphic-score-height">10</setting>
+    <setting id="filter/show-category-filter">yes</setting>
+    <setting id="filter/show-creation-date-filter">yes</setting>
+    <setting id="filter/show-creation-user-filter">yes</setting>
+    <setting id="filter/show-content-type-filter">yes</setting>
+    <setting id="filter/show-host-filter">yes</setting>
+    <setting id="filter/show-last-editor-filter">yes</setting>
+    <setting id="filter/show-last-modified-date-filter">yes</setting>
+    <setting id="filter/show-launch-date-filter">yes</setting>
+    <setting id="filter/show-object-type-filter">yes</setting>
+    <setting id="show-addition-filter">yes</setting>
+    <setting id="show-graphic-score">yes</setting>
+    <setting id="show-query-prefix">yes</setting>
+    <setting id="show-score">yes</setting>
+    <setting id="show-search-form-in-result-list">yes</setting>
+    <setting id="show-summary">yes</setting>
+    
+</foundry:configuration>
\ No newline at end of file
diff --git a/ccm-core/web/themes/foundry-base/texts/search.xml b/ccm-core/web/themes/foundry-base/texts/search.xml
new file mode 100644
index 000000000..318a0e526
--- /dev/null
+++ b/ccm-core/web/themes/foundry-base/texts/search.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<foundry:static-texts xmlns:foundry="http://foundry.libreccm.org">
+    
+    <text id="query">
+        <translation lang="de">Suche:</translation>
+        <translation lang="en">Search:</translation>
+    </text>
+    
+    <text id="additionalFilters">
+        <translation lang="de">Zusätzliche Kriterien:</translation>
+        <translation lang="en">Additional Filters:</translation>
+    </text>
+    
+    <text id="listheader/score">
+        <translation lang="de">Wertung</translation>
+        <translation lang="en">Evaluation</translation>
+    </text>
+    
+    <text id="listheader/title">
+        <translation lang="de">Titel</translation>
+        <translation lang="en">Title</translation>
+    </text>
+    
+    <text id="listheader/summary">
+        <translation lang="de">Zusammenfassung</translation>
+        <translation lang="en">Abstract</translation>
+    </text>
+    
+    <text id="listheader/addlink">
+        <translation lang="de"> </translation>
+        <translation lang="en"> </translation>
+    </text>
+    
+    <text id="resultlist/header">
+        <translation lang="de"> Suchergebnis</translation>
+        <translation lang="en"> Search result</translation>
+    </text>
+    
+    <text id="resultlist/select">
+        <translation lang="de"> Auswählen</translation>
+        <translation lang="en"> Choose</translation>
+    </text>
+    
+    <text id="searchfilter/types">
+        <translation lang="de">Typ:</translation>
+        <translation lang="en">Type:</translation>
+    </text>
+    
+    <text id="searchfilter/sites">
+        <translation lang="de">Server:</translation>
+        <translation lang="en">Server:</translation>
+    </text>
+    
+    <text id="searchfilter/categories">
+        <translation lang="de">Kategorien:</translation>
+        <translation lang="en">Categories:</translation>
+    </text>
+    
+    <text id="searchfilter/searchRecursiv">
+        <translation lang="de">Unterkategorien durchsuchen</translation>
+        <translation lang="en">Search subcategories</translation>
+    </text>
+    
+     <text id="searchFilter/creationDate">
+        <translation lang="de">Erstellt am:</translation>
+        <translation lang="en">Created:</translation>
+    </text>
+    
+    <text id="searchfilter/creationUser">
+        <translation lang="de">Erstellt von:</translation>
+        <translation lang="en">Created by:</translation>
+    </text>
+    
+    <text id="searchfilter/lastModUser">
+        <translation lang="de">Geändert von:</translation>
+        <translation lang="en">Edited by:</translation>
+    </text>
+    
+    <text id="searchfilter/launchDate">
+        <translation lang="de">Publiziert am:</translation>
+        <translation lang="en">Published at:</translation>
+    </text>
+    
+    <text id="searchfilter/lastModDate">
+        <translation lang="de">Geändert am:</translation>
+        <translation lang="en">Edited at:</translation>
+    </text>
+    
+    <text id="searchfilter/creationDate">
+        <translation lang="de">Erstellt am:</translation>
+        <translation lang="en">Created at</translation>
+    </text>
+    
+    <text id="searchfilter/dateRange/day">
+        <translation lang="de">Tag</translation>
+        <translation lang="en">Day</translation>
+    </text>
+    
+    <text id="searchfilter/dateRange/month">
+        <translation lang="de">Monat</translation>
+        <translation lang="en">Month</translation>
+    </text>
+    
+    <text id="searchfilter/dateRange/year">
+        <translation lang="de">Jahr</translation>
+        <translation lang="en">Year</translation>
+    </text>
+    
+    <text id="searchfilter/dateRange/from">
+        <translation lang="de">Von:</translation>
+        <translation lang="en">From:</translation>
+    </text>
+    
+    <text id="searchfilter/dateRange/to">
+        <translation lang="de">Bis:</translation>
+        <translation lang="en">To:</translation>
+    </text>
+    
+</foundry:static-texts>
\ No newline at end of file
diff --git a/ccm-core/web/themes/foundry/foundry/images/search/action.png b/ccm-core/web/themes/foundry/foundry/images/search/action.png
new file mode 100644
index 000000000..85d843485
Binary files /dev/null and b/ccm-core/web/themes/foundry/foundry/images/search/action.png differ
diff --git a/ccm-core/web/themes/foundry/foundry/images/search/score-empty.gif b/ccm-core/web/themes/foundry/foundry/images/search/score-empty.gif
new file mode 100755
index 000000000..27230c8fe
Binary files /dev/null and b/ccm-core/web/themes/foundry/foundry/images/search/score-empty.gif differ
diff --git a/ccm-core/web/themes/foundry/foundry/images/search/score-full.gif b/ccm-core/web/themes/foundry/foundry/images/search/score-full.gif
new file mode 100755
index 000000000..0da007416
Binary files /dev/null and b/ccm-core/web/themes/foundry/foundry/images/search/score-full.gif differ
diff --git a/ccm-core/web/themes/foundry/foundry/lib.xsl b/ccm-core/web/themes/foundry/foundry/lib.xsl
index 14abf7cda..6f8a411d3 100644
--- a/ccm-core/web/themes/foundry/foundry/lib.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib.xsl
@@ -26,7 +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/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-core/web/themes/foundry/foundry/lib/search/filterControls.xsl b/ccm-core/web/themes/foundry/foundry/lib/search/filterControls.xsl
index 758475455..9f9d15bc7 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/search/filterControls.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/search/filterControls.xsl
@@ -35,15 +35,8 @@
                   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:when test="string-length(./@customName) &gt; 0">
                     <xsl:attribute name="class" 
                                    select="concat('filter-controls ', 
                                                   ./@customName, 
@@ -53,9 +46,17 @@
                     <xsl:attribute name="class" select="'filter-controls'"/>
                 </xsl:otherwise>
             </xsl:choose>
+            <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:variable name="sort-and-filter-list-text" 
                           select="foundry:get-static-text('filter-controls', 
-                                                          concat(./@customName, 'sortAndFilterList')"/>
+                                                          concat(./@customName, 'sortAndFilterList'))"/>
             <xsl:choose>
                 <xsl:when test="string-length($sort-and-filter-list-text) > 0">
                     <fieldset>
@@ -99,7 +100,7 @@
             <fieldset>
                 <legend>
                     <xsl:value-of select="foundry:get-static-text('filter-controls', 
-                                                                  concat(./@customName, 'sortList')"/>
+                                                                  concat(./@customName, 'sortList'))"/>
                 </legend>
                 <xsl:call-template name="filterControlsSortFields"/>
                 <input type="submit" class="submit">
diff --git a/ccm-core/web/themes/foundry/foundry/lib/search/searchDocuments.xsl b/ccm-core/web/themes/foundry/foundry/lib/search/searchDocuments.xsl
index 7d9dd0015..a0b5e0bb4 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/search/searchDocuments.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/search/searchDocuments.xsl
@@ -3,31 +3,30 @@
 
 <!-- 
     Copyright: 2006, 2007, 2008 Sören Bernstein
+    Copyright: 2015 Jens Pelzetter
   
-    This file is part of Mandalay.
+    This file is part of the Foundry Theme Engine for LibreCCM. This file
+    was taken from the Mandalay theme engine at has been modified to work 
+    with Foundry.
 
-    Mandalay is free software: you can redistribute it and/or modify
+    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.
 
-    Mandalay is distributed in the hope that it will be useful,
+    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 Mandalay.  If not, see <http://www.gnu.org/licenses/>.
+    along with Foundry  If not, see <http://www.gnu.org/licenses/>. 
+    
 -->
-
-<!-- This file was copied from Mandalay and edited to work with Foundry. -->
-
-<!-- EN
-  Processing search results
+<!-- 
+    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"
@@ -37,8 +36,7 @@
                 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 -->
+    <!-- Search result for webpages are translated to a ul -->
     <xsl:template match="search:documents">
         <xsl:param name="layout-tree" select="."/>
     
@@ -49,13 +47,11 @@
         </ul>
     </xsl:template>
   
-    <!-- DE Zeige das Suchergebis für die Admin-Oberfläche an -->
-    <!-- EN Show search result for the admin pages -->
+    <!-- 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-->
+        <!-- Getting all needed setting-->
         <xsl:variable name="show-summary" 
                       select="foundry:get-setting('search', 
                                                   'show-summary', 
@@ -68,35 +64,26 @@
     
         <xsl:choose>
             <xsl:when test="$admin-result-mode = 'table'">
-                <!-- DE Erzeuge Tabellenkopf für die Suchergebnisse -->
-                <!-- EN Create table header for search results -->
+                <!-- 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>
+                            <xsl:value-of select="foundry:get-static-text('search', 
+                                                                          'listheader/score')"/>
                         </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>
+                            <xsl:value-of select="foundry:get-static-text('search',
+                                                                          'listheader/title')"/>
                         </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>
+                                <xsl:value-of select="foundry:get-static-text('search',
+                                                                          'listheader/summary')"/>
                             </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>
+                            <xsl:value-of select="foundry:get-static-text('search',
+                                                                          'listheader/addlink')"/>
                         </th>
                     </tr>
                     <xsl:apply-templates mode="admin"/>
@@ -135,10 +122,8 @@
             <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>
+                        <xsl:value-of select="foundry:get-static-text('search', 
+                                                                      'resultlist/header')"/>
                     </div>
                     <ul>
                         <xsl:apply-templates mode="admin"/>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/search/searchFilter.xsl b/ccm-core/web/themes/foundry/foundry/lib/search/searchFilter.xsl
index 358a98def..fce4912c8 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/search/searchFilter.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/search/searchFilter.xsl
@@ -3,635 +3,496 @@
 
 <!-- 
     Copyright: 2006, 2007, 2008 Sören Bernstein
+    Copyright: 2015 Jens Pelzetter
   
-    This file is part of Mandalay.
+    This file is part of the Foundry Theme Engine for LibreCCM. This file
+    was taken from the Mandalay theme engine at has been modified to work 
+    with Foundry.
 
-    Mandalay is free software: you can redistribute it and/or modify
+    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.
 
-    Mandalay is distributed in the hope that it will be useful,
+    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 Mandalay.  If not, see <http://www.gnu.org/licenses/>.
+    along with Foundry  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: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 search"
+                version="2.0">
+  
+    <!-- Search filter for content type -->
+    <xsl:template match="search:filter[@type='contentType']">
+        <xsl:param name="layoutTree" select="."/>
+    
+        <xsl:if test="foundry:boolean(foundry:get-setting('search', 
+                                                          'filter/show-content-type-filter', 
+                                                          'true'))">
+            <div class="filter">
+                <span class="filterName">
+                    <xsl:value-of select="foundry:get-static-text('search', 'searchfilter/types')"/>
+                </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>
+  
+    <!-- Search filter for object type -->
+    <xsl:template match="search:filter[@type='objectType']">
+        <xsl:param name="layoutTree" select="."/>
+    
+        <xsl:if test="foundry:boolean(foundry:get-setting('search', 
+                                                          'filter/show-object-type-filter', 
+                                                          'true'))">
+            <div class="filter">
+                <span class="filterName">
+                    <xsl:value-of select="foundry:get-static-text('search', 'searchfilter/types')"/>
+                </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>
+  
+    <!-- Search filter for host -->
+    <xsl:template match="search:filter[@type='host']">
+        <xsl:param name="layoutTree" select="."/>
+    
+        <xsl:if test="foundry:boolean(foundry:get-setting('search', 
+                                                          'filter/show-host-filter', 
+                                                          'true'))">
+            <div class="filter">
+                <span class="filterName">
+                    <xsl:value-of select="foundry:get-static-text('search', 
+                                                                  'searchfilter/sites')"/>
+                </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>
+  
+    <!-- Search filter for category -->
+    <xsl:template match="search:filter[@type='category']">
+        <xsl:param name="layoutTree" select="."/>
+    
+        <xsl:if test="foundry:boolean(foundry:get-setting('search', 
+                                                          'filter/show-category-filter', 
+                                                          'true'))">
+            <div class="filter">
+                <span class="filterName">
+                    <xsl:value-of select="foundry:get-static-text('search', 
+                                                                  'searchfilter/categories')"/>
+                </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:value-of select="foundry:get-static-text('search', 
+                                                                  'searchfilter/searchRecursiv')"/>
+                </span>
+            </div>
+        </xsl:if>
+    </xsl:template>
+  
+    <!-- Search filter for author -->
+    <xsl:template match="search:filter[@type='creationUser']">
+        <xsl:param name="layoutTree" select="."/>
+    
+        <xsl:if test="foundry:boolean(foundry:get-setting('search', 
+                                                          'show-creation-user-filter',
+                                                          'true'))">
+            <xsl:apply-templates select="search:partyText">
+                <xsl:with-param name="filterName">
+                    <xsl:value-of select="foundry:get-static-text('search', 
+                                                              'searchfilter/creationUser')"/>
+                </xsl:with-param>
+            </xsl:apply-templates>
+        </xsl:if>
+    </xsl:template>
+  
+    <!-- Search filter for last editor -->
+    <xsl:template match="search:filter[@type='lastModifiedUser']">
+        <xsl:param name="layoutTree" select="."/>
 
-<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">
+        <xsl:if test="foundry:boolean(foundry:get-setting('search',
+                                                          'show-last-editor-filter',
+                                                          'true'))">
+            <xsl:apply-templates select="search:partyText">
+                <xsl:with-param name="filterName">
+                    <xsl:value-of select="foundry:get-static-text('search', 
+                                                                  'searchfilter/lastModUser')"/>
+                </xsl:with-param>
+            </xsl:apply-templates>
+        </xsl:if>
+    </xsl:template>
   
-  <!-- DE Suchfilter für Content Typ -->
-  <!-- EN Search filter for content type -->
-  <xsl:template match="search:filter[@type='contentType']">
-    <xsl:param name="layoutTree" select="."/>
+    <!-- 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="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>
+        <xsl:if test="foundry:boolean(foundry:get-setting('search' , 
+                                                          'filter/show-launch-date-filter', 
+                                                          'true'))">
+            <xsl:call-template name="search:dateRangeFilter">
+                <xsl:with-param name="filterName">
+                    <xsl:value-of select="foundry:get-static-text('search', 
+                                                                  'searchfilter/lauchDate')"/>
+                </xsl:with-param>
+            </xsl:call-template>
+        </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="."/>
+    <!-- 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="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>
+        <xsl:if test="foundry:boolean(foundry:get-setting('search',
+                                                          'show-last-modified-date-filter',
+                                                          'true'))">
+            <xsl:call-template name="search:dateRangeFilter">
+                <xsl:with-param name="filterName">
+                    <xsl:value-of select="foundry:get-static-text('search', 
+                                                                  'searchfilter/lastModDate')"/>
+                </xsl:with-param>
+            </xsl:call-template>
+        </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="."/>
+    <!-- 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="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>
+        <xsl:if test="foundry:boolean(foundry:get-setting('search', 
+                                                          'filter/show-creation-date-filter',
+                                                          'true'))">
+            <xsl:call-template name="search:dateRangeFilter">
+                <xsl:with-param name="filterName">
+                    <xsl:value-of select="foundry:get-static-text('search',
+                                                                  'searchFilter/creationDate')"/>
+                </xsl:with-param>
+            </xsl:call-template>
+        </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>
+    <!-- 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:value-of select="foundry:get-static-text('search', 
+                                                                  concat('searchfilter/dateRange/', $fragment1))"/>
+                </th>
+                <th>
+                    <xsl:value-of select="foundry:get-static-text('search', 
+                                                                  concat('searchfilter/dateRange/', $fragment2))"/>
+                </th>
+                <th>
+                    <xsl:value-of select="foundry:get-static-text('search', 
+                                                                  concat('searchfilter/dateRange/', $fragment3))"/>
+                </th>
+            </tr>
+            <tr>
+                <th align="right">
+                    <xsl:value-of select="foundry:get-static-text('search', 
+                                                                  'searchfilter/dateRange/from')"/>
+                </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:value-of select="foundry:get-static-text('search', 
+                                                                  'searchfilter/dateRange/to')"/>
+                </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>
   
-  <!-- DE Suchfilter für Autor -->
-  <!-- EN Search filter for author -->
-  <xsl:template match="search:filter[@type='creationUser']">
-    <xsl:param name="layoutTree" select="."/>
+    <xsl:template name="search:dateRangeFragment">
+        <xsl:param name="fragment" select="''"/>
+        <xsl:param name="mode" 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: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>
-        
-        
-      </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>
   
-  <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:template name="search:oldStyleDateRangeFilter">
+        <table>
+            <tr>
+                <td/>
+                <th>
+                    <xsl:value-of select="foundry:get-static-text('search', 
+                                                                  'searchfilter/dateRange/day')"/>
+                </th>
+                <th>
+                    <xsl:value-of select="foundry:get-static-text('search', 
+                                                                  'searchfilter/dateRange/month')"/>
+                </th>
+                <th>
+                    <xsl:value-of select="foundry:get-static-text('search', 
+                                                                  'searchfilter/dateRange/year')"/>
+                </th>
+            </tr>
+            <tr>
+                <th align="right">
+                    <xsl:value-of select="foundry:get-static-text('search', 
+                                                                  'searchfilter/dateRange/from')"/>
+                </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:value-of select="foundry:get-static-text('search', 
+                                                                  'searchfilter/dateRange/to')"/>
+                </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-core/web/themes/foundry/foundry/lib/search/searchObject.xsl b/ccm-core/web/themes/foundry/foundry/lib/search/searchObject.xsl
index b32d081e9..229dabf87 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/search/searchObject.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/search/searchObject.xsl
@@ -3,315 +3,166 @@
 
 <!-- 
     Copyright: 2006, 2007, 2008 Sören Bernstein
+    Copyright: 2015 Jens Pelzetter
   
-    This file is part of Mandalay.
+    This file is part of the Foundry Theme Engine for LibreCCM. This file
+    was taken from the Mandalay theme engine at has been modified to work 
+    with Foundry.
 
-    Mandalay is free software: you can redistribute it and/or modify
+    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.
 
-    Mandalay is distributed in the hope that it will be useful,
+    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 Mandalay.  If not, see <http://www.gnu.org/licenses/>.
+    along with Foundry  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">
+<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 search" 
+                version="2.0">
   
-  <!-- DE Zeige die Suchergebnisse an -->
-  <!-- EN Show the search results -->
-  <xsl:template match="search:object">
-    <xsl:param name="layoutTree" select="."/>
+    <!-- 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">
+        <li>
+            <span class="re">
+                <xsl:if test="foundry:boolean(foundry:get-setting('search', 'show-score', 'true'))">
+                    <div class="score">
+                        <xsl:choose>
+                            <xsl:when test="foundry:boolean(foundry:get-setting('search', 
+                                                                  'show-graphic-score', 
+                                                                  'true'))">
+                                <xsl:attribute name="style" 
+                                               select="concat('background-image: ', foundry:gen-path('images/search/score-empty.gif', 'internal'), '; ',
+                                                              'background-repeat: no-repeat; ',
+                                                              'width: ', foundry:get-setting('search', 'graphic-score-width', '50'), 'px; ')"/>
+                                <div class="imgFull">
+                                    <xsl:attribute name="style"
+                                                   select="concat('font-size: 0px; overflow: hidden; width: ', ./@score, '; height: ', foundry:get-setting('search', 'graphic-score-height', '10'), 'px; ')"/>
+                                    <img>
+                                        <xsl:attribute name="src" 
+                                                       select="foundry:gen-path('images/search/score-full.gif', 'internal')"/>
+                                        <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="foundry:boolean(foundry:get-setting('search', 'show-summary', 'true'))">
+                <br />
+                <span class="summary">
+                    <xsl:value-of select="./@summary" disable-output-escaping="yes"/>
+                </span>
+            </xsl:if>
+        </li>
+    </xsl:template>
+  
+    <!-- 
+        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="."/>
+      
+        <div class="searchResults">
             <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: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>
-          </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:if test="foundry:boolean(foundry:get-setting('search', 'show-score', 'true'))">
+                <span class="score">
+                    <xsl:choose>
+                        <xsl:when test="foundry:boolean(foundry:get-setting('search', 
+                                                                            'show-graphic-score', 
+                                                                              'true'))">
+                            <div class="score">
+                                <xsl:attribute name="style" 
+                                               select="concat('background-image: ', foundry:gen-path('images/search/score-empty.gif', 'internal'), '; ',
+                                                              'background-repeat: no-repeat; ',
+                                                              'width: ', foundry:get-setting('search', 'graphic-score-width', '50'), 'px; ')"/>
+                                <div class="imgFull">
+                                    <xsl:attribute name="style"
+                                                   select="concat('font-size: 0px; overflow: hidden; width: ', ./@score, '; height: ', foundry:get-setting('search', 'graphic-score-height', '10'), 'px; ')"/>
+                                    <img>
+                                        <xsl:attribute name="src" 
+                                                       select="foundry:gen-path('images/search/score-full.gif', 'internal')"/>
+                                        <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="foundry:boolean(foundry:get-setting('search', 'show-summary', '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" 
+                                           select="foundry:gen-path('images/search/action.png', 
+                                                                     'internal')"/>
+                            <xsl:attribute name="alt"
+                                           select="foundry:get-static-text('search', 
+                                                                           'resultList/select')"/>
+                            <xsl:attribute name="title" 
+                                           select="foundry:get-static-text('search', 
+                                                                            'resultlist/select')"/>
+                        </img>
+                        <xsl:value-of select="foundry:get-static-text('search', 
+                                                                      'resultlist/select')"/>
+                    </a>
+                </span>
+            </xsl:if>
+        </div>
+    </xsl:template>
   
 </xsl:stylesheet>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/search/searchPartyText.xsl b/ccm-core/web/themes/foundry/foundry/lib/search/searchPartyText.xsl
index b17fa327d..ef6d006e8 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/search/searchPartyText.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/search/searchPartyText.xsl
@@ -3,73 +3,63 @@
 
 <!-- 
     Copyright: 2006, 2007, 2008 Sören Bernstein
+    Copyright: 2015 Jens Pelzetter
   
-    This file is part of Mandalay.
+    This file is part of the Foundry Theme Engine for LibreCCM. This file
+    was taken from the Mandalay theme engine at has been modified to work 
+    with Foundry.
 
-    Mandalay is free software: you can redistribute it and/or modify
+    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.
 
-    Mandalay is distributed in the hope that it will be useful,
+    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 Mandalay.  If not, see <http://www.gnu.org/licenses/>.
+    along with Foundry  If not, see <http://www.gnu.org/licenses/>. 
+    
 -->
 
-<!-- DE
-  Hier wird die Anzeige der verwendeten Filter verarbeitet 
+
+<!--   
+    Processing search party text
 -->
 
-<!-- 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">
+<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 search" 
+                version="2.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="."/>
+    <!-- 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: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-core/web/themes/foundry/foundry/lib/search/searchQuery.xsl b/ccm-core/web/themes/foundry/foundry/lib/search/searchQuery.xsl
index c8b075c98..818438a8a 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/search/searchQuery.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/search/searchQuery.xsl
@@ -3,106 +3,89 @@
 
 <!-- 
     Copyright: 2006, 2007, 2008 Sören Bernstein
+    Copyright: 2015 Jens Pelzetter
   
-    This file is part of Mandalay.
+    This file is part of the Foundry Theme Engine for LibreCCM. This file
+    was taken from the Mandalay theme engine at has been modified to work 
+    with Foundry.
 
-    Mandalay is free software: you can redistribute it and/or modify
+    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.
 
-    Mandalay is distributed in the hope that it will be useful,
+    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 Mandalay.  If not, see <http://www.gnu.org/licenses/>.
+    along with Foundry  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">
+<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 search" 
+                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="."/>
+    <!-- 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>
+        <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">
+            <!-- Don't show, if there is already a search result -->
+            <xsl:if test="foundry:boolean(foundry:get-setting('search', 
+                                                              'show-search-form-in-result-list',
+                                                              'true')) 
+                          or not(../search:results)">
+                <xsl:apply-templates select="search:terms"/>
+            </xsl:if>
+            <xsl:if test="search:*[not(self::search:terms)] 
+                          and foundry:boolean(foundry:get-setting('search', 
+                                                                  'show-addition-filter', 
+                                                                  'true'))">
+                <fieldset class="advancedSearch">
+                    <legend onclick="javascript:parent.display('none');">
+                        <xsl:value-of select="foundry:get-static-text('search', 
+                                                                      'additionalFilters')"/>
+                    </legend>
+                    <xsl:apply-templates select="search:*[not(self::search:terms)]"/>
+                </fieldset>
+            </xsl:if>
+        </div>
+    </xsl:template>
   
 </xsl:stylesheet>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/search/searchResults.xsl b/ccm-core/web/themes/foundry/foundry/lib/search/searchResults.xsl
index 900a968f8..d786d5b4c 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/search/searchResults.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/search/searchResults.xsl
@@ -3,59 +3,55 @@
 
 <!-- 
     Copyright: 2006, 2007, 2008 Sören Bernstein
+    Copyright: 2015 Jens Pelzetter
   
-    This file is part of Mandalay.
+    This file is part of the Foundry Theme Engine for LibreCCM. This file
+    was taken from the Mandalay theme engine at has been modified to work 
+    with Foundry.
 
-    Mandalay is free software: you can redistribute it and/or modify
+    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.
 
-    Mandalay is distributed in the hope that it will be useful,
+    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 Mandalay.  If not, see <http://www.gnu.org/licenses/>.
+    along with Foundry  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">
+<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 search" 
+                version="2.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>
+    <!-- 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:template match="info">
+        <div class="info">
+            <xsl:value-of select="."/>
+        </div>
+    </xsl:template>
 </xsl:stylesheet>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/search/searchTerms.xsl b/ccm-core/web/themes/foundry/foundry/lib/search/searchTerms.xsl
index 70fdb9450..3a5cd012d 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/search/searchTerms.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/search/searchTerms.xsl
@@ -3,71 +3,57 @@
 
 <!-- 
     Copyright: 2006, 2007, 2008 Sören Bernstein
+    Copyright: 2015 Jens Pelzetter
   
-    This file is part of Mandalay.
+    This file is part of the Foundry Theme Engine for LibreCCM. This file
+    was taken from the Mandalay theme engine at has been modified to work 
+    with Foundry.
 
-    Mandalay is free software: you can redistribute it and/or modify
+    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.
 
-    Mandalay is distributed in the hope that it will be useful,
+    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 Mandalay.  If not, see <http://www.gnu.org/licenses/>.
+    along with Foundry  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">
+<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 search" 
+                version="2.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>
+    <!-- Create a widget for the search terms -->
+    <xsl:template match="search:terms">
+        <xsl:param name="layoutTree" select="."/>
+
+        <xsl:if test="foundry:boolean(foundry:get-setting('search', 'show-query-prefix', 'true'))">
+            <span class="query">
+                <xsl:value-of select="foundry:get-static-text('search', 'query')"/>
+            </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-core/web/themes/foundry/foundry/texts/search.xml b/ccm-core/web/themes/foundry/foundry/texts/search.xml
new file mode 100644
index 000000000..3611528af
--- /dev/null
+++ b/ccm-core/web/themes/foundry/foundry/texts/search.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<foundry:static-texts xmlns:foundry="http://foundry.libreccm.org">
+    
+    <text id="query">
+        <translation lang="de">Suche:</translation>
+        <translation lang="en">Search:</translation>
+    </text>
+    
+    <text id="additionalFilters">
+        <translation lang="de">Zusätzliche Kriterien:</translation>
+        <translation lang="en">Additional Filters:</translation>
+    </text>
+    
+    <text id="listheader/score">
+        <translation lang="de">Wertung</translation>
+        <translation lang="en">Evaluation</translation>
+    </text>
+    
+    <text id="listheader/title">
+        <translation lang="de">Titel</translation>
+        <translation lang="en">Title</translation>
+    </text>
+    
+    <text id="listheader/summary">
+        <translation lang="de">Zusammenfassung</translation>
+        <translation lang="en">Abstract</translation>
+    </text>
+    
+    <text id="listheader/addlink">
+        <translation lang="de"> </translation>
+        <translation lang="en"> </translation>
+    </text>
+    
+    <text id="resultlist/header">
+        <translation lang="de"> Suchergebnis</translation>
+        <translation lang="en"> Search result</translation>
+    </text>
+    
+    <text id="resultlist/select">
+        <translation lang="de"> Auswählen</translation>
+        <translation lang="en"> Choose</translation>
+    </text>
+    
+    <text id="searchfilter/types">
+        <translation lang="de">Typ:</translation>
+        <translation lang="en">Type:</translation>
+    </text>
+    
+    <text id="searchfilter/sites">
+        <translation lang="de">Server:</translation>
+        <translation lang="en">Server:</translation>
+    </text>
+    
+    <text id="searchfilter/categories">
+        <translation lang="de">Kategorien:</translation>
+        <translation lang="en">Categories:</translation>
+    </text>
+    
+    <text id="searchfilter/searchRecursiv">
+        <translation lang="de">Unterkategorien durchsuchen</translation>
+        <translation lang="en">Search subcategories</translation>
+    </text>
+    
+    <text id="searchFilter/creationDate">
+        <translation lang="de">Erstellt am:</translation>
+        <translation lang="en">Created:</translation>
+    </text>
+    
+    <text id="searchfilter/creationUser">
+        <translation lang="de">Erstellt von:</translation>
+        <translation lang="en">Created by:</translation>
+    </text>
+    
+    <text id="searchfilter/lastModUser">
+        <translation lang="de">Geändert von:</translation>
+        <translation lang="en">Edited by:</translation>
+    </text>
+    
+    <text id="searchfilter/launchDate">
+        <translation lang="de">Publiziert am:</translation>
+        <translation lang="en">Published at:</translation>
+    </text>
+    
+    <text id="searchfilter/lastModDate">
+        <translation lang="de">Geändert am:</translation>
+        <translation lang="en">Edited at:</translation>
+    </text>
+    
+    <text id="searchfilter/creationDate">
+        <translation lang="de">Erstellt am:</translation>
+        <translation lang="en">Created at</translation>
+    </text>
+    
+    <text id="searchfilter/dateRange/day">
+        <translation lang="de">Tag</translation>
+        <translation lang="en">Day</translation>
+    </text>
+    
+    <text id="searchfilter/dateRange/month">
+        <translation lang="de">Monat</translation>
+        <translation lang="en">Month</translation>
+    </text>
+    
+    <text id="searchfilter/dateRange/year">
+        <translation lang="de">Jahr</translation>
+        <translation lang="en">Year</translation>
+    </text>
+    
+    <text id="searchfilter/dateRange/from">
+        <translation lang="de">Von:</translation>
+        <translation lang="en">From:</translation>
+    </text>
+    
+    <text id="searchfilter/dateRange/to">
+        <translation lang="de">Bis:</translation>
+        <translation lang="en">To:</translation>
+    </text>
+    
+</foundry:static-texts>
\ No newline at end of file