diff --git a/comicpress-options-config.php b/comicpress-options-config.php
index 1279b27..90cbb26 100644
--- a/comicpress-options-config.php
+++ b/comicpress-options-config.php
@@ -163,6 +163,11 @@ $options = array (
 			"id" => "comicpress-disable_categories_in_posts",
 			"default" => "no",
 			"type" => "comicpress-disable_categories_in_posts"),
+			
+		array(
+			"id" => "comicpress-moods_directory",
+			"default" => "default",
+			"type" => "comicpress-moods_directory"),
 
 
 		array("type" => "close")
diff --git a/comicpress-options.php b/comicpress-options.php
index 25ccd5b..fc84594 100644
--- a/comicpress-options.php
+++ b/comicpress-options.php
@@ -7,7 +7,7 @@ function comicpress_options() {
 }
 
 function comicpress_admin() {
-	global $options, $upload_path, $blogcat;
+	global $options, $upload_path, $blogcat, $moods_directory;
 	
 
 	?>
@@ -388,13 +388,49 @@ function comicpress_admin() {
 				
 				<?php break;
 				
+			case "comicpress-moods_directory": 
+				$current_directory = get_option($value['id']);
+				if (empty($current_directory)) $current_directory = 'default';
+					
+				$count = count($results = glob(get_template_directory() . '/images/moods/'.$current_directory.'/*'));
+				$mood_directories = glob(get_template_directory() . '/images/moods/*');
+			?>
+				<tr>
+				<th scope="row"><strong>Moods Directory</strong><br /><br />Choose a directory to get the post moods from.<br /></th>
+				<td valign="top">
+						<label>
+								<select name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>">
+				<?php
+					foreach ($mood_directories as $mood_dirs) {
+						if (is_dir($mood_dirs)) { 
+							$mood_dir_name = basename($mood_dirs); ?>
+							<option class="level-0" value="<?php echo $mood_dir_name; ?>" <?php if ($current_directory == $mood_dir_name) { ?>selected="selected"<?php } ?>><?php echo $mood_dir_name; ?></option>
+					<?php }
+					}
+				?>
+							</select>
+						</label>
+				</td>
+				<td valign="top">
+					Found: <?php echo $count; ?> moods in the "<?php echo $current_directory; ?>" directory.<br />
+					<br />
+					Mood directories are found in your theme directory/images/moods/* to create your own custom moods just create a directory
+					under images/moods/ and place ONLY image files inside of it.  The name of the image file represents what the mood is.
+				</td>
+				</tr>
+				
+				<?php break;
+				
 		}
 	}
 	?>
 	</table>
-
 	</div>
 	</div>
+		<input name="comicpress_save" type="submit" class="button-primary" value="Save Settings" />
+		<input type="hidden" name="action" value="comicpress_save" />	
+		<br />
+		<br />
 
 		<div class="stuffbox">
 		<h3><label for="link_url">Settings - Custom Header</label></h3>
diff --git a/functions.php b/functions.php
index fbefa8b..8455a35 100644
--- a/functions.php
+++ b/functions.php
@@ -64,10 +64,11 @@ if (get_option('upload_path') !== false) {
 				'disable_css_style_editor'		=> 'disable_css_style_editor',
 				'enable_post_calendar'			=> 'enable_post_calendar',
 				'enable_post_author_gravatar'	=> 'enable_post_author_gravatar',
-				'enable_comic_post_calendar'		=> 'enable_comic_post_calendar',
+				'enable_comic_post_calendar'	=> 'enable_comic_post_calendar',
 				'enable_comic_post_author_gravatar'	=> 'enable_comic_post_author_gravatar',
 				'disable_tags_in_posts'			=> 'disable_tags_in_posts',
 				'disable_categories_in_posts'	=> 'disable_categories_in_posts',
+				'moods_directory'				=> 'moods_directory',
 				'contact_in_menubar'			=> 'contact_in_menubar' ) as $options => $variable_name) {
 		$variables_to_extract[$variable_name] = get_option("comicpress-${options}");
 	}
@@ -125,6 +126,7 @@ require_once(get_template_directory() . '/functions/relatedposts.php');
 require_once(get_template_directory() . '/functions/relatedcomics.php');
 require_once(get_template_directory() . '/functions/membersonly.php');
 require_once(get_template_directory() . '/functions/syndication.php');
+require_once(get_template_directory() . '/functions/moods.php');
 
 
 if ($enable_dropdown_sidebar == 'yes') {
diff --git a/functions/displayblogpost.php b/functions/displayblogpost.php
index d89b991..13f65d8 100644
--- a/functions/displayblogpost.php
+++ b/functions/displayblogpost.php
@@ -21,6 +21,7 @@ function display_blog_post() {
 					<?php if ($enable_post_author_gravatar == 'yes') { ?>
 						<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),get_avatar(get_the_author_meta('email'), 64)); ?></div>
 					<?php } ?>
+					<?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?>
 					<?php if ($enable_post_calendar == 'yes') { ?>
 						<div class="post-date">
 							<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
diff --git a/functions/displaycomicpost.php b/functions/displaycomicpost.php
index 0c3edc8..1405361 100644
--- a/functions/displaycomicpost.php
+++ b/functions/displaycomicpost.php
@@ -23,6 +23,7 @@ function display_comic_post() {
 			<?php if ($enable_comic_post_author_gravatar == 'yes') { ?>
 				<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),get_avatar(get_the_author_meta('email'), 64)); ?></div>
 			<?php } ?>
+			<?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?>
 			<?php if ($enable_comic_post_calendar == 'yes') { ?>
 				<div class="post-date">
 					<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
diff --git a/functions/moods.php b/functions/moods.php
new file mode 100644
index 0000000..401dff1
--- /dev/null
+++ b/functions/moods.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Theme Function: Moods
+ * Author: Philip M. Hofer (Frumph)
+ * Created: 08/22/2009
+ * Lets you set and make moods for your blog posts.
+ * 
+ * Usage:  if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post();
+ * 
+ * Edit a post and it you will see the possible moods you can use, select one.
+ * 
+ */
+
+function comicpress_show_mood_in_post() {
+	global $post;
+	$moods_directory = get_option('comicpress-moods_directory');
+	$mood_file = get_post_meta( get_the_ID(), "mood", true );
+	$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>
+	<?php }
+}
+
+function comicpress_showmood_edit_post() { 
+	global $post;
+	$moods_directory = get_option('comicpress-moods_directory');
+?>
+	<div id="mooddiv" class="postbox">
+		<h3><?php _e("Available Moods", 'comicpress') ?></h3>
+		<div class="inside" style="overflow: hidden">
+		Available Moods here, you can set which mood images to use in the ComicPress Options.<br />
+		<br />
+		<?php 
+		
+		$currentmood = get_post_meta( $post->ID, "mood", true );
+
+		if (empty($currentmood)) { 
+			$mood = 'none';
+		} else {
+			$mood = explode(".", $currentmood);
+			$mood = reset($mood);
+		}
+		
+		$filtered_glob_results = array();
+		$count = count($results = glob(get_template_directory() . '/images/moods/'.$moods_directory.'/*'));
+		echo $count .' moods are available.<br />
+		Using Moods from directory: '.$moods_directory.'<br />
+		Current Mood: '.$mood.'<br /><br />';
+		if (!empty($results)) { ?>
+			<div style="float:left; margin-top: 10px; text-align: center; width: 68px; padding-top: 64px;">
+			None.<br />
+			<label><input  name="postmood" id="postmood-none" type="radio" value="none"<?php if ( $mood == "none" ) { echo " checked"; } ?> /></label>
+			</div>
+			<?php foreach ($results as $file) {
+				$newmood_file = basename($file);
+				$newmood = explode(".", $newmood_file); 
+				$newmood = $newmood[0]; ?>
+				<div style="float:left; margin-top: 10px; text-align: center; width: 68px; overflow: hidden;">
+					<img src="<?php bloginfo('stylesheet_directory'); ?>/images/moods/<?php echo $moods_directory; ?>/<?php echo basename($file); ?>"><br />
+					<?php echo $newmood; ?><br />
+					<label><input  name="postmood" style="margin-top: 3px;" id="postmood-<?php echo $newmood; ?>" type="radio" value="<?php echo $newmood_file; ?>"<?php if ( $mood == $newmood ) { echo " checked"; } ?> /></label>
+				</div>
+			<?php }
+		} ?>
+		</div>
+	</div>
+<?php }
+
+function comicpress_handle_edit_post_mood_save($post_id) {
+	if (empty($_POST['postmood']) || $_POST['postmood'] == 'none') {
+		$postmood = 'none';
+	} else {
+		$postmood = $_POST['postmood'];
+	}
+	update_post_meta($post_id, 'mood', $postmood);
+}
+
+add_action('edit_form_advanced', 'comicpress_showmood_edit_post', 5, 1);
+add_action('save_post', 'comicpress_handle_edit_post_mood_save' ,5, 1);
+?>
\ No newline at end of file
diff --git a/images/moods/default/anger.png b/images/moods/default/anger.png
new file mode 100644
index 0000000..065b32f
Binary files /dev/null and b/images/moods/default/anger.png differ
diff --git a/images/moods/default/angry.png b/images/moods/default/angry.png
new file mode 100644
index 0000000..c963c02
Binary files /dev/null and b/images/moods/default/angry.png differ
diff --git a/images/moods/default/awe.png b/images/moods/default/awe.png
new file mode 100644
index 0000000..569073b
Binary files /dev/null and b/images/moods/default/awe.png differ
diff --git a/images/moods/default/burn.png b/images/moods/default/burn.png
new file mode 100644
index 0000000..f12f18f
Binary files /dev/null and b/images/moods/default/burn.png differ
diff --git a/images/moods/default/confused.png b/images/moods/default/confused.png
new file mode 100644
index 0000000..7ebaa15
Binary files /dev/null and b/images/moods/default/confused.png differ
diff --git a/images/moods/default/cool.png b/images/moods/default/cool.png
new file mode 100644
index 0000000..b24612b
Binary files /dev/null and b/images/moods/default/cool.png differ
diff --git a/images/moods/default/coolglare.png b/images/moods/default/coolglare.png
new file mode 100644
index 0000000..423e741
Binary files /dev/null and b/images/moods/default/coolglare.png differ
diff --git a/images/moods/default/crazy.png b/images/moods/default/crazy.png
new file mode 100644
index 0000000..3d70b7e
Binary files /dev/null and b/images/moods/default/crazy.png differ
diff --git a/images/moods/default/cry.png b/images/moods/default/cry.png
new file mode 100644
index 0000000..5d16313
Binary files /dev/null and b/images/moods/default/cry.png differ
diff --git a/images/moods/default/crying.png b/images/moods/default/crying.png
new file mode 100644
index 0000000..41365cb
Binary files /dev/null and b/images/moods/default/crying.png differ
diff --git a/images/moods/default/dizzy.png b/images/moods/default/dizzy.png
new file mode 100644
index 0000000..8591522
Binary files /dev/null and b/images/moods/default/dizzy.png differ
diff --git a/images/moods/default/embarrass.png b/images/moods/default/embarrass.png
new file mode 100644
index 0000000..a8b1b7d
Binary files /dev/null and b/images/moods/default/embarrass.png differ
diff --git a/images/moods/default/fire.png b/images/moods/default/fire.png
new file mode 100644
index 0000000..7a22f3e
Binary files /dev/null and b/images/moods/default/fire.png differ
diff --git a/images/moods/default/grimace.png b/images/moods/default/grimace.png
new file mode 100644
index 0000000..1d2c1ca
Binary files /dev/null and b/images/moods/default/grimace.png differ
diff --git a/images/moods/default/happy.png b/images/moods/default/happy.png
new file mode 100644
index 0000000..e7978dd
Binary files /dev/null and b/images/moods/default/happy.png differ
diff --git a/images/moods/default/huh.png b/images/moods/default/huh.png
new file mode 100644
index 0000000..6a589b8
Binary files /dev/null and b/images/moods/default/huh.png differ
diff --git a/images/moods/default/love.png b/images/moods/default/love.png
new file mode 100644
index 0000000..699dbca
Binary files /dev/null and b/images/moods/default/love.png differ
diff --git a/images/moods/default/lust.png b/images/moods/default/lust.png
new file mode 100644
index 0000000..bcaca01
Binary files /dev/null and b/images/moods/default/lust.png differ
diff --git a/images/moods/default/miao.png b/images/moods/default/miao.png
new file mode 100644
index 0000000..27774b5
Binary files /dev/null and b/images/moods/default/miao.png differ
diff --git a/images/moods/default/morequestions.png b/images/moods/default/morequestions.png
new file mode 100644
index 0000000..0890a82
Binary files /dev/null and b/images/moods/default/morequestions.png differ
diff --git a/images/moods/default/music.png b/images/moods/default/music.png
new file mode 100644
index 0000000..2c3d84e
Binary files /dev/null and b/images/moods/default/music.png differ
diff --git a/images/moods/default/ninja.png b/images/moods/default/ninja.png
new file mode 100644
index 0000000..f5a0cfa
Binary files /dev/null and b/images/moods/default/ninja.png differ
diff --git a/images/moods/default/normal.png b/images/moods/default/normal.png
new file mode 100644
index 0000000..da3b37f
Binary files /dev/null and b/images/moods/default/normal.png differ
diff --git a/images/moods/default/ooo.png b/images/moods/default/ooo.png
new file mode 100644
index 0000000..e206219
Binary files /dev/null and b/images/moods/default/ooo.png differ
diff --git a/images/moods/default/prettiness.png b/images/moods/default/prettiness.png
new file mode 100644
index 0000000..13d87f3
Binary files /dev/null and b/images/moods/default/prettiness.png differ
diff --git a/images/moods/default/pwnburn.png b/images/moods/default/pwnburn.png
new file mode 100644
index 0000000..a15a2b2
Binary files /dev/null and b/images/moods/default/pwnburn.png differ
diff --git a/images/moods/default/question.png b/images/moods/default/question.png
new file mode 100644
index 0000000..00900cd
Binary files /dev/null and b/images/moods/default/question.png differ
diff --git a/images/moods/default/shout.png b/images/moods/default/shout.png
new file mode 100644
index 0000000..396818f
Binary files /dev/null and b/images/moods/default/shout.png differ
diff --git a/images/moods/default/shy.png b/images/moods/default/shy.png
new file mode 100644
index 0000000..a9544c2
Binary files /dev/null and b/images/moods/default/shy.png differ
diff --git a/images/moods/default/silent.png b/images/moods/default/silent.png
new file mode 100644
index 0000000..ef2f105
Binary files /dev/null and b/images/moods/default/silent.png differ
diff --git a/images/moods/default/sleep.png b/images/moods/default/sleep.png
new file mode 100644
index 0000000..49f1268
Binary files /dev/null and b/images/moods/default/sleep.png differ
diff --git a/images/moods/default/slobber.png b/images/moods/default/slobber.png
new file mode 100644
index 0000000..f751e20
Binary files /dev/null and b/images/moods/default/slobber.png differ
diff --git a/images/moods/default/smile.png b/images/moods/default/smile.png
new file mode 100644
index 0000000..b64f1df
Binary files /dev/null and b/images/moods/default/smile.png differ
diff --git a/images/moods/default/spook.png b/images/moods/default/spook.png
new file mode 100644
index 0000000..78ecc2e
Binary files /dev/null and b/images/moods/default/spook.png differ
diff --git a/images/moods/default/startle.png b/images/moods/default/startle.png
new file mode 100644
index 0000000..3274c32
Binary files /dev/null and b/images/moods/default/startle.png differ
diff --git a/images/moods/default/surprise.png b/images/moods/default/surprise.png
new file mode 100644
index 0000000..5842d66
Binary files /dev/null and b/images/moods/default/surprise.png differ
diff --git a/images/moods/default/sweat.png b/images/moods/default/sweat.png
new file mode 100644
index 0000000..0b268ab
Binary files /dev/null and b/images/moods/default/sweat.png differ
diff --git a/images/moods/default/tears.png b/images/moods/default/tears.png
new file mode 100644
index 0000000..62bdd91
Binary files /dev/null and b/images/moods/default/tears.png differ
diff --git a/images/moods/default/thirst.png b/images/moods/default/thirst.png
new file mode 100644
index 0000000..63d8c53
Binary files /dev/null and b/images/moods/default/thirst.png differ
diff --git a/images/moods/default/vomit.png b/images/moods/default/vomit.png
new file mode 100644
index 0000000..0c1c4f0
Binary files /dev/null and b/images/moods/default/vomit.png differ
diff --git a/style.css b/style.css
index 425ddeb..ae33ce1 100644
--- a/style.css
+++ b/style.css
@@ -516,6 +516,13 @@ h3, h3 a {
 		height: 63px;
 	}
 	
+	.post-mood {
+		float: left;
+		margin: 2px;
+		width: 63px;
+		height: 63px;
+	}
+	
 	.post-date {
 		color: #777;
 		font-family: 'Georgia' , serif;
diff --git a/widgets/menubar.php b/widgets/menubar.php
index 9e3d9d9..4f7312c 100644
--- a/widgets/menubar.php
+++ b/widgets/menubar.php
@@ -65,7 +65,7 @@ function comicpress_menubar() {
 	<?php if ($contact_in_menubar == 'yes') { ?>
 		<li class="page_item page-item-contact"><a href="mailto:<?php bloginfo('admin_email'); ?>">Contact</a></li>
 	<?php } ?>
-		<li><a href="<?php bloginfo('rss2_url'); ?>"><img src="<?php bloginfo('stylesheet_directory'); ?>/images/data_rss.gif" class="rss" alt="RSS" /></a></li>		    
+		<li class="page_item page-item-rss"><a href="<?php bloginfo('rss2_url'); ?>"><img src="<?php bloginfo('stylesheet_directory'); ?>/images/data_rss.gif" class="rss" alt="RSS" /></a></li>		    
 	</ul>
 	<div class="clear"></div>
 </div>