Index: comment-template.php
===================================================================
--- comment-template.php	(revision 13049)
+++ comment-template.php	(working copy)
@@ -1465,34 +1465,47 @@
 
 	$req = get_option( 'require_name_email' );
 	$aria_req = ( $req ? " aria-required='true'" : '' );
-	$defaults = array( 'fields' => apply_filters( 'comment_form_default_fields', array( 'author' => '<div id="form-section-author" class="form-section">
-																										<div class="form-label"><label for="author">' . __( 'Name', 'twentyten' ) . '</label> ' . ( $req ? '<span class="required">*</span>' : '' ) . '</div>
-																										<div class="form-input"><input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" tabindex="1"' . $aria_req . ' /></div>
-																									</div><!-- #form-section-author .form-section -->',
-																							'email' => '<div id="form-section-email" class="form-section">
-																											<div class="form-label"><label for="email">' . __( 'Email', 'twentyten' ) . '</label> ' . ( $req ? '<span class="required">*</span>' : '' ) . '</div>
-																											<div class="form-input"><input id="email" name="email" type="text" value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" tabindex="2"' . $aria_req . ' /></div>
-																										</div><!-- #form-section-email .form-section -->', 
-																							'url' => '<div id="form-section-url" class="form-section">
-																											<div class="form-label"><label for="url">' . __( 'Website', 'twentyten' ) . '</label></div>
-																											<div class="form-input"><input id="url" name="url" type="text" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" tabindex="3" /></div>
-																										</div><!-- #form-section-url .form-section -->' ) ),
-						'comment_field' => '<div id="form-section-comment" class="form-section">
-												<div class="form-label"><label for="comment">' . __( 'Comment', 'twentyten' ) . '</label></div>
-												<div class="form-textarea"><textarea id="comment" name="comment" cols="45" rows="8" tabindex="4" aria-required="true"></textarea></div>
-											</div><!-- #form-section-comment .form-section -->',
-						'must_log_in' => '<p>' .  sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
-						'logged_in_as' => '<p>' . sprintf( __( 'Logged in as <a href="%s">%s</a>. <a href="%s" title="Log out of this account">Log out?</a></p>' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ),
-						'comment_notes_before' => '<p id="comment-notes">' . __( 'Your email is <em>never</em> published nor shared.' ) . ( $req ? __( ' Required fields are marked <span class="required">*</span>' ) : '' ) . '</p>', 
-						'comment_notes_after' => '<div id="form-allowed-tags" class="form-section">
-													<p><span>' . __( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes:' ) . '</span> <code>' . allowed_tags() . '</code></p>
-												</div>',
-						'id_form' => 'commentform',
-						'id_submit' => 'submit',
-						'title_reply' => __( 'Leave a Reply' ),
-						'title_reply_to' => __( 'Leave a Reply to %s'),
-						'cancel_reply_link' => __( 'Cancel reply' ),
-						'label_submit' => __( 'Post Comment' ),
+	$defaults = array( 
+		'fields' => apply_filters( 'comment_form_default_fields', array( 
+				'author' => 
+					'<p class="comment-form-author">'.
+					'<label for="author">' . __( 'Name' ) . '</label> ' . 
+					( $req ? '<span class="required">*</span>' : '' ) . 
+					'<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" tabindex="1"' . $aria_req . ' />'.
+					'</p>',
+				'email' => 
+					'<p class="comment-form-email">'.
+					'<label for="email">' . __( 'Email' ) . '</label> ' . 
+					( $req ? '<span class="required">*</span>' : '' ) . 
+					'<input id="email" name="email" type="text" value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" tabindex="2"' . $aria_req . ' />'.
+					'</p>',
+				'url' => 
+					'<p class="comment-form-url">'.
+					'<label for="url">' . __( 'Website' ) . '</label> ' .
+					'<input id="url" name="url" type="text" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" tabindex="3" />'.
+					'</p>' 
+				) 
+			),
+		'comment_form_before_fields' => '<div class="comment-fields">';
+		'comment_form_after_fields' => '</div>';
+		'comment_field' => 
+			'<div class="comment-form-comment">'.
+			'<label for="comment">' . __( 'Comment' ) . '</label></div>'.
+			'<textarea id="comment" name="comment" cols="45" rows="8" tabindex="4" aria-required="true"></textarea></div>'.
+			'</div>',
+		'must_log_in' => '<p>' .  sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
+		'logged_in_as' => '<p>' . sprintf( __( 'Logged in as <a href="%s">%s</a>. <a href="%s" title="Log out of this account">Log out?</a></p>' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ),
+		'comment_notes_before' => '<p id="comment-notes">' . __( 'Your email is <em>never</em> published nor shared.' ) . ( $req ? __( ' Required fields are marked <span class="required">*</span>' ) : '' ) . '</p>', 
+		'comment_notes_after' => 
+			'<div class="comment-form-allowed-tags">'.
+			'<p><span>' . __( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes:' ) . '</span> <code>' . allowed_tags() . '</code></p>'.
+			'</div>',
+		'id_form' => 'commentform',
+		'id_submit' => 'submit',
+		'title_reply' => __( 'Leave a Reply' ),
+		'title_reply_to' => __( 'Leave a Reply to %s'),
+		'cancel_reply_link' => __( 'Cancel reply' ),
+		'label_submit' => __( 'Post Comment' ),
 				);
 	$args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) );