diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopForm.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopForm.xsl
index 377956440..d4dc804c5 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopForm.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopForm.xsl
@@ -31,45 +31,45 @@
 <!-- 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:mandalay="http://mandalay.quasiweb.de" 
-  exclude-result-prefixes="xsl bebop cms nav"
-  version="1.0">
+    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:mandalay="http://mandalay.quasiweb.de" 
+    exclude-result-prefixes="xsl bebop cms nav"
+    version="1.0">
 
-  <!-- DE Formulare -->
-  <!-- EN Forms -->
-  <xsl:template match="bebop:form">
-    <xsl:if test="@message">
-      <div class="formMessage">
-        <xsl:value-of select="@message"/>
-      </div>
-    </xsl:if>
-    <form>
-      <xsl:if test="not(@method)">
-        <xsl:attribute name="method">post</xsl:attribute>
-      </xsl:if>
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <xsl:apply-templates/>
-    </form>
-  </xsl:template>
+    <!-- DE Formulare -->
+    <!-- EN Forms -->
+    <xsl:template match="bebop:form">
+        <xsl:if test="@message">
+            <div class="formMessage">
+                <xsl:value-of select="@message"/>
+            </div>
+        </xsl:if>
+        <form>
+            <xsl:if test="not(@method)">
+                <xsl:attribute name="method">post</xsl:attribute>
+            </xsl:if>
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:apply-templates/>
+        </form>
+    </xsl:template>
 
-  <!-- DE Formularfehler -->
-  <!-- EN Form errors -->
-  <xsl:template match="bebop:formErrors">
-    <span class="bebopFormErrors">
-      <xsl:value-of disable-output-escaping="yes" select="@message"/>
-    </span>
-    <br />
-  </xsl:template>
+    <!-- DE Formularfehler -->
+    <!-- EN Form errors -->
+    <xsl:template match="bebop:formErrors">
+        <span class="bebopFormErrors">
+            <xsl:value-of disable-output-escaping="yes" select="@message"/>
+        </span>
+        <br />
+    </xsl:template>
   
-  <!-- DE Verschiebe-Knöpfe -->
-  <!-- EN Move-Buttons -->
-  <xsl:template match="bebop:cell[@prevURL != '' or @nextURL != '']">
-    <xsl:apply-templates select="."/>
-    <xsl:call-template name="mandalay:moveButtons"/>
-  </xsl:template>
+    <!-- DE Verschiebe-Knöpfe -->
+    <!-- EN Move-Buttons -->
+    <xsl:template match="bebop:cell[@prevURL != '' or @nextURL != '']">
+        <xsl:apply-templates select="."/>
+        <xsl:call-template name="mandalay:moveButtons"/>
+    </xsl:template>
 
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopImage.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopImage.xsl
index 02c1047a3..c2af05a95 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopImage.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopImage.xsl
@@ -36,18 +36,18 @@
     exclude-result-prefixes="xsl bebop cms nav mandalay"
     version="1.0">
     
-  <!-- DE Verarbeite Bilder - Ignoriere javascript-mode -->
-  <!-- EN Processing images - inore javascript-mode --> 
-  <xsl:template match="bebop:image" mode="javascript-mode">
-    <xsl:apply-templates select="."/>
-  </xsl:template>
+    <!-- DE Verarbeite Bilder - Ignoriere javascript-mode -->
+    <!-- EN Processing images - inore javascript-mode --> 
+    <xsl:template match="bebop:image" mode="javascript-mode">
+        <xsl:apply-templates select="."/>
+    </xsl:template>
 
-  <!-- DE Verarbeite Bilder -->
-  <!-- EN Processing images -->
-  <xsl:template name="bebop:image" match="bebop:image">
-    <img class="bebopImage">
-      <xsl:call-template name="mandalay:processAttributes"/>
-    </img>
-  </xsl:template>
+    <!-- DE Verarbeite Bilder -->
+    <!-- EN Processing images -->
+    <xsl:template name="bebop:image" match="bebop:image">
+        <img class="bebopImage">
+            <xsl:call-template name="mandalay:processAttributes"/>
+        </img>
+    </xsl:template>
 
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopLabel.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopLabel.xsl
index bc09df958..2405bc788 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopLabel.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopLabel.xsl
@@ -31,236 +31,236 @@
 -->
 
 <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:mandalay="http://mandalay.quasiweb.de" 
-  exclude-result-prefixes="xsl bebop cms nav mandalay"
-  version="1.0">
+    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:mandalay="http://mandalay.quasiweb.de" 
+    exclude-result-prefixes="xsl bebop cms nav mandalay"
+    version="1.0">
   
-  <!-- DE Ein Text-Label mit Formatierung -->
-  <!-- EN A formatted text label -->
-  <xsl:template match="bebop:label[@color != '' or @weight != '' or @id != '']">
-    <xsl:call-template name="mandalay:bebopLabelStyle">
-      <xsl:with-param name="text">
-        <xsl:value-of select="."/>
-      </xsl:with-param>
-      <xsl:with-param name="escape">
-        <xsl:value-of select="@escape"/>
-      </xsl:with-param>
-      <xsl:with-param name="color">
-        <xsl:value-of select="@color"/>
-      </xsl:with-param>
-      <xsl:with-param name="weight">
-        <xsl:value-of select="@weight"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-
-  <!-- DE Ein Text-Label im Javascript-Mode und mit Formatierung -->
-  <!-- EN A formatted, javascript-mode text label -->
-  <xsl:template match="bebop:label[@color != '' or @weight != '' or @id != '']" mode="javascript-mode">
-    <xsl:call-template name="mandalay:bebopLabelStyle">
-      <xsl:with-param name="text">
-        <xsl:value-of select="."/>
-      </xsl:with-param>
-      <xsl:with-param name="escape">
-        <xsl:value-of select="@escape"/>
-      </xsl:with-param>
-      <xsl:with-param name="color">
-        <xsl:value-of select="@color"/>
-      </xsl:with-param>
-      <xsl:with-param name="weight">
-        <xsl:value-of select="@weight"/>
-      </xsl:with-param>
-      <xsl:with-param name="mode">
-        <xsl:text>javascript</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  
-  <!-- DE Ein Text-Label im Javascript-Mode -->
-  <!-- EN A javascript-mode text label -->
-  <xsl:template match="bebop:label" mode="javascript-mode">
-    <xsl:call-template name="mandalay:bebopLabelTextJS">
-      <xsl:with-param name="text">
-        <xsl:value-of select="."/>
-      </xsl:with-param>
-      <xsl:with-param name="escape">
-        <xsl:value-of select="@escape"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  
-  <!-- DE Ein vorformatiertes Text-Label -->
-  <!-- EN A preformatted text label -->
-  <xsl:template match="bebop:label[@class = 'preformatted']">
-    <pre>
-      <xsl:call-template name="mandalay:bebopLabelText">
-        <xsl:with-param name="text">
-          <xsl:value-of select="."/>
-        </xsl:with-param>
-        <xsl:with-param name="escape">
-          <xsl:value-of select="@escape"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </pre>
-  </xsl:template>
-  
-  <!-- DE Ein Text-Label als Überschrift -->
-  <!-- EN A text label for the heading -->
-  <xsl:template match="bebop:label[@class = 'heading']">
-    <span class="heading">
-      <xsl:call-template name="mandalay:bebopLabelText">
-        <xsl:with-param name="text">
-          <xsl:value-of select="."/>
-        </xsl:with-param>
-        <xsl:with-param name="escape">
-          <xsl:value-of select="@escape"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </span>
-  </xsl:template>
-  
-  <!-- DE Ein Text-Label -->
-  <!-- EN A text label -->
-  <xsl:template match="bebop:label">
-    <xsl:call-template name="mandalay:bebopLabelText">
-      <xsl:with-param name="text">
-        <xsl:value-of select="."/>
-      </xsl:with-param>
-      <xsl:with-param name="escape">
-        <xsl:value-of select="@escape"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
- 
-  <!-- DE Ein graphisches Label-->
-  <!-- EN A graphical label -->
-  <xsl:template match="bebop:label" mode="image">
-    <xsl:param name="alt"/>
-    <xsl:param name="title"/>
-    <xsl:param name="src"/>
-    <img alt="{$alt}" title="{$title}" src="{$src}"/>
-  </xsl:template>
- 
-  <!-- DE Setze die Formatierung für das Label als style Attribut für ein span -->
-  <!-- EN Set label formatting as style attribute for a span-->
-  <xsl:template name="mandalay:bebopLabelStyle">
-    <xsl:param name="text"/>
-    <xsl:param name="escape">no</xsl:param>
-    <xsl:param name="color"/>
-    <xsl:param name="weight"/>
-    <xsl:param name="mode"/>
-    
-    <span>
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <xsl:choose>
-        <xsl:when test="$color != ''">
-          <xsl:attribute name="style">
-            <xsl:value-of select="concat('font-color:', $color, ';')"/>
-          </xsl:attribute>
-        </xsl:when>
-        <xsl:when test="$weight != ''">
-          <xsl:attribute name="style">
-            <xsl:choose>
-              <xsl:when test="$weight = 'b'">
-                <xsl:text>font-weight:bold;</xsl:text>
-              </xsl:when>
-              <xsl:when test="$weight = 'i'">
-                <xsl:text>font-style:italic;</xsl:text>
-              </xsl:when>
-              <xsl:when test="$weight = 'bi' or $weight = 'ib'">
-                <xsl:text>font-style:italic;font-weight:bold;</xsl:text>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="concat('font-weight:', $weight, ';')"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-        </xsl:when>
-      </xsl:choose>
-      <xsl:choose>
-        <xsl:when test="$mode = 'javascript'">
-          <xsl:call-template name="mandalay:bebopLabelTextJS">
+    <!-- DE Ein Text-Label mit Formatierung -->
+    <!-- EN A formatted text label -->
+    <xsl:template match="bebop:label[@color != '' or @weight != '' or @id != '']">
+        <xsl:call-template name="mandalay:bebopLabelStyle">
             <xsl:with-param name="text">
-              <xsl:value-of select="$text"/>
+                <xsl:value-of select="."/>
             </xsl:with-param>
             <xsl:with-param name="escape">
-              <xsl:value-of select="$escape"/>
+                <xsl:value-of select="@escape"/>
             </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="mandalay:bebopLabelText">
-            <xsl:with-param name="text">
-              <xsl:value-of select="$text"/>
+            <xsl:with-param name="color">
+                <xsl:value-of select="@color"/>
             </xsl:with-param>
-            <xsl:with-param name="escape">
-              <xsl:value-of select="$escape"/>
+            <xsl:with-param name="weight">
+                <xsl:value-of select="@weight"/>
             </xsl:with-param>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </span>
-  </xsl:template>
-  
-  <!-- DE Erzuege den Text des Labels javascript konform -->
-  <!-- EN Processing the label text in a javascript compatible way -->
-  <xsl:template name="mandalay:bebopLabelTextJS">
-    <xsl:param name="text"/>
-    <xsl:param name="escape">no</xsl:param>
-    
-    <xsl:call-template name="mandalay:bebopLabelText">
-      <xsl:with-param name="text">
-        <xsl:call-template name="mandalay:string-replace">
-          <xsl:with-param name="string">
-            <xsl:value-of select="."/>
-          </xsl:with-param>
-          <xsl:with-param name="from">
-            <xsl:text>&apos;</xsl:text>
-          </xsl:with-param>
-          <xsl:with-param name="to">
-            <xsl:text>\&apos;</xsl:text>
-          </xsl:with-param>
         </xsl:call-template>
-      </xsl:with-param>
-      <xsl:with-param name="escape">
-        <xsl:value-of select="$escape"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
+    </xsl:template>
 
