Index: wp-content/themes/twentyfourteen/style.css
===================================================================
--- wp-content/themes/twentyfourteen/style.css	(revision 25028)
+++ wp-content/themes/twentyfourteen/style.css	(working copy)
@@ -545,14 +545,10 @@
 }
 #page {
 	background-color: #fff;
-	max-width: 1230px;
-	max-width: 123.0rem;
+	max-width: 1260px;
+	max-width: 126.0rem;
 	position: relative;
 }
-#main {
-	max-width: 1230px;
-	max-width: 123.0rem;
-}
 #primary {
 	padding-top:24px;
 	padding-top:2.4rem;
@@ -600,8 +596,8 @@
 
 #masthead {
 	background-color: #000;
-	max-width: 1230px;
-	max-width: 123.0rem;
+	max-width: 1260px;
+	max-width: 126rem;
 	position: relative;
 	width: 100%;
 	z-index: 3;
@@ -981,8 +977,6 @@
 .hentry {
 	margin-bottom: 24px;
 	margin-bottom: 2.4rem;
-	max-width: 672px;
-	max-width: 67.2rem;
 }
 .attachment-featured-thumbnail {
 	background: #8c8c8c url(images/pattern.png) repeat 0 0;
@@ -1367,8 +1361,8 @@
 	width: 100%;
 }
 .front-page-content-area {
-	max-width: 1230px;
-	max-width: 123.0rem;
+	max-width: 1260px;
+	max-width: 126.0rem;
 }
 
 
@@ -2535,9 +2529,6 @@
 		padding: 3.6rem 0;
 		width: 100%;
 	}
-	.site-content {
-		margin: 0 33.33333333% 0 0;
-	}
 	#content-sidebar {
 		float: right;
 		margin: 0 0 0 -30.35714285%;
@@ -2565,12 +2556,11 @@
 		height: 96px;
 		height: 9.6rem;
 	}
-	.full-width.site-content {
-		margin: 0;
+	.secondary-sidebar .site-content,
+	.front-page .site-content {
+		margin-right: 33.33333333%;
 	}
-	.full-width.site-content .hentry {
-		max-width: 100%;
-	}
+
 }
 
 @media screen and (min-width: 740px) {
@@ -2602,19 +2592,6 @@
 		padding: 0 4.46428571% 12px;
 		padding: 0 4.46428571% 1.2rem;
 	}
-	#primary .full-width .entry-header {
-		margin: 0 6.04307432%;
-		padding: 0 0 12px;
-		padding: 0 0 1.2rem;
-	}
-	#primary .full-width .entry-content {
-		margin: 0 6.04307432%;
-		padding: 0;
-	}
-	#primary .full-width footer.entry-meta {
-		margin: 0 6.04307432%;
-		padding: 0;
-	}
 	#primary .format-aside .entry-header,
 	#primary .format-quote .entry-header,
 	#primary .format-link .entry-header,
@@ -2673,20 +2650,10 @@
 		padding-left: 9.12778904%;
 	}
 	#image-navigation .previous-image,
-	#image-navigation .next-image,
-	.full-width .comment-navigation,
-	.full-width .comments-title,
-	.full-width #comments #respond,
-	.full-width .comments-area article,
-	.full-width .comment-list li.trackback,
-	.full-width .comment-list li.pingback {
-		padding-right: 6.04307432%;
-		padding-left: 6.04307432%;
+	#image-navigation .next-image {
+		padding-right: 9.12778904%;
+		padding-left: 9.12778904%;
 	}
-	.full-width #reply-title,
-	.full-width #commentform {
-		padding: 0;
-	}
 	#infinite-handle {
 		margin: 48px 0 0;
 		margin: 4.8rem 0 0;
@@ -2694,7 +2661,8 @@
 	#infinite-handle span {
 		display: inline;
 	}
-	#primary .no-results .entry-header {
+	#primary .no-results .entry-header,
+	.single-attachment #primary .entry-header {
 		margin: 0 4.59183673%;
 		padding: 0 4.46428571%;
 	}
@@ -2735,11 +2703,6 @@
 	.error404 #primary .page-header {
 		margin: 0 8.03571428% 0 12.5%;
 	}
-	#primary .full-width .entry-header,
-	#primary .full-width .entry-content,
-	#primary .full-width footer.entry-meta {
-		margin: 0 11.30926724%;
-	}
 	.page-header {
 		margin: 0 8.03571428% 24px 12.5%;
 		margin: 0 8.03571428% 2.4rem 12.5%;
@@ -2771,8 +2734,7 @@
 	#comments #respond {
 		padding-right: 13.8900862%;
 	}
