1 files changed, 35 insertions, 2 deletions

diff --git a/modules/system/system.module b/modules/system/system.module
index 0db103ae3..33386da6d 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -235,6 +235,7 @@ function system_elements() {
   $type['form'] = array(
     '#method' => 'post',
     '#action' => request_uri(),
+    '#theme_wrapper' => 'form',
   );
 
   $type['page'] = array(
@@ -259,6 +260,7 @@ function system_elements() {
     '#button_type' => 'submit',
     '#executes_submit_callback' => TRUE,
     '#process' => array('form_process_ahah'),
+    '#theme_wrapper' => 'button',
   );
 
   $type['button'] = array(
@@ -267,6 +269,7 @@ function system_elements() {
     '#button_type' => 'submit',
     '#executes_submit_callback' => FALSE,
     '#process' => array('form_process_ahah'),
+    '#theme_wrapper' => 'button',
   );
 
   $type['image_button'] = array(
@@ -277,6 +280,7 @@ function system_elements() {
     '#return_value' => TRUE,
     '#has_garbage_value' => TRUE,
     '#src' => NULL,
+    '#theme_wrapper' => 'image_button',
   );
 
   $type['textfield'] = array(
@@ -285,6 +289,8 @@ function system_elements() {
     '#maxlength' => 128,
     '#autocomplete_path' => FALSE,
     '#process' => array('form_process_input_format', 'form_process_ahah'),
+    '#theme' => 'textfield',
+    '#theme_wrapper' => 'form_element',
   );
 
   $type['password'] = array(
@@ -292,11 +298,14 @@ function system_elements() {
     '#size' => 60,
     '#maxlength' => 128,
     '#process' => array('form_process_ahah'),
+    '#theme' => 'password',
+    '#theme_wrapper' => 'form_element',
   );
 
   $type['password_confirm'] = array(
     '#input' => TRUE,
     '#process' => array('form_process_password_confirm'),
+    '#theme_wrapper' => 'form_element',
   );
 
   $type['textarea'] = array(
@@ -305,29 +314,41 @@ function system_elements() {
     '#rows' => 5,
     '#resizable' => TRUE,
     '#process' => array('form_process_input_format', 'form_process_ahah'),
+    '#theme' => 'textarea',
+    '#theme_wrapper' => 'form_element',
   );
 
   $type['radios'] = array(
     '#input' => TRUE,
     '#process' => array('form_process_radios'),
+    '#theme_wrapper' => 'radios',
+    '#pre_render' => array('form_pre_render_conditional_form_element'),
   );
 
   $type['radio'] = array(
     '#input' => TRUE,
     '#default_value' => NULL,
     '#process' => array('form_process_ahah'),
+    '#theme' => 'radio',
+    '#theme_wrapper' => 'form_element',
+    '#form_element_skip_title' => TRUE,
   );
 
   $type['checkboxes'] = array(
     '#input' => TRUE,
     '#tree' => TRUE,
     '#process' => array('form_process_checkboxes'),
+    '#theme_wrapper' => 'checkboxes',
+    '#pre_render' => array('form_pre_render_conditional_form_element'),
   );
 
   $type['checkbox'] = array(
     '#input' => TRUE,
     '#return_value' => 1,
     '#process' => array('form_process_ahah'),
+    '#theme' => 'checkbox',
+    '#theme_wrapper' => 'form_element',
+    '#form_element_skip_title' => TRUE,
   );
 
   $type['select'] = array(
@@ -335,6 +356,8 @@ function system_elements() {
     '#size' => 0,
     '#multiple' => FALSE,
     '#process' => array('form_process_ahah'),
+    '#theme' => 'select',
+    '#theme_wrapper' => 'form_element',
   );
 
   $type['weight'] = array(
@@ -348,11 +371,15 @@ function system_elements() {
     '#input' => TRUE,
     '#element_validate' => array('date_validate'),
     '#process' => array('form_process_date'),
+    '#theme' => 'date',
+    '#theme_wrapper' => 'form_element',
   );
 
   $type['file'] = array(
     '#input' => TRUE,
     '#size' => 60,
+    '#theme' => 'file',
+    '#theme_wrapper' => 'form_element',
   );
   $type['tableselect'] = array(
     '#input' => TRUE,
@@ -361,6 +388,7 @@ function system_elements() {
     '#process' => array('form_process_tableselect'),
     '#options' => array(),
     '#empty' => '',
+    '#theme' => 'tableselect'
   );
 
   /**
@@ -368,11 +396,14 @@ function system_elements() {
    */
   $type['item'] = array(
     '#markup' => '',
+    '#theme' => 'markup',
+    '#theme_wrapper' => 'form_element',
   );
 
   $type['hidden'] = array(
     '#input' => TRUE,
     '#process' => array('form_process_ahah'),
+    '#theme' => 'hidden',
   );
 
   $type['value'] = array(
@@ -380,8 +411,8 @@ function system_elements() {
   );
 
   $type['markup'] = array(
-    '#prefix' => '',
-    '#suffix' => '',
+    '#markup' => '',
+    '#theme' => 'markup',
   );
 
   $type['fieldset'] = array(
@@ -389,10 +420,12 @@ function system_elements() {
     '#collapsed' => FALSE,
     '#value' => NULL,
     '#process' => array('form_process_ahah'),
+    '#theme_wrapper' => 'fieldset',
   );
 
   $type['token'] = array(
     '#input' => TRUE,
+    '#theme' => array('hidden'),
   );
 
   return $type;