Index: trunk/templates/source/archives_block.html
===================================================================
--- trunk/templates/source/archives_block.html	(revision 114)
+++ trunk/templates/source/archives_block.html	(revision 115)
@@ -12,14 +12,18 @@
 ************************* End of usage ************************ *}>
 <{* Start Template *}>
-<{$block.err_message}>
-<{if $block.config.is_archive_doropdown}>
-	<{$block.archive_dropdown}>
-<{else}>
-<ul class="xpress_archive_content">
-	<{foreach from=$block.contents item=content}>
-		<li>
-		<{$content.archive}>
-		</li>
-	<{/foreach}>
-</ul>
-<{/if}>
+<div class="xpress_block">
+	<div class="xpress_archive_block">
+		<{$block.err_message}>
+		<{if $block.config.is_archive_doropdown}>
+			<{$block.archive_dropdown}>
+		<{else}>
+			<ul>
+				<{foreach from=$block.contents item=content}>
+					<li>
+					<{$content.archive}>
+					</li>
+				<{/foreach}>
+			</ul>
+		<{/if}>
+	</div>
+</div>
Index: trunk/templates/source/authors_block.html
===================================================================
--- trunk/templates/source/authors_block.html	(revision 114)
+++ trunk/templates/source/authors_block.html	(revision 115)
@@ -10,10 +10,14 @@
 ************************* End of usage ************************ *}>
 <{* Start Template *}>
-<{$block.err_message}>
-<ul class="xpress_authors_content">
-	<{foreach from=$block.contents item=content}>
-		<li>
-		<{$content.author}>
-		</li>
-	<{/foreach}>
-</ul>
+<div class="xpress_block">
+	<div class="xpress_authors_block">
+		<{$block.err_message}>
+		<ul>
+		<{foreach from=$block.contents item=content}>
+			<li>
+			<{$content.author}>
+			</li>
+		<{/foreach}>
+		</ul>
+	</div>
+</div>
Index: trunk/templates/source/calender_block.html
===================================================================
--- trunk/templates/source/calender_block.html	(revision 114)
+++ trunk/templates/source/calender_block.html	(revision 115)
@@ -1,10 +1,12 @@
 <{* **************************  usage ****************************
  	The template tag of the following list can be used. 
- 		<{$block.content}>
+		<{$block.err_message}> 					// When the block cannot be displayed, this outputs the reason. Please do not delete it.
+ 		<{$block.calender}>						// Displays Calender
    ************************* End of usage ************************ *}>
 <{* Start Template *}>
-
-<div id="xpress_calender">
-	<{$block.err_message}>
-	<{$block.content}>
+<div class="xpress_block">
+	<div class="xpress_calender_block">
+		<{$block.err_message}>
+		<{$block.calender}>
+	</div>
 </div>
Index: trunk/templates/source/popular_posts_block.html
===================================================================
--- trunk/templates/source/popular_posts_block.html	(revision 114)
+++ trunk/templates/source/popular_posts_block.html	(revision 115)
@@ -23,25 +23,14 @@
 ************************* End of usage ************************ *}>
 <{* Start Template *}>
-
-<ul class="xpress_popular_post">
-	<{$block.err_message}>
-	<{$block.data_count}>
-	<{foreach from=$block.contents item=content}>
-		<li>
-		<{$content.post_id}><br />
-		<{$content.post_title}><br />
-		<{$content.post_date}><br />
-		<{$content.post_time}><br />
-		<{$content.post_date_time}><br />
-		<{$content.post_modified_date}><br />
-		<{$content.post_modified_time}><br />
-		<{$content.post_modified_date_time}><br />
-		<{$content.post_author}><br />
-		<{$content.post_category}><br />
-		<{$content.post_tags}><br />
-		<{$content.post_views}><br />
-		<{$content.comment_link}><br />
-		<{$content.trackback_url}>
-		</li>
-	<{/foreach}>
-</ul>
+<div class="xpress_block">
+	<div class="xpress_popular_post_block">
+		<{$block.err_message}>
+		<ul>
+		<{foreach from=$block.contents item=content}>
+			<li>
+			<{$content.post_title}>&nbsp;(<{$content.post_views}>)
+			</li>
+		<{/foreach}>
+		</ul>
+	</div>
+</div>
Index: trunk/templates/source/recent_comments_block.html
===================================================================
--- trunk/templates/source/recent_comments_block.html	(revision 114)
+++ trunk/templates/source/recent_comments_block.html	(revision 115)
@@ -26,14 +26,15 @@
    ************************* End of usage ************************ *}>
 <{* Start Template *}>
