diff --git a/editors/ckeditor.inc b/editors/ckeditor.inc
index 80c9fff..e53b2bf 100644
--- a/editors/ckeditor.inc
+++ b/editors/ckeditor.inc
@@ -32,6 +32,10 @@ function wysiwyg_ckeditor_editor() {
       ),
     ),
     'install note callback' => 'wysiwyg_ckeditor_install_note',
+    'toolbar groups' => TRUE,
+    'toolbar rows' => TRUE,
+    'toolbar separator' => '-',
+    'install note callback' => 'wysiwyg_ckeditor_install_note',
     'version callback' => 'wysiwyg_ckeditor_version',
     'themes callback' => 'wysiwyg_ckeditor_themes',
     'settings form callback' => 'wysiwyg_ckeditor_settings_form',
@@ -41,7 +45,8 @@ function wysiwyg_ckeditor_editor() {
     'plugin settings callback' => 'wysiwyg_ckeditor_plugin_settings',
     'proxy plugin' => array(
       'drupal' => array(
-        'load' => TRUE,
+        'title' => t('Drupal proxy plugin'),
+        'load' => FALSE,
         'proxy' => TRUE,
       ),
     ),
@@ -428,73 +433,46 @@ function wysiwyg_ckeditor_settings($editor, $config, $theme) {
     $settings['resize_enabled'] = (bool) $config['resize_enabled'];
   }
 
-  $settings['toolbar'] = array();
-  $supports_groups = version_compare($editor['installed version'], '3.6.0', '>=');
-  $use_default_groups = $supports_groups && !empty($config['default_toolbar_grouping']);
-  if (!empty($config['buttons'])) {
-    $extra_plugins = array();
-    $plugins = wysiwyg_get_plugins($editor['name']);
-    foreach ($config['buttons'] as $plugin => $buttons) {
-      foreach ($buttons as $button => $enabled) {
-        // Iterate separately over buttons and extensions properties.
-        foreach (array('buttons', 'extensions') as $type) {
-          // Skip unavailable plugins.
-          if (!isset($plugins[$plugin][$type][$button])) {
-            continue;
-          }
-          // Add buttons.
-          if ($type == 'buttons') {
-            if ($use_default_groups) {
-              $settings['toolbar'][_wysiwyg_ckeditor_group($button)][] = $button;
-            }
-            else {
-              // Use one button row for backwards compatibility.
-              $settings['toolbar'][] = $button;
-            }
-          }
-          // Add external Drupal plugins to the list of extensions.
-          if ($type == 'buttons' && !empty($plugins[$plugin]['proxy'])) {
-            $extra_plugins[] = $button;
-          }
-          // Add external plugins to the list of extensions.
-          elseif ($type == 'buttons' && empty($plugins[$plugin]['internal'])) {
-            $extra_plugins[] = $plugin;
-          }
-          // Add internal buttons that also need to be loaded as extension.
-          elseif ($type == 'buttons' && !empty($plugins[$plugin]['load'])) {
-            $extra_plugins[] = $plugin;
-          }
-          // Add plain extensions.
-          elseif ($type == 'extensions' && !empty($plugins[$plugin]['load'])) {
-            $extra_plugins[] = $plugin;
-          }
-          // Allow plugins to add or override global configuration settings.
-          if (!empty($plugins[$plugin]['options'])) {
-            $settings = array_merge($settings, $plugins[$plugin]['options']);
-          }
-        }
-      }
+  $toolbar = array();
+  $extra_plugins = array();
+  $plugins = wysiwyg_get_plugins($editor['name']);
+  foreach ($config['plugins'] as $plugin => $enabled) {
+    if (!$enabled || !isset($plugins[$plugin])) {
+      continue;
     }
-    if (!empty($extra_plugins)) {
-      $settings['extraPlugins'] = implode(',', $extra_plugins);
+    // Add plain extensions.
+    if (!empty($plugins[$plugin]['load'])) {
+      $extra_plugins[] = $plugin;
+    }
+    // Allow plugins to add or override global configuration settings.
+    if (!empty($plugins[$plugin]['options'])) {
+      $settings = array_merge($settings, $plugins[$plugin]['options']);
     }
   }
 
-  if ($use_default_groups) {
-    // Organize groups to use lables to improves accessibility.
-    // http://docs.ckeditor.com/#!/guide/dev_toolbar-section-3.
-    $groups_toolbar = array();
-    foreach ($settings['toolbar'] as $group => $items) {
-      $groups_toolbar[] = array(
-        'name' => $group,
-        'items' => $items,
-      );
-      $settings['toolbar'] = $groups_toolbar;
+  foreach ($config['toolbar'] as $config_row) {
+    foreach ($config_row as $buttons) {
+      $row = array();
+      foreach ($buttons as $button) {
+        // Cross-editor plugin buttons are prefixed by the proxy plugin name.
+        if (strpos($button, '.') !== FALSE) {
+          list($plugin, $button) = explode('.', $button);
+          // @todo Proxy-plugins: remove when allowing multiple buttons.
+          $extra_plugins[] = $button;
+        }
+        $row[] = $button;
+      }
+      $toolbar[] = $row;
     }
+    $toolbar[] = '/';
   }
-  else {
-    // For now, all buttons are placed into one row.
-    $settings['toolbar'] = array($settings['toolbar']);
+
+  // Remove the last '/'.
+  array_pop($toolbar);
+  $settings['toolbar'] = $toolbar;
+
+  if (!empty($extra_plugins)) {
+    $settings['extraPlugins'] = implode(',', array_unique($extra_plugins));
   }
 
   return $settings;
@@ -596,6 +574,7 @@ function wysiwyg_ckeditor_proxy_plugin_settings($editor, $profile, $plugins) {
 function wysiwyg_ckeditor_plugins($editor) {
   $plugins = array(
     'default' => array(
+      'title' => t('CKEditor core'),
       'buttons' => array(
         'Bold' => t('Bold'), 'Italic' => t('Italic'), 'Underline' => t('Underline'),
         'Strike' => t('Strike-through'),
diff --git a/editors/css/tinymce-2.css b/editors/css/tinymce-2.css
index 4aa201d..b076335 100644
--- a/editors/css/tinymce-2.css
+++ b/editors/css/tinymce-2.css
@@ -6,22 +6,3 @@ table.mceEditor {
   clear: left;
 }
 
-/**
- * Align all buttons and separators in a single row, so they wrap into multiple
- * rows if required.
- */
-.mceToolbarTop a, .mceToolbarBottom a {
-  float: left;
-}
-.mceSeparatorLine {
-  float: left;
-  margin-top: 3px;
-}
-.mceSelectList {
-  float: left;
-  margin-bottom: 1px;
-}
-/* Place table plugin buttons into new row */
-#mce_editor_0_table, #mce_editor_1_table {
-  clear: left;
-}
diff --git a/editors/css/tinymce-3.css b/editors/css/tinymce-3.css
index 5d0ebe9..ce13c63 100644
--- a/editors/css/tinymce-3.css
+++ b/editors/css/tinymce-3.css
@@ -6,19 +6,3 @@ table.mceLayout {
   clear: left;
 }
 
-/**
- * Align all buttons and separators in a single row, so they wrap into multiple
- * rows if required.
- */
-.mceToolbar td {
-  display: inline;
-}
-.mceToolbar a,
-.mceSeparator {
-  float: left;
-}
-.mceListBox,
-.mceSplitButton {
-  float: left;
-  margin-bottom: 1px;
-}
diff --git a/editors/fckeditor.inc b/editors/fckeditor.inc
index 672e6d1..09fa867 100644
--- a/editors/fckeditor.inc
+++ b/editors/fckeditor.inc
@@ -19,6 +19,9 @@ function wysiwyg_fckeditor_editor() {
         'files' => array('fckeditor.js'),
       ),
     ),
+    'toolbar groups' => TRUE,
+    'toolbar rows' => TRUE,
+    'toolbar separator' => '-',
     'version callback' => 'wysiwyg_fckeditor_version',
     'themes callback' => 'wysiwyg_fckeditor_themes',
     'settings form callback' => 'wysiwyg_fckeditor_settings_form',
@@ -27,7 +30,8 @@ function wysiwyg_fckeditor_editor() {
     'plugin settings callback' => 'wysiwyg_fckeditor_plugin_settings',
     'proxy plugin' => array(
       'drupal' => array(
-        'load' => TRUE,
+        'title' => t('Drupal proxy plugin'),
+        'load' => FALSE,
         'proxy' => TRUE,
       ),
     ),
@@ -205,32 +209,36 @@ function wysiwyg_fckeditor_settings($editor, $config, $theme) {
 
   // Use our custom toolbar set.
   $settings['ToolbarSet'] = 'Wysiwyg';
-  // Populate our custom toolbar set for fckeditor.config.js.
-  $settings['buttons'] = array();
-  if (!empty($config['buttons'])) {
-    $plugins = wysiwyg_get_plugins($editor['name']);
-    foreach ($config['buttons'] as $plugin => $buttons) {
-      foreach ($buttons as $button => $enabled) {
-        // Iterate separately over buttons and extensions properties.
-        foreach (array('buttons', 'extensions') as $type) {
-          // Skip unavailable plugins.
-          if (!isset($plugins[$plugin][$type][$button])) {
-            continue;
-          }
-          // Add buttons.
-          if ($type == 'buttons') {
-            $settings['buttons'][] = $button;
-          }
-          // Allow plugins to add or override global configuration settings.
-          if (!empty($plugins[$plugin]['options'])) {
-            $settings = array_merge($settings, $plugins[$plugin]['options']);
-          }
+  $toolbar = array();
+  $plugins = wysiwyg_get_plugins($editor['name']);
+  foreach ($config['plugins'] as $plugin => $enabled) {
+    if (!$enabled || !isset($plugins[$plugin])) {
+      continue;
+    }
+    // Allow plugins to add or override global configuration settings.
+    if (!empty($plugins[$plugin]['options'])) {
+      $settings = array_merge($settings, $plugins[$plugin]['options']);
+    }
+  }
+
+  foreach ($config['toolbar'] as $row) {
+    foreach ($row as $buttons) {
+      $group = array();
+      foreach ($buttons as $button_name) {
+        // Cross-editor plugin buttons are prefixed with the proxy plugin name.
+        if (strpos($button_name, '.') !== FALSE) {
+          list($plugin, $button_name) = explode('.', $button_name);
         }
+        $group[] = $button_name;
       }
+      $toolbar[] = $group;
     }
+    $toolbar[] = '/';
   }
-  // For now, all buttons are placed into one row.
-  $settings['buttons'] = array($settings['buttons']);
+  // Remove the last '/'.
+  array_pop($toolbar);
+
+  $settings['ToolbarSets']['Wysiwyg'] = $toolbar;
 
   return $settings;
 }
@@ -281,6 +289,7 @@ function wysiwyg_fckeditor_proxy_plugin_settings($editor, $profile, $plugins) {
 function wysiwyg_fckeditor_plugins($editor) {
   $plugins = array(
     'default' => array(
+      'title' => t('FCKeditor core'),
       'buttons' => array(
         'Bold' => t('Bold'), 'Italic' => t('Italic'), 'Underline' => t('Underline'),
         'StrikeThrough' => t('Strike-through'),
diff --git a/editors/js/fckeditor.config.js b/editors/js/fckeditor.config.js
index d441055..9f05fc5 100644
--- a/editors/js/fckeditor.config.js
+++ b/editors/js/fckeditor.config.js
@@ -16,28 +16,7 @@ var pluginSettings = (Drupal.settings.wysiwyg.plugins[wysiwygFormat] ? Drupal.se
  * Apply format-specific settings.
  */
 for (var setting in wysiwygSettings) {
-  if (setting == 'buttons') {
-    // Apply custom Wysiwyg toolbar for this format.
-    // FCKConfig.ToolbarSets['Wysiwyg'] = wysiwygSettings.buttons;
-
-    // Temporarily stack buttons into multiple button groups and remove
-    // separators until #277954 is solved.
-    FCKConfig.ToolbarSets['Wysiwyg'] = [];
-    for (var i = 0; i < wysiwygSettings.buttons[0].length; i++) {
-      FCKConfig.ToolbarSets['Wysiwyg'].push([wysiwygSettings.buttons[0][i]]);
-    }
-    FCKTools.AppendStyleSheet(document, '#xToolbar .TB_Start { display:none; }');
-    // Set valid height of select element in silver and office2003 skins.
-    if (FCKConfig.SkinPath.match(/\/office2003\/$/)) {
-      FCKTools.AppendStyleSheet(document, '#xToolbar .SC_FieldCaption { height: 24px; } #xToolbar .TB_End { display: none; }');
-    }
-    else if (FCKConfig.SkinPath.match(/\/silver\/$/)) {
-      FCKTools.AppendStyleSheet(document, '#xToolbar .SC_FieldCaption { height: 27px; }');
-    }
-  }
-  else {
-    FCKConfig[setting] = wysiwygSettings[setting];
-  }
+  FCKConfig[setting] = wysiwygSettings[setting];
 }
 
 // Fix Drupal toolbar obscuring editor toolbar in fullscreen mode.
diff --git a/editors/markitup.inc b/editors/markitup.inc
index faa35b4..05475d3 100644
--- a/editors/markitup.inc
+++ b/editors/markitup.inc
@@ -172,13 +172,9 @@ function wysiwyg_markitup_settings($editor, $config, $theme) {
     ),
   );
   $settings['markupSet'] = array();
-  if (!empty($config['buttons'])) {
-    foreach ($config['buttons'] as $plugin) {
-      foreach ($plugin as $button => $enabled) {
-        if (isset($default_buttons[$button])) {
-          $settings['markupSet'][$button] = $default_buttons[$button];
-        }
-      }
+  if (!empty($config['toolbar'])) {
+    foreach ($config['toolbar'] as $button) {
+      $settings['markupSet'][$button] = $default_buttons[$button];
     }
   }
 
@@ -191,6 +187,7 @@ function wysiwyg_markitup_settings($editor, $config, $theme) {
 function wysiwyg_markitup_plugins($editor) {
   return array(
     'default' => array(
+      'title' => t('markItUp core'),
       'buttons' => array(
         'bold' => t('Bold'), 'italic' => t('Italic'),
         'stroke' => t('Strike-through'),
diff --git a/editors/nicedit.inc b/editors/nicedit.inc
index 8a77564..fe48b2b 100644
--- a/editors/nicedit.inc
+++ b/editors/nicedit.inc
@@ -79,12 +79,8 @@ function wysiwyg_nicedit_settings($editor, $config, $theme) {
 
   // Add configured buttons or all available.
   $settings['buttonList'] = array();
-  if (!empty($config['buttons'])) {
-    $buttons = array();
-    foreach ($config['buttons'] as $plugin) {
-      $buttons = array_merge($buttons, $plugin);
-    }
-    $settings['buttonList'] = array_keys($buttons);
+  if (!empty($config['toolbar'])) {
+    $settings['buttonList'] = $config['toolbar'];
   }
 
   // Add editor content stylesheet.
@@ -110,6 +106,7 @@ function wysiwyg_nicedit_settings($editor, $config, $theme) {
 function wysiwyg_nicedit_plugins($editor) {
   return array(
     'default' => array(
+      'title' => t('NicEdit core'),
       'buttons' => array(
         'bold' => t('Bold'), 'italic' => t('Italic'), 'underline' => t('Underline'),
         'strikethrough' => t('Strike-through'),
diff --git a/editors/openwysiwyg.inc b/editors/openwysiwyg.inc
index 5aae0ed..ce40114 100644
--- a/editors/openwysiwyg.inc
+++ b/editors/openwysiwyg.inc
@@ -20,6 +20,8 @@ function wysiwyg_openwysiwyg_editor() {
         'files' => array('wysiwyg.js'),
       ),
     ),
+    'toolbar rows' => TRUE,
+    'toolbar separator' => 'seperator',
     'version callback' => 'wysiwyg_openwysiwyg_version',
     'themes callback' => 'wysiwyg_openwysiwyg_themes',
     'settings form callback' => 'wysiwyg_openwysiwyg_settings_form',
@@ -133,21 +135,13 @@ function wysiwyg_openwysiwyg_settings($editor, $config, $theme) {
   }
 
   $settings['Toolbar'] = array();
-  if (!empty($config['buttons'])) {
-    $plugins = wysiwyg_get_plugins($editor['name']);
-    foreach ($config['buttons'] as $plugin => $buttons) {
-      foreach ($buttons as $button => $enabled) {
-        foreach (array('buttons', 'extensions') as $type) {
-          // Skip unavailable plugins.
-          if (!isset($plugins[$plugin][$type][$button])) {
-            continue;
-          }
-          // Add buttons.
-          if ($type == 'buttons') {
-            $settings['Toolbar'][0][] = $button;
-          }
-        }
+  if (!empty($config['toolbar'])) {
+    foreach ($config['toolbar'] as $row) {
+      $toolbar_row = array();
+      foreach ($row as $button) {
+        $toolbar_row[] = $button;
       }
+      $settings['Toolbar'][] = $toolbar_row;
     }
   }
 
@@ -160,6 +154,7 @@ function wysiwyg_openwysiwyg_settings($editor, $config, $theme) {
 function wysiwyg_openwysiwyg_plugins($editor) {
   $plugins = array(
     'default' => array(
+      'title' => t('openWYSIWYG core'),
       'buttons' => array(
         'bold' => t('Bold'), 'italic' => t('Italic'), 'underline' => t('Underline'),
         'strikethrough' => t('Strike-through'),
diff --git a/editors/tinymce.inc b/editors/tinymce.inc
index 3316aa2..39e7399 100644
--- a/editors/tinymce.inc
+++ b/editors/tinymce.inc
@@ -26,6 +26,8 @@ function wysiwyg_tinymce_editor() {
         'files' => array('tiny_mce_src.js'),
       ),
     ),
+    'toolbar rows' => TRUE,
+    'toolbar separator' => '|',
     'version callback' => 'wysiwyg_tinymce_version',
     'themes callback' => 'wysiwyg_tinymce_themes',
     'settings form callback' => 'wysiwyg_tinymce_settings_form',
@@ -35,7 +37,8 @@ function wysiwyg_tinymce_editor() {
     'plugin settings callback' => 'wysiwyg_tinymce_plugin_settings',
     'proxy plugin' => array(
       'drupal' => array(
-        'load' => TRUE,
+        'title' => t('Drupal proxy plugin'),
+        'load' => FALSE,
         'proxy' => TRUE,
       ),
     ),
@@ -373,69 +376,49 @@ function wysiwyg_tinymce_settings($editor, $config, $theme) {
     }
   }
 
-  // Find the enabled buttons and the button row they belong on.
-  // Also map the plugin metadata for each button.
-  // @todo What follows is a pain; needs a rewrite.
-  // $settings['buttons'] are stacked into $settings['theme_advanced_buttons1']
-  // later.
-  $settings['buttons'] = array();
-  if (!empty($config['buttons']) && is_array($config['buttons'])) {
-    // Only array keys in $settings['extensions'] matter; added to
-    // $settings['plugins'] later.
-    $settings['extensions'] = array();
-    // $settings['extended_valid_elements'] are just stacked, unique'd later,
-    // and transformed into a comma-separated string in
-    // wysiwyg_add_editor_settings().
-    // @todo Needs a complete plugin API redesign using arrays for
-    //   tag => attributes definitions and array_merge_recursive().
-    $settings['extended_valid_elements'] = array();
-
-    $plugins = wysiwyg_get_plugins($editor['name']);
-    foreach ($config['buttons'] as $plugin => $buttons) {
-      foreach ($buttons as $button => $enabled) {
-        // Iterate separately over buttons and extensions properties.
-        foreach (array('buttons', 'extensions') as $type) {
-          // Skip unavailable plugins.
-          if (!isset($plugins[$plugin][$type][$button])) {
-            continue;
-          }
-          // Add buttons.
-          if ($type == 'buttons') {
-            $settings['buttons'][] = $button;
-          }
-          // Add external Drupal plugins to the list of extensions.
-          if ($type == 'buttons' && !empty($plugins[$plugin]['proxy'])) {
-            $settings['extensions'][_wysiwyg_tinymce_plugin_name('add', $button)] = 1;
-          }
-          // Add external plugins to the list of extensions.
-          elseif ($type == 'buttons' && empty($plugins[$plugin]['internal'])) {
-            $settings['extensions'][_wysiwyg_tinymce_plugin_name('add', $plugin)] = 1;
-          }
-          // Add internal buttons that also need to be loaded as extension.
-          elseif ($type == 'buttons' && !empty($plugins[$plugin]['load'])) {
-            $settings['extensions'][$plugin] = 1;
-          }
-          // Add plain extensions.
-          elseif ($type == 'extensions' && !empty($plugins[$plugin]['load'])) {
-            $settings['extensions'][$plugin] = 1;
-          }
-          // Allow plugins to add valid HTML elements.
-          if (!empty($plugins[$plugin]['extended_valid_elements'])) {
-            $settings['extended_valid_elements'] = array_merge($settings['extended_valid_elements'], $plugins[$plugin]['extended_valid_elements']);
-          }
-          // Allow plugins to add or override global configuration settings.
-          if (!empty($plugins[$plugin]['options'])) {
-            $settings = array_merge($settings, $plugins[$plugin]['options']);
-          }
-        }
+  $toolbar = array();
+  $extensions = array();
+  $settings['extended_valid_elements'] = array();
+
+  $plugins = wysiwyg_get_plugins($editor['name']);
+  foreach ($config['plugins'] as $plugin => $enabled) {
+    if (!$enabled || !isset($plugins[$plugin])) {
+      continue;
+    }
+    // Add plain extensions.
+    if (!empty($plugins[$plugin]['load'])) {
+      if (!empty($plugins[$plugin]['internal'])) {
+        $extensions[$plugin] = 1;
       }
+      else {
+        $extensions[_wysiwyg_tinymce_plugin_name('add', $plugin)] = 1;
+      }
+    }
+    // Allow plugins to add valid HTML elements.
+    if (!empty($plugins[$plugin]['extended_valid_elements'])) {
+      $settings['extended_valid_elements'] = array_merge($settings['extended_valid_elements'], $plugins[$plugin]['extended_valid_elements']);
     }
-    // Clean-up.
-    $settings['extended_valid_elements'] = array_unique($settings['extended_valid_elements']);
-    if ($settings['extensions']) {
-      $settings['plugins'] = array_keys($settings['extensions']);
+    // Allow plugins to add or override global configuration settings.
+    if (!empty($plugins[$plugin]['options'])) {
+      $settings = array_merge($settings, $plugins[$plugin]['options']);
     }
-    unset($settings['extensions']);
+  }
+
+  foreach ($config['toolbar'] as $config_row) {
+    $row = array();
+    foreach ($config_row as $button) {
+      // Cross-editor plugin buttons are prefixed by the proxy plugin name.
+      if (strpos($button, '.') !== FALSE) {
+        list($plugin, $button) = explode('.', $button);
+        $extensions['-' . $button ] = 1;
+      }
+      $row[] = $button;
+    }
+    $toolbar[] = $row;
+  }
+  $settings['extended_valid_elements'] = array_unique($settings['extended_valid_elements']);
+  if ($extensions) {
+    $settings['plugins'] = array_keys($extensions);
   }
 
   // Add theme-specific settings.
@@ -449,25 +432,29 @@ function wysiwyg_tinymce_settings($editor, $config, $theme) {
         'theme_advanced_toolbar_location' => isset($config['theme_advanced_toolbar_location']) ? $config['theme_advanced_toolbar_location'] : 'top',
         'theme_advanced_toolbar_align' => isset($config['theme_advanced_toolbar_align']) ? $config['theme_advanced_toolbar_align'] : 'left',
       );
-      if (isset($settings['buttons'])) {
+      if (isset($config['block_formats'])) {
+        $settings['theme_advanced_blockformats'] = $config['block_formats'];
+      }
+      if ($toolbar) {
         // These rows explicitly need to be set to be empty, otherwise TinyMCE
         // loads its default buttons of the advanced theme for each row.
         $settings += array(
-          'theme_advanced_buttons1' => array(),
-          'theme_advanced_buttons2' => array(),
-          'theme_advanced_buttons3' => array(),
+          'theme_advanced_buttons1' => '',
+          'theme_advanced_buttons2' => '',
+          'theme_advanced_buttons3' => '',
         );
-        // @todo Allow to sort/arrange editor buttons.
-        for ($i = 0; $i < count($settings['buttons']); $i++) {
-          $settings['theme_advanced_buttons1'][] = $settings['buttons'][$i];
+        for ($i = 0; $i < count($toolbar); $i++) {
+          $settings['theme_advanced_buttons' . ($i + 1)] = $toolbar[$i];
         }
       }
       break;
   }
-  unset($settings['buttons']);
 
   // Convert the config values into the form expected by TinyMCE.
-  $csv_settings = array('plugins', 'extended_valid_elements', 'theme_advanced_buttons1', 'theme_advanced_buttons2', 'theme_advanced_buttons3');
+  $csv_settings = array('plugins', 'extended_valid_elements');
+  for ($i = 0; $i < count($toolbar); $i++) {
+    $csv_settings[] = 'theme_advanced_buttons' . ($i + 1);
+  }
   foreach ($csv_settings as $key) {
     if (isset($settings[$key]) && is_array($settings[$key])) {
       $settings[$key] = implode(',', $settings[$key]);
@@ -548,6 +535,7 @@ function _wysiwyg_tinymce_plugin_name($op, $name) {
 function wysiwyg_tinymce_plugins($editor) {
   $plugins = array(
     'default' => array(
+      'title' => t('TinyMCE core'),
       'path' => $editor['library path'] . '/themes/advanced',
       'buttons' => array(
         'bold' => t('Bold'), 'italic' => t('Italic'), 'underline' => t('Underline'),
@@ -565,7 +553,7 @@ function wysiwyg_tinymce_plugins($editor) {
         'sup' => t('Superscript'), 'sub' => t('Subscript'),
         'blockquote' => t('Blockquote'), 'code' => t('Source code'),
         'hr' => t('Horizontal rule'),
-        'cut' => t('Cut'), 'copy' => t('Copy'), 'paste' => t('Paste'),
+        'cut' => t('Cut'), 'copy' => t('Copy'), 'pastetext' => t('Paste text'),
         'visualaid' => t('Visual aid'),
         'removeformat' => t('Remove format'),
         'charmap' => t('Character map'),
diff --git a/editors/whizzywig.inc b/editors/whizzywig.inc
index 3c627c4..a642167 100644
--- a/editors/whizzywig.inc
+++ b/editors/whizzywig.inc
@@ -23,6 +23,8 @@ function wysiwyg_whizzywig_editor() {
     'settings form callback' => 'wysiwyg_whizzywig_settings_form',
     'settings callback' => 'wysiwyg_whizzywig_settings',
     'plugin callback' => 'wysiwyg_whizzywig_plugins',
+    'toolbar separator' => '|',
+    'toolbar rows' => TRUE,
     'versions' => array(
       '55' => array(
         'js files' => array('whizzywig.js'),
@@ -103,13 +105,13 @@ function wysiwyg_whizzywig_settings($editor, $config, $theme) {
 
   // Add configured buttons or all available.
   $settings['buttons'] = array();
-  if (!empty($config['buttons'])) {
-    $buttons = array();
-    foreach ($config['buttons'] as $plugin) {
-      $buttons = array_merge($buttons, $plugin);
+  $toolbar = array();
+  if (!empty($config['toolbar'])) {
+    foreach ($config['toolbar'] as $config_row) {
+      $toolbar[] = implode(' ', $config_row);
     }
-    $settings['buttons'] = implode(' ', array_keys($buttons));
   }
+  $settings['buttons'] = implode(' newline ', $toolbar);
 
   // Add editor content stylesheet.
   // @todo CSS settings are currently not used.
@@ -134,6 +136,7 @@ function wysiwyg_whizzywig_settings($editor, $config, $theme) {
 function wysiwyg_whizzywig_plugins($editor) {
   return array(
     'default' => array(
+      'title' => t('Whizzywig core'),
       'buttons' => array(
         'formatblock' => t('HTML block format'), 'fontname' => t('Font'), 'fontsize' => t('Font size'),
         'bold' => t('Bold'), 'italic' => t('Italic'), 'underline' => t('Underline'),
diff --git a/editors/wymeditor.inc b/editors/wymeditor.inc
index d317d26..d85f5b2 100644
--- a/editors/wymeditor.inc
+++ b/editors/wymeditor.inc
@@ -142,34 +142,33 @@ function wysiwyg_wymeditor_settings($editor, $config, $theme) {
 
   // Add configured buttons.
   $settings['toolsItems'] = array();
-  if (!empty($config['buttons'])) {
+  if (!empty($config['toolbar'])) {
     $buttoninfo = _wysiwyg_wymeditor_button_info();
     $plugins = wysiwyg_get_plugins($editor['name']);
-    foreach ($config['buttons'] as $plugin => $buttons) {
-      foreach ($buttons as $button => $enabled) {
-        // Iterate separately over buttons and extensions properties.
-        foreach (array('buttons', 'extensions') as $type) {
-          // Skip unavailable plugins.
-          if (!isset($plugins[$plugin][$type][$button])) {
-            continue;
-          }
-          // Add buttons.
-          if ($type == 'buttons') {
-            // Merge meta-data for internal default buttons.
-            if (isset($buttoninfo[$button])) {
-              $buttoninfo[$button] += array('name' => $button);
-              $settings['toolsItems'][] = $buttoninfo[$button];
-            }
-            // For custom buttons, try to provide a valid button definition.
-            else {
-              $settings['toolsItems'][] = array(
-                'name' => $button,
-                'title' => $plugins[$plugin][$type][$button],
-                'css' => 'wym_tools_' . $button,
-              );
-            }
-          }
-        }
+    // Allow looking up which button is provided by which plugin.
+    $plugin_lookup = array();
+    foreach ($plugins as $plugin => $meta) {
+      if (empty($meta['buttons'])) {
+        continue;
+      }
+      foreach ($meta['buttons'] as $button_name => $button) {
+        $plugin_lookup[$button_name] = $plugin;
+      }
+    }
+    foreach ($config['toolbar'] as $button) {
+      // Merge meta-data for internal default buttons.
+      if (isset($buttoninfo[$button])) {
+        $buttoninfo[$button] += array('name' => $button);
+        $settings['toolsItems'][] = $buttoninfo[$button];
+      }
+      // For custom buttons, try to provide a valid button definition.
+      else {
+        $plugin = $plugin_lookup[$button];
+        $settings['toolsItems'][] = array(
+          'name' => $button,
+          'title' => $plugins[$plugin]['buttons'][$button],
+          'css' => 'wym_tools_' . $button,
+        );
       }
     }
   }
diff --git a/editors/yui.inc b/editors/yui.inc
index db952b6..9662f7f 100644
--- a/editors/yui.inc
+++ b/editors/yui.inc
@@ -49,11 +49,14 @@ function wysiwyg_yui_editor() {
     'plugin settings callback' => 'wysiwyg_yui_plugin_settings',
     'proxy plugin' => array(
       'drupal' => array(
+        'title' => t('Drupal proxy plugin'),
         'load' => TRUE,
         'proxy' => TRUE,
       ),
     ),
     'proxy plugin settings callback' => 'wysiwyg_yui_proxy_plugin_settings',
+    'toolbar groups' => TRUE,
+    'toolbar separator' => TRUE,
     'versions' => array(
       '2.7.0' => array(
         'js files' => array('yui.js'),
@@ -189,10 +192,21 @@ function wysiwyg_yui_settings($editor, $config, $theme) {
       'buttons' => array(),
     ),
   );
-  if (!empty($config['buttons'])) {
+  $plugins = wysiwyg_get_plugins($editor['name']);
+  foreach ($config['plugins'] as $plugin => $enabled) {
+    if (!$enabled || !isset($plugins[$plugin])) {
+      continue;
+    }
+    // Allow plugins to add or override global configuration settings.
+    if (!empty($plugins[$plugin]['options'])) {
+      $settings = array_merge($settings, $plugins[$plugin]['options']);
+    }
+  }
+  if (!empty($config['toolbar'])) {
     $buttons = array();
-    foreach ($config['buttons'] as $plugin => $enabled_buttons) {
-      foreach ($enabled_buttons as $button => $enabled) {
+    foreach ($config['toolbar'] as $group_index => $group_config) {
+      $group = array('group' => 'group' . $group_index, 'label' => '', 'buttons' => array());
+      foreach ($group_config as $button) {
         $extra = array();
         if ($button == 'heading') {
           $extra = array('menu' => array(
@@ -228,12 +242,11 @@ function wysiwyg_yui_settings($editor, $config, $theme) {
             array('text' => 'Verdana'),
           ));
         }
-        $buttons[] = wysiwyg_yui_button_setting($editor, $plugin, $button, $extra);
+        $group['buttons'][] = wysiwyg_yui_button_setting($editor, $button, $extra);
       }
+      $buttons[] = $group;
     }
-    // Group buttons in a dummy group.
-    $buttons = array('group' => 'default', 'label' => '', 'buttons' => $buttons);
-    $settings['toolbar']['buttons'] = array($buttons);
+    $settings['toolbar']['buttons'] = $buttons;
   }
 
   if (isset($config['css_setting'])) {
@@ -259,25 +272,41 @@ function wysiwyg_yui_settings($editor, $config, $theme) {
  *
  * @param $editor
  *   A processed hook_editor() array of editor properties.
- * @param $plugin
- *   The internal name of a plugin.
  * @param $button
- *   The internal name of a button, defined by $plugin.
+ *   The internal name of a button, defined by a plugin.
  * @param $extra
  *   (optional) An array containing arbitrary other elements to add to the
  *   resulting button.
  */
-function wysiwyg_yui_button_setting($editor, $plugin, $button, $extra = array()) {
+function wysiwyg_yui_button_setting($editor, $button, $extra = array()) {
   static $plugins;
+  static $plugin_lookup;
 
   if (!isset($plugins)) {
     $plugins = wysiwyg_get_plugins($editor['name']);
+    // Allow looking up which button is provided by which plugin.
+    $plugin_lookup = array();
+    foreach ($plugins as $plugin => $meta) {
+      if (empty($meta['buttons'])) {
+        continue;
+      }
+      foreach ($meta['buttons'] as $button_name => $button_info) {
+        $plugin_lookup[$button_name] = $plugin;
+      }
+    }
   }
 
   // Return a simple separator.
   if ($button === 'separator') {
     return array('type' => 'separator');
   }
+  // Cross-editor plugin buttons are prefixed by the proxy plugin name.
+  if (strpos($button, '.') !== FALSE) {
+    list($plugin, $button) = explode('.', $button);
+  }
+  else {
+    $plugin = $plugin_lookup[$button];
+  }
   // Setup defaults.
   $type = 'push';
   $label = $plugins[$plugin]['buttons'][$button];
@@ -347,6 +376,7 @@ function wysiwyg_yui_proxy_plugin_settings($editor, $profile, $plugins) {
 function wysiwyg_yui_plugins($editor) {
   return array(
     'default' => array(
+      'title' => t('YUI Editor core'),
       'buttons' => array(
         'bold' => t('Bold'), 'italic' => t('Italic'), 'underline' => t('Underline'),
         'strikethrough' => t('Strike-through'),
diff --git a/images/add.png b/images/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..6332fefea4be19eeadf211b0b202b272e8564898
GIT binary patch
literal 733
zcmV<30wVp1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!Z%IT!R5;6}
zlj}>9VHk(~TedF+gQSL8D5xnVSSWAVY>J9b+m>@{iq7_KE}go~11+5s4;8hc+i0Xa
zI1j@EX5!S+Me6HNqKzU5YQwL;-W5$p%ZMKMeR<%zp69-~?<4?8|C8S?bklXr4v&Ov
zb&06v2|-x?qB`90yn>Qi%Sh2^G4n)$ZdyvTPf9}1)_buUT7>`e2G&2VU@~Bb(o+Mz
zi4)>IxlSY${Dj4k={-9RzU^W5g9|2V5RZ2Zu<x6&^l=W_1sO_5@*~{AJR(k@osu$W
zIOyKBVDIZThPU;2xYmJgUn>lL9s2xQbZ@r6eP9Ra5u(s|C0Nj#&4>wTSkb?%#=9?@
z^oxDy-O@tyN{L@by(WWvQ3%CyEu8x{+#Jb4-h&K9Owi)2p<DqQ{Z%tMS5;_RkwZ2s
ziU|ZZE*fUaAe}14z#AR(OU=04okqn3igEs-_q_}KZ*?@>gg+heWDyked|3R$$kL@A
z#sp1v-r+=G4B8D6DqsDH0@7OztA7aT9qc1Py{()w`m``?Y0&gi2=ROcc-9+nU^I6<
zT=e_Y=<?pf1$FXK3F5I5#ceAAN5BHvd?h5_(jPS+7l@o3)VYh{*frx)Pb%2=Sw~G2
znu{1!PYZ*jM}To^G}f>vSnG@?3Ue{BW5ONFttcE!R-R_W4O01|0-|K-YNXLo2`4Qv
z`r1LxR6#yf3FB%T95gJnaKKivA~Z}S9A(ZxE<qS_Liq!k=vg3Per<qx!vKx95m{X+
zQ8;uQPPk0h^qI`uo^&$1^CFd@NeQR5pADaHJwu&SvB+fQDdu0d@n7>DK}O3T04USJ
P00000NkvXXu0mjf^IS-S

literal 0
HcmV?d00001

diff --git a/images/draggable.png b/images/draggable.png
new file mode 100644
index 0000000000000000000000000000000000000000..47e8a02cf432be62bde8984f14cb2d243b6db160
GIT binary patch
literal 349
zcmeAS@N?(olHy`uVBq!ia0vp^{6MV1!VDxY2k!k2q?n7HJVQ7*IBq}me*omF2l#}z
z0_j7C4z;$n78Mmeefsp?y?Y-%eCY1(77!4aJbCh$FJG#wt7p!f`DZ0l15hb%NswRg
ze>h<H|9@T4&u2gh&H|6fVg?4T4<O9ww8mrxP*AnRHKHUqKdq!Zu_%?nH!-;=KQ}cc
zGf}}UvnaJZzbLy{!8by|$iTp)y=={SpoV5o7srr_Imr=Qv!;p&=qCW_M8zqJJ3YA$
zMQmbKQrem$9dMPYtu;7y`z|>aqa)?ajT1!zmWXI<5{%?^x~^5ItZ6d&VOb+1E03;5
za;5N;g$EY0ChDZNc4Vx5#Po=j=X7LHWbljz9#%Gi3sDC)aHuhbH(%K5)ySB2PD!m~
dw??5cgB0^N9f>5BNkHc?c)I$ztaD0e0sz|Kfb{?X

literal 0
HcmV?d00001

diff --git a/images/remove.png b/images/remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..1514d51a3cf1b67e1c5b9ada36f1fd474e2d214a
GIT binary patch
literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!AxT6*R5;6(
zlj}|sQ51!ViOGr2pjL^7$dQ1=8$w$KD6I_$CeZtZUZjAurR}6mp*HFdO?(oc3q-}<
zu+o`!I@9H@m`W`r;m1zSWX}5bthM(H02sJT)z?DT&OUcv5HmU|-dF4oa@p;T*KAHh
zFQ6^X?4p&<LW?JRAa!4W*8^cRHn#BV<;v&k;?li;fWKno-=RgNB}6ngw>uEoyT++I
zn$b9r%cFfhHe2K68Pk<hKq}2z2~lh9z5zadf|kv-0cZq5T=w`mb%(MY1L(c%58!zI
zxmp(Hu69|_VhN_cj;WfM0p5Rrno6S{41>Bu*@^<$y+7xQ$wJ~;c5aBx$R=xq*41Wo
zhwQus_VOgm0hughj}MhOvs#{>Vg09Y8WxjWUJY5Y<Msg#Hz1}_nVr{4MuGi*zXu>W
zJ?&8eG!59Cz=|E%Ns@013KLWOLV)CObIIj_5{>{#k%TEAMs_GbdDV`x-iYsG<NRDe
z&F<oo(+wrG4$v4ShYJ*zTAVUyCyUEKWCOJq%P2g2jKiT}-UXn|;?x~V@D+7UK%!5l
zu+-wDffb%iu%q!uYSm;0f+3t(tT-AO#lfvX-T}~N2{oGoN+1Mj)d31iEk4tC0{b>H
z#=Z{USAQA>NY(}X7=3{K8#<xO0&SL1U06cNFs)HoJ!v1_9b#Vw@2F?RJt3C#MxpR@
plJ)zU4s^HK{`H%}g=4&I{RVQoq{rLsz7zle002ovPDHLkV1j2<C=vhw

literal 0
HcmV?d00001

diff --git a/wysiwyg.admin.css b/wysiwyg.admin.css
new file mode 100644
index 0000000..1f4d480
--- /dev/null
+++ b/wysiwyg.admin.css
@@ -0,0 +1,81 @@
+#toolbar-rows {
+  margin: 1em 0;
+}
+#toolbar-rows div, #toolbar-rows span {
+  vertical-align: top;
+}
+#toolbar-rows .toolbar-row {
+  border: 1px solid gray;
+  padding: 0.2em 0.2em 0.2em 20px;
+  min-height: 2em;
+  position: relative;
+  margin-bottom: 0.5em;
+}
+#toolbar-rows .single-group .toolbar-group {
+  border: 0;
+  margin: 0;
+  padding: 0;
+  width: 100%;
+}
+#toolbar-rows .single-group .group-handler {
+  display: none;
+}
+#toolbar-rows .toolbar-group {
+  border: 1px dotted silver;
+  display: inline-block;
+  min-width: 10em;
+  min-height: 27px;
+  padding: 0 0.5em;
+  margin: 0 0.5em 0.1em 0;
+  position: relative;
+}
+.toolbar-row-template, .toolbar-group-template  {
+  display: none;
+}
+#toolbar-rows .row-handler {
+  position: absolute;
+  top: 0.2em;
+  left: 0.2em;
+}
+#toolbar-description {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+#toolbar-available-buttons, #toolbar-active-buttons {
+  border: 1px dashed silver;
+  padding: 0.5em;
+  margin-bottom: 1em;
+  position: relative;
+}
+#wysiwyg-toolbar-designer .add {
+  display: inline-block;
+  background: transparent url(images/add.png) no-repeat;
+  text-indent: 18px;
+  height: 16px;
+  text-decoration: none;
+  outline: none;
+}
+#wysiwyg-toolbar-designer .add-group {
+  position: absolute;
+  right: 0.2em;
+  top: 0.2em;
+}
+#wysiwyg-toolbar-designer .handler {
+  background: url(images/draggable.png) no-repeat 0 4px;
+  width: 16px;
+  height: 16px;
+  display: inline-block;
+  text-decoration: none;
+}
+#wysiwyg-toolbar-designer .wysiwyg-button {
+  border: 1px solid silver;
+  display: inline-block;
+  margin: 0.2em 0.2em 0.2em 0;
+  padding: 0 0.5em;
+  height: 20px;
+  cursor: pointer;
+}
+#wysiwyg-toolbar-designer .ahah-progress, #wysiwyg-toolbar-designer div.warning {
+  /* Hidden by default. */
+  display: none;
+}
diff --git a/wysiwyg.admin.inc b/wysiwyg.admin.inc
index bc3e5ec..7f7f6e6 100644
--- a/wysiwyg.admin.inc
+++ b/wysiwyg.admin.inc
@@ -6,9 +6,9 @@
  */
 
 /**
- * Form builder for Wysiwyg profile form.
+ * Prepare default properties for profile.
  */
-function wysiwyg_profile_form($form, &$form_state, $profile) {
+function wysiwyg_profile_default($profile) {
   // Merge in defaults.
   $profile = (array) $profile;
   $profile += array(
@@ -27,10 +27,34 @@ function wysiwyg_profile_form($form, &$form_state, $profile) {
     'theme' => '',
     'language' => 'en',
     'buttons' => array(),
+    'access' => 1,
+    'access_pages' => "node/*\nuser/*\ncomment/*",
+    'toolbar' => array(),
+    'toolbar_loc' => 'top',
+    'toolbar_align' => 'left',
+    'path_loc' => 'bottom',
+    'resizing' => TRUE,
+    // Also available, but buggy in TinyMCE 2.x: blockquote,code,dt,dd,samp.
+    'block_formats' => 'p,address,pre,h2,h3,h4,h5,h6,div',
+    'verify_html' => TRUE,
+    'preformatted' => FALSE,
+    'convert_fonts_to_spans' => TRUE,
+    'remove_linebreaks' => TRUE,
+    'apply_source_formatting' => FALSE,
+    'paste_auto_cleanup_on_paste' => FALSE,
     'css_setting' => 'theme',
     'css_path' => NULL,
   );
   $profile = (object) $profile;
+  return $profile;
+}
+
+/**
+ * Form builder for Wysiwyg profile form.
+ */
+function wysiwyg_profile_form($form, &$form_state, $profile) {
+  $profile = wysiwyg_profile_default($profile);
+  $settings = $profile->settings;
 
   $formats = filter_formats();
   $editor = wysiwyg_get_editor($profile->editor);
@@ -40,6 +64,12 @@ function wysiwyg_profile_form($form, &$form_state, $profile) {
   $form['input_format'] = array('#type' => 'value', '#value' => $formats[$profile->format]->name);
   $form['editor'] = array('#type' => 'value', '#value' => $profile->editor);
 
+  $form['advanced'] = array(
+    '#type' => 'vertical_tabs',
+    '#weight' => 50,
+  );
+
+  // Basic setup (vertical tab).
   $form['basic'] = array(
     '#type' => 'fieldset',
     '#title' => t('Basic setup'),
@@ -90,6 +120,7 @@ function wysiwyg_profile_form($form, &$form_state, $profile) {
     '#title' => t('Interface language'),
     '#default_value' => $settings['language'],
   );
+
   // @see _locale_prepare_predefined_list()
   require_once DRUPAL_ROOT . '/includes/iso.inc';
   $predefined = _locale_get_predefined_list();
@@ -106,51 +137,91 @@ function wysiwyg_profile_form($form, &$form_state, $profile) {
   asort($predefined);
   $form['basic']['language']['#options'] = $predefined;
 
-  $form['buttons'] = array(
+  // Retrieve all available plugins and buttons.
+  $plugins = wysiwyg_get_plugins($profile->editor);
+
+  // Supply contextual information for other callbacks and handlers.
+  // @todo Modernize this form for D7+:
+  // $profile is the primary object of this form, and as an entity, usually
+  // expected to live in $form_state[$entity_type].
+  $form_state['wysiwyg_profile'] = $profile;
+  $form_state['wysiwyg']['editor'] = $editor;
+  $form_state['wysiwyg']['plugins'] = $plugins;
+
+  // Create the Plugins section and, optionally, the Extensions section.
+  $form['plugins'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Buttons and plugins'),
-    '#collapsible' => FALSE,
+    '#title' => t('Plugins'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
     '#tree' => TRUE,
-    '#theme' => 'wysiwyg_admin_button_table',
+    '#theme' => 'wysiwyg_admin_plugin_table',
+    '#access' => !empty($plugins),
   );
 
-  $plugins = wysiwyg_get_plugins($profile->editor);
-  // Generate the button list.
+  $buttons = array();
+  $proxy = (isset($editor['proxy plugin']) ? key($editor['proxy plugin']) : FALSE);
   foreach ($plugins as $name => $meta) {
+    $title = (!empty($meta['title']) ? $meta['title'] : (!empty($meta['extensions']) ? $meta['extensions'][$name] : $name));
+    $form['plugins'][$name] = array(
+      '#type' => 'checkbox',
+      '#title' => check_plain($title),
+      '#default_value' => !empty($profile->settings['plugins'][$name]),
+      '#description' => isset($meta['url']) ? l($meta['url'], $meta['url']) : NULL,
+    );
     if (isset($meta['buttons']) && is_array($meta['buttons'])) {
-      foreach ($meta['buttons'] as $button => $title) {
-        $icon = '';
-        if (!empty($meta['path'])) {
-          // @todo Button icon locations are different in editors, editor versions,
-          //   and contrib/custom plugins (like Image Assist, f.e.).
-          $img_src = $meta['path'] . "/images/$name.gif";
-          // Handle plugins that have more than one button.
-          if (!file_exists($img_src)) {
-            $img_src = $meta['path'] . "/images/$button.gif";
-          }
-          $icon = file_exists($img_src) ? '<img src="' . base_path() . $img_src . '" title="' . $button . '" style="border: 1px solid grey; vertical-align: middle;" />' : '';
-        }
-        $title = (!empty($icon) ? $icon . ' ' . check_plain($title) : check_plain($title));
-        $form['buttons'][$name][$button] = array(
-          '#type' => 'checkbox',
-          '#title' => $title,
-          '#default_value' => !empty($settings['buttons'][$name][$button]) ? $settings['buttons'][$name][$button] : FALSE,
-          '#description' => isset($meta['url']) ? l($meta['url'], $meta['url']) : NULL,
+      foreach ($meta['buttons'] as $button_name => $button) {
+        $button_name = ($name === $proxy ? $name . '.' . $button_name : $button_name);
+        $buttons[$button_name] = (is_array($button) ? $button : array('title' => $button));
+        $buttons[$button_name] += array(
+          'plugin' => $name,
+          'button' => $button,
+          'title' => $title,
         );
       }
     }
-    elseif (isset($meta['extensions']) && is_array($meta['extensions'])) {
+    if (isset($meta['extensions']) && is_array($meta['extensions'])) {
       foreach ($meta['extensions'] as $extension => $title) {
-        $form['buttons'][$name][$extension] = array(
+        $form['extensions'][$name][$extension] = array(
           '#type' => 'checkbox',
-          '#title' => check_plain($title),
-          '#default_value' => !empty($settings['buttons'][$name][$extension]) ? $settings['buttons'][$name][$extension] : FALSE,
-          '#description' => isset($meta['url']) ? l($meta['url'], $meta['url']) : NULL,
+          '#title' => isset($meta['url']) ? l($title, $meta['url'], array('target' => '_blank')) : $title,
+          '#default_value' => !empty($profile->settings['extensions'][$name][$extension]) ? $profile->settings['extensions'][$name][$extension] : 0,
         );
       }
     }
   }
 
+  // The Toolbar section.
+  $form['toolbar'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Toolbar definition'),
+    '#default_value' => json_encode($profile->settings['toolbar']),
+    '#access' => !empty($buttons),
+  );
+
+  // Separator.
+  if (!empty($editor['toolbar separator'])) {
+    $separator = $editor['toolbar separator'] === TRUE ? 'separator' : $editor['toolbar separator'];
+    $buttons[$separator] = array(
+      'plugin' => 'none',
+      'title' => t('Separator'),
+      'multiple' => TRUE,
+    );
+  }
+  $toolbar_support = array(
+    'toolbar' => $profile->settings['toolbar'],
+    'toolbar rows' => !empty($editor['toolbar rows']),
+    'toolbar groups' => !empty($editor['toolbar groups']),
+    'toolbar separator' => !empty($editor['toolbar separator']) ? $editor['toolbar separator'] : FALSE,
+    'buttons' => $buttons,
+  );
+  $form['toolbar']['#attached']['js'][] = array(
+    'data' => array('wysiwyg_toolbar' => $toolbar_support),
+    'type' => 'setting',
+  );
+  $form['toolbar']['#attached']['library'][] = array('wysiwyg', 'wysiwyg.admin');
+
+  // Editor appearance (vertical tab).
   $form['appearance'] = array(
     '#type' => 'fieldset',
     '#title' => t('Editor appearance'),
@@ -159,6 +230,7 @@ function wysiwyg_profile_form($form, &$form_state, $profile) {
     '#group' => 'advanced',
   );
 
+  // Cleanup and output (vertical tab).
   $form['output'] = array(
     '#type' => 'fieldset',
     '#title' => t('Cleanup and output'),
@@ -167,6 +239,7 @@ function wysiwyg_profile_form($form, &$form_state, $profile) {
     '#group' => 'advanced',
   );
 
+  // CSS (vertical tab).
   $form['css'] = array(
     '#type' => 'fieldset',
     '#title' => t('CSS'),
@@ -192,11 +265,7 @@ function wysiwyg_profile_form($form, &$form_state, $profile) {
     '#description' => t('If "Define CSS" was selected above, enter path to a CSS file or a list of CSS files separated by a comma.') . '<br />' . t('Available tokens: <code>%b</code> (base path, eg: <code>/</code>), <code>%t</code> (path to theme, eg: <code>themes/garland</code>)') . '<br />' . t('Example:') . ' css/editor.css,/themes/garland/style.css,%b%t/style.css,http://example.com/external.css',
   );
 
-  $form['advanced'] = array(
-    '#type' => 'vertical_tabs',
-    '#weight' => 50,
-  );
-
+  // Submit button and Cancel link.
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array(
     '#type' => 'submit',
@@ -208,19 +277,12 @@ function wysiwyg_profile_form($form, &$form_state, $profile) {
     '#href' => 'admin/config/content/wysiwyg',
   );
 
-  // Supply contextual information for other callbacks and handlers.
-  // @todo Modernize this form for D7+ and declare these earlier.
-  // $profile is the primary object of this form, and as an entity, usually
-  // expected to live in $form_state[$entity_type].
-  $form_state['wysiwyg_profile'] = $profile;
-  $form_state['wysiwyg']['editor'] = $editor;
-  $form_state['wysiwyg']['plugins'] = $plugins;
-
   // Allow editor library specific changes to be made to the form.
   if (isset($editor['settings form callback'])) {
     $editor['settings form callback']($form, $form_state);
   }
 
+  // Hide the "Editor appearance" and "Cleanup and output" tabs if empty.
   foreach (array('appearance', 'output') as $fieldset) {
     if (count(element_children($form[$fieldset])) == 0) {
       $form[$fieldset]['#access'] = FALSE;
@@ -236,25 +298,85 @@ function wysiwyg_profile_form($form, &$form_state, $profile) {
  * @see wysiwyg_profile_form()
  */
 function wysiwyg_profile_form_submit($form, &$form_state) {
-  $values = $form_state['values'];
-  if (isset($values['buttons'])) {
-    // Store only enabled buttons for each plugin.
-    foreach ($values['buttons'] as $plugin => $buttons) {
-      $values['buttons'][$plugin] = array_filter($values['buttons'][$plugin]);
-    }
+  $values = &$form_state['values'];
+  $editor = $form_state['wysiwyg']['editor'];
+  if (isset($values['plugins'])) {
     // Store only enabled plugins.
-    $values['buttons'] = array_filter($values['buttons']);
+    $values['plugins'] = array_filter($values['plugins']);
+  }
+  else {
+    $values['plugins'] = array();
+  }
+  $values['toolbar'] = json_decode($values['toolbar'], FALSE);
+  $plugins = wysiwyg_get_plugins($values['editor']);
+  // Allow looking up which button is provided by which plugin.
+  $plugin_lookup = array();
+  foreach ($plugins as $plugin => $meta) {
+    if (empty($meta['buttons'])) {
+      continue;
+    }
+    foreach ($meta['buttons'] as $button_name => $button) {
+      $plugin_lookup[$button_name] = $plugin;
+    }
+  }
+
+  // Verify all dependencies are also enabled.
+  $additional_plugins = array();
+  $dependencies = array();
+  $toolbar = (!empty($editor['toolbar rows']) ? $values['toolbar'] : array($values['toolbar']));
+  foreach ($toolbar as $row) {
+    if (empty($editor['toolbar groups'])) {
+      $row = array($row);
+    }
+    foreach ($row as $group) {
+      foreach ($group as $button) {
+        // Cross-editor plugin buttons are prefixed by the proxy plugin name.
+        if (strpos($button, '.') !== FALSE) {
+          list($plugin, $button_id) = explode('.', $button);
+        }
+        elseif (isset($plugin_lookup[$button]) && !isset($values['plugins'][$plugin_lookup[$button]])) {
+          $plugin = $plugin_lookup[$button];
+        }
+        if (!isset($values['plugins'][$plugin])) {
+          $additional_plugins[$plugin] = 1;
+        }
+        if (!empty($plugins[$plugin]['dependencies'])) {
+          $dependencies = array_unique(array_merge($dependencies, $plugins[$plugin]['dependencies']));
+        }
+      }
+    }
+  }
+  foreach ($values['plugins'] as $plugin => $enabled) {
+    if (!empty($plugins[$plugin]['dependencies'])) {
+      $dependencies = array_unique(array_merge($dependencies, $plugins[$plugin]['dependencies']));
+    }
+  }
+  // Walk up the dependency chain until a dependency is already enabled.
+  while ($dependency = array_pop($dependencies)) {
+    if (!isset($values['plugins'][$dependency]) && !isset($additional_plugins[$dependency])) {
+      $additional_plugins[$dependency] = 1;
+      if (!empty($plugins[$dependency]['dependencies'])) {
+        $dependencies = array_unique(array_merge($dependencies, $plugins[$dependency]['dependencies']));
+      }
+    }
+  }
+  if (!empty($additional_plugins)) {
+    drupal_set_message(t('Additional plugins were automatically enabled because they were required by already enabled plugins or buttons.<br />The enabled plugins were: @plugins', array('@plugins' => implode(', ', array_keys($additional_plugins)))));
+    $values['plugins'] = array_merge($values['plugins'], $additional_plugins);
   }
 
+  // Remove any white-space from 'block_formats' setting, since editor
+  // implementations rely on a comma-separated list to explode().
+  $values['block_formats'] = preg_replace('@\s+@', '', $values['block_formats']);
+
   // Remove input format name.
   $format = $values['format'];
   $input_format = $values['input_format'];
   $editor = $values['editor'];
   unset($values['format'], $values['input_format'], $values['editor']);
 
-  // Remove FAPI values.
-  // @see system_settings_form_submit()
-  unset($values['submit'], $values['form_id'], $values['op'], $values['form_token'], $values['form_build_id']);
+  // Remove internal Form API values.
+  form_state_values_clean($form_state);
 
   // Insert new profile data.
   db_merge('wysiwyg')
@@ -272,27 +394,25 @@ function wysiwyg_profile_form_submit($form, &$form_state) {
 }
 
 /**
- * Layout for the buttons in the Wysiwyg Editor profile form.
+ * Layout for the plugins in the Wysiwyg Editor profile form.
  */
-function theme_wysiwyg_admin_button_table($variables) {
+function theme_wysiwyg_admin_plugin_table($variables) {
   $form = $variables['form'];
-  $buttons = array();
+  $plugins = array();
 
   // Flatten forms array.
-  foreach (element_children($form) as $name) {
-    foreach (element_children($form[$name]) as $button) {
-      $buttons[] = drupal_render($form[$name][$button]);
-    }
+  foreach (element_children($form) as $plugin) {
+    $plugins[] = drupal_render($form[$plugin]);
   }
 
   // Split checkboxes into rows with 3 columns.
-  $total = count($buttons);
+  $total = count($plugins);
   $rows = array();
   for ($i = 0; $i < $total; $i += 3) {
     $row = array();
-    $row_buttons = array_slice($buttons, $i, 3) + array_fill(0, 3, array());
-    foreach ($row_buttons as $row_button) {
-      $row[] = array('data' => $row_button);
+    $row_plugins = array_slice($plugins, $i, 3) + array_fill(0, 3, array());
+    foreach ($row_plugins as $row_plugin) {
+      $row[] = array('data' => $row_plugin);
     }
     $rows[] = $row;
   }
@@ -474,11 +594,17 @@ function theme_wysiwyg_profile_overview($variables) {
  * Submit callback for Wysiwyg profile overview form.
  */
 function wysiwyg_profile_overview_submit($form, &$form_state) {
+  // The settings handling relies on these to be defined and arrays.
+  $settings = array(
+    'toolbar' => array(),
+    'plugins' => array(),
+  );
   foreach ($form_state['values']['formats'] as $format => $values) {
     db_merge('wysiwyg')
       ->key(array('format' => $format))
       ->fields(array(
         'editor' => $values['editor'],
+        'settings' => serialize($settings),
       ))
       ->execute();
   }
diff --git a/wysiwyg.admin.js b/wysiwyg.admin.js
new file mode 100644
index 0000000..9d3273b
--- /dev/null
+++ b/wysiwyg.admin.js
@@ -0,0 +1,258 @@
+(function ($, undefined) {
+
+Drupal.behaviors.wysiwygToolbarDesigner = {
+  attach: function (context, settings) {
+    var settings = settings.wysiwyg_toolbar;
+    $('#edit-toolbar').parent().parent().hide();
+    if (!settings.buttons || settings.buttons.length == 0) {
+      return;
+    }
+    // Insert toolbar designer.
+    $('#edit-plugins').after(Drupal.theme('toolbar_designer', settings));
+    var workspace = $('#wysiwyg-toolbar-designer');
+    var designArea = $('#toolbar-rows');
+    var changeNotification = $('#wysiwyg-toolbar-designer div.toolbar-changed-warning');
+    var availableButtons = $('#toolbar-available-buttons');
+
+    // Set up sortables.
+    $('.wysiwyg-button',availableButtons).addClass('template-button').draggable({
+      handle: '.handler',
+      helper: 'clone',
+      connectToSortable: '.toolbar-group',
+      revert: 'invalid',
+      addClasses: false,
+      start: function(event, ui) {
+        // Workaround for jQuery UI bug fixed in version 1.8.11.
+        // @see http://bugs.jqueryui.com/ticket/5811
+        $('#toolbar-rows .toolbar-group').sortable('refreshPositions');
+      }
+    });
+
+    availableButtons.droppable({
+      accept: '.toolbar-button, .toolbar-group, .toolbar-row',
+      drop: function(event, ui) {
+        var item = ui.draggable;
+        var parent = item.parent();
+
+        // Guarantee there is at least 1 row and 1 group.
+        if (item.hasClass('toolbar-row') && parent.find('.toolbar-row').not('.ui-sortable-placeholder').length == 1) {
+          return;
+        } else if (item.hasClass('toolbar-group') && parent.find('.toolbar-group').not('.ui-sortable-placeholder').length == 1) {
+          return;
+        }
+
+        var buttons = $('.toolbar-button', item);
+        if (item.hasClass('toolbar-button')) {
+          buttons = buttons.add(item);
+        }
+
+        // Remove each button and enable in template.
+        buttons.each(function(){
+          var $button = $(this);
+          $('.wysiwyg-button[data-plugin="' + $button.attr('data-plugin')  + '"][data-button="' + $button.attr('data-button')  + '"]').show();
+        });
+
+        item.parent().sortable('refresh');
+        item.remove();
+        changeNotification.fadeIn();
+      }
+    });
+
+    $('#toolbar-rows').sortable({
+      items: '.toolbar-row',
+      handle: '.row-handler',
+      addClass: false,
+      stop: updateToolbarTextarea,
+    });
+
+    // Design actions buttons.
+    $('.add-toolbar-row',workspace).click(function(){
+      // Clone from toolbar template.
+      var row = createRow();
+
+      // Append row to design area.
+      designArea.append(row).sortable('refresh');
+      changeNotification.fadeIn();
+      return false;
+    });
+
+    $('#reset-design').click(function() {
+      if (!changeNotification.is(':hidden') && confirm(Drupal.t('Do you want to reset the changes ?')))
+        reset();
+      return false;
+    });
+
+    if (!settings['toolbar rows']) {
+      $('.add-toolbar-row').hide();
+    }
+
+    reset();
+
+    function createRow (noGroup) {
+      var row = $('.toolbar-row-template',workspace).clone().removeClass('toolbar-row-template');
+      row.addClass('toolbar-row').sortable({
+        handle: '.group-handler',
+        revert: true,
+        items: '.toolbar-group',
+        addClasses: false,
+        connectWith: '#toolbar-rows .toolbar-row',
+        receive: function(event, ui) {
+          // ui.sender is posibly the available button which was cloned and
+          // and dragged to this group. Separators can be used multiple times.
+          if (ui.sender.hasClass('template-button') && !ui.sender.attr('data-multiple-instances')) {
+            ui.sender.hide();
+          }
+        },
+        stop: updateToolbarTextarea
+      });
+      if (settings['toolbar groups']) {
+        row.find('.add-group').click(function() {
+          var group = createGroup();
+          row.append(group);
+          row.sortable('refresh');
+          changeNotification.fadeIn();
+          return false;
+        });
+      }
+      else {
+        row.find('.add-group').hide();
+        row.addClass('single-group');
+      }
+      // Add required group.
+      if (!noGroup) {
+        var group = createGroup();
+        row.append(group);
+      }
+      return row;
+    };
+
+    function createGroup () {
+      var group = $('.toolbar-group-template').clone().removeClass('toolbar-group-template');
+      group.addClass('toolbar-group');
+      group.sortable({
+        revert: true,
+        items: '.wysiwyg-button',
+        connectWith: '#toolbar-rows .toolbar-group',
+        addClasses: false,
+        stop: updateToolbarTextarea,
+        beforeStop: function(event, ui) {
+          // ui.item is the clone of an available button dragged to this group.
+          ui.item.removeClass('template-button').addClass('toolbar-button');
+        },
+        receive: function(event, ui) {
+          // ui.sender is posibly the available button which was cloned and
+          // and dragged to this group. Separators can be used multiple times.
+          if (ui.sender.hasClass('template-button') && !ui.sender.attr('data-multiple-instances')) {
+            ui.sender.hide();
+          }
+        }
+
+      });
+      return group;
+    }
+
+    function reset () {
+      $('.toolbar-row',designArea).remove();
+      // Enable all buttons and then disable it later.
+      $('.wysiwyg-button',availableButtons).show();
+
+      var rows = (settings['toolbar rows'] || !settings.toolbar ? settings.toolbar : [settings.toolbar]);
+      for (var i in rows) {
+        var row = createRow(true);
+        var groups = (settings['toolbar groups'] ? rows[i] : [rows[i]]);
+        for (var j in groups) {
+          var group = createGroup();
+          var buttons = groups[j];
+
+          for (var k in buttons) {
+            var buttonInfo = settings.buttons[buttons[k]];
+            var template_button = $('.wysiwyg-button[data-plugin="' + buttonInfo.plugin + '"][data-button="' + buttons[k] + '"]', availableButtons);
+            if (template_button.length) {
+              button = template_button.clone().show();
+              button.removeClass('template-button').addClass('toolbar-button');
+              group.append(button);
+
+              if (!buttonInfo.multiple) {
+                // Disable button in template area.
+                template_button.hide();
+              }
+            }
+          }
+          row.append(group);
+        }
+        designArea.append(row);
+      }
+      // Make sure we always have at least one row.
+      if ($('.toolbar-row',designArea).length <= 0) {
+        var row = createRow();
+        designArea.append(row);
+      }
+      changeNotification.fadeOut();
+    }
+
+    function updateToolbarTextarea(event, ui) {
+      // Prepare toolbar data to submit.
+      var toolbar = [];
+      designArea.find('.toolbar-row').each(function (key, rowDom){
+        var row = [];
+        $('.toolbar-group',rowDom).each(function (key, groupDom){
+          var group = [];
+          $('.wysiwyg-button',groupDom).each( function(key, button){
+            group.push($(button).attr('data-button'));
+          })
+          if (settings['toolbar groups']) {
+            row.push(group);
+          }
+          else {
+            row = group;
+          }
+        });
+        if (settings['toolbar rows']) {
+           toolbar.push(row);
+        }
+        else {
+          toolbar = row;
+        }
+      });
+      // Assign to hidden field.
+      $('#edit-toolbar').val(JSON.stringify(toolbar));
+      changeNotification.fadeIn();
+    }
+  }
+};
+
+Drupal.theme.prototype.toolbar_designer = function (settings) {
+  var available = Drupal.t('Available buttons');
+  var active = Drupal.t('Active buttons');
+  var markup = '<div id="wysiwyg-toolbar-designer">';
+  markup += '<label for="wysiwyg-toolbar-designer">' + Drupal.t('Select and arrange buttons') + '</label>'
+    + '<div id="toolbar-description">'
+    + Drupal.t('Use the !plus buttons to add a new row to the %active area or to add a button group within a row. Drag any buttons you need from the %available area into a button group. Drag any item back to the %available2 area to remove it from the toolbar layout.',
+        {'!plus': '<a href="javascript:;" class="add">&nbsp;</a>', '%available': available, '%active': active, '%available2': available})
+    + '</div>';
+  markup += '<div id="toolbar-available-buttons"><label for="toolbar-available-buttons">' + available + '</label>';
+  for (var button_name in settings.buttons) {
+    var button = settings.buttons[button_name];
+    markup += '<span class="wysiwyg-button" data-plugin="' + button.plugin + '" data-button="' + button_name
+      + (button.multiple ? '" data-multiple-instances="yes"' : '')
+      + '">' + Drupal.checkPlain(button.title) + '</span>';
+  }
+  markup += '</div><div id="toolbar-active-buttons"><label for="toolbar-active-buttons">' + active + '</label>'
+    + '<div id="toolbar-rows"></div>'
+    + '<div id="toolbar-actions">'
+      + '<a href="#" class="add add-toolbar-row">' + Drupal.t('Add new row') + '</a>'
+    + '</div>'
+    + '<div class="toolbar-row-template">'
+      + '<a href="javascript:;" class="row-handler handler">&nbsp;</a>'
+      + '<a href="javascript:;" class="add add-group">&nbsp;</a>'
+    + '</div>'
+    + '<div class="toolbar-group-template">'
+      + '<a href="javascript:;" class="group-handler handler">&nbsp;</a>'
+    + '</div>'
+  + '</div>'
+  + '<div class="toolbar-changed-warning messages warning"><span class="warning">*</span>'
+    + Drupal.t('Changes made to this toolbar will not be saved until the form is submitted.') + '</div>';
+  return markup;
+}
+
+})(jQuery);
diff --git a/wysiwyg.api.php b/wysiwyg.api.php
index 06b3808..5efe8f5 100644
--- a/wysiwyg.api.php
+++ b/wysiwyg.api.php
@@ -41,6 +41,10 @@ function hook_wysiwyg_plugin($editor, $version) {
       if ($version > 3) {
         return array(
           'myplugin' => array(
+            // The plugin's title; defaulting to its internal name ('myplugin'),
+            // or the value of the first item in the 'extensions' key, if it
+            // exists..
+            'title' => t('My plugin'),
             // A URL to the plugin's homepage.
             'url' => 'http://drupal.org/project/img_assist',
             // The full path to the native editor plugin, no trailing slash.
@@ -79,6 +83,10 @@ function hook_wysiwyg_plugin($editor, $version) {
             // other modules. TRUE means 'path' and 'filename' above are ignored
             // and the plugin is instead loaded from the editor's plugin folder.
             'internal' => TRUE,
+            // A lost of internal names of other native plugins this plugin
+            // depends on to function. These plugins will also be automatically
+            // enabled if this plugin or one of its buttons are enabled.
+            'dependencies' => array('dialog'),
             // TinyMCE-specific: Additional HTML elements to allow in the markup.
             'extended_valid_elements' => array(
               'img[class|src|border=0|alt|title|width|height|align|name|style]',
diff --git a/wysiwyg.module b/wysiwyg.module
index 381b182..969bbf5 100644
--- a/wysiwyg.module
+++ b/wysiwyg.module
@@ -93,6 +93,28 @@ function wysiwyg_menu() {
 }
 
 /**
+ * Implements hook_library().
+ */
+function wysiwyg_library() {
+  $path = drupal_get_path('module', 'wysiwyg');
+  $libraries['wysiwyg.admin'] = array(
+    'title' => 'Wysiwyg admin',
+    'version' => VERSION,
+    'js' => array(
+      $path . '/wysiwyg.admin.js' => array(),
+    ),
+    'css' => array(
+      $path . '/wysiwyg.admin.css' => array(),
+    ),
+    'dependencies' => array(
+      array('system', 'ui.droppable'),
+      array('system', 'ui.sortable'),
+    ),
+  );
+  return $libraries;
+}
+
+/**
  * Display an editor profile title.
  *
  * @param $profile
@@ -156,7 +178,7 @@ function wysiwyg_theme() {
     'wysiwyg_profile_overview' => array(
       'render element' => 'form',
     ),
-    'wysiwyg_admin_button_table' => array(
+    'wysiwyg_admin_plugin_table' => array(
       'render element' => 'form',
     ),
     // @see wysiwyg_dialog()
@@ -500,18 +522,17 @@ function wysiwyg_add_plugin_settings($profile) {
   $proxy = (isset($editor['proxy plugin']) ? key($editor['proxy plugin']) : '');
 
   // Process native editor plugins.
-  if (isset($editor['plugin settings callback'])) {
-    // @todo Require PHP 5.1 in 3.x and use array_intersect_key().
+  if (isset($editor['plugin settings callback']) && !empty($profile->settings['plugins'])) {
     $profile_plugins_native = array();
-    foreach ($plugins[$editor['name']] as $plugin => $meta) {
+    foreach ($profile->settings['plugins'] as $plugin => $enabled) {
+      if (!$enabled) {
+        continue;
+      }
       // Skip Drupal plugins (handled below).
       if ($plugin === $proxy) {
         continue;
       }
-      // Only keep native plugins that are enabled in this profile.
-      if (isset($profile->settings['buttons'][$plugin])) {
-        $profile_plugins_native[$plugin] = $meta;
-      }
+      $profile_plugins_native[$plugin] = $plugins[$editor['name']][$plugin];
     }
     // Invoke the editor's plugin settings callback, so it can populate the
     // settings for native external plugins with required values.
@@ -523,24 +544,40 @@ function wysiwyg_add_plugin_settings($profile) {
   }
 
   // Process Drupal plugins.
-  if ($proxy && isset($editor['proxy plugin settings callback'])) {
+  // @todo Perhaps introduce $profile->settings['proxy plugins'] instead of
+  // finding their buttons in the toolbar?
+  if ($proxy && isset($editor['proxy plugin settings callback']) && !empty($profile->settings['toolbar'])) {
+    $drupal_plugins = wysiwyg_get_all_plugins();
     $profile_plugins_drupal = array();
-    foreach (wysiwyg_get_all_plugins() as $plugin => $meta) {
-      if (isset($profile->settings['buttons'][$proxy][$plugin])) {
-        // JavaScript and plugin-specific settings for Drupal plugins must be
-        // loaded and processed only once. Plugin information is cached
-        // statically to pass it to the editor's proxy plugin settings callback.
-        if (!isset($processed_plugins[$proxy][$plugin])) {
-          $profile_plugins_drupal[$plugin] = $processed_plugins[$proxy][$plugin] = $meta;
-          // Load the Drupal plugin's JavaScript.
-          drupal_add_js($meta['js path'] . '/' . $meta['js file']);
-          // Add plugin-specific settings.
-          if (isset($meta['settings'])) {
-            drupal_add_js(array('wysiwyg' => array('plugins' => array('drupal' => array($plugin => $meta['settings'])))), 'setting');
+    $toolbar = (!empty($editor['toolbar rows']) ? $profile->settings['toolbar'] : array($profile->settings['toolbar']));
+    foreach ($toolbar as $row) {
+      if (empty($editor['toolbar groups'])) {
+        $row = array($row);
+      }
+      foreach ($row as $group) {
+        foreach ($group as $button) {
+          if (strpos($button, '.') === FALSE) {
+            continue;
+          }
+          list($plugin, $button_id) = explode('.', $button);
+          if ($plugin == $proxy && isset($drupal_plugins[$button_id])) {
+            $meta = $drupal_plugins[$button_id];
+            // JavaScript and plugin-specific settings for Drupal plugins must be
+            // loaded and processed only once. Plugin information is cached
+            // statically to pass it to the editor's proxy plugin settings callback.
+            if (!isset($processed_plugins[$proxy][$button_id])) {
+              $profile_plugins_drupal[$button_id] = $processed_plugins[$proxy][$button_id] = $meta;
+              // Load the Drupal plugin's JavaScript.
+              drupal_add_js($meta['js path'] . '/' . $meta['js file']);
+              // Add plugin-specific settings.
+              if (isset($meta['settings'])) {
+                drupal_add_js(array('wysiwyg' => array('plugins' => array('drupal' => array($button_id => $meta['settings'])))), 'setting');
+              }
+            }
+            else {
+              $profile_plugins_drupal[$button_id] = $processed_plugins[$proxy][$button_id];
+            }
           }
-        }
-        else {
-          $profile_plugins_drupal[$plugin] = $processed_plugins[$proxy][$plugin];
         }
       }
     }