diff --git a/wp-content/themes/twentytwelve/archive.php b/wp-content/themes/twentytwelve/archive.php
index a5548672a..bbe9b6731 100644
--- a/wp-content/themes/twentytwelve/archive.php
+++ b/wp-content/themes/twentytwelve/archive.php
@@ -18,36 +18,31 @@ get_header(); ?>
 		<div id="content" role="main">
 
 		<?php if ( have_posts() ) : ?>
-
-			<header class="page-header">
-				<h1 class="page-title"><?php
-					if ( is_day() ) {
-						printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' );
-					} elseif ( is_month() ) {
-						printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '</span>' );
-					} elseif ( is_year() ) {
-						printf( __( 'Yearly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentytwelve' ) ) . '</span>' );
-					} elseif ( is_tag() ) {
-						printf( __( 'Tag Archives: %s', 'twentytwelve' ), '<span>' . single_tag_title( '', false ) . '</span>' );
-						// Show an optional tag description
-						$tag_description = tag_description();
-						if ( $tag_description )
-							echo apply_filters( 'tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' );
-					} elseif ( is_category() ) {
-						printf( __( 'Category Archives: %s', 'twentytwelve' ), '<span>' . single_cat_title( '', false ) . '</span>' );
-						// Show an optional category description
-						$category_description = category_description();
-						if ( $category_description )
-							echo apply_filters( 'category_archive_meta', '<div class="category-archive-meta">' . $category_description . '</div>' );
-					} else {
-						_e( 'Blog Archives', 'twentytwelve' );
-					}
-				?></h1>
-			</header>
+			<h1 class="archive-title all-caps-title"><?php
+				if ( is_day() ) {
+					printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' );
+				} elseif ( is_month() ) {
+					printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '</span>' );
+				} elseif ( is_year() ) {
+					printf( __( 'Yearly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentytwelve' ) ) . '</span>' );
+				} elseif ( is_tag() ) {
+					printf( __( 'Tag Archives: %s', 'twentytwelve' ), '<span>' . single_tag_title( '', false ) . '</span>' );
+					// Show an optional tag description
+					$tag_description = tag_description();
+					if ( $tag_description )
+						echo apply_filters( 'tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' );
+				} elseif ( is_category() ) {
+					printf( __( 'Category Archives: %s', 'twentytwelve' ), '<span>' . single_cat_title( '', false ) . '</span>' );
+					// Show an optional category description
+					$category_description = category_description();
+					if ( $category_description )
+						echo apply_filters( 'category_archive_meta', '<div class="category-archive-meta">' . $category_description . '</div>' );
+				} else {
+					_e( 'Blog Archives', 'twentytwelve' );
+				}
+			?></h1>
 
 			<?php
-			twentytwelve_content_nav( 'nav-above' );
-			
 			/* Start the Loop */
 			while ( have_posts() ) : the_post();
 