-  <!-- DE Erzeuge den Text des Labels-->
-  <!-- EN Processing the label text-->
-  <xsl:template name="mandalay:bebopLabelText">
-    <xsl:param name="text"/>
-    <xsl:param name="escape">no</xsl:param>
+    <!-- DE Ein Text-Label im Javascript-Mode und mit Formatierung -->
+    <!-- EN A formatted, javascript-mode text label -->
+    <xsl:template match="bebop:label[@color != '' or @weight != '' or @id != '']" mode="javascript-mode">
+        <xsl:call-template name="mandalay:bebopLabelStyle">
+            <xsl:with-param name="text">
+                <xsl:value-of select="."/>
+            </xsl:with-param>
+            <xsl:with-param name="escape">
+                <xsl:value-of select="@escape"/>
+            </xsl:with-param>
+            <xsl:with-param name="color">
+                <xsl:value-of select="@color"/>
+            </xsl:with-param>
+            <xsl:with-param name="weight">
+                <xsl:value-of select="@weight"/>
+            </xsl:with-param>
+            <xsl:with-param name="mode">
+                <xsl:text>javascript</xsl:text>
+            </xsl:with-param>
+        </xsl:call-template>
+    </xsl:template>
+  
+    <!-- DE Ein Text-Label im Javascript-Mode -->
+    <!-- EN A javascript-mode text label -->
+    <xsl:template match="bebop:label" mode="javascript-mode">
+        <xsl:call-template name="mandalay:bebopLabelTextJS">
+            <xsl:with-param name="text">
+                <xsl:value-of select="."/>
+            </xsl:with-param>
+            <xsl:with-param name="escape">
+                <xsl:value-of select="@escape"/>
+            </xsl:with-param>
+        </xsl:call-template>
+    </xsl:template>
+  
+    <!-- DE Ein vorformatiertes Text-Label -->
+    <!-- EN A preformatted text label -->
+    <xsl:template match="bebop:label[@class = 'preformatted']">
+        <pre>
+            <xsl:call-template name="mandalay:bebopLabelText">
+                <xsl:with-param name="text">
+                    <xsl:value-of select="."/>
+                </xsl:with-param>
+                <xsl:with-param name="escape">
+                    <xsl:value-of select="@escape"/>
+                </xsl:with-param>
+            </xsl:call-template>
+        </pre>
+    </xsl:template>
+  
+    <!-- DE Ein Text-Label als Überschrift -->
+    <!-- EN A text label for the heading -->
+    <xsl:template match="bebop:label[@class = 'heading']">
+        <span class="heading">
+            <xsl:call-template name="mandalay:bebopLabelText">
+                <xsl:with-param name="text">
+                    <xsl:value-of select="."/>
+                </xsl:with-param>
+                <xsl:with-param name="escape">
+                    <xsl:value-of select="@escape"/>
+                </xsl:with-param>
+            </xsl:call-template>
+        </span>
+    </xsl:template>
+  
+    <!-- DE Ein Text-Label -->
+    <!-- EN A text label -->
+    <xsl:template match="bebop:label">
+        <xsl:call-template name="mandalay:bebopLabelText">
+            <xsl:with-param name="text">
+                <xsl:value-of select="."/>
+            </xsl:with-param>
+            <xsl:with-param name="escape">
+                <xsl:value-of select="@escape"/>
+            </xsl:with-param>
+        </xsl:call-template>
+    </xsl:template>
+ 
+    <!-- DE Ein graphisches Label-->
+    <!-- EN A graphical label -->
+    <xsl:template match="bebop:label" mode="image">
+        <xsl:param name="alt"/>
+        <xsl:param name="title"/>
+        <xsl:param name="src"/>
+        <img alt="{$alt}" title="{$title}" src="{$src}"/>
+    </xsl:template>
+ 
+    <!-- DE Setze die Formatierung für das Label als style Attribut für ein span -->
+    <!-- EN Set label formatting as style attribute for a span-->
+    <xsl:template name="mandalay:bebopLabelStyle">
+        <xsl:param name="text"/>
+        <xsl:param name="escape">no</xsl:param>
+        <xsl:param name="color"/>
+        <xsl:param name="weight"/>
+        <xsl:param name="mode"/>
     
-    <!-- DE Keine leeren Labels ausgeben. Das original Theme wandelt diese in &#160; um. Das sollte nicht nötig sein -->
-    <!-- EN Don't print empty Labels. Originally they were converted to &#160; but that shouldn't be needed -->
-    <xsl:if test="not(normalize-space($text)='')">
-      <xsl:choose>
-        <xsl:when test="$escape='yes'">
-          <xsl:value-of disable-output-escaping="yes" select="$text"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of disable-output-escaping="no" select="$text"/>
-        </xsl:otherwise>
-      </xsl:choose> 
-    </xsl:if>
+        <span>
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:choose>
+                <xsl:when test="$color != ''">
+                    <xsl:attribute name="style">
+                        <xsl:value-of select="concat('font-color:', $color, ';')"/>
+                    </xsl:attribute>
+                </xsl:when>
+                <xsl:when test="$weight != ''">
+                    <xsl:attribute name="style">
+                        <xsl:choose>
+                            <xsl:when test="$weight = 'b'">
+                                <xsl:text>font-weight:bold;</xsl:text>
+                            </xsl:when>
+                            <xsl:when test="$weight = 'i'">
+                                <xsl:text>font-style:italic;</xsl:text>
+                            </xsl:when>
+                            <xsl:when test="$weight = 'bi' or $weight = 'ib'">
+                                <xsl:text>font-style:italic;font-weight:bold;</xsl:text>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:value-of select="concat('font-weight:', $weight, ';')"/>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:attribute>
+                </xsl:when>
+            </xsl:choose>
+            <xsl:choose>
+                <xsl:when test="$mode = 'javascript'">
+                    <xsl:call-template name="mandalay:bebopLabelTextJS">
+                        <xsl:with-param name="text">
+                            <xsl:value-of select="$text"/>
+                        </xsl:with-param>
+                        <xsl:with-param name="escape">
+                            <xsl:value-of select="$escape"/>
+                        </xsl:with-param>
+                    </xsl:call-template>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:call-template name="mandalay:bebopLabelText">
+                        <xsl:with-param name="text">
+                            <xsl:value-of select="$text"/>
+                        </xsl:with-param>
+                        <xsl:with-param name="escape">
+                            <xsl:value-of select="$escape"/>
+                        </xsl:with-param>
+                    </xsl:call-template>
+                </xsl:otherwise>
+            </xsl:choose>
+        </span>
+    </xsl:template>
+  
+    <!-- DE Erzuege den Text des Labels javascript konform -->
+    <!-- EN Processing the label text in a javascript compatible way -->
+    <xsl:template name="mandalay:bebopLabelTextJS">
+        <xsl:param name="text"/>
+        <xsl:param name="escape">no</xsl:param>
+    
+        <xsl:call-template name="mandalay:bebopLabelText">
+            <xsl:with-param name="text">
+                <xsl:call-template name="mandalay:string-replace">
+                    <xsl:with-param name="string">
+                        <xsl:value-of select="."/>
+                    </xsl:with-param>
+                    <xsl:with-param name="from">
+                        <xsl:text>&apos;</xsl:text>
+                    </xsl:with-param>
+                    <xsl:with-param name="to">
+                        <xsl:text>\&apos;</xsl:text>
+                    </xsl:with-param>
+                </xsl:call-template>
+            </xsl:with-param>
+            <xsl:with-param name="escape">
+                <xsl:value-of select="$escape"/>
+            </xsl:with-param>
+        </xsl:call-template>
+    </xsl:template>
 
-    <!-- DE Hinweise anzeigen -->
-    <!-- EN Display form hints -->
-    <xsl:if test="../following-sibling::bebop:cell/*/@hint != ''">
-      <span class="hint">
-        <xsl:attribute name="content">
-          <xsl:value-of select="../following-sibling::bebop:cell/*/@hint"/>
-        </xsl:attribute>
-        (?)
-      </span>
-    </xsl:if>
-  </xsl:template>
+    <!-- DE Erzeuge den Text des Labels-->
+    <!-- EN Processing the label text-->
+    <xsl:template name="mandalay:bebopLabelText">
+        <xsl:param name="text"/>
+        <xsl:param name="escape">no</xsl:param>
+    
+        <!-- DE Keine leeren Labels ausgeben. Das original Theme wandelt diese in &#160; um. Das sollte nicht nötig sein -->
+        <!-- EN Don't print empty Labels. Originally they were converted to &#160; but that shouldn't be needed -->
+        <xsl:if test="not(normalize-space($text)='')">
+            <xsl:choose>
+                <xsl:when test="$escape='yes'">
+                    <xsl:value-of disable-output-escaping="yes" select="$text"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of disable-output-escaping="no" select="$text"/>
+                </xsl:otherwise>
+            </xsl:choose> 
+        </xsl:if>
+
+        <!-- DE Hinweise anzeigen -->
+        <!-- EN Display form hints -->
+        <xsl:if test="../following-sibling::bebop:cell/*/@hint != ''">
+            <span class="hint">
+                <xsl:attribute name="content">
+                    <xsl:value-of select="../following-sibling::bebop:cell/*/@hint"/>
+                </xsl:attribute>
+                (?)
+            </span>
+        </xsl:if>
+    </xsl:template>
     
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopLink.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopLink.xsl
index 6f39e6d74..b5699591a 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopLink.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopLink.xsl
@@ -44,75 +44,75 @@
 
 
 <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:mandalay="http://mandalay.quasiweb.de"
-  exclude-result-prefixes="xsl bebop cms nav" 
-  version="1.0">
+    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:mandalay="http://mandalay.quasiweb.de"
+    exclude-result-prefixes="xsl bebop cms nav" 
+    version="1.0">
 
-  <!-- DE Hier werden die Links verarbeitet -->
-  <!-- EN Processing links -->
-  <xsl:template name="bebop:link" match="bebop:link">
-    <xsl:param name="alt"/>
-    <xsl:param name="title"/>
-    <xsl:param name="src"/>
+    <!-- DE Hier werden die Links verarbeitet -->
+    <!-- EN Processing links -->
+    <xsl:template name="bebop:link" match="bebop:link">
+        <xsl:param name="alt"/>
+        <xsl:param name="title"/>
+        <xsl:param name="src"/>
     
-    <!-- DE  -->
-    <!-- EN  -->
-    <xsl:variable name="onclick">
-      <xsl:choose>
-        <xsl:when test="boolean(@onclick)=true() and not(starts-with(@onclick, 'return'))">
-          <xsl:value-of select="@onclick" disable-output-escaping="yes"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>this.href='</xsl:text>
-          <xsl:value-of select="@href" disable-output-escaping="yes"/>
-          <xsl:text>'; </xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
+        <!-- DE  -->
+        <!-- EN  -->
+        <xsl:variable name="onclick">
+            <xsl:choose>
+                <xsl:when test="boolean(@onclick)=true() and not(starts-with(@onclick, 'return'))">
+                    <xsl:value-of select="@onclick" disable-output-escaping="yes"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:text>this.href='</xsl:text>
+                    <xsl:value-of select="@href" disable-output-escaping="yes"/>
+                    <xsl:text>'; </xsl:text>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
     
-    <!-- DE DoubleClickProtection für Links, wenn es keinen OnClick-Handler gibt -->
-    <!-- EN DoubleClickProtection for links without an onclick handler -->
-    <xsl:variable name="dcp">
-      <xsl:if test="$dcp-on-links and boolean(@onclick)=false()">
-        <xsl:text>doubleClickProtect(this); </xsl:text>
-      </xsl:if>
-    </xsl:variable>
+        <!-- DE DoubleClickProtection für Links, wenn es keinen OnClick-Handler gibt -->
+        <!-- EN DoubleClickProtection for links without an onclick handler -->
+        <xsl:variable name="dcp">
+            <xsl:if test="$dcp-on-links and boolean(@onclick)=false()">
+                <xsl:text>doubleClickProtect(this); </xsl:text>
+            </xsl:if>
+        </xsl:variable>
     
