Index: wp-content/themes/twentyfourteen/functions.php
===================================================================
--- wp-content/themes/twentyfourteen/functions.php	(revision 25102)
+++ wp-content/themes/twentyfourteen/functions.php	(working copy)
@@ -57,7 +57,7 @@
 	add_theme_support( 'post-thumbnails', array( 'post' ) );
 
 	// Adding several sizes for Post Thumbnails.
-	add_image_size( 'featured-thumbnail-large', 672, 0 );
+	add_image_size( 'featured-thumbnail-large', 1010, 0 );
 	add_image_size( 'featured-thumbnail-featured', 672, 336, true );
 	add_image_size( 'featured-thumbnail-formatted', 306, 0 );
 
@@ -99,7 +99,7 @@
  * @return void
  */
 function twentyfourteen_content_width() {
-	if ( is_page_template( 'full-width-page.php' ) || is_attachment() )
+	if ( ( ! is_front_page() && ! is_active_sidebar( 'sidebar-3' ) ) || is_page_template( 'full-width-page.php' ) || is_attachment() )
 		$GLOBALS['content_width'] = 895;
 }
 add_action( 'template_redirect', 'twentyfourteen_content_width' );
@@ -122,7 +122,7 @@
 
 		$featured_posts = apply_filters( 'twentyfourteen_get_featured_posts', array() );
 
-	return is_array( $featured_posts ) && count( $featured_posts ) > absint( $minimum );
+	return is_array( $featured_posts ) && count( $featured_posts ) >= absint( $minimum );
 }
 
 /**
@@ -410,13 +410,15 @@
  * @return array The filtered body class list.
  */
 function twentyfourteen_body_classes( $classes ) {
-	// Adds a class of group-blog to blogs with more than 1 published author
-	if ( is_multi_author() ) {
+	// Adds a class of group-blog to blogs with more than 1 published author.
+	if ( is_multi_author() )
 		$classes[] = 'group-blog';
-	}
-	if ( is_archive() || is_search() || is_home() ) {
+
+	if ( is_archive() || is_search() || is_home() )
 		$classes[] = 'list-view';
-	}
+
+	if ( ( ! is_front_page() && ! is_active_sidebar( 'sidebar-3' ) ) || is_page_template( 'full-width-page.php' ) )
+		$classes[] = 'full-width';
 
 	return $classes;
 }
Index: wp-content/themes/twentyfourteen/featured-content.php
===================================================================
--- wp-content/themes/twentyfourteen/featured-content.php	(revision 25102)
+++ wp-content/themes/twentyfourteen/featured-content.php	(working copy)
@@ -9,23 +9,22 @@
  */
 ?>
 
-<div class="featured-content-wrapper">
-	<div id="featured-content" class="featured-content">
 
-		<?php
-			do_action( 'twentyfourteen_featured_posts_before' );
+<div id="featured-content" class="featured-content">
 
-			$featured_posts = twentyfourteen_get_featured_posts();
-			foreach ( (array) $featured_posts as $order => $post ) :
-				setup_postdata( $post );
+	<?php
+		do_action( 'twentyfourteen_featured_posts_before' );
 
-				get_template_part( 'content', 'featured-post' );
-			endforeach;
+		$featured_posts = twentyfourteen_get_featured_posts();
+		foreach ( (array) $featured_posts as $order => $post ) :
+			setup_postdata( $post );
 
-			do_action( 'twentyfourteen_featured_posts_after' );
+			get_template_part( 'content', 'featured-post' );
+		endforeach;
 
-			wp_reset_postdata();
-		?>
+		do_action( 'twentyfourteen_featured_posts_after' );
 
-	</div><!-- .featured-content -->
-</div><!-- .featured-content-wrapper -->
+		wp_reset_postdata();
+	?>
+
+</div><!-- .featured-content -->
Index: wp-content/themes/twentyfourteen/front-page.php
===================================================================
--- wp-content/themes/twentyfourteen/front-page.php	(revision 25102)
+++ wp-content/themes/twentyfourteen/front-page.php	(working copy)
@@ -6,45 +6,35 @@
  * @subpackage Twenty_Fourteen
  */
 
