Index: modules/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment.module,v
retrieving revision 1.371
diff -u -F^f -r1.371 comment.module
--- modules/comment.module	18 Sep 2005 12:04:10 -0000	1.371
+++ modules/comment.module	18 Sep 2005 17:22:06 -0000
@@ -1442,14 +1442,12 @@ function theme_comment_form($edit, $titl
   }
 
   $destination = $_REQUEST['destination'] ? 'destination='. $_REQUEST['destination'] : '';
-  return theme('box', $title, form($form, 'post', url('comment/reply/'. $edit['nid'], $destination)));
+
+  return theme('wrapper', form($form, 'post', url('comment/reply/'.$edit['nid'])), 'comment-reply', 'comment', $title);
 }
 
 function theme_comment_preview($comment, $links = '', $visible = 1) {
-  $output = '<div class="preview">';
-  $output .= theme('comment_view', $comment, $links, $visible);
-  $output .= '</div>';
-  return $output;
+  return theme('wrapper', theme('comment_view', $comment, $links, $visible), 'comment-preview', 'preview');
 };
 
 function theme_comment_view($comment, $links = '', $visible = 1) {
@@ -1508,7 +1506,7 @@ function theme_comment_controls($thresho
     $output = form_item(NULL, $output, t('Select your preferred way to display the comments and click "Save settings" to activate your changes.'));
   }
 
-  return theme('box', t('Comment viewing options'), $output);
+  return theme('wrapper', $output, 'comment-options', 'comment', t('Comment viewing options'));
 }
 
 function comment_moderation_form($comment) {
Index: modules/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu.module,v
retrieving revision 1.35
diff -u -F^f -r1.35 menu.module
--- modules/menu.module	13 Sep 2005 19:10:06 -0000	1.35
+++ modules/menu.module	18 Sep 2005 17:22:06 -0000
@@ -414,7 +414,7 @@ function menu_overview_tree() {
     }
     $table = theme('item_list', $operations);
     $table .= theme('table', $header, menu_overview_tree_rows($mid));
-    $output .= theme('box', $menu['items'][$mid]['title'], $table);
+    $output .= theme('wrapper', $table, 'menu-table' . $menu['items'][$mid]['mid'], 'admin-table', $menu['items'][$mid]['title']);
   }
   return $output;
 }
Index: modules/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search.module,v
retrieving revision 1.134
diff -u -F^f -r1.134 search.module
--- modules/search.module	7 Sep 2005 20:57:39 -0000	1.134
+++ modules/search.module	18 Sep 2005 17:22:07 -0000
@@ -576,11 +576,11 @@ function search_view() {
       $results = search_data($keys, $type);
 
       if ($results) {
-        $results = theme('box', t('Search results'), $results);
+        $results = theme('wrapper', $results, 'search-results', 'search-results', t('Search results'));
       }
       else {
-        $results = theme('box', t('Your search yielded no results'), search_help('search#noresults'));
-      }
+        $results = theme('wrapper', search_help('search#noresults'), 'search-results', 'message', t('Your search yielded no results'));
+    }
     }
     else if (isset($_POST['edit'])) {
       form_set_error('keys', t('Please enter some keywords.'));
Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.511
diff -u -F^f -r1.511 user.module
--- modules/user.module	15 Sep 2005 21:45:21 -0000	1.511
+++ modules/user.module	18 Sep 2005 17:22:08 -0000
@@ -633,7 +633,7 @@ function theme_user_profile($account, $f
   $output .= theme('user_picture', $account);
   foreach ($fields as $category => $value) {
     $value = implode('', $value);
-    $output .= theme('box', $category, $value);
+    $output .= theme('wrapper', $value, "user-profile-". $id++, "user-profile", $category);
   }
   $output .= "</div>\n";