Index: wp-content/themes/twentyfourteen/content-single.php
===================================================================
--- wp-content/themes/twentyfourteen/content-single.php	(revision 24862)
+++ wp-content/themes/twentyfourteen/content-single.php	(working copy)
@@ -1,83 +0,0 @@
-<?php
-/**
- * @package WordPress
- * @subpackage Twenty_Fourteen
- */
-$format = get_post_format();
-if ( false === $format )
-	$format = 'standard';
-?>
-
-<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-	<?php if ( ( 'video' != $format ) && ( 'image' != $format ) && ( 'aside' != $format ) && ( 'link' != $format ) && ( 'quote' != $format ) ) : ?>
-	<div class="attachment-featured-thumbnail">
-	<?php
-		if ( '' != get_the_post_thumbnail() )
-			the_post_thumbnail( 'featured-thumbnail-large' );
-	?>
-	</div>
-	<?php endif; ?>
-
-	<header class="entry-header">
-		<div class="entry-meta">
-			<?php
-				/* translators: used between list items, there is a space after the comma */
-				$categories_list = get_the_category_list( __( ', ', 'twentyfourteen' ) );
-				if ( $categories_list && twentyfourteen_categorized_blog() ) :
-			?>
-			<span class="cat-links">
-				<?php echo $categories_list; ?>
-			</span>
-			<?php endif; // End if categories ?>
-		</div><!-- .entry-meta -->
-
-		<?php if ( ( 'standard' == $format ) || ( 'video' == $format ) || ( 'image' == $format ) || ( 'gallery' == $format ) ) : ?>
-			<h1 class="entry-title"><?php the_title(); ?></h1>
-		<?php endif; ?>
-
-		<div class="entry-meta">
-			<?php if ( 'standard' != $format ) : ?>
-			<span class="post-format">
-				<a class="entry-format" href="<?php echo esc_url( get_post_format_link( get_post_format() ) ); ?>" title="<?php echo esc_attr( sprintf( __( 'All %s posts', 'twentyfourteen' ), get_post_format_string( get_post_format() ) ) ); ?>"><?php echo get_post_format_string( get_post_format() ); ?></a>
-			</span>
-			<?php endif; ?>
-
-			<?php twentyfourteen_posted_on(); ?>
-
-			<?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
-			<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
-			<?php endif; ?>
-
-			<?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
-		</div><!-- .entry-meta -->
-	</header><!-- .entry-header -->
-
-	<div class="entry-content clearfix">
-		<?php the_content(); ?>
-		<?php
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
-				'after'       => '</div>',
-				'link_before' => '<span>',
-				'link_after'  => '</span>'
-			) );
-		?>
-	</div><!-- .entry-content -->
-
-	<footer class="entry-meta">
-		<?php if ( ( 'quote' == $format ) || ( 'aside' == $format ) ) : ?>
-		<div class="entry-meta">
-			<?php the_title( '<h1 class="entry-title"><a href="' . get_permalink() . '" rel="bookmark">', '</a></h1>' ); ?>
-		</div><!-- .entry-meta -->
-		<?php endif; ?>
-
-		<?php
-			$tag_list = get_the_tag_list();
-			if ( '' != $tag_list ) :
-		?>
-			<span class="tag-links">
-				<?php echo $tag_list; ?>
-			</span>
-		<?php endif; // End if $tag_list ?>
-	</footer><!-- .entry-meta -->
-</article><!-- #post-<?php the_ID(); ?> -->
Index: wp-content/themes/twentyfourteen/content-aside.php
===================================================================
--- wp-content/themes/twentyfourteen/content-aside.php	(revision 0)
+++ wp-content/themes/twentyfourteen/content-aside.php	(revision 0)
@@ -0,0 +1,49 @@
+<?php
+/**
+ * The template for displaying posts in the Aside post format.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Fourteen
+ */
+?>
+
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+	<header class="entry-header">
+		<div class="entry-meta">
+			<?php twentyfourteen_categories(); ?>
+			<?php twentyfourteen_post_format(); ?>
+			<?php twentyfourteen_posted_on(); ?>
+
+			<?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
+				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
+			<?php endif; ?>
+
+			<?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
+		</div><!-- .entry-meta -->
+	</header><!-- .entry-header -->
+
+	<div class="entry-content clearfix">
+		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) ); ?>
+		<?php
+			wp_link_pages( array(
+				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+				'after'       => '</div>',
+				'link_before' => '<span>',
+				'link_after'  => '</span>'
+			) );
+		?>
+	</div><!-- .entry-content -->
+
+	<footer class="entry-meta">
+		<?php if ( is_single() ) : ?>
+		<h1 class="entry-title"><?php the_title(); ?></h1>
+		<?php else : ?>
+		<h1 class="entry-title">
+			<a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a>
+		</h1>
+		<?php endif; // is_single() ?>
+
+		<?php twentyfourteen_tags(); ?>
+	</footer><!-- .entry-meta -->
+
+</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
Index: wp-content/themes/twentyfourteen/style.css
===================================================================
--- wp-content/themes/twentyfourteen/style.css	(revision 24862)
+++ wp-content/themes/twentyfourteen/style.css	(working copy)
@@ -500,9 +500,15 @@
 }
 
 /* Clearing floats */