-    <!-- DE Wenn es ein Link mit Bestätigung ist -->
-    <!-- EN A link with confirmation -->
-    <xsl:variable name="confirm">
-      <xsl:if test="boolean(@confirm)=true() or starts-with(@onclick, 'return')">
-        <xsl:call-template name="mandalay:string-replace">
-          <xsl:with-param name="string" select="@onclick"/>
-          <xsl:with-param name="from" select="'\'"/>
-          <xsl:with-param name="to" select="''"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:variable>
+        <!-- DE Wenn es ein Link mit Bestätigung ist -->
+        <!-- EN A link with confirmation -->
+        <xsl:variable name="confirm">
+            <xsl:if test="boolean(@confirm)=true() or starts-with(@onclick, 'return')">
+                <xsl:call-template name="mandalay:string-replace">
+                    <xsl:with-param name="string" select="@onclick"/>
+                    <xsl:with-param name="from" select="'\'"/>
+                    <xsl:with-param name="to" select="''"/>
+                </xsl:call-template>
+            </xsl:if>
+        </xsl:variable>
     
-    <a>
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <xsl:attribute name="href">
-        <xsl:call-template name="mandalay:linkParser">
-          <xsl:with-param name="link" select="@href_no_javascript"/>
-        </xsl:call-template>
-      </xsl:attribute>
+        <a>
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:attribute name="href">
+                <xsl:call-template name="mandalay:linkParser">
+                    <xsl:with-param name="link" select="@href_no_javascript"/>
+                </xsl:call-template>
+            </xsl:attribute>
       
-      <xsl:attribute name="onclick">
-        <xsl:value-of select="$onclick"/>  
-        <xsl:value-of select="$dcp"/>
-        <xsl:value-of select="$confirm"/>  
-      </xsl:attribute>
+            <xsl:attribute name="onclick">
+                <xsl:value-of select="$onclick"/>  
+                <xsl:value-of select="$dcp"/>
+                <xsl:value-of select="$confirm"/>  
+            </xsl:attribute>
       
-      <xsl:if test="$src">
-        <img alt="{$alt}" title="{$title}" src="{$src}"/>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </a>
-  </xsl:template>
+            <xsl:if test="$src">
+                <img alt="{$alt}" title="{$title}" src="{$src}"/>
+            </xsl:if>
+            <xsl:apply-templates/>
+        </a>
+    </xsl:template>
     
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopList.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopList.xsl
index a90a52179..0c0d9a3d9 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopList.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopList.xsl
@@ -40,7 +40,7 @@
     <!-- DE Eine verticale Liste als UL, wenn es keine item-path-Liste ist -->
     <!-- EN A vertical list as ul, if it is not an item-path type list -->
     <xsl:template match="bebop:list[@layout = 'vertical']">
-        <xsl:call-template name="mandalay:processAttributes"/>
+        <!--<xsl:call-template name="mandalay:processAttributes"/>-->
   
         <xsl:choose>
             <xsl:when test="@type = 'item-path'">
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopPanel.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopPanel.xsl
index 4596eef62..ca83018c7 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopPanel.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopPanel.xsl
@@ -33,199 +33,199 @@
 <!-- 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:mandalay="http://mandalay.quasiweb.de" 
-  exclude-result-prefixes="xsl bebop cms nav"
-  version="1.0">
+    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:mandalay="http://mandalay.quasiweb.de" 
+    exclude-result-prefixes="xsl bebop cms nav"
+    version="1.0">
 
-  <!-- DE Layout Panel: Ein 2- 3-spaltiges Panel -->
-  <!-- EN Layout panel: A 2- 3-column panel -->
-  <xsl:template match="bebop:layoutPanel">
-    <div class="bebopLayoutPanel">
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-  
-  <!-- DE Linke Spalte -->
-  <!-- EN Left column -->
-  <xsl:template match="bebop:left">
-    <div class="bebopLeft">
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-  
-  <!-- DE Haupt-Spalte bzw. mittlere Spalte -->
-  <!-- EN Main or middle column --> 
-  <xsl:template match="bebop:body">
-    <div class="bebopBody">
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-  
-  <!-- DE Segmented Panel: Ein Panel aus Segmenten mit Überschrift und Inhaltsbereich -->
-  <!-- EN Segmented Panel: A panel of segments with heading and content part -->
-  <xsl:template match="bebop:segmentedPanel">
-    <div class="bebopSegmentedPanel">
-      <!-- DE Verarbeite vorhandene Parameter -->
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-  
-  <!-- DE Ein Segment für das Segmented Panel. Bebop:section macht das gleiche, nur 
-          ohne das umschließende Segmented Panel. -->
-  <!-- EN A segment for segmented panel. Bebop:section is doing the same, only without
-          the surrounding segmented panel. -->
-  <xsl:template match="bebop:segment | bebop:section">
-    <div class="bebopSegment">
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <xsl:apply-templates select="bebop:segmentHeader | bebop:heading" mode="segment"/>
-      <xsl:apply-templates select="bebop:segmentBody | bebop:body" mode="segment"/>
-    </div>
-  </xsl:template>
-  
-  <!-- DE Überschrift für ein Segment -->
-  <!-- EN Heading for a segment -->
-  <xsl:template match="bebop:segmentHeader | bebop:heading" mode="segment">
-    <h3 class="bebopSegmentHeader">
-      <xsl:apply-templates/>
-    </h3>
-  </xsl:template>
-  
-  <!-- DE Inhaltsbereich für ein Segment -->
-  <!-- EN Content for a segment -->
-  <xsl:template match="bebop:segmentBody | bebop:body" mode="segment">
-    <div class="bebopSegmentBody">
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-
-  <!-- DE Split Panel: Ein Panel mit Überschrift und 2 Spalten -->
-  <!-- EN Split Panel: A penel with a heading and 2 columns -->
-  <xsl:template match="bebop:splitPanel">
-    <div width="{@width}" border="{@border}" cellpadding="{@cellpadding}" cellspacing="{@cellspacing}">
-      <div class="bebopSplitPanelHeader">
-        <xsl:apply-templates select="bebop:cell[position()=1]"/>
-      </div>
-      <div class="bebopSplitPanelLeft" width="{@divider_left}">
-        <xsl:apply-templates select="bebop:cell[position()=2]"/>
-      </div>
-      <div class="bebopSplitPanelRight" width="{@divider_right}">
-        <xsl:apply-templates select="bebop:cell[position()>2]"/>
-      </div>
-    </div>  
-  </xsl:template>
-  
-  <!-- DE List Panel: Eine Panel mit einer Liste -->
-  <!-- EN List Panel: A panel with a list-->
-  <xsl:template match="bebop:listPanel">
-    <ul>
-      <xsl:apply-templates select="bebop:cell" mode="list"/>
-    </ul>
-  </xsl:template>
-  
-  <!-- DE List Panel: Eine Panel mit einer geordneten Liste -->
-  <!-- EN List Panel: A panel with an ordered list-->
-  <xsl:template match="bebop:listPanel[@ordered='true']">
-    <ol>
-      <xsl:apply-templates select="bebop:cell" mode="list"/>
-    </ol>
-  </xsl:template>
-  
-  <!-- DE Grid Panel: Ein Panel, daß an einem Gitter ausrichtet (funktioniert nicht) -->
-  <!-- EN Grid Panel -->
-  <xsl:template match="bebop:gridPanel">
-    <div class="bebopGridPanel">
-      <!--<xsl:call-template name="mandalay:ProcessAttributes"/>-->
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-  
-  <!-- DE PanelRow erzeugt eine neue Zeile im (Grid) Panel -->
-  <!-- EN PanelRow creates a new row in a (grid) panel -->
-  <xsl:template match="bebop:panelRow">
-    <div class="bebopPanelRow">
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-  
-  <!-- DE Column Panel: Ein Panel, daß alles in Spalten anzeigt -->
-  <!-- EN Column Panel: A panel that will create columns -->
-  <xsl:template match="bebop:columnPanel">
-    <div class="bebopColumnPanel">
-      <xsl:apply-templates />
-    </div>  
-  </xsl:template>
-  
-  <!-- DE Box Panel -->
-  <!--  <xsl:template match="bebop:boxPanel">
-    <div>
-    <xsl:apply-templates/>
-    </div>
+    <!-- DE Layout Panel: Ein 2- 3-spaltiges Panel -->
+    <!-- EN Layout panel: A 2- 3-column panel -->
+    <xsl:template match="bebop:layoutPanel">
+        <div class="bebopLayoutPanel">
+            <xsl:apply-templates/>
+        </div>
     </xsl:template>
-  -->  
-
-  <!-- DE Ab hier kommen die original templates -->
-  <!-- EN Some original templates which aren't rewritten yet-->
   
-  <!-- Box Panel -->
-  <!-- horizontal -->
-  <xsl:template match="bebop:boxPanel[@axis='1']">
-    <table>
-     <xsl:if test="string-length(@width)>0">
-       <xsl:attribute name="width">
-         <xsl:value-of select="@width"/>
-       </xsl:attribute>
-     </xsl:if>
-     <xsl:if test="string-length(@border)>0">
-       <xsl:attribute name="border">
-         <xsl:value-of select="@border"/>
-       </xsl:attribute>
-     </xsl:if>
-     <tr>
-       <xsl:for-each select="bebop:cell">
-         <td>
-           <xsl:for-each select="*/@class|*/@style">
-             <xsl:attribute name="{name()}">
-               <xsl:value-of select="." />
-             </xsl:attribute>
-           </xsl:for-each>
-           <xsl:apply-templates/>
-         </td>
-       </xsl:for-each>
-     </tr>
-    </table>  
-  </xsl:template>
+    <!-- DE Linke Spalte -->
+    <!-- EN Left column -->
+    <xsl:template match="bebop:left">
+        <div class="bebopLeft">
+            <xsl:apply-templates/>
+        </div>
+    </xsl:template>
+  
+    <!-- DE Haupt-Spalte bzw. mittlere Spalte -->
+    <!-- EN Main or middle column --> 
+    <xsl:template match="bebop:body">
+        <div class="bebopBody">
+            <xsl:apply-templates/>
+        </div>
+    </xsl:template>
+  
+    <!-- DE Segmented Panel: Ein Panel aus Segmenten mit Überschrift und Inhaltsbereich -->
+    <!-- EN Segmented Panel: A panel of segments with heading and content part -->
+    <xsl:template match="bebop:segmentedPanel">
+        <div class="bebopSegmentedPanel">
+            <!-- DE Verarbeite vorhandene Parameter -->
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:apply-templates/>
+        </div>
+    </xsl:template>
+  
+    <!-- DE Ein Segment für das Segmented Panel. Bebop:section macht das gleiche, nur 
+    ohne das umschließende Segmented Panel. -->
+    <!-- EN A segment for segmented panel. Bebop:section is doing the same, only without
+    the surrounding segmented panel. -->
+    <xsl:template match="bebop:segment | bebop:section">
+        <div class="bebopSegment">
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:apply-templates select="bebop:segmentHeader | bebop:heading" mode="segment"/>
+            <xsl:apply-templates select="bebop:segmentBody | bebop:body" mode="segment"/>
+        </div>
+    </xsl:template>
+  
+    <!-- DE Überschrift für ein Segment -->
+    <!-- EN Heading for a segment -->
+    <xsl:template match="bebop:segmentHeader | bebop:heading" mode="segment">
+        <h3 class="bebopSegmentHeader">
+            <xsl:apply-templates/>
+        </h3>
+    </xsl:template>
+  
+    <!-- DE Inhaltsbereich für ein Segment -->
+    <!-- EN Content for a segment -->
+    <xsl:template match="bebop:segmentBody | bebop:body" mode="segment">
+        <div class="bebopSegmentBody">
+            <xsl:apply-templates/>
+        </div>
+    </xsl:template>
 
