diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index a6b953265fc..16ac49d543b 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -136,7 +136,6 @@ print '</table>'."\n";
 
 
 print '<br>'."\n";
-print '<!-- Editor name = '.$conf->global->FCKEDITOR_EDITORNAME.' -->';
 print_fiche_titre($langs->trans("TestSubmitForm"),'','');
 print '<form name="formtest" method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 $uselocalbrowser=true;
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index d7fae4fa9d6..1a9425fbf79 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -343,8 +343,6 @@ class Conf
 		$this->mailing->email_from=$this->email_from;
 		if (! empty($this->global->MAILING_EMAIL_FROM))	$this->mailing->email_from=$this->global->MAILING_EMAIL_FROM;
 
-        if (! isset($this->global->FCKEDITOR_EDITORNAME)) $this->global->FCKEDITOR_EDITORNAME='ckeditor';  // fckeditor to switch
-
         // Format for date (used by default when not found or searched in lang)
         $this->format_date_short="%d/%m/%Y";            // Format of day with PHP/C tags (strftime functions)
         $this->format_date_short_java="dd/MM/yyyy";     // Format of day with Java tags
diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 5f4b6708309..55209c975a5 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -139,14 +139,15 @@ class DolEditor
      *		Output edit area inside the HTML stream.
      *		Output depends on this->tool (fckeditor, ckeditor, texatrea, ...)
      *
-     *      @param      noprint     1=Return HTML string instead of printing it to output
+     *      @param	int		$noprint     1=Return HTML string instead of printing it to output
+     *      @return	void
      */
     function Create($noprint=0)
     {
     	global $conf;
 
         $found=0;
-        $out='';
+		$out='';
 
         if ($this->tool == 'fckeditor')
         {
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index ee394539023..f017b66968e 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -944,7 +944,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.min.js"></script>'."\n";
 			}
             // CKEditor
-            if (! empty($conf->fckeditor->enabled) && ! empty($conf->global->FCKEDITOR_EDITORNAME) && $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor')
+            if (! empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor'))
             {
                 print '<!-- Includes JS for CKEditor -->'."\n";
                 print '<script type="text/javascript">var CKEDITOR_BASEPATH = \''.DOL_URL_ROOT.'/includes/ckeditor/\';</script>'."\n";
diff --git a/htdocs/theme/bureau2crea/graph-color.php b/htdocs/theme/bureau2crea/graph-color.php
index a34e6c1735e..5870778f5ce 100644
--- a/htdocs/theme/bureau2crea/graph-color.php
+++ b/htdocs/theme/bureau2crea/graph-color.php
@@ -27,6 +27,6 @@ global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcolorongle
 $theme_bordercolor = array(235,235,224);
 $theme_datacolor = array(array(120,130,150), array(200,160,180), array(190,190,220));
 $theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
-$theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));
+$theme_bgcoloronglet = array(hexdec('FF'),hexdec('FF'),hexdec('FF'));
 
 ?>