+.hentry:after,
+.entry-content:after,
 .clearfix:after {
 	clear: both;
 }
+.hentry:before,
+.hentry:after,
+.entry-content:before,
+.entry-content:after,
 .clearfix:before,
 .clearfix:after {
 	display: table;
@@ -1009,6 +1015,13 @@
 	font-weight: 900;
 	text-transform: uppercase;
 }
+.format-aside .cat-links,
+.format-link .cat-links,
+.format-quote .cat-links {
+	display: block;
+	margin-bottom: 8px;
+	margin-bottom: 0.8rem;
+}
 .cat-links a {
 	color: #2b2b2b;
 }
@@ -1116,8 +1129,8 @@
 	font-size: 1.2rem;
 	font-weight: 400;
 	line-height: 1.3333333333;
-	margin-bottom: 8px;
-	margin-bottom: 0.8rem;
+	margin-bottom: 24px;
+	margin-bottom: 2.4rem;
 	text-transform: none;
 }
 #primary footer.entry-meta .entry-title a {
@@ -1133,11 +1146,6 @@
 #primary .format-video {
 	border-top: 1px solid rgba(0, 0, 0, 0.1);
 }
-#primary .format-aside .entry-header .entry-title,
-#primary .format-quote .entry-header .entry-title,
-#primary .format-link .entry-header .entry-title {
-	display: none;
-}
 #primary .format-aside .entry-content,
 #primary .format-aside .entry-summary,
 #primary .format-quote .entry-content,
Index: wp-content/themes/twentyfourteen/search.php
===================================================================
--- wp-content/themes/twentyfourteen/search.php	(revision 24862)
+++ wp-content/themes/twentyfourteen/search.php	(working copy)
@@ -19,7 +19,7 @@
 
 		<?php while ( have_posts() ) : the_post(); ?>
 
-			<?php twentyfourteen_get_template_part(); ?>
+			<?php get_template_part( 'content', get_post_format() ); ?>
 
 		<?php endwhile; ?>
 