-  <!-- vertikal -->
-  <xsl:template match="bebop:boxPanel[@axis='2']">
-   <table>
-     <xsl:if test="string-length(@width)>0">
-       <xsl:attribute name="width">
-         <xsl:value-of select="@width"/>
-       </xsl:attribute>
-     </xsl:if>
-     <xsl:if test="string-length(@border)>0">
-       <xsl:attribute name="border">
-         <xsl:value-of select="@border"/>
-       </xsl:attribute>
-     </xsl:if>
-     <xsl:for-each select="bebop:cell">
-       <tr>
-         <td>
-           <xsl:for-each select="*/@class|*/@style">
-             <xsl:attribute name="{name()}">
-               <xsl:value-of select="." />
-             </xsl:attribute>
-           </xsl:for-each>
-           <xsl:apply-templates/>
-         </td>
-       </tr>
-     </xsl:for-each>
-   </table>  
-  </xsl:template>
+    <!-- DE Split Panel: Ein Panel mit Überschrift und 2 Spalten -->
+    <!-- EN Split Panel: A penel with a heading and 2 columns -->
+    <xsl:template match="bebop:splitPanel">
+        <div width="{@width}" border="{@border}" cellpadding="{@cellpadding}" cellspacing="{@cellspacing}">
+            <div class="bebopSplitPanelHeader">
+                <xsl:apply-templates select="bebop:cell[position()=1]"/>
+            </div>
+            <div class="bebopSplitPanelLeft" width="{@divider_left}">
+                <xsl:apply-templates select="bebop:cell[position()=2]"/>
+            </div>
+            <div class="bebopSplitPanelRight" width="{@divider_right}">
+                <xsl:apply-templates select="bebop:cell[position()>2]"/>
+            </div>
+        </div>  
+    </xsl:template>
+  
+    <!-- DE List Panel: Eine Panel mit einer Liste -->
+    <!-- EN List Panel: A panel with a list-->
+    <xsl:template match="bebop:listPanel">
+        <ul>
+            <xsl:apply-templates select="bebop:cell" mode="list"/>
+        </ul>
+    </xsl:template>
+  
+    <!-- DE List Panel: Eine Panel mit einer geordneten Liste -->
+    <!-- EN List Panel: A panel with an ordered list-->
+    <xsl:template match="bebop:listPanel[@ordered='true']">
+        <ol>
+            <xsl:apply-templates select="bebop:cell" mode="list"/>
+        </ol>
+    </xsl:template>
+  
+    <!-- DE Grid Panel: Ein Panel, daß an einem Gitter ausrichtet (funktioniert nicht) -->
+    <!-- EN Grid Panel -->
+    <xsl:template match="bebop:gridPanel">
+        <div class="bebopGridPanel">
+            <!--<xsl:call-template name="mandalay:ProcessAttributes"/>-->
+            <xsl:apply-templates/>
+        </div>
+    </xsl:template>
+  
+    <!-- DE PanelRow erzeugt eine neue Zeile im (Grid) Panel -->
+    <!-- EN PanelRow creates a new row in a (grid) panel -->
+    <xsl:template match="bebop:panelRow">
+        <div class="bebopPanelRow">
+            <xsl:apply-templates/>
+        </div>
+    </xsl:template>
+  
+    <!-- DE Column Panel: Ein Panel, daß alles in Spalten anzeigt -->
+    <!-- EN Column Panel: A panel that will create columns -->
+    <xsl:template match="bebop:columnPanel">
+        <div class="bebopColumnPanel">
+            <xsl:apply-templates />
+        </div>  
+    </xsl:template>
+  
+    <!-- DE Box Panel -->
+    <!--  <xsl:template match="bebop:boxPanel">
+      <div>
+      <xsl:apply-templates/>
+      </div>
+      </xsl:template>
+    -->  
+
+    <!-- DE Ab hier kommen die original templates -->
+    <!-- EN Some original templates which aren't rewritten yet-->
+  
+    <!-- Box Panel -->
+    <!-- horizontal -->
+    <xsl:template match="bebop:boxPanel[@axis='1']">
+        <table>
+            <xsl:if test="string-length(@width)>0">
+                <xsl:attribute name="width">
+                    <xsl:value-of select="@width"/>
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:if test="string-length(@border)>0">
+                <xsl:attribute name="border">
+                    <xsl:value-of select="@border"/>
+                </xsl:attribute>
+            </xsl:if>
+            <tr>
+                <xsl:for-each select="bebop:cell">
+                    <td>
+                        <xsl:for-each select="*/@class|*/@style">
+                            <xsl:attribute name="{name()}">
+                                <xsl:value-of select="." />
+                            </xsl:attribute>
+                        </xsl:for-each>
+                        <xsl:apply-templates/>
+                    </td>
+                </xsl:for-each>
+            </tr>
+        </table>  
+    </xsl:template>
+
+    <!-- vertikal -->
+    <xsl:template match="bebop:boxPanel[@axis='2']">
+        <table>
+            <xsl:if test="string-length(@width)>0">
+                <xsl:attribute name="width">
+                    <xsl:value-of select="@width"/>
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:if test="string-length(@border)>0">
+                <xsl:attribute name="border">
+                    <xsl:value-of select="@border"/>
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:for-each select="bebop:cell">
+                <tr>
+                    <td>
+                        <xsl:for-each select="*/@class|*/@style">
+                            <xsl:attribute name="{name()}">
+                                <xsl:value-of select="." />
+                            </xsl:attribute>
+                        </xsl:for-each>
+                        <xsl:apply-templates/>
+                    </td>
+                </tr>
+            </xsl:for-each>
+        </table>  
+    </xsl:template>
 
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopPropertyList.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopPropertyList.xsl
index 34a2a476d..5445532d3 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopPropertyList.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopPropertyList.xsl
@@ -31,36 +31,36 @@
 <!-- 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:mandalay="http://mandalay.quasiweb.de"
-  exclude-result-prefixes="xsl bebop cms nav mandalay" 
-  version="1.0">
+    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:mandalay="http://mandalay.quasiweb.de"
+    exclude-result-prefixes="xsl bebop cms nav mandalay" 
+    version="1.0">
   
-  <!-- DE Erzeuge eine Property-Liste -->
-  <!-- EN Create a property list -->
-  <xsl:template match="bebop:propertyList">
-    <div class="bebopPropertyList">
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
+    <!-- DE Erzeuge eine Property-Liste -->
+    <!-- EN Create a property list -->
+    <xsl:template match="bebop:propertyList">
+        <div class="bebopPropertyList">
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:apply-templates/>
+        </div>
+    </xsl:template>
   
-  <!-- DE Erzeuge einen Eintrag in der Property-Liste -->
-  <!-- EN Create an entry for the property list -->
-  <xsl:template match="bebop:property">
-    <span class="property">
-      <span class="propertyName">
-        <xsl:value-of select="@title"/>
-      </span>
+    <!-- DE Erzeuge einen Eintrag in der Property-Liste -->
+    <!-- EN Create an entry for the property list -->
+    <xsl:template match="bebop:property">
+        <span class="property">
+            <span class="propertyName">
+                <xsl:value-of select="@title"/>
+            </span>
       &nbsp;
-      <span class="propertyValue">
-        <xsl:value-of select="@value"/>
-      </span>
-      <br/>
-    </span>
-  </xsl:template>
+            <span class="propertyValue">
+                <xsl:value-of select="@value"/>
+            </span>
+            <br/>
+        </span>
+    </xsl:template>
   
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopTable.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopTable.xsl
index f38873670..4a712bf76 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopTable.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopTable.xsl
@@ -29,185 +29,185 @@
 -->
 
 <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:mandalay="http://mandalay.quasiweb.de" 
-  exclude-result-prefixes="xsl bebop cms nav mandalay" 
-  version="1.0">
+    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:mandalay="http://mandalay.quasiweb.de" 
+    exclude-result-prefixes="xsl bebop cms nav mandalay" 
+    version="1.0">
   
-  <!-- DE Erzeuge Tabelle. Da die einzelnen Bestandteile (thead, tbody und tfoot) nicht 
-          in der von HTML vorgesehenen Reihenfolge im XML stehen, müssen diese hier in
-          der richtigen Reihenfolge manuell aufgerufen werden. -->
-  <!-- EN Create a table. Because the parts of a table (thead, tbody and tfoot) are not
-          in the required order for html, these templates have to be called manually in
-          correct order. -->
-  <xsl:template match="bebop:table">
-    <table>
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <xsl:apply-templates select="bebop:thead"/>
-      <xsl:apply-templates select="bebop:tfoot"/>
-      <xsl:apply-templates select="bebop:tbody"/>
-    </table>
-  </xsl:template>
+    <!-- DE Erzeuge Tabelle. Da die einzelnen Bestandteile (thead, tbody und tfoot) nicht 
+    in der von HTML vorgesehenen Reihenfolge im XML stehen, müssen diese hier in
+    der richtigen Reihenfolge manuell aufgerufen werden. -->
+    <!-- EN Create a table. Because the parts of a table (thead, tbody and tfoot) are not
+    in the required order for html, these templates have to be called manually in
+    correct order. -->
+    <xsl:template match="bebop:table">
+        <table>
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:apply-templates select="bebop:thead"/>
+            <xsl:apply-templates select="bebop:tfoot"/>
+            <xsl:apply-templates select="bebop:tbody"/>
+        </table>
+    </xsl:template>
   
-  <!-- DE Tabellenkopf -->
-  <!-- EN Table header -->
-  <xsl:template match="bebop:thead">
-    <thead>
-      <tr>
-        <xsl:call-template name="mandalay:processAttributes"/>
-        <xsl:apply-templates mode="tableHead"/>
-      </tr>
-    </thead>
-  </xsl:template>
+    <!-- DE Tabellenkopf -->
+    <!-- EN Table header -->
+    <xsl:template match="bebop:thead">
+        <thead>
+            <tr>
+                <xsl:call-template name="mandalay:processAttributes"/>
+                <xsl:apply-templates mode="tableHead"/>
+            </tr>
+        </thead>
+    </xsl:template>
 
-  <!-- DE Tabellenkörper -->
-  <!-- EN Table body -->
-  <xsl:template match="bebop:tbody">
-    <tbody>
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <xsl:apply-templates/>
-    </tbody>
-  </xsl:template>
+    <!-- DE Tabellenkörper -->
+    <!-- EN Table body -->
+    <xsl:template match="bebop:tbody">
+        <tbody>
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:apply-templates/>
+        </tbody>
+    </xsl:template>
   
-  <!-- DE Tabellenfuß -->
-  <!-- EN Table footer -->
-  <xsl:template match="bebop:tfoot">
-    <tfoot>
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <xsl:apply-templates/>
-    </tfoot>
-  </xsl:template>
+    <!-- DE Tabellenfuß -->
+    <!-- EN Table footer -->
+    <xsl:template match="bebop:tfoot">
+        <tfoot>
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:apply-templates/>
+        </tfoot>
+    </xsl:template>
   
-  <!-- DE Einzeugt eine Zeile in der Tabelle. Kann diese Zeile alternierend mit zwei verschieden
-          Klassen versehen. -->
-  <!-- EN Creates a table row. is able to set two different class attributes -->
-  <xsl:template match="bebop:trow">
-    <tr>
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <xsl:choose>
-        <xsl:when test="(../@striped or ../../@class = 'dataTable') and (position() mod 2) = 1">
-          <xsl:attribute name="class">bebopTableRowOdd</xsl:attribute>
-        </xsl:when>
-        <xsl:when test="(../@striped or ../../@class = 'dataTable') and (position() mod 2) = 0">
-          <xsl:attribute name="class">bebopTableRowEven</xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="class">bebopTableRow</xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates mode="table"/>
-    </tr>
-  </xsl:template>
+    <!-- DE Einzeugt eine Zeile in der Tabelle. Kann diese Zeile alternierend mit zwei verschieden
+    Klassen versehen. -->
+    <!-- EN Creates a table row. is able to set two different class attributes -->
+    <xsl:template match="bebop:trow">
+        <tr>
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:choose>
+                <xsl:when test="(../@striped or ../../@class = 'dataTable') and (position() mod 2) = 1">
+                    <xsl:attribute name="class">bebopTableRowOdd</xsl:attribute>
+                </xsl:when>
+                <xsl:when test="(../@striped or ../../@class = 'dataTable') and (position() mod 2) = 0">
+                    <xsl:attribute name="class">bebopTableRowEven</xsl:attribute>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:attribute name="class">bebopTableRow</xsl:attribute>
+                </xsl:otherwise>
+            </xsl:choose>
+            <xsl:apply-templates mode="table"/>
+        </tr>
+    </xsl:template>
 
