diff -Nurp syntaxhighlighter.org/syntaxhighlighter.admin.inc syntaxhighlighter/syntaxhighlighter.admin.inc
--- syntaxhighlighter.org/syntaxhighlighter.admin.inc	2014-03-10 22:55:11.217085052 +0100
+++ syntaxhighlighter/syntaxhighlighter.admin.inc	2014-03-10 23:07:30.632739960 +0100
@@ -22,6 +22,14 @@ function syntaxhighlighter_settings_form
     return array();
   }
 
+  // Group options to individually select Syntaxhighlighter brushes or to autoload brushes
+  $form['syntaxhighlighter_brush_loading_options'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Syntax highlighter brush loading configuration'),
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE,  
+  );
+  
   $autoloader_available = file_exists($path . '/scripts/shAutoloader.js');
 
   $files = file_scan_directory($path . '/scripts', '/shBrush.*\.js/');
@@ -29,7 +37,7 @@ function syntaxhighlighter_settings_form
     $lang_options[$file->filename] = substr($file->name, 7);
   }
   ksort($lang_options);
-  $form['syntaxhighlighter_enabled_languages'] = array(
+  $form['syntaxhighlighter_brush_loading_options']['syntaxhighlighter_enabled_languages'] = array(
     '#type' => 'checkboxes',
     '#title' => t('Enabled languages'),
     '#options' => $lang_options,
@@ -40,7 +48,7 @@ function syntaxhighlighter_settings_form
   );
 
   if ($autoloader_available) {
-    $form['syntaxhighlighter_use_autoloader'] = array(
+    $form['syntaxhighlighter_brush_loading_options']['syntaxhighlighter_use_autoloader'] = array(
       '#type' => 'checkbox',
       '#title' => t('Use autoloader'),
       '#default_value' => variable_get('syntaxhighlighter_use_autoloader', FALSE),
@@ -56,7 +64,7 @@ function syntaxhighlighter_settings_form
   }
   else {
     variable_set('syntaxhighlighter_use_autoloader', FALSE);
-    $form['syntaxhighlighter_use_autoloader'] = array(
+    $form['syntaxhighlighter_brush_loading_options']['syntaxhighlighter_use_autoloader'] = array(
       '#type' => 'checkbox',
       '#title' => t('Use autoloader'),
       '#default_value' => FALSE,
@@ -65,13 +73,21 @@ function syntaxhighlighter_settings_form
     );
   }
 
+  // Group Syntaxhighlighter theme, tag, and legacy support library options
+  $form['syntaxhighlighter_libconfig'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Syntax highlighter library configuration'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,  
+  );
+
   $files = file_scan_directory($path . '/styles', '/shTheme.*\.css/', array('nomask' => '/(\.\.?|CVS|shThemeDefault.css)$/'));
   foreach ($files as $file) {
     $theme_options[$file->filename] = substr($file->name, 7);
   }
   ksort($theme_options);
   $theme_options = array_merge(array('shThemeDefault.css' => 'Default'), $theme_options);
-  $form['syntaxhighlighter_theme'] = array(
+  $form['syntaxhighlighter_libconfig']['syntaxhighlighter_theme'] = array(
     '#type' => 'radios',
     '#title' => t('Theme'),
     '#description' => t('Choose a syntax highlight theme.'),
@@ -80,7 +96,7 @@ function syntaxhighlighter_settings_form
     '#multicolumn' => array('width' => 2),
   );
 
-  $form['syntaxhighlighter_tagname'] = array(
+  $form['syntaxhighlighter_libconfig']['syntaxhighlighter_tagname'] = array(
     '#type' => 'textfield',
     '#title' => t('Tag name'),
     '#required' => TRUE,
@@ -88,7 +104,7 @@ function syntaxhighlighter_settings_form
     '#default_value' => variable_get('syntaxhighlighter_tagname', 'pre'),
     '#size' => 10,
   );
-  $form['syntaxhighlighter_legacy_mode'] = array(
+  $form['syntaxhighlighter_libconfig']['syntaxhighlighter_legacy_mode'] = array(
     '#type' => 'radios',
     '#title' => t('Legacy mode'),
     '#description' => t('Enable pre-2.0 style markup support.'),
@@ -96,10 +112,14 @@ function syntaxhighlighter_settings_form
     '#default_value' => variable_get('syntaxhighlighter_legacy_mode', 0),
   );
 
+  // Group Syntaxhighlighter JS/CSS code injection options
   $form['inject_settings'] = array(
     '#type' => 'fieldset',
     '#title' => t('Syntaxhighlighter js/css code inject settings'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,  
   );
+
   $has_php_access = user_access(SYNTAXHIGHLIGHTER_PHP_PERMISSION);
   if ((!$has_php_access || !function_exists('php_eval')) && variable_get('syntaxhighlighter_inject', SYNTAXHIGHLIGHTER_INJECT_EXCEPT_LISTED) == SYNTAXHIGHLIGHTER_INJECT_PHP) {
     $form['syntaxhighlighter_inject'] = array(