diff --git a/wp-content/themes/twentytwelve/content-aside.php b/wp-content/themes/twentytwelve/content-aside.php
new file mode 100644
index 000000000..0bec8ebbb
--- /dev/null
+++ b/wp-content/themes/twentytwelve/content-aside.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * The template for displaying posts in the Aside post format
+ *
+ * @package WordPress
+ * @subpackage Twenty_Twelve
+ * @since Twenty Twelve 1.0
+ */
+?>
+
+	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+		<header class="entry-header">
+			<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
+		</header><!-- .entry-header -->
+
+		<div class="entry-content">
+			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?>
+			<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
+		</div><!-- .entry-content -->
+
+		<footer class="entry-meta">
+			<?php twentytwelve_posted_on(); ?>
+			<?php if ( comments_open() ) : ?>
+			<span class="sep"> | </span>
+			<span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '<b>1</b> Reply', 'twentytwelve' ), __( '<b>%</b> Replies', 'twentytwelve' ) ); ?></span>
+			<?php endif; ?>
+			<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
+		</footer><!-- #entry-meta -->
+	</article><!-- #post -->
diff --git a/wp-content/themes/twentytwelve/content-image.php b/wp-content/themes/twentytwelve/content-image.php
new file mode 100644
index 000000000..16d018049
--- /dev/null
+++ b/wp-content/themes/twentytwelve/content-image.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * The template for displaying posts in the Image post format
+ *
+ * @package WordPress
+ * @subpackage Twenty_Twelve
+ * @since Twenty Twelve 1.0
+ */
+?>
+
+	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+		<header class="entry-header">
+			<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
+
+			<div class="entry-meta">
+				<?php twentytwelve_posted_on(); ?>
+			</div><!-- .entry-meta -->
+		</header><!-- .entry-header -->
+
+		<div class="entry-content">
+			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?>
+			<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
+		</div><!-- .entry-content -->
+
+		<footer class="entry-meta">
+			<?php
+				/* translators: used between list items, there is a space after the comma */
+				$categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
+				if ( $categories_list ) :
+			?>
+			<span class="cat-links">
+				<?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list ); ?>
+			</span>
+			<?php endif; // End if categories ?>
+			<?php
+				/* translators: used between list items, there is a space after the comma */
+				$tags_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
+				if ( $tags_list ) : ?>
+			<span class="tag-links">
+				<?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
+			</span>
+			<?php endif; // End if $tags_list ?>
+
+			<?php if ( comments_open() ) : ?>
+			<span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '<b>1</b> Reply', 'twentytwelve' ), __( '<b>%</b> Replies', 'twentytwelve' ) ); ?></span>
+			<?php endif; // End if comments_open() ?>
+
+			<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
+		</footer><!-- #entry-meta -->
+	</article><!-- #post -->
diff --git a/wp-content/themes/twentytwelve/content-link.php b/wp-content/themes/twentytwelve/content-link.php
new file mode 100644
index 000000000..c062e51cf
--- /dev/null
+++ b/wp-content/themes/twentytwelve/content-link.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * The template for displaying posts in the Link post format
+ *
+ * @package WordPress
+ * @subpackage Twenty_Twelve
+ * @since Twenty Twelve 1.0
+ */
+?>
+
+	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+		<header class="entry-header">
+			<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
+		</header><!-- .entry-header -->
+
+		<div class="entry-content">
+			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?>
+			<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
+		</div><!-- .entry-content -->
+
+		<footer class="entry-meta">
+			<?php twentytwelve_posted_on(); ?>
+			<?php if ( comments_open() ) : ?>
+			<span class="sep"> | </span>
+			<span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '<b>1</b> Reply', 'twentytwelve' ), __( '<b>%</b> Replies', 'twentytwelve' ) ); ?></span>
+			<?php endif; ?>
+			<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
+		</footer><!-- #entry-meta -->
+	</article><!-- #post -->
diff --git a/wp-content/themes/twentytwelve/content-quote.php b/wp-content/themes/twentytwelve/content-quote.php
new file mode 100644
index 000000000..be809bb63
--- /dev/null
+++ b/wp-content/themes/twentytwelve/content-quote.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * The template for displaying posts in the Quote post format
+ *
+ * @package WordPress
+ * @subpackage Twenty_Twelve
+ * @since Twenty Twelve 1.0
+ */
+?>
+
+	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+		<header class="entry-header">
+			<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
+
+			<div class="entry-meta">
+				<?php twentytwelve_posted_on(); ?>
+			</div><!-- .entry-meta -->
+		</header><!-- .entry-header -->
+
+		<div class="entry-content">
+			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?>
+			<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
+		</div><!-- .entry-content -->
+
+		<footer class="entry-meta">
+			<?php
+				/* translators: used between list items, there is a space after the comma */
+				$categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
+				if ( $categories_list ) :
+			?>
+			<span class="cat-links">
+				<?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list ); ?>
+			</span>
+			<?php endif; // End if categories ?>
+			<?php
+				/* translators: used between list items, there is a space after the comma */
+				$tags_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
+				if ( $tags_list ) : ?>
+			<span class="tag-links">
+				<?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
+			</span>
+			<?php endif; // End if $tags_list ?>
+
+			<?php if ( comments_open() ) : ?>
+			<span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '<b>1</b> Reply', 'twentytwelve' ), __( '<b>%</b> Replies', 'twentytwelve' ) ); ?></span>
+			<?php endif; // End if comments_open() ?>
+
+			<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
+		</footer><!-- #entry-meta -->
+	</article><!-- #post -->
diff --git a/wp-content/themes/twentytwelve/content-single.php b/wp-content/themes/twentytwelve/content-single.php
index 2d80e9c3e..498bbc4e1 100644
--- a/wp-content/themes/twentytwelve/content-single.php
+++ b/wp-content/themes/twentytwelve/content-single.php
@@ -8,64 +8,64 @@
  */
 ?>
 