-  <!-- DE Eine Tabellenzelle für den Tabellenkopf -->
-  <!-- EN A table cell for table header -->
-  <xsl:template match="bebop:cell" mode="tableHead">
-    <th>
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <xsl:apply-templates select="."/>
-    </th>
-  </xsl:template>
+    <!-- DE Eine Tabellenzelle für den Tabellenkopf -->
+    <!-- EN A table cell for table header -->
+    <xsl:template match="bebop:cell" mode="tableHead">
+        <th>
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:apply-templates select="."/>
+        </th>
+    </xsl:template>
   
-  <!-- DE Eine Tabellenzelle für den Tabellenkörper oder Tabellenfuß -->
-  <!-- EN A table cell for table body or table footer -->
-  <xsl:template match="bebop:cell" mode="table">
-    <td>
-      <xsl:call-template name="mandalay:processAttributes"/>
-        <xsl:apply-templates/>      
-    </td>
-  </xsl:template>
+    <!-- DE Eine Tabellenzelle für den Tabellenkörper oder Tabellenfuß -->
+    <!-- EN A table cell for table body or table footer -->
+    <xsl:template match="bebop:cell" mode="table">
+        <td>
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:apply-templates/>      
+        </td>
+    </xsl:template>
 
-  <!-- DE Eine Bebop-Zelle. Dieses Tag ist stark überladen. Es wird an vielen verschiedenen
-          Stellen verwendet. Diese speziellen Versionen werden in Mandalay in den entsprechenden
-          Templatedateien verarbeitet. -->
-  <!-- EN A bebop cell. This tag is heavily overloaded. It is used in many different places.
-          These special versions of bebop:cell are defined in the corresponding template file
-          of Mandalay. -->
-  <xsl:template match="bebop:cell">
-    <xsl:call-template name="mandalay:processAttributes"/>
-    <xsl:apply-templates/>
-  </xsl:template>
+    <!-- DE Eine Bebop-Zelle. Dieses Tag ist stark überladen. Es wird an vielen verschiedenen
+    Stellen verwendet. Diese speziellen Versionen werden in Mandalay in den entsprechenden
+    Templatedateien verarbeitet. -->
+    <!-- EN A bebop cell. This tag is heavily overloaded. It is used in many different places.
+    These special versions of bebop:cell are defined in the corresponding template file
+    of Mandalay. -->
+    <xsl:template match="bebop:cell">
+        <!--<xsl:call-template name="mandalay:processAttributes"/>-->
+        <xsl:apply-templates/>
+    </xsl:template>
  
  
-  <!-- DE Sonderbehandlung für die grafischen Checkboxen -->
-  <!-- EN Special treatment for graphical checkboxes -->
-  <xsl:template match="bebop:link[@class = 'checkBoxChecked']">
-    <xsl:call-template name="bebop:link">
-      <xsl:with-param name="alt" select="'[X]'"/>
-      <xsl:with-param name="title" select="'[X]'"/>
-      <xsl:with-param name="src">
-        <xsl:call-template name="mandalay:linkParser">
-          <xsl:with-param name="link">
-            <xsl:call-template name="mandalay:getSetting">
-              <xsl:with-param name="module" select="'bebop'"/>
-              <xsl:with-param name="setting" select="'table/setImage/checkboxChecked'"/>
-              <xsl:with-param name="default" select="'/images/bebop/checkBoxChecked.gif'"/>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="prefix" select="$theme-prefix"/>
+    <!-- DE Sonderbehandlung für die grafischen Checkboxen -->
+    <!-- EN Special treatment for graphical checkboxes -->
+    <xsl:template match="bebop:link[@class = 'checkBoxChecked']">
+        <xsl:call-template name="bebop:link">
+            <xsl:with-param name="alt" select="'[X]'"/>
+            <xsl:with-param name="title" select="'[X]'"/>
+            <xsl:with-param name="src">
+                <xsl:call-template name="mandalay:linkParser">
+                    <xsl:with-param name="link">
+                        <xsl:call-template name="mandalay:getSetting">
+                            <xsl:with-param name="module" select="'bebop'"/>
+                            <xsl:with-param name="setting" select="'table/setImage/checkboxChecked'"/>
+                            <xsl:with-param name="default" select="'/images/bebop/checkBoxChecked.gif'"/>
+                        </xsl:call-template>
+                    </xsl:with-param>
+                    <xsl:with-param name="prefix" select="$theme-prefix"/>
+                </xsl:call-template>
+            </xsl:with-param>
         </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
+    </xsl:template>
   
-  <xsl:template match="bebop:link[@class = 'checkBoxUnchecked']">
-    <xsl:call-template name="bebop:link">
-      <xsl:with-param name="alt" select="'[ ]'"/>
-      <xsl:with-param name="title" select="'[ ]'"/>
-      <xsl:with-param name="src">
-        <xsl:call-template name="mandalay:linkParser">
-          <xsl:with-param name="link">
-            <xsl:call-template name="mandalay:getSetting">
-              <xsl:with-param name="module" select="'bebop'"/>
-              <xsl:with-param name="setting" select="'table/setImage/checkboxUnchecked'"/>
-              <xsl:with-param name="default" select="'/images/bebop/checkBoxUnchecked.gif'"/>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="prefix" select="$theme-prefix"/>
+    <xsl:template match="bebop:link[@class = 'checkBoxUnchecked']">
+        <xsl:call-template name="bebop:link">
+            <xsl:with-param name="alt" select="'[ ]'"/>
+            <xsl:with-param name="title" select="'[ ]'"/>
+            <xsl:with-param name="src">
+                <xsl:call-template name="mandalay:linkParser">
+                    <xsl:with-param name="link">
+                        <xsl:call-template name="mandalay:getSetting">
+                            <xsl:with-param name="module" select="'bebop'"/>
+                            <xsl:with-param name="setting" select="'table/setImage/checkboxUnchecked'"/>
+                            <xsl:with-param name="default" select="'/images/bebop/checkBoxUnchecked.gif'"/>
+                        </xsl:call-template>
+                    </xsl:with-param>
+                    <xsl:with-param name="prefix" select="$theme-prefix"/>
+                </xsl:call-template>
+            </xsl:with-param>
         </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
+    </xsl:template>
   
-  <xsl:template match="bebop:label[@class = 'checkBoxGreyChecked']">
-    <xsl:apply-templates select="." mode='image'>
-      <xsl:with-param name="alt" select="'{X}'"/>
-      <xsl:with-param name="title" select="'{X}'"/>
-      <xsl:with-param name="src">
-        <xsl:call-template name="mandalay:linkParser">
-          <xsl:with-param name="link">
-            <xsl:call-template name="mandalay:getSetting">
-              <xsl:with-param name="module" select="'bebop'"/>
-              <xsl:with-param name="setting" select="'table/setImage/checkboxGreyChecked'"/>
-              <xsl:with-param name="default" select="'/images/bebop/checkBoxGreyChecked.gif'"/>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="prefix" select="$theme-prefix"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:apply-templates>
-  </xsl:template>
+    <xsl:template match="bebop:label[@class = 'checkBoxGreyChecked']">
+        <xsl:apply-templates select="." mode='image'>
+            <xsl:with-param name="alt" select="'{X}'"/>
+            <xsl:with-param name="title" select="'{X}'"/>
+            <xsl:with-param name="src">
+                <xsl:call-template name="mandalay:linkParser">
+                    <xsl:with-param name="link">
+                        <xsl:call-template name="mandalay:getSetting">
+                            <xsl:with-param name="module" select="'bebop'"/>
+                            <xsl:with-param name="setting" select="'table/setImage/checkboxGreyChecked'"/>
+                            <xsl:with-param name="default" select="'/images/bebop/checkBoxGreyChecked.gif'"/>
+                        </xsl:call-template>
+                    </xsl:with-param>
+                    <xsl:with-param name="prefix" select="$theme-prefix"/>
+                </xsl:call-template>
+            </xsl:with-param>
+        </xsl:apply-templates>
+    </xsl:template>
   
-  <xsl:template match="bebop:label[@class = 'checkBoxGreyUnchecked']">
-    <xsl:apply-templates select="." mode='image'>
-      <xsl:with-param name="alt" select="'{ }'"/>
-      <xsl:with-param name="title" select="'{ }'"/>
-      <xsl:with-param name="src">
-        <xsl:call-template name="mandalay:linkParser">
-          <xsl:with-param name="link">
-            <xsl:call-template name="mandalay:getSetting">
-              <xsl:with-param name="module" select="'bebop'"/>
-              <xsl:with-param name="setting" select="'table/setImage/checkboxGreyUnchecked'"/>
-              <xsl:with-param name="default" select="'/images/bebop/checkBoxGreyUnchecked.gif'"/>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="prefix" select="$theme-prefix"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:apply-templates>
-  </xsl:template>
+    <xsl:template match="bebop:label[@class = 'checkBoxGreyUnchecked']">
+        <xsl:apply-templates select="." mode='image'>
+            <xsl:with-param name="alt" select="'{ }'"/>
+            <xsl:with-param name="title" select="'{ }'"/>
+            <xsl:with-param name="src">
+                <xsl:call-template name="mandalay:linkParser">
+                    <xsl:with-param name="link">
+                        <xsl:call-template name="mandalay:getSetting">
+                            <xsl:with-param name="module" select="'bebop'"/>
+                            <xsl:with-param name="setting" select="'table/setImage/checkboxGreyUnchecked'"/>
+                            <xsl:with-param name="default" select="'/images/bebop/checkBoxGreyUnchecked.gif'"/>
+                        </xsl:call-template>
+                    </xsl:with-param>
+                    <xsl:with-param name="prefix" select="$theme-prefix"/>
+                </xsl:call-template>
+            </xsl:with-param>
+        </xsl:apply-templates>
+    </xsl:template>
   
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopWidget.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopWidget.xsl
index cc265cbce..e697cfbdd 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopWidget.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopWidget.xsl
@@ -35,178 +35,178 @@
 <!-- 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:mandalay="http://mandalay.quasiweb.de" 
-  exclude-result-prefixes="xsl bebop cms nav"
-  version="1.0">
+    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:mandalay="http://mandalay.quasiweb.de" 
+    exclude-result-prefixes="xsl bebop cms nav"
+    version="1.0">
   
