diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/imageAttachment.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/imageAttachment.xsl
index 6c01922f2..3d7e8a32a 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/imageAttachment.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/imageAttachment.xsl
@@ -147,12 +147,14 @@ Parameter showCaption: boolean to sshow caption
         <xsl:attribute name="class">
           <xsl:value-of select="$imageGallery"/>
         </xsl:attribute>
-        <xsl:attribute name="rel">
-          <xsl:value-of select="$imageGallery"/>
-        </xsl:attribute>
+        <xsl:if test="$imageGallery != 'imageZoom'">
+          <xsl:attribute name="rel">
+            <xsl:value-of select="$imageGallery"/>
+          </xsl:attribute>
+        </xsl:if>
         <xsl:call-template name="mandalay:imageGallerySetup">
           <xsl:with-param name="imageGallery" select="$imageGallery"/>
-        </xsl:call-template>        
+        </xsl:call-template>
         <img>
           <xsl:attribute name="src">
             <xsl:value-of select="$dispatcher-prefix"/>/cms-service/stream/image/?image_id=<xsl:value-of select="id"/>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/imageGallery.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/imageGallery.xsl
index acb4ef333..21c38a3ba 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/imageGallery.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/imageGallery.xsl
@@ -43,15 +43,20 @@
   exclude-result-prefixes="xsl bebop cms nav mandalay"
   version="1.0">
   
-  <xsl:template name="mandalay:imageGallery">
-
+  <xsl:template name="mandalay:fancybox">
+<!--
     <xsl:if test="count($resultTree//cms:item/image | $resultTree//cms:item/imageAttachments/image) > 1">
+-->
       <script type="text/javascript" src="/assets/jquery.js"/>
       <script type="text/javascript" src="/assets/fancybox/jquery.fancybox.pack.js"/>
       <script type="text/javascript" src="/assets/fancybox/jquery.easing.pack.js"/>
       <script type="text/javascript" src="/assets/fancybox/jquery.mousewheel.pack.js"/>
       <link rel="stylesheet" href="/assets/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen"/>
+
+      <script type="text/javascript">$(document).ready(function() {$("a.imageZoom").fancybox({'type':'image'});});</script>
+<!--
     </xsl:if>
+-->
 <!--
     <xsl:variable name="firstMatch">
       <xsl:value-of select="//imageAttachment/@name"/>
@@ -166,4 +171,4 @@
     </xsl:if>
 
   </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
index 9ab559c4c..31037d1be 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
@@ -52,7 +52,6 @@
         <xsl:value-of select="$lang"/>
       </xsl:attribute>
       <xsl:apply-templates/>
-      <script type="text/javascript" src="/assets/xinha/plugins/Equation/ASCIIMathML.js"></script>
     </html>
   </xsl:template>
 
@@ -77,7 +76,7 @@
     </xsl:variable>
     <xsl:variable name="colorClass">
       <xsl:if test="@withColorset='true'">
-        <xsl:call-template name="mandalay:getColorset"/>       
+        <xsl:call-template name="mandalay:getColorset"/>
       </xsl:if>
     </xsl:variable>
     
@@ -161,6 +160,13 @@
     <xsl:call-template name="mandalay:cssLoader"/>
   </xsl:template>
 
+  <xsl:template match="useFancybox">
+    <xsl:call-template name="mandalay:fancybox"/>
+  </xsl:template>
+
+  <xsl:template match="useMathJax">
+    <script type="text/javascript" src="/assets/mathjax/MathJax.js?config=TeX-MML-AM_HTMLorMML"/>
+  </xsl:template>
 
   <!-- DE Setze den lokalisierten Seitentitel -->
   <!-- EN Setup localized page title -->
@@ -448,11 +454,11 @@
           <xsl:with-param name="layoutTree" select="."/>
         </xsl:apply-templates>
       </xsl:when>
-      <xsl:when test="../useSearchResults">
-        <xsl:apply-templates select="$resultTree/search:results/search:paginator" mode="header">
+      <xsl:otherwise>
+        <xsl:apply-templates select="$resultTree//search:paginator" mode="header">
           <xsl:with-param name="layoutTree" select="."/>
         </xsl:apply-templates>
-      </xsl:when>
+      </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
@@ -464,11 +470,11 @@
           <xsl:with-param name="layoutTree" select="."/>
         </xsl:apply-templates>
       </xsl:when>
