Index: trunk/wp-content/themes/xpress_default/single.php
===================================================================
--- trunk/wp-content/themes/xpress_default/single.php	(revision 64)
+++ trunk/wp-content/themes/xpress_default/single.php	(revision 141)
@@ -1,26 +1,45 @@
 <?php get_header(); ?>
 
-	<div id="xpress_content" class="widecolumn">
-
-    <div id="xpress_header">
-    	<div id="xpress_headerimg">
-    		<h1><a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a></h1>
-    		<div class="description"><?php bloginfo('description'); ?></div>
-    	</div>
-    </div>
+<div id="xpress_wrap">
+<?php
+	if(xpress_is_theme_sidebar_disp()) {
+		echo '<div id="xpress_content" class="narrowcolumn">';	
+	} else {
+		echo '<div id="xpress_content" class="narrowcolumn_nonside">';
+	}	
+?>
+		<div class="xpress-header-bar">
+			<div class="xpress-header-title">
+				<a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a>
+			</div>
+			<div class="xpress-conditional-title">
+				&nbsp;( <?php xpress_conditional_title();?> )
+			</div>
+			<div class="xpress-description">
+				<?php bloginfo('description'); ?>
+			</div>
+			<div class="xpress-operation-link">
+				<a href="<?php echo get_option('home'); ?>/"><?php _e('Mein Page','xpress')?></a> 
+				<?php if(is_xpress_contributor()) { echo ' | ' ; xpress_post_new_link(__('Post New','xpress')); }?>
+			</div>
+		</div>
+		<hr class="xpress-border">
 
 	<?php if (have_posts()) : while (have_posts()) : the_post(); ?>
 
-		<div class="xpress_single_navigation">
+		<div class="xpress-navi-bar">
 			<div class="alignleft"><?php xpress_left_arrow_post_link(true) ?></div>
 			<div class="alignright"><?php xpress_right_arrow_post_link(true) ?></div>
 		</div>
 
-		<div class="post" id="post-<?php the_ID(); ?>">
-			<?php if (function_exists('hotDates')) { hotDates(); }?>
-			<h2><?php the_title(); ?></h2>
-			<small><?php the_time(__('F jS, Y', 'xpress')) ?> <!-- by <?php the_author() ?> --></small>
+		<div class="xpress-post" id="post-<?php the_ID(); ?>">
+					<div class ="xpress-post-header">
+						<?php if (function_exists('hotDates')) { hotDates(); }?>
+						<div class ="xpress-post-title">
+							<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'xpress'), the_title_attribute('echo=0')); ?>"><?php the_title(); ?></a></h2>
+						</div>
+					</div>
 
-			<div class="entry">
+			<div class="xpress-post-entry">
 				<?php the_content('<p class="serif">' . __('Read the rest of this entry &raquo;', 'xpress') . '</p>'); ?>
 
@@ -72,6 +91,12 @@
 
 <?php endif; ?>
+		<div class="xpress-navi-bar">
+			<div class="alignleft"><?php xpress_left_arrow_post_link(true) ?></div>
+			<div class="alignright"><?php xpress_right_arrow_post_link(true) ?></div>
+		</div>
 
 	</div>
-
+</div>
+<?php if(xpress_is_theme_sidebar_disp()) get_sidebar(); ?>
+<hr class="xpress-border">
 <?php get_footer(); ?>