-  <!-- DE Verabeitung von Checkbox- und Radiobutton-Groups. 
-          Kann diese horizontal oder vertikal anzeigen -->
-  <!-- EN Processing checkbox group and radiobutton group.
-          Distinguish between horizontal and vertical display. --> 
-  <xsl:template match="bebop:checkboxGroup | bebop:radioGroup">
-    <xsl:choose>
-      <xsl:when test="@class = 'vertical' or @axis = '2'">
-        <div class="optionGroup">
-          <xsl:apply-templates mode="vertical"/>
-        </div>
-      </xsl:when>
-      <xsl:otherwise>
-        <span class="optionGroup">
-          <xsl:apply-templates/>
-        </span>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  
-  <!-- DE Vertikale Anzeige von Radiobuttons -->
-  <!-- EN Display radio buttons vertically -->
-  <xsl:template match="bebop:radio" mode="vertical">
-    <xsl:apply-templates select="."/>
-    <br />
-  </xsl:template>
-  
-  <!-- DE Erzeuge einen Radiobutton mit allen gefundenen Angaben -->
-  <!-- EN Create a radio button with all given attributes -->
-  <xsl:template match="bebop:radio">
-    <input type="radio" id="{@name}:{@value}">
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <xsl:for-each select="../@readonly | ../@disabled | ../@title | ../@onclick">
-        <xsl:attribute name="{name()}">
-          <xsl:value-of select="."/>
-        </xsl:attribute>
-      </xsl:for-each>
-    </input>
-    &nbsp;
-    <label for="{@name}:{@value}">
-      <xsl:apply-templates/>
-    </label>
-  </xsl:template>
-  
-  <!-- DE Vertikale Anzeige von Checkboxen -->
-  <!-- EN Display checkboxes vertically -->
-  <xsl:template match="bebop:checkbox" mode="vertical">
-    <xsl:apply-templates select="."/>
-    <br />
-  </xsl:template>
-  
-  <!-- DE Erzeuge eine Checkbox mit allen gefundenen Angaben -->
-  <!-- EN Create a checkbox with all given attributes -->
-  <xsl:template match="bebop:checkbox">
-    <input type="checkbox" id="{@name}:{@value}">
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <xsl:for-each select="../@readonly | ../@disabled | ../@title | ../@onclick">
-        <xsl:attribute name="{name()}">
-          <xsl:value-of select="."/>
-        </xsl:attribute>
-      </xsl:for-each>
-    </input>
-    <label for="{@name}:{@value}">
-      <xsl:apply-templates/>
-    </label>
-    &nbsp;
-  </xsl:template>
-  
-  <!-- DE Erzeuge eine Auswahlliste (Select), optional mit Mehrfachauswahl (MultiSelect).
-          Wenn angefordert, erzeugt es für eine Auswahl der Länge 1 stattdessen ein Label. -->
-  <!-- EN Create a select or multiselect widget. If wanted, creates a label instead for
-          a selection length of 1. -->
-  <xsl:template match="bebop:select | bebop:multiSelect">
-    <xsl:choose>
-      <xsl:when test="@class = 'displayOneOptionAsLabel' and count(bebop:option) = 1">
+    <!-- DE Verabeitung von Checkbox- und Radiobutton-Groups. 
+    Kann diese horizontal oder vertikal anzeigen -->
+    <!-- EN Processing checkbox group and radiobutton group.
+    Distinguish between horizontal and vertical display. --> 
+    <xsl:template match="bebop:checkboxGroup | bebop:radioGroup">
         <xsl:choose>
-          <xsl:when test="bebop:option/@label">
-            <label>
-              <xsl:attribute name="for">
-                <xsl:value-of select="@name"/>
-              </xsl:attribute>
-              <xsl:value-of select="bebop:option/@label"/>
-            </label>
-          </xsl:when>
-          <xsl:otherwise>
-            <label>
-              <xsl:attribute name="for">
-                <xsl:value-of select="@name"/>
-              </xsl:attribute>
-              <xsl:apply-templates select="bebop:option/bebop:label"/>
-            </label>
-          </xsl:otherwise>
+            <xsl:when test="@class = 'vertical' or @axis = '2'">
+                <div class="optionGroup">
+                    <xsl:apply-templates mode="vertical"/>
+                </div>
+            </xsl:when>
+            <xsl:otherwise>
+                <span class="optionGroup">
+                    <xsl:apply-templates/>
+                </span>
+            </xsl:otherwise>
         </xsl:choose>
-        <input type="hidden">
-          <xsl:attribute name="name">
-            <xsl:value-of select="@name"/>
-          </xsl:attribute>
-          <xsl:attribute name="value">
-            <xsl:value-of select="bebop:option/@value"/>
-          </xsl:attribute>
+    </xsl:template>
+  
+    <!-- DE Vertikale Anzeige von Radiobuttons -->
+    <!-- EN Display radio buttons vertically -->
+    <xsl:template match="bebop:radio" mode="vertical">
+        <xsl:apply-templates select="."/>
+        <br />
+    </xsl:template>
+  
+    <!-- DE Erzeuge einen Radiobutton mit allen gefundenen Angaben -->
+    <!-- EN Create a radio button with all given attributes -->
+    <xsl:template match="bebop:radio">
+        <input type="radio" id="{@name}:{@value}">
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:for-each select="../@readonly | ../@disabled | ../@title | ../@onclick">
+                <xsl:attribute name="{name()}">
+                    <xsl:value-of select="."/>
+                </xsl:attribute>
+            </xsl:for-each>
         </input>
-      </xsl:when>
-      <xsl:otherwise>
-        <select id="@name">
-          <xsl:call-template name="mandalay:processAttributes"/>
-          <xsl:apply-templates/>
-        </select>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
+    &nbsp;
+        <label for="{@name}:{@value}">
+            <xsl:apply-templates/>
+        </label>
+    </xsl:template>
+  
+    <!-- DE Vertikale Anzeige von Checkboxen -->
+    <!-- EN Display checkboxes vertically -->
+    <xsl:template match="bebop:checkbox" mode="vertical">
+        <xsl:apply-templates select="."/>
+        <br />
+    </xsl:template>
+  
+    <!-- DE Erzeuge eine Checkbox mit allen gefundenen Angaben -->
+    <!-- EN Create a checkbox with all given attributes -->
+    <xsl:template match="bebop:checkbox">
+        <input type="checkbox" id="{@name}:{@value}">
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:for-each select="../@readonly | ../@disabled | ../@title | ../@onclick">
+                <xsl:attribute name="{name()}">
+                    <xsl:value-of select="."/>
+                </xsl:attribute>
+            </xsl:for-each>
+        </input>
+        <label for="{@name}:{@value}">
+            <xsl:apply-templates/>
+        </label>
+    &nbsp;
+    </xsl:template>
+  
+    <!-- DE Erzeuge eine Auswahlliste (Select), optional mit Mehrfachauswahl (MultiSelect).
+    Wenn angefordert, erzeugt es für eine Auswahl der Länge 1 stattdessen ein Label. -->
+    <!-- EN Create a select or multiselect widget. If wanted, creates a label instead for
+    a selection length of 1. -->
+    <xsl:template match="bebop:select | bebop:multiSelect">
+        <xsl:choose>
+            <xsl:when test="@class = 'displayOneOptionAsLabel' and count(bebop:option) = 1">
+                <xsl:choose>
+                    <xsl:when test="bebop:option/@label">
+                        <label>
+                            <xsl:attribute name="for">
+                                <xsl:value-of select="@name"/>
+                            </xsl:attribute>
+                            <xsl:value-of select="bebop:option/@label"/>
+                        </label>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <label>
+                            <xsl:attribute name="for">
+                                <xsl:value-of select="@name"/>
+                            </xsl:attribute>
+                            <xsl:apply-templates select="bebop:option/bebop:label"/>
+                        </label>
+                    </xsl:otherwise>
+                </xsl:choose>
+                <input type="hidden">
+                    <xsl:attribute name="name">
+                        <xsl:value-of select="@name"/>
+                    </xsl:attribute>
+                    <xsl:attribute name="value">
+                        <xsl:value-of select="bebop:option/@value"/>
+                    </xsl:attribute>
+                </input>
+            </xsl:when>
+            <xsl:otherwise>
+                <select id="@name">
+                    <xsl:call-template name="mandalay:processAttributes"/>
+                    <xsl:apply-templates/>
+                </select>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
 
-  <!-- DE Erzeugt einen Eintrag für eine Selectbox -->
-  <!-- EN Create an entry for a select widget -->
-  <xsl:template match="bebop:option">
-    <option>
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <xsl:apply-templates/>
-    </option>
-  </xsl:template>
+    <!-- DE Erzeugt einen Eintrag für eine Selectbox -->
+    <!-- EN Create an entry for a select widget -->
+    <xsl:template match="bebop:option">
+        <option>
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:apply-templates/>
+        </option>
+    </xsl:template>
   
-  <!-- DE Erzeugt alle Formular-Eingabefelder, die per <input> in HTML angelegt werden. -->
-  <!-- EN Creates all form input field, which are created by a <input> in html. -->
-  <xsl:template match="bebop:formWidget">
-    <input>
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <!-- DE Besondere Behandlung von Submit-Button Double-Click-Protection -->
-      <!-- EN Special processing for submit button: doble click protection -->
-      <xsl:if test="$dcp-on-buttons and @type='submit' and boolean(@onclick)=false()">
-        <xsl:attribute name="onclick">
-          <xsl:text>doubleClickProtect(this);</xsl:text>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </input>
-  </xsl:template>
+    <!-- DE Erzeugt alle Formular-Eingabefelder, die per <input> in HTML angelegt werden. -->
+    <!-- EN Creates all form input field, which are created by a <input> in html. -->
+    <xsl:template match="bebop:formWidget">
+        <input>
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <!-- DE Besondere Behandlung von Submit-Button Double-Click-Protection -->
+            <!-- EN Special processing for submit button: doble click protection -->
+            <xsl:if test="$dcp-on-buttons and @type='submit' and boolean(@onclick)=false()">
+                <xsl:attribute name="onclick">
+                    <xsl:text>doubleClickProtect(this);</xsl:text>
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:apply-templates/>
+        </input>
+    </xsl:template>
   
-  <!-- DE Erzeugt ein Textfeld -->
-  <!-- EN Create a textarea -->
-  <xsl:template match="bebop:textarea">
-    <textarea>
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <xsl:value-of select="@value"/>
-    </textarea>
-  </xsl:template>
+    <!-- DE Erzeugt ein Textfeld -->
+    <!-- EN Create a textarea -->
+    <xsl:template match="bebop:textarea">
+        <textarea>
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:value-of select="@value"/>
+        </textarea>
+    </xsl:template>
   
-  <xsl:template match="bebop:date">
-    <span class="date">
-      <xsl:apply-templates/>
-    </span>
-  </xsl:template>
+    <xsl:template match="bebop:date">
+        <span class="date">
+            <xsl:apply-templates/>
+        </span>
+    </xsl:template>
   
-  <xsl:template match="bebop:time">
-    <span class="time">
-      <xsl:apply-templates/>
-    </span>
-  </xsl:template>
+    <xsl:template match="bebop:time">
+        <span class="time">
+            <xsl:apply-templates/>
+        </span>
+    </xsl:template>
   
-  <xsl:template match="bebop:fieldset">
-    <fieldset>
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <legend>
-        <xsl:value-of select="@legend"/>
-      </legend>
-      <xsl:apply-templates/>
-    </fieldset>
-  </xsl:template>
+    <xsl:template match="bebop:fieldset">
+        <fieldset>
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <legend>
+                <xsl:value-of select="@legend"/>
+            </legend>
+            <xsl:apply-templates/>
+        </fieldset>
+    </xsl:template>
   
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsContainer.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsContainer.xsl
index 6a390348f..c5fa2938a 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsContainer.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsContainer.xsl
@@ -31,21 +31,21 @@
 <!-- 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:mandalay="http://mandalay.quasiweb.de" 
-  exclude-result-prefixes="xsl bebop cms nav mandalay"
-  version="1.0">
+    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:mandalay="http://mandalay.quasiweb.de" 
+    exclude-result-prefixes="xsl bebop cms nav mandalay"
+    version="1.0">
   
-  <!-- DE Verarbeitet den cmsContainer -->
-  <!-- EN Processing a cmsContainer -->
-  <xsl:template match="cms:container">
-    <div>
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
+    <!-- DE Verarbeitet den cmsContainer -->
+    <!-- EN Processing a cmsContainer -->
+    <xsl:template match="cms:container">
+        <div>
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:apply-templates/>
+        </div>
+    </xsl:template>
     
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsImageBrowser.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsImageBrowser.xsl
index be088d58e..ac33a3baf 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsImageBrowser.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsImageBrowser.xsl
@@ -31,109 +31,109 @@
 <!-- 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:mandalay="http://mandalay.quasiweb.de"
-  exclude-result-prefixes="xsl bebop cms nav mandalay" 
-  version="1.0">
+    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:mandalay="http://mandalay.quasiweb.de"
+    exclude-result-prefixes="xsl bebop cms nav mandalay" 
+    version="1.0">
   
