Index: modules/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator.module,v
retrieving revision 1.234
diff -u -F^f -r1.234 aggregator.module
--- modules/aggregator.module	7 Apr 2005 22:46:55 -0000	1.234
+++ modules/aggregator.module	21 Apr 2005 16:22:36 -0000
@@ -762,7 +762,7 @@ function aggregator_edit() {
     $output = aggregator_form_feed(aggregator_get_feed(arg(2)));
   }
 
-  print theme('page', $output);
+  return $output;
 }
 
 
@@ -792,7 +792,7 @@ function aggregator_admin_edit_category(
         $output = aggregator_form_category();
       }
   }
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -822,7 +822,7 @@ function aggregator_admin_edit_feed($fee
         $output = aggregator_form_feed();
       }
   }
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -845,7 +845,7 @@ function aggregator_admin_refresh_feed($
  * Menu callback; displays the aggregator administration page.
  */
 function aggregator_admin_overview() {
-  print theme('page', aggregator_view());
+  return aggregator_view();
 }
 
 /**
@@ -946,7 +946,7 @@ function _aggregator_page_list($sql, $op
     $output .= $pager;
   }
 
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -971,7 +971,7 @@ function aggregator_page_sources() {
   }
   $output .= theme('xml_icon', url('aggregator/opml'));
   $output .= '</div>';
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -1020,7 +1020,7 @@ function aggregator_page_categories() {
   }
   $output .= '</div>';
 
-  print theme('page', $output);
+  return $output;
 }
 
 /**
Index: modules/archive.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/archive.module,v
retrieving revision 1.79
diff -u -F^f -r1.79 archive.module
--- modules/archive.module	1 Apr 2005 15:54:58 -0000	1.79
+++ modules/archive.module	21 Apr 2005 16:22:37 -0000
@@ -249,7 +249,7 @@ function archive_page($year = 0, $month 
       $output .= node_view(node_load(array('nid' => $nid->nid)), 1);
     }
   }
-  print theme('page', $output);
+  return $output;
 }
 
 ?>
Index: modules/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block.module,v
retrieving revision 1.164
diff -u -F^f -r1.164 block.module
--- modules/block.module	18 Apr 2005 20:31:50 -0000	1.164
+++ modules/block.module	21 Apr 2005 16:22:37 -0000
@@ -299,7 +299,7 @@ function block_admin_configure($module =
 
       $form .= form_submit(t('Save block'));
 
-      print theme('page', form($form));
+      return form($form);
   }
 }
 
@@ -323,7 +323,7 @@ function block_box_add() {
       $output .= form($form);
   }
 
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -348,7 +348,7 @@ function block_box_delete($bid = 0) {
                     t('Delete'));
   }
 
-  print theme('page', $output);
+  return $output;
 }
 
 function block_box_form($edit = array()) {
@@ -390,7 +390,7 @@ function block_admin() {
     cache_clear_all();
     drupal_goto($_GET['q']);
   }
-  print theme('page', block_admin_display());
+  return block_admin_display();
 }
 
 /**
Index: modules/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog.module,v
retrieving revision 1.214
diff -u -F^f -r1.214 blog.module
--- modules/blog.module	12 Apr 2005 19:47:06 -0000	1.214
+++ modules/blog.module	21 Apr 2005 16:22:37 -0000
@@ -149,7 +149,7 @@ function blog_page_user($uid) {
     $output .= theme('xml_icon', url("blog/$account->uid/feed"));
 
     drupal_set_html_head('<link rel="alternate" type="application/rss+xml" title="RSS - '. $title .'" href="'. url("blog/$account->uid/feed") .'" />');
-    print theme('page', $output);
+    return $output;
   }
   else {
     drupal_not_found();
@@ -173,7 +173,7 @@ function blog_page_last() {
   $output .= theme('xml_icon', url('blog/feed'));
 
   drupal_set_html_head('<link rel="alternate" type="application/rss+xml" title="RSS - blogs" href="'. url('blog/feed') .'" />');
-  print theme('page', $output);
+  return $output;
 }
 
 /**
Index: modules/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book.module,v
retrieving revision 1.290
diff -u -F^f -r1.290 book.module
--- modules/book.module	17 Apr 2005 16:03:50 -0000	1.290
+++ modules/book.module	21 Apr 2005 16:22:37 -0000
@@ -288,7 +288,7 @@ function book_outline() {
         }
 
         drupal_set_title(check_plain($node->title));
-        print theme('page', form($output));
+        return form($output);
     }
   }
 }
@@ -611,7 +611,7 @@ function book_render() {
   }
 
   drupal_set_title(t('Books'));
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -767,7 +767,7 @@ function book_admin_orphan() {
     $output .= theme('table', $header, $rows);
   }
 
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -785,7 +785,7 @@ function book_admin($nid = 0) {
       $output .= book_admin_view($nid);
       break;
   }
-  print theme('page', $output);
+  return $output;
 }
 
 /**
Index: modules/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment.module,v
retrieving revision 1.349
diff -u -F^f -r1.349 comment.module
--- modules/comment.module	8 Apr 2005 13:34:10 -0000	1.349
+++ modules/comment.module	21 Apr 2005 16:22:38 -0000
@@ -329,7 +329,7 @@ function comment_configure() {
     $output .= form_group(t('Comment moderation settings'), $group);
   }
 
-  print theme('page', system_settings_form($output));
+  return system_settings_form($output);
 }
 
 /**
@@ -361,7 +361,7 @@ function comment_edit($cid) {
   $comment = drupal_unpack($comment);
   $comment->name = $comment->uid ? $comment->registered_name : $comment->name;
   if (comment_access('edit', $comment)) {
-    print theme('page', comment_preview(object2array($comment)));
+    return comment_preview(object2array($comment));
   }
   else {
     drupal_access_denied();
@@ -380,15 +380,13 @@ function comment_reply($nid, $pid = NULL
     $edit = $_POST['edit'];
     $edit = comment_validate_form($edit);
     drupal_set_title(t('Post comment'));
-    print theme('page', comment_post($edit));
-    return;
+    return comment_post($edit);
   }
   else if ($_POST['op'] == t('Preview comment')) {
     $edit = $_POST['edit'];
     $edit = comment_validate_form($edit);
     drupal_set_title(t('Preview comment'));
-    print theme('page', comment_preview($edit));
-    return;
+    return comment_preview($edit);
   }
 
   // or are we merely showing the form?
@@ -423,7 +421,7 @@ function comment_reply($nid, $pid = NULL
   }
 
   drupal_set_title(t('Add new comment'));
-  print theme('page', $output);
+  return $output;
 }
 
 function comment_validate_form($edit) {
@@ -661,7 +659,7 @@ function comment_post($edit) {
       }
     }
     else {
-      print theme('page', comment_preview($edit));
+      return comment_preview($edit);
     }
   }
   else {
@@ -945,7 +943,7 @@ function comment_admin_edit($cid) {
     $form .= form_hidden('nid', $comment->nid);
     $form .= form_hidden('cid', $comment->cid);
     $form .= form_submit(t('Submit'));
-    print theme('page', form($form));
+    return form($form);
   }
 }
 
@@ -989,7 +987,7 @@ function comment_delete($cid) {
     drupal_set_message(t('The comment no longer exists.'));
   }
 
-  print theme('page', $output);
+  return $output;
 }
 
 function comment_save($id, $edit) {
@@ -1042,7 +1040,7 @@ function comment_admin_overview($type = 
     $rows[] = array(array('data' => t('No comments available.'), 'colspan' => '6'));
   }
 
-  print theme('page', theme('table', $header, $rows));
+  return theme('table', $header, $rows);
 }
 
 /**
@@ -1091,7 +1089,7 @@ function comment_matrix_settings() {
   $output .= theme('table', $header, $rows);
   if ($rows) { $output .= '<br />'. form_submit(t('Submit votes')); }
 
-  print theme('page', form($output));
+  return form($output);
 }
 
 /**
@@ -1121,7 +1119,7 @@ function comment_role_settings() {
   $output .= theme('table', $header, $rows);
   $output .= '<br />'. form_submit(t('Save scores'));
 
-  print theme('page', form($output));
+  return form($output);
 }
 
 /**
@@ -1176,7 +1174,7 @@ function comment_vote_settings($mid = 0)
     $form .= form_submit(t('Add new vote'));
   }
 
-  print theme('page', $output . form($form));
+  return $output . form($form);
 }
 
 /**
@@ -1230,7 +1228,7 @@ function comment_threshold_settings($fid
     $form .= form_submit(t('Add new threshold'));
   }
 
-  print theme('page', $output . form($form));
+  return $output . form($form);
 }
 
 /**
Index: modules/contact.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact.module,v
retrieving revision 1.7
diff -u -F^f -r1.7 contact.module
--- modules/contact.module	11 Apr 2005 11:06:01 -0000	1.7
+++ modules/contact.module	21 Apr 2005 16:22:38 -0000
@@ -127,7 +127,8 @@ function contact_mail_user() {
       $output  = form($output);
     }
 
-    print theme('page', $output, $account->name);
+    drupal_set_title($account->name);
+    return $output;
   }
   else {
     drupal_not_found();
Index: modules/drupal.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/drupal.module,v
retrieving revision 1.100
diff -u -F^f -r1.100 drupal.module
--- modules/drupal.module	31 Mar 2005 09:25:33 -0000	1.100
+++ modules/drupal.module	21 Apr 2005 16:22:38 -0000
@@ -199,7 +199,7 @@ function drupal_menu($may_cache) {
  * Menu callback; print Drupal-authentication-specific information from user/help.
  */
 function drupal_page_help() {
-  print theme('page', drupal_help('user/help#drupal'));
+  return drupal_help('user/help#drupal');
 }
 
 /**
Index: modules/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter.module,v
retrieving revision 1.59
diff -u -F^f -r1.59 filter.module
--- modules/filter.module	20 Apr 2005 03:01:07 -0000	1.59
+++ modules/filter.module	21 Apr 2005 16:22:38 -0000
@@ -310,7 +310,7 @@ function filter_admin_overview() {
   $group .= form($form);
   $output .= '<h2>'. t('Add new input format') .'</h2>'. $group;
 
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -403,7 +403,7 @@ function filter_admin_delete() {
                   t('Delete'),
                   t('Cancel'),
                   $extra);
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -449,7 +449,7 @@ function filter_admin_filters() {
   $group .= $tiplist;
   $output .= '<h2>'. t('Formatting guidelines') .'</h2>'. $group;
 
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -505,7 +505,7 @@ function filter_admin_order() {
   $form .= form_submit(t('Save configuration'));
   $output = form($form);
 
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -544,7 +544,7 @@ function filter_admin_configure() {
     $output = t('No settings are available.');
   }
 
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -764,7 +764,7 @@ function filter_tips_long() {
   else {
     $output = theme('filter_tips', _filter_tips(-1, true), true);
   }
-  print theme('page', $output);
+  return $output;
 }
 
 /**
Index: modules/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum.module,v
retrieving revision 1.247
diff -u -F^f -r1.247 forum.module
--- modules/forum.module	12 Apr 2005 18:55:33 -0000	1.247
+++ modules/forum.module	21 Apr 2005 16:22:39 -0000
@@ -105,7 +105,7 @@ function forum_admin() {
       $output = forum_overview();
   }
 
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -299,7 +299,7 @@ function forum_admin_configure() {
   $forder = array(1 => t('Date - newest first'), 2 => t('Date - oldest first'), 3 => t('Posts - most active first'), 4=> t('Posts - least active first'));
   $output .= form_radios(t('Default order'), 'forum_order', variable_get('forum_order', '1'), $forder, t('The default display order for topics.'));
 
-  print theme('page', system_settings_form($output));
+  return system_settings_form($output);
 }
 
 /**
@@ -736,11 +736,11 @@ function forum_page($tid = 0) {
       $topics = forum_get_topics($tid, $sortby, $forum_per_page);
     }
 
-    print theme('page', theme('forum_display', $forums, $topics, $parents, $tid, $sortby, $forum_per_page));
+    return theme('forum_display', $forums, $topics, $parents, $tid, $sortby, $forum_per_page);
   }
   else {
     drupal_set_title(t('Warning'));
-    print theme('page', forum_help('admin/settings/forum'));
+    return forum_help('admin/settings/forum');
   }
 }
 
Index: modules/help.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/help.module,v
retrieving revision 1.45
diff -u -F^f -r1.45 help.module
--- modules/help.module	1 Apr 2005 15:55:00 -0000	1.45
+++ modules/help.module	21 Apr 2005 16:22:39 -0000
@@ -63,7 +63,7 @@ function help_main() {
    <dt>Visitor</dt><dd>A person who does not have an account at your Drupal site or a person who has an account at your Drupal site but is <strong>not</strong> logged in with that account. Also termed \"anonymous user\".</dd>
   </dl>", array('%Drupal' => 'http://drupal.org', '%handbook' => 'http://drupal.org/handbook', '%help_pages' => help_links_as_list(), '%taxonomy' => url('admin/help/taxonomy')));
 
-  print theme('page', $output);
+  return $output;
 }
 
 function help_links_as_list() {
@@ -103,7 +103,7 @@ function help_page() {
       $output .= $temp;
     }
   }
-  print theme('page', $output);
+  return $output;
 }
 
 ?>
Index: modules/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale.module,v
retrieving revision 1.120
diff -u -F^f -r1.120 locale.module
--- modules/locale.module	31 Mar 2005 09:25:33 -0000	1.120
+++ modules/locale.module	21 Apr 2005 16:22:39 -0000
@@ -283,7 +283,7 @@ function locale_admin_manage() {
     drupal_goto('admin/locale/language/overview');
   }
 
-  print theme('page', _locale_admin_manage_screen());
+  return _locale_admin_manage_screen();
 }
 
 /**
@@ -327,7 +327,7 @@ function locale_admin_manage_delete_scre
                   t('Delete'),
                   t('Cancel'),
                   $extra);
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -364,7 +364,7 @@ function locale_admin_manage_add() {
       }
       break;
   }
-  print theme('page', _locale_admin_manage_add_screen());
+  return _locale_admin_manage_add_screen();
 }
 
 // ---------------------------------------------------------------------------------
@@ -397,7 +397,7 @@ function locale_admin_import() {
       drupal_goto('admin/locale');
       break;
   }
-  print theme('page', _locale_admin_import_screen());
+  return _locale_admin_import_screen();
 }
 
 
@@ -414,7 +414,7 @@ function locale_admin_export() {
       _locale_export_po($_POST['edit']['langcode']);
       break;
   }
-  print theme('page', _locale_admin_export_screen());
+  return _locale_admin_export_screen();
 }
 
 
@@ -449,7 +449,7 @@ function locale_admin_string() {
       break;
     default:
   }
-  print theme('page', $output);
+  return $output;
 }
 
 ?>
Index: modules/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu.module,v
retrieving revision 1.29
diff -u -F^f -r1.29 menu.module
--- modules/menu.module	31 Mar 2005 21:18:08 -0000	1.29
+++ modules/menu.module	21 Apr 2005 16:22:39 -0000
@@ -104,7 +104,7 @@ function menu_perm() {
 function menu_overview() {
   menu_rebuild();
 
-  print theme('page', menu_overview_tree());
+  return menu_overview_tree();
 }
 
 /**
@@ -124,7 +124,7 @@ function menu_reset() {
                       'admin/menu',
                       t('Any custom additions or changes to the menu will be lost.'),
                       t('Reset all'));
-      print theme('page', $output);
+      return $output;
   }
 }
 
@@ -150,7 +150,7 @@ function menu_add_menu() {
       $output .= menu_edit_item_form($edit);
   }
 
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -171,7 +171,7 @@ function menu_reset_item($mid) {
                       'admin/menu',
                       t('Any customizations will be lost. This action cannot be undone.'),
                       t('Reset'));
-      print theme('page', $output);
+      return $output;
   }
 }
 
@@ -204,7 +204,7 @@ function menu_delete_item($mid) {
         $message = t('Are you sure you want to delete the custom menu item %item?', array('%item' => theme('placeholder', $menu->title)));
       }
       $output = theme('confirm', $message, 'admin/menu', t('This action cannot be undone.'), t('Delete'));
-      print theme('page', $output);
+      return $output;
   }
 }
 
@@ -260,7 +260,7 @@ function menu_edit_item($mid = 0) {
       $output .= menu_edit_item_form($edit);
   }
 
-  print theme('page', $output);
+  return $output;
 }
 
 /**
Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.486
diff -u -F^f -r1.486 node.module
--- modules/node.module	11 Apr 2005 16:39:19 -0000	1.486
+++ modules/node.module	21 Apr 2005 16:22:40 -0000
@@ -614,7 +614,7 @@ function node_configure() {
   $output .= form_select(t('Length of trimmed posts'), 'teaser_length', variable_get('teaser_length', 600), array(0 => t('Unlimited'), 200 => t('200 characters'), 400 => t('400 characters'), 600 => t('600 characters'), 800 => t('800 characters'), 1000 => t('1000 characters'), 1200 => t('1200 characters'), 1400 => t('1400 characters'), 1600 => t('1600 characters'), 1800 => t('1800 characters'), 2000 => t('2000 characters')), t("The maximum number of characters used in the trimmed version of a post.  Drupal will use this setting to determine at which offset long posts should be trimmed.  The trimmed version of a post is typically used as a teaser when displaying the post on the main page, in XML feeds, etc.  To disable teasers, set to 'Unlimited'. Note that this setting will only affect new or updated content and will not affect existing teasers."));
   $output .= form_radios(t('Preview post'), 'node_preview', variable_get('node_preview', 0), array(t('Optional'), t('Required')), t('Must users preview posts before submitting?'));
 
-  print theme('page', system_settings_form($output));
+  return system_settings_form($output);
 }
 
 /**
@@ -958,6 +958,10 @@ function node_types_configure($type = NU
     // Go to the listing page when we submit this form, system_settings_save() calls drupal_goto().
     if ($_POST['op']) {
       $_GET['q'] = 'admin/node/configure/types';
+      $options = 'options_'. $type;
+      if (empty($node->$options)) {
+        $node->$options = array();
+      }
     }
     system_settings_save();
 
@@ -968,7 +972,7 @@ function node_types_configure($type = NU
     $output = form_group(t('Submission form'), $group);
     $output .= form_group(t('Workflow'), implode('', node_invoke_nodeapi($node, 'settings')));
 
-    print theme('page', system_settings_form($output));
+    return system_settings_form($output);
   }
   else {
     $header = array(t('Type'), t('Operations'));
@@ -978,7 +982,7 @@ function node_types_configure($type = NU
       $rows[] = array(node_invoke($type, 'node_name'), l(t('configure'), 'admin/node/configure/types/'. $type));
     }
 
-    print theme('page', theme('table', $header, $rows));
+    return theme('table', $header, $rows);
   }
 }
 
@@ -1111,7 +1115,7 @@ function node_admin() {
     default:
       $output = node_admin_nodes();
   }
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -1661,13 +1665,13 @@ function node_page() {
       node_feed();
       return;
     case 'add':
-      print theme('page', node_add(arg(2)));
+      return node_add(arg(2));
       break;
     case 'edit':
-      print theme('page', node_edit(arg(1)));
+      return node_edit(arg(1));
       break;
     case 'revisions':
-      print theme('page', node_revision_overview(arg(1)));
+      return node_revision_overview(arg(1));
       break;
     case 'rollback-revision':
       node_revision_rollback(arg(1), arg(3));
@@ -1680,7 +1684,7 @@ function node_page() {
         $node = node_load(array('nid' => arg(1)), $_GET['revision']);
         if ($node->nid) {
           drupal_set_title(check_plain($node->title));
-          print theme('page', node_show($node, arg(2)));
+          return node_show($node, arg(2));
         }
         else {
           drupal_not_found();
@@ -1690,7 +1694,7 @@ function node_page() {
     case t('Preview'):
       $edit = node_validate($edit);
       drupal_set_title(t('Preview'));
-      print theme('page', node_preview($edit));
+      return node_preview($edit);
       break;
     case t('Submit'):
       if ($nid = node_submit($edit)) {
@@ -1703,7 +1707,7 @@ function node_page() {
       }
       else {
         drupal_set_title(t('Submit'));
-        print theme('page', node_preview($edit));
+        return node_preview($edit);
       }
       break;
     case 'delete':
@@ -1719,11 +1723,11 @@ function node_page() {
         drupal_set_message(t('The node has been deleted.'));
         drupal_goto('admin/node');
       }
-      print theme('page', node_delete($edit));
+      return node_delete($edit);
       break;
     default:
       drupal_set_title('');
-      print theme('page', node_page_default());
+      return node_page_default();
   }
 }
 
Index: modules/path.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/path.module,v
retrieving revision 1.56
diff -u -F^f -r1.56 path.module
--- modules/path.module	1 Apr 2005 15:55:00 -0000	1.56
+++ modules/path.module	21 Apr 2005 16:22:40 -0000
@@ -95,7 +95,7 @@ function path_menu($may_cache) {
  * Menu callback; presents an overview of all URL aliases.
  */
 function path_admin() {
-  print theme('page', path_overview());
+  return path_overview();
 }
 
 /**
@@ -114,7 +114,7 @@ function path_admin_edit($pid = 0) {
     $output = path_form();
   }
 
-  print theme('page', $output);
+  return $output;
 }
 
 /**
Index: modules/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll.module,v
retrieving revision 1.162
diff -u -F^f -r1.162 poll.module
--- modules/poll.module	1 Apr 2005 15:55:00 -0000	1.162
+++ modules/poll.module	21 Apr 2005 16:22:40 -0000
@@ -274,7 +274,7 @@ function poll_page() {
   }
   $output .= '</ul>';
   $output .= theme("pager", NULL, 15);
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -361,7 +361,7 @@ function poll_view_results(&$node, $teas
 function poll_results() {
   if ($node = node_load(array('nid' => arg(1)))) {
     drupal_set_title(check_plain($node->title));
-    print theme('page', node_show($node, 0));
+    return node_show($node, 0);
   }
   else {
     drupal_not_found();
Index: modules/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile.module,v
retrieving revision 1.93
diff -u -F^f -r1.93 profile.module
--- modules/profile.module	18 Apr 2005 20:58:38 -0000	1.93
+++ modules/profile.module	21 Apr 2005 16:22:40 -0000
@@ -177,7 +177,7 @@ function profile_browse() {
     $output .= '</div>';
 
     drupal_set_title($title);
-    print theme('page', $output);
+    return $output;
   }
   else if ($name && !$field->id) {
     drupal_not_found();
@@ -201,7 +201,7 @@ function profile_browse() {
     $output .= theme('pager', NULL, 20);
 
     drupal_set_title(t('user list'));
-    print theme('page', $output);
+    return $output;
   }
 }
 
@@ -523,7 +523,7 @@ function profile_admin_add($type) {
   }
 
   drupal_set_title(t('Add new %type', array('%type' => _profile_field_types($type))));
-  print theme('page', _profile_field_form($type, $data));
+  return _profile_field_form($type, $data);
 }
 
 /**
@@ -551,7 +551,7 @@ function profile_admin_edit($fid) {
   }
 
   drupal_set_title(t('Edit %type', array('%type' => $data['type'])));
-  print theme('page', _profile_field_form($data['type'], $data));
+  return _profile_field_form($data['type'], $data);
 }
 
 /**
@@ -617,7 +617,7 @@ function profile_admin_overview() {
   }
   $output .= '</ul>';
 
-  print theme('page', $output);
+  return $output;
 }
 
 function theme_profile_block($user, $fields = array()) {
Index: modules/queue.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/queue.module,v
retrieving revision 1.129
diff -u -F^f -r1.129 queue.module
--- modules/queue.module	11 Apr 2005 16:42:28 -0000	1.129
+++ modules/queue.module	21 Apr 2005 16:22:40 -0000
@@ -151,7 +151,7 @@ function queue_overview() {
 
   drupal_set_title(t('Submission queue'));
 
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -197,7 +197,7 @@ function queue_view($nid) {
     if ($node->comment && variable_get('queue_show_comments', 1)) {
       $output .= module_invoke('comment', 'render', $node);
     }
-    print theme('page', $output);
+    return $output;
   }
   else {
     drupal_not_found();
Index: modules/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search.module,v
retrieving revision 1.124
diff -u -F^f -r1.124 search.module
--- modules/search.module	11 Apr 2005 22:48:27 -0000	1.124
+++ modules/search.module	21 Apr 2005 16:22:41 -0000
@@ -163,7 +163,7 @@ function search_admin() {
   $group .= form_textfield(t('Minimum word length to search for'), 'remove_short', variable_get('remove_short', 3), 3, 3, t('The number of characters a word has to be to be searched for, including wildcard characters.'));
   $output .= form_group(t('Indexing settings'), $group);
 
-  print theme('page', system_settings_form($output));
+  return system_settings_form($output);
 }
 
 /**
@@ -599,7 +599,7 @@ function search_view() {
 
     $output .= $results;
 
-    print theme('page', $output);
+    return $output;
   }
   else {
     drupal_access_denied();
Index: modules/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics.module,v
retrieving revision 1.187
diff -u -F^f -r1.187 statistics.module
--- modules/statistics.module	14 Apr 2005 19:37:11 -0000	1.187
+++ modules/statistics.module	21 Apr 2005 16:22:41 -0000
@@ -154,7 +154,7 @@ function statistics_access_log($aid) {
     $output .= ' <tr><th>'. t('User') .'</th><td>'. format_name($access) .'</td></tr>';
     $output .= ' <tr><th>'. t('Hostname') ."</th><td>$access->hostname</td></tr>";
     $output .= '</table>';
-    print theme('page', $output);
+    return $output;
   }
   else {
     drupal_not_found();
@@ -184,7 +184,7 @@ function statistics_node_tracker() {
     }
 
     drupal_set_title(check_plain($node->title));
-    print theme('page', theme('table', $header, $rows));
+    return theme('table', $header, $rows);
   }
   else {
     drupal_not_found();
@@ -212,7 +212,7 @@ function statistics_user_tracker() {
     }
 
     drupal_set_title($account->name);
-    print theme('page', theme('table', $header, $rows));
+    return theme('table', $header, $rows);
   }
   else {
     drupal_not_found();
@@ -245,7 +245,7 @@ function statistics_recent_hits($type = 
     $rows[] = array(array('data' => $pager, 'colspan' => '4'));
   }
 
-  print theme('page', theme('table', $header, $rows));
+  return theme('table', $header, $rows);
 }
 
 /**
@@ -270,7 +270,7 @@ function statistics_top_pages() {
   }
 
   drupal_set_title(t('Top pages in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))));
-  print theme('page', theme('table', $header, $rows));
+  return theme('table', $header, $rows);
 }
 
 /**
@@ -296,7 +296,7 @@ function statistics_top_users() {
   }
 
   drupal_set_title(t('Top users in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))));
-  print theme('page', theme('table', $header, $rows));
+  return theme('table', $header, $rows);
 }
 
 /**
@@ -323,7 +323,7 @@ function statistics_top_referrers() {
     $rows[] = array(array('data' => $pager, 'colspan' => '3'));
   }
 
-  print theme('page', theme('table', $header, $rows));
+  return theme('table', $header, $rows);
 }
 
 /**
Index: modules/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system.module,v
retrieving revision 1.205
diff -u -F^f -r1.205 system.module
--- modules/system.module	11 Apr 2005 19:05:52 -0000	1.205
+++ modules/system.module	21 Apr 2005 16:22:41 -0000
@@ -70,7 +70,7 @@ function system_menu($may_cache) {
 
     $items[] = array('path' => 'admin', 'title' => t('administer'),
       'access' => user_access('access administration pages'),
-      'callback' => 'system_admin_page',
+      'callback' => 'watchdog_overview',
       'weight' => 9);
 
     // Themes:
@@ -120,13 +120,6 @@ function system_test() {
 }
 
 /**
- * Menu callback; provides the main page of the administration section.
- */
-function system_admin_page() {
-  watchdog_overview('actions');
-}
-
-/**
  * Implementation of hook_user().
  *
  * Allows users to individually set their theme and time zone.
@@ -574,7 +567,7 @@ function system_themes() {
   system_listing_save();
   $form = system_theme_listing();
   $form .= form_submit(t('Save configuration'));
-  print theme('page', form($form));
+  return form($form);
 }
 
 /**
@@ -584,7 +577,7 @@ function system_modules() {
   system_listing_save();
   $form = system_module_listing();
   $form .= form_submit(t('Save configuration'));
-  print theme('page', form($form));
+  return form($form);
 }
 
 /**
@@ -600,7 +593,7 @@ function system_site_settings($module = 
     $form = system_view_general();
   }
 
-  print theme('page', system_settings_form($form));
+  return system_settings_form($form);
 }
 
 /**
@@ -711,7 +704,7 @@ function system_theme_settings($key = ''
   $form .= form_submit(t('Save configuration'));
   $form .= form_submit(t('Reset to defaults'));
 
-  print theme('page', form($form, 'post', null, array('enctype' => 'multipart/form-data')));
+  return form($form, 'post', null, array('enctype' => 'multipart/form-data'));
 
 }
 
Index: modules/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy.module,v
retrieving revision 1.197
diff -u -F^f -r1.197 taxonomy.module
--- modules/taxonomy.module	16 Apr 2005 11:49:27 -0000	1.197
+++ modules/taxonomy.module	21 Apr 2005 16:22:42 -0000
@@ -1080,7 +1080,7 @@ function taxonomy_term_page($str_tids = 
 
           $output = taxonomy_render_nodes(taxonomy_select_nodes($tids, $operator, $depth, TRUE));
           $output .= theme('xml_icon', url("taxonomy/term/$rss_tids/$depth/feed"));
-          print theme('page', $output);
+          return $output;
           break;
 
         case 'feed':
@@ -1118,8 +1118,7 @@ function taxonomy_admin() {
   if (is_numeric(arg(2)) && arg(3) == 'add' && arg(4) == 'term') {
     if ($op != t('Submit')) {
       $output = taxonomy_form_term(array('vid' => arg(2)));
-      print theme('page', $output);
-      return;
+      return $output;
     }
     else {
       taxonomy_save_term($edit);
@@ -1170,7 +1169,7 @@ function taxonomy_admin() {
       $output = taxonomy_overview();
   }
 
-  print theme('page', $output);
+  return $output;
 }
 
 /**
Index: modules/tracker.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker.module,v
retrieving revision 1.114
diff -u -F^f -r1.114 tracker.module
--- modules/tracker.module	12 Feb 2005 07:51:14 -0000	1.114
+++ modules/tracker.module	21 Apr 2005 16:22:42 -0000
@@ -118,7 +118,7 @@ function tracker_page($uid = 0) {
   $output .= theme('table', $header, $rows);
   $output .= '</div>';
 
-  print theme('page', $output);
+  return $output;
 }
 
 ?>
Index: modules/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload.module,v
retrieving revision 1.31
diff -u -F^f -r1.31 upload.module
--- modules/upload.module	1 Apr 2005 15:55:01 -0000	1.31
+++ modules/upload.module	21 Apr 2005 16:22:42 -0000
@@ -97,7 +97,7 @@ function upload_admin() {
     $output .= form_group(t('Settings for %role', array('%role' => "<em>$role</em>")), $group);
   }
 
-  print theme('page', system_settings_form($output));
+  return system_settings_form($output);
 }
 
 function upload_download() {
Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.462
diff -u -F^f -r1.462 user.module
--- modules/user.module	18 Apr 2005 20:43:26 -0000	1.462
+++ modules/user.module	21 Apr 2005 16:22:43 -0000
@@ -953,7 +953,7 @@ function user_pass() {
     $output .= form_textfield(t('Username'), 'name', $edit['name'], 30, 64);
     $output .= form_textfield(t('E-mail address'), 'mail', $edit['mail'], 30, 64);
     $output .= form_submit(t('E-mail new password'));
-    print theme('page', form($output));
+    return form($output);
   }
 }
 
@@ -1165,8 +1165,7 @@ function user_edit($category = 'account'
                       'user/'. $account->uid,
                       t('Deleting a user will remove all their submissions as well. This action cannot be undone.'),
                       t('Delete'));
-      print theme('page', $output);
-      return;
+      return $output;
     }
   }
   else if ($_POST['op'] == t('Delete')) {
@@ -1182,7 +1181,7 @@ function user_edit($category = 'account'
   $output = form($output, 'post', 0, array('enctype' => 'multipart/form-data'));
 
   drupal_set_title($account->name);
-  print theme('page', $output);
+  return $output;
 }
 
 function user_view($uid = 0) {
@@ -1200,7 +1199,7 @@ function user_view($uid = 0) {
     }
 
     drupal_set_title($account->name);
-    print theme('page', theme('user_profile', $account, $fields));
+    return theme('user_profile', $account, $fields);
   }
   else {
     drupal_not_found();
@@ -1220,11 +1219,11 @@ function user_page() {
   switch ($op) {
     case t('Create new account'):
     case 'register':
-      print theme('page', user_register($edit));
+      return user_register($edit);
       break;
     case t('Log in'):
     case 'login':
-      print theme('page', user_login($edit));
+      return user_login($edit);
       break;
     default:
       if (!arg(1)) {
@@ -1232,7 +1231,7 @@ function user_page() {
           drupal_goto('user/'. $user->uid);
         }
         else {
-          print theme('page', user_login($edit));
+          return user_login($edit);
         }
       }
       else {
@@ -1355,7 +1354,7 @@ function user_admin_access_check() {
   $form .= form_submit('Check e-mail');
   $output .= form($form);
 
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -1377,7 +1376,7 @@ function user_admin_access_add() {
   $form = _user_admin_access_form($edit);
   $form .= form_submit(t('Add rule'));
 
-  print theme('page', form($form, 'post', NULL, array('id' => 'access-rules')));
+  return form($form, 'post', NULL, array('id' => 'access-rules'));
 }
 
 /**
@@ -1400,7 +1399,7 @@ function user_admin_access_delete($aid =
                     t('Delete'),
                     t('Cancel'),
                     $extra);
-    print theme('page', $output);
+    return $output;
   }
 }
 
@@ -1423,7 +1422,7 @@ function user_admin_access_edit($aid = 0
   }
   $form = _user_admin_access_form($edit);
   $form .= form_submit(t('Save rule'));
-  print theme('page', form($form, 'post', NULL, array('id' => 'access-rules')));
+  return form($form, 'post', NULL, array('id' => 'access-rules'));
 }
 
 function _user_admin_access_form($edit) {
@@ -1450,7 +1449,7 @@ function user_admin_access() {
   }
   $output .= theme('table', $header, $rows);
 
-  print theme('page', $output);
+  return $output;
 }
 
 function user_roles($membersonly = 0, $permission = 0) {
@@ -1535,7 +1534,7 @@ function user_admin_perm() {
   $output = theme('table', $header, $rows, array('id' => 'permissions'));
   $output .= form_submit(t('Save permissions'));
 
-  print theme('page', form($output));
+  return form($output);
 }
 
 /**
@@ -1617,7 +1616,7 @@ function user_admin_role() {
     $output = form($output);
   }
 
-  print theme('page', $output);
+  return $output;
 }
 
 function user_admin_account() {
@@ -1666,7 +1665,7 @@ function user_configure() {
   }
   $output = system_settings_form(user_configure_settings());
 
-  print theme('page', $output);
+  return $output;
 }
 
 function user_admin() {
@@ -1689,7 +1688,7 @@ function user_admin() {
     default:
       $output = user_admin_account();
   }
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -1769,7 +1768,7 @@ function user_help($section) {
  * Menu callback; Prints user-specific help information.
  */
 function user_help_page() {
-  print theme('page', user_help('user/help#user'));
+  return user_help('user/help#user');
 }
 
 /**
Index: modules/watchdog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/watchdog.module,v
retrieving revision 1.121
diff -u -F^f -r1.121 watchdog.module
--- modules/watchdog.module	26 Jan 2005 23:02:44 -0000	1.121
+++ modules/watchdog.module	21 Apr 2005 16:22:43 -0000
@@ -125,7 +125,7 @@ function watchdog_overview() {
   $output  = '<div class="container-inline">'. form($form) .'</div>';
   $output .= theme('table', $header, $rows);
 
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -146,7 +146,7 @@ function watchdog_event($id) {
     $output .= ' <tr><th>'. t('Hostname') ."</th><td>$watchdog->hostname</td></tr>";
     $output .= '</table>';
   }
-  print theme('page', $output);
+  return $output;
 }
 
 function _watchdog_get_message_types() {