-<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-	<header class="entry-header">
-		<h1 class="entry-title"><?php the_title(); ?></h1>
+	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+		<header class="entry-header">
+			<h1 class="entry-title"><?php the_title(); ?></h1>
 
-		<?php if ( 'post' == get_post_type() ) : ?>
-		<div class="entry-meta">
-			<?php twentytwelve_posted_on(); ?>
-		</div><!-- .entry-meta -->
-		<?php endif; ?>
-	</header><!-- .entry-header -->
+			<?php if ( 'post' == get_post_type() ) : // Hide entry meta for pages ?>
+			<div class="entry-meta">
+				<?php twentytwelve_posted_on(); ?>
+			</div><!-- .entry-meta -->
+			<?php endif; ?>
+		</header><!-- .entry-header -->
 
-	<div class="entry-content">
-		<?php the_content(); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
-	</div><!-- .entry-content -->
+		<div class="entry-content">
+			<?php the_content(); ?>
+			<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
+		</div><!-- .entry-content -->
 
-	<footer class="entry-meta">
-		<?php
-			/* translators: used between list items, there is a space after the comma */
-			$categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
+		<footer class="entry-meta">
+			<?php
+				/* translators: used between list items, there is a space after the comma */
+				$categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
 
-			/* translators: used between list items, there is a space after the comma */
-			$tag_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
-			if ( '' != $tag_list ) {
-				$utility_text = __( 'This entry was posted in %1$s and tagged %2$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentytwelve' );
-			} elseif ( '' != $categories_list ) {
-				$utility_text = __( 'This entry was posted in %1$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentytwelve' );
-			} else {
-				$utility_text = __( 'This entry was posted by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentytwelve' );
-			}
+				/* translators: used between list items, there is a space after the comma */
+				$tag_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
+				if ( '' != $tag_list ) {
+					$utility_text = __( 'This entry was posted in %1$s and tagged %2$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentytwelve' );
+				} elseif ( '' != $categories_list ) {
+					$utility_text = __( 'This entry was posted in %1$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentytwelve' );
+				} else {
+					$utility_text = __( 'This entry was posted by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentytwelve' );
+				}
 
-			printf(
-				$utility_text,
-				$categories_list,
-				$tag_list,
-				esc_url( get_permalink() ),
-				the_title_attribute( 'echo=0' ),
-				get_the_author(),
-				esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) )
-			);
-		?>
-		<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
+				printf(
+					$utility_text,
+					$categories_list,
+					$tag_list,
+					esc_url( get_permalink() ),
+					the_title_attribute( 'echo=0' ),
+					get_the_author(),
+					esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) )
+				);
+			?>
+			<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
 