-get_header(); ?>
-
-	<div class="front-page-content-wrapper">
-		<div class="front-page-content-main">
-
-			<?php if ( twentyfourteen_has_featured_posts() ) : ?>
-				<?php get_template_part( 'featured-content' ); ?>
-			<?php endif; ?>
-
-			<div class="front-page-content-area">
+get_header();
 
-				<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();
+if ( twentyfourteen_has_featured_posts() )
+	get_template_part( 'featured-content' );
 
-								get_template_part( 'content', get_post_format() );
+?>
 
-								comments_template();
-							endwhile;
-							twentyfourteen_paging_nav();
+<div id="primary" class="content-area">
+	<div id="content" class="site-content" role="main">
+		<?php
+			if ( have_posts() ) :
+				while ( have_posts() ) :
+					the_post();
 
-						else :
-							get_template_part( 'no-results', 'index' );
+					get_template_part( 'content', get_post_format() );
 
-						endif;
-					?>
-					</div><!-- #content .site-content -->
-				</div><!-- #primary .content-area -->
+					comments_template();
+				endwhile;
+				twentyfourteen_paging_nav();
 
-				<?php get_sidebar( 'ephemera' ); ?>
+			else :
+				get_template_part( 'no-results', 'index' );
 
-			</div><!-- .front-page-content-area -->
-
-		</div><!-- .front-page-content-main -->
-	</div><!-- .front-page-content-wrapper -->
+			endif;
+		?>
+	</div><!-- #content -->
+</div><!-- #primary -->
 
 <?php
+get_sidebar( 'ephemera' );
 get_sidebar();
 get_footer();
Index: wp-content/themes/twentyfourteen/image.php
===================================================================
--- wp-content/themes/twentyfourteen/image.php	(revision 25102)
+++ wp-content/themes/twentyfourteen/image.php	(working copy)
@@ -6,11 +6,13 @@
  * @subpackage Twenty_Fourteen
  */
 
+$metadata = wp_get_attachment_metadata();
+
 get_header();
 ?>
 
 <section id="primary" class="content-area image-attachment">
-	<div id="content" class="site-content full-width" role="main">
+	<div id="content" class="site-content" role="main">
 
 	<?php while ( have_posts() ) : the_post(); ?>
 
@@ -19,8 +21,6 @@
 				<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
 
 				<div class="entry-meta">
-					<?php $metadata = wp_get_attachment_metadata(); ?>
-
 					<span class="entry-date"><time class="entry-date" datetime="<?php echo esc_attr( get_the_date( 'c' ) ); ?>"><?php echo esc_html( get_the_date() ); ?></time></span>
 
 					<span class="full-size-link"><a href="<?php echo wp_get_attachment_url(); ?>" title="Link to full-size image"><?php echo $metadata['width']; ?> &times; <?php echo $metadata['height']; ?></a></span>
Index: wp-content/themes/twentyfourteen/style.css
===================================================================
--- wp-content/themes/twentyfourteen/style.css	(revision 25102)
+++ wp-content/themes/twentyfourteen/style.css	(working copy)
@@ -528,6 +528,7 @@
 .site-main {
 	max-width: 1230px;
 	max-width: 123.0rem;
+	position: relative
 }
 .content-area {
 	padding-top:24px;
@@ -964,6 +965,9 @@
 	max-width: 672px;
 	max-width: 67.2rem;
 }
+.full-width .hentry {
+	max-width: inherit;
+}
 .attachment-featured-thumbnail {
 	background: #767676 url(images/pattern.png) repeat 0 0;
 	background-size: 5px 5px;
@@ -1487,6 +1491,7 @@
 }
 .ephemera .hentry {
 	border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+	border-top: 0;
 	margin-bottom: 18px;
 	margin-bottom: 1.8rem;
 }
@@ -2505,25 +2510,23 @@
 		float: left;
 		padding: 36px 0;
 		padding: 3.6rem 0;
+		position: relative;
 		width: 100%;
 	}
 	.site-content {
 		margin: 0 33.33333333% 0 0;
 	}