Index: wp-content/themes/twentyfourteen/content-link.php
===================================================================
--- wp-content/themes/twentyfourteen/content-link.php	(revision 0)
+++ wp-content/themes/twentyfourteen/content-link.php	(revision 0)
@@ -0,0 +1,41 @@
+<?php
+/**
+ * The template for displaying posts in the Link post format.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Fourteen
+ */
+?>
+
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+	<header class="entry-header">
+		<div class="entry-meta">
+			<?php twentyfourteen_categories(); ?>
+			<?php twentyfourteen_post_format(); ?>
+			<?php twentyfourteen_posted_on(); ?>
+
+			<?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
+				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
+			<?php endif; ?>
+
+			<?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
+		</div><!-- .entry-meta -->
+	</header><!-- .entry-header -->
+
+	<div class="entry-content">
+		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) ); ?>
+		<?php
+			wp_link_pages( array(
+				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+				'after'       => '</div>',
+				'link_before' => '<span>',
+				'link_after'  => '</span>'
+			) );
+		?>
+	</div><!-- .entry-content -->
+
+	<footer class="entry-meta">
+		<?php twentyfourteen_tags(); ?>
+	</footer><!-- .entry-meta -->
+
+</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
Index: wp-content/themes/twentyfourteen/content.php
===================================================================
--- wp-content/themes/twentyfourteen/content.php	(revision 24862)
+++ wp-content/themes/twentyfourteen/content.php	(working copy)
@@ -1,44 +1,38 @@
 <?php
 /**
+ * The default template for displaying content
+ *
  * @package WordPress
  * @subpackage Twenty_Fourteen
  */
-$format = get_post_format();
 ?>
 
-<article id="post-<?php the_ID(); ?>" <?php post_class( 'clearfix' ); ?>>
-	<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyfourteen' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="<?php the_ID(); ?>" class="attachment-featured-thumbnail">
-		<?php
-			if ( '' != get_the_post_thumbnail() )
-				the_post_thumbnail( 'featured-thumbnail-large' );
-		?>
-	</a>
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+	<?php
+		printf( '<a href="%1$s" title="%2$s" rel="%3$s" class="attachment-featured-thumbnail">%4$s</a>',
+			get_permalink(),
+			esc_attr( sprintf( __( 'Permalink to %s', 'twentyfourteen' ), the_title_attribute( 'echo=0' ) ) ),
+			get_the_ID(),
+			the_post_thumbnail( 'featured-thumbnail-large' )
+		);
+	?>	
 
 	<header class="entry-header">
-		<?php
-			/* translators: used between list items, there is a space after the comma */
-			$categories_list = get_the_category_list( __( ', ', 'twentyfourteen' ) );
-			if ( $categories_list && twentyfourteen_categorized_blog() && 'post' == get_post_type() ) :
-		?>
 		<div class="entry-meta">
-			<span class="cat-links"><?php echo $categories_list; ?></span>
+			<?php twentyfourteen_categories(); ?>
 		</div>
-		<?php endif; ?>
 
-		<h1 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
+		<?php if ( is_single() ) : ?>
+		<h1 class="entry-title"><?php the_title(); ?></h1>
+		<?php else : ?>
+		<h1 class="entry-title">
+			<a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a>
+		</h1>
+		<?php endif; // is_single() ?>
 
 		<div class="entry-meta">
-			<?php if ( 'gallery' == $format ) : ?>
-			<span class="post-format">
-				<a class="entry-format" href="<?php echo esc_url( get_post_format_link( get_post_format() ) ); ?>" title="<?php echo esc_attr( sprintf( __( 'All %s posts', 'twentyfourteen' ), get_post_format_string( get_post_format() ) ) ); ?>"><?php echo get_post_format_string( get_post_format() ); ?></a>
-			</span>
-			<?php endif; ?>
+			<?php twentyfourteen_posted_on(); ?>
 
-			<?php
-				if ( 'post' == get_post_type() )
-					twentyfourteen_posted_on();
-			?>
-
 			<?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
 				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
 			<?php endif; ?>
@@ -48,11 +42,11 @@
 	</header><!-- .entry-header -->
 
 	<?php if ( is_search() ) : ?>
-	<div class="entry-summary clearfix">
+	<div class="entry-summary">
 		<?php the_excerpt(); ?>
 	</div><!-- .entry-summary -->
 	<?php else : ?>