-		<?php if ( get_the_author_meta( 'description' ) && ( ! function_exists( 'is_multi_author' ) || is_multi_author() ) ) : // If a user has filled out their description and this is a multi-author blog, show a bio on their entries ?>
-		<div id="author-info">
-			<div id="author-avatar">
-				<?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentytwelve_author_bio_avatar_size', 68 ) ); ?>
-			</div><!-- #author-avatar -->
-			<div id="author-description">
-				<h2><?php printf( __( 'About %s', 'twentytwelve' ), get_the_author() ); ?></h2>
-				<?php the_author_meta( 'description' ); ?>
-				<div id="author-link">
-					<a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ); ?>" rel="author">
-						<?php printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentytwelve' ), get_the_author() ); ?>
-					</a>
-				</div><!-- #author-link	-->
-			</div><!-- #author-description -->
-		</div><!-- #entry-author-info -->
-		<?php endif; ?>
-	</footer><!-- .entry-meta -->
-</article><!-- #post -->
+			<?php if ( get_the_author_meta( 'description' ) && ( ! function_exists( 'is_multi_author' ) || is_multi_author() ) ) : // If a user has filled out their description and this is a multi-author blog, show a bio on their entries ?>
+			<div id="author-info">
+				<div id="author-avatar">
+					<?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentytwelve_author_bio_avatar_size', 68 ) ); ?>
+				</div><!-- #author-avatar -->
+				<div id="author-description">
+					<h2><?php printf( __( 'About %s', 'twentytwelve' ), get_the_author() ); ?></h2>
+					<?php the_author_meta( 'description' ); ?>
+					<div id="author-link">
+						<a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ); ?>" rel="author">
+							<?php printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentytwelve' ), get_the_author() ); ?>
+						</a>
+					</div><!-- #author-link	-->
+				</div><!-- #author-description -->
+			</div><!-- #entry-author-info -->
+			<?php endif; ?>
+		</footer><!-- .entry-meta -->
+	</article><!-- #post -->
diff --git a/wp-content/themes/twentytwelve/content.php b/wp-content/themes/twentytwelve/content.php
index fe0933a80..cfbb97e06 100644
--- a/wp-content/themes/twentytwelve/content.php
+++ b/wp-content/themes/twentytwelve/content.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The default template for displaying content
+ * The default template for displaying content on indexed pages (home, archive, search)
  *
  * @package WordPress
  * @subpackage Twenty_Twelve
@@ -10,23 +10,16 @@
 
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 		<header class="entry-header">
-			<?php if ( is_sticky() ) : ?>
-				<hgroup>
-					<h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-					<h3 class="entry-format"><?php _e( 'Featured', 'twentytwelve' ); ?></h3>
-				</hgroup>
-			<?php else : ?>
 			<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
-			<?php endif; ?>
 
-			<?php if ( 'post' == get_post_type() ) : ?>
+			<?php if ( 'post' == get_post_type() ) : // Hide entry meta for pages ?>
 			<div class="entry-meta">
 				<?php twentytwelve_posted_on(); ?>
 			</div><!-- .entry-meta -->
 			<?php endif; ?>
 		</header><!-- .entry-header -->
 
-		<?php if ( is_search() ) : // Only display Excerpts for Search ?>
+		<?php if ( is_search() ) : // Only display excerpts for search ?>
 		<div class="entry-summary">
 			<?php the_excerpt(); ?>
 		</div><!-- .entry-summary -->
@@ -38,36 +31,27 @@
 		<?php endif; ?>
 
 		<footer class="entry-meta">
-			<?php $show_sep = false; ?>
-			<?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages on Search ?>
+			<?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages ?>
 			<?php
 				/* translators: used between list items, there is a space after the comma */
 				$categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
-				if ( $categories_list ):
+				if ( $categories_list ) :
 			?>
 			<span class="cat-links">
-				<?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list );
-				$show_sep = true; ?>
+				<?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list ); ?>
 			</span>
 			<?php endif; // End if categories ?>
 			<?php
 				/* translators: used between list items, there is a space after the comma */
 				$tags_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
-				if ( $tags_list ):
-				if ( $show_sep ) : ?>
-			<span class="sep"> | </span>
-				<?php endif; // End if $show_sep ?>
+				if ( $tags_list ) : ?>
 			<span class="tag-links">
