Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.272
diff -u -p -r1.272 form.inc
--- includes/form.inc	6 May 2008 12:18:45 -0000	1.272
+++ includes/form.inc	6 Jun 2008 00:42:37 -0000
@@ -2164,7 +2164,8 @@ function theme_form_element($element, $v
   // This is also used in the installer, pre-database setup.
   $t = get_t();
 
-  $output = '<div class="form-item"';
+  // Add element name as additional container class.
+  $output = '<div class="form-item' . (!empty($element['#name']) ? ' ' . form_clean_id($element['#name']) : '') . '"';
   if (!empty($element['#id'])) {
     $output .= ' id="' . $element['#id'] . '-wrapper"';
   }
@@ -2177,7 +2178,10 @@ function theme_form_element($element, $v
       $output .= ' <label for="' . $element['#id'] . '">' . $t('!title: !required', array('!title' => filter_xss_admin($title), '!required' => $required)) . "</label>\n";
     }
     else {
-      $output .= ' <label>' . $t('!title: !required', array('!title' => filter_xss_admin($title), '!required' => $required)) . "</label>\n";
+      // Add form item type as class for radios and checkboxes.
+      $output .= ' <label';
+      $output .= ' class="' . $element['#type'] . '"';
+      $output .= $t('!title: !required', array('!title' => filter_xss_admin($title), '!required' => $required)) . "</label>\n";
     }
   }