-	.content-sidebar {
-		float: right;
-		margin: 0 0 0 -30.35714285%;
-		padding: 36px 10px 24px 0;
-		padding: 3.6rem 1.0rem 2.4rem 0;
-		width: 30.35714285%;
+	.full-width .site-content {
+		margin: 0;
 	}
+	.content-sidebar,
 	.ephemera {
 		border: none;
-		clear: none;
-		float: right;
-		margin: 0 0 0 -30.35714285%;
-		padding: 36px 10px 0 0;
-		padding: 3.6rem 1.0rem 0 0;
+		padding: 36px 10px 24px 0;
+		padding: 3.6rem 1rem 2.4rem 0;
+		position: absolute;
+			right: 0;
+			top: 0;
 		width: 30.35714285%;
 	}
 	#featured-content .hentry {
@@ -2798,13 +2801,12 @@
 	#secondary {
 		background-color: transparent;
 		border-bottom: 0;
-		clear: none;
 		font-size: 1.1rem;
-		float: left;
 		line-height: 1.6363636363;
-		margin: 0 0 0 -100%;
 		padding: 0 27px;
 		padding: 0 2.7rem;
+		position: absolute;
+			top: 0;
 		width: 168px;
 		width: 16.8rem;
 	}
@@ -2821,9 +2823,12 @@
 		margin: 0 27.31707317% 0 222px;
 		margin: 0 27.31707317% 0 22.2rem;
 	}
+	.full-width .site-content {
+		margin: 0 0 0 222px;
+		margin: 0 0 0 22.2rem;
+	}
 	.content-sidebar,
 	.ephemera {
-		margin: 0 0 0 -27.31707317%;
 		width: 24.87804878%;
 	}
 	.content-area .entry-header,
@@ -3053,10 +3058,6 @@
 		max-width: 1260px;
 		max-width: 126.0rem;
 	}
-	.content-sidebar,
-	.ephemera {
-		padding-right: 0;
-	}
 	.content-area .full-width .entry-header,
 	.content-area .full-width .entry-content,
 	.content-area .full-width .page-content,
Index: wp-content/themes/twentyfourteen/full-width-page.php
===================================================================
--- wp-content/themes/twentyfourteen/full-width-page.php	(revision 25102)
+++ wp-content/themes/twentyfourteen/full-width-page.php	(working copy)
@@ -9,7 +9,7 @@
 get_header(); ?>
 
 	<div id="primary" class="content-area">
-		<div id="content" class="site-content full-width" role="main">
+		<div id="content" class="site-content" role="main">
 			<?php
 				while ( have_posts() ) :
 					the_post();
Index: wp-content/themes/twentyfourteen/sidebar-content.php
===================================================================
--- wp-content/themes/twentyfourteen/sidebar-content.php	(revision 25102)
+++ wp-content/themes/twentyfourteen/sidebar-content.php	(working copy)
@@ -5,29 +5,11 @@
  * @package WordPress
  * @subpackage Twenty_Fourteen
  */
-?>
-<div id="content-sidebar" class="content-sidebar widget-area" role="complementary">
-	<?php do_action( 'before_sidebar' ); ?>
 
-	<?php if ( ! dynamic_sidebar( 'sidebar-3' ) ) : ?>
-		<aside id="search" class="widget widget_search">
-				<?php get_search_form(); ?>
-		</aside>
-
-		<aside id="link" class="widget widget_links">
-			<h1 class="widget-title"><?php _e( 'Blogroll', 'twentyfourteen' ); ?></h1>
-			<ul class="xoxo blogroll">
-				<?php wp_list_bookmarks( array( 'title_li' => '', 'categorize' => 0 ) ); ?>
-			</ul>
-		</aside>
+if ( ! is_active_sidebar( 'sidebar-3' ) )
+	return;
+?>
 
-		<aside id="meta" class="widget">
-			<h1 class="widget-title"><?php _e( 'Meta', 'twentyfourteen' ); ?></h1>
-			<ul>
-				<?php wp_register(); ?>
-				<li><?php wp_loginout(); ?></li>
-				<?php wp_meta(); ?>
-			</ul>
-		</aside>
-	<?php endif; // end sidebar widget area ?>
+<div id="content-sidebar" class="content-sidebar widget-area" role="complementary">
+	<?php dynamic_sidebar( 'sidebar-3' ); ?>
 </div><!-- #content-sidebar -->