-				<?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list );
-				$show_sep = true; ?>
+				<?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
 			</span>
 			<?php endif; // End if $tags_list ?>
 			<?php endif; // End if 'post' == get_post_type() ?>
 
 			<?php if ( comments_open() ) : ?>
-			<?php if ( $show_sep ) : ?>
-			<span class="sep"> | </span>
-			<?php endif; // End if $show_sep ?>
 			<span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '<b>1</b> Reply', 'twentytwelve' ), __( '<b>%</b> Replies', 'twentytwelve' ) ); ?></span>
 			<?php endif; // End if comments_open() ?>
 
diff --git a/wp-content/themes/twentytwelve/full-width-page.php b/wp-content/themes/twentytwelve/full-width-page.php
new file mode 100644
index 000000000..fbc7a781e
--- /dev/null
+++ b/wp-content/themes/twentytwelve/full-width-page.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Template Name: Full-width page, no sidebar
+ *
+ * @package WordPress
+ * @subpackage Twenty_Twelve
+ * @since Twenty Twelve 1.0
+ */
+
+get_header(); ?>
+
+	<div id="primary">
+		<div id="content" role="main">
+
+			<?php while ( have_posts() ) : the_post(); ?>
+				<?php get_template_part( 'content', 'page' ); ?>
+				<?php comments_template( '', true ); ?>
+			<?php endwhile; // end of the loop. ?>
+
+		</div><!-- #content -->
+	</div><!-- #primary -->
+
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/wp-content/themes/twentytwelve/functions.php b/wp-content/themes/twentytwelve/functions.php
index b2cd93bde..b1a006074 100644
--- a/wp-content/themes/twentytwelve/functions.php
+++ b/wp-content/themes/twentytwelve/functions.php
@@ -36,7 +36,7 @@ if ( ! isset( $content_width ) )
  */
 add_action( 'after_setup_theme', 'twentytwelve_setup' );
 