-	<div class="entry-content clearfix">
+	<div class="entry-content">
 		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) ); ?>
 		<?php
 			wp_link_pages( array(
@@ -65,12 +59,7 @@
 	</div><!-- .entry-content -->
 	<?php endif; ?>
 
-	<?php
-		$tag_list = get_the_tag_list();
-		if ( '' != $tag_list && 'post' == get_post_type() ) :
-	?>
-		<footer class="entry-meta">
-			<span class="tag-links"><?php echo $tag_list; ?></span>
-		</footer><!-- .entry-meta -->
-	<?php endif; // End if $tag_list ?>
+	<footer class="entry-meta">
+		<?php twentyfourteen_tags(); ?>
+	</footer><!-- .entry-meta -->
 </article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
Index: wp-content/themes/twentyfourteen/archive.php
===================================================================
--- wp-content/themes/twentyfourteen/archive.php	(revision 24862)
+++ wp-content/themes/twentyfourteen/archive.php	(working copy)
@@ -69,7 +69,7 @@
 
 		<?php while ( have_posts() ) : the_post(); ?>
 
-			<?php twentyfourteen_get_template_part(); ?>
+			<?php get_template_part( 'content', get_post_format() ); ?>
 
 		<?php endwhile; ?>
 
@@ -88,4 +88,4 @@
 
 <?php get_sidebar(); ?>
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: wp-content/themes/twentyfourteen/single.php
===================================================================
--- wp-content/themes/twentyfourteen/single.php	(revision 24862)
+++ wp-content/themes/twentyfourteen/single.php	(working copy)
@@ -13,7 +13,7 @@
 
 	<?php while ( have_posts() ) : the_post(); ?>
 
-		<?php get_template_part( 'content', 'single' ); ?>
+		<?php get_template_part( 'content', get_post_format() ); ?>
 
 		<?php twentyfourteen_content_nav( 'nav-below' ); ?>
 
Index: wp-content/themes/twentyfourteen/content-post-format.php
===================================================================
--- wp-content/themes/twentyfourteen/content-post-format.php	(revision 24862)
+++ wp-content/themes/twentyfourteen/content-post-format.php	(working copy)
@@ -1,83 +0,0 @@
-<?php
-/**
- * @package WordPress
- * @subpackage Twenty_Fourteen
- */
-$format = get_post_format();
-?>
-
-<article id="post-<?php the_ID(); ?>" <?php post_class( 'clearfix' ); ?>>
-	<?php
-		if ( 'gallery' == $format ) :
-			$images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC' ) );
-			if ( $images ) :
-				$image = array_shift( $images ); ?>
-				<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyfourteen' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="<?php the_ID(); ?>" class="attachment-featured-thumbnail">
-				<?php echo wp_get_attachment_image( $image->ID, 'featured-thumbnail-large' ); ?>
-				</a><?php
-			endif;
-		endif;
-	?>
-
-	<header class="entry-header">
-		<?php
-			/* translators: used between list items, there is a space after the comma */
-			$categories_list = get_the_category_list( __( ', ', 'twentyfourteen' ) );
-			if ( $categories_list && twentyfourteen_categorized_blog() && 'post' == get_post_type() ) :
-		?>
-		<div class="entry-meta">
-			<span class="cat-links"><?php echo $categories_list; ?></span>
-		</div>
-		<?php endif; ?>
-
-		<?php
-			/* Show title only if it exsits */
-			the_title( '<h1 class="entry-title"><a href="' . get_permalink() . '" rel="bookmark">', '</a></h1>' );
-		?>
-
-		<div class="entry-meta">
-			<span class="post-format">
-				<a class="entry-format" href="<?php echo esc_url( get_post_format_link( get_post_format() ) ); ?>" title="<?php echo esc_attr( sprintf( __( 'All %s posts', 'twentyfourteen' ), get_post_format_string( get_post_format() ) ) ); ?>"><?php echo get_post_format_string( get_post_format() ); ?></a>
-			</span>
-
-			<?php
-				if ( 'post' == get_post_type() )
-					twentyfourteen_posted_on();
-			?>
-
-			<?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
-				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
-			<?php endif; ?>
-
-			<?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
-		</div><!-- .entry-meta -->
-	</header><!-- .entry-header -->
-
-	<div class="entry-content clearfix">
-		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) ); ?>
-		<?php
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
-				'after'       => '</div>',
-				'link_before' => '<span>',
-				'link_after'  => '</span>'
-			) );
-		?>
-	</div><!-- .entry-content -->
-
-	<footer class="entry-meta">
-		<?php if ( ( 'quote' == $format ) || ( 'aside' == $format ) ) : ?>
-		<div class="entry-meta">
-			<?php the_title( '<h1 class="entry-title"><a href="' . get_permalink() . '" rel="bookmark">', '</a></h1>' ); ?>
-		</div>
-		<?php endif; ?>
-
-		<?php
-			$tag_list = get_the_tag_list();
-			if ( '' != $tag_list && 'post' == get_post_type() ) :
-		?>
-		<span class="tag-links"><?php echo $tag_list; ?></span>
-		<?php endif; // End if $tag_list ?>
-	</footer><!-- .entry-meta -->
-
-</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
Index: wp-content/themes/twentyfourteen/content-image.php
===================================================================
--- wp-content/themes/twentyfourteen/content-image.php	(revision 0)
+++ wp-content/themes/twentyfourteen/content-image.php	(revision 0)
@@ -0,0 +1,51 @@
+<?php
+/**
+ * The template for displaying posts in the Image post format.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Fourteen
+ */
+?>
+
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+	<header class="entry-header">
+		<div class="entry-meta">
+			<?php twentyfourteen_categories(); ?>
+		</div><!-- .entry-meta -->
+
+		<?php if ( is_single() ) : ?>
+		<h1 class="entry-title"><?php the_title(); ?></h1>
+		<?php else : ?>
+		<h1 class="entry-title">
+			<a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a>
+		</h1>
+		<?php endif; // is_single() ?>
+
+		<div class="entry-meta">
+			<?php twentyfourteen_post_format(); ?>
+			<?php twentyfourteen_posted_on(); ?>
+
+			<?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
+				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
+			<?php endif; ?>
+
+			<?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
+		</div><!-- .entry-meta -->
+	</header><!-- .entry-header -->
+
+	<div class="entry-content">
+		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) ); ?>
+		<?php
+			wp_link_pages( array(
+				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+				'after'       => '</div>',
+				'link_before' => '<span>',
+				'link_after'  => '</span>'
+			) );
+		?>
+	</div><!-- .entry-content -->
+
+	<footer class="entry-meta">
+		<?php twentyfourteen_tags(); ?>
+	</footer><!-- .entry-meta -->
+</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
Index: wp-content/themes/twentyfourteen/content-quote.php
===================================================================
--- wp-content/themes/twentyfourteen/content-quote.php	(revision 0)
+++ wp-content/themes/twentyfourteen/content-quote.php	(revision 0)
@@ -0,0 +1,51 @@
+<?php
+/**
+ * The template for displaying posts in the Quote post format.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Fourteen
+ */
+$format = get_post_format();
+?>
+
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+
+	<header class="entry-header">
+		<div class="entry-meta">
+			<?php twentyfourteen_categories(); ?>
+			<?php twentyfourteen_post_format(); ?>
+			<?php twentyfourteen_posted_on(); ?>
+
+			<?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
+				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
+			<?php endif; ?>
+
+			<?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
+		</div><!-- .entry-meta -->
+	</header><!-- .entry-header -->
+
+	<div class="entry-content clearfix">
+		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) ); ?>
+		<?php
+			wp_link_pages( array(
+				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+				'after'       => '</div>',
+				'link_before' => '<span>',
+				'link_after'  => '</span>'
+			) );
+		?>
+	</div><!-- .entry-content -->
+
+	<footer class="entry-meta">
+		<?php if ( is_single() ) : ?>
+		<h1 class="entry-title"><?php the_title(); ?></h1>
+		<?php else : ?>
+		<h1 class="entry-title">
+			<a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a>
+		</h1>
+		<?php endif; // is_single() ?>
+
+		<?php twentyfourteen_tags(); ?>
+	</footer><!-- .entry-meta -->
+
+</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
Index: wp-content/themes/twentyfourteen/index.php
===================================================================
--- wp-content/themes/twentyfourteen/index.php	(revision 24862)
+++ wp-content/themes/twentyfourteen/index.php	(working copy)
@@ -27,18 +27,18 @@
 
 				<div id="primary" class="content-area no-sidebar">
 					<div id="content" class="site-content" role="main">
