theming user/edit with extra fields

Hi,

I have looked around and still have not been able to find a good solution for this.

I need to theme the user/edit page, and have all my extra profile fields on the same page. the form needs to submit, and edit the standard account information at the same time it edits the extra profile fields. (not two seperate forms).

So far I have tried to solve this using simular code to my registration page, which I found somewhere or other on the site.

my code is as below:

the problem with this it does not inject the 'GP Information' form fields as by default they are not part of this form. Anybody have any ideas what I can do to make this work for me? Or is there a beter/simpler solution?

function theme_user_edit($form) {

    foreach($form as $key => $value) { // loop through top level
    if (is_array($form[$key])) {
      $form[$key]['#title'] = '';
      $form[$key]['#description'] = '';
      foreach($form[$key] as $key2 => $value2) { // loop through second level
        if (is_array($form[$key][$key2])) {
          $form[$key][$key2]['#title'] = '';
          $form[$key][$key2]['#description'] = '';
        }
      }
    }
  }
  

  // Set up the Vars Array
  $vars = array();

  // Render Specific Fields You Want on Your Registration Form
  // note - the specific location of the element in the form array varies
  $vars['title_element'] = drupal_render($form['GP Information']['profile_title']);
  $vars['firstname_element'] = drupal_render($form['GP Information']['profile_firstname']);
  $vars['lastname_element'] = drupal_render($form['GP Information']['profile_lastname']);
  $vars['address_element'] = drupal_render($form['GP Information']['profile_address']);
  $vars['suburb_element'] = drupal_render($form['GP Information']['profile_suburb']);
  $vars['city_element'] = drupal_render($form['GP Information']['profile_city']);
  $vars['state_element'] = drupal_render($form['GP Information']['profile_state']);
  $vars['postcode_element'] = drupal_render($form['GP Information']['profile_postcode']);
  $vars['mail_element'] = drupal_render($form['account']['mail']);
  $vars['cpdnumber_element'] = drupal_render($form['GP Information']['profile_cpdnumber']);
  $vars['formid_element'] = drupal_render($form['account']['form_id']);

  // continue for each field you want...

  // Don't Forget the Submit Button 

  $vars['submit_button'] = drupal_render($form['submit']);
  

  $output =  _phptemplate_callback('user_edit', $vars);
  
  
 
  return $output;
}