-if ( ! function_exists( 'twentytwelve_setup' ) ):
+if ( ! function_exists( 'twentytwelve_setup' ) ) :
 /**
  * Sets up theme defaults and registers support for various WordPress features.
  *
@@ -59,14 +59,134 @@ function twentytwelve_setup() {
 	// Add default posts and comments RSS feed links to <head>.
 	add_theme_support( 'automatic-feed-links' );
 
+	// Add support for a variety of post formats
+	add_theme_support( 'post-formats', array( 'aside', 'image', 'link', 'quote' ) );
+
 	// This theme uses wp_nav_menu() in one location.
 	register_nav_menu( 'primary', __( 'Primary Menu', 'twentytwelve' ) );
 
-	// Add support for custom backgrounds
+	// Add support for custom background.
 	add_custom_background();
+
+	// Add support for a custom header image.
+	$header_args = array(
+		'random-default' => true,
+		'flex-height' => true,
+		'suggested-height' => apply_filters( 'twentytwelve_header_image_height', 250 ),
+		'flex-width' => true,
+		'max-width' => apply_filters( 'twentytwelve_header_image_max_width', 2000 ),
+		'suggested-width' => apply_filters( 'twentytwelve_header_image_width', 960 ),
+	);
+	add_theme_support( 'custom-header', $header_args );
+	add_custom_image_header( 'twentytwelve_header_style', 'twentytwelve_admin_header_style', 'twentytwelve_admin_header_image' );
+
+	// The default header text color
+	define( 'HEADER_TEXTCOLOR', '444' );
 }
 endif;
 
+if ( ! function_exists( 'twentytwelve_header_style' ) ) :
+/**
+ * Styles the header image and text displayed on the blog
+ *
+ * get_header_textcolor() options: HEADER_TEXTCOLOR is default, hide text (returns 'blank'), or any hex value
+ *
+ * @since Twenty Twelve 1.0
+ */
+function twentytwelve_header_style() {
+	// If no custom options for text are set, let's bail
+	if ( HEADER_TEXTCOLOR == get_header_textcolor() )
+		return;
+	// If we get this far, we have custom styles.
+	?>
+	<style type="text/css">
+	<?php
+		// Has the text been hidden?
+		if ( 'blank' == get_header_textcolor() ) :
+	?>
+		.site-title,
+		.site-description {
+			position: absolute !important;
+			clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
+			clip: rect(1px, 1px, 1px, 1px);
+		}
+	<?php
+		// If the user has set a custom color for the text, use that.
+		else :
+	?>
+		.site-title a,
+		.site-description {
+			color: #<?php echo get_header_textcolor(); ?> !important;
+		}
+	<?php endif; ?>
+	</style>
+	<?php
+}
+endif;
+
+if ( ! function_exists( 'twentytwelve_admin_header_style' ) ) :
+/**
+ * Styles the header image displayed on the Appearance > Header admin panel.
+ *
+ * Referenced via add_custom_image_header() in twentytwelve_setup().
+ *
+ * @since Twenty Twelve 1.0
+ */
+function twentytwelve_admin_header_style() {
+?>
+	<style type="text/css">
+	.appearance_page_custom-header #headimg {
+		border: none;
+	}
+	#headimg h1,
+	#headimg h2 {
+		line-height: 1.6;
+		margin: 0;
+		padding: 0;
+	}
+	#headimg h1 {
+		font-size: 30px;
+	}
+	#headimg h1 a {
+		text-decoration: none;
+	}
+	#headimg h2 {
+		font: normal 13px/1.8 "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif;
+		margin-bottom: 24px;
+	}
+	#headimg img {
+	}
+	</style>
+<?php
+}
+endif;
+
+if ( ! function_exists( 'twentytwelve_admin_header_image' ) ) :
+/**
+ * Custom header image markup displayed on the Appearance > Header admin panel.
+ *
+ * Referenced via add_custom_image_header() in twentytwelve_setup().
+ *
+ * @since Twenty Twelve 1.0
+ */
+function twentytwelve_admin_header_image() { ?>
+	<div id="headimg">
+		<?php
+		if ( 'blank' == get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) || '' == get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) )
+			$style = ' style="display:none;"';
+		else
+			$style = ' style="color:#' . get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) . ';"';
+		?>
+		<h1><a id="name"<?php echo $style; ?> onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1>
+		<h2 id="desc"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></h2>
+		<?php $header_image = get_header_image();
+		if ( ! empty( $header_image ) ) : ?>
+			<img src="<?php echo esc_url( $header_image ); ?>" alt="" />
+		<?php endif; ?>
+	</div>
+<?php }
+endif;
+
 /**
  * Get our wp_nav_menu() fallback, wp_page_menu(), to show a home link.
  *
@@ -89,7 +209,7 @@ function twentytwelve_widgets_init() {
 		'id' => 'sidebar-1',
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget' => "</aside>",
-		'before_title' => '<h3 class="widget-title">',
+		'before_title' => '<h3 class="widget-title all-caps-title">',
 		'after_title' => '</h3>',
 	) );
 }
@@ -107,8 +227,8 @@ function twentytwelve_content_nav( $nav_id ) {
 	if ( $wp_query->max_num_pages > 1 ) : ?>
 		<nav id="<?php echo $nav_id; ?>">
 			<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentytwelve' ); ?></h3>
-			<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentytwelve' ) ); ?></div>
-			<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?></div>
+			<div class="nav-previous alignleft"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentytwelve' ) ); ?></div>
+			<div class="nav-next alignright"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?></div>
 		</nav><!-- #nav-above -->
 	<?php endif;
 }
@@ -201,4 +321,19 @@ function twentytwelve_posted_on() {
 		get_the_author()
 	);
 }
-endif;
\ No newline at end of file
+endif;
+
+/**
+ * Extends the default WordPress body class to denote a full-width layout.
+ *
+ * Used in two cases: no active widgets in sidebar, and full-width page template.
+ *
+ * @since Twenty Twelve 1.0
+ */
+function twentytwelve_body_class( $classes ) {
+	if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'full-width' ) )
+		$classes[] = 'full-width';
+
+	return $classes;
+}
+add_filter( 'body_class', 'twentytwelve_body_class' );
\ No newline at end of file
diff --git a/wp-content/themes/twentytwelve/header.php b/wp-content/themes/twentytwelve/header.php
index 41d9056e7..90a41bafb 100644
--- a/wp-content/themes/twentytwelve/header.php
+++ b/wp-content/themes/twentytwelve/header.php
@@ -13,7 +13,7 @@
 <head>
 <meta charset="<?php bloginfo( 'charset' ); ?>" />
 <meta name="viewport" content="width=device-width" />
