Index: wp-content/themes/default/style.css
===================================================================
--- wp-content/themes/default/style.css	(revision 13166)
+++ wp-content/themes/default/style.css	(working copy)
@@ -182,6 +182,12 @@
 	font-family: 'Lucida Grande', Verdana, Arial, Sans-Serif;
 	}
 
+#cancel-comment-reply-link {
+	color: #06C;
+	font-size: 80%;
+	display: block;
+	}
+	
 .commentmetadata {
 	font-weight: normal;
 	}
Index: wp-content/themes/default/comments.php
===================================================================
--- wp-content/themes/default/comments.php	(revision 13166)
+++ wp-content/themes/default/comments.php	(working copy)
@@ -45,52 +45,27 @@
 	<?php endif; ?>
 <?php endif; ?>
 
-
-<?php if ( comments_open() ) : ?>
-
-<div id="respond">
-
-<h3><?php comment_form_title( 'Leave a Reply', 'Leave a Reply to %s' ); ?></h3>
-
-<div class="cancel-comment-reply">
-	<small><?php cancel_comment_reply_link(); ?></small>
-</div>
-
-<?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
-<p>You must be <a href="<?php echo wp_login_url( get_permalink() ); ?>">logged in</a> to post a comment.</p>
-<?php else : ?>
-
-<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
-
-<?php if ( is_user_logged_in() ) : ?>
-
-<p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="Log out of this account">Log out &raquo;</a></p>
-
-<?php else : ?>
-
-<p><input type="text" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
-<label for="author"><small>Name <?php if ($req) echo "(required)"; ?></small></label></p>
-
-<p><input type="text" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
-<label for="email"><small>Mail (will not be published) <?php if ($req) echo "(required)"; ?></small></label></p>
-
-<p><input type="text" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" size="22" tabindex="3" />
-<label for="url"><small>Website</small></label></p>
-
-<?php endif; ?>
-
-<!--<p><small><strong>XHTML:</strong> You can use these tags: <code><?php echo allowed_tags(); ?></code></small></p>-->
-
-<p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>
-
-<p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
-<?php comment_id_fields(); ?>
-</p>
-<?php do_action('comment_form', $post->ID); ?>
-
-</form>
-
-<?php endif; // If registration required and not logged in ?>
-</div>
-
-<?php endif; // if you delete this the sky will fall on your head ?>
+<?php 
+// comment_form() output is what is used in Twenty Ten by default, but needs
+// some modification for Kubrick
+$req = get_option( 'require_name_email' );
+$args = array( 'comment_notes_before' => '',
+				'comment_notes_after' => '', 
+				'fields' => array( 'name' => '<p><input type="text" name="author" id="author" value="' . esc_attr( $comment_author ) . '" size="22" tabindex="1" ' . ( $req ? "aria-required='true'" : '' ) . ' />' .
+											'<label for="author"><small>Name ' . ( $req ? "(required)" : '' ) . '</small></label></p>',
+									'email' => '<p><input type="text" name="email" id="email" value="' . esc_attr( $comment_author_email ) . '" size="22" tabindex="2" ' . ( $req ? "aria-required='true'" : '' ) . ' />' .
+												'<label for="email"><small>Mail (will not be published) ' . ( $req ? "(required)" : '' ) . '</small></label></p>',
+									'url' => '<p><input type="text" name="url" id="url" value="' . esc_attr( $comment_author_url ) . '" size="22" tabindex="3" />' .
+												'<label for="url"><small>Website</small></label></p>',
+				 					'note' => '<!--<p><small><strong>XHTML:</strong> You can use these tags: <code>' . allowed_tags() . '</code></small></p>-->' ),
+				'cancel_reply_link' => __( 'Click here to cancel reply.' ),
+				'comment_field' => '<p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>',
+				'logged_in_as' => '<p class="logged-in-as">' . sprintf( __( 'Logged in as <a href="%s">%s</a>. <a href="%s" title="Log out of this account">Log out &raquo;</a></p>' ), 
+																		admin_url( 'profile.php' ), 
+																		$user_identity, 
+																		wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
+																	),
+				'label_submit' => __( 'Submit Comment' )
+			);
+comment_form( $args );
+?>
\ No newline at end of file