diff --git a/comicpress-options-config.php b/comicpress-options-config.php
index e728b7c..1279b27 100644
--- a/comicpress-options-config.php
+++ b/comicpress-options-config.php
@@ -154,6 +154,16 @@ $options = array (
 			"default" => "no",
 			"type" => "comicpress-enable_comic_post_author_gravatar"),
 		
+		array(
+			"id" => "comicpress-disable_tags_in_posts",
+			"default" => "no",
+			"type" => "comicpress-disable_tags_in_posts"),
+			
+		array(
+			"id" => "comicpress-disable_categories_in_posts",
+			"default" => "no",
+			"type" => "comicpress-disable_categories_in_posts"),
+
 
 		array("type" => "close")
 		);
diff --git a/comicpress-options.php b/comicpress-options.php
index 3bb7efb..25ccd5b 100644
--- a/comicpress-options.php
+++ b/comicpress-options.php
@@ -351,6 +351,30 @@ function comicpress_admin() {
 				
 				<?php break;
 				
+			case "comicpress-disable_categories_in_posts": ?>
+				<tr>
+				<th scope="row"><strong>Disable showing categories in posts?</strong><br /><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>
+				</td>
+				</tr>
+				
+				<?php break;
+				
+			case "comicpress-disable_tags_in_posts": ?>
+				<tr>
+				<th scope="row"><strong>Disable showing tags in posts?</strong><br /><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>
+				</td>
+				</tr>
+				
+				<?php break;
+				
 				
 			case "comicpress-disable_css_style_editor": ?>
 				<tr>
diff --git a/functions.php b/functions.php
index d6ab8af..1fe52d2 100644
--- a/functions.php
+++ b/functions.php
@@ -67,6 +67,8 @@ if (get_option('upload_path') !== false) {
 				'enable_post_author_gravatar'	=> 'enable_post_author_gravatar',
 				'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',
 				'contact_in_menubar'			=> 'contact_in_menubar' ) as $options => $variable_name) {
 		$variables_to_extract[$variable_name] = get_option("comicpress-${options}");
 	}
diff --git a/functions/displayblogpost.php b/functions/displayblogpost.php
index 01a45fb..fa8c239 100644
--- a/functions/displayblogpost.php
+++ b/functions/displayblogpost.php
@@ -28,8 +28,10 @@ function display_blog_post() {
 					<?php } ?>
 					<div class="post-text">
 						<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
-						<small> - By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?></small><br />
-						<small> - Subject: <?php the_category(','); ?> <?php edit_post_link('Edit Post', ' [ ', ' ] '); ?> </small><br />
+						<small> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?> <?php edit_post_link('Edit Post', ' [ ', ' ] '); ?></small><br />
+						<?php if ($disable_categories_in_posts != 'yes') { ?>
+							<small> Posted In: <?php the_category(','); ?></small><br />
+						<?php } ?>
 						<?php if(function_exists('the_ratings')) { the_ratings(); } ?>
 					</div>
 					<div class="clear"></div>
@@ -39,9 +41,11 @@ function display_blog_post() {
 					<?php the_content('&darr; Read the rest of this entry...') ?>
 				</div>
 				<div class="post-extras">
-					<div class="tags">
+					<?php if ($disable_tags_in_posts != 'yes') { ?>
+						<div class="tags">
 						<?php the_tags('&#9492; Tags: ', ', ', '<br />'); ?>
-					</div>
+						</div>
+					<?php } ?>
 					<div class="comment-link">
 						<?php if ('open' == $post->comment_status) { comments_popup_link('&ldquo;Comment!&rdquo;', '&ldquo;1 Comment&rdquo;', '&ldquo;% Comments&rdquo;'); } ?>
 					</div>
diff --git a/functions/displaycomicpost.php b/functions/displaycomicpost.php
index aa9989b..40499ff 100644
--- a/functions/displaycomicpost.php
+++ b/functions/displaycomicpost.php
@@ -7,7 +7,7 @@
  */
 
 function display_comic_post() { 
-	global $post, $wp_query, $transcript_in_posts, $enable_related_comics, $enable_comic_post_author_gravatar, $enable_comic_post_calendar; 
+	global $post, $wp_query, $transcript_in_posts, $enable_related_comics, $enable_comic_post_author_gravatar, $enable_comic_post_calendar, $disable_categories_in_posts, $disable_tags_in_posts; 
 	$first_comic = get_first_comic_permalink(); $last_comic = get_last_comic_permalink();
 	?>
 	<div class="nav">
@@ -30,7 +30,7 @@ function display_comic_post() {
 			<?php } ?>
 			<div class="post-text">
 				<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
-				<small> - By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?></small><br />
+				<small> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?> <?php edit_post_link('Edit Post', ' [ ', ' ] '); ?></small><br />
 				<?php if(function_exists('the_ratings')) { the_ratings(); } ?>
 			</div>
 			<div class="clear"></div>
@@ -41,8 +41,13 @@ function display_comic_post() {
 		</div>
 		<?php if ($transcript_in_posts == 'yes') the_transcript('styled'); ?>
 		<div class="post-extras">
+			<?php if ($disable_tags_in_posts != 'yes') { ?>
+				<div class="tags">
+				<?php the_tags('&#9492; Tags: ', ', ', '<br />'); ?>
+				</div>
+			<?php } ?>
 			<div class="tags">
-				<?php the_tags('&#9492; Tags: ', ', ', '<br />'); ?> <?php edit_post_link('Edit Post', ' [ ', ' ] '); ?> 
+				<?php if ($disable_tags_in_posts != 'yes') the_tags('&#9492; Tags: ', ', ', '<br />'); ?> 
 			</div>
 			<div class="comment-link">
 			<?php if ('open' == $post->comment_status) { comments_popup_link('&ldquo;Comment!&rdquo;', '&ldquo;1 Comment&rdquo;', '&ldquo;% Comments&rdquo;'); } ?>