-					<?php
-						if ( have_posts() ) :
-							while ( have_posts() ) :
-								the_post();
-								twentyfourteen_get_template_part();
-							endwhile;
+					<?php if ( have_posts() ) : ?>
 
-							twentyfourteen_content_nav( 'nav-below' );
-						else :
-							get_template_part( 'no-results', 'index' );
-						endif;
-					?>
+						<?php /* The loop */ ?>
+						<?php while ( have_posts() ) : the_post(); ?>
+							<?php get_template_part( 'content', get_post_format() ); ?>
+						<?php endwhile; ?>
+
+						<?php twentyfourteen_content_nav( 'nav-below' ); ?>
+
+					<?php else : ?>
+						<?php get_template_part( 'content', 'none' ); ?>
+					<?php endif; ?>
 					</div><!-- #content .site-content -->
 				</div><!-- #primary .content-area -->
 
@@ -81,4 +81,4 @@
 
 <?php endif; // is_front_page() check ?>
 
-<?php get_footer(); ?>
+<?php get_footer(); ?>
\ No newline at end of file
Index: wp-content/themes/twentyfourteen/content-gallery.php
===================================================================
--- wp-content/themes/twentyfourteen/content-gallery.php	(revision 0)
+++ wp-content/themes/twentyfourteen/content-gallery.php	(revision 0)
@@ -0,0 +1,76 @@
+<?php
+/**
+ * The template for displaying posts in the Gallery post format.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Fourteen
+ */
+?>
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+
+	<?php
+		if ( is_single() && '' != get_the_post_thumbnail() ) {
+			the_post_thumbnail( 'featured-thumbnail-large' );
+		} else {
+			$images = get_children( array(
+				'post_parent'    => $post->ID,
+				'post_type'      => 'attachment',
+				'post_mime_type' => 'image',
+				'orderby'        => 'menu_order',
+				'order'          => 'ASC'
+			) );
+			if ( $images ) {
+				$image = array_shift( $images );
+				printf( '<a href="%1$s" title="%2$s" rel="%3$s" class="attachment-featured-thumbnail">%4$s</a>',
+					get_permalink(),
+					esc_attr( sprintf( __( 'Permalink to %s', 'twentyfourteen' ), the_title_attribute( 'echo=0' ) ) ),
+					get_the_ID(),
+					wp_get_attachment_image( $image->ID, 'featured-thumbnail-large' )
+				);
+			}
+		}
+
+	 ?>
+
+	<header class="entry-header">
+		<div class="entry-meta">
+			<?php twentyfourteen_categories(); ?>
+		</div><!-- .entry-meta -->
+
+		<?php if ( is_single() ) : ?>
+		<h1 class="entry-title"><?php the_title(); ?></h1>
+		<?php else : ?>
+		<h1 class="entry-title">
+			<a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a>
+		</h1>
+		<?php endif; // is_single() ?>
+
+		<div class="entry-meta">
+			<?php twentyfourteen_post_format(); ?>
+			<?php twentyfourteen_posted_on(); ?>
+
+			<?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
+				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
+			<?php endif; ?>
+
+			<?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
+		</div><!-- .entry-meta -->
+	</header><!-- .entry-header -->
+
+	<div class="entry-content">
+		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) ); ?>
+		<?php
+			wp_link_pages( array(
+				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+				'after'       => '</div>',
+				'link_before' => '<span>',
+				'link_after'  => '</span>'
+			) );
+		?>
+	</div><!-- .entry-content -->
+
+	<footer class="entry-meta">
+		<?php twentyfourteen_tags(); ?>
+	</footer><!-- .entry-meta -->
+
+</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
Index: wp-content/themes/twentyfourteen/content-video.php
===================================================================
--- wp-content/themes/twentyfourteen/content-video.php	(revision 0)
+++ wp-content/themes/twentyfourteen/content-video.php	(revision 0)
@@ -0,0 +1,52 @@
+<?php
+/**
+ * The template for displaying posts in the Video post format.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Fourteen
+ */
+?>
+
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+	<header class="entry-header">
+		<div class="entry-meta">
+			<?php twentyfourteen_categories(); ?>
+		</div><!-- .entry-meta -->
+
+		<?php if ( is_single() ) : ?>
+		<h1 class="entry-title"><?php the_title(); ?></h1>
+		<?php else : ?>
+		<h1 class="entry-title">
+			<a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a>
+		</h1>
+		<?php endif; // is_single() ?>
+
+		<div class="entry-meta">
+			<?php twentyfourteen_post_format(); ?>
+			<?php twentyfourteen_posted_on(); ?>
+
+			<?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
+				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
+			<?php endif; ?>
+
+			<?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
+		</div><!-- .entry-meta -->
+	</header><!-- .entry-header -->
+
+	<div class="entry-content">
+		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) ); ?>
+		<?php
+			wp_link_pages( array(
+				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+				'after'       => '</div>',
+				'link_before' => '<span>',
+				'link_after'  => '</span>'
+			) );
+		?>
+	</div><!-- .entry-content -->
+
+	<footer class="entry-meta">
+		<?php twentyfourteen_tags(); ?>
+	</footer><!-- .entry-meta -->
+
+</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
Index: wp-content/themes/twentyfourteen/inc/template-tags.php
===================================================================
--- wp-content/themes/twentyfourteen/inc/template-tags.php	(revision 24862)
+++ wp-content/themes/twentyfourteen/inc/template-tags.php	(working copy)
@@ -147,7 +147,51 @@
 }
 endif;
 
