diff --git a/archive.php b/archive.php
index 22ae223b..13ab4c5e 100644
--- a/archive.php
+++ b/archive.php
@@ -2,9 +2,6 @@
 /**
  * The template for displaying Archive pages.
  *
- * Used to display archive-type pages if nothing more specific matches a query.
- * For example, puts together date-based pages if no date.php file exists.
- *
  * Learn more: http://codex.wordpress.org/Template_Hierarchy
  *
  * @package _s
@@ -21,17 +18,44 @@ get_header(); ?>
 				<header class="page-header">
 					<h1 class="page-title">
 						<?php
-							if ( is_day() ) :
+							if ( is_category() ) {
+								printf( __( 'Category Archives: %s', '_s' ), '<span>' . single_cat_title( '', false ) . '</span>' );
+
+							} elseif ( is_tag() ) {
+								printf( __( 'Tag Archives: %s', '_s' ), '<span>' . single_tag_title( '', false ) . '</span>' );
+
+							} elseif ( is_author() ) {
+								printf( __( 'Author Archives: %s', '_s' ), '<span class="vcard"><a class="url fn n" href="' . get_author_posts_url( get_the_author_meta( "ID" ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' );
+
+							} elseif ( is_day() ) {
 								printf( __( 'Daily Archives: %s', '_s' ), '<span>' . get_the_date() . '</span>' );
-							elseif ( is_month() ) :
+
+							} elseif ( is_month() ) {
 								printf( __( 'Monthly Archives: %s', '_s' ), '<span>' . get_the_date( 'F Y' ) . '</span>' );
-							elseif ( is_year() ) :
+
+							} elseif ( is_year() ) {
 								printf( __( 'Yearly Archives: %s', '_s' ), '<span>' . get_the_date( 'Y' ) . '</span>' );
-							else :
+
+							} else {
 								_e( 'Archives', '_s' );
-							endif;
+
+							}
 						?>
 					</h1>
+					<?php
+						if ( is_category() ) {
+							// show an optional category description
+							$category_description = category_description();
+							if ( ! empty( $category_description ) )
+								echo apply_filters( 'category_archive_meta', '<div class="taxonomy-description">' . $category_description . '</div>' );
+
+						} elseif ( is_tag() ) {
+							// show an optional tag description
+							$tag_description = tag_description();
+							if ( ! empty( $tag_description ) )
+								echo apply_filters( 'tag_archive_meta', '<div class="taxonomy-description">' . $tag_description . '</div>' );
+						}
+					?>
 				</header>
 
 				<?php rewind_posts(); ?>
diff --git a/category.php b/category.php
deleted file mode 100644
index 93e7c204..00000000
--- a/category.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * The template for displaying Category Archive pages.
- *
- * @package _s
- * @since _s 1.0
- */
-
-get_header(); ?>
-
-		<section id="primary">
-			<div id="content" role="main">
-
-			<?php if ( have_posts() ) : ?>
-
-				<header class="page-header">
-					<h1 class="page-title"><?php
-						printf( __( 'Category Archives: %s', '_s' ), '<span>' . single_cat_title( '', false ) . '</span>' );
-					?></h1>
-
-					<?php
-						$category_description = category_description();
-						if ( ! empty( $category_description ) )
-							echo apply_filters( 'category_archive_meta', '<div class="category-archive-meta">' . $category_description . '</div>' );
-					?>
-				</header>
-
-				<?php _s_content_nav( 'nav-above' ); ?>
-
-				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
-
-					<?php
-						/* Include the Post-Format-specific template for the content.
-						 * If you want to overload this in a child theme then include a file
-						 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
-						 */
-						get_template_part( 'content', get_post_format() );
-					?>
-
-				<?php endwhile; ?>
-
-				<?php _s_content_nav( 'nav-below' ); ?>
-
-			<?php else : ?>
-
-				<article id="post-0" class="post no-results not-found">
-					<header class="entry-header">
-						<h1 class="entry-title"><?php _e( 'Nothing Found', '_s' ); ?></h1>
-					</header><!-- .entry-header -->
-
-					<div class="entry-content">
-						<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', '_s' ); ?></p>
-						<?php get_search_form(); ?>
-					</div><!-- .entry-content -->
-				</article><!-- #post-0 -->
-
-			<?php endif; ?>
-
-			</div><!-- #content -->
-		</section><!-- #primary -->
-
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
diff --git a/tag.php b/tag.php
deleted file mode 100644
index ec431fb7..00000000
--- a/tag.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * The template used to display Tag Archive pages
- *
- * @package _s
- * @since _s 1.0
- */
-
-get_header(); ?>
-
-		<section id="primary">
-			<div id="content" role="main">
-
-			<?php if ( have_posts() ) : ?>
-
-				<header class="page-header">
-					<h1 class="page-title"><?php
-						printf( __( 'Tag Archives: %s', '_s' ), '<span>' . single_tag_title( '', false ) . '</span>' );
-					?></h1>
-
-					<?php
-						$tag_description = tag_description();
-						if ( ! empty( $tag_description ) )
-							echo apply_filters( 'tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' );
-					?>
-				</header>
-
-				<?php rewind_posts(); ?>
-
-				<?php _s_content_nav( 'nav-above' ); ?>
-
-				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
-
-					<?php
-						/* Include the Post-Format-specific template for the content.
-						 * If you want to overload this in a child theme then include a file
-						 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
-						 */
-						get_template_part( 'content', get_post_format() );
-					?>
-
-				<?php endwhile; ?>
-
-				<?php _s_content_nav( 'nav-below' ); ?>
-
-			<?php else : ?>
-
-				<article id="post-0" class="post no-results not-found">
-					<header class="entry-header">
-						<h1 class="entry-title"><?php _e( 'Nothing Found', '_s' ); ?></h1>
-					</header><!-- .entry-header -->
-
-					<div class="entry-content">
-						<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', '_s' ); ?></p>
-						<?php get_search_form(); ?>
-					</div><!-- .entry-content -->
-				</article><!-- #post-0 -->
-
-			<?php endif; ?>
-
-			</div><!-- #content -->
-		</section><!-- #primary -->
-
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file