-	.comment-list,
-	.full-width .comment-list {
+	.comment-list {
 		margin-left: -70px;
 		margin-left: -7.0rem;
 	}
@@ -2780,15 +2742,9 @@
 		padding-left: 17.06896551%;
 	}
 	#image-navigation .previous-image,
-	#image-navigation .next-image,
-	.full-width .comment-navigation,
-	.full-width .comments-title,
-	.full-width #comments #respond,
-	.full-width .comments-area article,
-	.full-width .comment-list li.trackback,
-	.full-width .comment-list li.pingback {
-		padding-right: 11.30926724%;
-		padding-left: 11.30926724%;
+	#image-navigation .next-image {
+		padding-right: 17.06896551%;
+		padding-left: 17.06896551%;
 	}
 	blockquote.pull.alignleft {
 		margin-left: -20%;
@@ -2796,7 +2752,8 @@
 	blockquote.pull.alignright {
 		margin-right: -20%;
 	}
-	#primary .no-results .entry-header {
+	#primary .no-results .entry-header,
+	.single-attachment #primary .entry-header {
 		margin-right: 8.03571428%;
 		margin-left: 12.5%;
 	}
@@ -2831,9 +2788,13 @@
 		padding-left: 22.2rem;
 	}
 	.site-content {
-		margin: 0 27.31707317% 0 222px;
-		margin: 0 27.31707317% 0 22.2rem;
+		margin-left: 222px;
+		margin-left: 22.2rem;
 	}
+	.secondary-sidebar .site-content,
+	.front-page .site-content {
+		margin-right: 27.31707317%;
+	}
 	#secondary {
 		background-color: transparent;
 		border-bottom: 0;
@@ -2853,18 +2814,6 @@
 		margin: -3px 0 21px;
 		margin: -0.3rem 0 2.1rem;
 	}
-	.front-page-content-wrapper {
-		float: left;
-	}
-	.site-content {
-		margin: 0 27.31707317% 0 222px;
-		margin: 0 27.31707317% 0 22.2rem;
-	}
-	#content-sidebar,
-	.post-formatted-posts {
-		margin: 0 0 0 -27.31707317%;
-		width: 24.87804878%;
-	}
 	#primary .entry-header,
 	#primary .page-header {
 		margin: -48px 4.59183673% 0;
@@ -2932,26 +2881,21 @@
 	.secondary-navigation ul li:hover > ul {
 		display: block;
 	}
+	#content-sidebar,
+	.post-formatted-posts {
+		margin: 0 0 0 -27.31707317%;
+		width: 24.87804878%;
+	}
+	.front-page-content-wrapper {
+		float: left;
+	}
 	.page #primary .entry-header,
+	.single-attachment #primary .entry-header,
 	.error404 #primary .page-header {
 		margin: 0 4.59183673%;
 		padding: 0 4.46428571% 12px;
 		padding: 0 4.46428571% 1.2rem;
 	}
-	.full-width.site-content {
-		margin-left: 222px;
-		margin-left: 22.2rem;
-	}
-	#primary .full-width .entry-header {
-		padding: 0 0 12px;
-		padding: 0 0 1.2rem;
-	}
-	#primary .full-width .entry-header,
-	#primary .full-width .entry-content,
-	#primary .full-width .page-content,
-	#primary .full-width footer.entry-meta {
-		margin: 0 5.882236%;
-	}
 	.comments-title,
 	.no-comments,
 	#comments #respond,
@@ -2963,23 +2907,16 @@
 		padding-right: 9.87001616%;
 		padding-left: 9.19765166%;
 	}
-	.comment-list,
-	.full-width .comment-list {
+	.comment-list {
 		margin-left: 0;
 	}
 	.comment-navigation {
 		padding-left: 9.19765166%;
 	}
 	#image-navigation .previous-image,
-	#image-navigation .next-image,
-	.full-width .comment-navigation,
-	.full-width .comments-title,
-	.full-width #comments #respond,
-	.full-width .comments-area article,
-	.full-width .comment-list li.trackback,
-	.full-width .comment-list li.pingback {
-		padding-right: 5.882236%;
-		padding-left: 5.882236%;
+	#image-navigation .next-image {
+		padding-right: 9.19765166%;
+		padding-left: 9.19765166%;
 	}
 	blockquote.pull.alignleft {
 		margin-left: 0;
@@ -3059,8 +2996,7 @@
 	#comments #respond {
 		padding-right: 13.73697916%;
 	}
-	.comment-list,
-	.full-width .comment-list {
+	.comment-list {
 		margin-left: -70px;
 		margin-left: -7.0rem;
 	}
@@ -3072,25 +3008,14 @@
 		margin: 0 8.03571428% 2.4rem 12.5%;
 	}
 	.page #primary .entry-header,
-	.error404 #primary .page-header {
+	.error404 #primary .page-header,
+	.single-attachment #primary .entry-header {
 		margin: 0 8.03571428% 0 12.5%;
 	}