-<title><?php wp_title( '|', true, 'right' ); ?></title>
+<title><?php wp_title( '|', true, 'right' ); ?> <?php bloginfo( 'name' ); ?></title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
 <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
 
@@ -27,7 +27,7 @@
 if ( is_singular() && get_option( 'thread_comments' ) )
 	wp_enqueue_script( 'comment-reply' );
 
-wp_enqueue_style( 'twentytwelve-style', get_bloginfo( 'stylesheet_url' ) );
+wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
 ?>
 <?php wp_head(); ?>
 </head>
@@ -46,6 +46,11 @@ wp_enqueue_style( 'twentytwelve-style', get_bloginfo( 'stylesheet_url' ) );
 			<div class="skip-link"><a class="assistive-text" href="#secondary" title="<?php esc_attr_e( 'Skip to secondary content', 'twentytwelve' ); ?>"><?php _e( 'Skip to secondary content', 'twentytwelve' ); ?></a></div>
 			<?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>
 		</nav>
+
+		<?php $header_image = get_header_image();
+		if ( ! empty( $header_image ) ) : ?>
+			<img src="<?php echo esc_url( $header_image ); ?>" alt="" />
+		<?php endif; ?>
 	</header><!-- #masthead -->
 
 	<div id="main">
\ No newline at end of file
diff --git a/wp-content/themes/twentytwelve/images/flowers.jpg b/wp-content/themes/twentytwelve/images/flowers.jpg
deleted file mode 100644
index 1f6ad6d4c..000000000
Binary files a/wp-content/themes/twentytwelve/images/flowers.jpg and /dev/null differ
diff --git a/wp-content/themes/twentytwelve/index.php b/wp-content/themes/twentytwelve/index.php
index fde893d67..194848603 100644
--- a/wp-content/themes/twentytwelve/index.php
+++ b/wp-content/themes/twentytwelve/index.php
@@ -16,11 +16,6 @@ get_header(); ?>
 
 	<div id="primary">
 		<div id="content" role="main">
-		<!-- Placeholder for optional header image
-		<section role="banner">
-			<img src="<?php echo get_stylesheet_directory_uri(); ?>/images/flowers.jpg" width="625" height="188" />
-		</section>
-		-->
 		<?php if ( have_posts() ) : ?>
 
 			<?php /* Start the Loop */ ?>
diff --git a/wp-content/themes/twentytwelve/sidebar.php b/wp-content/themes/twentytwelve/sidebar.php
index d2056e367..f3808016e 100644
--- a/wp-content/themes/twentytwelve/sidebar.php
+++ b/wp-content/themes/twentytwelve/sidebar.php
@@ -2,29 +2,16 @@
 /**
  * The Sidebar containing the main widget area.
  *
+ * If no active widgets in sidebar, hide it completely.
+ *
  * @package WordPress
  * @subpackage Twenty_Twelve
  * @since Twenty Twelve 1.0
  */
 ?>
+
+	<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
 	<div id="secondary" class="widget-area" role="complementary">