+if ( ! function_exists( 'twentyfourteen_categories' ) ) :
 /**
+ * Prints HTML with the categories of the current post
+ *
+ */
+function twentyfourteen_categories() {
+	/* translators: used between list items, there is a space after the comma */
+	$categories_list = get_the_category_list( __( ', ', 'twentyfourteen' ) );
+
+	if ( $categories_list && twentyfourteen_categorized_blog() ) {
+		echo '<span class="cat-links">' . $categories_list . '</span>';
+	}
+}
+endif;
+
+if ( ! function_exists( 'twentyfourteen_tags' ) ) :
+/**
+ * Prints HTML with the tags of the current post
+ *
+ */
+function twentyfourteen_tags() {
+	$tag_list = get_the_tag_list();
+
+	if ( $tag_list ) {
+		echo '<span class="tag-links">' . $tag_list . '</span>';
+	}
+}
+endif;
+
+if ( ! function_exists( 'twentyfourteen_post_format' ) ) :
+/**
+ * Prints HTML with the format of the current post
+ *
+ */
+function twentyfourteen_post_format() {
+	$post_format = get_post_format();
+	printf( '<span class="post-format"><a class="entry-format" href="%1$s" title="%2$s">%3$s</a></span>',
+		esc_url( get_post_format_link( $post_format ) ),
+		esc_attr( sprintf( __( 'All %s posts', 'twentyfourteen' ), get_post_format_string( $post_format ) ) ),
+		get_post_format_string ( $post_format )
+	);
+}
+endif;
+
+/**
  * Returns true if a blog has more than 1 category
  *
  */