--- wysiwyg.admin.inc.orig	2009-07-18 11:47:48.000000000 -0700
+++ wysiwyg.admin.inc	2009-10-08 18:52:13.000000000 -0700
@@ -86,12 +86,7 @@ function wysiwyg_profile_form($form_stat
     '#description' => t('Whether or not to show the <em>enable/disable rich text</em> toggle link below a textarea. If disabled, the user setting or global default is used (see above).'),
   );
 
-  $form['basic']['theme'] = array(
-    '#type' => 'hidden',
-    '#value' => $profile->settings['theme'],
-  );
-
-  $form['basic']['language'] = array(
+    $form['basic']['language'] = array(
     '#type' => 'select',
     '#title' => t('Language'),
     '#default_value' => $profile->settings['language'],
@@ -151,7 +146,15 @@ function wysiwyg_profile_form($form_stat
     '#collapsed' => TRUE,
   );
 
-  $form['appearance']['toolbar_loc'] = array(
+  $form['appearance']['theme'] = array(
+    '#type' => 'select',
+    '#title' => t('Editor theme'),
+    '#description' => t('How is your editor displayed to the end user?'),
+    '#default_value' => $profile->settings['theme'],
+    '#options' => $editor['themes callback']($editor, $profile),
+  );
+
+$form['appearance']['toolbar_loc'] = array(
     '#type' => 'select',
     '#title' => t('Toolbar location'),
     '#default_value' => $profile->settings['toolbar_loc'],