-		<?php if ( ! dynamic_sidebar( 'sidebar-1' ) ) : ?>
-
-			<aside id="archives" class="widget">
-				<h3 class="widget-title"><?php _e( 'Archives', 'twentytwelve' ); ?></h3>
-				<ul>
-					<?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
-				</ul>
-			</aside>
-
-			<aside id="meta" class="widget">
-				<h3 class="widget-title"><?php _e( 'Meta', 'twentytwelve' ); ?></h3>
-				<ul>
-					<?php wp_register(); ?>
-					<li><?php wp_loginout(); ?></li>
-					<?php wp_meta(); ?>
-				</ul>
-			</aside>
-
-		<?php endif; // end sidebar widget area ?>
-	</div><!-- #secondary .widget-area -->
\ No newline at end of file
+		<?php dynamic_sidebar( 'sidebar-1' ); ?>
+	</div><!-- #secondary .widget-area -->
+	<?php endif; ?>
\ No newline at end of file
diff --git a/wp-content/themes/twentytwelve/style.css b/wp-content/themes/twentytwelve/style.css
index cb4c2638b..248a82167 100644
--- a/wp-content/themes/twentytwelve/style.css
+++ b/wp-content/themes/twentytwelve/style.css
@@ -114,6 +114,17 @@ img {
 	clear: both;
 }
 
+/* patterns.scss
+ * Repeatable patterns
+ * ------------------------------------------------------------------ */
+.all-caps-title {
+	text-transform: uppercase;
+	font-weight: 400;
+	font-size: 13px;
+	font-size: 0.928571429rem;
+	line-height: 1.846153846;
+}
+
 /* scaffolding.css.scss
 * Basic structure
 * ------------------------------------------------------------------ */
@@ -148,46 +159,50 @@ a:hover {
 /*---------------------------------------------------------
 Page structure
 ------------------------------------------------------------ */
-div#page {
+#page {
 	padding: 0 24px;
 	padding: 0 1.714285714rem;
 	background-color: #fff;
 }
 @media screen and (min-width: 600px) {
-	div#page {
+	#page {
 		zoom: 1;
 		margin: 0 auto;
 		max-width: 960px;
 		max-width: 68.571428571rem;
 	}
-	div#page:before, div#page:after {
+	#page:before, #page:after {
 		display: table;
 		content: "";
 	}
-	div#page:after {
+	#page:after {
 		clear: both;
 	}
 
 }
 
-div#primary {
+#primary {
 	margin: 24px 0;
 	margin: 1.714285714rem 0;
 }
 @media screen and (min-width: 600px) {
-	div#primary {
+	#primary {
 		float: left;
 		width: 65.104166667%;
 	}
 
+@media screen and (min-width: 600px) {
+	body.full-width #primary {
+		width: 100%;
+	}
 }
 
-div#secondary {
+#secondary {
 	margin: 24px 0;
 	margin: 1.714285714rem 0;
 }
 @media screen and (min-width: 600px) {
-	div#secondary {
+	#secondary {
 		float: right;
 		width: 26.041666667%;
 	}
@@ -347,11 +362,6 @@ div#secondary aside {
 div#secondary aside h3 {
 	margin-bottom: 24px;
 	margin-bottom: 1.714285714rem;
-	text-transform: uppercase;
-	font-weight: 300;
-	font-size: 13px;
-	font-size: 0.928571429rem;
-	line-height: 1.846153846;
 }
 div#secondary aside p,
 div#secondary aside li {
@@ -520,4 +530,16 @@ embed,
 object,
 video {
 	max-width: 100%;
-}
\ No newline at end of file
+}
+
+/* archive.css.scss
+ * Styling for the archive view
+ * ------------------------------------------------------------------ */
+#content.archive h1.archive-title {
+	margin-bottom: 48px;
+	margin-bottom: 3.428571429rem;
+	padding-bottom: 22px;
+	padding-bottom: 1.571428571rem;
+	border-bottom: 1px solid #ededed;
+	color: #777777;
+}