diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php
index be93a15..a248950 100644
--- a/archive-comic-calendar.php
+++ b/archive-comic-calendar.php
@@ -107,8 +107,31 @@ foreach ( $years as $year ) {
 			<?php } } ?>
 		</div>
 		
-		<?php $i=1; while($i<=12) { ?>
-			<div class="cpcal-month" id="<?php echo $month[$i]['month'] ?>">
+		<?php $i=1; while($i<=12) { 
+			$calendar_directory = get_option('comicpress-calendar_directory');
+		
+			
+		?>
+			<?php if ($calendar_directory != 'none') { ?>
+					<div class="cpcal-month" style="height: 257px;" id="<?php echo $month[$i]['month'] ?>">
+				<?php if (file_exists(get_template_directory().'/images/cal/'.$calendar_directory.'/'.$archive_year)) { ?>
+			<?php if (count($monthfile = glob(get_template_directory().'/images/cal/'.$calendar_directory.'/'.$archive_year.'/'.strtolower($month[$i]['month']).'.*')) > 0) { 
+						if (is_array($monthfile)) $monthfile = reset($monthfile); ?>
+						<img class="cpcal-image" src="<?php bloginfo('stylesheet_directory'); ?>/images/cal/<?php echo $calendar_directory; ?>/<?php echo $archive_year; ?>/<?php echo basename($monthfile); ?>" alt="<?php echo $month[$i]['month'] ?>" title="<?php echo $month[$i]['month'] ?>" />
+					<?php } else { ?>
+						<img class="cpcal-image" src="<?php bloginfo('stylesheet_directory'); ?>/images/cal/default.png" alt="<?php echo $month[$i]['month'] ?>" title="<?php echo $month[$i]['month'] ?>" />
+					<?php } ?>
+				<?php } else { ?>
+					<?php if (count($monthfile = glob(get_template_directory().'/images/cal/'.$calendar_directory.'/'.strtolower($month[$i]['month']).'.*')) > 0) { 
+						if (is_array($monthfile)) $monthfile = reset($monthfile); ?>
+						<img class="cpcal-image" src="<?php bloginfo('stylesheet_directory'); ?>/images/cal/<?php echo $calendar_directory; ?>/<?php echo basename($monthfile); ?>" alt="<?php echo $month[$i]['month'] ?>" title="<?php echo $month[$i]['month'] ?>" />				
+					<?php } else { ?>
+						<img class="cpcal-image" src="<?php bloginfo('stylesheet_directory'); ?>/images/cal/default.png" alt="<?php echo $month[$i]['month'] ?>" title="<?php echo $month[$i]['month'] ?>" />
+					<?php } ?>
+				<?php } ?>
+			<?php } else { ?>
+				<div class="cpcal-month" style="height: 137px;" id="<?php echo $month[$i]['month'] ?>">
+			<?php } ?>
 				<div class="cpcal-monthtitle"><?php echo $month[$i]['month']." ".$archive_year ?></div>
 				<?php foreach(array("S", "M", "T", "W", "T", "F", "S") as $dow) { ?>
 					<div class="cpcal-dayletter"><?php echo $dow ?></div>		
diff --git a/comicpress-options-config.php b/comicpress-options-config.php
index 44dd344..bd3f6c9 100644
--- a/comicpress-options-config.php
+++ b/comicpress-options-config.php
@@ -194,6 +194,11 @@ $options = array (
 			"default" => "no",
 			"type" => "comicpress-disable_lrsidebars_frontpage"),
 			
+		array(
+			"id" => "comicpress-calendar_directory",
+			"default" => "none",
+			"type" => "comicpress-calendar_directory"),
+			
 
 		array("type" => "close")
 		);
diff --git a/comicpress-options.php b/comicpress-options.php
index 96b19e8..2f47574 100644
--- a/comicpress-options.php
+++ b/comicpress-options.php
@@ -20,7 +20,7 @@ if ($is_IE) {
 
 
 function comicpress_admin() {
-	global $options, $upload_path, $blogcat, $moods_directory;
+	global $options, $upload_path, $blogcat, $moods_directory, $calendar_directory, $graphicnav_directory;
 	
 
 	?>
@@ -305,6 +305,41 @@ function comicpress_admin() {
 				</td>
 				</tr>
 				
+			<?php break;
+			case "comicpress-calendar_directory": 
+				$current_cal_directory = get_option($value['id']);
+				if (empty($current_cal_directory)) $current_cal_directory = 'default';
+					
+				$count = count($results = glob(get_template_directory() . '/images/cal/'.$current_cal_directory.'/*'));
+				$cal_directories = glob(get_template_directory() . '/images/cal/*');
+				
+			?>
+				<tr>
+				<th scope="row"><strong>Calendar Directory</strong><br /><br />Choose a directory to get the Archive Calendar styling from.<br /></th>
+				<td valign="top">
+					<label>
+						<select name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>">
+						<option class="level-0" value="none" <?php if ($current_cal_directory == "none") { ?>selected="selected"<?php } ?>>none</option>
+				<?php
+					foreach ($cal_directories as $cal_dirs) {
+						if (is_dir($cal_dirs)) { 
+							$cal_dir_name = basename($cal_dirs); ?>
+							<option class="level-0" value="<?php echo $cal_dir_name; ?>" <?php if ($current_cal_directory == $cal_dir_name) { ?>selected="selected"<?php } ?>><?php echo $cal_dir_name; ?></option>
+					<?php }
+					}
+				?>
+						</select>
+					</label>
+				</td>
+				<td valign="top">
+					To not have calendar graphics, set this as "none".<br />
+					<br />
+					<?php echo get_template_directory() . '/images/cal/'; ?>
+					Calendar directories are found in your theme directory/images/cal/* to create your own custom archive calendar images just create a directory
+					under images/cal/ and place your image files inside of it.
+				</td>
+				</tr>
+				
 			<?php break;
 			case "comicpress-disable_extended_comments": ?>
 				<tr>
@@ -355,14 +390,14 @@ function comicpress_admin() {
 				<?php break;
 			case "comicpress-disable_comic_blog_frontpage": ?>
 				<tr>
-				<th scope="row"><strong>Disable the comic blog on the index page?</strong><br /><br />Set to &quot;Yes&quot; and the blog portion of the comic will not display on the index page/front page of your site.<br /></th>
+				<th scope="row"><strong>Disable the comic blog on the index and single pages?</strong><br /><br />Set to &quot;Yes&quot; and the blog portion of the comic will not display on the index page/front page of your site.<br /></th>
 				<td valign="top">
 				<label><input name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-yes" type="radio" value="yes"<?php if ( get_option( $value['id'] ) == "yes") { echo " checked"; } ?> />Yes</label>
 				&nbsp;&nbsp;
 				<label><input  name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-no" type="radio" value="no"<?php if ( get_option( $value['id'] ) == "no") { echo " checked"; } ?> />No</label><br />
 				</td>
 				<td valign="top">
-				*Some* people,.. not naming names ..do not like to have a comic post let alone showing on the index page.
+				*Some* people,.. not naming names ..do not like to have a comic post let alone showing on the index page.  You can use the comic blog post widget and place it anywhere around the comic.   IF there is no content in the post it will not display.
 				</td>
 				</tr>
 				
diff --git a/footer.php b/footer.php
index a8f1940..05c8a90 100644
--- a/footer.php
+++ b/footer.php
@@ -10,7 +10,7 @@
 	<?php } ?>
 	<?php get_sidebar('footer'); ?>
 		<p>
-			<?php global $wpmu_version; if (empty($wpmu_version)) { ?>&copy;<?php echo cp_copyright_year(); ?> <?php echo the_author_meta('firstname',1); echo "&nbsp;"; echo the_author_meta('lastname',1); ?>.<?php } ?><?php bloginfo('name') ?> is powered by <a href="http://wordpress.org/">WordPress</a> with <a href="http://comicpress.org/">ComicPress</a>
+			<?php global $wpmu_version; if (empty($wpmu_version)) { ?>&copy;<?php echo cp_copyright_year(); ?> <?php echo the_author_meta('firstname',1); echo "&nbsp;"; echo the_author_meta('lastname',1); ?> | <?php } ?><?php bloginfo('name') ?> is powered by <a href="http://wordpress.org/">WordPress</a> with <a href="http://comicpress.org/">ComicPress</a>
 			| Subscribe: <a href="<?php bloginfo('rss2_url') ?>">RSS Feed</a> | <a href="#outside" onclick="scrollup(); return false;">Back to Top &uarr;</a><br />
 			<!-- <?php echo get_num_queries() ?> queries. <?php timer_stop(1) ?> seconds. -->
 		</p>
diff --git a/functions.php b/functions.php
index 351fd93..fd56998 100644
--- a/functions.php
+++ b/functions.php
@@ -1,6 +1,6 @@
 <?php
 
-$comicpress_version = '2.8.0.R';
+$comicpress_version = '2.8.0.R2';
 
 // Remove the wptexturizer from changing the quotes and squotes.
 // remove_filter('the_title', 'wptexturize');
@@ -76,6 +76,7 @@ if (get_option('upload_path') !== false) {
 				'enable_rss_in_menubar'			=> 'enable_rss_in_menubar',
 				'enable_navigation_in_menubar'	=> 'enable_navigation_in_menubar',
 				'disable_lrsidebars_frontpage'	=> 'disable_lrsidebars_frontpage',
+				'comicpress-calendar_directory' => 'comicpress-calendar_directory',
 				'contact_in_menubar'			=> 'contact_in_menubar' ) as $options => $variable_name) {
 		$variables_to_extract[$variable_name] = get_option("comicpress-${options}");
 	}
@@ -85,6 +86,7 @@ if (get_option('upload_path') !== false) {
 
 if (empty($graphicnav_directory)) $graphicnav_directory = 'default';
 if (empty($moods_directory)) $moods_directory = 'default';
+if (empty($calendar_directory)) $calendar_directory = 'none';
 
 function is_cp_theme_style($choices) {
 global $cp_theme_style;
diff --git a/functions/moods.php b/functions/moods.php
index 3411240..a7aa620 100644
--- a/functions/moods.php
+++ b/functions/moods.php
@@ -22,7 +22,7 @@ function comicpress_show_mood_in_post() {
 	$mood = explode(".", $mood);
 	$mood = reset($mood);
 	if ( !empty($mood_file) && file_exists(get_template_directory() . '/images/moods/'.$moods_directory.'/'.$mood_file) ) { ?>
-		<div class="post-mood post-<?php echo $mood; ?>"><img src="<?php bloginfo('stylesheet_directory'); ?>/images/moods/default/<?php echo $mood_file; ?>" alt="<?php echo $mood; ?>" title="<?php echo $mood; ?>" /></div>
+		<div class="post-mood post-<?php echo $mood; ?>"><img src="<?php bloginfo('stylesheet_directory'); ?>/images/moods/<?php echo $moods_directory; ?>/<?php echo $mood_file; ?>" alt="<?php echo $mood; ?>" title="<?php echo $mood; ?>" /></div>
 	<?php }
 }
 
diff --git a/images/bgs/background.png b/images/bgs/background.png
index bf3a76d..3c9344c 100644
Binary files a/images/bgs/background.png and b/images/bgs/background.png differ
diff --git a/images/cal/default.png b/images/cal/default.png
new file mode 100644
index 0000000..ecfeec9
Binary files /dev/null and b/images/cal/default.png differ
diff --git a/images/cal/default/april.jpg b/images/cal/default/april.jpg
new file mode 100644
index 0000000..0ccc2fb
Binary files /dev/null and b/images/cal/default/april.jpg differ
diff --git a/images/cal/default/august.jpg b/images/cal/default/august.jpg
new file mode 100644
index 0000000..d1ef427
Binary files /dev/null and b/images/cal/default/august.jpg differ
diff --git a/images/cal/default/december.jpg b/images/cal/default/december.jpg
new file mode 100644
index 0000000..ffc8238
Binary files /dev/null and b/images/cal/default/december.jpg differ
diff --git a/images/cal/default/february.jpg b/images/cal/default/february.jpg
new file mode 100644
index 0000000..1a1c7b0
Binary files /dev/null and b/images/cal/default/february.jpg differ
diff --git a/images/cal/default/january.jpg b/images/cal/default/january.jpg
new file mode 100644
index 0000000..f5ac4b5
Binary files /dev/null and b/images/cal/default/january.jpg differ
diff --git a/images/cal/default/july.jpg b/images/cal/default/july.jpg
new file mode 100644
index 0000000..2de5446
Binary files /dev/null and b/images/cal/default/july.jpg differ
diff --git a/images/cal/default/june.jpg b/images/cal/default/june.jpg
new file mode 100644
index 0000000..348120b
Binary files /dev/null and b/images/cal/default/june.jpg differ
diff --git a/images/cal/default/march.jpg b/images/cal/default/march.jpg
new file mode 100644
index 0000000..b259e08
Binary files /dev/null and b/images/cal/default/march.jpg differ
diff --git a/images/cal/default/may.jpg b/images/cal/default/may.jpg
new file mode 100644
index 0000000..2552e60
Binary files /dev/null and b/images/cal/default/may.jpg differ
diff --git a/images/cal/default/november.jpg b/images/cal/default/november.jpg
new file mode 100644
index 0000000..21f0f60
Binary files /dev/null and b/images/cal/default/november.jpg differ
diff --git a/images/cal/default/october.jpg b/images/cal/default/october.jpg
new file mode 100644
index 0000000..0e70b2d
Binary files /dev/null and b/images/cal/default/october.jpg differ
diff --git a/images/cal/default/september.jpg b/images/cal/default/september.jpg
new file mode 100644
index 0000000..4a79f79
Binary files /dev/null and b/images/cal/default/september.jpg differ
diff --git a/single.php b/single.php
index dc5671c..0e53138 100644
--- a/single.php
+++ b/single.php
@@ -45,7 +45,10 @@
 	<?php get_sidebar('blog'); ?>	
 	<?php if (have_posts()) : while (have_posts()) : the_post();
 		if (in_comic_category()) {
-			display_comic_post();
+			global $disable_comic_blog_frontpage;
+			if ($disable_comic_blog_frontpage != 'yes') {
+				display_comic_post();
+			}
 		} else { 
 			display_blog_post();			
 		} 
diff --git a/style.css b/style.css
index 9faa2dc..5749264 100644
--- a/style.css
+++ b/style.css
@@ -211,6 +211,7 @@ h3, h3 a {
 	border-width: 1px 1px 1px 0;
 	border-style: solid;
 	border-color: #999;
+	list-style: none;
 }
 
 #menunav {
@@ -1331,9 +1332,13 @@ li.storyline-root {
 
 /* Archive Calendar Template */
 
+.cpcal-image {
+	height: 120px;
+	width: 152px;
+}
+
 .cpcal-month {
 	width: 157px;
-	height: 138px;
 	padding: 5px 0 5px 5px;
 	margin: 0 8px 8px 0;
 	float: left;
diff --git a/widgets/bookmark.php b/widgets/bookmark.php
index fca05d6..87cc6b9 100644
--- a/widgets/bookmark.php
+++ b/widgets/bookmark.php
@@ -121,13 +121,11 @@ class widget_comicpress_bookmark extends WP_Widget {
 	function widget($args, $instance) {
 		global $post, $wp_query;
 		extract($args, EXTR_SKIP);
-		if (!is_home() && !is_page() && !is_single()) {	
-			echo $before_widget;
-			$title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']);
-			if ( !empty( $title ) ) { echo $before_title . $title . $after_title; };
-			comicpress_comic_bookmark();
-			echo $after_widget;
-		}
+		echo $before_widget;
+		$title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']);
+		if ( !empty( $title ) ) { echo $before_title . $title . $after_title; };
+		comicpress_comic_bookmark();
+		echo $after_widget;
 	}
 	
 	function update($new_instance, $old_instance) {
diff --git a/widgets/comicblogpost.php b/widgets/comicblogpost.php
index ef65d4f..43edbce 100644
--- a/widgets/comicblogpost.php
+++ b/widgets/comicblogpost.php
@@ -17,14 +17,19 @@ class widget_comicpress_comic_blog_post extends WP_Widget {
 	}
 	
 	function widget($args, $instance) {
-		global $post;
+		global $post, $wp_query;
 		extract($args, EXTR_SKIP); 
-		
-		echo $before_widget;
-		$title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']);
-		if ( !empty( $title ) ) { echo $title; } 
-		display_comic_post();
-		echo $after_widget;
+		if (have_posts()) : while (have_posts()) : the_post();
+			if (!empty($post->post_content)) {
+				echo $before_widget;
+				$title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']);
+				if ( !empty( $title ) ) { echo $title; } 
+				
+				display_comic_post();
+				echo $after_widget;
+			}
+		endwhile;
+		endif;
 	}
 	
 	function update($new_instance, $old_instance) {