-	#primary .full-width .entry-header,
-	#primary .full-width .entry-content,
-	#primary .full-width .page-content,
-	#primary .full-width footer.entry-meta {
-		margin: 0 11.21868265%;
-	}
 	#image-navigation .previous-image,
-	#image-navigation .next-image,
-	.full-width .comment-navigation,
-	.full-width .comments-title,
-	.full-width #comments #respond,
-	.full-width .comments-area article,
-	.full-width .comment-list li.trackback,
-	.full-width .comment-list li.pingback {
-		padding-right: 11.21868265%;
-		padding-left: 11.21868265%;
+	#image-navigation .next-image {
+		padding-right: 16.77524429%;
+		padding-left: 16.77524429%;
 	}
 	#primary .entry-content .wp-caption.alignleft .wp-caption-text {
 		padding-left: 10px;
@@ -3105,30 +3030,12 @@
 }
 
 @media screen and (min-width: 1230px) {
-	#page,
-	#masthead,
-	.home #main {
-		max-width: 1260px;
-		max-width: 126.0rem;
-	}
 	#content-sidebar,
 	.post-formatted-posts {
-		padding-right: 0;
+		padding-right: 30px;
 	}
-	#primary .full-width .entry-header,
-	#primary .full-width .entry-content,
-	#primary .full-width .page-content,
-	#primary .full-width footer.entry-meta {
-		margin: 0 0 0 11.21868265%;
-	}
 	#image-navigation .previous-image,
-	#image-navigation .next-image,
-	.full-width .comment-navigation,
-	.full-width .comments-title,
-	.full-width #comments #respond,
-	.full-width .comments-area article,
-	.full-width .comment-list li.trackback,
-	.full-width .comment-list li.pingback {
+	#image-navigation .next-image {
 		padding-right: 0;
 	}
 }
\ No newline at end of file
Index: wp-content/themes/twentyfourteen/sidebar-content.php
===================================================================
--- wp-content/themes/twentyfourteen/sidebar-content.php	(revision 25028)
+++ wp-content/themes/twentyfourteen/sidebar-content.php	(working copy)
@@ -6,28 +6,12 @@
  * @subpackage Twenty_Fourteen
  */
 ?>
-<div id="content-sidebar" class="widget-area" role="complementary">
-	<?php do_action( 'before_sidebar' ); ?>
 
-	<?php if ( ! dynamic_sidebar( 'sidebar-2' ) ) : ?>
-		<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>
-
-		<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><!-- #content-sidebar -->
+<?php if ( is_active_sidebar( 'sidebar-2' ) ) : ?>
+	<div id="content-sidebar" class="widget-area" role="complementary">
+		<?php
+			do_action( 'before_sidebar' );
+			dynamic_sidebar( 'sidebar-2' );
+		?>
+	</div><!-- #content-sidebar .widget-area -->
+<?php endif; ?>
\ No newline at end of file
Index: wp-content/themes/twentyfourteen/full-width-page.php
===================================================================
--- wp-content/themes/twentyfourteen/full-width-page.php	(revision 25028)
+++ 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/functions.php
===================================================================
--- wp-content/themes/twentyfourteen/functions.php	(revision 25028)
+++ 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', 1038, 0 );
 	add_image_size( 'featured-thumbnail-featured', 672, 336, true );
 	add_image_size( 'featured-thumbnail-formatted', 306, 0 );
 
@@ -459,13 +459,21 @@
  */
 function twentyfourteen_body_classes( $classes ) {
 	// Adds a class of group-blog to blogs with more than 1 published author
-	if ( is_multi_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() )
+		$classes[] = 'front-page';
+
+	if ( is_active_sidebar( 'sidebar-1' ) )
+		$classes[] = 'primary-sidebar';
+
+	if ( is_active_sidebar( 'sidebar-2' ) && ! is_attachment() && ! is_page_template( 'full-width-page.php' ) )
+		$classes[] = 'secondary-sidebar';
+
 	return $classes;
 }
 add_filter( 'body_class', 'twentyfourteen_body_classes' );
Index: wp-content/themes/twentyfourteen/image.php
===================================================================
--- wp-content/themes/twentyfourteen/image.php	(revision 25028)
+++ wp-content/themes/twentyfourteen/image.php	(working copy)
@@ -10,7 +10,7 @@
 ?>
 
 <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(); ?>