-  <!-- DE Erzeugt die Liste mit den zugewiesenen Aufgaben -->
-  <!-- EN Create a list of tasks -->
-  <xsl:template match="bebop:table[@class='imageBrowser']">
-    <div id="cmsImageBrowser">
-      <xsl:apply-templates select="bebop:tbody/bebop:trow" mode="imageBrowser"/>
-    </div>
-  </xsl:template>
+    <!-- DE Erzeugt die Liste mit den zugewiesenen Aufgaben -->
+    <!-- EN Create a list of tasks -->
+    <xsl:template match="bebop:table[@class='imageBrowser']">
+        <div id="cmsImageBrowser">
+            <xsl:apply-templates select="bebop:tbody/bebop:trow" mode="imageBrowser"/>
+        </div>
+    </xsl:template>
   
-  <xsl:template match="bebop:trow" mode="imageBrowser">
-    <div class="tile">
-      <xsl:apply-templates select="bebop:cell" mode="imageBrowser"/>
-    </div>
-  </xsl:template>
+    <xsl:template match="bebop:trow" mode="imageBrowser">
+        <div class="tile">
+            <xsl:apply-templates select="bebop:cell" mode="imageBrowser"/>
+        </div>
+    </xsl:template>
   
-  <xsl:template match="bebop:cell" mode="imageBrowser">
-    <div>
-      <xsl:if test="bebop:label">
-        <xsl:attribute name="alt">
-          <xsl:value-of select="bebop:label"/>
-        </xsl:attribute>
-        <xsl:attribute name="title">
-          <xsl:value-of select="bebop:label"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates mode="imageBrowser"/>
-    </div>  
-  </xsl:template>
+    <xsl:template match="bebop:cell" mode="imageBrowser">
+        <div>
+            <xsl:if test="bebop:label">
+                <xsl:attribute name="alt">
+                    <xsl:value-of select="bebop:label"/>
+                </xsl:attribute>
+                <xsl:attribute name="title">
+                    <xsl:value-of select="bebop:label"/>
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:apply-templates mode="imageBrowser"/>
+        </div>  
+    </xsl:template>
 
-  <xsl:template match="bebop:link" mode="imageBrowser">
-    <xsl:param name="alt"/>
-    <xsl:param name="title"/>
-    <xsl:param name="src"/>
+    <xsl:template match="bebop:link" mode="imageBrowser">
+        <xsl:param name="alt"/>
+        <xsl:param name="title"/>
+        <xsl:param name="src"/>
     
-    <!-- DE  -->
-    <!-- EN  -->
-    <xsl:variable name="onclick">
-      <xsl:choose>
-        <xsl:when test="boolean(@onclick)=true() and not(starts-with(@onclick, 'return'))">
-          <xsl:value-of select="@onclick" disable-output-escaping="yes"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>this.href='</xsl:text>
-          <xsl:value-of select="@href" disable-output-escaping="yes"/>
-          <xsl:text>'; </xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
+        <!-- DE  -->
+        <!-- EN  -->
+        <xsl:variable name="onclick">
+            <xsl:choose>
+                <xsl:when test="boolean(@onclick)=true() and not(starts-with(@onclick, 'return'))">
+                    <xsl:value-of select="@onclick" disable-output-escaping="yes"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:text>this.href='</xsl:text>
+                    <xsl:value-of select="@href" disable-output-escaping="yes"/>
+                    <xsl:text>'; </xsl:text>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
     
-    <!-- DE DoubleClickProtection für Links, wenn es keinen OnClick-Handler gibt -->
-    <!-- EN DoubleClickProtection for links without an onclick handler -->
-    <xsl:variable name="dcp">
-      <xsl:if test="$dcp-on-links and boolean(@onclick)=false()">
-        <xsl:text>doubleClickProtect(this); </xsl:text>
-      </xsl:if>
-    </xsl:variable>
+        <!-- DE DoubleClickProtection für Links, wenn es keinen OnClick-Handler gibt -->
+        <!-- EN DoubleClickProtection for links without an onclick handler -->
+        <xsl:variable name="dcp">
+            <xsl:if test="$dcp-on-links and boolean(@onclick)=false()">
+                <xsl:text>doubleClickProtect(this); </xsl:text>
+            </xsl:if>
+        </xsl:variable>
     
-    <!-- DE Wenn es ein Link mit Bestätigung ist -->
-    <!-- EN A link with confirmation -->
-    <xsl:variable name="confirm">
-      <xsl:if test="boolean(@confirm)=true() or starts-with(@onclick, 'return')">
-        <xsl:call-template name="mandalay:string-replace">
-          <xsl:with-param name="string" select="@onclick"/>
-          <xsl:with-param name="from" select="'\'"/>
-          <xsl:with-param name="to" select="''"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:variable>
+        <!-- DE Wenn es ein Link mit Bestätigung ist -->
+        <!-- EN A link with confirmation -->
+        <xsl:variable name="confirm">
+            <xsl:if test="boolean(@confirm)=true() or starts-with(@onclick, 'return')">
+                <xsl:call-template name="mandalay:string-replace">
+                    <xsl:with-param name="string" select="@onclick"/>
+                    <xsl:with-param name="from" select="'\'"/>
+                    <xsl:with-param name="to" select="''"/>
+                </xsl:call-template>
+            </xsl:if>
+        </xsl:variable>
     
-    <a>
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <xsl:attribute name="href">
-        <xsl:call-template name="mandalay:linkParser">
-          <xsl:with-param name="link" select="@href_no_javascript"/>
-        </xsl:call-template>
-      </xsl:attribute>
+        <a>
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:attribute name="href">
+                <xsl:call-template name="mandalay:linkParser">
+                    <xsl:with-param name="link" select="@href_no_javascript"/>
+                </xsl:call-template>
+            </xsl:attribute>
       
-      <xsl:attribute name="onclick">
-        <xsl:value-of select="$onclick"/>  
-        <xsl:value-of select="$dcp"/>
-        <xsl:value-of select="$confirm"/>  
-      </xsl:attribute>
+            <xsl:attribute name="onclick">
+                <xsl:value-of select="$onclick"/>  
+                <xsl:value-of select="$dcp"/>
+                <xsl:value-of select="$confirm"/>  
+            </xsl:attribute>
       
-      <xsl:if test="$src">
-        <img alt="{$alt}" title="{$title}" src="{$src}"/>
-      </xsl:if>
-      <xsl:apply-templates mode="imageBrowser"/>
-    </a>
-  </xsl:template>
+            <xsl:if test="$src">
+                <img alt="{$alt}" title="{$title}" src="{$src}"/>
+            </xsl:if>
+            <xsl:apply-templates mode="imageBrowser"/>
+        </a>
+    </xsl:template>
   
-  <xsl:template match="bebop:image" mode="imageBrowser">
-    <xsl:apply-templates select="."/>
-  </xsl:template>
+    <xsl:template match="bebop:image" mode="imageBrowser">
+        <xsl:apply-templates select="."/>
+    </xsl:template>
 
-  <xsl:template match="bebop:label" mode="imageBrowser">
-    <xsl:apply-templates select="."/>
-  </xsl:template>
+    <xsl:template match="bebop:label" mode="imageBrowser">
+        <xsl:apply-templates select="."/>
+    </xsl:template>
   
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsSortableList.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsSortableList.xsl
index e096db5bd..15faf676e 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsSortableList.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsSortableList.xsl
@@ -31,59 +31,59 @@
 <!-- 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:mandalay="http://mandalay.quasiweb.de"
-  exclude-result-prefixes="xsl bebop cms nav mandalay" 
-  version="1.0">
+    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:mandalay="http://mandalay.quasiweb.de"
+    exclude-result-prefixes="xsl bebop cms nav mandalay" 
+    version="1.0">
   
-  <!-- DE Erzeuge eine sortierbare Liste (mit Sortierpfeilen) -->
-  <!-- EN Create a sortable list (with sorting buttons) -->
-  <xsl:template match="cms:sortableList">
-    <div class="cmsSortableList">
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <ul>
-        <xsl:apply-templates mode="sortableList"/>
-      </ul>
-    </div>
-  </xsl:template>  
+    <!-- DE Erzeuge eine sortierbare Liste (mit Sortierpfeilen) -->
+    <!-- EN Create a sortable list (with sorting buttons) -->
+    <xsl:template match="cms:sortableList">
+        <div class="cmsSortableList">
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <ul>
+                <xsl:apply-templates mode="sortableList"/>
+            </ul>
+        </div>
+    </xsl:template>  
   
-  <!-- DE Spezielles bebop:cell für die sortierbaren Listen, daß die Pfeile mit erzeugt -->
-  <!-- EN A special bebop:cell for sortable list, which will create sorting buttons -->
-  <xsl:template match="bebop:cell" mode="sortableList">
-    <li>
-      <xsl:if test="@configure">
-        <span class="sortButtons">
-          <span class="sortButtonUp">
-            <xsl:choose>
-              <xsl:when test="@prevURL">
-                <a href="{@prevURL}">
-                  <img alt="^" src="{$theme-prefix}/images/cms/arrowUp.gif"/>
-                </a>
-              </xsl:when>
-              <xsl:otherwise>
+    <!-- DE Spezielles bebop:cell für die sortierbaren Listen, daß die Pfeile mit erzeugt -->
+    <!-- EN A special bebop:cell for sortable list, which will create sorting buttons -->
+    <xsl:template match="bebop:cell" mode="sortableList">
+        <li>
+            <xsl:if test="@configure">
+                <span class="sortButtons">
+                    <span class="sortButtonUp">
+                        <xsl:choose>
+                            <xsl:when test="@prevURL">
+                                <a href="{@prevURL}">
+                                    <img alt="^" src="{$theme-prefix}/images/cms/arrowUp.gif"/>
+                                </a>
+                            </xsl:when>
+                            <xsl:otherwise>
                 &nbsp;
-              </xsl:otherwise>
-            </xsl:choose>
-          </span>
-          <span class="sortButtonDown">
-            <xsl:choose>
-              <xsl:when test="@nextURL">
-                <a href="{@nextURL}">
-                  <img alt="v" src="{$theme-prefix}/images/cms/arrowDown.gif"/>
-                </a>
-              </xsl:when>
-              <xsl:otherwise>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </span>
+                    <span class="sortButtonDown">
+                        <xsl:choose>
+                            <xsl:when test="@nextURL">
+                                <a href="{@nextURL}">
+                                    <img alt="v" src="{$theme-prefix}/images/cms/arrowDown.gif"/>
+                                </a>
+                            </xsl:when>
+                            <xsl:otherwise>
                 &nbsp;
-              </xsl:otherwise>
-            </xsl:choose>
-          </span>
-        </span>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </li>
-  </xsl:template>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </span>
+                </span>
+            </xsl:if>
+            <xsl:apply-templates/>
+        </li>
+    </xsl:template>
 
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/forum/forumForms.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/forum/forumForms.xsl
index 79c84ebe8..29ad605dc 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/forum/forumForms.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/forum/forumForms.xsl
@@ -31,191 +31,191 @@
 <!-- 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:mandalay="http://mandalay.quasiweb.de" 
-  xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
-  xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
-  xmlns:forum="http://www.arsdigita.com/forum/1.0"
-  exclude-result-prefixes="xsl bebop cms nav mandalay portal portlet forum"
-  version="1.0">
+    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:mandalay="http://mandalay.quasiweb.de" 
+    xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
+    xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
+    xmlns:forum="http://www.arsdigita.com/forum/1.0"
+    exclude-result-prefixes="xsl bebop cms nav mandalay portal portlet forum"
+    version="1.0">
 
