diff --git editors/tinymce.inc editors/tinymce.inc
index a7250f3..88a11c3 100644
--- editors/tinymce.inc
+++ editors/tinymce.inc
@@ -383,6 +383,8 @@ function wysiwyg_tinymce_plugins($editor) {
         'link' => t('Link'), 'unlink' => t('Unlink'), 'anchor' => t('Anchor'),
         'image' => t('Image'),
         'cleanup' => t('Clean-up'),
+        'formatselect' => t('Block format'), 'styleselect' => t('Styles'),
+        'fontselect' => t('Font'), 'fontsizeselect' => t('Font size'),
         'forecolor' => t('Forecolor'), 'backcolor' => t('Backcolor'),
         'sup' => t('Superscript'), 'sub' => t('Subscript'),
         'blockquote' => t('Blockquote'), 'code' => t('Source code'),
@@ -447,13 +449,6 @@ function wysiwyg_tinymce_plugins($editor) {
       'internal' => TRUE,
       'load' => TRUE,
     ),
-    'font' => array(
-      'path' => $editor['library path'] . '/plugins/font',
-      'buttons' => array('formatselect' => t('HTML block format'), 'fontselect' => t('Font'), 'fontsizeselect' => t('Font size'), 'styleselect' => t('Font style')),
-      'extended_valid_elements' => array('font[face|size|color|style],span[class|align|style]'),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/font',
-      'internal' => TRUE,
-    ),
     'fullscreen' => array(
       'path' => $editor['library path'] . '/plugins/fullscreen',
       'buttons' => array('fullscreen' => t('Fullscreen')),
@@ -519,7 +514,7 @@ function wysiwyg_tinymce_plugins($editor) {
     ),
     'style' => array(
       'path' => $editor['library path'] . '/plugins/style',
-      'buttons' => array('styleprops' => t('Style properties')),
+      'buttons' => array('styleprops' => t('Advanced CSS styles')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style',
       'internal' => TRUE,
       'load' => TRUE,