Index: /trunk/extras/my_themes/comments.php
===================================================================
--- /trunk/extras/my_themes/comments.php	(revision 628)
+++ /trunk/extras/my_themes/comments.php	(revision 629)
@@ -67,53 +67,53 @@
 
 <?php if ('open' == $post->comment_status) : ?>
-	<div id="xpress-respond">
+	<div id="respond">
 		<h3><?php comment_form_title( __('Leave a Reply', 'xpress'), __('Leave a Reply for %s' , 'xpress') ); ?></h3>
+			
+		<?php if ( function_exists('cancel_comment_reply_link') ): ?>
+			<div id="cancel-comment-reply"> 
+				<small><?php cancel_comment_reply_link() ?></small>
+			</div> 
+		<?php endif; ?>
+		
+		<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
+			<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.', 'xpress'), get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode(get_permalink())); ?></p>
+		<?php else : ?>
+			<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+				<div id="xpress-comment-user">
+					<?php if ( $user_ID ) : ?>
+						<?php if ( function_exists('wp_logout_url') ): ?>
+							<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out &raquo;', 'xpress'); ?></a></p>
+						<?php else : ?>
+							<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out &raquo;', 'xpress'); ?></a></p>
+						<?php endif; ?>
+					<?php else : ?>
+						<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
+						<label for="author"><small><?php _e('Name', 'xpress'); ?> <?php if ($req) _e("(required)", "xpress"); ?></small></label></p>
+
+						<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
+						<label for="email"><small><?php _e('Mail (will not be published)', 'xpress'); ?> <?php if ($req) _e("(required)", "xpress"); ?></small></label></p>
+
+						<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
+						<label for="url"><small><?php _e('Website', 'xpress'); ?></small></label></p>
+					<?php endif; ?>
+				</div>
+
+				<div id="xpress-comment-form">
+					<!--<p><small><?php printf(__('<strong>XHTML:</strong> You can use these tags: <code>%s</code>', 'xpress'), allowed_tags()); ?></small></p>-->
+
+					<textarea name="comment" id="comment" cols="100" rows="5" tabindex="4" style="width:100%"></textarea>
+					<div class ="xpress-comment-submit">
+						<input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment', 'xpress'); ?>" />
+					</div>
+					<?php if (function_exists('comment_id_fields')) : ?>
+						<?php comment_id_fields(); //@since 2.7.0 ?>  
+					<?php else : ?>
+						<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
+					<?php endif; ?>
+					<?php do_action('comment_form', $post->ID); ?>
+				</div>
+			</form>
+		<?php endif; // If registration required and not logged in ?>
 	</div>
-			
-	<?php if ( function_exists('cancel_comment_reply_link') ): ?>
-		<div id="cancel-comment-reply"> 
-			<small><?php cancel_comment_reply_link() ?></small>
-		</div> 
-	<?php endif; ?>
-	
-	<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
-		<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.', 'xpress'), get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode(get_permalink())); ?></p>
-	<?php else : ?>
-		<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
-			<div id="xpress-comment-user">
-				<?php if ( $user_ID ) : ?>
-					<?php if ( function_exists('wp_logout_url') ): ?>
-						<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out &raquo;', 'xpress'); ?></a></p>
-					<?php else : ?>
-						<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out &raquo;', 'xpress'); ?></a></p>
-					<?php endif; ?>
-				<?php else : ?>
-					<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
-					<label for="author"><small><?php _e('Name', 'xpress'); ?> <?php if ($req) _e("(required)", "xpress"); ?></small></label></p>
-
-					<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
-					<label for="email"><small><?php _e('Mail (will not be published)', 'xpress'); ?> <?php if ($req) _e("(required)", "xpress"); ?></small></label></p>
-
-					<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
-					<label for="url"><small><?php _e('Website', 'xpress'); ?></small></label></p>
-				<?php endif; ?>
-			</div>
-
-			<div id="xpress-comment-form">
-				<!--<p><small><?php printf(__('<strong>XHTML:</strong> You can use these tags: <code>%s</code>', 'xpress'), allowed_tags()); ?></small></p>-->
-
-				<textarea name="comment" id="comment" cols="100" rows="5" tabindex="4" style="width:100%"></textarea>
-				<div class ="xpress-comment-submit">
-					<input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment', 'xpress'); ?>" />
-				</div>
-				<?php if (function_exists('comment_id_fields')) : ?>
-					<?php comment_id_fields(); //@since 2.7.0 ?>  
-				<?php else : ?>
-					<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
-				<?php endif; ?>
-				<?php do_action('comment_form', $post->ID); ?>
-			</div>
-		</form>
-	<?php endif; // If registration required and not logged in ?>
 
 <?php endif; // if you delete this the sky will fall on your head ?>
