diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index 14d2c4d20f..650829f2f2 100644
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -1,4 +1,4 @@
-<?php //$Id: announcements.php 22201 2009-07-17 19:57:03Z cfasanando $
+<?php //$Id: announcements.php 22259 2009-07-20 18:56:45Z ivantcholakov $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -1115,7 +1115,7 @@ if ($display_form == true) {
 	$oFCKeditor->Height		= '300';
 	
 	if(!api_is_allowed_to_edit()) {
-		$oFCKeditor->ToolbarSet = "Announcements_Student";
+		$oFCKeditor->ToolbarSet = "AnnouncementsStudent";
 	} else {
 		$oFCKeditor->ToolbarSet = "Announcements";
 	}		
diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php
index 48a7e3ebbb..d9bb075d45 100644
--- a/main/calendar/agenda.inc.php
+++ b/main/calendar/agenda.inc.php
@@ -1,4 +1,4 @@
-<?php //$Id: agenda.inc.php 21905 2009-07-08 17:42:29Z juliomontoya $
+<?php //$Id: agenda.inc.php 22259 2009-07-20 18:56:45Z ivantcholakov $
 /* For licensing terms, see /dokeos_license.txt */
 /*
 ==============================================================================
@@ -2844,7 +2844,7 @@ function show_add_form($id = '')
 
 			if(!api_is_allowed_to_edit())
 			{
-				$oFCKeditor->ToolbarSet = 'Agenda_Student';
+				$oFCKeditor->ToolbarSet = 'AgendaStudent';
 			}
 			else
 			{
diff --git a/main/document/create_document.php b/main/document/create_document.php
index bf3afa1e7a..f7b444103f 100644
--- a/main/document/create_document.php
+++ b/main/document/create_document.php
@@ -1,4 +1,4 @@
-<?php // $Id: create_document.php 22201 2009-07-17 19:57:03Z cfasanando $
+<?php // $Id: create_document.php 22259 2009-07-20 18:56:45Z ivantcholakov $
 
 /*
 ==============================================================================
@@ -252,7 +252,7 @@ if ($relative_url== '') {
 }
 
 $html_editor_config = array(
-	'ToolbarSet' => (api_is_allowed_to_edit() ? 'Documents' :'Documents_Student'),
+	'ToolbarSet' => (api_is_allowed_to_edit() ? 'Documents' :'DocumentsStudent'),
 	'Width' => '100%',
 	'Height' => '600',
 	'FullPage' => true,
diff --git a/main/document/edit_document.php b/main/document/edit_document.php
index 3390493530..45f1caf78c 100644
--- a/main/document/edit_document.php
+++ b/main/document/edit_document.php
@@ -1,4 +1,4 @@
-<?php // $Id: edit_document.php 22201 2009-07-17 19:57:03Z cfasanando $
+<?php // $Id: edit_document.php 22259 2009-07-20 18:56:45Z ivantcholakov $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -158,7 +158,7 @@ for($i=0;$i<($count_dir);$i++)
 }
 
 $html_editor_config = array(
-	'ToolbarSet' => (api_is_allowed_to_edit() ? 'Documents' :'Documents_Student'),
+	'ToolbarSet' => (api_is_allowed_to_edit() ? 'Documents' :'DocumentsStudent'),
 	'Width' => '100%',
 	'Height' => '600',
 	'FullPage' => true,
diff --git a/main/forum/forumfunction.inc.php b/main/forum/forumfunction.inc.php
index 4024c7dc2a..be6fae488b 100644
--- a/main/forum/forumfunction.inc.php
+++ b/main/forum/forumfunction.inc.php
@@ -1919,7 +1919,7 @@ function show_add_post_form($action='', $id='', $form_values='') {
 	$form->addElement('html_editor', 'post_text', get_lang('Text'), null,
 		api_is_allowed_to_edit()
 			? array('ToolbarSet' => 'Forum', 'Width' => '100%', 'Height' => '400')
-			: array('ToolbarSet' => 'Forum_Student', 'Width' => '100%', 'Height' => '400', 'UserStatus' => 'student')
+			: array('ToolbarSet' => 'ForumStudent', 'Width' => '100%', 'Height' => '400', 'UserStatus' => 'student')
 	);
 	//$form->applyFilter('post_text', 'html_filter');	
 	
@@ -2352,7 +2352,7 @@ function show_edit_post_form($current_post, $current_thread, $current_forum, $fo
 	$form->addElement('html_editor', 'post_text', get_lang('Text'), null,
 		api_is_allowed_to_edit()
 			? array('ToolbarSet' => 'Forum', 'Width' => '100%', 'Height' => '400')
-			: array('ToolbarSet' => 'Forum_Student', 'Width' => '100%', 'Height' => '400', 'UserStatus' => 'student')
+			: array('ToolbarSet' => 'ForumStudent', 'Width' => '100%', 'Height' => '400', 'UserStatus' => 'student')
 	);
 	//$form->applyFilter('post_text', 'html_filter');	
 		
diff --git a/main/notebook/index.php b/main/notebook/index.php
index 28bc278912..56b4d1e37f 100755
--- a/main/notebook/index.php
+++ b/main/notebook/index.php
@@ -71,7 +71,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'addnote')
 	//$form->applyFilter('note_title', 'html_filter');
 	$form->addElement('html_editor', 'note_comment', get_lang('NoteComment'), null, api_is_allowed_to_edit()
 		? array('ToolbarSet' => 'Notebook', 'Width' => '100%', 'Height' => '300')
-		: array('ToolbarSet' => 'Notebook_Student', 'Width' => '100%', 'Height' => '300', 'UserStatus' => 'student')
+		: array('ToolbarSet' => 'NotebookStudent', 'Width' => '100%', 'Height' => '300', 'UserStatus' => 'student')
 	);
 	$form->addElement('style_submit_button', 'SubmitNote', get_lang('AddNote'), 'class="add"');	
 	
@@ -121,7 +121,7 @@ else if (isset($_GET['action']) && $_GET['action'] == 'editnote' && is_numeric($
 	//$form->applyFilter('note_title', 'html_filter');
 	$form->addElement('html_editor', 'note_comment', get_lang('NoteComment'), null, api_is_allowed_to_edit()
 		? array('ToolbarSet' => 'Notebook', 'Width' => '100%', 'Height' => '300')
-		: array('ToolbarSet' => 'Notebook_Student', 'Width' => '100%', 'Height' => '300', 'UserStatus' => 'student')
+		: array('ToolbarSet' => 'NotebookStudent', 'Width' => '100%', 'Height' => '300', 'UserStatus' => 'student')
 	);
 	$form->addElement('style_submit_button', 'SubmitNote', get_lang('ModifyNote'), 'class="save"');	
 	
diff --git a/main/wiki/index.php b/main/wiki/index.php
index 1045166c6b..8bb86365a5 100644
--- a/main/wiki/index.php
+++ b/main/wiki/index.php
@@ -1333,7 +1333,7 @@ if ($_GET['action']=='edit')
 				
 				api_disp_html_area('content', stripslashes($content), '', '', null, api_is_allowed_to_edit()
 					? array('ToolbarSet' => 'Wiki', 'Width' => '100%', 'Height' => '400')
-					: array('ToolbarSet' => 'Wiki_Student', 'Width' => '100%', 'Height' => '400', 'UserStatus' => 'student')
+					: array('ToolbarSet' => 'WikiStudent', 'Width' => '100%', 'Height' => '400', 'UserStatus' => 'student')
 				); 	
 				echo '<br/>';
 	            echo '<br/>'; 	
diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php
index 377a0348e9..7a61aeb66b 100644
--- a/main/wiki/wiki.inc.php
+++ b/main/wiki/wiki.inc.php
@@ -508,7 +508,7 @@ return true;
 	echo '<div id="wikicontent">';
 	api_disp_html_area('content', '', '', '', null, api_is_allowed_to_edit()
 		? array('ToolbarSet' => 'Wiki', 'Width' => '100%', 'Height' => '400')
-		: array('ToolbarSet' => 'Wiki_Student', 'Width' => '100%', 'Height' => '400', 'UserStatus' => 'student')
+		: array('ToolbarSet' => 'WikiStudent', 'Width' => '100%', 'Height' => '400', 'UserStatus' => 'student')
 	); 	
 	echo '<br/>';
 	echo '<br/>';