Index: trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/authors_block_theme.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/authors_block_theme.php	(revision 354)
+++ trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/authors_block_theme.php	(revision 360)
@@ -10,5 +10,5 @@
 	$mydirpath = get_xpress_dir_path();
 	
-	if(xpress_is_wp20() ){
+	if(xpress_is_wp_version('<','2.3') ){
 		$param_str = 'optioncount='. $optioncount . '&exclude_admin=' . $exclude_admin .'&show_fullname='. $show_fullname . '&hide_empty=' . $hide_empty;
 		ob_start();
Index: trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/meta_block_theme.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/meta_block_theme.php	(revision 354)
+++ trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/meta_block_theme.php	(revision 360)
@@ -35,5 +35,5 @@
 		if ($post_new){
 			if($Now_user_level > 0){
-				if (xpress_is_wp20()){
+				if (xpress_is_wp_version('<','2.1') ){
 					$output .=
 					'<li>'.
Index: trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/page_block_theme.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/page_block_theme.php	(revision 354)
+++ trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/page_block_theme.php	(revision 360)
@@ -22,5 +22,5 @@
 	if ($show_date == 'none' ) $show_date = '';
 	
-	if (!xpress_is_wp20()){
+	if (xpress_is_wp_version('>=','2.2')){
 		$parm = array(
 	    	'sort_column'	=> $sort_column, 
Index: trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/recent_comments_block_theme.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/recent_comments_block_theme.php	(revision 354)
+++ trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/recent_comments_block_theme.php	(revision 360)
@@ -46,5 +46,5 @@
 		$comment_sql  = "SELECT comment_ID,comment_post_ID,comment_author,comment_author_email,comment_author_url,comment_content, comment_type,UNIX_TIMESTAMP(comment_date) as comment_unix_time ";
 		$comment_sql .= "FROM $wpdb->comments LEFT JOIN $wpdb->posts ON  $wpdb->posts.ID = $wpdb->comments.comment_post_ID ";
-		if (xpress_is_wp20()){
+		if (xpress_is_wp_version('<','2.1')){
 			$comment_sql .= "WHERE comment_approved = '1' AND post_status = 'publish' $type_select ";
 		} else {
@@ -60,9 +60,5 @@
 				$comment_content = $comment->comment_content;
 				$comment_excerpt = ($disp_length>0 ? xpress_substr($comment_content, 0, $disp_length): $comment->comment_content);
-				if (xpress_is_wp20()){
-					$comment_link = get_permalink($comment->comment_post_ID) . '#comment-' . $comment->comment_ID ;
-				} else {
-					$comment_link = get_comment_link($comment->comment_ID);
-				}
+				$comment_link = get_comment_link($comment->comment_ID);
 				$comment_title = $comment_excerpt;
 				$comment_title_link = "<a href='$comment_link' rel='external nofollow' class='url'>$comment_title</a>";
Index: trunk/xpressme_integration_kit/wp-content/themes/xpress_default/comments.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/themes/xpress_default/comments.php	(revision 354)
+++ trunk/xpressme_integration_kit/wp-content/themes/xpress_default/comments.php	(revision 360)
@@ -12,5 +12,5 @@
 
 <!-- You can start editing here. -->
-<?php if (! xpress_is_wp20() ) : ?>
+<?php if ( xpress_is_wp_version('>=','2.7')) : ?>
 	<?php if ( have_comments() ) : ?>
 		<?php if ( ! empty($comments_by_type['comment']) ) : ?>
@@ -34,5 +34,5 @@
 		<?php endif; ?>
 	<?php endif; ?>
-<?php else : // is WordPress2.0 ?>
+<?php else : // is version 2.7 under?>
 	<?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>
Index: trunk/xpressme_integration_kit/wp-content/themes/xpress_default/single.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/themes/xpress_default/single.php	(revision 354)
+++ trunk/xpressme_integration_kit/wp-content/themes/xpress_default/single.php	(revision 360)
@@ -66,5 +66,5 @@
 					<div id ="xpress-comments-block">
 						<?php
-							if (xpress_is_wp20() )
+							if ( xpress_is_wp_version('<','2.7') )
 								comments_template();
 							else