-      <xsl:when test="../useSearchResults">
-        <xsl:apply-templates select="$resultTree/search:results/search:paginator" mode="navbar">
+      <xsl:otherwise>
+        <xsl:apply-templates select="$resultTree//search:paginator" mode="navbar">
           <xsl:with-param name="layoutTree" select="."/>
         </xsl:apply-templates>
-      </xsl:when>
+      </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/search/searchResults.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/search/searchResults.xsl
index 89248a143..844aaad7f 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/search/searchResults.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/search/searchResults.xsl
@@ -43,8 +43,6 @@
   <!-- DE Zeigt das Ergebnis in der Admin-Oberfläche an -->
   <!-- EN Show the result on admin pages -->
   <xsl:template match="search:results">
-    <xsl:apply-templates select="search:paginator" mode="header"/>
-    <xsl:apply-templates select="search:paginator" mode="navbar"/>
     <xsl:choose>
       <xsl:when test="../search:query/bebop:formWidget[@name='draft_search']">
         <xsl:apply-templates select="search:documents" mode="admin"/>
@@ -53,7 +51,6 @@
         <xsl:apply-templates select="search:documents"/>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates select="search:paginator" mode="navbar"/>
   </xsl:template>
   
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types/Event.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types/Event.xsl
index 592f1661d..1ef1fee33 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/types/Event.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/types/Event.xsl
@@ -409,23 +409,6 @@
         </xsl:if>
       </div>
     </xsl:if>
-    <a>
-      <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
-      <xsl:attribute name="title">
-        <xsl:call-template name="mandalay:shying">
-          <xsl:with-param name="title">
-            <xsl:value-of select="nav:attribute[@name='title']"/>
-          </xsl:with-param>
-          <xsl:with-param name="mode">dynamic</xsl:with-param>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:call-template name="mandalay:shying">
-        <xsl:with-param name="title">
-          <xsl:value-of disable-output-escaping="yes" select="nav:attribute[@name='title']"/>
-        </xsl:with-param>
-        <xsl:with-param name="mode">dynamic</xsl:with-param>
-      </xsl:call-template>
-    </a>
 
     <a class="CIname">
       <xsl:attribute name="href"><xsl:value-of select="nav:path"/></xsl:attribute>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types/GenericContact.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types/GenericContact.xsl
index 713e430d7..45b6396f4 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/types/GenericContact.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/types/GenericContact.xsl
@@ -456,10 +456,10 @@
           </xsl:call-template>    
         </h3>
       </xsl:if>
-      <xsl:for-each select="contactEntryKeys/entryKey">
-        <xsl:apply-templates select="contactentries">
-          <xsl:with-param name="key" select="entryKey"/>
-        </xsl:apply-templates>
+      <xsl:for-each select="./contactEntryKeys/entryKey">
+	<xsl:apply-templates select="../../contactentries[keyId=current()]">
+	  <xsl:with-param name="key" select="entryKey"/>
+	</xsl:apply-templates>
       </xsl:for-each>
     </xsl:if>
   </xsl:template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types/Person.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types/Person.xsl
index bcd7de179..03ca47eba 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/types/Person.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/types/Person.xsl
@@ -351,8 +351,8 @@
 
   <xsl:template name="CT_Person_Link" match="*/cms:item/links[targetItem/objectType = 'com.arsdigita.cms.contenttypes.Person']" mode="link_view">
 
-    <!-- DE Hole alle benötigten Einstellungen-->
-    <!-- EN Getting all needed setting-->
+    <!-- DE Hole alle benötigten Einstellungen -->
+    <!-- EN Getting all needed setting -->
     <xsl:variable name="setImageAndText">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'Person'"/>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types/SiteProxy.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types/SiteProxy.xsl
index 565a828cc..ea80319dd 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/types/SiteProxy.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/types/SiteProxy.xsl
@@ -92,8 +92,7 @@
 
     <div id="mainBody">
       <xsl:apply-templates select="/bebop:page/cms:contentPanel[@id = 'siteProxyItemXML']"/>
-      <xsl:apply-templates select="/bebop:page/cms:contentPanel/cms:siteProxyPanel"/>
-      <xsl:apply-templates select="/bebop:page/cms:siteProxyPanel"/>
+      <xsl:apply-templates select="cms:siteProxyPanel"/>
       <div class="endFloat"/>
     </div>
     <div class="endFloat"/>