-
-<ul id="xpress_recent_comments">
-	<{$block.err_message}>
-	<{$block.data_count}>
-	<{foreach from=$block.contents item=content}>
-		<li>
-			<{$content.from_auther_to_post}><br />
-			<{$content.comment_excerpt}><br />
-			<{$content.comment_date_time}>
-		</li>
-	<{/foreach}>
-</ul>
+<div class="xpress_block">
+	<div class="xpress_recent_comments_block">
+		<{$block.err_message}>
+		<ul>
+		<{foreach from=$block.contents item=content}>
+			<li>
+				<{$content.from_auther_to_post}><br />
+				<{$content.comment_date_time}>
+			</li>
+		<{/foreach}>
+		</ul>
+	</div>
+</div>
Index: trunk/templates/source/recent_posts_content_block.html
===================================================================
--- trunk/templates/source/recent_posts_content_block.html	(revision 114)
+++ trunk/templates/source/recent_posts_content_block.html	(revision 115)
@@ -24,26 +24,22 @@
 ************************* End of usage ************************ *}>
 <{* Start Template *}>
-
-<ul class="xpress_recent_post_content">
-	<{$block.err_message}>
-	<{$block.data_count}>
-	<{foreach from=$block.contents item=content}>
-		<li>
-		<{$content.post_id}><br />
-		<{$content.post_title}><br />
-		<{$content.post_content}><br />
-		<{$content.post_date}><br />
-		<{$content.post_time}><br />
-		<{$content.post_date_time}><br />
-		<{$content.post_modified_date}><br />
-		<{$content.post_modified_time}><br />
-		<{$content.post_modified_date_time}><br />
-		<{$content.post_author}><br />
-		<{$content.post_category}><br />
-		<{$content.post_tags}><br />
-		<{$content.post_views}><br />
-		<{$content.comment_link}><br />
-		<{$content.trackback_url}>
-		</li>
-	<{/foreach}>
-</ul>
+<div class="xpress_block">
+	<div class="xpress_recent_post_content_block">
+		<{$block.err_message}>
+		<ul>
+		<{foreach from=$block.contents item=content}>
+			<li>
+			<{$content.post_title}><br />
+			<{$content.post_content}><br />
+			<{$content.post_date_time}><br />
+			<{$content.post_author}><br />
+			<{$content.post_category}><br />
+			<{$content.post_tags}><br />
+			<{$content.post_views}><br />
+			<{$content.comment_link}><br />
+			<{$content.trackback_url}>
+			</li>
+		<{/foreach}>
+		</ul>
+	</div>
+</div>
Index: trunk/templates/source/recent_posts_list_block.html
===================================================================
--- trunk/templates/source/recent_posts_list_block.html	(revision 114)
+++ trunk/templates/source/recent_posts_list_block.html	(revision 115)
@@ -24,26 +24,16 @@
 ************************* End of usage ************************ *}>
 <{* Start Template *}>
-
-<ul class="xpress_recent_post_list">
-	<{$block.err_message}>
-	<{$block.data_count}>
-	<{foreach from=$block.contents item=content}>
-		<li>
-		<{$content.post_id}><br />
-		<{$content.new_mark}>
-		<{$content.post_title}><br />
-		<{$content.post_date}><br />
-		<{$content.post_time}><br />
-		<{$content.post_date_time}><br />
-		<{$content.post_modified_date}><br />
-		<{$content.post_modified_time}><br />
-		<{$content.post_modified_date_time}><br />
-		<{$content.post_author}><br />
-		<{$content.post_category}><br />
-		<{$content.post_tags}><br />
-		<{$content.post_views}><br />
-		<{$content.comment_link}><br />
-		<{$content.trackback_url}>
-		</li>
-	<{/foreach}>
-</ul>
+<div class="xpress_block">
+	<div class="xpress_recent_post_list_block">
+		<{$block.err_message}>
+		<ul>
+		<{foreach from=$block.contents item=content}>
+			<li>
+			<{$content.new_mark}><{$content.post_title}><br />
+			<{$content.post_date_time}><br />
+			<{$content.post_author}><br />
+			</li>
+		<{/foreach}>
+		</ul>
+	</div>
+</div>
Index: trunk/wp-content/themes/xpress_default/blocks/calender_block_theme.php
===================================================================
--- trunk/wp-content/themes/xpress_default/blocks/calender_block_theme.php	(revision 114)
+++ trunk/wp-content/themes/xpress_default/blocks/calender_block_theme.php	(revision 115)
@@ -9,5 +9,5 @@
 	$mydirpath = get_xpress_dir_path();
 
-	$block['content'] = get_xpress_calendar($sun_color,$sat_color);
+	$block['calender'] = get_xpress_calendar($sun_color,$sat_color);
 	return $block ;	
 }
@@ -69,5 +69,5 @@
 			LIMIT 1");
 
-	echo '<table id="wp-calendar" summary="' . __('Calendar') . '">
+	echo '<table  summary="' . __('Calendar') . '">
 	<caption>' . sprintf(_c('%1$s %2$s|Used as a calendar caption'), $wp_locale->get_month($thismonth), date('Y', $unixmonth)) . '</caption>
 	<thead>