diff --git a/ccm-core/web/assets/xinha/CCMcoreXinhaConfig.js b/ccm-core/web/assets/xinha/CCMcoreXinhaConfig.js
index 5ddb0a78d..646ef6ca6 100644
--- a/ccm-core/web/assets/xinha/CCMcoreXinhaConfig.js
+++ b/ccm-core/web/assets/xinha/CCMcoreXinhaConfig.js
@@ -13,7 +13,7 @@ xinha_init=xinha_init?xinha_init:function(){
 xinha_editors=xinha_editors?xinha_editors:["myTextArea","anotherOne"];
 xinha_plugins=xinha_plugins?xinha_plugins:["CharacterMap","CharCounter",
     "ContextMenu","DefinitionList","FindReplace","ListType","QuickTag",
-    "SmartReplace","Stylist","TableOperations","UnFormat"];
+    "Stylist","TableOperations","UnFormat"];
 if(!Xinha.loadPlugins(xinha_plugins,xinha_init)){
 return;
 }
diff --git a/ccm-core/web/packages/bebop/xsl/XinhaEditor.xsl b/ccm-core/web/packages/bebop/xsl/XinhaEditor.xsl
index e6a444bde..f3b53eb26 100755
--- a/ccm-core/web/packages/bebop/xsl/XinhaEditor.xsl
+++ b/ccm-core/web/packages/bebop/xsl/XinhaEditor.xsl
@@ -6,8 +6,6 @@
   version="1.0">
   
   
-  <xsl:output method="html" indent="yes"/>
-  
   <!-- This is a backport from Mandalay v0.9 to support Xinha editor with the -->
   <!-- generic theme. Xinha is the follow-up of the discontinued HTMLArea. -->
   
@@ -24,18 +22,17 @@
  
       <script type="text/javascript">
         _editor_url = "<xsl:value-of select="@editor_url"/>";
-        <!-- There is no $lang variable in the original theme, so this is hardcodes to english -->
-        _editor_lang ="<xsl:value-of select="en"/>";
-
+        _editor_lang = "en";
+<!--        _editor_skin = "silva";-->
+        
         <!-- DE Definiere, welche Textareas zu Xinha-Editoren werden sollen -->
         <!-- EN Define all textares which should become xinha editors -->
-
         xinha_editors = [
         <xsl:for-each select="//bebop:xinha">
           'ta_<xsl:value-of select="@name"/>'<xsl:if test="position() != last()">, </xsl:if>
         </xsl:for-each>
         ];
-
+        
         <!-- DE Lade die angegebenen Plugins falls angegeben -->
         <!-- EN Load the mentioned plugins if any-->
         xinha_plugins = null;
@@ -47,14 +44,21 @@
           ];
         </xsl:if>
       </script>      
-
-      <!-- DE Lade die externe JavaScript-Datei fuer Xinha -->
+    
+      <!-- DE Lade die externe JavaScript-Datei für Xinha -->
       <script type="text/javascript" src="{@editor_src}"/>
       
       <!-- DE Lade die angegebene Konfiguration -->
       <script type="text/javascript">
         <xsl:attribute name="src">
-          <xsl:value-of select="bebop:config[@name='Xinha.Config']/@path"/>
+          <xsl:choose>
+            <xsl:when test="bebop:config[@name='XinhaConfig']">
+              <xsl:value-of select="bebop:config[@name='XinhaConfig']/@path"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="bebop:config[@name='Xinha.Config']/@path"/>
+            </xsl:otherwise>
+          </xsl:choose>
         </xsl:attribute>
       </script>
     
@@ -64,5 +68,4 @@
       <xsl:value-of disable-output-escaping="no" select="text()"/>
     </textarea>
   </xsl:template>
-
 </xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/XinhaEditor.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/XinhaEditor.xsl
index e6a444bde..f3b53eb26 100644
--- a/ccm-core/web/themes/heirloom/packages/bebop/xsl/XinhaEditor.xsl
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/XinhaEditor.xsl
@@ -6,8 +6,6 @@
   version="1.0">
   
   
-  <xsl:output method="html" indent="yes"/>
-  
   <!-- This is a backport from Mandalay v0.9 to support Xinha editor with the -->
   <!-- generic theme. Xinha is the follow-up of the discontinued HTMLArea. -->
   
@@ -24,18 +22,17 @@
  
       <script type="text/javascript">
         _editor_url = "<xsl:value-of select="@editor_url"/>";
-        <!-- There is no $lang variable in the original theme, so this is hardcodes to english -->
-        _editor_lang ="<xsl:value-of select="en"/>";
-
+        _editor_lang = "en";
+<!--        _editor_skin = "silva";-->
+        
         <!-- DE Definiere, welche Textareas zu Xinha-Editoren werden sollen -->
         <!-- EN Define all textares which should become xinha editors -->
-
         xinha_editors = [
         <xsl:for-each select="//bebop:xinha">
           'ta_<xsl:value-of select="@name"/>'<xsl:if test="position() != last()">, </xsl:if>
         </xsl:for-each>
         ];
-
+        
         <!-- DE Lade die angegebenen Plugins falls angegeben -->
         <!-- EN Load the mentioned plugins if any-->
         xinha_plugins = null;
@@ -47,14 +44,21 @@
           ];
         </xsl:if>
       </script>      
-
-      <!-- DE Lade die externe JavaScript-Datei fuer Xinha -->
+    
+      <!-- DE Lade die externe JavaScript-Datei für Xinha -->
       <script type="text/javascript" src="{@editor_src}"/>
       
       <!-- DE Lade die angegebene Konfiguration -->
       <script type="text/javascript">
         <xsl:attribute name="src">
-          <xsl:value-of select="bebop:config[@name='Xinha.Config']/@path"/>
+          <xsl:choose>
+            <xsl:when test="bebop:config[@name='XinhaConfig']">
+              <xsl:value-of select="bebop:config[@name='XinhaConfig']/@path"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="bebop:config[@name='Xinha.Config']/@path"/>
+            </xsl:otherwise>
+          </xsl:choose>
         </xsl:attribute>
       </script>
     
@@ -64,5 +68,4 @@
       <xsl:value-of disable-output-escaping="no" select="text()"/>
     </textarea>
   </xsl:template>
-
 </xsl:stylesheet>