Index: /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/comments.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/comments.php	(revision 628)
+++ /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/comments.php	(revision 629)
@@ -67,53 +67,53 @@
 
 <?php if ('open' == $post->comment_status) : ?>
-	<div id="xpress-respond">
+	<div id="respond">
 		<h3><?php comment_form_title( __('Leave a Reply', 'xpress'), __('Leave a Reply for %s' , 'xpress') ); ?></h3>
+			
+		<?php if ( function_exists('cancel_comment_reply_link') ): ?>
+			<div id="cancel-comment-reply"> 
+				<small><?php cancel_comment_reply_link() ?></small>
+			</div> 
+		<?php endif; ?>
+		
+		<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
+			<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.', 'xpress'), get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode(get_permalink())); ?></p>
+		<?php else : ?>
+			<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+				<div id="xpress-comment-user">
+					<?php if ( $user_ID ) : ?>
+						<?php if ( function_exists('wp_logout_url') ): ?>
+							<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out &raquo;', 'xpress'); ?></a></p>
+						<?php else : ?>
+							<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out &raquo;', 'xpress'); ?></a></p>
+						<?php endif; ?>
+					<?php else : ?>
+						<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
+						<label for="author"><small><?php _e('Name', 'xpress'); ?> <?php if ($req) _e("(required)", "xpress"); ?></small></label></p>
+
+						<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
+						<label for="email"><small><?php _e('Mail (will not be published)', 'xpress'); ?> <?php if ($req) _e("(required)", "xpress"); ?></small></label></p>
+
+						<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
+						<label for="url"><small><?php _e('Website', 'xpress'); ?></small></label></p>
+					<?php endif; ?>
+				</div>
+
+				<div id="xpress-comment-form">
+					<!--<p><small><?php printf(__('<strong>XHTML:</strong> You can use these tags: <code>%s</code>', 'xpress'), allowed_tags()); ?></small></p>-->
+
+					<textarea name="comment" id="comment" cols="100" rows="5" tabindex="4" style="width:100%"></textarea>
+					<div class ="xpress-comment-submit">
+						<input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment', 'xpress'); ?>" />
+					</div>
+					<?php if (function_exists('comment_id_fields')) : ?>
+						<?php comment_id_fields(); //@since 2.7.0 ?>  
+					<?php else : ?>
+						<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
+					<?php endif; ?>
+					<?php do_action('comment_form', $post->ID); ?>
+				</div>
+			</form>
+		<?php endif; // If registration required and not logged in ?>
 	</div>
-			
-	<?php if ( function_exists('cancel_comment_reply_link') ): ?>
-		<div id="cancel-comment-reply"> 
-			<small><?php cancel_comment_reply_link() ?></small>
-		</div> 
-	<?php endif; ?>
-	
-	<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
-		<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.', 'xpress'), get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode(get_permalink())); ?></p>
-	<?php else : ?>
-		<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
-			<div id="xpress-comment-user">
-				<?php if ( $user_ID ) : ?>
-					<?php if ( function_exists('wp_logout_url') ): ?>
-						<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out &raquo;', 'xpress'); ?></a></p>
-					<?php else : ?>
-						<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out &raquo;', 'xpress'); ?></a></p>
-					<?php endif; ?>
-				<?php else : ?>
-					<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
-					<label for="author"><small><?php _e('Name', 'xpress'); ?> <?php if ($req) _e("(required)", "xpress"); ?></small></label></p>
-
-					<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
-					<label for="email"><small><?php _e('Mail (will not be published)', 'xpress'); ?> <?php if ($req) _e("(required)", "xpress"); ?></small></label></p>
-
-					<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
-					<label for="url"><small><?php _e('Website', 'xpress'); ?></small></label></p>
-				<?php endif; ?>
-			</div>
-
-			<div id="xpress-comment-form">
-				<!--<p><small><?php printf(__('<strong>XHTML:</strong> You can use these tags: <code>%s</code>', 'xpress'), allowed_tags()); ?></small></p>-->
-
-				<textarea name="comment" id="comment" cols="100" rows="5" tabindex="4" style="width:100%"></textarea>
-				<div class ="xpress-comment-submit">
-					<input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment', 'xpress'); ?>" />
-				</div>
-				<?php if (function_exists('comment_id_fields')) : ?>
-					<?php comment_id_fields(); //@since 2.7.0 ?>  
-				<?php else : ?>
-					<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
-				<?php endif; ?>
-				<?php do_action('comment_form', $post->ID); ?>
-			</div>
-		</form>
-	<?php endif; // If registration required and not logged in ?>
 
 <?php endif; // if you delete this the sky will fall on your head ?>