-  <xsl:template match="bebop:form[@name='newPostForm'] | bebop:form[@name='editPostForm'] | bebop:form[@name='replyPostForm']">
-    <div class="forumForm">
-      <h2>
-        <xsl:choose>
-          <xsl:when test="forum:postForm | forum:postFormFiles">
-            <xsl:call-template name="mandalay:getStaticText">
-              <xsl:with-param name="module" select="'forum'"/>
-              <xsl:with-param name="id" select="concat('forms/', @name, '/post')"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="mandalay:getStaticText">
-              <xsl:with-param name="module" select="'forum'"/>
-              <xsl:with-param name="id" select="concat('forms/', @name, '/confirm')"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </h2>
-      <xsl:if test="@message">
-        <div class="formMessage">
-          <xsl:value-of select="@message"/>
-        </div>
-      </xsl:if>
+    <xsl:template match="bebop:form[@name='newPostForm'] | bebop:form[@name='editPostForm'] | bebop:form[@name='replyPostForm']">
+        <div class="forumForm">
+            <h2>
+                <xsl:choose>
+                    <xsl:when test="forum:postForm | forum:postFormFiles">
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'forum'"/>
+                            <xsl:with-param name="id" select="concat('forms/', @name, '/post')"/>
+                        </xsl:call-template>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'forum'"/>
+                            <xsl:with-param name="id" select="concat('forms/', @name, '/confirm')"/>
+                        </xsl:call-template>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </h2>
+            <xsl:if test="@message">
+                <div class="formMessage">
+                    <xsl:value-of select="@message"/>
+                </div>
+            </xsl:if>
       
-      <form>
-        <xsl:if test="not(@method)">
-          <xsl:attribute name="method">post</xsl:attribute>
-        </xsl:if>
-        <xsl:call-template name="mandalay:processAttributes"/>
-        <xsl:apply-templates/>
-      </form>
-    </div>
-  </xsl:template>
+            <form>
+                <xsl:if test="not(@method)">
+                    <xsl:attribute name="method">post</xsl:attribute>
+                </xsl:if>
+                <xsl:call-template name="mandalay:processAttributes"/>
+                <xsl:apply-templates/>
+            </form>
+        </div>
+    </xsl:template>
   
-  <xsl:template match="forum:postForm">
-    <xsl:apply-templates select="bebop:formWidget[@type='hidden']"/>
-    <div>
-    <label for="subject">
-      <xsl:call-template name="mandalay:getStaticText">
-        <xsl:with-param name="module" select="'forum'"/>
-        <xsl:with-param name="id" select="'forms/subject'"/>
-      </xsl:call-template>
-    </label>
-      <xsl:apply-templates select="bebop:formWidget[@name='subject']"/>
-    </div>
-    <div>
-      <label for="ta_message">
-        <xsl:call-template name="mandalay:getStaticText">
-          <xsl:with-param name="module" select="'forum'"/>
-          <xsl:with-param name="id" select="'forms/message'"/>
-        </xsl:call-template>
-      </label>
-      <xsl:apply-templates select="bebop:textarea[@name='message'] | bebop:xinha[@name='message']"/>
-    </div>
-    <xsl:if test="bebop:select[@name='bodyType']">
-      <div>
-        <label for="bodyType">
-          <xsl:call-template name="mandalay:getStaticText">
-            <xsl:with-param name="module" select="'forum'"/>
-            <xsl:with-param name="id" select="'forms/format'"/>
-          </xsl:call-template>
-        </label>
-        <xsl:apply-templates select="bebop:select[@name='bodyType']"/>
-      </div>
-    </xsl:if>
-    <xsl:choose>
-      <xsl:when test="bebop:select[@name='postTopic']">
+    <xsl:template match="forum:postForm">
+        <xsl:apply-templates select="bebop:formWidget[@type='hidden']"/>
         <div>
-          <label for="postTopic">
-            <xsl:call-template name="mandalay:getStaticText">
-              <xsl:with-param name="module" select="'forum'"/>
-              <xsl:with-param name="id" select="'forms/topic'"/>
-            </xsl:call-template>
-          </label>
-            <xsl:apply-templates select="bebop:select[@name='postTopic']"/>
+            <label for="subject">
+                <xsl:call-template name="mandalay:getStaticText">
+                    <xsl:with-param name="module" select="'forum'"/>
+                    <xsl:with-param name="id" select="'forms/subject'"/>
+                </xsl:call-template>
+            </label>
+            <xsl:apply-templates select="bebop:formWidget[@name='subject']"/>
         </div>
-      </xsl:when>
-      <xsl:when test="forum:message">
         <div>
-          <label for="">
-            <xsl:call-template name="mandalay:getStaticText">
-              <xsl:with-param name="module" select="'forum'"/>
-              <xsl:with-param name="id" select="'forms/inReply'"/>
-            </xsl:call-template>
-          </label>
-          <xsl:apply-templates select="forum:message"/>
+            <label for="ta_message">
+                <xsl:call-template name="mandalay:getStaticText">
+                    <xsl:with-param name="module" select="'forum'"/>
+                    <xsl:with-param name="id" select="'forms/message'"/>
+                </xsl:call-template>
+            </label>
+            <xsl:apply-templates select="bebop:textarea[@name='message'] | bebop:xinha[@name='message']"/>
         </div>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
+        <xsl:if test="bebop:select[@name='bodyType']">
+            <div>
+                <label for="bodyType">
+                    <xsl:call-template name="mandalay:getStaticText">
+                        <xsl:with-param name="module" select="'forum'"/>
+                        <xsl:with-param name="id" select="'forms/format'"/>
+                    </xsl:call-template>
+                </label>
+                <xsl:apply-templates select="bebop:select[@name='bodyType']"/>
+            </div>
+        </xsl:if>
+        <xsl:choose>
+            <xsl:when test="bebop:select[@name='postTopic']">
+                <div>
+                    <label for="postTopic">
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'forum'"/>
+                            <xsl:with-param name="id" select="'forms/topic'"/>
+                        </xsl:call-template>
+                    </label>
+                    <xsl:apply-templates select="bebop:select[@name='postTopic']"/>
+                </div>
+            </xsl:when>
+            <xsl:when test="forum:message">
+                <div>
+                    <label for="">
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'forum'"/>
+                            <xsl:with-param name="id" select="'forms/inReply'"/>
+                        </xsl:call-template>
+                    </label>
+                    <xsl:apply-templates select="forum:message"/>
+                </div>
+            </xsl:when>
+        </xsl:choose>
+    </xsl:template>
 
-  <xsl:template match="forum:postConfirm">
-    <div class="postConfirm">
-      <span class="label">
-        <xsl:call-template name="mandalay:getStaticText">
-          <xsl:with-param name="module" select="'forum'"/>
-          <xsl:with-param name="id" select="'messages/subject'"/>
-        </xsl:call-template>
-      </span>
-      <span class="value">
-        <xsl:value-of select="subject"/>
-      </span>
-      <br/>
-      <span class="label">
-        <xsl:call-template name="mandalay:getStaticText">
-          <xsl:with-param name="module" select="'forum'"/>
-          <xsl:with-param name="id" select="'messages/message'"/>
-        </xsl:call-template>
-      </span>
-      <span class="value">
-        <xsl:value-of disable-output-escaping="yes" select="body"/>
-      </span>
-      <br/>
-      <h3>
-        <xsl:call-template name="mandalay:getStaticText">
-          <xsl:with-param name="module" select="'forum'"/>
-          <xsl:with-param name="id" select="'forms/attachedFiles/heading'"/>
-        </xsl:call-template>
-      </h3>
-      <xsl:apply-templates select="forum:files | files"/>
-      <br/>
-    </div>
-  </xsl:template>
+    <xsl:template match="forum:postConfirm">
+        <div class="postConfirm">
+            <span class="label">
+                <xsl:call-template name="mandalay:getStaticText">
+                    <xsl:with-param name="module" select="'forum'"/>
+                    <xsl:with-param name="id" select="'messages/subject'"/>
+                </xsl:call-template>
+            </span>
+            <span class="value">
+                <xsl:value-of select="subject"/>
+            </span>
+            <br/>
+            <span class="label">
+                <xsl:call-template name="mandalay:getStaticText">
+                    <xsl:with-param name="module" select="'forum'"/>
+                    <xsl:with-param name="id" select="'messages/message'"/>
+                </xsl:call-template>
+            </span>
+            <span class="value">
+                <xsl:value-of disable-output-escaping="yes" select="body"/>
+            </span>
+            <br/>
+            <h3>
+                <xsl:call-template name="mandalay:getStaticText">
+                    <xsl:with-param name="module" select="'forum'"/>
+                    <xsl:with-param name="id" select="'forms/attachedFiles/heading'"/>
+                </xsl:call-template>
+            </h3>
+            <xsl:apply-templates select="forum:files | files"/>
+            <br/>
+        </div>
+    </xsl:template>
 
-  <xsl:template match="forum:postFormFiles">
-    <h3>
-      <xsl:call-template name="mandalay:getStaticText">
-        <xsl:with-param name="module" select="'forum'"/>
-        <xsl:with-param name="id" select="'forms/attachedFiles/heading'"/>
-      </xsl:call-template>
-    </h3>
-    <xsl:apply-templates/>
-  </xsl:template>
+    <xsl:template match="forum:postFormFiles">
+        <h3>
+            <xsl:call-template name="mandalay:getStaticText">
+                <xsl:with-param name="module" select="'forum'"/>
+                <xsl:with-param name="id" select="'forms/attachedFiles/heading'"/>
+            </xsl:call-template>
+        </h3>
+        <xsl:apply-templates/>
+    </xsl:template>
 
-  <xsl:template match="forum:attachedFiles">
-    <ul>
-      <xsl:apply-templates/>
-    </ul>
-    <div class="formDescription">
-      <xsl:call-template name="mandalay:getStaticText">
-        <xsl:with-param name="module" select="'forum'"/>
-        <xsl:with-param name="id" select="'forms/attachFile/description'"/>
-      </xsl:call-template>
-    </div>
-  </xsl:template>
+    <xsl:template match="forum:attachedFiles">
+        <ul>
+            <xsl:apply-templates/>
+        </ul>
+        <div class="formDescription">
+            <xsl:call-template name="mandalay:getStaticText">
+                <xsl:with-param name="module" select="'forum'"/>
+                <xsl:with-param name="id" select="'forms/attachFile/description'"/>
+            </xsl:call-template>
+        </div>
+    </xsl:template>
 
-  <xsl:template match="forum:file">
-    <li>
-      <span class="name">
-        <xsl:value-of select="@name"/>
-      </span>
-      <xsl:if test="@deleteLink">
+    <xsl:template match="forum:file">
+        <li>
+            <span class="name">
+                <xsl:value-of select="@name"/>
+            </span>
+            <xsl:if test="@deleteLink">
         &nbsp;
-        <a class="deleteLink">
-          <xsl:attribute name="href">
-            <xsl:value-of select="@deleteLink"/>
-          </xsl:attribute>
-          <xsl:attribute name="title">
-          <xsl:call-template name="mandalay:getStaticText">
-            <xsl:with-param name="module" select="'forum'"/>
-            <xsl:with-param name="id" select="'forms/attachedFiles/delete'"/>
-          </xsl:call-template>
-          </xsl:attribute>
-          <xsl:call-template name="mandalay:getStaticText">
-            <xsl:with-param name="module" select="'forum'"/>
-            <xsl:with-param name="id" select="'forms/attachedFiles/delete'"/>
-          </xsl:call-template>
-        </a>
-      </xsl:if>
+                <a class="deleteLink">
+                    <xsl:attribute name="href">
+                        <xsl:value-of select="@deleteLink"/>
+                    </xsl:attribute>
+                    <xsl:attribute name="title">
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'forum'"/>
+                            <xsl:with-param name="id" select="'forms/attachedFiles/delete'"/>
+                        </xsl:call-template>
+                    </xsl:attribute>
+                    <xsl:call-template name="mandalay:getStaticText">
+                        <xsl:with-param name="module" select="'forum'"/>
+                        <xsl:with-param name="id" select="'forms/attachedFiles/delete'"/>
+                    </xsl:call-template>
+                </a>
+            </xsl:if>
       &nbsp;
-      <span class="description">
-        <xsl:value-of select="@description"/>
-      </span>
-    </li>
-  </xsl:template>
+            <span class="description">
+                <xsl:value-of select="@description"/>
+            </span>
+        </li>
+    </xsl:template>
 
 </xsl:stylesheet>