Index: trunk/wp-content/themes/xpress_default/archive.php
===================================================================
--- trunk/wp-content/themes/xpress_default/archive.php	(revision 46)
+++ trunk/wp-content/themes/xpress_default/archive.php	(revision 47)
@@ -3,5 +3,5 @@
        <div id="xpress_wrap">
 	   
-	<?php if(is_sidbar_disp()) : ?>
+	<?php if(xpress_is_theme_sidebar_disp()) : ?>
 	   
 		<div id="xpress_content" class="narrowcolumn">
Index: trunk/wp-content/themes/xpress_default/search.php
===================================================================
--- trunk/wp-content/themes/xpress_default/search.php	(revision 46)
+++ trunk/wp-content/themes/xpress_default/search.php	(revision 47)
@@ -3,5 +3,5 @@
        <div id="xpress_wrap">
 	   
-	<?php if(is_sidbar_disp()) : ?>
+	<?php if(xpress_is_theme_sidebar_disp()) : ?>
 	   
 		<div id="xpress_content" class="narrowcolumn">
Index: trunk/wp-content/themes/xpress_default/xpress_block.inc.php
===================================================================
--- trunk/wp-content/themes/xpress_default/xpress_block.inc.php	(revision 46)
+++ 	(revision )
@@ -1,42 +1,0 @@
-<?php
-
-function theme_contents_block(&$block_posts,$except=false,$except_size= 100,$show_comment_link=true,$show_cat_link=true,$show_post_time=true,$show_view_num=true,$show_author=true,$show_the_tags=true)
-{
-	global $id;
-
-	while($block_posts->have_posts()){
-		$block_posts->the_post();
-?>
-            <style type="text/css">
-            <!--
-            .entry p{margin:0;padding:5px 0;}
-            .post p{line-height:1.4;}
-            .dateblock{margin-left:-5px!important;}
-            //-->
-            </style>
-			<div class="post" id="post-<?php the_ID(); ?>" style="clear:both;margin:0 0 20px;padding:20px 0 0;width:100%;">
-				<?php if (function_exists('hotDates')) {
-					echo '<style type="text/css">@import url('. get_bloginfo('url') . '/wp-content/plugins/hotDates/hotDates.css);</style>';
-					hotDates(); 
-				}?>
-				<h2 style="margin:0;font-size:1.5em;"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'kubrick'), the_title_attribute('echo=0')); ?>"><?php the_title(); ?></a></h2>
-				<small style="font-family:Arial,Helvetica,Sans-Serif;font-size:0.8em;line-height:1.5em;color:#777777;"><?php the_time(__('F jS, Y', 'kubrick')) ?> <!-- by <?php the_author() ?> --></small>
-
-				<div class="entry" style="line-height:1.4em;clear:both;padding:10px 0 0;margin:0;">
-					<?php
-						if ($except) 
-							wpj_excerpt($except_size, 2);
-						else
-							the_content(__('Read the rest of this entry &raquo;', 'kubrick'));
-					?>
-				</div>
-				<p class="postmetadata" style="padding:10px 0 0;color:#777777;font-size:0.9em;">
-				<?php/* if($show_author) { _e('Posted:', 'kubrick'); the_author_posts_link(); echo '<br />' ; }*/?>
-				<?php if($show_the_tags) the_tags(__('Tags:', 'kubrick') . ' ', ' &bull; ', '<br />'); ?>
-			 	<?php printf(__('Posted in %s', 'kubrick'), get_the_category_list(' &bull; ')); ?> | <?php edit_post_link(__('Edit', 'kubrick'), '', ' | '); ?>  <?php comments_popup_link(__('No Comments &#187;', 'kubrick'), __('1 Comment &#187;', 'kubrick'), __('% Comments &#187;', 'kubrick'), '', __('Comments Closed', 'kubrick') ); ?></p>
-			</div>
-
-<?php
-   }
-}
-?>