Index: trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php	(revision 252)
+++ trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php	(revision 253)
@@ -41,4 +41,10 @@
 }
 
+function xpress_is_wp20() {
+	global $xoops_config;
+	
+	return $xoops_config->is_wp20;
+}
+
 function xpress_selected_author($show=true ) {
 	$output = '';
Index: trunk/xpressme_integration_kit/wp-content/themes/xpress_default/comments.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/themes/xpress_default/comments.php	(revision 252)
+++ trunk/xpressme_integration_kit/wp-content/themes/xpress_default/comments.php	(revision 253)
@@ -8,55 +8,59 @@
 		return;
 	}
-	
-	if (function_exists('have_comments'))
-		$have_comments= have_comments();
-	else
-		$have_comments= $comments;
 
 ?>
 
 <!-- You can start editing here. -->
-<?php if ( $have_comments ) : ?>
-	<?php if ( ! empty($comments_by_type['comment']) ) : ?>
+<?php if (! xpress_is_wp20() ) : ?>
+	<?php if ( have_comments() ) : ?>
+		<?php if ( ! empty($comments_by_type['comment']) ) : ?>
+			<h3 id="xpress_comments"><?php comments_number(__('No Responses', 'xpress'), __('One Response', 'xpress'), __('% Responses', 'xpress'));?> <?php printf(__('to &#8220;%s&#8221;', 'xpress'), the_title('', '', false)); ?></h3>
+			<div id="xpress_commentlist">
+				<?php wp_list_comments('type=comment&style=div'); ?>
+			</div>
+		<?php endif; ?>
+		
+		<div class="navigation">
+			<div class="alignleft"><?php previous_comments_link() ?></div>
+			<div class="alignright"><?php next_comments_link() ?></div>
+		</div>
+	<?php else : // this is displayed if there are no comments so far ?>
+
+		<?php if ('open' == $post->comment_status) : ?>
+			<!-- If comments are open, but there are no comments. -->
+		<?php else : // comments are closed ?>
+			<!-- If comments are closed. -->
+			<p class="nocomments"><?php _e('Comments are closed.' , 'xpress'); ?></p>
+		<?php endif; ?>
+	<?php endif; ?>
+<?php else : // is WordPress2.0 ?>
+	<?php if ( $comments ) : ?>
 		<h3 id="xpress_comments"><?php comments_number(__('No Responses', 'xpress'), __('One Response', 'xpress'), __('% Responses', 'xpress'));?> <?php printf(__('to &#8220;%s&#8221;', 'xpress'), the_title('', '', false)); ?></h3>
 		<div id="xpress_commentlist">
-			<?php if (function_exists('wp_list_comments')) : ?>
-				<?php wp_list_comments('type=comment&style=div'); ?>
-			 		<ol class="commentlist">
- 			<?php else : ?>
-				<?php foreach ($comments as $comment) : ?>
-					<li <?php echo $oddcomment; ?>id="comment-<?php comment_ID() ?>">
-						<?php if (function_exists('get_avatar')) echo get_avatar( $comment, 32 ); ?>	
-						<?php printf(__('<cite>%s</cite> Says:', 'xpressme'), get_comment_author_link()); ?>
-						<?php if ($comment->comment_approved == '0') : ?>
-						<em><?php _e('Your comment is awaiting moderation.', 'xpressme'); ?></em>
-						<?php endif; ?>
-						<br />
-						<small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php printf(__('%1$s at %2$s', 'xpressme'), get_comment_date(__('F jS, Y', 'xpressme')), get_comment_time()); ?></a> <?php edit_comment_link(__('Comment Edit', 'xpressme'),'&nbsp;&nbsp;',''); ?></small>
-						<?php comment_text() ?>
-					</li>
+			<?php foreach ($comments as $comment) : ?>
+				<li <?php echo $oddcomment; ?>id="comment-<?php comment_ID() ?>">
+					<?php if (function_exists('get_avatar')) echo get_avatar( $comment, 32 ); ?>	
+					<?php printf(__('<cite>%s</cite> Says:', 'xpress'), get_comment_author_link()); ?>
+					<?php if ($comment->comment_approved == '0') : ?>
+					<em><?php _e('Your comment is awaiting moderation.', 'xpress'); ?></em>
+					<?php endif; ?>
+					<br />
+					<small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php printf(__('%1$s at %2$s', 'xpress'), get_comment_date(), get_comment_time()); ?></a> <?php edit_comment_link(__('Comment Edit', 'xpress'),'&nbsp;&nbsp;',''); ?></small>
+					<?php comment_text() ?>
+				</li>
 				<?php
 					/* Changes every other comment to a different class */
 					$oddcomment = ( empty( $oddcomment ) ) ? 'class="alt" ' : '';
 				?>
-				<?php endforeach; /* end for each comment */ ?>
-				</ol>
-			<?php endif; ?>
+			<?php endforeach; /* end for each comment */ ?>
+			</ol>
 		</div>
-	<?php endif; ?>
-	<?php if (function_exists('wp_list_comments')) : ?>
-		<div class="navigation">
-			<div class="alignleft"><?php previous_comments_link() ?></div>
-			<div class="alignright"><?php next_comments_link() ?></div>
-		</div>
-	<?php endif; ?>
-				
-<?php else : // this is displayed if there are no comments so far ?>
-
-	<?php if ('open' == $post->comment_status) : ?>
-		<!-- If comments are open, but there are no comments. -->
-	<?php else : // comments are closed ?>
-		<!-- If comments are closed. -->
-		<p class="nocomments"><?php _e('Comments are closed.' , 'xpress'); ?></p>
+	<?php else : // this is displayed if there are no comments so far ?>
+		<?php if ('open' == $post->comment_status) : ?>
+			<!-- If comments are open, but there are no comments. -->
+		<?php else : // comments are closed ?>
+			<!-- If comments are closed. -->
+			<p class="nocomments"><?php _e('Comments are closed.' , 'xpress'); ?></p>
+		<?php endif; ?>
 	<?php endif; ?>
 <?php endif; ?>
Index: trunk/xpressme_integration_kit/wp-content/themes/xpress_default/single.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/themes/xpress_default/single.php	(revision 252)
+++ trunk/xpressme_integration_kit/wp-content/themes/xpress_default/single.php	(revision 253)
@@ -65,5 +65,10 @@
 							
 					<div id ="xpress-comments-block">
-						<?php comments_template(); ?>
+						<?php
+							if (xpress_is_wp20() )
+								comments_template();
+							else
+								comments_template('',true);
+						?>
 					</div>
 				</div>