Index: src/wp-content/plugins/hello.php
===================================================================
--- src/wp-content/plugins/hello.php	(revision 40901)
+++ src/wp-content/plugins/hello.php	(working copy)
@@ -79,4 +79,4 @@
 
 add_action( 'admin_head', 'dolly_css' );
 
-?>
+
Index: src/wp-content/themes/twentyeleven/404.php
===================================================================
--- src/wp-content/themes/twentyeleven/404.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/404.php	(working copy)
@@ -22,19 +22,34 @@
 
 					<?php get_search_form(); ?>
 
-					<?php the_widget( 'WP_Widget_Recent_Posts', array( 'number' => 10 ), array( 'widget_id' => '404' ) ); ?>
+					<?php the_widget( 'WP_Widget_Recent_Posts', array(
+						'number' => 10,
+						), array(
+						'widget_id' => '404',
+					) ); ?>
 
 					<div class="widget">
 						<h2 class="widgettitle"><?php _e( 'Most Used Categories', 'twentyeleven' ); ?></h2>
 						<ul>
-						<?php wp_list_categories( array( 'orderby' => 'count', 'order' => 'DESC', 'show_count' => 1, 'title_li' => '', 'number' => 10 ) ); ?>
+						<?php wp_list_categories( array(
+							'orderby' => 'count',
+							'order' => 'DESC',
+							'show_count' => 1,
+							'title_li' => '',
+							'number' => 10,
+						) ); ?>
 						</ul>
 					</div>
 
 					<?php
 					/* translators: %1$s: smilie */
 					$archive_content = '<p>' . sprintf( __( 'Try looking in the monthly archives. %1$s', 'twentyeleven' ), convert_smilies( ':)' ) ) . '</p>';
-					the_widget( 'WP_Widget_Archives', array( 'count' => 0, 'dropdown' => 1 ), array( 'after_title' => '</h2>' . $archive_content ) );
+					the_widget( 'WP_Widget_Archives', array(
+						'count' => 0,
+						'dropdown' => 1,
+						), array(
+						'after_title' => '</h2>' . $archive_content,
+					) );
 					?>
 
 					<?php the_widget( 'WP_Widget_Tag_Cloud' ); ?>
@@ -45,4 +60,4 @@
 		</div><!-- #content -->
 	</div><!-- #primary -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: src/wp-content/themes/twentyeleven/author.php
===================================================================
--- src/wp-content/themes/twentyeleven/author.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/author.php	(working copy)
@@ -98,4 +98,4 @@
 		</section><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: src/wp-content/themes/twentyeleven/category.php
===================================================================
--- src/wp-content/themes/twentyeleven/category.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/category.php	(working copy)
@@ -21,16 +21,16 @@
 
 					<?php
 						$category_description = category_description();
-						if ( ! empty( $category_description ) ) {
-							/**
+					if ( ! empty( $category_description ) ) {
+						/**
 							 * Filter the default Twenty Eleven category description.
 							 *
 							 * @since Twenty Eleven 1.0
 							 *
 							 * @param string The default category description HTML.
 							 */
-							echo apply_filters( 'category_archive_meta', '<div class="category-archive-meta">' . $category_description . '</div>' );
-						}
+						echo apply_filters( 'category_archive_meta', '<div class="category-archive-meta">' . $category_description . '</div>' );
+					}
 					?>
 				</header>
 
Index: src/wp-content/themes/twentyeleven/comments.php
===================================================================
--- src/wp-content/themes/twentyeleven/comments.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/comments.php	(working copy)
@@ -32,7 +32,7 @@
 		<h2 id="comments-title">
 			<?php
 				printf( _n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentyeleven' ),
-					number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
+				number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
 			?>
 		</h2>
 
@@ -53,7 +53,9 @@
 				 * define twentyeleven_comment() and that will be used instead.
 				 * See twentyeleven_comment() in twentyeleven/functions.php for more.
 				 */
-				wp_list_comments( array( 'callback' => 'twentyeleven_comment' ) );
+				wp_list_comments( array(
+					'callback' => 'twentyeleven_comment',
+				) );
 			?>
 		</ol>
 
Index: src/wp-content/themes/twentyeleven/content-featured.php
===================================================================
--- src/wp-content/themes/twentyeleven/content-featured.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/content-featured.php	(working copy)
@@ -20,18 +20,21 @@
 
 	<div class="entry-summary">
 		<?php the_excerpt(); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+		<?php wp_link_pages( array(
+			'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+			'after' => '</div>',
+		) ); ?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
 		<?php
 			/* translators: used between list items, there is a space after the comma */
 			$tag_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
-			if ( '' != $tag_list ) {
-				$utility_text = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
-			} else {
-				$utility_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
-			}
+		if ( '' != $tag_list ) {
+			$utility_text = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
+		} else {
+			$utility_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
+		}
 			printf(
 				$utility_text,
 				/* translators: used between list items, there is a space after the comma */
Index: src/wp-content/themes/twentyeleven/content-image.php
===================================================================
--- src/wp-content/themes/twentyeleven/content-image.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/content-image.php	(working copy)
@@ -27,7 +27,10 @@
 
 		<div class="entry-content">
 			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+			<?php wp_link_pages( array(
+				'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+				'after' => '</div>',
+			) ); ?>
 		</div><!-- .entry-content -->
 
 		<footer class="entry-meta">
@@ -47,16 +50,16 @@
 				<?php
 					/* translators: used between list items, there is a space after the comma */
 					$categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
-					if ( $categories_list ):
+				if ( $categories_list ) :
 				?>
 				<span class="cat-links">
-					<?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list ); ?>
+				<?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), '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( '', __( ', ', 'twentyeleven' ) );
-					if ( $tags_list ): ?>
+				if ( $tags_list ) : ?>
 				<span class="tag-links">
 					<?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
 				</span>
Index: src/wp-content/themes/twentyeleven/content-intro.php
===================================================================
--- src/wp-content/themes/twentyeleven/content-intro.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/content-intro.php	(working copy)
@@ -15,7 +15,10 @@
 
 	<div class="entry-content">
 		<?php the_content(); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+		<?php wp_link_pages( array(
+			'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+			'after' => '</div>',
+		) ); ?>
 		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 	</div><!-- .entry-content -->
 </article><!-- #post-<?php the_ID(); ?> -->
Index: src/wp-content/themes/twentyeleven/content-page.php
===================================================================
--- src/wp-content/themes/twentyeleven/content-page.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/content-page.php	(working copy)
@@ -15,7 +15,10 @@
 
 	<div class="entry-content">
 		<?php the_content(); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+		<?php wp_link_pages( array(
+			'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+			'after' => '</div>',
+		) ); ?>
 	</div><!-- .entry-content -->
 	<footer class="entry-meta">
 		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
Index: src/wp-content/themes/twentyeleven/content-quote.php
===================================================================
--- src/wp-content/themes/twentyeleven/content-quote.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/content-quote.php	(working copy)
@@ -33,7 +33,10 @@
 		<?php else : ?>
 		<div class="entry-content">
 			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+			<?php wp_link_pages( array(
+				'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+				'after' => '</div>',
+			) ); ?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>
 
@@ -42,17 +45,17 @@
 			<?php
 				/* translators: used between list items, there is a space after the comma */
 				$categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
-				if ( $categories_list ):
+			if ( $categories_list ) :
 			?>
 			<span class="cat-links">
-				<?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list );
-				$show_sep = true; ?>
+			<?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list );
+			$show_sep = true; ?>
 			</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( '', __( ', ', 'twentyeleven' ) );
-				if ( $tags_list ):
+			if ( $tags_list ) :
 				if ( $show_sep ) : ?>
 			<span class="sep"> | </span>
 				<?php endif; // End if $show_sep ?>
Index: src/wp-content/themes/twentyeleven/content-single.php
===================================================================
--- src/wp-content/themes/twentyeleven/content-single.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/content-single.php	(working copy)
@@ -31,13 +31,13 @@
 
 			/* translators: used between list items, there is a space after the comma */
 			$tag_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
-			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>.', 'twentyeleven' );
-			} 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>.', 'twentyeleven' );
-			} 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>.', 'twentyeleven' );
-			}
+		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>.', 'twentyeleven' );
+		} 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>.', 'twentyeleven' );
+		} 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>.', 'twentyeleven' );
+		}
 
 			printf(
 				$utility_text,
Index: src/wp-content/themes/twentyeleven/content.php
===================================================================
--- src/wp-content/themes/twentyeleven/content.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/content.php	(working copy)
@@ -39,7 +39,10 @@
 		<?php else : ?>
 		<div class="entry-content">
 			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+			<?php wp_link_pages( array(
+				'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+				'after' => '</div>',
+			) ); ?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>
 
@@ -49,11 +52,11 @@
 			<?php
 				/* translators: used between list items, there is a space after the comma */
 				$categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
-				if ( $categories_list ):
+			if ( $categories_list ) :
 			?>
 			<span class="cat-links">
-				<?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list );
-				$show_sep = true; ?>
+			<?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list );
+			$show_sep = true; ?>
 			</span>
 			<?php endif; // End if categories ?>
 			<?php endif; // End if is_object_in_taxonomy( get_post_type(), 'category' ) ?>
@@ -61,7 +64,7 @@
 			<?php
 				/* translators: used between list items, there is a space after the comma */
 				$tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
-				if ( $tags_list ):
+			if ( $tags_list ) :
 				if ( $show_sep ) : ?>
 			<span class="sep"> | </span>
 				<?php endif; // End if $show_sep ?>
Index: src/wp-content/themes/twentyeleven/footer.php
===================================================================
--- src/wp-content/themes/twentyeleven/footer.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/footer.php	(working copy)
@@ -19,8 +19,9 @@
 				 * A sidebar in the footer? Yep. You can customize
 				 * your footer with three columns of widgets.
 				 */
-				if ( ! is_404() )
-					get_sidebar( 'footer' );
+			if ( ! is_404() ) {
+				get_sidebar( 'footer' );
+			}
 			?>
 
 			<div id="site-generator">
@@ -33,4 +34,4 @@
 <?php wp_footer(); ?>
 
 </body>
-</html>
\ No newline at end of file
+</html>
Index: src/wp-content/themes/twentyeleven/functions.php
===================================================================
--- src/wp-content/themes/twentyeleven/functions.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/functions.php	(working copy)
@@ -39,16 +39,17 @@
  */
 
 // Set the content width based on the theme's design and stylesheet.
-if ( ! isset( $content_width ) )
+if ( ! isset( $content_width ) ) {
 	$content_width = 584;
+}
 
 /*
  * Tell WordPress to run twentyeleven_setup() when the 'after_setup_theme' hook is run.
  */
 add_action( 'after_setup_theme', 'twentyeleven_setup' );
 
-if ( ! function_exists( 'twentyeleven_setup' ) ):
-/**
+if ( ! function_exists( 'twentyeleven_setup' ) ) :
+	/**
  * Set up theme defaults and registers support for various WordPress features.
  *
  * Note that this function is hooked into the after_setup_theme hook, which runs
@@ -68,187 +69,188 @@
  *
  * @since Twenty Eleven 1.0
  */
-function twentyeleven_setup() {
-
-	/*
-	 * Make Twenty Eleven available for translation.
-	 * Translations can be added to the /languages/ directory.
-	 * If you're building a theme based on Twenty Eleven, use
-	 * a find and replace to change 'twentyeleven' to the name
-	 * of your theme in all the template files.
-	 */
-	load_theme_textdomain( 'twentyeleven', get_template_directory() . '/languages' );
-
-	// This theme styles the visual editor with editor-style.css to match the theme style.
-	add_editor_style();
-
-	// Load up our theme options page and related code.
-	require( get_template_directory() . '/inc/theme-options.php' );
-
-	// Grab Twenty Eleven's Ephemera widget.
-	require( get_template_directory() . '/inc/widgets.php' );
-
-	// Add default posts and comments RSS feed links to <head>.
-	add_theme_support( 'automatic-feed-links' );
-
-	// This theme uses wp_nav_menu() in one location.
-	register_nav_menu( 'primary', __( 'Primary Menu', 'twentyeleven' ) );
-
-	// Add support for a variety of post formats
-	add_theme_support( 'post-formats', array( 'aside', 'link', 'gallery', 'status', 'quote', 'image' ) );
-
-	$theme_options = twentyeleven_get_theme_options();
-	if ( 'dark' == $theme_options['color_scheme'] )
-		$default_background_color = '1d1d1d';
-	else
-		$default_background_color = 'e2e2e2';
+	function twentyeleven_setup() {
 
-	// Add support for custom backgrounds.
-	add_theme_support( 'custom-background', array(
 		/*
-		 * Let WordPress know what our default background color is.
-		 * This is dependent on our current color scheme.
+		 * Make Twenty Eleven available for translation.
+		 * Translations can be added to the /languages/ directory.
+		 * If you're building a theme based on Twenty Eleven, use
+		 * a find and replace to change 'twentyeleven' to the name
+		 * of your theme in all the template files.
 		 */
-		'default-color' => $default_background_color,
-	) );
+		load_theme_textdomain( 'twentyeleven', get_template_directory() . '/languages' );
+
+		// This theme styles the visual editor with editor-style.css to match the theme style.
+		add_editor_style();
+
+		// Load up our theme options page and related code.
+		require( get_template_directory() . '/inc/theme-options.php' );
 
-	// This theme uses Featured Images (also known as post thumbnails) for per-post/per-page Custom Header images
-	add_theme_support( 'post-thumbnails' );
+		// Grab Twenty Eleven's Ephemera widget.
+		require( get_template_directory() . '/inc/widgets.php' );
+
+		// Add default posts and comments RSS feed links to <head>.
+		add_theme_support( 'automatic-feed-links' );
+
+		// This theme uses wp_nav_menu() in one location.
+		register_nav_menu( 'primary', __( 'Primary Menu', 'twentyeleven' ) );
+
+		// Add support for a variety of post formats
+		add_theme_support( 'post-formats', array( 'aside', 'link', 'gallery', 'status', 'quote', 'image' ) );
+
+		$theme_options = twentyeleven_get_theme_options();
+		if ( 'dark' == $theme_options['color_scheme'] ) {
+			$default_background_color = '1d1d1d';
+		} else { $default_background_color = 'e2e2e2';
+		}
 
-	// Add support for custom headers.
-	$custom_header_support = array(
-		// The default header text color.
-		'default-text-color' => '000',
-		// The height and width of our custom header.
-		/**
+		// Add support for custom backgrounds.
+		add_theme_support( 'custom-background', array(
+			/*
+            * Let WordPress know what our default background color is.
+            * This is dependent on our current color scheme.
+            */
+			'default-color' => $default_background_color,
+		) );
+
+			// This theme uses Featured Images (also known as post thumbnails) for per-post/per-page Custom Header images
+			add_theme_support( 'post-thumbnails' );
+
+			// Add support for custom headers.
+			$custom_header_support = array(
+			// The default header text color.
+			'default-text-color' => '000',
+			// The height and width of our custom header.
+			/**
 		 * Filter the Twenty Eleven default header image width.
 		 *
 		 * @since Twenty Eleven 1.0
 		 *
 		 * @param int The default header image width in pixels. Default 1000.
 		 */
-		'width' => apply_filters( 'twentyeleven_header_image_width', 1000 ),
-		/**
+			'width' => apply_filters( 'twentyeleven_header_image_width', 1000 ),
+			/**
 		 * Filter the Twenty Eleven default header image height.
 		 *
 		 * @since Twenty Eleven 1.0
 		 *
 		 * @param int The default header image height in pixels. Default 288.
 		 */
-		'height' => apply_filters( 'twentyeleven_header_image_height', 288 ),
-		// Support flexible heights.
-		'flex-height' => true,
-		// Random image rotation by default.
-		'random-default' => true,
-		// Callback for styling the header.
-		'wp-head-callback' => 'twentyeleven_header_style',
-		// Callback for styling the header preview in the admin.
-		'admin-head-callback' => 'twentyeleven_admin_header_style',
-		// Callback used to display the header preview in the admin.
-		'admin-preview-callback' => 'twentyeleven_admin_header_image',
-	);
-
-	add_theme_support( 'custom-header', $custom_header_support );
-
-	if ( ! function_exists( 'get_custom_header' ) ) {
-		// This is all for compatibility with versions of WordPress prior to 3.4.
-		define( 'HEADER_TEXTCOLOR', $custom_header_support['default-text-color'] );
-		define( 'HEADER_IMAGE', '' );
-		define( 'HEADER_IMAGE_WIDTH', $custom_header_support['width'] );
-		define( 'HEADER_IMAGE_HEIGHT', $custom_header_support['height'] );
-		add_custom_image_header( $custom_header_support['wp-head-callback'], $custom_header_support['admin-head-callback'], $custom_header_support['admin-preview-callback'] );
-		add_custom_background();
-	}
-
-	/*
-	 * We'll be using post thumbnails for custom header images on posts and pages.
-	 * We want them to be the size of the header image that we just defined.
-	 * Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
-	 */
-	set_post_thumbnail_size( $custom_header_support['width'], $custom_header_support['height'], true );
-
-	/*
-	 * Add Twenty Eleven's custom image sizes.
-	 * Used for large feature (header) images.
-	 */
-	add_image_size( 'large-feature', $custom_header_support['width'], $custom_header_support['height'], true );
-	// Used for featured posts if a large-feature doesn't exist.
-	add_image_size( 'small-feature', 500, 300 );
-
-	// Default custom headers packaged with the theme. %s is a placeholder for the theme template directory URI.
-	register_default_headers( array(
-		'wheel' => array(
-			'url' => '%s/images/headers/wheel.jpg',
-			'thumbnail_url' => '%s/images/headers/wheel-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Wheel', 'twentyeleven' )
-		),
-		'shore' => array(
-			'url' => '%s/images/headers/shore.jpg',
-			'thumbnail_url' => '%s/images/headers/shore-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Shore', 'twentyeleven' )
-		),
-		'trolley' => array(
-			'url' => '%s/images/headers/trolley.jpg',
-			'thumbnail_url' => '%s/images/headers/trolley-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Trolley', 'twentyeleven' )
-		),
-		'pine-cone' => array(
-			'url' => '%s/images/headers/pine-cone.jpg',
-			'thumbnail_url' => '%s/images/headers/pine-cone-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Pine Cone', 'twentyeleven' )
-		),
-		'chessboard' => array(
-			'url' => '%s/images/headers/chessboard.jpg',
-			'thumbnail_url' => '%s/images/headers/chessboard-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Chessboard', 'twentyeleven' )
-		),
-		'lanterns' => array(
-			'url' => '%s/images/headers/lanterns.jpg',
-			'thumbnail_url' => '%s/images/headers/lanterns-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Lanterns', 'twentyeleven' )
-		),
-		'willow' => array(
-			'url' => '%s/images/headers/willow.jpg',
-			'thumbnail_url' => '%s/images/headers/willow-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Willow', 'twentyeleven' )
-		),
-		'hanoi' => array(
-			'url' => '%s/images/headers/hanoi.jpg',
-			'thumbnail_url' => '%s/images/headers/hanoi-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Hanoi Plant', 'twentyeleven' )
-		)
-	) );
+			'height' => apply_filters( 'twentyeleven_header_image_height', 288 ),
+			// Support flexible heights.
+			'flex-height' => true,
+			// Random image rotation by default.
+			'random-default' => true,
+			// Callback for styling the header.
+			'wp-head-callback' => 'twentyeleven_header_style',
+			// Callback for styling the header preview in the admin.
+			'admin-head-callback' => 'twentyeleven_admin_header_style',
+			// Callback used to display the header preview in the admin.
+			'admin-preview-callback' => 'twentyeleven_admin_header_image',
+			);
+
+			add_theme_support( 'custom-header', $custom_header_support );
+
+		if ( ! function_exists( 'get_custom_header' ) ) {
+			// This is all for compatibility with versions of WordPress prior to 3.4.
+			define( 'HEADER_TEXTCOLOR', $custom_header_support['default-text-color'] );
+			define( 'HEADER_IMAGE', '' );
+			define( 'HEADER_IMAGE_WIDTH', $custom_header_support['width'] );
+			define( 'HEADER_IMAGE_HEIGHT', $custom_header_support['height'] );
+			add_custom_image_header( $custom_header_support['wp-head-callback'], $custom_header_support['admin-head-callback'], $custom_header_support['admin-preview-callback'] );
+			add_custom_background();
+		}
 
-	// Indicate widget sidebars can use selective refresh in the Customizer.
-	add_theme_support( 'customize-selective-refresh-widgets' );
-}
+			/*
+			 * We'll be using post thumbnails for custom header images on posts and pages.
+			 * We want them to be the size of the header image that we just defined.
+			 * Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
+			 */
+			set_post_thumbnail_size( $custom_header_support['width'], $custom_header_support['height'], true );
+
+			/*
+			 * Add Twenty Eleven's custom image sizes.
+			 * Used for large feature (header) images.
+			 */
+			add_image_size( 'large-feature', $custom_header_support['width'], $custom_header_support['height'], true );
+			// Used for featured posts if a large-feature doesn't exist.
+			add_image_size( 'small-feature', 500, 300 );
+
+			// Default custom headers packaged with the theme. %s is a placeholder for the theme template directory URI.
+			register_default_headers( array(
+				'wheel' => array(
+				'url' => '%s/images/headers/wheel.jpg',
+				'thumbnail_url' => '%s/images/headers/wheel-thumbnail.jpg',
+				/* translators: header image description */
+				'description' => __( 'Wheel', 'twentyeleven' ),
+				),
+				'shore' => array(
+				'url' => '%s/images/headers/shore.jpg',
+				'thumbnail_url' => '%s/images/headers/shore-thumbnail.jpg',
+				/* translators: header image description */
+				'description' => __( 'Shore', 'twentyeleven' ),
+				),
+				'trolley' => array(
+				'url' => '%s/images/headers/trolley.jpg',
+				'thumbnail_url' => '%s/images/headers/trolley-thumbnail.jpg',
+				/* translators: header image description */
+				'description' => __( 'Trolley', 'twentyeleven' ),
+				),
+				'pine-cone' => array(
+				'url' => '%s/images/headers/pine-cone.jpg',
+				'thumbnail_url' => '%s/images/headers/pine-cone-thumbnail.jpg',
+				/* translators: header image description */
+				'description' => __( 'Pine Cone', 'twentyeleven' ),
+				),
+				'chessboard' => array(
+				'url' => '%s/images/headers/chessboard.jpg',
+				'thumbnail_url' => '%s/images/headers/chessboard-thumbnail.jpg',
+				/* translators: header image description */
+				'description' => __( 'Chessboard', 'twentyeleven' ),
+				),
+				'lanterns' => array(
+				'url' => '%s/images/headers/lanterns.jpg',
+				'thumbnail_url' => '%s/images/headers/lanterns-thumbnail.jpg',
+				/* translators: header image description */
+				'description' => __( 'Lanterns', 'twentyeleven' ),
+				),
+				'willow' => array(
+				'url' => '%s/images/headers/willow.jpg',
+				'thumbnail_url' => '%s/images/headers/willow-thumbnail.jpg',
+				/* translators: header image description */
+				'description' => __( 'Willow', 'twentyeleven' ),
+				),
+				'hanoi' => array(
+				'url' => '%s/images/headers/hanoi.jpg',
+				'thumbnail_url' => '%s/images/headers/hanoi-thumbnail.jpg',
+				/* translators: header image description */
+				'description' => __( 'Hanoi Plant', 'twentyeleven' ),
+				),
+			) );
+
+			// Indicate widget sidebars can use selective refresh in the Customizer.
+			add_theme_support( 'customize-selective-refresh-widgets' );
+	}
 endif; // twentyeleven_setup
 
 if ( ! function_exists( 'twentyeleven_header_style' ) ) :
-/**
+	/**
  * Styles the header image and text displayed on the blog.
  *
  * @since Twenty Eleven 1.0
  */
-function twentyeleven_header_style() {
-	$text_color = get_header_textcolor();
+	function twentyeleven_header_style() {
+		$text_color = get_header_textcolor();
 
-	// If no custom options for text are set, let's bail.
-	if ( $text_color == HEADER_TEXTCOLOR )
-		return;
+		// If no custom options for text are set, let's bail.
+		if ( $text_color == HEADER_TEXTCOLOR ) {
+			return;
+		}
 
-	// If we get this far, we have custom styles. Let's do this.
-	?>
-	<style type="text/css" id="twentyeleven-header-css">
-	<?php
+		// If we get this far, we have custom styles. Let's do this.
+		?>
+		<style type="text/css" id="twentyeleven-header-css">
+		<?php
 		// Has the text been hidden?
 		if ( 'blank' == $text_color ) :
 	?>
@@ -269,48 +271,48 @@
 	<?php endif; ?>
 	</style>
 	<?php
-}
+	}
 endif; // twentyeleven_header_style
 
 if ( ! function_exists( 'twentyeleven_admin_header_style' ) ) :
-/**
+	/**
  * Styles the header image displayed on the Appearance > Header admin panel.
  *
  * Referenced via add_theme_support('custom-header') in twentyeleven_setup().
  *
  * @since Twenty Eleven 1.0
  */
-function twentyeleven_admin_header_style() {
-?>
-	<style type="text/css" id="twentyeleven-admin-header-css">
-	.appearance_page_custom-header #headimg {
+	function twentyeleven_admin_header_style() {
+		?>
+		<style type="text/css" id="twentyeleven-admin-header-css">
+		.appearance_page_custom-header #headimg {
 		border: none;
-	}
-	#headimg h1,
-	#desc {
+		}
+		#headimg h1,
+		#desc {
 		font-family: "Helvetica Neue", Arial, Helvetica, "Nimbus Sans L", sans-serif;
-	}
-	#headimg h1 {
+		}
+		#headimg h1 {
 		margin: 0;
-	}
-	#headimg h1 a {
+		}
+		#headimg h1 a {
 		font-size: 32px;
 		line-height: 36px;
 		text-decoration: none;
-	}
-	#desc {
+		}
+		#desc {
 		font-size: 14px;
 		line-height: 23px;
 		padding: 0 0 3em;
-	}
-	<?php
+		}
+		<?php
 		// If the user has set a custom color for the text use that
 		if ( get_header_textcolor() != HEADER_TEXTCOLOR ) :
 	?>
-		#site-title a,
-		#site-description {
-			color: #<?php echo get_header_textcolor(); ?>;
-		}
+	#site-title a,
+	#site-description {
+		color: #<?php echo get_header_textcolor(); ?>;
+	}
 	<?php endif; ?>
 	#headimg img {
 		max-width: 1000px;
@@ -318,35 +320,36 @@
 		width: 100%;
 	}
 	</style>
-<?php
-}
+	<?php
+	}
 endif; // twentyeleven_admin_header_style
 
 if ( ! function_exists( 'twentyeleven_admin_header_image' ) ) :
-/**
+	/**
  * Custom header image markup displayed on the Appearance > Header admin panel.
  *
  * Referenced via add_theme_support('custom-header') in twentyeleven_setup().
  *
  * @since Twenty Eleven 1.0
  */
-function twentyeleven_admin_header_image() { ?>
-	<div id="headimg">
-		<?php
-		$color = get_header_textcolor();
-		$image = get_header_image();
-		$style = 'display: none;';
-		if ( $color && $color != 'blank' ) {
-			$style = 'color: #' . $color . ';';
-		}
-		?>
-		<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( $style ); ?>" onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
-		<div id="desc" class="displaying-header-text" style="<?php echo esc_attr( $style ); ?>"><?php bloginfo( 'description' ); ?></div>
-  		<?php if ( $image ) : ?>
+	function twentyeleven_admin_header_image() {
+	?>
+			<div id="headimg">
+				<?php
+				$color = get_header_textcolor();
+				$image = get_header_image();
+				$style = 'display: none;';
+				if ( $color && $color != 'blank' ) {
+					$style = 'color: #' . $color . ';';
+				}
+				?>
+				<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( $style ); ?>" onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
+			<div id="desc" class="displaying-header-text" style="<?php echo esc_attr( $style ); ?>"><?php bloginfo( 'description' ); ?></div>
+			<?php if ( $image ) : ?>
 			<img src="<?php echo esc_url( $image ); ?>" alt="" />
 		<?php endif; ?>
-	</div>
-<?php }
+			</div>
+		<?php }
 endif; // twentyeleven_admin_header_image
 
 /**
@@ -367,16 +370,16 @@
 add_filter( 'excerpt_length', 'twentyeleven_excerpt_length' );
 
 if ( ! function_exists( 'twentyeleven_continue_reading_link' ) ) :
-/**
+	/**
  * Return a "Continue Reading" link for excerpts
  *
  * @since Twenty Eleven 1.0
  *
  * @return string The "Continue Reading" HTML link.
  */
-function twentyeleven_continue_reading_link() {
-	return ' <a href="'. esc_url( get_permalink() ) . '">' . __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) . '</a>';
-}
+	function twentyeleven_continue_reading_link() {
+		return ' <a href="' . esc_url( get_permalink() ) . '">' . __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) . '</a>';
+	}
 endif; // twentyeleven_continue_reading_link
 
 /**
@@ -428,8 +431,9 @@
  * @return array The filtered page menu arguments.
  */
 function twentyeleven_page_menu_args( $args ) {
-	if ( ! isset( $args['show_home'] ) )
+	if ( ! isset( $args['show_home'] ) ) {
 		$args['show_home'] = true;
+	}
 	return $args;
 }
 add_filter( 'wp_page_menu_args', 'twentyeleven_page_menu_args' );
@@ -497,24 +501,24 @@
 add_action( 'widgets_init', 'twentyeleven_widgets_init' );
 
 if ( ! function_exists( 'twentyeleven_content_nav' ) ) :
-/**
+	/**
  * Display navigation to next/previous pages when applicable.
  *
  * @since Twenty Eleven 1.0
  *
  * @param string $html_id The HTML id attribute.
  */
-function twentyeleven_content_nav( $html_id ) {
-	global $wp_query;
+	function twentyeleven_content_nav( $html_id ) {
+		global $wp_query;
 
-	if ( $wp_query->max_num_pages > 1 ) : ?>
-		<nav id="<?php echo esc_attr( $html_id ); ?>">
-			<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentyeleven' ); ?></h3>
-			<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyeleven' ) ); ?></div>
-			<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?></div>
-		</nav><!-- #nav-above -->
-	<?php endif;
-}
+		if ( $wp_query->max_num_pages > 1 ) : ?>
+			<nav id="<?php echo esc_attr( $html_id ); ?>">
+				<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentyeleven' ); ?></h3>
+				<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyeleven' ) ); ?></div>
+				<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?></div>
+			</nav><!-- #nav-above -->
+		<?php endif;
+	}
 endif; // twentyeleven_content_nav
 
 /**
@@ -531,8 +535,9 @@
 	$content = get_the_content();
 	$has_url = function_exists( 'get_url_in_content' ) ? get_url_in_content( $content ) : false;
 
-	if ( ! $has_url )
+	if ( ! $has_url ) {
 		$has_url = twentyeleven_url_grabber();
+	}
 
 	/** This filter is documented in wp-includes/link-template.php */
 	return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() );
@@ -546,8 +551,9 @@
  * @return string|bool URL or false when no link is present.
  */
 function twentyeleven_url_grabber() {
-	if ( ! preg_match( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches ) )
+	if ( ! preg_match( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches ) ) {
 		return false;
+	}
 
 	return esc_url_raw( $matches[1] );
 }
@@ -560,14 +566,17 @@
 function twentyeleven_footer_sidebar_class() {
 	$count = 0;
 
-	if ( is_active_sidebar( 'sidebar-3' ) )
+	if ( is_active_sidebar( 'sidebar-3' ) ) {
 		$count++;
+	}
 
-	if ( is_active_sidebar( 'sidebar-4' ) )
+	if ( is_active_sidebar( 'sidebar-4' ) ) {
 		$count++;
+	}
 
-	if ( is_active_sidebar( 'sidebar-5' ) )
+	if ( is_active_sidebar( 'sidebar-5' ) ) {
 		$count++;
+	}
 
 	$class = '';
 
@@ -583,12 +592,13 @@
 			break;
 	}
 
-	if ( $class )
+	if ( $class ) {
 		echo 'class="' . esc_attr( $class ) . '"';
+	}
 }
 
 if ( ! function_exists( 'twentyeleven_comment' ) ) :
-/**
+	/**
  * Template for comments and pingbacks.
  *
  * To override this walker in a child theme without modifying the comments template
@@ -602,26 +612,27 @@
  * @param array  $args    An array of comment arguments. @see get_comment_reply_link()
  * @param int    $depth   The depth of the comment.
  */
-function twentyeleven_comment( $comment, $args, $depth ) {
-	$GLOBALS['comment'] = $comment;
-	switch ( $comment->comment_type ) :
-		case 'pingback' :
-		case 'trackback' :
-	?>
-	<li class="post pingback">
+	function twentyeleven_comment( $comment, $args, $depth ) {
+		$GLOBALS['comment'] = $comment;
+		switch ( $comment->comment_type ) :
+			case 'pingback' :
+			case 'trackback' :
+		?>
+		<li class="post pingback">
 		<p><?php _e( 'Pingback:', 'twentyeleven' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?></p>
 	<?php
 			break;
-		default :
-	?>
-	<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
+			default :
+		?>
+		<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
 		<article id="comment-<?php comment_ID(); ?>" class="comment">
 			<footer class="comment-meta">
 				<div class="comment-author vcard">
 					<?php
 						$avatar_size = 68;
-						if ( '0' != $comment->comment_parent )
-							$avatar_size = 39;
+					if ( '0' != $comment->comment_parent ) {
+						$avatar_size = 39;
+					}
 
 						echo get_avatar( $comment, $avatar_size );
 
@@ -635,50 +646,54 @@
 								sprintf( __( '%1$s at %2$s', 'twentyeleven' ), get_comment_date(), get_comment_time() )
 							)
 						);
-					?>
+						?>
 
-					<?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
-				</div><!-- .comment-author .vcard -->
+						<?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
+					</div><!-- .comment-author .vcard -->
 
-				<?php if ( $comment->comment_approved == '0' ) : ?>
+					<?php if ( $comment->comment_approved == '0' ) : ?>
 					<em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentyeleven' ); ?></em>
 					<br />
 				<?php endif; ?>
 
-			</footer>
+				</footer>
 
-			<div class="comment-content"><?php comment_text(); ?></div>
+				<div class="comment-content"><?php comment_text(); ?></div>
 
-			<div class="reply">
-				<?php comment_reply_link( array_merge( $args, array( 'reply_text' => __( 'Reply <span>&darr;</span>', 'twentyeleven' ), 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
-			</div><!-- .reply -->
-		</article><!-- #comment-## -->
+				<div class="reply">
+					<?php comment_reply_link( array_merge( $args, array(
+						'reply_text' => __( 'Reply <span>&darr;</span>', 'twentyeleven' ),
+						'depth' => $depth,
+						'max_depth' => $args['max_depth'],
+					) ) ); ?>
+				</div><!-- .reply -->
+			</article><!-- #comment-## -->
 
-	<?php
+		<?php
 			break;
-	endswitch;
-}
+			endswitch;
+	}
 endif; // ends check for twentyeleven_comment()
 
 if ( ! function_exists( 'twentyeleven_posted_on' ) ) :
-/**
+	/**
  * Print HTML with meta information for the current post-date/time and author.
  *
  * Create your own twentyeleven_posted_on to override in a child theme
  *
  * @since Twenty Eleven 1.0
  */
-function twentyeleven_posted_on() {
-	printf( __( '<span class="sep">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a><span class="by-author"> <span class="sep"> by </span> <span class="author vcard"><a class="url fn n" href="%5$s" title="%6$s" rel="author">%7$s</a></span></span>', 'twentyeleven' ),
-		esc_url( get_permalink() ),
-		esc_attr( get_the_time() ),
-		esc_attr( get_the_date( 'c' ) ),
-		esc_html( get_the_date() ),
-		esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-		esc_attr( sprintf( __( 'View all posts by %s', 'twentyeleven' ), get_the_author() ) ),
-		get_the_author()
-	);
-}
+	function twentyeleven_posted_on() {
+		printf( __( '<span class="sep">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a><span class="by-author"> <span class="sep"> by </span> <span class="author vcard"><a class="url fn n" href="%5$s" title="%6$s" rel="author">%7$s</a></span></span>', 'twentyeleven' ),
+			esc_url( get_permalink() ),
+			esc_attr( get_the_time() ),
+			esc_attr( get_the_date( 'c' ) ),
+			esc_html( get_the_date() ),
+			esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+			esc_attr( sprintf( __( 'View all posts by %s', 'twentyeleven' ), get_the_author() ) ),
+			get_the_author()
+		);
+	}
 endif;
 
 /**
@@ -694,11 +709,13 @@
  */
 function twentyeleven_body_classes( $classes ) {
 
-	if ( function_exists( 'is_multi_author' ) && ! is_multi_author() )
+	if ( function_exists( 'is_multi_author' ) && ! is_multi_author() ) {
 		$classes[] = 'single-author';
+	}
 
-	if ( is_singular() && ! is_home() && ! is_page_template( 'showcase.php' ) && ! is_page_template( 'sidebar-page.php' ) )
+	if ( is_singular() && ! is_home() && ! is_page_template( 'showcase.php' ) && ! is_page_template( 'sidebar-page.php' ) ) {
 		$classes[] = 'singular';
+	}
 
 	return $classes;
 }
@@ -719,14 +736,16 @@
 
 	if ( function_exists( 'get_post_galleries' ) ) {
 		$galleries = get_post_galleries( get_the_ID(), false );
-		if ( isset( $galleries[0]['ids'] ) )
+		if ( isset( $galleries[0]['ids'] ) ) {
 			$images = explode( ',', $galleries[0]['ids'] );
+		}
 	} else {
 		$pattern = get_shortcode_regex();
 		preg_match( "/$pattern/s", get_the_content(), $match );
 		$atts = shortcode_parse_atts( $match[3] );
-		if ( isset( $atts['ids'] ) )
+		if ( isset( $atts['ids'] ) ) {
 			$images = explode( ',', $atts['ids'] );
+		}
 	}
 
 	if ( ! $images ) {
Index: src/wp-content/themes/twentyeleven/header.php
===================================================================
--- src/wp-content/themes/twentyeleven/header.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/header.php	(working copy)
@@ -35,12 +35,14 @@
 
 	// Add the blog description for the home/front page.
 	$site_description = get_bloginfo( 'description', 'display' );
-	if ( $site_description && ( is_home() || is_front_page() ) )
-		echo " | $site_description";
+if ( $site_description && ( is_home() || is_front_page() ) ) {
+	echo " | $site_description";
+}
 
 	// Add a page number if necessary:
-	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() )
-		echo esc_html( ' | ' . sprintf( __( 'Page %s', 'twentyeleven' ), max( $paged, $page ) ) );
+if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
+	echo esc_html( ' | ' . sprintf( __( 'Page %s', 'twentyeleven' ), max( $paged, $page ) ) );
+}
 
 	?></title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
@@ -54,8 +56,9 @@
 	 * We add some JavaScript to pages with the comment form
 	 * to support sites with threaded comments (when in use).
 	 */
-	if ( is_singular() && get_option( 'thread_comments' ) )
-		wp_enqueue_script( 'comment-reply' );
+if ( is_singular() && get_option( 'thread_comments' ) ) {
+	wp_enqueue_script( 'comment-reply' );
+}
 
 	/*
 	 * Always have wp_head() just before the closing </head>
@@ -78,39 +81,39 @@
 			<?php
 				// Check to see if the header image has been removed
 				$header_image = get_header_image();
-				if ( $header_image ) :
+			if ( $header_image ) :
+				// Compatibility with versions of WordPress prior to 3.4.
+				if ( function_exists( 'get_custom_header' ) ) {
+					/*
+					 * We need to figure out what the minimum width should be for our featured image.
+					 * This result would be the suggested width if the theme were to implement flexible widths.
+					 */
+					$header_image_width = get_theme_support( 'custom-header', 'width' );
+				} else {
+					$header_image_width = HEADER_IMAGE_WIDTH;
+				}
+				?>
+			<a href="<?php echo esc_url( home_url( '/' ) ); ?>">
+				<?php
+				/*
+				* The header image.
+				* Check if this is a post or page, if it has a thumbnail, and if it's a big one
+				*/
+				if ( is_singular() && has_post_thumbnail( $post->ID ) &&
+					( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( $header_image_width, $header_image_width ) ) ) &&
+					$image[1] >= $header_image_width ) :
+					// Houston, we have a new header image!
+					echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
+				else :
 					// Compatibility with versions of WordPress prior to 3.4.
 					if ( function_exists( 'get_custom_header' ) ) {
-						/*
-						 * We need to figure out what the minimum width should be for our featured image.
-						 * This result would be the suggested width if the theme were to implement flexible widths.
-						 */
-						$header_image_width = get_theme_support( 'custom-header', 'width' );
+						$header_image_width  = get_custom_header()->width;
+						$header_image_height = get_custom_header()->height;
 					} else {
-						$header_image_width = HEADER_IMAGE_WIDTH;
+						$header_image_width  = HEADER_IMAGE_WIDTH;
+						$header_image_height = HEADER_IMAGE_HEIGHT;
 					}
 					?>
-			<a href="<?php echo esc_url( home_url( '/' ) ); ?>">
-				<?php
-					/*
-					 * The header image.
-					 * Check if this is a post or page, if it has a thumbnail, and if it's a big one
-					 */
-					if ( is_singular() && has_post_thumbnail( $post->ID ) &&
-							( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( $header_image_width, $header_image_width ) ) ) &&
-							$image[1] >= $header_image_width ) :
-						// Houston, we have a new header image!
-						echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
-					else :
-						// Compatibility with versions of WordPress prior to 3.4.
-						if ( function_exists( 'get_custom_header' ) ) {
-							$header_image_width  = get_custom_header()->width;
-							$header_image_height = get_custom_header()->height;
-						} else {
-							$header_image_width  = HEADER_IMAGE_WIDTH;
-							$header_image_height = HEADER_IMAGE_HEIGHT;
-						}
-						?>
 					<img src="<?php header_image(); ?>" width="<?php echo esc_attr( $header_image_width ); ?>" height="<?php echo esc_attr( $header_image_height ); ?>" alt="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" />
 				<?php endif; // end check for featured image or standard header ?>
 			</a>
@@ -118,11 +121,11 @@
 
 			<?php
 				// Has the text been hidden?
-				if ( 'blank' == get_header_textcolor() ) :
+			if ( 'blank' == get_header_textcolor() ) :
 			?>
-				<div class="only-search<?php if ( $header_image ) : ?> with-image<?php endif; ?>">
-				<?php get_search_form(); ?>
-				</div>
+			<div class="only-search<?php if ( $header_image ) : ?> with-image<?php endif; ?>">
+			<?php get_search_form(); ?>
+			</div>
 			<?php
 				else :
 			?>
Index: src/wp-content/themes/twentyeleven/image.php
===================================================================
--- src/wp-content/themes/twentyeleven/image.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/image.php	(working copy)
@@ -52,25 +52,33 @@
 	 * Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
 	 * or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
 	 */
-	$attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
-	foreach ( $attachments as $k => $attachment ) {
-		if ( $attachment->ID == $post->ID )
-			break;
+	$attachments = array_values( get_children( array(
+		'post_parent' => $post->post_parent,
+		'post_status' => 'inherit',
+		'post_type' => 'attachment',
+		'post_mime_type' => 'image',
+		'order' => 'ASC',
+		'orderby' => 'menu_order ID',
+	) ) );
+foreach ( $attachments as $k => $attachment ) {
+	if ( $attachment->ID == $post->ID ) {
+		break;
 	}
+}
 
 	// If there is more than 1 attachment in a gallery
-	if ( count( $attachments ) > 1 ) {
-		$k++;
-		if ( isset( $attachments[ $k ] ) )
-			// get the URL of the next image attachment
-			$next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
-		else
-			// or get the URL of the first image attachment
-			$next_attachment_url = get_attachment_link( $attachments[0]->ID );
-	} else {
-		// or, if there's only 1 image, get the URL of the image
-		$next_attachment_url = wp_get_attachment_url();
+if ( count( $attachments ) > 1 ) {
+	$k++;
+	if ( isset( $attachments[ $k ] ) ) {
+		// get the URL of the next image attachment
+		$next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
+	} else { // End if().
+		$next_attachment_url = get_attachment_link( $attachments[0]->ID );
 	}
+} else {
+	// or, if there's only 1 image, get the URL of the image
+	$next_attachment_url = wp_get_attachment_url();
+}
 ?>
 									<a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
 									/**
@@ -95,7 +103,10 @@
 
 							<div class="entry-description">
 								<?php the_content(); ?>
-								<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+								<?php wp_link_pages( array(
+									'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+									'after' => '</div>',
+								) ); ?>
 							</div><!-- .entry-description -->
 
 						</div><!-- .entry-content -->
@@ -109,4 +120,4 @@
 			</div><!-- #content -->
 		</div><!-- #primary -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: src/wp-content/themes/twentyeleven/inc/theme-options.php
===================================================================
--- src/wp-content/themes/twentyeleven/inc/theme-options.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/inc/theme-options.php	(working copy)
@@ -99,8 +99,9 @@
 		'twentyeleven_theme_options_render_page' // Function that renders the options page
 	);
 
-	if ( ! $theme_page )
+	if ( ! $theme_page ) {
 		return;
+	}
 
 	add_action( "load-$theme_page", 'twentyeleven_theme_options_help' );
 }
@@ -217,8 +218,9 @@
 		'theme_layout' => 'content-sidebar',
 	);
 
-	if ( is_rtl() )
+	if ( is_rtl() ) {
 		$default_theme_options['theme_layout'] = 'sidebar-content';
+	}
 
 	/**
 	 * Filter the Twenty Eleven default options.
@@ -246,8 +248,9 @@
 	}
 
 	$color_schemes = twentyeleven_color_schemes();
-	if ( ! isset( $color_schemes[ $color_scheme ] ) )
+	if ( ! isset( $color_schemes[ $color_scheme ] ) ) {
 		return false;
+	}
 
 	return $color_schemes[ $color_scheme ]['default_link_color'];
 }
@@ -364,19 +367,22 @@
 	$output = $defaults = twentyeleven_get_default_theme_options();
 
 	// Color scheme must be in our array of color scheme options
-	if ( isset( $input['color_scheme'] ) && array_key_exists( $input['color_scheme'], twentyeleven_color_schemes() ) )
+	if ( isset( $input['color_scheme'] ) && array_key_exists( $input['color_scheme'], twentyeleven_color_schemes() ) ) {
 		$output['color_scheme'] = $input['color_scheme'];
+	}
 
 	// Our defaults for the link color may have changed, based on the color scheme.
 	$output['link_color'] = $defaults['link_color'] = twentyeleven_get_default_link_color( $output['color_scheme'] );
 
 	// Link color must be 3 or 6 hexadecimal characters
-	if ( isset( $input['link_color'] ) && preg_match( '/^#?([a-f0-9]{3}){1,2}$/i', $input['link_color'] ) )
+	if ( isset( $input['link_color'] ) && preg_match( '/^#?([a-f0-9]{3}){1,2}$/i', $input['link_color'] ) ) {
 		$output['link_color'] = '#' . strtolower( ltrim( $input['link_color'], '#' ) );
+	}
 
 	// Theme layout must be in our array of theme layout options
-	if ( isset( $input['theme_layout'] ) && array_key_exists( $input['theme_layout'], twentyeleven_layouts() ) )
+	if ( isset( $input['theme_layout'] ) && array_key_exists( $input['theme_layout'], twentyeleven_layouts() ) ) {
 		$output['theme_layout'] = $input['theme_layout'];
+	}
 
 	/**
 	 * Filter the Twenty Eleven sanitized form input array.
@@ -399,8 +405,9 @@
 	$options = twentyeleven_get_theme_options();
 	$color_scheme = $options['color_scheme'];
 
-	if ( 'dark' == $color_scheme )
+	if ( 'dark' == $color_scheme ) {
 		wp_enqueue_style( 'dark', get_template_directory_uri() . '/colors/dark.css', array(), null );
+	}
 
 	/**
 	 * Fires after the styles for the Twenty Eleven color scheme are enqueued.
@@ -427,8 +434,9 @@
 	$default_options = twentyeleven_get_default_theme_options();
 
 	// Don't do anything if the current link color is the default.
-	if ( $default_options['link_color'] == $link_color )
+	if ( $default_options['link_color'] == $link_color ) {
 		return;
+	}
 ?>
 	<style>
 		/* Link color */
@@ -472,17 +480,17 @@
 	$options = twentyeleven_get_theme_options();
 	$current_layout = $options['theme_layout'];
 
-	if ( in_array( $current_layout, array( 'content-sidebar', 'sidebar-content' ) ) )
+	if ( in_array( $current_layout, array( 'content-sidebar', 'sidebar-content' ) ) ) {
 		$classes = array( 'two-column' );
-	else
-		$classes = array( 'one-column' );
+	} else { $classes = array( 'one-column' );
+	}
 
-	if ( 'content-sidebar' == $current_layout )
+	if ( 'content-sidebar' == $current_layout ) {
 		$classes[] = 'right-sidebar';
-	elseif ( 'sidebar-content' == $current_layout )
+	} elseif ( 'sidebar-content' == $current_layout ) {
 		$classes[] = 'left-sidebar';
-	else
-		$classes[] = $current_layout;
+	} else { $classes[] = $current_layout;
+	}
 
 	/**
 	 * Filter the Twenty Eleven layout body classes.
Index: src/wp-content/themes/twentyeleven/inc/widgets.php
===================================================================
--- src/wp-content/themes/twentyeleven/inc/widgets.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/inc/widgets.php	(working copy)
@@ -50,11 +50,13 @@
 	function widget( $args, $instance ) {
 		$cache = wp_cache_get( 'widget_twentyeleven_ephemera', 'widget' );
 
-		if ( ! is_array( $cache ) )
+		if ( ! is_array( $cache ) ) {
 			$cache = array();
+		}
 
-		if ( ! isset( $args['widget_id'] ) )
+		if ( ! isset( $args['widget_id'] ) ) {
 			$args['widget_id'] = null;
+		}
 
 		if ( ! is_customize_preview() && isset( $cache[ $args['widget_id'] ] ) ) {
 			echo $cache[ $args['widget_id'] ];
@@ -67,11 +69,13 @@
 		/** This filter is documented in wp-includes/default-widgets.php */
 		$args['title'] = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Ephemera', 'twentyeleven' ) : $instance['title'], $instance, $this->id_base );
 
-		if ( ! isset( $instance['number'] ) )
+		if ( ! isset( $instance['number'] ) ) {
 			$instance['number'] = '10';
+		}
 
-		if ( ! $args['number'] = absint( $instance['number'] ) )
+		if ( ! $args['number'] = absint( $instance['number'] ) ) {
 			$args['number'] = 10;
+		}
 
 		$ephemera_args = array(
 			'order'          => 'DESC',
@@ -128,7 +132,7 @@
 			// Reset the post globals as this query will have stomped on it
 			wp_reset_postdata();
 
-		// end check for ephemeral posts
+			// end check for ephemeral posts
 		endif;
 
 		$cache[ $args['widget_id'] ] = ob_get_flush();
@@ -153,8 +157,9 @@
 		$this->flush_widget_cache();
 
 		$alloptions = wp_cache_get( 'alloptions', 'options' );
-		if ( isset( $alloptions['widget_twentyeleven_ephemera'] ) )
+		if ( isset( $alloptions['widget_twentyeleven_ephemera'] ) ) {
 			delete_option( 'widget_twentyeleven_ephemera' );
+		}
 
 		return $instance;
 	}
@@ -176,7 +181,7 @@
 	 * @since Twenty Eleven 1.0
 	 **/
 	function form( $instance ) {
-		$title = isset( $instance['title']) ? esc_attr( $instance['title'] ) : '';
+		$title = isset( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
 		$number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 10;
 ?>
 			<p><label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:', 'twentyeleven' ); ?></label>
Index: src/wp-content/themes/twentyeleven/page.php
===================================================================
--- src/wp-content/themes/twentyeleven/page.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/page.php	(working copy)
@@ -28,4 +28,4 @@
 			</div><!-- #content -->
 		</div><!-- #primary -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: src/wp-content/themes/twentyeleven/search.php
===================================================================
--- src/wp-content/themes/twentyeleven/search.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/search.php	(working copy)
@@ -56,4 +56,4 @@
 		</section><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: src/wp-content/themes/twentyeleven/showcase.php
===================================================================
--- src/wp-content/themes/twentyeleven/showcase.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/showcase.php	(working copy)
@@ -30,8 +30,9 @@
 					 * We are using a heading by rendering the_content
 					 * If we have content for this page, let's display it.
 					 */
-					if ( '' != get_the_content() )
-						get_template_part( 'content', 'intro' );
+				if ( '' != get_the_content() ) {
+					get_template_part( 'content', 'intro' );
+				}
 				?>
 
 				<?php endwhile; ?>
@@ -46,13 +47,13 @@
 					$sticky = get_option( 'sticky_posts' );
 
 					// Proceed only if sticky posts exist.
-					if ( ! empty( $sticky ) ) :
+				if ( ! empty( $sticky ) ) :
 
 					$featured_args = array(
-						'post__in' => $sticky,
-						'post_status' => 'publish',
-						'posts_per_page' => 10,
-						'no_found_rows' => true,
+					'post__in' => $sticky,
+					'post_status' => 'publish',
+					'posts_per_page' => 10,
+					'no_found_rows' => true,
 					);
 
 					// The Featured Posts query.
@@ -61,33 +62,33 @@
 					// Proceed only if published posts exist
 					if ( $featured->have_posts() ) :
 
-					/*
-					 * We will need to count featured posts starting from zero
-					 * to create the slider navigation.
-					 */
-					$counter_slider = 0;
+						/*
+						* We will need to count featured posts starting from zero
+						* to create the slider navigation.
+						*/
+						$counter_slider = 0;
 
-					// Compatibility with versions of WordPress prior to 3.4.
-					if ( function_exists( 'get_custom_header' ) )
-						$header_image_width = get_theme_support( 'custom-header', 'width' );
-					else
-						$header_image_width = HEADER_IMAGE_WIDTH;
-				?>
+						// Compatibility with versions of WordPress prior to 3.4.
+						if ( function_exists( 'get_custom_header' ) ) {
+							$header_image_width = get_theme_support( 'custom-header', 'width' );
+						} else { $header_image_width = HEADER_IMAGE_WIDTH;
+						}
+					?>
 
-				<div class="featured-posts">
+					<div class="featured-posts">
 					<h1 class="showcase-heading"><?php _e( 'Featured Post', 'twentyeleven' ); ?></h1>
 
 				<?php
-					// Let's roll.
-					while ( $featured->have_posts() ) : $featured->the_post();
+				// Let's roll.
+				while ( $featured->have_posts() ) : $featured->the_post();
 
 					// Increase the counter.
 					$counter_slider++;
 
 					/*
-					 * We're going to add a class to our featured post for featured images
-					 * by default it'll have the feature-text class.
-					 */
+					* We're going to add a class to our featured post for featured images
+					* by default it'll have the feature-text class.
+					*/
 					$feature_class = 'feature-text';
 
 					if ( has_post_thumbnail() ) {
@@ -107,49 +108,49 @@
 
 					<section class="featured-post <?php echo esc_attr( $feature_class ); ?>" id="featured-post-<?php echo esc_attr( $counter_slider ); ?>">
 
-						<?php
-							/*
-							 * If the thumbnail is as big as the header image
-							 * make it a large featured post, otherwise render it small
-							 */
-							if ( has_post_thumbnail() ) {
-								if ( $image[1] >= $header_image_width )
-									$thumbnail_size = 'large-feature';
-								else
-									$thumbnail_size = 'small-feature';
-								?>
-								<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_post_thumbnail( $thumbnail_size ); ?></a>
-								<?php
-							}
+					<?php
+						/*
+						 * If the thumbnail is as big as the header image
+						 * make it a large featured post, otherwise render it small
+						 */
+					if ( has_post_thumbnail() ) {
+						if ( $image[1] >= $header_image_width ) {
+							$thumbnail_size = 'large-feature';
+						} else { $thumbnail_size = 'small-feature';
+						}
 						?>
-						<?php get_template_part( 'content', 'featured' ); ?>
+						<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_post_thumbnail( $thumbnail_size ); ?></a>
+							<?php
+					}
+					?>
+					<?php get_template_part( 'content', 'featured' ); ?>
 					</section>
 				<?php endwhile;	?>
 
-				<?php
+					<?php
 					// Show slider only if we have more than one featured post.
 					if ( $featured->post_count > 1 ) :
-				?>
-				<nav class="feature-slider">
+					?>
+					<nav class="feature-slider">
 					<ul>
 					<?php
 
-						// Reset the counter so that we end up with matching elements
-						$counter_slider = 0;
+					// Reset the counter so that we end up with matching elements
+					$counter_slider = 0;
 
-						// Begin from zero
-						rewind_posts();
+					// Begin from zero
+					rewind_posts();
 
-						// Let's roll again.
-						while ( $featured->have_posts() ) : $featured->the_post();
-							$counter_slider++;
-							if ( 1 == $counter_slider )
-								$class = ' class="active"';
-							else
-								$class = '';
-						?>
-						<li><a href="#featured-post-<?php echo esc_attr( $counter_slider ); ?>" title="<?php echo esc_attr( sprintf( __( 'Featuring: %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ); ?>"<?php echo $class; ?>></a></li>
-					<?php endwhile;	?>
+					// Let's roll again.
+					while ( $featured->have_posts() ) : $featured->the_post();
+						$counter_slider++;
+						if ( 1 == $counter_slider ) {
+							$class = ' class="active"';
+						} else { $class = '';
+						}
+					?>
+					<li><a href="#featured-post-<?php echo esc_attr( $counter_slider ); ?>" title="<?php echo esc_attr( sprintf( __( 'Featuring: %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ); ?>"<?php echo $class; ?>></a></li>
+				<?php endwhile;	?>
 					</ul>
 				</nav>
 				<?php endif; // End check for more than one sticky post. ?>
@@ -207,8 +208,9 @@
 					endwhile;
 
 					// If we had some posts, close the <ol>
-					if ( $recent->post_count > 0 )
+					if ( $recent->post_count > 0 ) {
 						echo '</ol>';
+					}
 					?>
 				</section><!-- .recent-posts -->
 
@@ -216,7 +218,10 @@
 					<?php if ( ! dynamic_sidebar( 'sidebar-2' ) ) : ?>
 
 						<?php
-						the_widget( 'Twenty_Eleven_Ephemera_Widget', '', array( 'before_title' => '<h3 class="widget-title">', 'after_title' => '</h3>' ) );
+						the_widget( 'Twenty_Eleven_Ephemera_Widget', '', array(
+							'before_title' => '<h3 class="widget-title">',
+							'after_title' => '</h3>',
+						) );
 						?>
 
 					<?php endif; // end sidebar widget area ?>
@@ -225,4 +230,4 @@
 			</div><!-- #content -->
 		</div><!-- #primary -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: src/wp-content/themes/twentyeleven/sidebar-footer.php
===================================================================
--- src/wp-content/themes/twentyeleven/sidebar-footer.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/sidebar-footer.php	(working copy)
@@ -15,11 +15,12 @@
 	 *
 	 * If none of the sidebars have widgets, then let's bail early.
 	 */
-	if (   ! is_active_sidebar( 'sidebar-3'  )
+if ( ! is_active_sidebar( 'sidebar-3' )
 		&& ! is_active_sidebar( 'sidebar-4' )
-		&& ! is_active_sidebar( 'sidebar-5'  )
-	)
-		return;
+		&& ! is_active_sidebar( 'sidebar-5' )
+	) {
+	return;
+}
 	// If we get this far, we have widgets. Let do this.
 ?>
 <div id="supplementary" <?php twentyeleven_footer_sidebar_class(); ?>>
@@ -40,4 +41,4 @@
 		<?php dynamic_sidebar( 'sidebar-5' ); ?>
 	</div><!-- #third .widget-area -->
 	<?php endif; ?>
-</div><!-- #supplementary -->
\ No newline at end of file
+</div><!-- #supplementary -->
Index: src/wp-content/themes/twentyeleven/sidebar-page.php
===================================================================
--- src/wp-content/themes/twentyeleven/sidebar-page.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/sidebar-page.php	(working copy)
@@ -26,4 +26,4 @@
 		</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: src/wp-content/themes/twentyeleven/sidebar.php
===================================================================
--- src/wp-content/themes/twentyeleven/sidebar.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/sidebar.php	(working copy)
@@ -33,4 +33,4 @@
 
 			<?php endif; // end sidebar widget area ?>
 		</div><!-- #secondary .widget-area -->
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
Index: src/wp-content/themes/twentyeleven/single.php
===================================================================
--- src/wp-content/themes/twentyeleven/single.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/single.php	(working copy)
@@ -29,4 +29,4 @@
 			</div><!-- #content -->
 		</div><!-- #primary -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: src/wp-content/themes/twentyeleven/tag.php
===================================================================
--- src/wp-content/themes/twentyeleven/tag.php	(revision 40901)
+++ src/wp-content/themes/twentyeleven/tag.php	(working copy)
@@ -21,16 +21,16 @@
 
 					<?php
 						$tag_description = tag_description();
-						if ( ! empty( $tag_description ) ) {
-							/**
+					if ( ! empty( $tag_description ) ) {
+						/**
 							 * Filter the default Twenty Eleven tag description.
 							 *
 							 * @since Twenty Eleven 1.0
 							 *
 							 * @param string The default tag description.
 							 */
-							echo apply_filters( 'tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' );
-						}
+						echo apply_filters( 'tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' );
+					}
 					?>
 				</header>
 
Index: src/wp-content/themes/twentyfifteen/archive.php
===================================================================
--- src/wp-content/themes/twentyfifteen/archive.php	(revision 40901)
+++ src/wp-content/themes/twentyfifteen/archive.php	(working copy)
@@ -41,7 +41,7 @@
 				 */
 				get_template_part( 'content', get_post_format() );
 
-			// End the loop.
+				// End the loop.
 			endwhile;
 
 			// Previous/next page navigation.
@@ -51,7 +51,7 @@
 				'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>',
 			) );
 
-		// If no content, include the "No posts found" template.
+			// If no content, include the "No posts found" template.
 		else :
 			get_template_part( 'content', 'none' );
 
Index: src/wp-content/themes/twentyfifteen/comments.php
===================================================================
--- src/wp-content/themes/twentyfifteen/comments.php	(revision 40901)
+++ src/wp-content/themes/twentyfifteen/comments.php	(working copy)
@@ -26,7 +26,7 @@
 		<h2 class="comments-title">
 			<?php
 				printf( _nx( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title', 'twentyfifteen' ),
-					number_format_i18n( get_comments_number() ), get_the_title() );
+				number_format_i18n( get_comments_number() ), get_the_title() );
 			?>
 		</h2>
 
@@ -48,9 +48,9 @@
 
 	<?php
 		// If comments are closed and there are comments, let's leave a little note, shall we?
-		if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
+	if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
 	?>
-		<p class="no-comments"><?php _e( 'Comments are closed.', 'twentyfifteen' ); ?></p>
+	<p class="no-comments"><?php _e( 'Comments are closed.', 'twentyfifteen' ); ?></p>
 	<?php endif; ?>
 
 	<?php comment_form(); ?>
Index: src/wp-content/themes/twentyfifteen/content-link.php
===================================================================
--- src/wp-content/themes/twentyfifteen/content-link.php	(revision 40901)
+++ src/wp-content/themes/twentyfifteen/content-link.php	(working copy)
@@ -15,8 +15,8 @@
 
 	<header class="entry-header">
 		<?php
-			if ( is_single() ) :
-				the_title( sprintf( '<h1 class="entry-title"><a href="%s">', esc_url( twentyfifteen_get_link_url() ) ), '</a></h1>' );
+		if ( is_single() ) :
+			the_title( sprintf( '<h1 class="entry-title"><a href="%s">', esc_url( twentyfifteen_get_link_url() ) ), '</a></h1>' );
 			else :
 				the_title( sprintf( '<h2 class="entry-title"><a href="%s">', esc_url( twentyfifteen_get_link_url() ) ), '</a></h2>' );
 			endif;
@@ -46,8 +46,8 @@
 
 	<?php
 		// Author bio.
-		if ( is_single() && get_the_author_meta( 'description' ) ) :
-			get_template_part( 'author-bio' );
+	if ( is_single() && get_the_author_meta( 'description' ) ) :
+		get_template_part( 'author-bio' );
 		endif;
 	?>
 
Index: src/wp-content/themes/twentyfifteen/content.php
===================================================================
--- src/wp-content/themes/twentyfifteen/content.php	(revision 40901)
+++ src/wp-content/themes/twentyfifteen/content.php	(working copy)
@@ -18,8 +18,8 @@
 
 	<header class="entry-header">
 		<?php
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+		if ( is_single() ) :
+			the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( sprintf( '<h2 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h2>' );
 			endif;
@@ -47,8 +47,8 @@
 
 	<?php
 		// Author bio.
-		if ( is_single() && get_the_author_meta( 'description' ) ) :
-			get_template_part( 'author-bio' );
+	if ( is_single() && get_the_author_meta( 'description' ) ) :
+		get_template_part( 'author-bio' );
 		endif;
 	?>
 
Index: src/wp-content/themes/twentyfifteen/functions.php
===================================================================
--- src/wp-content/themes/twentyfifteen/functions.php	(revision 40901)
+++ src/wp-content/themes/twentyfifteen/functions.php	(working copy)
@@ -42,7 +42,7 @@
 }
 
 if ( ! function_exists( 'twentyfifteen_setup' ) ) :
-/**
+	/**
  * Sets up theme defaults and registers support for various WordPress features.
  *
  * Note that this function is hooked into the after_setup_theme hook, which
@@ -51,75 +51,87 @@
  *
  * @since Twenty Fifteen 1.0
  */
-function twentyfifteen_setup() {
-
-	/*
-	 * Make theme available for translation.
-	 * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentyfifteen
-	 * If you're building a theme based on twentyfifteen, use a find and replace
-	 * to change 'twentyfifteen' to the name of your theme in all the template files
-	 */
-	load_theme_textdomain( 'twentyfifteen' );
-
-	// Add default posts and comments RSS feed links to head.
-	add_theme_support( 'automatic-feed-links' );
-
-	/*
-	 * Let WordPress manage the document title.
-	 * By adding theme support, we declare that this theme does not use a
-	 * hard-coded <title> tag in the document head, and expect WordPress to
-	 * provide it for us.
-	 */
-	add_theme_support( 'title-tag' );
-
-	/*
-	 * Enable support for Post Thumbnails on posts and pages.
-	 *
-	 * See: https://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
-	 */
-	add_theme_support( 'post-thumbnails' );
-	set_post_thumbnail_size( 825, 510, true );
-
-	// This theme uses wp_nav_menu() in two locations.
-	register_nav_menus( array(
-		'primary' => __( 'Primary Menu',      'twentyfifteen' ),
-		'social'  => __( 'Social Links Menu', 'twentyfifteen' ),
-	) );
-
-	/*
-	 * Switch default core markup for search form, comment form, and comments
-	 * to output valid HTML5.
-	 */
-	add_theme_support( 'html5', array(
-		'search-form', 'comment-form', 'comment-list', 'gallery', 'caption'
-	) );
+	function twentyfifteen_setup() {
 
-	/*
-	 * Enable support for Post Formats.
-	 *
-	 * See: https://codex.wordpress.org/Post_Formats
-	 */
-	add_theme_support( 'post-formats', array(
-		'aside', 'image', 'video', 'quote', 'link', 'gallery', 'status', 'audio', 'chat'
-	) );
-
-	/*
-	 * Enable support for custom logo.
-	 *
-	 * @since Twenty Fifteen 1.5
-	 */
-	add_theme_support( 'custom-logo', array(
-		'height'      => 248,
-		'width'       => 248,
-		'flex-height' => true,
-	) );
+		/*
+		 * Make theme available for translation.
+		 * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentyfifteen
+		 * If you're building a theme based on twentyfifteen, use a find and replace
+		 * to change 'twentyfifteen' to the name of your theme in all the template files
+		 */
+		load_theme_textdomain( 'twentyfifteen' );
+
+		// Add default posts and comments RSS feed links to head.
+		add_theme_support( 'automatic-feed-links' );
+
+		/*
+		 * Let WordPress manage the document title.
+		 * By adding theme support, we declare that this theme does not use a
+		 * hard-coded <title> tag in the document head, and expect WordPress to
+		 * provide it for us.
+		 */
+		add_theme_support( 'title-tag' );
+
+		/*
+		 * Enable support for Post Thumbnails on posts and pages.
+		 *
+		 * See: https://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
+		 */
+		add_theme_support( 'post-thumbnails' );
+		set_post_thumbnail_size( 825, 510, true );
+
+		// This theme uses wp_nav_menu() in two locations.
+		register_nav_menus( array(
+			'primary' => __( 'Primary Menu',      'twentyfifteen' ),
+			'social'  => __( 'Social Links Menu', 'twentyfifteen' ),
+		) );
+
+			/*
+			 * Switch default core markup for search form, comment form, and comments
+			 * to output valid HTML5.
+			 */
+			add_theme_support( 'html5', array(
+				'search-form',
+				'comment-form',
+				'comment-list',
+				'gallery',
+				'caption',
+			) );
+
+			/*
+			 * Enable support for Post Formats.
+			 *
+			 * See: https://codex.wordpress.org/Post_Formats
+			 */
+			add_theme_support( 'post-formats', array(
+				'aside',
+				'image',
+				'video',
+				'quote',
+				'link',
+				'gallery',
+				'status',
+				'audio',
+				'chat',
+			) );
+
+			/*
+			 * Enable support for custom logo.
+			 *
+			 * @since Twenty Fifteen 1.5
+			 */
+			add_theme_support( 'custom-logo', array(
+				'height'      => 248,
+				'width'       => 248,
+				'flex-height' => true,
+			) );
 
-	$color_scheme  = twentyfifteen_get_color_scheme();
-	$default_color = trim( $color_scheme[0], '#' );
+			$color_scheme  = twentyfifteen_get_color_scheme();
+			$default_color = trim( $color_scheme[0], '#' );
 
-	// Setup the WordPress core custom background feature.
+			// Setup the WordPress core custom background feature.
 
-	/**
+			/**
 	 * Filter Twenty Fifteen custom-header support arguments.
 	 *
 	 * @since Twenty Fifteen 1.0
@@ -131,20 +143,20 @@
 	 *     @type string $default-attachment     Default attachment of the header.
 	 * }
 	 */
-	add_theme_support( 'custom-background', apply_filters( 'twentyfifteen_custom_background_args', array(
-		'default-color'      => $default_color,
-		'default-attachment' => 'fixed',
-	) ) );
-
-	/*
-	 * This theme styles the visual editor to resemble the theme style,
-	 * specifically font, colors, icons, and column width.
-	 */
-	add_editor_style( array( 'css/editor-style.css', 'genericons/genericons.css', twentyfifteen_fonts_url() ) );
+			add_theme_support( 'custom-background', apply_filters( 'twentyfifteen_custom_background_args', array(
+				'default-color'      => $default_color,
+				'default-attachment' => 'fixed',
+			) ) );
+
+			/*
+			 * This theme styles the visual editor to resemble the theme style,
+			 * specifically font, colors, icons, and column width.
+			 */
+			add_editor_style( array( 'css/editor-style.css', 'genericons/genericons.css', twentyfifteen_fonts_url() ) );
 
-	// Indicate widget sidebars can use selective refresh in the Customizer.
-	add_theme_support( 'customize-selective-refresh-widgets' );
-}
+			// Indicate widget sidebars can use selective refresh in the Customizer.
+			add_theme_support( 'customize-selective-refresh-widgets' );
+	}
 endif; // twentyfifteen_setup
 add_action( 'after_setup_theme', 'twentyfifteen_setup' );
 
@@ -169,67 +181,67 @@
 add_action( 'widgets_init', 'twentyfifteen_widgets_init' );
 
 if ( ! function_exists( 'twentyfifteen_fonts_url' ) ) :
-/**
+	/**
  * Register Google fonts for Twenty Fifteen.
  *
  * @since Twenty Fifteen 1.0
  *
  * @return string Google fonts URL for the theme.
  */
-function twentyfifteen_fonts_url() {
-	$fonts_url = '';
-	$fonts     = array();
-	$subsets   = 'latin,latin-ext';
-
-	/*
-	 * Translators: If there are characters in your language that are not supported
-	 * by Noto Sans, translate this to 'off'. Do not translate into your own language.
-	 */
-	if ( 'off' !== _x( 'on', 'Noto Sans font: on or off', 'twentyfifteen' ) ) {
-		$fonts[] = 'Noto Sans:400italic,700italic,400,700';
-	}
+	function twentyfifteen_fonts_url() {
+		$fonts_url = '';
+		$fonts     = array();
+		$subsets   = 'latin,latin-ext';
+
+		/*
+		 * Translators: If there are characters in your language that are not supported
+		 * by Noto Sans, translate this to 'off'. Do not translate into your own language.
+		 */
+		if ( 'off' !== _x( 'on', 'Noto Sans font: on or off', 'twentyfifteen' ) ) {
+			$fonts[] = 'Noto Sans:400italic,700italic,400,700';
+		}
 
-	/*
-	 * Translators: If there are characters in your language that are not supported
-	 * by Noto Serif, translate this to 'off'. Do not translate into your own language.
-	 */
-	if ( 'off' !== _x( 'on', 'Noto Serif font: on or off', 'twentyfifteen' ) ) {
-		$fonts[] = 'Noto Serif:400italic,700italic,400,700';
-	}
+		/*
+		 * Translators: If there are characters in your language that are not supported
+		 * by Noto Serif, translate this to 'off'. Do not translate into your own language.
+		 */
+		if ( 'off' !== _x( 'on', 'Noto Serif font: on or off', 'twentyfifteen' ) ) {
+			$fonts[] = 'Noto Serif:400italic,700italic,400,700';
+		}
 
-	/*
-	 * Translators: If there are characters in your language that are not supported
-	 * by Inconsolata, translate this to 'off'. Do not translate into your own language.
-	 */
-	if ( 'off' !== _x( 'on', 'Inconsolata font: on or off', 'twentyfifteen' ) ) {
-		$fonts[] = 'Inconsolata:400,700';
-	}
+		/*
+		 * Translators: If there are characters in your language that are not supported
+		 * by Inconsolata, translate this to 'off'. Do not translate into your own language.
+		 */
+		if ( 'off' !== _x( 'on', 'Inconsolata font: on or off', 'twentyfifteen' ) ) {
+			$fonts[] = 'Inconsolata:400,700';
+		}
 
-	/*
-	 * Translators: To add an additional character subset specific to your language,
-	 * translate this to 'greek', 'cyrillic', 'devanagari' or 'vietnamese'. Do not translate into your own language.
-	 */
-	$subset = _x( 'no-subset', 'Add new subset (greek, cyrillic, devanagari, vietnamese)', 'twentyfifteen' );
+		/*
+		 * Translators: To add an additional character subset specific to your language,
+		 * translate this to 'greek', 'cyrillic', 'devanagari' or 'vietnamese'. Do not translate into your own language.
+		 */
+		$subset = _x( 'no-subset', 'Add new subset (greek, cyrillic, devanagari, vietnamese)', 'twentyfifteen' );
+
+		if ( 'cyrillic' == $subset ) {
+			$subsets .= ',cyrillic,cyrillic-ext';
+		} elseif ( 'greek' == $subset ) {
+			$subsets .= ',greek,greek-ext';
+		} elseif ( 'devanagari' == $subset ) {
+			$subsets .= ',devanagari';
+		} elseif ( 'vietnamese' == $subset ) {
+			$subsets .= ',vietnamese';
+		}
 
-	if ( 'cyrillic' == $subset ) {
-		$subsets .= ',cyrillic,cyrillic-ext';
-	} elseif ( 'greek' == $subset ) {
-		$subsets .= ',greek,greek-ext';
-	} elseif ( 'devanagari' == $subset ) {
-		$subsets .= ',devanagari';
-	} elseif ( 'vietnamese' == $subset ) {
-		$subsets .= ',vietnamese';
-	}
+		if ( $fonts ) {
+			$fonts_url = add_query_arg( array(
+				'family' => urlencode( implode( '|', $fonts ) ),
+				'subset' => urlencode( $subsets ),
+			), 'https://fonts.googleapis.com/css' );
+		}
 
-	if ( $fonts ) {
-		$fonts_url = add_query_arg( array(
-			'family' => urlencode( implode( '|', $fonts ) ),
-			'subset' => urlencode( $subsets ),
-		), 'https://fonts.googleapis.com/css' );
+			return $fonts_url;
 	}
-
-	return $fonts_url;
-}
 endif;
 
 /**
Index: src/wp-content/themes/twentyfifteen/header.php
===================================================================
--- src/wp-content/themes/twentyfifteen/header.php	(revision 40901)
+++ src/wp-content/themes/twentyfifteen/header.php	(working copy)
@@ -31,14 +31,14 @@
 				<?php
 					twentyfifteen_the_custom_logo();
 
-					if ( is_front_page() && is_home() ) : ?>
+				if ( is_front_page() && is_home() ) : ?>
 						<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
 					<?php else : ?>
 						<p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></p>
 					<?php endif;
 
 					$description = get_bloginfo( 'description', 'display' );
-					if ( $description || is_customize_preview() ) : ?>
+if ( $description || is_customize_preview() ) : ?>
 						<p class="site-description"><?php echo $description; ?></p>
 					<?php endif;
 				?>
Index: src/wp-content/themes/twentyfifteen/image.php
===================================================================
--- src/wp-content/themes/twentyfifteen/image.php	(revision 40901)
+++ src/wp-content/themes/twentyfifteen/image.php	(working copy)
@@ -14,38 +14,38 @@
 
 			<?php
 				// Start the loop.
-				while ( have_posts() ) : the_post();
+			while ( have_posts() ) : the_post();
 			?>
 
-				<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+			<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-					<nav id="image-navigation" class="navigation image-navigation">
-						<div class="nav-links">
-							<div class="nav-previous"><?php previous_image_link( false, __( 'Previous Image', 'twentyfifteen' ) ); ?></div><div class="nav-next"><?php next_image_link( false, __( 'Next Image', 'twentyfifteen' ) ); ?></div>
-						</div><!-- .nav-links -->
-					</nav><!-- .image-navigation -->
-
-					<header class="entry-header">
-						<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
-					</header><!-- .entry-header -->
-
-					<div class="entry-content">
-
-						<div class="entry-attachment">
-							<?php
-								/**
+			<nav id="image-navigation" class="navigation image-navigation">
+				<div class="nav-links">
+					<div class="nav-previous"><?php previous_image_link( false, __( 'Previous Image', 'twentyfifteen' ) ); ?></div><div class="nav-next"><?php next_image_link( false, __( 'Next Image', 'twentyfifteen' ) ); ?></div>
+				</div><!-- .nav-links -->
+			</nav><!-- .image-navigation -->
+
+			<header class="entry-header">
+				<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
+			</header><!-- .entry-header -->
+
+			<div class="entry-content">
+
+				<div class="entry-attachment">
+					<?php
+						/**
 								 * Filter the default Twenty Fifteen image attachment size.
 								 *
 								 * @since Twenty Fifteen 1.0
 								 *
 								 * @param string $image_size Image size. Default 'large'.
 								 */
-								$image_size = apply_filters( 'twentyfifteen_attachment_size', 'large' );
+						$image_size = apply_filters( 'twentyfifteen_attachment_size', 'large' );
 
-								echo wp_get_attachment_image( get_the_ID(), $image_size );
-							?>
+						echo wp_get_attachment_image( get_the_ID(), $image_size );
+					?>
 
-							<?php if ( has_excerpt() ) : ?>
+					<?php if ( has_excerpt() ) : ?>
 								<div class="entry-caption">
 									<?php the_excerpt(); ?>
 								</div><!-- .entry-caption -->
@@ -54,35 +54,35 @@
 						</div><!-- .entry-attachment -->
 
 						<?php
-							the_content();
-							wp_link_pages( array(
-								'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfifteen' ) . '</span>',
-								'after'       => '</div>',
-								'link_before' => '<span>',
-								'link_after'  => '</span>',
-								'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
-								'separator'   => '<span class="screen-reader-text">, </span>',
-							) );
-						?>
+						the_content();
+						wp_link_pages( array(
+							'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfifteen' ) . '</span>',
+							'after'       => '</div>',
+							'link_before' => '<span>',
+							'link_after'  => '</span>',
+							'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
+							'separator'   => '<span class="screen-reader-text">, </span>',
+						) );
+					?>
 					</div><!-- .entry-content -->
 
 					<footer class="entry-footer">
-						<?php twentyfifteen_entry_meta(); ?>
-						<?php edit_post_link( __( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
+					<?php twentyfifteen_entry_meta(); ?>
+					<?php edit_post_link( __( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
 					</footer><!-- .entry-footer -->
 
 				</article><!-- #post-## -->
 
 				<?php
-					// If comments are open or we have at least one comment, load up the comment template
-					if ( comments_open() || get_comments_number() ) :
-						comments_template();
+				// If comments are open or we have at least one comment, load up the comment template
+				if ( comments_open() || get_comments_number() ) :
+					comments_template();
 					endif;
 
-					// Previous/next post navigation.
-					the_post_navigation( array(
-						'prev_text' => _x( '<span class="meta-nav">Published in</span><span class="post-title">%title</span>', 'Parent post link', 'twentyfifteen' ),
-					) );
+				// Previous/next post navigation.
+				the_post_navigation( array(
+					'prev_text' => _x( '<span class="meta-nav">Published in</span><span class="post-title">%title</span>', 'Parent post link', 'twentyfifteen' ),
+				) );
 
 				// End the loop.
 				endwhile;
Index: src/wp-content/themes/twentyfifteen/inc/custom-header.php
===================================================================
--- src/wp-content/themes/twentyfifteen/inc/custom-header.php	(revision 40901)
+++ src/wp-content/themes/twentyfifteen/inc/custom-header.php	(working copy)
@@ -53,10 +53,10 @@
 	$color = trim( $color, '#' );
 
 	if ( strlen( $color ) == 3 ) {
-		$r = hexdec( substr( $color, 0, 1 ).substr( $color, 0, 1 ) );
-		$g = hexdec( substr( $color, 1, 1 ).substr( $color, 1, 1 ) );
-		$b = hexdec( substr( $color, 2, 1 ).substr( $color, 2, 1 ) );
-	} else if ( strlen( $color ) == 6 ) {
+		$r = hexdec( substr( $color, 0, 1 ) . substr( $color, 0, 1 ) );
+		$g = hexdec( substr( $color, 1, 1 ) . substr( $color, 1, 1 ) );
+		$b = hexdec( substr( $color, 2, 1 ) . substr( $color, 2, 1 ) );
+	} elseif ( strlen( $color ) == 6 ) {
 		$r = hexdec( substr( $color, 0, 2 ) );
 		$g = hexdec( substr( $color, 2, 2 ) );
 		$b = hexdec( substr( $color, 4, 2 ) );
@@ -64,29 +64,33 @@
 		return array();
 	}
 
-	return array( 'red' => $r, 'green' => $g, 'blue' => $b );
+	return array(
+		'red' => $r,
+		'green' => $g,
+		'blue' => $b,
+	);
 }
 
 if ( ! function_exists( 'twentyfifteen_header_style' ) ) :
-/**
+	/**
  * Styles the header image and text displayed on the blog.
  *
  * @since Twenty Fifteen 1.0
  *
  * @see twentyfifteen_custom_header_setup()
  */
-function twentyfifteen_header_style() {
-	$header_image = get_header_image();
+	function twentyfifteen_header_style() {
+		$header_image = get_header_image();
 
-	// If no custom options for text are set, let's bail.
-	if ( empty( $header_image ) && display_header_text() ) {
-		return;
-	}
+		// If no custom options for text are set, let's bail.
+		if ( empty( $header_image ) && display_header_text() ) {
+			return;
+		}
 
-	// If we get this far, we have custom styles. Let's do this.
-	?>
-	<style type="text/css" id="twentyfifteen-header-css">
-	<?php
+		// If we get this far, we have custom styles. Let's do this.
+		?>
+		<style type="text/css" id="twentyfifteen-header-css">
+		<?php
 		// Short header for when there is no Custom Header and Header Text is hidden.
 		if ( empty( $header_image ) && ! display_header_text() ) :
 	?>
@@ -182,7 +186,7 @@
 	<?php endif; ?>
 	</style>
 	<?php
-}
+	}
 endif; // twentyfifteen_header_style
 
 /**
Index: src/wp-content/themes/twentyfifteen/inc/customizer.php
===================================================================
--- src/wp-content/themes/twentyfifteen/inc/customizer.php	(revision 40901)
+++ src/wp-content/themes/twentyfifteen/inc/customizer.php	(working copy)
@@ -216,47 +216,47 @@
 }
 
 if ( ! function_exists( 'twentyfifteen_get_color_scheme' ) ) :
-/**
+	/**
  * Get the current Twenty Fifteen color scheme.
  *
  * @since Twenty Fifteen 1.0
  *
  * @return array An associative array of either the current or default color scheme hex values.
  */
-function twentyfifteen_get_color_scheme() {
-	$color_scheme_option = get_theme_mod( 'color_scheme', 'default' );
-	$color_schemes       = twentyfifteen_get_color_schemes();
+	function twentyfifteen_get_color_scheme() {
+		$color_scheme_option = get_theme_mod( 'color_scheme', 'default' );
+		$color_schemes       = twentyfifteen_get_color_schemes();
 
-	if ( array_key_exists( $color_scheme_option, $color_schemes ) ) {
-		return $color_schemes[ $color_scheme_option ]['colors'];
-	}
+		if ( array_key_exists( $color_scheme_option, $color_schemes ) ) {
+			return $color_schemes[ $color_scheme_option ]['colors'];
+		}
 
-	return $color_schemes['default']['colors'];
-}
+		return $color_schemes['default']['colors'];
+	}
 endif; // twentyfifteen_get_color_scheme
 
 if ( ! function_exists( 'twentyfifteen_get_color_scheme_choices' ) ) :
-/**
+	/**
  * Returns an array of color scheme choices registered for Twenty Fifteen.
  *
  * @since Twenty Fifteen 1.0
  *
  * @return array Array of color schemes.
  */
-function twentyfifteen_get_color_scheme_choices() {
-	$color_schemes                = twentyfifteen_get_color_schemes();
-	$color_scheme_control_options = array();
+	function twentyfifteen_get_color_scheme_choices() {
+		$color_schemes                = twentyfifteen_get_color_schemes();
+		$color_scheme_control_options = array();
 
-	foreach ( $color_schemes as $color_scheme => $value ) {
-		$color_scheme_control_options[ $color_scheme ] = $value['label'];
-	}
+		foreach ( $color_schemes as $color_scheme => $value ) {
+			$color_scheme_control_options[ $color_scheme ] = $value['label'];
+		}
 
-	return $color_scheme_control_options;
-}
+		return $color_scheme_control_options;
+	}
 endif; // twentyfifteen_get_color_scheme_choices
 
 if ( ! function_exists( 'twentyfifteen_sanitize_color_scheme' ) ) :
-/**
+	/**
  * Sanitization callback for color schemes.
  *
  * @since Twenty Fifteen 1.0
@@ -264,15 +264,15 @@
  * @param string $value Color scheme name value.
  * @return string Color scheme name.
  */
-function twentyfifteen_sanitize_color_scheme( $value ) {
-	$color_schemes = twentyfifteen_get_color_scheme_choices();
+	function twentyfifteen_sanitize_color_scheme( $value ) {
+		$color_schemes = twentyfifteen_get_color_scheme_choices();
 
-	if ( ! array_key_exists( $value, $color_schemes ) ) {
-		$value = 'default';
-	}
+		if ( ! array_key_exists( $value, $color_schemes ) ) {
+			$value = 'default';
+		}
 
-	return $value;
-}
+		return $value;
+	}
 endif; // twentyfifteen_sanitize_color_scheme
 
 /**
Index: src/wp-content/themes/twentyfifteen/inc/template-tags.php
===================================================================
--- src/wp-content/themes/twentyfifteen/inc/template-tags.php	(revision 40901)
+++ src/wp-content/themes/twentyfifteen/inc/template-tags.php	(working copy)
@@ -10,120 +10,120 @@
  */
 
 if ( ! function_exists( 'twentyfifteen_comment_nav' ) ) :
-/**
+	/**
  * Display navigation to next/previous comments when applicable.
  *
  * @since Twenty Fifteen 1.0
  */
-function twentyfifteen_comment_nav() {
-	// Are there comments to navigate through?
-	if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
-	?>
-	<nav class="navigation comment-navigation" role="navigation">
+	function twentyfifteen_comment_nav() {
+		// Are there comments to navigate through?
+		if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
+		?>
+		<nav class="navigation comment-navigation" role="navigation">
 		<h2 class="screen-reader-text"><?php _e( 'Comment navigation', 'twentyfifteen' ); ?></h2>
 		<div class="nav-links">
 			<?php
-				if ( $prev_link = get_previous_comments_link( __( 'Older Comments', 'twentyfifteen' ) ) ) :
-					printf( '<div class="nav-previous">%s</div>', $prev_link );
+			if ( $prev_link = get_previous_comments_link( __( 'Older Comments', 'twentyfifteen' ) ) ) :
+				printf( '<div class="nav-previous">%s</div>', $prev_link );
 				endif;
 
-				if ( $next_link = get_next_comments_link( __( 'Newer Comments', 'twentyfifteen' ) ) ) :
-					printf( '<div class="nav-next">%s</div>', $next_link );
+			if ( $next_link = get_next_comments_link( __( 'Newer Comments', 'twentyfifteen' ) ) ) :
+				printf( '<div class="nav-next">%s</div>', $next_link );
 				endif;
 			?>
-		</div><!-- .nav-links -->
-	</nav><!-- .comment-navigation -->
-	<?php
-	endif;
-}
+			</div><!-- .nav-links -->
+		</nav><!-- .comment-navigation -->
+		<?php
+		endif;
+	}
 endif;
 
 if ( ! function_exists( 'twentyfifteen_entry_meta' ) ) :
-/**
+	/**
  * Prints HTML with meta information for the categories, tags.
  *
  * @since Twenty Fifteen 1.0
  */
-function twentyfifteen_entry_meta() {
-	if ( is_sticky() && is_home() && ! is_paged() ) {
-		printf( '<span class="sticky-post">%s</span>', __( 'Featured', 'twentyfifteen' ) );
-	}
-
-	$format = get_post_format();
-	if ( current_theme_supports( 'post-formats', $format ) ) {
-		printf( '<span class="entry-format">%1$s<a href="%2$s">%3$s</a></span>',
-			sprintf( '<span class="screen-reader-text">%s </span>', _x( 'Format', 'Used before post format.', 'twentyfifteen' ) ),
-			esc_url( get_post_format_link( $format ) ),
-			get_post_format_string( $format )
-		);
-	}
-
-	if ( in_array( get_post_type(), array( 'post', 'attachment' ) ) ) {
-		$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
+	function twentyfifteen_entry_meta() {
+		if ( is_sticky() && is_home() && ! is_paged() ) {
+			printf( '<span class="sticky-post">%s</span>', __( 'Featured', 'twentyfifteen' ) );
+		}
 
-		if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
-			$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
+		$format = get_post_format();
+		if ( current_theme_supports( 'post-formats', $format ) ) {
+			printf( '<span class="entry-format">%1$s<a href="%2$s">%3$s</a></span>',
+				sprintf( '<span class="screen-reader-text">%s </span>', _x( 'Format', 'Used before post format.', 'twentyfifteen' ) ),
+				esc_url( get_post_format_link( $format ) ),
+				get_post_format_string( $format )
+			);
 		}
 
-		$time_string = sprintf( $time_string,
-			esc_attr( get_the_date( 'c' ) ),
-			get_the_date(),
-			esc_attr( get_the_modified_date( 'c' ) ),
-			get_the_modified_date()
-		);
+		if ( in_array( get_post_type(), array( 'post', 'attachment' ) ) ) {
+			$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
 
-		printf( '<span class="posted-on"><span class="screen-reader-text">%1$s </span><a href="%2$s" rel="bookmark">%3$s</a></span>',
-			_x( 'Posted on', 'Used before publish date.', 'twentyfifteen' ),
-			esc_url( get_permalink() ),
-			$time_string
-		);
-	}
+			if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
+				$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
+			}
+
+			$time_string = sprintf( $time_string,
+				esc_attr( get_the_date( 'c' ) ),
+				get_the_date(),
+				esc_attr( get_the_modified_date( 'c' ) ),
+				get_the_modified_date()
+			);
 
-	if ( 'post' == get_post_type() ) {
-		if ( is_singular() || is_multi_author() ) {
-			printf( '<span class="byline"><span class="author vcard"><span class="screen-reader-text">%1$s </span><a class="url fn n" href="%2$s">%3$s</a></span></span>',
-				_x( 'Author', 'Used before post author name.', 'twentyfifteen' ),
-				esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-				get_the_author()
+			printf( '<span class="posted-on"><span class="screen-reader-text">%1$s </span><a href="%2$s" rel="bookmark">%3$s</a></span>',
+				_x( 'Posted on', 'Used before publish date.', 'twentyfifteen' ),
+				esc_url( get_permalink() ),
+				$time_string
 			);
 		}
 
-		$categories_list = get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfifteen' ) );
-		if ( $categories_list && twentyfifteen_categorized_blog() ) {
-			printf( '<span class="cat-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
-				_x( 'Categories', 'Used before category names.', 'twentyfifteen' ),
-				$categories_list
-			);
+		if ( 'post' == get_post_type() ) {
+			if ( is_singular() || is_multi_author() ) {
+				printf( '<span class="byline"><span class="author vcard"><span class="screen-reader-text">%1$s </span><a class="url fn n" href="%2$s">%3$s</a></span></span>',
+					_x( 'Author', 'Used before post author name.', 'twentyfifteen' ),
+					esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+					get_the_author()
+				);
+			}
+
+			$categories_list = get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfifteen' ) );
+			if ( $categories_list && twentyfifteen_categorized_blog() ) {
+				printf( '<span class="cat-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
+					_x( 'Categories', 'Used before category names.', 'twentyfifteen' ),
+					$categories_list
+				);
+			}
+
+			$tags_list = get_the_tag_list( '', _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfifteen' ) );
+			if ( $tags_list ) {
+				printf( '<span class="tags-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
+					_x( 'Tags', 'Used before tag names.', 'twentyfifteen' ),
+					$tags_list
+				);
+			}
 		}
 
-		$tags_list = get_the_tag_list( '', _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfifteen' ) );
-		if ( $tags_list ) {
-			printf( '<span class="tags-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
-				_x( 'Tags', 'Used before tag names.', 'twentyfifteen' ),
-				$tags_list
+		if ( is_attachment() && wp_attachment_is_image() ) {
+			// Retrieve attachment metadata.
+			$metadata = wp_get_attachment_metadata();
+
+			printf( '<span class="full-size-link"><span class="screen-reader-text">%1$s </span><a href="%2$s">%3$s &times; %4$s</a></span>',
+				_x( 'Full size', 'Used before full size attachment link.', 'twentyfifteen' ),
+				esc_url( wp_get_attachment_url() ),
+				$metadata['width'],
+				$metadata['height']
 			);
 		}
-	}
 
-	if ( is_attachment() && wp_attachment_is_image() ) {
-		// Retrieve attachment metadata.
-		$metadata = wp_get_attachment_metadata();
-
-		printf( '<span class="full-size-link"><span class="screen-reader-text">%1$s </span><a href="%2$s">%3$s &times; %4$s</a></span>',
-			_x( 'Full size', 'Used before full size attachment link.', 'twentyfifteen' ),
-			esc_url( wp_get_attachment_url() ),
-			$metadata['width'],
-			$metadata['height']
-		);
-	}
-
-	if ( ! is_single() && ! post_password_required() && ( comments_open() || get_comments_number() ) ) {
-		echo '<span class="comments-link">';
-		/* translators: %s: post title */
-		comments_popup_link( sprintf( __( 'Leave a comment<span class="screen-reader-text"> on %s</span>', 'twentyfifteen' ), get_the_title() ) );
-		echo '</span>';
+		if ( ! is_single() && ! post_password_required() && ( comments_open() || get_comments_number() ) ) {
+			echo '<span class="comments-link">';
+			/* translators: %s: post title */
+			comments_popup_link( sprintf( __( 'Leave a comment<span class="screen-reader-text"> on %s</span>', 'twentyfifteen' ), get_the_title() ) );
+			echo '</span>';
+		}
 	}
-}
 endif;
 
 /**
@@ -172,7 +172,7 @@
 add_action( 'save_post',     'twentyfifteen_category_transient_flusher' );
 
 if ( ! function_exists( 'twentyfifteen_post_thumbnail' ) ) :
-/**
+	/**
  * Display an optional post thumbnail.
  *
  * Wraps the post thumbnail in an anchor element on index views, or a div
@@ -180,15 +180,15 @@
  *
  * @since Twenty Fifteen 1.0
  */
-function twentyfifteen_post_thumbnail() {
-	if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
-		return;
-	}
+	function twentyfifteen_post_thumbnail() {
+		if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
+			return;
+		}
 
-	if ( is_singular() ) :
-	?>
+		if ( is_singular() ) :
+		?>
 
-	<div class="post-thumbnail">
+		<div class="post-thumbnail">
 		<?php the_post_thumbnail(); ?>
 	</div><!-- .post-thumbnail -->
 
@@ -201,11 +201,11 @@
 	</a>
 
 	<?php endif; // End is_singular()
-}
+	}
 endif;
 
 if ( ! function_exists( 'twentyfifteen_get_link_url' ) ) :
-/**
+	/**
  * Return the post URL.
  *
  * Falls back to the post permalink if no URL is found in the post.
@@ -216,43 +216,43 @@
  *
  * @return string The Link format URL.
  */
-function twentyfifteen_get_link_url() {
-	$has_url = get_url_in_content( get_the_content() );
+	function twentyfifteen_get_link_url() {
+		$has_url = get_url_in_content( get_the_content() );
 
-	return $has_url ? $has_url : apply_filters( 'the_permalink', get_permalink() );
-}
+		return $has_url ? $has_url : apply_filters( 'the_permalink', get_permalink() );
+	}
 endif;
 
 if ( ! function_exists( 'twentyfifteen_excerpt_more' ) && ! is_admin() ) :
-/**
+	/**
  * Replaces "[...]" (appended to automatically generated excerpts) with ... and a 'Continue reading' link.
  *
  * @since Twenty Fifteen 1.0
  *
  * @return string 'Continue reading' link prepended with an ellipsis.
  */
-function twentyfifteen_excerpt_more( $more ) {
-	$link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
-		esc_url( get_permalink( get_the_ID() ) ),
-		/* translators: %s: Name of current post */
-		sprintf( __( 'Continue reading %s', 'twentyfifteen' ), '<span class="screen-reader-text">' . get_the_title( get_the_ID() ) . '</span>' )
+	function twentyfifteen_excerpt_more( $more ) {
+		$link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
+			esc_url( get_permalink( get_the_ID() ) ),
+			/* translators: %s: Name of current post */
+			sprintf( __( 'Continue reading %s', 'twentyfifteen' ), '<span class="screen-reader-text">' . get_the_title( get_the_ID() ) . '</span>' )
 		);
-	return ' &hellip; ' . $link;
-}
-add_filter( 'excerpt_more', 'twentyfifteen_excerpt_more' );
+			return ' &hellip; ' . $link;
+	}
+	add_filter( 'excerpt_more', 'twentyfifteen_excerpt_more' );
 endif;
 
 if ( ! function_exists( 'twentyfifteen_the_custom_logo' ) ) :
-/**
+	/**
  * Displays the optional custom logo.
  *
  * Does nothing if the custom logo is not available.
  *
  * @since Twenty Fifteen 1.5
  */
-function twentyfifteen_the_custom_logo() {
-	if ( function_exists( 'the_custom_logo' ) ) {
-		the_custom_logo();
+	function twentyfifteen_the_custom_logo() {
+		if ( function_exists( 'the_custom_logo' ) ) {
+			the_custom_logo();
+		}
 	}
-}
 endif;
Index: src/wp-content/themes/twentyfifteen/index.php
===================================================================
--- src/wp-content/themes/twentyfifteen/index.php	(revision 40901)
+++ src/wp-content/themes/twentyfifteen/index.php	(working copy)
@@ -38,7 +38,7 @@
 				 */
 				get_template_part( 'content', get_post_format() );
 
-			// End the loop.
+				// End the loop.
 			endwhile;
 
 			// Previous/next page navigation.
@@ -48,7 +48,7 @@
 				'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>',
 			) );
 
-		// If no content, include the "No posts found" template.
+			// If no content, include the "No posts found" template.
 		else :
 			get_template_part( 'content', 'none' );
 
Index: src/wp-content/themes/twentyfifteen/page.php
===================================================================
--- src/wp-content/themes/twentyfifteen/page.php	(revision 40901)
+++ src/wp-content/themes/twentyfifteen/page.php	(working copy)
@@ -28,7 +28,7 @@
 				comments_template();
 			endif;
 
-		// End the loop.
+			// End the loop.
 		endwhile;
 		?>
 
Index: src/wp-content/themes/twentyfifteen/search.php
===================================================================
--- src/wp-content/themes/twentyfifteen/search.php	(revision 40901)
+++ src/wp-content/themes/twentyfifteen/search.php	(working copy)
@@ -30,7 +30,7 @@
 				 */
 				get_template_part( 'content', 'search' );
 
-			// End the loop.
+				// End the loop.
 			endwhile;
 
 			// Previous/next page navigation.
@@ -40,7 +40,7 @@
 				'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>',
 			) );
 
-		// If no content, include the "No posts found" template.
+			// If no content, include the "No posts found" template.
 		else :
 			get_template_part( 'content', 'none' );
 
Index: src/wp-content/themes/twentyfifteen/sidebar.php
===================================================================
--- src/wp-content/themes/twentyfifteen/sidebar.php	(revision 40901)
+++ src/wp-content/themes/twentyfifteen/sidebar.php	(working copy)
@@ -7,7 +7,7 @@
  * @since Twenty Fifteen 1.0
  */
 
-if ( has_nav_menu( 'primary' ) || has_nav_menu( 'social' ) || is_active_sidebar( 'sidebar-1' )  ) : ?>
+if ( has_nav_menu( 'primary' ) || has_nav_menu( 'social' ) || is_active_sidebar( 'sidebar-1' ) ) : ?>
 	<div id="secondary" class="secondary">
 
 		<?php if ( has_nav_menu( 'primary' ) ) : ?>
Index: src/wp-content/themes/twentyfifteen/single.php
===================================================================
--- src/wp-content/themes/twentyfifteen/single.php	(revision 40901)
+++ src/wp-content/themes/twentyfifteen/single.php	(working copy)
@@ -38,7 +38,7 @@
 					'<span class="post-title">%title</span>',
 			) );
 
-		// End the loop.
+			// End the loop.
 		endwhile;
 		?>
 
Index: src/wp-content/themes/twentyfourteen/archive.php
===================================================================
--- src/wp-content/themes/twentyfourteen/archive.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/archive.php	(working copy)
@@ -27,8 +27,8 @@
 			<header class="page-header">
 				<h1 class="page-title">
 					<?php
-						if ( is_day() ) :
-							printf( __( 'Daily Archives: %s', 'twentyfourteen' ), get_the_date() );
+					if ( is_day() ) :
+						printf( __( 'Daily Archives: %s', 'twentyfourteen' ), get_the_date() );
 
 						elseif ( is_month() ) :
 							printf( __( 'Monthly Archives: %s', 'twentyfourteen' ), get_the_date( _x( 'F Y', 'monthly archives date format', 'twentyfourteen' ) ) );
@@ -46,14 +46,14 @@
 
 			<?php
 					// Start the Loop.
-					while ( have_posts() ) : the_post();
+			while ( have_posts() ) : the_post();
 
-						/*
-						 * Include the post format-specific template for the content. If you want to
-						 * use this in a child theme, then include a file called called content-___.php
-						 * (where ___ is the post format) and that will be used instead.
-						 */
-						get_template_part( 'content', get_post_format() );
+				/*
+				* Include the post format-specific template for the content. If you want to
+				* use this in a child theme, then include a file called called content-___.php
+				* (where ___ is the post format) and that will be used instead.
+				*/
+				get_template_part( 'content', get_post_format() );
 
 					endwhile;
 					// Previous/next page navigation.
Index: src/wp-content/themes/twentyfourteen/author.php
===================================================================
--- src/wp-content/themes/twentyfourteen/author.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/author.php	(working copy)
@@ -45,14 +45,14 @@
 					rewind_posts();
 
 					// Start the Loop.
-					while ( have_posts() ) : the_post();
+			while ( have_posts() ) : the_post();
 
-						/*
-						 * Include the post format-specific template for the content. If you want to
-						 * use this in a child theme, then include a file called called content-___.php
-						 * (where ___ is the post format) and that will be used instead.
-						 */
-						get_template_part( 'content', get_post_format() );
+				/*
+				* Include the post format-specific template for the content. If you want to
+				* use this in a child theme, then include a file called called content-___.php
+				* (where ___ is the post format) and that will be used instead.
+				*/
+				get_template_part( 'content', get_post_format() );
 
 					endwhile;
 					// Previous/next page navigation.
Index: src/wp-content/themes/twentyfourteen/category.php
===================================================================
--- src/wp-content/themes/twentyfourteen/category.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/category.php	(working copy)
@@ -22,22 +22,22 @@
 				<?php
 					// Show an optional term description.
 					$term_description = term_description();
-					if ( ! empty( $term_description ) ) :
-						printf( '<div class="taxonomy-description">%s</div>', $term_description );
+				if ( ! empty( $term_description ) ) :
+					printf( '<div class="taxonomy-description">%s</div>', $term_description );
 					endif;
 				?>
 			</header><!-- .archive-header -->
 
 			<?php
 					// Start the Loop.
-					while ( have_posts() ) : the_post();
+			while ( have_posts() ) : the_post();
 
-					/*
-					 * Include the post format-specific template for the content. If you want to
-					 * use this in a child theme, then include a file called called content-___.php
-					 * (where ___ is the post format) and that will be used instead.
-					 */
-					get_template_part( 'content', get_post_format() );
+				/*
+				* Include the post format-specific template for the content. If you want to
+				* use this in a child theme, then include a file called called content-___.php
+				* (where ___ is the post format) and that will be used instead.
+				*/
+				get_template_part( 'content', get_post_format() );
 
 					endwhile;
 					// Previous/next page navigation.
Index: src/wp-content/themes/twentyfourteen/comments.php
===================================================================
--- src/wp-content/themes/twentyfourteen/comments.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/comments.php	(working copy)
@@ -25,7 +25,7 @@
 	<h2 class="comments-title">
 		<?php
 			printf( _n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentyfourteen' ),
-				number_format_i18n( get_comments_number() ), get_the_title() );
+			number_format_i18n( get_comments_number() ), get_the_title() );
 		?>
 	</h2>
 
Index: src/wp-content/themes/twentyfourteen/content-aside.php
===================================================================
--- src/wp-content/themes/twentyfourteen/content-aside.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/content-aside.php	(working copy)
@@ -19,8 +19,8 @@
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+if ( is_single() ) :
+	the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
Index: src/wp-content/themes/twentyfourteen/content-audio.php
===================================================================
--- src/wp-content/themes/twentyfourteen/content-audio.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/content-audio.php	(working copy)
@@ -19,8 +19,8 @@
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+if ( is_single() ) :
+	the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
Index: src/wp-content/themes/twentyfourteen/content-featured-post.php
===================================================================
--- src/wp-content/themes/twentyfourteen/content-featured-post.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/content-featured-post.php	(working copy)
@@ -12,12 +12,12 @@
 	<a class="post-thumbnail" href="<?php the_permalink(); ?>">
 	<?php
 		// Output the featured image.
-		if ( has_post_thumbnail() ) :
-			if ( 'grid' == get_theme_mod( 'featured_content_layout' ) ) {
-				the_post_thumbnail();
-			} else {
-				the_post_thumbnail( 'twentyfourteen-full-width' );
-			}
+	if ( has_post_thumbnail() ) :
+		if ( 'grid' == get_theme_mod( 'featured_content_layout' ) ) {
+			the_post_thumbnail();
+		} else {
+			the_post_thumbnail( 'twentyfourteen-full-width' );
+		}
 		endif;
 	?>
 	</a>
Index: src/wp-content/themes/twentyfourteen/content-gallery.php
===================================================================
--- src/wp-content/themes/twentyfourteen/content-gallery.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/content-gallery.php	(working copy)
@@ -19,8 +19,8 @@
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+if ( is_single() ) :
+	the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
Index: src/wp-content/themes/twentyfourteen/content-image.php
===================================================================
--- src/wp-content/themes/twentyfourteen/content-image.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/content-image.php	(working copy)
@@ -19,8 +19,8 @@
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+if ( is_single() ) :
+	the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
Index: src/wp-content/themes/twentyfourteen/content-link.php
===================================================================
--- src/wp-content/themes/twentyfourteen/content-link.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/content-link.php	(working copy)
@@ -19,8 +19,8 @@
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+if ( is_single() ) :
+	the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
Index: src/wp-content/themes/twentyfourteen/content-quote.php
===================================================================
--- src/wp-content/themes/twentyfourteen/content-quote.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/content-quote.php	(working copy)
@@ -19,8 +19,8 @@
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+if ( is_single() ) :
+	the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
Index: src/wp-content/themes/twentyfourteen/content-video.php
===================================================================
--- src/wp-content/themes/twentyfourteen/content-video.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/content-video.php	(working copy)
@@ -19,8 +19,8 @@
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+if ( is_single() ) :
+	the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
Index: src/wp-content/themes/twentyfourteen/content.php
===================================================================
--- src/wp-content/themes/twentyfourteen/content.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/content.php	(working copy)
@@ -21,8 +21,8 @@
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+if ( is_single() ) :
+	the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
@@ -30,10 +30,11 @@
 
 		<div class="entry-meta">
 			<?php
-				if ( 'post' == get_post_type() )
-					twentyfourteen_posted_on();
+			if ( 'post' == get_post_type() ) {
+				twentyfourteen_posted_on();
+			}
 
-				if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
+			if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
 			?>
 			<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
 			<?php
Index: src/wp-content/themes/twentyfourteen/featured-content.php
===================================================================
--- src/wp-content/themes/twentyfourteen/featured-content.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/featured-content.php	(working copy)
@@ -19,11 +19,11 @@
 		do_action( 'twentyfourteen_featured_posts_before' );
 
 		$featured_posts = twentyfourteen_get_featured_posts();
-		foreach ( (array) $featured_posts as $order => $post ) :
-			setup_postdata( $post );
+	foreach ( (array) $featured_posts as $order => $post ) :
+		setup_postdata( $post );
 
-			// Include the featured content template.
-			get_template_part( 'content', 'featured-post' );
+		// Include the featured content template.
+		get_template_part( 'content', 'featured-post' );
 		endforeach;
 
 		/**
Index: src/wp-content/themes/twentyfourteen/footer.php
===================================================================
--- src/wp-content/themes/twentyfourteen/footer.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/footer.php	(working copy)
@@ -25,4 +25,4 @@
 
 	<?php wp_footer(); ?>
 </body>
-</html>
\ No newline at end of file
+</html>
Index: src/wp-content/themes/twentyfourteen/functions.php
===================================================================
--- src/wp-content/themes/twentyfourteen/functions.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/functions.php	(working copy)
@@ -44,7 +44,7 @@
 }
 
 if ( ! function_exists( 'twentyfourteen_setup' ) ) :
-/**
+	/**
  * Twenty Fourteen setup.
  *
  * Set up theme defaults and registers support for various WordPress features.
@@ -55,68 +55,78 @@
  *
  * @since Twenty Fourteen 1.0
  */
-function twentyfourteen_setup() {
-
-	/*
-	 * Make Twenty Fourteen available for translation.
-	 *
-	 * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentyfourteen
-	 * If you're building a theme based on Twenty Fourteen, use a find and
-	 * replace to change 'twentyfourteen' to the name of your theme in all
-	 * template files.
-	 */
-	load_theme_textdomain( 'twentyfourteen' );
-
-	// This theme styles the visual editor to resemble the theme style.
-	add_editor_style( array( 'css/editor-style.css', twentyfourteen_font_url(), 'genericons/genericons.css' ) );
-
-	// Add RSS feed links to <head> for posts and comments.
-	add_theme_support( 'automatic-feed-links' );
-
-	// Enable support for Post Thumbnails, and declare two sizes.
-	add_theme_support( 'post-thumbnails' );
-	set_post_thumbnail_size( 672, 372, true );
-	add_image_size( 'twentyfourteen-full-width', 1038, 576, true );
-
-	// This theme uses wp_nav_menu() in two locations.
-	register_nav_menus( array(
-		'primary'   => __( 'Top primary menu', 'twentyfourteen' ),
-		'secondary' => __( 'Secondary menu in left sidebar', 'twentyfourteen' ),
-	) );
-
-	/*
-	 * Switch default core markup for search form, comment form, and comments
-	 * to output valid HTML5.
-	 */
-	add_theme_support( 'html5', array(
-		'search-form', 'comment-form', 'comment-list', 'gallery', 'caption'
-	) );
+	function twentyfourteen_setup() {
 
-	/*
-	 * Enable support for Post Formats.
-	 * See https://codex.wordpress.org/Post_Formats
-	 */
-	add_theme_support( 'post-formats', array(
-		'aside', 'image', 'video', 'audio', 'quote', 'link', 'gallery',
-	) );
+		/*
+		 * Make Twenty Fourteen available for translation.
+		 *
+		 * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentyfourteen
+		 * If you're building a theme based on Twenty Fourteen, use a find and
+		 * replace to change 'twentyfourteen' to the name of your theme in all
+		 * template files.
+		 */
+		load_theme_textdomain( 'twentyfourteen' );
+
+		// This theme styles the visual editor to resemble the theme style.
+		add_editor_style( array( 'css/editor-style.css', twentyfourteen_font_url(), 'genericons/genericons.css' ) );
+
+		// Add RSS feed links to <head> for posts and comments.
+		add_theme_support( 'automatic-feed-links' );
+
+		// Enable support for Post Thumbnails, and declare two sizes.
+		add_theme_support( 'post-thumbnails' );
+		set_post_thumbnail_size( 672, 372, true );
+		add_image_size( 'twentyfourteen-full-width', 1038, 576, true );
+
+		// This theme uses wp_nav_menu() in two locations.
+		register_nav_menus( array(
+			'primary'   => __( 'Top primary menu', 'twentyfourteen' ),
+			'secondary' => __( 'Secondary menu in left sidebar', 'twentyfourteen' ),
+		) );
 
-	// This theme allows users to set a custom background.
-	add_theme_support( 'custom-background', apply_filters( 'twentyfourteen_custom_background_args', array(
-		'default-color' => 'f5f5f5',
-	) ) );
-
-	// Add support for featured content.
-	add_theme_support( 'featured-content', array(
-		'featured_content_filter' => 'twentyfourteen_get_featured_posts',
-		'max_posts' => 6,
-	) );
+			/*
+			 * Switch default core markup for search form, comment form, and comments
+			 * to output valid HTML5.
+			 */
+			add_theme_support( 'html5', array(
+				'search-form',
+				'comment-form',
+				'comment-list',
+				'gallery',
+				'caption',
+			) );
+
+			/*
+			 * Enable support for Post Formats.
+			 * See https://codex.wordpress.org/Post_Formats
+			 */
+			add_theme_support( 'post-formats', array(
+				'aside',
+				'image',
+				'video',
+				'audio',
+				'quote',
+				'link',
+				'gallery',
+			) );
+
+			// This theme allows users to set a custom background.
+			add_theme_support( 'custom-background', apply_filters( 'twentyfourteen_custom_background_args', array(
+				'default-color' => 'f5f5f5',
+			) ) );
+
+			// Add support for featured content.
+			add_theme_support( 'featured-content', array(
+				'featured_content_filter' => 'twentyfourteen_get_featured_posts',
+				'max_posts' => 6,
+			) );
 
-	// This theme uses its own gallery styles.
-	add_filter( 'use_default_gallery_style', '__return_false' );
+			// This theme uses its own gallery styles.
+			add_filter( 'use_default_gallery_style', '__return_false' );
 
-	// Indicate widget sidebars can use selective refresh in the Customizer.
-	add_theme_support( 'customize-selective-refresh-widgets' );
-}
+			// Indicate widget sidebars can use selective refresh in the Customizer.
+			add_theme_support( 'customize-selective-refresh-widgets' );
+	}
 endif; // twentyfourteen_setup
 add_action( 'after_setup_theme', 'twentyfourteen_setup' );
 
@@ -259,7 +269,7 @@
 		wp_enqueue_script( 'twentyfourteen-slider', get_template_directory_uri() . '/js/slider.js', array( 'jquery' ), '20131205', true );
 		wp_localize_script( 'twentyfourteen-slider', 'featuredSliderDefaults', array(
 			'prevText' => __( 'Previous', 'twentyfourteen' ),
-			'nextText' => __( 'Next', 'twentyfourteen' )
+			'nextText' => __( 'Next', 'twentyfourteen' ),
 		) );
 	}
 
@@ -303,14 +313,14 @@
 add_filter( 'wp_resource_hints', 'twentyfourteen_resource_hints', 10, 2 );
 
 if ( ! function_exists( 'twentyfourteen_the_attached_image' ) ) :
-/**
+	/**
  * Print the attached image with a link to the next attached image.
  *
  * @since Twenty Fourteen 1.0
  */
-function twentyfourteen_the_attached_image() {
-	$post                = get_post();
-	/**
+	function twentyfourteen_the_attached_image() {
+		$post                = get_post();
+		/**
 	 * Filter the default Twenty Fourteen attachment size.
 	 *
 	 * @since Twenty Fourteen 1.0
@@ -322,94 +332,92 @@
 	 *     @type int $width  Width of the image in pixels. Default 810.
 	 * }
 	 */
-	$attachment_size     = apply_filters( 'twentyfourteen_attachment_size', array( 810, 810 ) );
-	$next_attachment_url = wp_get_attachment_url();
+		$attachment_size     = apply_filters( 'twentyfourteen_attachment_size', array( 810, 810 ) );
+		$next_attachment_url = wp_get_attachment_url();
 
-	/*
-	 * Grab the IDs of all the image attachments in a gallery so we can get the URL
-	 * of the next adjacent image in a gallery, or the first image (if we're
-	 * looking at the last image in a gallery), or, in a gallery of one, just the
-	 * link to that image file.
-	 */
-	$attachment_ids = get_posts( array(
-		'post_parent'    => $post->post_parent,
-		'fields'         => 'ids',
-		'numberposts'    => -1,
-		'post_status'    => 'inherit',
-		'post_type'      => 'attachment',
-		'post_mime_type' => 'image',
-		'order'          => 'ASC',
-		'orderby'        => 'menu_order ID',
-	) );
+		/*
+		 * Grab the IDs of all the image attachments in a gallery so we can get the URL
+		 * of the next adjacent image in a gallery, or the first image (if we're
+		 * looking at the last image in a gallery), or, in a gallery of one, just the
+		 * link to that image file.
+		 */
+		$attachment_ids = get_posts( array(
+			'post_parent'    => $post->post_parent,
+			'fields'         => 'ids',
+			'numberposts'    => -1,
+			'post_status'    => 'inherit',
+			'post_type'      => 'attachment',
+			'post_mime_type' => 'image',
+			'order'          => 'ASC',
+			'orderby'        => 'menu_order ID',
+		) );
 
-	// If there is more than 1 attachment in a gallery...
-	if ( count( $attachment_ids ) > 1 ) {
-		foreach ( $attachment_ids as $idx => $attachment_id ) {
-			if ( $attachment_id == $post->ID ) {
-				$next_id = $attachment_ids[ ( $idx + 1 ) % count( $attachment_ids ) ];
-				break;
+			// If there is more than 1 attachment in a gallery...
+		if ( count( $attachment_ids ) > 1 ) {
+			foreach ( $attachment_ids as $idx => $attachment_id ) {
+				if ( $attachment_id == $post->ID ) {
+					$next_id = $attachment_ids[ ( $idx + 1 ) % count( $attachment_ids ) ];
+					break;
+				}
 			}
-		}
 
-		// get the URL of the next image attachment...
-		if ( $next_id ) {
-			$next_attachment_url = get_attachment_link( $next_id );
+			// get the URL of the next image attachment...
+			if ( $next_id ) {
+				$next_attachment_url = get_attachment_link( $next_id );
+			} // End if().
+			else {
+				$next_attachment_url = get_attachment_link( reset( $attachment_ids ) );
+			}
 		}
 
-		// or get the URL of the first image attachment.
-		else {
-			$next_attachment_url = get_attachment_link( reset( $attachment_ids ) );
-		}
+			printf( '<a href="%1$s" rel="attachment">%2$s</a>',
+				esc_url( $next_attachment_url ),
+				wp_get_attachment_image( $post->ID, $attachment_size )
+			);
 	}
-
-	printf( '<a href="%1$s" rel="attachment">%2$s</a>',
-		esc_url( $next_attachment_url ),
-		wp_get_attachment_image( $post->ID, $attachment_size )
-	);
-}
 endif;
 
 if ( ! function_exists( 'twentyfourteen_list_authors' ) ) :
-/**
+	/**
  * Print a list of all site contributors who published at least one post.
  *
  * @since Twenty Fourteen 1.0
  */
-function twentyfourteen_list_authors() {
-	$contributor_ids = get_users( array(
-		'fields'  => 'ID',
-		'orderby' => 'post_count',
-		'order'   => 'DESC',
-		'who'     => 'authors',
-	) );
+	function twentyfourteen_list_authors() {
+		$contributor_ids = get_users( array(
+			'fields'  => 'ID',
+			'orderby' => 'post_count',
+			'order'   => 'DESC',
+			'who'     => 'authors',
+		) );
 
-	foreach ( $contributor_ids as $contributor_id ) :
-		$post_count = count_user_posts( $contributor_id );
+		foreach ( $contributor_ids as $contributor_id ) :
+			$post_count = count_user_posts( $contributor_id );
 
-		// Move on if user has not published a post (yet).
-		if ( ! $post_count ) {
-			continue;
-		}
-	?>
+			// Move on if user has not published a post (yet).
+			if ( ! $post_count ) {
+				continue;
+			}
+			?>
 
-	<div class="contributor">
-		<div class="contributor-info">
+			<div class="contributor">
+			<div class="contributor-info">
 			<div class="contributor-avatar"><?php echo get_avatar( $contributor_id, 132 ); ?></div>
 			<div class="contributor-summary">
 				<h2 class="contributor-name"><?php echo get_the_author_meta( 'display_name', $contributor_id ); ?></h2>
 				<p class="contributor-bio">
-					<?php echo get_the_author_meta( 'description', $contributor_id ); ?>
+				<?php echo get_the_author_meta( 'description', $contributor_id ); ?>
 				</p>
 				<a class="button contributor-posts-link" href="<?php echo esc_url( get_author_posts_url( $contributor_id ) ); ?>">
-					<?php printf( _n( '%d Article', '%d Articles', $post_count, 'twentyfourteen' ), $post_count ); ?>
+				<?php printf( _n( '%d Article', '%d Articles', $post_count, 'twentyfourteen' ), $post_count ); ?>
 				</a>
 			</div><!-- .contributor-summary -->
-		</div><!-- .contributor-info -->
-	</div><!-- .contributor -->
+			</div><!-- .contributor-info -->
+		</div><!-- .contributor -->
 
-	<?php
-	endforeach;
-}
+		<?php
+		endforeach;
+	}
 endif;
 
 /**
@@ -553,9 +561,9 @@
  * `is_customize_preview` function was introduced.
  */
 if ( ! function_exists( 'is_customize_preview' ) ) :
-function is_customize_preview() {
-	global $wp_customize;
+	function is_customize_preview() {
+		global $wp_customize;
 
-	return ( $wp_customize instanceof WP_Customize_Manager ) && $wp_customize->is_preview();
-}
+		return ( $wp_customize instanceof WP_Customize_Manager ) && $wp_customize->is_preview();
+	}
 endif;
Index: src/wp-content/themes/twentyfourteen/image.php
===================================================================
--- src/wp-content/themes/twentyfourteen/image.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/image.php	(working copy)
@@ -18,51 +18,51 @@
 
 	<?php
 		// Start the Loop.
-		while ( have_posts() ) : the_post();
+	while ( have_posts() ) : the_post();
 	?>
-			<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-				<header class="entry-header">
-					<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
+	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+		<header class="entry-header">
+			<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
 
-					<div class="entry-meta">
+			<div class="entry-meta">
 
-						<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="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 esc_url( wp_get_attachment_url() ); ?>"><?php echo esc_html( $metadata['width'] ); ?> &times; <?php echo esc_html( $metadata['height'] ); ?></a></span>
+				<span class="full-size-link"><a href="<?php echo esc_url( wp_get_attachment_url() ); ?>"><?php echo esc_html( $metadata['width'] ); ?> &times; <?php echo esc_html( $metadata['height'] ); ?></a></span>
 
-						<span class="parent-post-link"><a href="<?php echo esc_url( get_permalink( $post->post_parent ) ); ?>" rel="gallery"><?php echo get_the_title( $post->post_parent ); ?></a></span>
-						<?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
-					</div><!-- .entry-meta -->
-				</header><!-- .entry-header -->
+				<span class="parent-post-link"><a href="<?php echo esc_url( get_permalink( $post->post_parent ) ); ?>" rel="gallery"><?php echo get_the_title( $post->post_parent ); ?></a></span>
+				<?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
+			</div><!-- .entry-meta -->
+		</header><!-- .entry-header -->
 
-				<div class="entry-content">
-					<div class="entry-attachment">
-						<div class="attachment">
-							<?php twentyfourteen_the_attached_image(); ?>
-						</div><!-- .attachment -->
+		<div class="entry-content">
+			<div class="entry-attachment">
+				<div class="attachment">
+					<?php twentyfourteen_the_attached_image(); ?>
+				</div><!-- .attachment -->
 
-						<?php if ( has_excerpt() ) : ?>
+				<?php if ( has_excerpt() ) : ?>
 						<div class="entry-caption">
 							<?php the_excerpt(); ?>
 						</div><!-- .entry-caption -->
 						<?php endif; ?>
-					</div><!-- .entry-attachment -->
+			</div><!-- .entry-attachment -->
 
-					<?php
-						the_content();
-						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 -->
+			<?php
+				the_content();
+				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 -->
 			</article><!-- #post-## -->
 
 			<nav id="image-navigation" class="navigation image-navigation">
-				<div class="nav-links">
-				<?php previous_image_link( false, '<div class="previous-image">' . __( 'Previous Image', 'twentyfourteen' ) . '</div>' ); ?>
+			<div class="nav-links">
+			<?php previous_image_link( false, '<div class="previous-image">' . __( 'Previous Image', 'twentyfourteen' ) . '</div>' ); ?>
 				<?php next_image_link( false, '<div class="next-image">' . __( 'Next Image', 'twentyfourteen' ) . '</div>' ); ?>
 				</div><!-- .nav-links -->
 			</nav><!-- #image-navigation -->
Index: src/wp-content/themes/twentyfourteen/inc/custom-header.php
===================================================================
--- src/wp-content/themes/twentyfourteen/inc/custom-header.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/inc/custom-header.php	(working copy)
@@ -48,23 +48,24 @@
 add_action( 'after_setup_theme', 'twentyfourteen_custom_header_setup' );
 
 if ( ! function_exists( 'twentyfourteen_header_style' ) ) :
-/**
+	/**
  * Styles the header image and text displayed on the blog
  *
  * @see twentyfourteen_custom_header_setup().
  *
  */
-function twentyfourteen_header_style() {
-	$text_color = get_header_textcolor();
+	function twentyfourteen_header_style() {
+		$text_color = get_header_textcolor();
 
-	// If no custom color for text is set, let's bail.
-	if ( display_header_text() && $text_color === get_theme_support( 'custom-header', 'default-text-color' ) )
-		return;
+		// If no custom color for text is set, let's bail.
+		if ( display_header_text() && $text_color === get_theme_support( 'custom-header', 'default-text-color' ) ) {
+			return;
+		}
 
-	// If we get this far, we have custom styles.
-	?>
-	<style type="text/css" id="twentyfourteen-header-css">
-	<?php
+		// If we get this far, we have custom styles.
+		?>
+		<style type="text/css" id="twentyfourteen-header-css">
+		<?php
 		// Has the text been hidden?
 		if ( ! display_header_text() ) :
 	?>
@@ -84,64 +85,64 @@
 	<?php endif; ?>
 	</style>
 	<?php
-}
+	}
 endif; // twentyfourteen_header_style
 
 
 if ( ! function_exists( 'twentyfourteen_admin_header_style' ) ) :
-/**
+	/**
  * Style the header image displayed on the Appearance > Header screen.
  *
  * @see twentyfourteen_custom_header_setup()
  *
  * @since Twenty Fourteen 1.0
  */
-function twentyfourteen_admin_header_style() {
-?>
-	<style type="text/css" id="twentyfourteen-admin-header-css">
-	.appearance_page_custom-header #headimg {
+	function twentyfourteen_admin_header_style() {
+		?>
+		<style type="text/css" id="twentyfourteen-admin-header-css">
+		.appearance_page_custom-header #headimg {
 		background-color: #000;
 		border: none;
 		max-width: 1260px;
 		min-height: 48px;
-	}
-	#headimg h1 {
+		}
+		#headimg h1 {
 		font-family: Lato, sans-serif;
 		font-size: 18px;
 		line-height: 48px;
 		margin: 0 0 0 30px;
-	}
-	.rtl #headimg h1  {
+		}
+		.rtl #headimg h1  {
 		margin: 0 30px 0 0;
-	}
-	#headimg h1 a {
+		}
+		#headimg h1 a {
 		color: #fff;
 		text-decoration: none;
-	}
-	#headimg img {
+		}
+		#headimg img {
 		vertical-align: middle;
+		}
+		</style>
+		<?php
 	}
-	</style>
-<?php
-}
 endif; // twentyfourteen_admin_header_style
 
 if ( ! function_exists( 'twentyfourteen_admin_header_image' ) ) :
-/**
+	/**
  * Create the custom header image markup displayed on the Appearance > Header screen.
  *
  * @see twentyfourteen_custom_header_setup()
  *
  * @since Twenty Fourteen 1.0
  */
-function twentyfourteen_admin_header_image() {
-?>
-	<div id="headimg">
+	function twentyfourteen_admin_header_image() {
+		?>
+		<div id="headimg">
 		<?php if ( get_header_image() ) : ?>
 		<img src="<?php header_image(); ?>" alt="">
 		<?php endif; ?>
 		<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( sprintf( 'color: #%s;', get_header_textcolor() ) ); ?>" onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
 	</div>
-<?php
-}
+	<?php
+	}
 endif; // twentyfourteen_admin_header_image
Index: src/wp-content/themes/twentyfourteen/inc/featured-content.php
===================================================================
--- src/wp-content/themes/twentyfourteen/inc/featured-content.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/inc/featured-content.php	(working copy)
@@ -83,15 +83,15 @@
 			self::$max_posts = absint( $theme_support[0]['max_posts'] );
 		}
 
-		add_filter( $filter,                              array( __CLASS__, 'get_featured_posts' )    );
+		add_filter( $filter,                              array( __CLASS__, 'get_featured_posts' ) );
 		add_action( 'customize_register',                 array( __CLASS__, 'customize_register' ), 9 );
-		add_action( 'admin_init',                         array( __CLASS__, 'register_setting'   )    );
-		add_action( 'switch_theme',                       array( __CLASS__, 'delete_transient'   )    );
-		add_action( 'save_post',                          array( __CLASS__, 'delete_transient'   )    );
-		add_action( 'delete_post_tag',                    array( __CLASS__, 'delete_post_tag'    )    );
-		add_action( 'customize_controls_enqueue_scripts', array( __CLASS__, 'enqueue_scripts'    )    );
-		add_action( 'pre_get_posts',                      array( __CLASS__, 'pre_get_posts'      )    );
-		add_action( 'wp_loaded',                          array( __CLASS__, 'wp_loaded'          )    );
+		add_action( 'admin_init',                         array( __CLASS__, 'register_setting' ) );
+		add_action( 'switch_theme',                       array( __CLASS__, 'delete_transient' ) );
+		add_action( 'save_post',                          array( __CLASS__, 'delete_transient' ) );
+		add_action( 'delete_post_tag',                    array( __CLASS__, 'delete_post_tag' ) );
+		add_action( 'customize_controls_enqueue_scripts', array( __CLASS__, 'enqueue_scripts' ) );
+		add_action( 'pre_get_posts',                      array( __CLASS__, 'pre_get_posts' ) );
+		add_action( 'wp_loaded',                          array( __CLASS__, 'wp_loaded' ) );
 	}
 
 	/**
@@ -106,7 +106,7 @@
 	 */
 	public static function wp_loaded() {
 		if ( self::get_setting( 'hide-tag' ) ) {
-			add_filter( 'get_terms',     array( __CLASS__, 'hide_featured_term'     ), 10, 3 );
+			add_filter( 'get_terms',     array( __CLASS__, 'hide_featured_term' ), 10, 3 );
 			add_filter( 'get_the_terms', array( __CLASS__, 'hide_the_featured_term' ), 10, 3 );
 		}
 	}
Index: src/wp-content/themes/twentyfourteen/inc/template-tags.php
===================================================================
--- src/wp-content/themes/twentyfourteen/inc/template-tags.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/inc/template-tags.php	(working copy)
@@ -8,7 +8,7 @@
  */
 
 if ( ! function_exists( 'twentyfourteen_paging_nav' ) ) :
-/**
+	/**
  * Display navigation to next/previous set of posts when applicable.
  *
  * @since Twenty Fourteen 1.0
@@ -16,108 +16,108 @@
  * @global WP_Query   $wp_query   WordPress Query object.
  * @global WP_Rewrite $wp_rewrite WordPress Rewrite object.
  */
-function twentyfourteen_paging_nav() {
-	global $wp_query, $wp_rewrite;
+	function twentyfourteen_paging_nav() {
+		global $wp_query, $wp_rewrite;
 
-	// Don't print empty markup if there's only one page.
-	if ( $wp_query->max_num_pages < 2 ) {
-		return;
-	}
-
-	$paged        = get_query_var( 'paged' ) ? intval( get_query_var( 'paged' ) ) : 1;
-	$pagenum_link = html_entity_decode( get_pagenum_link() );
-	$query_args   = array();
-	$url_parts    = explode( '?', $pagenum_link );
-
-	if ( isset( $url_parts[1] ) ) {
-		wp_parse_str( $url_parts[1], $query_args );
-	}
-
-	$pagenum_link = remove_query_arg( array_keys( $query_args ), $pagenum_link );
-	$pagenum_link = trailingslashit( $pagenum_link ) . '%_%';
-
-	$format  = $wp_rewrite->using_index_permalinks() && ! strpos( $pagenum_link, 'index.php' ) ? 'index.php/' : '';
-	$format .= $wp_rewrite->using_permalinks() ? user_trailingslashit( $wp_rewrite->pagination_base . '/%#%', 'paged' ) : '?paged=%#%';
-
-	// Set up paginated links.
-	$links = paginate_links( array(
-		'base'     => $pagenum_link,
-		'format'   => $format,
-		'total'    => $wp_query->max_num_pages,
-		'current'  => $paged,
-		'mid_size' => 1,
-		'add_args' => array_map( 'urlencode', $query_args ),
-		'prev_text' => __( '&larr; Previous', 'twentyfourteen' ),
-		'next_text' => __( 'Next &rarr;', 'twentyfourteen' ),
-	) );
+		// Don't print empty markup if there's only one page.
+		if ( $wp_query->max_num_pages < 2 ) {
+			return;
+		}
 
-	if ( $links ) :
+		$paged        = get_query_var( 'paged' ) ? intval( get_query_var( 'paged' ) ) : 1;
+		$pagenum_link = html_entity_decode( get_pagenum_link() );
+		$query_args   = array();
+		$url_parts    = explode( '?', $pagenum_link );
 
-	?>
-	<nav class="navigation paging-navigation" role="navigation">
-		<h1 class="screen-reader-text"><?php _e( 'Posts navigation', 'twentyfourteen' ); ?></h1>
-		<div class="pagination loop-pagination">
+		if ( isset( $url_parts[1] ) ) {
+			wp_parse_str( $url_parts[1], $query_args );
+		}
+
+		$pagenum_link = remove_query_arg( array_keys( $query_args ), $pagenum_link );
+		$pagenum_link = trailingslashit( $pagenum_link ) . '%_%';
+
+		$format  = $wp_rewrite->using_index_permalinks() && ! strpos( $pagenum_link, 'index.php' ) ? 'index.php/' : '';
+		$format .= $wp_rewrite->using_permalinks() ? user_trailingslashit( $wp_rewrite->pagination_base . '/%#%', 'paged' ) : '?paged=%#%';
+
+		// Set up paginated links.
+		$links = paginate_links( array(
+			'base'     => $pagenum_link,
+			'format'   => $format,
+			'total'    => $wp_query->max_num_pages,
+			'current'  => $paged,
+			'mid_size' => 1,
+			'add_args' => array_map( 'urlencode', $query_args ),
+			'prev_text' => __( '&larr; Previous', 'twentyfourteen' ),
+			'next_text' => __( 'Next &rarr;', 'twentyfourteen' ),
+		) );
+
+		if ( $links ) :
+
+			?>
+			<nav class="navigation paging-navigation" role="navigation">
+			<h1 class="screen-reader-text"><?php _e( 'Posts navigation', 'twentyfourteen' ); ?></h1>
+			<div class="pagination loop-pagination">
 			<?php echo $links; ?>
-		</div><!-- .pagination -->
-	</nav><!-- .navigation -->
-	<?php
-	endif;
-}
+			</div><!-- .pagination -->
+		</nav><!-- .navigation -->
+		<?php
+		endif;
+	}
 endif;
 
 if ( ! function_exists( 'twentyfourteen_post_nav' ) ) :
-/**
+	/**
  * Display navigation to next/previous post when applicable.
  *
  * @since Twenty Fourteen 1.0
  */
-function twentyfourteen_post_nav() {
-	// Don't print empty markup if there's nowhere to navigate.
-	$previous = ( is_attachment() ) ? get_post( get_post()->post_parent ) : get_adjacent_post( false, '', true );
-	$next     = get_adjacent_post( false, '', false );
+	function twentyfourteen_post_nav() {
+		// Don't print empty markup if there's nowhere to navigate.
+		$previous = ( is_attachment() ) ? get_post( get_post()->post_parent ) : get_adjacent_post( false, '', true );
+		$next     = get_adjacent_post( false, '', false );
 
-	if ( ! $next && ! $previous ) {
-		return;
-	}
+		if ( ! $next && ! $previous ) {
+			return;
+		}
 
-	?>
-	<nav class="navigation post-navigation" role="navigation">
+		?>
+		<nav class="navigation post-navigation" role="navigation">
 		<h1 class="screen-reader-text"><?php _e( 'Post navigation', 'twentyfourteen' ); ?></h1>
 		<div class="nav-links">
 			<?php
 			if ( is_attachment() ) :
 				previous_post_link( '%link', __( '<span class="meta-nav">Published In</span>%title', 'twentyfourteen' ) );
-			else :
-				previous_post_link( '%link', __( '<span class="meta-nav">Previous Post</span>%title', 'twentyfourteen' ) );
-				next_post_link( '%link', __( '<span class="meta-nav">Next Post</span>%title', 'twentyfourteen' ) );
-			endif;
-			?>
-		</div><!-- .nav-links -->
-	</nav><!-- .navigation -->
-	<?php
-}
+				else :
+					previous_post_link( '%link', __( '<span class="meta-nav">Previous Post</span>%title', 'twentyfourteen' ) );
+					next_post_link( '%link', __( '<span class="meta-nav">Next Post</span>%title', 'twentyfourteen' ) );
+					endif;
+				?>
+				</div><!-- .nav-links -->
+			</nav><!-- .navigation -->
+			<?php
+	}
 endif;
 
 if ( ! function_exists( 'twentyfourteen_posted_on' ) ) :
-/**
+	/**
  * Print HTML with meta information for the current post-date/time and author.
  *
  * @since Twenty Fourteen 1.0
  */
-function twentyfourteen_posted_on() {
-	if ( is_sticky() && is_home() && ! is_paged() ) {
-		echo '<span class="featured-post">' . __( 'Sticky', 'twentyfourteen' ) . '</span>';
-	}
+	function twentyfourteen_posted_on() {
+		if ( is_sticky() && is_home() && ! is_paged() ) {
+			echo '<span class="featured-post">' . __( 'Sticky', 'twentyfourteen' ) . '</span>';
+		}
 
-	// Set up and print post meta information.
-	printf( '<span class="entry-date"><a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s">%3$s</time></a></span> <span class="byline"><span class="author vcard"><a class="url fn n" href="%4$s" rel="author">%5$s</a></span></span>',
-		esc_url( get_permalink() ),
-		esc_attr( get_the_date( 'c' ) ),
-		esc_html( get_the_date() ),
-		esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-		get_the_author()
-	);
-}
+		// Set up and print post meta information.
+		printf( '<span class="entry-date"><a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s">%3$s</time></a></span> <span class="byline"><span class="author vcard"><a class="url fn n" href="%4$s" rel="author">%5$s</a></span></span>',
+			esc_url( get_permalink() ),
+			esc_attr( get_the_date( 'c' ) ),
+			esc_html( get_the_date() ),
+			esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+			get_the_author()
+		);
+	}
 endif;
 
 /**
@@ -162,7 +162,7 @@
 add_action( 'save_post',     'twentyfourteen_category_transient_flusher' );
 
 if ( ! function_exists( 'twentyfourteen_post_thumbnail' ) ) :
-/**
+	/**
  * Display an optional post thumbnail.
  *
  * Wraps the post thumbnail in an anchor element on index
@@ -171,42 +171,44 @@
  * @since Twenty Fourteen 1.0
  * @since Twenty Fourteen 1.4 Was made 'pluggable', or overridable.
  */
-function twentyfourteen_post_thumbnail() {
-	if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
-		return;
-	}
+	function twentyfourteen_post_thumbnail() {
+		if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
+			return;
+		}
 
-	if ( is_singular() ) :
-	?>
+		if ( is_singular() ) :
+		?>
 
-	<div class="post-thumbnail">
-	<?php
+		<div class="post-thumbnail">
+		<?php
 		if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'page-templates/full-width.php' ) ) ) {
 			the_post_thumbnail( 'twentyfourteen-full-width' );
 		} else {
 			the_post_thumbnail();
 		}
-	?>
-	</div>
+		?>
+		</div>
 
-	<?php else : ?>
+		<?php else : ?>
 
 	<a class="post-thumbnail" href="<?php the_permalink(); ?>" aria-hidden="true">
 	<?php
-		if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'page-templates/full-width.php' ) ) ) {
-			the_post_thumbnail( 'twentyfourteen-full-width' );
-		} else {
-			the_post_thumbnail( 'post-thumbnail', array( 'alt' => get_the_title() ) );
-		}
+	if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'page-templates/full-width.php' ) ) ) {
+		the_post_thumbnail( 'twentyfourteen-full-width' );
+	} else {
+		the_post_thumbnail( 'post-thumbnail', array(
+			'alt' => get_the_title(),
+		) );
+	}
 	?>
 	</a>
 
 	<?php endif; // End is_singular()
-}
+	}
 endif;
 
 if ( ! function_exists( 'twentyfourteen_excerpt_more' ) && ! is_admin() ) :
-/**
+	/**
  * Replaces "[...]" (appended to automatically generated excerpts) with ...
  * and a Continue reading link.
  *
@@ -215,13 +217,13 @@
  * @param string $more Default Read More excerpt link.
  * @return string Filtered Read More excerpt link.
  */
-function twentyfourteen_excerpt_more( $more ) {
-	$link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
-		esc_url( get_permalink( get_the_ID() ) ),
+	function twentyfourteen_excerpt_more( $more ) {
+		$link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
+			esc_url( get_permalink( get_the_ID() ) ),
 			/* translators: %s: Name of current post */
 			sprintf( __( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ), '<span class="screen-reader-text">' . get_the_title( get_the_ID() ) . '</span>' )
 		);
-	return ' &hellip; ' . $link;
-}
-add_filter( 'excerpt_more', 'twentyfourteen_excerpt_more' );
+			return ' &hellip; ' . $link;
+	}
+	add_filter( 'excerpt_more', 'twentyfourteen_excerpt_more' );
 endif;
Index: src/wp-content/themes/twentyfourteen/inc/widgets.php
===================================================================
--- src/wp-content/themes/twentyfourteen/inc/widgets.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/inc/widgets.php	(working copy)
@@ -133,86 +133,87 @@
 			<ol>
 
 				<?php
-					while ( $ephemera->have_posts() ) :
-						$ephemera->the_post();
-						$tmp_more = $GLOBALS['more'];
-						$GLOBALS['more'] = 0;
+				while ( $ephemera->have_posts() ) :
+					$ephemera->the_post();
+					$tmp_more = $GLOBALS['more'];
+					$GLOBALS['more'] = 0;
 				?>
 				<li>
 				<article <?php post_class(); ?>>
-					<div class="entry-content">
-						<?php
-							if ( has_post_format( 'gallery' ) ) :
+				<div class="entry-content">
+				<?php
+				if ( has_post_format( 'gallery' ) ) :
+
+					if ( post_password_required() ) :
+						the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) );
+						else :
+							$images = array();
+
+							$galleries = get_post_galleries( get_the_ID(), false );
+							if ( isset( $galleries[0]['ids'] ) ) {
+								$images = explode( ',', $galleries[0]['ids'] );
+							}
+
+							if ( ! $images ) :
+								$images = get_posts( array(
+									'fields'         => 'ids',
+									'numberposts'    => -1,
+									'order'          => 'ASC',
+									'orderby'        => 'menu_order',
+									'post_mime_type' => 'image',
+									'post_parent'    => get_the_ID(),
+									'post_type'      => 'attachment',
+								) );
+							endif;
 
-								if ( post_password_required() ) :
-									the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) );
-								else :
-									$images = array();
-
-									$galleries = get_post_galleries( get_the_ID(), false );
-									if ( isset( $galleries[0]['ids'] ) )
-										$images = explode( ',', $galleries[0]['ids'] );
-
-									if ( ! $images ) :
-										$images = get_posts( array(
-											'fields'         => 'ids',
-											'numberposts'    => -1,
-											'order'          => 'ASC',
-											'orderby'        => 'menu_order',
-											'post_mime_type' => 'image',
-											'post_parent'    => get_the_ID(),
-											'post_type'      => 'attachment',
-										) );
-									endif;
-
-									$total_images = count( $images );
-
-									if ( has_post_thumbnail() ) :
-										$post_thumbnail = get_the_post_thumbnail();
-									elseif ( $total_images > 0 ) :
-										$image          = reset( $images );
-										$post_thumbnail = wp_get_attachment_image( $image, 'post-thumbnail' );
-									endif;
+							$total_images = count( $images );
 
-									if ( ! empty ( $post_thumbnail ) ) :
+							if ( has_post_thumbnail() ) :
+								$post_thumbnail = get_the_post_thumbnail();
+							elseif ( $total_images > 0 ) :
+								$image          = reset( $images );
+								$post_thumbnail = wp_get_attachment_image( $image, 'post-thumbnail' );
+							endif;
+
+							if ( ! empty( $post_thumbnail ) ) :
 						?>
 						<a href="<?php the_permalink(); ?>"><?php echo $post_thumbnail; ?></a>
 						<?php endif; ?>
 						<p class="wp-caption-text">
-							<?php
-								printf( _n( 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photo</a>.', 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photos</a>.', $total_images, 'twentyfourteen' ),
-									esc_url( get_permalink() ),
-									number_format_i18n( $total_images )
-								);
-							?>
-						</p>
-						<?php
-								endif;
+					<?php
+						printf( _n( 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photo</a>.', 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photos</a>.', $total_images, 'twentyfourteen' ),
+							esc_url( get_permalink() ),
+							number_format_i18n( $total_images )
+						);
+					?>
+				</p>
+				<?php
+				endif;
 
-							else :
-								the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) );
+						else :
+							the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) );
 							endif;
 						?>
 					</div><!-- .entry-content -->
 
 					<header class="entry-header">
 						<div class="entry-meta">
-							<?php
-								if ( ! has_post_format( 'link' ) ) :
-									the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
-								endif;
-
-								printf( '<span class="entry-date"><a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s">%3$s</time></a></span> <span class="byline"><span class="author vcard"><a class="url fn n" href="%4$s" rel="author">%5$s</a></span></span>',
-									esc_url( get_permalink() ),
-									esc_attr( get_the_date( 'c' ) ),
-									esc_html( get_the_date() ),
-									esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-									get_the_author()
-								);
-
-								if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
-							?>
-							<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
+						<?php
+						if ( ! has_post_format( 'link' ) ) :
+							the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
+							endif;
+
+						printf( '<span class="entry-date"><a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s">%3$s</time></a></span> <span class="byline"><span class="author vcard"><a class="url fn n" href="%4$s" rel="author">%5$s</a></span></span>',
+							esc_url( get_permalink() ),
+							esc_attr( get_the_date( 'c' ) ),
+							esc_html( get_the_date() ),
+							esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+							get_the_author()
+						);
+
+						if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
+						?>
+						<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
 							<?php endif; ?>
 						</div><!-- .entry-meta -->
 					</header><!-- .entry-header -->
Index: src/wp-content/themes/twentyfourteen/index.php
===================================================================
--- src/wp-content/themes/twentyfourteen/index.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/index.php	(working copy)
@@ -19,30 +19,30 @@
 <div id="main-content" class="main-content">
 
 <?php
-	if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
-		// Include the featured content template.
-		get_template_part( 'featured-content' );
-	}
+if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
+	// Include the featured content template.
+	get_template_part( 'featured-content' );
+}
 ?>
 
 	<div id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 
 		<?php
-			if ( have_posts() ) :
-				// Start the Loop.
-				while ( have_posts() ) : the_post();
-
-					/*
-					 * Include the post format-specific template for the content. If you want to
-					 * use this in a child theme, then include a file called called content-___.php
-					 * (where ___ is the post format) and that will be used instead.
-					 */
-					get_template_part( 'content', get_post_format() );
+		if ( have_posts() ) :
+			// Start the Loop.
+			while ( have_posts() ) : the_post();
+
+				/*
+				 * Include the post format-specific template for the content. If you want to
+				 * use this in a child theme, then include a file called called content-___.php
+				 * (where ___ is the post format) and that will be used instead.
+				 */
+				get_template_part( 'content', get_post_format() );
 
 				endwhile;
-				// Previous/next post navigation.
-				twentyfourteen_paging_nav();
+			// Previous/next post navigation.
+			twentyfourteen_paging_nav();
 
 			else :
 				// If no content, include the "No posts found" template.
Index: src/wp-content/themes/twentyfourteen/page-templates/contributors.php
===================================================================
--- src/wp-content/themes/twentyfourteen/page-templates/contributors.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/page-templates/contributors.php	(working copy)
@@ -12,35 +12,35 @@
 <div id="main-content" class="main-content">
 
 <?php
-	if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
-		// Include the featured content template.
-		get_template_part( 'featured-content' );
-	}
+if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
+	// Include the featured content template.
+	get_template_part( 'featured-content' );
+}
 ?>
 
 	<div id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 			<?php
 				// Start the Loop.
-				while ( have_posts() ) : the_post();
+			while ( have_posts() ) : the_post();
 			?>
 
 			<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-				<?php
-					the_title( '<header class="entry-header"><h1 class="entry-title">', '</h1></header><!-- .entry-header -->' );
+			<?php
+			the_title( '<header class="entry-header"><h1 class="entry-title">', '</h1></header><!-- .entry-header -->' );
 
-					// Output the authors list.
-					twentyfourteen_list_authors();
+			// Output the authors list.
+			twentyfourteen_list_authors();
 
-					edit_post_link( __( 'Edit', 'twentyfourteen' ), '<footer class="entry-meta"><span class="edit-link">', '</span></footer>' );
-				?>
+			edit_post_link( __( 'Edit', 'twentyfourteen' ), '<footer class="entry-meta"><span class="edit-link">', '</span></footer>' );
+			?>
 			</article><!-- #post-## -->
 
 			<?php
-					// If comments are open or we have at least one comment, load up the comment template.
-					if ( comments_open() || get_comments_number() ) {
-						comments_template();
-					}
+			// If comments are open or we have at least one comment, load up the comment template.
+			if ( comments_open() || get_comments_number() ) {
+				comments_template();
+			}
 				endwhile;
 			?>
 		</div><!-- #content -->
Index: src/wp-content/themes/twentyfourteen/page-templates/full-width.php
===================================================================
--- src/wp-content/themes/twentyfourteen/page-templates/full-width.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/page-templates/full-width.php	(working copy)
@@ -12,25 +12,25 @@
 <div id="main-content" class="main-content">
 
 <?php
-	if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
-		// Include the featured content template.
-		get_template_part( 'featured-content' );
-	}
+if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
+	// Include the featured content template.
+	get_template_part( 'featured-content' );
+}
 ?>
 
 	<div id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 			<?php
 				// Start the Loop.
-				while ( have_posts() ) : the_post();
+			while ( have_posts() ) : the_post();
 
-					// Include the page content template.
-					get_template_part( 'content', 'page' );
+				// Include the page content template.
+				get_template_part( 'content', 'page' );
 
-					// If comments are open or we have at least one comment, load up the comment template.
-					if ( comments_open() || get_comments_number() ) {
-						comments_template();
-					}
+				// If comments are open or we have at least one comment, load up the comment template.
+				if ( comments_open() || get_comments_number() ) {
+					comments_template();
+				}
 				endwhile;
 			?>
 		</div><!-- #content -->
Index: src/wp-content/themes/twentyfourteen/page.php
===================================================================
--- src/wp-content/themes/twentyfourteen/page.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/page.php	(working copy)
@@ -16,25 +16,25 @@
 <div id="main-content" class="main-content">
 
 <?php
-	if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
-		// Include the featured content template.
-		get_template_part( 'featured-content' );
-	}
+if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
+	// Include the featured content template.
+	get_template_part( 'featured-content' );
+}
 ?>
 	<div id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 
 			<?php
 				// Start the Loop.
-				while ( have_posts() ) : the_post();
+			while ( have_posts() ) : the_post();
 
-					// Include the page content template.
-					get_template_part( 'content', 'page' );
+				// Include the page content template.
+				get_template_part( 'content', 'page' );
 
-					// If comments are open or we have at least one comment, load up the comment template.
-					if ( comments_open() || get_comments_number() ) {
-						comments_template();
-					}
+				// If comments are open or we have at least one comment, load up the comment template.
+				if ( comments_open() || get_comments_number() ) {
+					comments_template();
+				}
 				endwhile;
 			?>
 
Index: src/wp-content/themes/twentyfourteen/search.php
===================================================================
--- src/wp-content/themes/twentyfourteen/search.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/search.php	(working copy)
@@ -20,14 +20,14 @@
 
 				<?php
 					// Start the Loop.
-					while ( have_posts() ) : the_post();
+				while ( have_posts() ) : the_post();
 
-						/*
-						 * Include the post format-specific template for the content. If you want to
-						 * use this in a child theme, then include a file called called content-___.php
-						 * (where ___ is the post format) and that will be used instead.
-						 */
-						get_template_part( 'content', get_post_format() );
+					/*
+					* Include the post format-specific template for the content. If you want to
+					* use this in a child theme, then include a file called called content-___.php
+					* (where ___ is the post format) and that will be used instead.
+					*/
+					get_template_part( 'content', get_post_format() );
 
 					endwhile;
 					// Previous/next post navigation.
Index: src/wp-content/themes/twentyfourteen/sidebar.php
===================================================================
--- src/wp-content/themes/twentyfourteen/sidebar.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/sidebar.php	(working copy)
@@ -10,14 +10,16 @@
 <div id="secondary">
 	<?php
 		$description = get_bloginfo( 'description', 'display' );
-		if ( ! empty ( $description ) ) :
+	if ( ! empty( $description ) ) :
 	?>
 	<h2 class="site-description"><?php echo esc_html( $description ); ?></h2>
 	<?php endif; ?>
 
 	<?php if ( has_nav_menu( 'secondary' ) ) : ?>
 	<nav role="navigation" class="navigation site-navigation secondary-navigation">
-		<?php wp_nav_menu( array( 'theme_location' => 'secondary' ) ); ?>
+		<?php wp_nav_menu( array(
+			'theme_location' => 'secondary',
+		) ); ?>
 	</nav>
 	<?php endif; ?>
 
Index: src/wp-content/themes/twentyfourteen/single.php
===================================================================
--- src/wp-content/themes/twentyfourteen/single.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/single.php	(working copy)
@@ -13,22 +13,22 @@
 		<div id="content" class="site-content" role="main">
 			<?php
 				// Start the Loop.
-				while ( have_posts() ) : the_post();
+			while ( have_posts() ) : the_post();
 
-					/*
-					 * Include the post format-specific template for the content. If you want to
-					 * use this in a child theme, then include a file called called content-___.php
-					 * (where ___ is the post format) and that will be used instead.
-					 */
-					get_template_part( 'content', get_post_format() );
+				/*
+				* Include the post format-specific template for the content. If you want to
+				* use this in a child theme, then include a file called called content-___.php
+				* (where ___ is the post format) and that will be used instead.
+				*/
+				get_template_part( 'content', get_post_format() );
 
-					// Previous/next post navigation.
-					twentyfourteen_post_nav();
+				// Previous/next post navigation.
+				twentyfourteen_post_nav();
 
-					// If comments are open or we have at least one comment, load up the comment template.
-					if ( comments_open() || get_comments_number() ) {
-						comments_template();
-					}
+				// If comments are open or we have at least one comment, load up the comment template.
+				if ( comments_open() || get_comments_number() ) {
+					comments_template();
+				}
 				endwhile;
 			?>
 		</div><!-- #content -->
Index: src/wp-content/themes/twentyfourteen/tag.php
===================================================================
--- src/wp-content/themes/twentyfourteen/tag.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/tag.php	(working copy)
@@ -24,22 +24,22 @@
 				<?php
 					// Show an optional term description.
 					$term_description = term_description();
-					if ( ! empty( $term_description ) ) :
-						printf( '<div class="taxonomy-description">%s</div>', $term_description );
+				if ( ! empty( $term_description ) ) :
+					printf( '<div class="taxonomy-description">%s</div>', $term_description );
 					endif;
 				?>
 			</header><!-- .archive-header -->
 
 			<?php
 					// Start the Loop.
-					while ( have_posts() ) : the_post();
+			while ( have_posts() ) : the_post();
 
-						/*
-						 * Include the post format-specific template for the content. If you want to
-						 * use this in a child theme, then include a file called called content-___.php
-						 * (where ___ is the post format) and that will be used instead.
-						 */
-						get_template_part( 'content', get_post_format() );
+				/*
+				* Include the post format-specific template for the content. If you want to
+				* use this in a child theme, then include a file called called content-___.php
+				* (where ___ is the post format) and that will be used instead.
+				*/
+				get_template_part( 'content', get_post_format() );
 
 					endwhile;
 					// Previous/next page navigation.
Index: src/wp-content/themes/twentyfourteen/taxonomy-post_format.php
===================================================================
--- src/wp-content/themes/twentyfourteen/taxonomy-post_format.php	(revision 40901)
+++ src/wp-content/themes/twentyfourteen/taxonomy-post_format.php	(working copy)
@@ -26,8 +26,8 @@
 			<header class="archive-header">
 				<h1 class="archive-title">
 					<?php
-						if ( is_tax( 'post_format', 'post-format-aside' ) ) :
-							_e( 'Asides', 'twentyfourteen' );
+					if ( is_tax( 'post_format', 'post-format-aside' ) ) :
+						_e( 'Asides', 'twentyfourteen' );
 
 						elseif ( is_tax( 'post_format', 'post-format-image' ) ) :
 							_e( 'Images', 'twentyfourteen' );
@@ -57,14 +57,14 @@
 
 			<?php
 					// Start the Loop.
-					while ( have_posts() ) : the_post();
+			while ( have_posts() ) : the_post();
 
-						/*
-						 * Include the post format-specific template for the content. If you want to
-						 * use this in a child theme, then include a file called called content-___.php
-						 * (where ___ is the post format) and that will be used instead.
-						 */
-						get_template_part( 'content', get_post_format() );
+				/*
+				* Include the post format-specific template for the content. If you want to
+				* use this in a child theme, then include a file called called content-___.php
+				* (where ___ is the post format) and that will be used instead.
+				*/
+				get_template_part( 'content', get_post_format() );
 
 					endwhile;
 					// Previous/next page navigation.
Index: src/wp-content/themes/twentyseventeen/archive.php
===================================================================
--- src/wp-content/themes/twentyseventeen/archive.php	(revision 40901)
+++ src/wp-content/themes/twentyseventeen/archive.php	(working copy)
@@ -42,8 +42,12 @@
 			endwhile;
 
 			the_posts_pagination( array(
-				'prev_text' => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '<span class="screen-reader-text">' . __( 'Previous page', 'twentyseventeen' ) . '</span>',
-				'next_text' => '<span class="screen-reader-text">' . __( 'Next page', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ),
+				'prev_text' => twentyseventeen_get_svg( array(
+					'icon' => 'arrow-left',
+				) ) . '<span class="screen-reader-text">' . __( 'Previous page', 'twentyseventeen' ) . '</span>',
+				'next_text' => '<span class="screen-reader-text">' . __( 'Next page', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array(
+					'icon' => 'arrow-right',
+				) ),
 				'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyseventeen' ) . ' </span>',
 			) );
 
Index: src/wp-content/themes/twentyseventeen/comments.php
===================================================================
--- src/wp-content/themes/twentyseventeen/comments.php	(revision 40901)
+++ src/wp-content/themes/twentyseventeen/comments.php	(working copy)
@@ -57,7 +57,9 @@
 					'avatar_size' => 100,
 					'style'       => 'ol',
 					'short_ping'  => true,
-					'reply_text'  => twentyseventeen_get_svg( array( 'icon' => 'mail-reply' ) ) . __( 'Reply', 'twentyseventeen' ),
+					'reply_text'  => twentyseventeen_get_svg( array(
+						'icon' => 'mail-reply',
+					) ) . __( 'Reply', 'twentyseventeen' ),
 				) );
 			?>
 		</ol>
Index: src/wp-content/themes/twentyseventeen/inc/custom-header.php
===================================================================
--- src/wp-content/themes/twentyseventeen/inc/custom-header.php	(revision 40901)
+++ src/wp-content/themes/twentyseventeen/inc/custom-header.php	(working copy)
@@ -53,24 +53,24 @@
 add_action( 'after_setup_theme', 'twentyseventeen_custom_header_setup' );
 
 if ( ! function_exists( 'twentyseventeen_header_style' ) ) :
-/**
+	/**
  * Styles the header image and text displayed on the blog.
  *
  * @see twentyseventeen_custom_header_setup().
  */
-function twentyseventeen_header_style() {
-	$header_text_color = get_header_textcolor();
+	function twentyseventeen_header_style() {
+		$header_text_color = get_header_textcolor();
 
-	// If no custom options for text are set, let's bail.
-	// get_header_textcolor() options: add_theme_support( 'custom-header' ) is default, hide text (returns 'blank') or any hex value.
-	if ( get_theme_support( 'custom-header', 'default-text-color' ) === $header_text_color ) {
-		return;
-	}
+		// If no custom options for text are set, let's bail.
+		// get_header_textcolor() options: add_theme_support( 'custom-header' ) is default, hide text (returns 'blank') or any hex value.
+		if ( get_theme_support( 'custom-header', 'default-text-color' ) === $header_text_color ) {
+			return;
+		}
 
-	// If we get this far, we have custom styles. Let's do this.
-	?>
-	<style id="twentyseventeen-custom-header-styles" type="text/css">
-	<?php
+		// If we get this far, we have custom styles. Let's do this.
+		?>
+		<style id="twentyseventeen-custom-header-styles" type="text/css">
+		<?php
 		// Has the text been hidden?
 		if ( 'blank' === $header_text_color ) :
 	?>
@@ -106,7 +106,7 @@
 	<?php endif; ?>
 	</style>
 	<?php
-}
+	}
 endif; // End of twentyseventeen_header_style.
 
 /**
@@ -115,8 +115,12 @@
  * @param array $settings Video settings.
  */
 function twentyseventeen_video_controls( $settings ) {
-	$settings['l10n']['play'] = '<span class="screen-reader-text">' . __( 'Play background video', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'play' ) );
-	$settings['l10n']['pause'] = '<span class="screen-reader-text">' . __( 'Pause background video', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'pause' ) );
+	$settings['l10n']['play'] = '<span class="screen-reader-text">' . __( 'Play background video', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array(
+		'icon' => 'play',
+	) );
+	$settings['l10n']['pause'] = '<span class="screen-reader-text">' . __( 'Pause background video', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array(
+		'icon' => 'pause',
+	) );
 	return $settings;
 }
 add_filter( 'header_video_settings', 'twentyseventeen_video_controls' );
Index: src/wp-content/themes/twentyseventeen/inc/template-tags.php
===================================================================
--- src/wp-content/themes/twentyseventeen/inc/template-tags.php	(revision 40901)
+++ src/wp-content/themes/twentyseventeen/inc/template-tags.php	(working copy)
@@ -10,83 +10,87 @@
  */
 
 if ( ! function_exists( 'twentyseventeen_posted_on' ) ) :
-/**
+	/**
  * Prints HTML with meta information for the current post-date/time and author.
  */
-function twentyseventeen_posted_on() {
+	function twentyseventeen_posted_on() {
 
-	// Get the author name; wrap it in a link.
-	$byline = sprintf(
-		/* translators: %s: post author */
-		__( 'by %s', 'twentyseventeen' ),
-		'<span class="author vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '">' . get_the_author() . '</a></span>'
-	);
+		// Get the author name; wrap it in a link.
+		$byline = sprintf(
+			/* translators: %s: post author */
+			__( 'by %s', 'twentyseventeen' ),
+			'<span class="author vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '">' . get_the_author() . '</a></span>'
+		);
 
-	// Finally, let's write all of this to the page.
-	echo '<span class="posted-on">' . twentyseventeen_time_link() . '</span><span class="byline"> ' . $byline . '</span>';
-}
+			// Finally, let's write all of this to the page.
+			echo '<span class="posted-on">' . twentyseventeen_time_link() . '</span><span class="byline"> ' . $byline . '</span>';
+	}
 endif;
 
 
 if ( ! function_exists( 'twentyseventeen_time_link' ) ) :
-/**
+	/**
  * Gets a nicely formatted string for the published date.
  */
-function twentyseventeen_time_link() {
-	$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
-	if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
-		$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
-	}
-
-	$time_string = sprintf( $time_string,
-		get_the_date( DATE_W3C ),
-		get_the_date(),
-		get_the_modified_date( DATE_W3C ),
-		get_the_modified_date()
-	);
-
-	// Wrap the time string in a link, and preface it with 'Posted on'.
-	return sprintf(
-		/* translators: %s: post date */
-		__( '<span class="screen-reader-text">Posted on</span> %s', 'twentyseventeen' ),
-		'<a href="' . esc_url( get_permalink() ) . '" rel="bookmark">' . $time_string . '</a>'
-	);
-}
+	function twentyseventeen_time_link() {
+		$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
+		if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
+			$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
+		}
+
+		$time_string = sprintf( $time_string,
+			get_the_date( DATE_W3C ),
+			get_the_date(),
+			get_the_modified_date( DATE_W3C ),
+			get_the_modified_date()
+		);
+
+			// Wrap the time string in a link, and preface it with 'Posted on'.
+			return sprintf(
+				/* translators: %s: post date */
+				__( '<span class="screen-reader-text">Posted on</span> %s', 'twentyseventeen' ),
+				'<a href="' . esc_url( get_permalink() ) . '" rel="bookmark">' . $time_string . '</a>'
+			);
+	}
 endif;
 
 
 if ( ! function_exists( 'twentyseventeen_entry_footer' ) ) :
-/**
+	/**
  * Prints HTML with meta information for the categories, tags and comments.
  */
-function twentyseventeen_entry_footer() {
+	function twentyseventeen_entry_footer() {
 
-	/* translators: used between list items, there is a space after the comma */
-	$separate_meta = __( ', ', 'twentyseventeen' );
+		/* translators: used between list items, there is a space after the comma */
+		$separate_meta = __( ', ', 'twentyseventeen' );
 
-	// Get Categories for posts.
-	$categories_list = get_the_category_list( $separate_meta );
+		// Get Categories for posts.
+		$categories_list = get_the_category_list( $separate_meta );
 
-	// Get Tags for posts.
-	$tags_list = get_the_tag_list( '', $separate_meta );
+		// Get Tags for posts.
+		$tags_list = get_the_tag_list( '', $separate_meta );
 
-	// We don't want to output .entry-footer if it will be empty, so make sure its not.
-	if ( ( ( twentyseventeen_categorized_blog() && $categories_list ) || $tags_list ) || get_edit_post_link() ) {
+		// We don't want to output .entry-footer if it will be empty, so make sure its not.
+		if ( ( ( twentyseventeen_categorized_blog() && $categories_list ) || $tags_list ) || get_edit_post_link() ) {
 
-		echo '<footer class="entry-footer">';
+			echo '<footer class="entry-footer">';
 
 			if ( 'post' === get_post_type() ) {
 				if ( ( $categories_list && twentyseventeen_categorized_blog() ) || $tags_list ) {
 					echo '<span class="cat-tags-links">';
 
 						// Make sure there's more than one category before displaying.
-						if ( $categories_list && twentyseventeen_categorized_blog() ) {
-							echo '<span class="cat-links">' . twentyseventeen_get_svg( array( 'icon' => 'folder-open' ) ) . '<span class="screen-reader-text">' . __( 'Categories', 'twentyseventeen' ) . '</span>' . $categories_list . '</span>';
-						}
-
-						if ( $tags_list ) {
-							echo '<span class="tags-links">' . twentyseventeen_get_svg( array( 'icon' => 'hashtag' ) ) . '<span class="screen-reader-text">' . __( 'Tags', 'twentyseventeen' ) . '</span>' . $tags_list . '</span>';
-						}
+					if ( $categories_list && twentyseventeen_categorized_blog() ) {
+						echo '<span class="cat-links">' . twentyseventeen_get_svg( array(
+							'icon' => 'folder-open',
+						) ) . '<span class="screen-reader-text">' . __( 'Categories', 'twentyseventeen' ) . '</span>' . $categories_list . '</span>';
+					}
+
+					if ( $tags_list ) {
+						echo '<span class="tags-links">' . twentyseventeen_get_svg( array(
+							'icon' => 'hashtag',
+						) ) . '<span class="screen-reader-text">' . __( 'Tags', 'twentyseventeen' ) . '</span>' . $tags_list . '</span>';
+					}
 
 					echo '</span>';
 				}
@@ -94,14 +98,14 @@
 
 			twentyseventeen_edit_link();
 
-		echo '</footer> <!-- .entry-footer -->';
+			echo '</footer> <!-- .entry-footer -->';
+		}
 	}
-}
 endif;
 
 
 if ( ! function_exists( 'twentyseventeen_edit_link' ) ) :
-/**
+	/**
  * Returns an accessibility-friendly link to edit a post or page.
  *
  * This also gives us a little context about what exactly we're editing
@@ -109,17 +113,17 @@
  * of the template hierarchy and their content. Helpful when/if the single-page
  * layout with multiple posts/pages shown gets confusing.
  */
-function twentyseventeen_edit_link() {
-	edit_post_link(
-		sprintf(
-			/* translators: %s: Name of current post */
-			__( 'Edit<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
-			get_the_title()
-		),
-		'<span class="edit-link">',
-		'</span>'
-	);
-}
+	function twentyseventeen_edit_link() {
+		edit_post_link(
+			sprintf(
+				/* translators: %s: Name of current post */
+				__( 'Edit<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
+				get_the_title()
+			),
+			'<span class="edit-link">',
+			'</span>'
+		);
+	}
 endif;
 
 /**
Index: src/wp-content/themes/twentyseventeen/index.php
===================================================================
--- src/wp-content/themes/twentyseventeen/index.php	(revision 40901)
+++ src/wp-content/themes/twentyseventeen/index.php	(working copy)
@@ -47,8 +47,12 @@
 				endwhile;
 
 				the_posts_pagination( array(
-					'prev_text' => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '<span class="screen-reader-text">' . __( 'Previous page', 'twentyseventeen' ) . '</span>',
-					'next_text' => '<span class="screen-reader-text">' . __( 'Next page', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ),
+					'prev_text' => twentyseventeen_get_svg( array(
+						'icon' => 'arrow-left',
+					) ) . '<span class="screen-reader-text">' . __( 'Previous page', 'twentyseventeen' ) . '</span>',
+					'next_text' => '<span class="screen-reader-text">' . __( 'Next page', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array(
+						'icon' => 'arrow-right',
+					) ),
 					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyseventeen' ) . ' </span>',
 				) );
 
Index: src/wp-content/themes/twentyseventeen/single.php
===================================================================
--- src/wp-content/themes/twentyseventeen/single.php	(revision 40901)
+++ src/wp-content/themes/twentyseventeen/single.php	(working copy)
@@ -28,7 +28,9 @@
 				endif;
 
 				the_post_navigation( array(
-					'prev_text' => '<span class="screen-reader-text">' . __( 'Previous Post', 'twentyseventeen' ) . '</span><span aria-hidden="true" class="nav-subtitle">' . __( 'Previous', 'twentyseventeen' ) . '</span> <span class="nav-title"><span class="nav-title-icon-wrapper">' . twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '</span>%title</span>',
+					'prev_text' => '<span class="screen-reader-text">' . __( 'Previous Post', 'twentyseventeen' ) . '</span><span aria-hidden="true" class="nav-subtitle">' . __( 'Previous', 'twentyseventeen' ) . '</span> <span class="nav-title"><span class="nav-title-icon-wrapper">' . twentyseventeen_get_svg( array(
+						'icon' => 'arrow-left',
+					) ) . '</span>%title</span>',
 					'next_text' => '<span class="screen-reader-text">' . __( 'Next Post', 'twentyseventeen' ) . '</span><span aria-hidden="true" class="nav-subtitle">' . __( 'Next', 'twentyseventeen' ) . '</span> <span class="nav-title">%title<span class="nav-title-icon-wrapper">' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ) . '</span></span>',
 				) );
 
Index: src/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php
===================================================================
--- src/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php	(revision 40901)
+++ src/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php	(working copy)
@@ -12,8 +12,12 @@
 <nav id="site-navigation" class="main-navigation" role="navigation" aria-label="<?php esc_attr_e( 'Top Menu', 'twentyseventeen' ); ?>">
 	<button class="menu-toggle" aria-controls="top-menu" aria-expanded="false">
 		<?php
-		echo twentyseventeen_get_svg( array( 'icon' => 'bars' ) );
-		echo twentyseventeen_get_svg( array( 'icon' => 'close' ) );
+		echo twentyseventeen_get_svg( array(
+			'icon' => 'bars',
+		) );
+		echo twentyseventeen_get_svg( array(
+			'icon' => 'close',
+		) );
 		_e( 'Menu', 'twentyseventeen' );
 		?>
 	</button>
@@ -24,6 +28,8 @@
 	) ); ?>
 
 	<?php if ( ( twentyseventeen_is_frontpage() || ( is_home() && is_front_page() ) ) && has_custom_header() ) : ?>
-		<a href="#content" class="menu-scroll-down"><?php echo twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ); ?><span class="screen-reader-text"><?php _e( 'Scroll down to content', 'twentyseventeen' ); ?></span></a>
+		<a href="#content" class="menu-scroll-down"><?php echo twentyseventeen_get_svg( array(
+			'icon' => 'arrow-right',
+		) ); ?><span class="screen-reader-text"><?php _e( 'Scroll down to content', 'twentyseventeen' ); ?></span></a>
 	<?php endif; ?>
 </nav><!-- #site-navigation -->
Index: src/wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php
===================================================================
--- src/wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php	(revision 40901)
+++ src/wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php	(working copy)
@@ -48,7 +48,7 @@
 
 			<?php
 			// Show recent blog posts if is blog posts page (Note that get_option returns a string, so we're casting the result as an int).
-			if ( get_the_ID() === (int) get_option( 'page_for_posts' )  ) : ?>
+			if ( get_the_ID() === (int) get_option( 'page_for_posts' ) ) : ?>
 
 				<?php // Show four most recent posts.
 				$recent_posts = new WP_Query( array(
@@ -59,7 +59,7 @@
 				) );
 				?>
 
-		 		<?php if ( $recent_posts->have_posts() ) : ?>
+					<?php if ( $recent_posts->have_posts() ) : ?>
 
 					<div class="recent-posts">
 
Index: src/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php
===================================================================
--- src/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php	(revision 40901)
+++ src/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php	(working copy)
@@ -14,30 +14,30 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<?php
-		if ( is_sticky() && is_home() ) {
-			echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
-		}
+	if ( is_sticky() && is_home() ) {
+		echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
+	}
 	?>
 	<header class="entry-header">
 		<?php
-			if ( 'post' === get_post_type() ) {
-				echo '<div class="entry-meta">';
-					if ( is_single() ) {
-						twentyseventeen_posted_on();
-					} else {
-						echo twentyseventeen_time_link();
-						twentyseventeen_edit_link();
-					};
-				echo '</div><!-- .entry-meta -->';
-			};
-
+		if ( 'post' === get_post_type() ) {
+			echo '<div class="entry-meta">';
 			if ( is_single() ) {
-				the_title( '<h1 class="entry-title">', '</h1>' );
-			} elseif ( is_front_page() && is_home() ) {
-				the_title( '<h3 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h3>' );
+				twentyseventeen_posted_on();
 			} else {
-				the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
-			}
+				echo twentyseventeen_time_link();
+				twentyseventeen_edit_link();
+			};
+			echo '</div><!-- .entry-meta -->';
+		};
+
+		if ( is_single() ) {
+			the_title( '<h1 class="entry-title">', '</h1>' );
+		} elseif ( is_front_page() && is_home() ) {
+			the_title( '<h3 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h3>' );
+		} else {
+			the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
+		}
 		?>
 	</header><!-- .entry-header -->
 
@@ -46,9 +46,9 @@
 		$audio = false;
 
 		// Only get audio from the content if a playlist isn't present.
-		if ( false === strpos( $content, 'wp-playlist-script' ) ) {
-			$audio = get_media_embedded_in_content( $content, array( 'audio' ) );
-		}
+	if ( false === strpos( $content, 'wp-playlist-script' ) ) {
+		$audio = get_media_embedded_in_content( $content, array( 'audio' ) );
+	}
 
 	?>
 
Index: src/wp-content/themes/twentyseventeen/template-parts/post/content-excerpt.php
===================================================================
--- src/wp-content/themes/twentyseventeen/template-parts/post/content-excerpt.php	(revision 40901)
+++ src/wp-content/themes/twentyseventeen/template-parts/post/content-excerpt.php	(working copy)
@@ -34,9 +34,9 @@
 
 			// The excerpt is being displayed within a front page section, so it's a lower hierarchy than h2.
 			the_title( sprintf( '<h3 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h3>' );
-		} else {
-			the_title( sprintf( '<h2 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h2>' );
-		} ?>
+} else {
+	the_title( sprintf( '<h2 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h2>' );
+} ?>
 	</header><!-- .entry-header -->
 
 	<div class="entry-summary">
Index: src/wp-content/themes/twentyseventeen/template-parts/post/content-gallery.php
===================================================================
--- src/wp-content/themes/twentyseventeen/template-parts/post/content-gallery.php	(revision 40901)
+++ src/wp-content/themes/twentyseventeen/template-parts/post/content-gallery.php	(working copy)
@@ -22,12 +22,12 @@
 		<?php
 		if ( 'post' === get_post_type() ) {
 			echo '<div class="entry-meta">';
-				if ( is_single() ) {
-					twentyseventeen_posted_on();
-				} else {
-					echo twentyseventeen_time_link();
-					twentyseventeen_edit_link();
-				};
+			if ( is_single() ) {
+				twentyseventeen_posted_on();
+			} else {
+				echo twentyseventeen_time_link();
+				twentyseventeen_edit_link();
+			};
 			echo '</div><!-- .entry-meta -->';
 		};
 
Index: src/wp-content/themes/twentyseventeen/template-parts/post/content-image.php
===================================================================
--- src/wp-content/themes/twentyseventeen/template-parts/post/content-image.php	(revision 40901)
+++ src/wp-content/themes/twentyseventeen/template-parts/post/content-image.php	(working copy)
@@ -14,30 +14,30 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<?php
-		if ( is_sticky() && is_home() ) {
-			echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
-		}
+	if ( is_sticky() && is_home() ) {
+		echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
+	}
 	?>
 	<header class="entry-header">
 		<?php
-			if ( 'post' === get_post_type() ) {
-				echo '<div class="entry-meta">';
-					if ( is_single() ) {
-						twentyseventeen_posted_on();
-					} else {
-						echo twentyseventeen_time_link();
-						twentyseventeen_edit_link();
-					};
-				echo '</div><!-- .entry-meta -->';
-			};
-
+		if ( 'post' === get_post_type() ) {
+			echo '<div class="entry-meta">';
 			if ( is_single() ) {
-				the_title( '<h1 class="entry-title">', '</h1>' );
-			} elseif ( is_front_page() && is_home() ) {
-				the_title( '<h3 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h3>' );
+				twentyseventeen_posted_on();
 			} else {
-				the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
-			}
+				echo twentyseventeen_time_link();
+				twentyseventeen_edit_link();
+			};
+			echo '</div><!-- .entry-meta -->';
+		};
+
+		if ( is_single() ) {
+			the_title( '<h1 class="entry-title">', '</h1>' );
+		} elseif ( is_front_page() && is_home() ) {
+			the_title( '<h3 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h3>' );
+		} else {
+			the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
+		}
 		?>
 	</header><!-- .entry-header -->
 
@@ -67,7 +67,7 @@
 				'link_after'  => '</span>',
 			) );
 
-		};
+};
 		?>
 
 	</div><!-- .entry-content -->
Index: src/wp-content/themes/twentyseventeen/template-parts/post/content-video.php
===================================================================
--- src/wp-content/themes/twentyseventeen/template-parts/post/content-video.php	(revision 40901)
+++ src/wp-content/themes/twentyseventeen/template-parts/post/content-video.php	(working copy)
@@ -14,30 +14,30 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<?php
-		if ( is_sticky() && is_home() ) {
-			echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
-		}
+	if ( is_sticky() && is_home() ) {
+		echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
+	}
 	?>
 	<header class="entry-header">
 		<?php
-			if ( 'post' === get_post_type() ) {
-				echo '<div class="entry-meta">';
-					if ( is_single() ) {
-						twentyseventeen_posted_on();
-					} else {
-						echo twentyseventeen_time_link();
-						twentyseventeen_edit_link();
-					}
-				echo '</div><!-- .entry-meta -->';
-			};
-
+		if ( 'post' === get_post_type() ) {
+			echo '<div class="entry-meta">';
 			if ( is_single() ) {
-				the_title( '<h1 class="entry-title">', '</h1>' );
-			} elseif ( is_front_page() && is_home() ) {
-				the_title( '<h3 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h3>' );
+				twentyseventeen_posted_on();
 			} else {
-				the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
+				echo twentyseventeen_time_link();
+				twentyseventeen_edit_link();
 			}
+			echo '</div><!-- .entry-meta -->';
+		};
+
+		if ( is_single() ) {
+			the_title( '<h1 class="entry-title">', '</h1>' );
+		} elseif ( is_front_page() && is_home() ) {
+			the_title( '<h3 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h3>' );
+		} else {
+			the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
+		}
 		?>
 	</header><!-- .entry-header -->
 
@@ -46,9 +46,9 @@
 		$video = false;
 
 		// Only get video from the content if a playlist isn't present.
-		if ( false === strpos( $content, 'wp-playlist-script' ) ) {
-			$video = get_media_embedded_in_content( $content, array( 'video', 'object', 'embed', 'iframe' ) );
-		}
+	if ( false === strpos( $content, 'wp-playlist-script' ) ) {
+		$video = get_media_embedded_in_content( $content, array( 'video', 'object', 'embed', 'iframe' ) );
+	}
 	?>
 
 	<?php if ( '' !== get_the_post_thumbnail() && ! is_single() && empty( $video ) ) : ?>
Index: src/wp-content/themes/twentyseventeen/template-parts/post/content.php
===================================================================
--- src/wp-content/themes/twentyseventeen/template-parts/post/content.php	(revision 40901)
+++ src/wp-content/themes/twentyseventeen/template-parts/post/content.php	(working copy)
@@ -22,12 +22,12 @@
 		<?php
 		if ( 'post' === get_post_type() ) {
 			echo '<div class="entry-meta">';
-				if ( is_single() ) {
-					twentyseventeen_posted_on();
-				} else {
-					echo twentyseventeen_time_link();
-					twentyseventeen_edit_link();
-				};
+			if ( is_single() ) {
+				twentyseventeen_posted_on();
+			} else {
+				echo twentyseventeen_time_link();
+				twentyseventeen_edit_link();
+			};
 			echo '</div><!-- .entry-meta -->';
 		};
 
Index: src/wp-content/themes/twentysixteen/archive.php
===================================================================
--- src/wp-content/themes/twentysixteen/archive.php	(revision 40901)
+++ src/wp-content/themes/twentysixteen/archive.php	(working copy)
@@ -41,7 +41,7 @@
 				 */
 				get_template_part( 'template-parts/content', get_post_format() );
 
-			// End the loop.
+				// End the loop.
 			endwhile;
 
 			// Previous/next page navigation.
@@ -51,7 +51,7 @@
 				'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>',
 			) );
 
-		// If no content, include the "No posts found" template.
+			// If no content, include the "No posts found" template.
 		else :
 			get_template_part( 'template-parts/content', 'none' );
 
Index: src/wp-content/themes/twentysixteen/comments.php
===================================================================
--- src/wp-content/themes/twentysixteen/comments.php	(revision 40901)
+++ src/wp-content/themes/twentysixteen/comments.php	(working copy)
@@ -26,23 +26,23 @@
 		<h2 class="comments-title">
 			<?php
 				$comments_number = get_comments_number();
-				if ( 1 === $comments_number ) {
-					/* translators: %s: post title */
-					printf( _x( 'One thought on &ldquo;%s&rdquo;', 'comments title', 'twentysixteen' ), get_the_title() );
-				} else {
-					printf(
-						/* translators: 1: number of comments, 2: post title */
-						_nx(
-							'%1$s thought on &ldquo;%2$s&rdquo;',
-							'%1$s thoughts on &ldquo;%2$s&rdquo;',
-							$comments_number,
-							'comments title',
-							'twentysixteen'
-						),
-						number_format_i18n( $comments_number ),
-						get_the_title()
-					);
-				}
+			if ( 1 === $comments_number ) {
+				/* translators: %s: post title */
+				printf( _x( 'One thought on &ldquo;%s&rdquo;', 'comments title', 'twentysixteen' ), get_the_title() );
+			} else {
+				printf(
+					/* translators: 1: number of comments, 2: post title */
+					_nx(
+						'%1$s thought on &ldquo;%2$s&rdquo;',
+						'%1$s thoughts on &ldquo;%2$s&rdquo;',
+						$comments_number,
+						'comments title',
+						'twentysixteen'
+					),
+					number_format_i18n( $comments_number ),
+					get_the_title()
+				);
+			}
 			?>
 		</h2>
 
@@ -64,9 +64,9 @@
 
 	<?php
 		// If comments are closed and there are comments, let's leave a little note, shall we?
-		if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
+	if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
 	?>
-		<p class="no-comments"><?php _e( 'Comments are closed.', 'twentysixteen' ); ?></p>
+	<p class="no-comments"><?php _e( 'Comments are closed.', 'twentysixteen' ); ?></p>
 	<?php endif; ?>
 
 	<?php
Index: src/wp-content/themes/twentysixteen/footer.php
===================================================================
--- src/wp-content/themes/twentysixteen/footer.php	(revision 40901)
+++ src/wp-content/themes/twentysixteen/footer.php	(working copy)
@@ -19,7 +19,7 @@
 						wp_nav_menu( array(
 							'theme_location' => 'primary',
 							'menu_class'     => 'primary-menu',
-						 ) );
+						) );
 					?>
 				</nav><!-- .main-navigation -->
 			<?php endif; ?>
Index: src/wp-content/themes/twentysixteen/functions.php
===================================================================
--- src/wp-content/themes/twentysixteen/functions.php	(revision 40901)
+++ src/wp-content/themes/twentysixteen/functions.php	(working copy)
@@ -33,7 +33,7 @@
 }
 
 if ( ! function_exists( 'twentysixteen_setup' ) ) :
-/**
+	/**
  * Sets up theme defaults and registers support for various WordPress features.
  *
  * Note that this function is hooked into the after_setup_theme hook, which
@@ -44,89 +44,89 @@
  *
  * @since Twenty Sixteen 1.0
  */
-function twentysixteen_setup() {
-	/*
-	 * Make theme available for translation.
-	 * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentysixteen
-	 * If you're building a theme based on Twenty Sixteen, use a find and replace
-	 * to change 'twentysixteen' to the name of your theme in all the template files
-	 */
-	load_theme_textdomain( 'twentysixteen' );
-
-	// Add default posts and comments RSS feed links to head.
-	add_theme_support( 'automatic-feed-links' );
-
-	/*
-	 * Let WordPress manage the document title.
-	 * By adding theme support, we declare that this theme does not use a
-	 * hard-coded <title> tag in the document head, and expect WordPress to
-	 * provide it for us.
-	 */
-	add_theme_support( 'title-tag' );
-
-	/*
-	 * Enable support for custom logo.
-	 *
-	 *  @since Twenty Sixteen 1.2
-	 */
-	add_theme_support( 'custom-logo', array(
-		'height'      => 240,
-		'width'       => 240,
-		'flex-height' => true,
-	) );
-
-	/*
-	 * Enable support for Post Thumbnails on posts and pages.
-	 *
-	 * @link http://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
-	 */
-	add_theme_support( 'post-thumbnails' );
-	set_post_thumbnail_size( 1200, 9999 );
-
-	// This theme uses wp_nav_menu() in two locations.
-	register_nav_menus( array(
-		'primary' => __( 'Primary Menu', 'twentysixteen' ),
-		'social'  => __( 'Social Links Menu', 'twentysixteen' ),
-	) );
-
-	/*
-	 * Switch default core markup for search form, comment form, and comments
-	 * to output valid HTML5.
-	 */
-	add_theme_support( 'html5', array(
-		'search-form',
-		'comment-form',
-		'comment-list',
-		'gallery',
-		'caption',
-	) );
-
-	/*
-	 * Enable support for Post Formats.
-	 *
-	 * See: https://codex.wordpress.org/Post_Formats
-	 */
-	add_theme_support( 'post-formats', array(
-		'aside',
-		'image',
-		'video',
-		'quote',
-		'link',
-		'gallery',
-		'status',
-		'audio',
-		'chat',
-	) );
+	function twentysixteen_setup() {
+		/*
+		 * Make theme available for translation.
+		 * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentysixteen
+		 * If you're building a theme based on Twenty Sixteen, use a find and replace
+		 * to change 'twentysixteen' to the name of your theme in all the template files
+		 */
+		load_theme_textdomain( 'twentysixteen' );
+
+		// Add default posts and comments RSS feed links to head.
+		add_theme_support( 'automatic-feed-links' );
+
+		/*
+		 * Let WordPress manage the document title.
+		 * By adding theme support, we declare that this theme does not use a
+		 * hard-coded <title> tag in the document head, and expect WordPress to
+		 * provide it for us.
+		 */
+		add_theme_support( 'title-tag' );
+
+		/*
+		 * Enable support for custom logo.
+		 *
+		 *  @since Twenty Sixteen 1.2
+		 */
+		add_theme_support( 'custom-logo', array(
+			'height'      => 240,
+			'width'       => 240,
+			'flex-height' => true,
+		) );
+
+			/*
+			 * Enable support for Post Thumbnails on posts and pages.
+			 *
+			 * @link http://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
+			 */
+			add_theme_support( 'post-thumbnails' );
+			set_post_thumbnail_size( 1200, 9999 );
+
+			// This theme uses wp_nav_menu() in two locations.
+			register_nav_menus( array(
+				'primary' => __( 'Primary Menu', 'twentysixteen' ),
+				'social'  => __( 'Social Links Menu', 'twentysixteen' ),
+			) );
+
+			/*
+			 * Switch default core markup for search form, comment form, and comments
+			 * to output valid HTML5.
+			 */
+			add_theme_support( 'html5', array(
+				'search-form',
+				'comment-form',
+				'comment-list',
+				'gallery',
+				'caption',
+			) );
+
+			/*
+			 * Enable support for Post Formats.
+			 *
+			 * See: https://codex.wordpress.org/Post_Formats
+			 */
+			add_theme_support( 'post-formats', array(
+				'aside',
+				'image',
+				'video',
+				'quote',
+				'link',
+				'gallery',
+				'status',
+				'audio',
+				'chat',
+			) );
+
+			/*
+			 * This theme styles the visual editor to resemble the theme style,
+			 * specifically font, colors, icons, and column width.
+			 */
+			add_editor_style( array( 'css/editor-style.css', twentysixteen_fonts_url() ) );
 
-	/*
-	 * This theme styles the visual editor to resemble the theme style,
-	 * specifically font, colors, icons, and column width.
-	 */
-	add_editor_style( array( 'css/editor-style.css', twentysixteen_fonts_url() ) );
-
-	// Indicate widget sidebars can use selective refresh in the Customizer.
-	add_theme_support( 'customize-selective-refresh-widgets' );
-}
+			// Indicate widget sidebars can use selective refresh in the Customizer.
+			add_theme_support( 'customize-selective-refresh-widgets' );
+	}
 endif; // twentysixteen_setup
 add_action( 'after_setup_theme', 'twentysixteen_setup' );
 
@@ -185,7 +185,7 @@
 add_action( 'widgets_init', 'twentysixteen_widgets_init' );
 
 if ( ! function_exists( 'twentysixteen_fonts_url' ) ) :
-/**
+	/**
  * Register Google fonts for Twenty Sixteen.
  *
  * Create your own twentysixteen_fonts_url() function to override in a child theme.
@@ -194,35 +194,35 @@
  *
  * @return string Google fonts URL for the theme.
  */
-function twentysixteen_fonts_url() {
-	$fonts_url = '';
-	$fonts     = array();
-	$subsets   = 'latin,latin-ext';
-
-	/* translators: If there are characters in your language that are not supported by Merriweather, translate this to 'off'. Do not translate into your own language. */
-	if ( 'off' !== _x( 'on', 'Merriweather font: on or off', 'twentysixteen' ) ) {
-		$fonts[] = 'Merriweather:400,700,900,400italic,700italic,900italic';
-	}
-
-	/* translators: If there are characters in your language that are not supported by Montserrat, translate this to 'off'. Do not translate into your own language. */
-	if ( 'off' !== _x( 'on', 'Montserrat font: on or off', 'twentysixteen' ) ) {
-		$fonts[] = 'Montserrat:400,700';
-	}
-
-	/* translators: If there are characters in your language that are not supported by Inconsolata, translate this to 'off'. Do not translate into your own language. */
-	if ( 'off' !== _x( 'on', 'Inconsolata font: on or off', 'twentysixteen' ) ) {
-		$fonts[] = 'Inconsolata:400';
-	}
+	function twentysixteen_fonts_url() {
+		$fonts_url = '';
+		$fonts     = array();
+		$subsets   = 'latin,latin-ext';
+
+		/* translators: If there are characters in your language that are not supported by Merriweather, translate this to 'off'. Do not translate into your own language. */
+		if ( 'off' !== _x( 'on', 'Merriweather font: on or off', 'twentysixteen' ) ) {
+			$fonts[] = 'Merriweather:400,700,900,400italic,700italic,900italic';
+		}
+
+		/* translators: If there are characters in your language that are not supported by Montserrat, translate this to 'off'. Do not translate into your own language. */
+		if ( 'off' !== _x( 'on', 'Montserrat font: on or off', 'twentysixteen' ) ) {
+			$fonts[] = 'Montserrat:400,700';
+		}
+
+		/* translators: If there are characters in your language that are not supported by Inconsolata, translate this to 'off'. Do not translate into your own language. */
+		if ( 'off' !== _x( 'on', 'Inconsolata font: on or off', 'twentysixteen' ) ) {
+			$fonts[] = 'Inconsolata:400';
+		}
+
+		if ( $fonts ) {
+			$fonts_url = add_query_arg( array(
+				'family' => urlencode( implode( '|', $fonts ) ),
+				'subset' => urlencode( $subsets ),
+			), 'https://fonts.googleapis.com/css' );
+		}
 
-	if ( $fonts ) {
-		$fonts_url = add_query_arg( array(
-			'family' => urlencode( implode( '|', $fonts ) ),
-			'subset' => urlencode( $subsets ),
-		), 'https://fonts.googleapis.com/css' );
+		return $fonts_url;
 	}
-
-	return $fonts_url;
-}
 endif;
 
 /**
@@ -333,10 +333,10 @@
 	$color = trim( $color, '#' );
 
 	if ( strlen( $color ) === 3 ) {
-		$r = hexdec( substr( $color, 0, 1 ).substr( $color, 0, 1 ) );
-		$g = hexdec( substr( $color, 1, 1 ).substr( $color, 1, 1 ) );
-		$b = hexdec( substr( $color, 2, 1 ).substr( $color, 2, 1 ) );
-	} else if ( strlen( $color ) === 6 ) {
+		$r = hexdec( substr( $color, 0, 1 ) . substr( $color, 0, 1 ) );
+		$g = hexdec( substr( $color, 1, 1 ) . substr( $color, 1, 1 ) );
+		$b = hexdec( substr( $color, 2, 1 ) . substr( $color, 2, 1 ) );
+	} elseif ( strlen( $color ) === 6 ) {
 		$r = hexdec( substr( $color, 0, 2 ) );
 		$g = hexdec( substr( $color, 2, 2 ) );
 		$b = hexdec( substr( $color, 4, 2 ) );
@@ -344,7 +344,11 @@
 		return array();
 	}
 
-	return array( 'red' => $r, 'green' => $g, 'blue' => $b );
+	return array(
+		'red' => $r,
+		'green' => $g,
+		'blue' => $b,
+	);
 }
 
 /**
Index: src/wp-content/themes/twentysixteen/header.php
===================================================================
--- src/wp-content/themes/twentysixteen/header.php	(revision 40901)
+++ src/wp-content/themes/twentysixteen/header.php	(working copy)
@@ -38,7 +38,7 @@
 					<?php endif;
 
 					$description = get_bloginfo( 'description', 'display' );
-					if ( $description || is_customize_preview() ) : ?>
+if ( $description || is_customize_preview() ) : ?>
 						<p class="site-description"><?php echo $description; ?></p>
 					<?php endif; ?>
 				</div><!-- .site-branding -->
@@ -53,7 +53,7 @@
 									wp_nav_menu( array(
 										'theme_location' => 'primary',
 										'menu_class'     => 'primary-menu',
-									 ) );
+									) );
 								?>
 							</nav><!-- .main-navigation -->
 						<?php endif; ?>
Index: src/wp-content/themes/twentysixteen/image.php
===================================================================
--- src/wp-content/themes/twentysixteen/image.php	(revision 40901)
+++ src/wp-content/themes/twentysixteen/image.php	(working copy)
@@ -14,93 +14,93 @@
 
 			<?php
 				// Start the loop.
-				while ( have_posts() ) : the_post();
+			while ( have_posts() ) : the_post();
 			?>
 
-				<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+			<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-					<nav id="image-navigation" class="navigation image-navigation">
-						<div class="nav-links">
-							<div class="nav-previous"><?php previous_image_link( false, __( 'Previous Image', 'twentysixteen' ) ); ?></div>
-							<div class="nav-next"><?php next_image_link( false, __( 'Next Image', 'twentysixteen' ) ); ?></div>
-						</div><!-- .nav-links -->
-					</nav><!-- .image-navigation -->
-
-					<header class="entry-header">
-						<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
-					</header><!-- .entry-header -->
-
-					<div class="entry-content">
-
-						<div class="entry-attachment">
-							<?php
-								/**
+			<nav id="image-navigation" class="navigation image-navigation">
+				<div class="nav-links">
+					<div class="nav-previous"><?php previous_image_link( false, __( 'Previous Image', 'twentysixteen' ) ); ?></div>
+					<div class="nav-next"><?php next_image_link( false, __( 'Next Image', 'twentysixteen' ) ); ?></div>
+				</div><!-- .nav-links -->
+			</nav><!-- .image-navigation -->
+
+			<header class="entry-header">
+				<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
+			</header><!-- .entry-header -->
+
+			<div class="entry-content">
+
+				<div class="entry-attachment">
+					<?php
+						/**
 								 * Filter the default twentysixteen image attachment size.
 								 *
 								 * @since Twenty Sixteen 1.0
 								 *
 								 * @param string $image_size Image size. Default 'large'.
 								 */
-								$image_size = apply_filters( 'twentysixteen_attachment_size', 'large' );
+						$image_size = apply_filters( 'twentysixteen_attachment_size', 'large' );
 
-								echo wp_get_attachment_image( get_the_ID(), $image_size );
-							?>
+						echo wp_get_attachment_image( get_the_ID(), $image_size );
+					?>
 
-							<?php twentysixteen_excerpt( 'entry-caption' ); ?>
+					<?php twentysixteen_excerpt( 'entry-caption' ); ?>
 
 						</div><!-- .entry-attachment -->
 
 						<?php
-							the_content();
-							wp_link_pages( array(
-								'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentysixteen' ) . '</span>',
-								'after'       => '</div>',
-								'link_before' => '<span>',
-								'link_after'  => '</span>',
-								'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>%',
-								'separator'   => '<span class="screen-reader-text">, </span>',
-							) );
-						?>
+						the_content();
+						wp_link_pages( array(
+							'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentysixteen' ) . '</span>',
+							'after'       => '</div>',
+							'link_before' => '<span>',
+							'link_after'  => '</span>',
+							'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>%',
+							'separator'   => '<span class="screen-reader-text">, </span>',
+						) );
+					?>
 					</div><!-- .entry-content -->
 
 					<footer class="entry-footer">
-						<?php twentysixteen_entry_meta(); ?>
-						<?php
-							// Retrieve attachment metadata.
-							$metadata = wp_get_attachment_metadata();
-							if ( $metadata ) {
-								printf( '<span class="full-size-link"><span class="screen-reader-text">%1$s </span><a href="%2$s">%3$s &times; %4$s</a></span>',
-									esc_html_x( 'Full size', 'Used before full size attachment link.', 'twentysixteen' ),
-									esc_url( wp_get_attachment_url() ),
-									absint( $metadata['width'] ),
-									absint( $metadata['height'] )
-								);
-							}
-						?>
-						<?php
-							edit_post_link(
-								sprintf(
-									/* translators: %s: Name of current post */
-									__( 'Edit<span class="screen-reader-text"> "%s"</span>', 'twentysixteen' ),
-									get_the_title()
-								),
-								'<span class="edit-link">',
-								'</span>'
-							);
-						?>
+					<?php twentysixteen_entry_meta(); ?>
+					<?php
+					// Retrieve attachment metadata.
+					$metadata = wp_get_attachment_metadata();
+					if ( $metadata ) {
+						printf( '<span class="full-size-link"><span class="screen-reader-text">%1$s </span><a href="%2$s">%3$s &times; %4$s</a></span>',
+							esc_html_x( 'Full size', 'Used before full size attachment link.', 'twentysixteen' ),
+							esc_url( wp_get_attachment_url() ),
+							absint( $metadata['width'] ),
+							absint( $metadata['height'] )
+						);
+					}
+					?>
+					<?php
+					edit_post_link(
+						sprintf(
+							/* translators: %s: Name of current post */
+							__( 'Edit<span class="screen-reader-text"> "%s"</span>', 'twentysixteen' ),
+							get_the_title()
+						),
+						'<span class="edit-link">',
+						'</span>'
+					);
+					?>
 					</footer><!-- .entry-footer -->
 				</article><!-- #post-## -->
 
 				<?php
-					// If comments are open or we have at least one comment, load up the comment template.
-					if ( comments_open() || get_comments_number() ) {
-						comments_template();
-					}
-
-					// Parent post navigation.
-					the_post_navigation( array(
-						'prev_text' => _x( '<span class="meta-nav">Published in</span><span class="post-title">%title</span>', 'Parent post link', 'twentysixteen' ),
-					) );
+				// If comments are open or we have at least one comment, load up the comment template.
+				if ( comments_open() || get_comments_number() ) {
+					comments_template();
+				}
+
+				// Parent post navigation.
+				the_post_navigation( array(
+					'prev_text' => _x( '<span class="meta-nav">Published in</span><span class="post-title">%title</span>', 'Parent post link', 'twentysixteen' ),
+				) );
 				// End the loop.
 				endwhile;
 			?>
Index: src/wp-content/themes/twentysixteen/inc/customizer.php
===================================================================
--- src/wp-content/themes/twentysixteen/inc/customizer.php	(revision 40901)
+++ src/wp-content/themes/twentysixteen/inc/customizer.php	(working copy)
@@ -61,7 +61,7 @@
 add_action( 'after_setup_theme', 'twentysixteen_custom_header_and_background' );
 
 if ( ! function_exists( 'twentysixteen_header_style' ) ) :
-/**
+	/**
  * Styles the header text displayed on the site.
  *
  * Create your own twentysixteen_header_style() function to override in a child theme.
@@ -70,15 +70,15 @@
  *
  * @see twentysixteen_custom_header_and_background().
  */
-function twentysixteen_header_style() {
-	// If the header text option is untouched, let's bail.
-	if ( display_header_text() ) {
-		return;
-	}
+	function twentysixteen_header_style() {
+		// If the header text option is untouched, let's bail.
+		if ( display_header_text() ) {
+			return;
+		}
 
-	// If the header text has been hidden.
-	?>
-	<style type="text/css" id="twentysixteen-header-css">
+		// If the header text has been hidden.
+		?>
+		<style type="text/css" id="twentysixteen-header-css">
 		.site-branding {
 			margin: 0 auto 0 0;
 		}
@@ -88,9 +88,9 @@
 			clip: rect(1px, 1px, 1px, 1px);
 			position: absolute;
 		}
-	</style>
-	<?php
-}
+		</style>
+		<?php
+	}
 endif; // twentysixteen_header_style
 
 /**
@@ -303,7 +303,7 @@
 }
 
 if ( ! function_exists( 'twentysixteen_get_color_scheme' ) ) :
-/**
+	/**
  * Retrieves the current Twenty Sixteen color scheme.
  *
  * Create your own twentysixteen_get_color_scheme() function to override in a child theme.
@@ -312,20 +312,20 @@
  *
  * @return array An associative array of either the current or default color scheme HEX values.
  */
-function twentysixteen_get_color_scheme() {
-	$color_scheme_option = get_theme_mod( 'color_scheme', 'default' );
-	$color_schemes       = twentysixteen_get_color_schemes();
+	function twentysixteen_get_color_scheme() {
+		$color_scheme_option = get_theme_mod( 'color_scheme', 'default' );
+		$color_schemes       = twentysixteen_get_color_schemes();
 
-	if ( array_key_exists( $color_scheme_option, $color_schemes ) ) {
-		return $color_schemes[ $color_scheme_option ]['colors'];
-	}
+		if ( array_key_exists( $color_scheme_option, $color_schemes ) ) {
+			return $color_schemes[ $color_scheme_option ]['colors'];
+		}
 
-	return $color_schemes['default']['colors'];
-}
+		return $color_schemes['default']['colors'];
+	}
 endif; // twentysixteen_get_color_scheme
 
 if ( ! function_exists( 'twentysixteen_get_color_scheme_choices' ) ) :
-/**
+	/**
  * Retrieves an array of color scheme choices registered for Twenty Sixteen.
  *
  * Create your own twentysixteen_get_color_scheme_choices() function to override
@@ -335,21 +335,21 @@
  *
  * @return array Array of color schemes.
  */
-function twentysixteen_get_color_scheme_choices() {
-	$color_schemes                = twentysixteen_get_color_schemes();
-	$color_scheme_control_options = array();
+	function twentysixteen_get_color_scheme_choices() {
+		$color_schemes                = twentysixteen_get_color_schemes();
+		$color_scheme_control_options = array();
 
-	foreach ( $color_schemes as $color_scheme => $value ) {
-		$color_scheme_control_options[ $color_scheme ] = $value['label'];
-	}
+		foreach ( $color_schemes as $color_scheme => $value ) {
+			$color_scheme_control_options[ $color_scheme ] = $value['label'];
+		}
 
-	return $color_scheme_control_options;
-}
+		return $color_scheme_control_options;
+	}
 endif; // twentysixteen_get_color_scheme_choices
 
 
 if ( ! function_exists( 'twentysixteen_sanitize_color_scheme' ) ) :
-/**
+	/**
  * Handles sanitization for Twenty Sixteen color schemes.
  *
  * Create your own twentysixteen_sanitize_color_scheme() function to override
@@ -360,15 +360,15 @@
  * @param string $value Color scheme name value.
  * @return string Color scheme name.
  */
-function twentysixteen_sanitize_color_scheme( $value ) {
-	$color_schemes = twentysixteen_get_color_scheme_choices();
+	function twentysixteen_sanitize_color_scheme( $value ) {
+		$color_schemes = twentysixteen_get_color_scheme_choices();
 
-	if ( ! array_key_exists( $value, $color_schemes ) ) {
-		return 'default';
-	}
+		if ( ! array_key_exists( $value, $color_schemes ) ) {
+			return 'default';
+		}
 
-	return $value;
-}
+		return $value;
+	}
 endif; // twentysixteen_sanitize_color_scheme
 
 /**
Index: src/wp-content/themes/twentysixteen/inc/template-tags.php
===================================================================
--- src/wp-content/themes/twentysixteen/inc/template-tags.php	(revision 40901)
+++ src/wp-content/themes/twentysixteen/inc/template-tags.php	(working copy)
@@ -10,108 +10,108 @@
  */
 
 if ( ! function_exists( 'twentysixteen_entry_meta' ) ) :
-/**
+	/**
  * Prints HTML with meta information for the categories, tags.
  *
  * Create your own twentysixteen_entry_meta() function to override in a child theme.
  *
  * @since Twenty Sixteen 1.0
  */
-function twentysixteen_entry_meta() {
-	if ( 'post' === get_post_type() ) {
-		$author_avatar_size = apply_filters( 'twentysixteen_author_avatar_size', 49 );
-		printf( '<span class="byline"><span class="author vcard">%1$s<span class="screen-reader-text">%2$s </span> <a class="url fn n" href="%3$s">%4$s</a></span></span>',
-			get_avatar( get_the_author_meta( 'user_email' ), $author_avatar_size ),
-			_x( 'Author', 'Used before post author name.', 'twentysixteen' ),
-			esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-			get_the_author()
-		);
-	}
-
-	if ( in_array( get_post_type(), array( 'post', 'attachment' ) ) ) {
-		twentysixteen_entry_date();
-	}
-
-	$format = get_post_format();
-	if ( current_theme_supports( 'post-formats', $format ) ) {
-		printf( '<span class="entry-format">%1$s<a href="%2$s">%3$s</a></span>',
-			sprintf( '<span class="screen-reader-text">%s </span>', _x( 'Format', 'Used before post format.', 'twentysixteen' ) ),
-			esc_url( get_post_format_link( $format ) ),
-			get_post_format_string( $format )
-		);
-	}
-
-	if ( 'post' === get_post_type() ) {
-		twentysixteen_entry_taxonomies();
-	}
-
-	if ( ! is_singular() && ! post_password_required() && ( comments_open() || get_comments_number() ) ) {
-		echo '<span class="comments-link">';
-		comments_popup_link( sprintf( __( 'Leave a comment<span class="screen-reader-text"> on %s</span>', 'twentysixteen' ), get_the_title() ) );
-		echo '</span>';
+	function twentysixteen_entry_meta() {
+		if ( 'post' === get_post_type() ) {
+			$author_avatar_size = apply_filters( 'twentysixteen_author_avatar_size', 49 );
+			printf( '<span class="byline"><span class="author vcard">%1$s<span class="screen-reader-text">%2$s </span> <a class="url fn n" href="%3$s">%4$s</a></span></span>',
+				get_avatar( get_the_author_meta( 'user_email' ), $author_avatar_size ),
+				_x( 'Author', 'Used before post author name.', 'twentysixteen' ),
+				esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+				get_the_author()
+			);
+		}
+
+		if ( in_array( get_post_type(), array( 'post', 'attachment' ) ) ) {
+			twentysixteen_entry_date();
+		}
+
+		$format = get_post_format();
+		if ( current_theme_supports( 'post-formats', $format ) ) {
+			printf( '<span class="entry-format">%1$s<a href="%2$s">%3$s</a></span>',
+				sprintf( '<span class="screen-reader-text">%s </span>', _x( 'Format', 'Used before post format.', 'twentysixteen' ) ),
+				esc_url( get_post_format_link( $format ) ),
+				get_post_format_string( $format )
+			);
+		}
+
+		if ( 'post' === get_post_type() ) {
+			twentysixteen_entry_taxonomies();
+		}
+
+		if ( ! is_singular() && ! post_password_required() && ( comments_open() || get_comments_number() ) ) {
+			echo '<span class="comments-link">';
+			comments_popup_link( sprintf( __( 'Leave a comment<span class="screen-reader-text"> on %s</span>', 'twentysixteen' ), get_the_title() ) );
+			echo '</span>';
+		}
 	}
-}
 endif;
 
 if ( ! function_exists( 'twentysixteen_entry_date' ) ) :
-/**
+	/**
  * Prints HTML with date information for current post.
  *
  * Create your own twentysixteen_entry_date() function to override in a child theme.
  *
  * @since Twenty Sixteen 1.0
  */
-function twentysixteen_entry_date() {
-	$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
+	function twentysixteen_entry_date() {
+		$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
 
-	if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
-		$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
-	}
+		if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
+			$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
+		}
+
+		$time_string = sprintf( $time_string,
+			esc_attr( get_the_date( 'c' ) ),
+			get_the_date(),
+			esc_attr( get_the_modified_date( 'c' ) ),
+			get_the_modified_date()
+		);
 
-	$time_string = sprintf( $time_string,
-		esc_attr( get_the_date( 'c' ) ),
-		get_the_date(),
-		esc_attr( get_the_modified_date( 'c' ) ),
-		get_the_modified_date()
-	);
-
-	printf( '<span class="posted-on"><span class="screen-reader-text">%1$s </span><a href="%2$s" rel="bookmark">%3$s</a></span>',
-		_x( 'Posted on', 'Used before publish date.', 'twentysixteen' ),
-		esc_url( get_permalink() ),
-		$time_string
-	);
-}
+			printf( '<span class="posted-on"><span class="screen-reader-text">%1$s </span><a href="%2$s" rel="bookmark">%3$s</a></span>',
+				_x( 'Posted on', 'Used before publish date.', 'twentysixteen' ),
+				esc_url( get_permalink() ),
+				$time_string
+			);
+	}
 endif;
 
 if ( ! function_exists( 'twentysixteen_entry_taxonomies' ) ) :
-/**
+	/**
  * Prints HTML with category and tags for current post.
  *
  * Create your own twentysixteen_entry_taxonomies() function to override in a child theme.
  *
  * @since Twenty Sixteen 1.0
  */
-function twentysixteen_entry_taxonomies() {
-	$categories_list = get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentysixteen' ) );
-	if ( $categories_list && twentysixteen_categorized_blog() ) {
-		printf( '<span class="cat-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
-			_x( 'Categories', 'Used before category names.', 'twentysixteen' ),
-			$categories_list
-		);
+	function twentysixteen_entry_taxonomies() {
+		$categories_list = get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentysixteen' ) );
+		if ( $categories_list && twentysixteen_categorized_blog() ) {
+			printf( '<span class="cat-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
+				_x( 'Categories', 'Used before category names.', 'twentysixteen' ),
+				$categories_list
+			);
+		}
+
+		$tags_list = get_the_tag_list( '', _x( ', ', 'Used between list items, there is a space after the comma.', 'twentysixteen' ) );
+		if ( $tags_list ) {
+			printf( '<span class="tags-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
+				_x( 'Tags', 'Used before tag names.', 'twentysixteen' ),
+				$tags_list
+			);
+		}
 	}
-
-	$tags_list = get_the_tag_list( '', _x( ', ', 'Used between list items, there is a space after the comma.', 'twentysixteen' ) );
-	if ( $tags_list ) {
-		printf( '<span class="tags-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
-			_x( 'Tags', 'Used before tag names.', 'twentysixteen' ),
-			$tags_list
-		);
-	}
-}
 endif;
 
 if ( ! function_exists( 'twentysixteen_post_thumbnail' ) ) :
-/**
+	/**
  * Displays an optional post thumbnail.
  *
  * Wraps the post thumbnail in an anchor element on index views, or a div
@@ -121,26 +121,28 @@
  *
  * @since Twenty Sixteen 1.0
  */
-function twentysixteen_post_thumbnail() {
-	if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
-		return;
-	}
+	function twentysixteen_post_thumbnail() {
+		if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
+			return;
+		}
 
-	if ( is_singular() ) :
-	?>
+		if ( is_singular() ) :
+		?>
 
-	<div class="post-thumbnail">
+		<div class="post-thumbnail">
 		<?php the_post_thumbnail(); ?>
 	</div><!-- .post-thumbnail -->
 
 	<?php else : ?>
 
 	<a class="post-thumbnail" href="<?php the_permalink(); ?>" aria-hidden="true">
-		<?php the_post_thumbnail( 'post-thumbnail', array( 'alt' => the_title_attribute( 'echo=0' ) ) ); ?>
+		<?php the_post_thumbnail( 'post-thumbnail', array(
+			'alt' => the_title_attribute( 'echo=0' ),
+		) ); ?>
 	</a>
 
 	<?php endif; // End is_singular()
-}
+	}
 endif;
 
 if ( ! function_exists( 'twentysixteen_excerpt' ) ) :
@@ -167,7 +169,7 @@
 endif;
 
 if ( ! function_exists( 'twentysixteen_excerpt_more' ) && ! is_admin() ) :
-/**
+	/**
  * Replaces "[...]" (appended to automatically generated excerpts) with ... and
  * a 'Continue reading' link.
  *
@@ -177,19 +179,19 @@
  *
  * @return string 'Continue reading' link prepended with an ellipsis.
  */
-function twentysixteen_excerpt_more() {
-	$link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
-		esc_url( get_permalink( get_the_ID() ) ),
-		/* translators: %s: Name of current post */
-		sprintf( __( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentysixteen' ), get_the_title( get_the_ID() ) )
-	);
-	return ' &hellip; ' . $link;
-}
-add_filter( 'excerpt_more', 'twentysixteen_excerpt_more' );
+	function twentysixteen_excerpt_more() {
+		$link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
+			esc_url( get_permalink( get_the_ID() ) ),
+			/* translators: %s: Name of current post */
+			sprintf( __( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentysixteen' ), get_the_title( get_the_ID() ) )
+		);
+			return ' &hellip; ' . $link;
+	}
+	add_filter( 'excerpt_more', 'twentysixteen_excerpt_more' );
 endif;
 
 if ( ! function_exists( 'twentysixteen_categorized_blog' ) ) :
-/**
+	/**
  * Determines whether blog/site has more than one category.
  *
  * Create your own twentysixteen_categorized_blog() function to override in a child theme.
@@ -198,29 +200,29 @@
  *
  * @return bool True if there is more than one category, false otherwise.
  */
-function twentysixteen_categorized_blog() {
-	if ( false === ( $all_the_cool_cats = get_transient( 'twentysixteen_categories' ) ) ) {
-		// Create an array of all the categories that are attached to posts.
-		$all_the_cool_cats = get_categories( array(
-			'fields'     => 'ids',
-			// We only need to know if there is more than one category.
-			'number'     => 2,
-		) );
-
-		// Count the number of categories that are attached to the posts.
-		$all_the_cool_cats = count( $all_the_cool_cats );
-
-		set_transient( 'twentysixteen_categories', $all_the_cool_cats );
-	}
-
-	if ( $all_the_cool_cats > 1 ) {
-		// This blog has more than 1 category so twentysixteen_categorized_blog should return true.
-		return true;
-	} else {
-		// This blog has only 1 category so twentysixteen_categorized_blog should return false.
-		return false;
+	function twentysixteen_categorized_blog() {
+		if ( false === ( $all_the_cool_cats = get_transient( 'twentysixteen_categories' ) ) ) {
+			// Create an array of all the categories that are attached to posts.
+			$all_the_cool_cats = get_categories( array(
+				'fields'     => 'ids',
+				// We only need to know if there is more than one category.
+				'number'     => 2,
+			) );
+
+			// Count the number of categories that are attached to the posts.
+			$all_the_cool_cats = count( $all_the_cool_cats );
+
+			set_transient( 'twentysixteen_categories', $all_the_cool_cats );
+		}
+
+		if ( $all_the_cool_cats > 1 ) {
+			// This blog has more than 1 category so twentysixteen_categorized_blog should return true.
+			return true;
+		} else {
+			// This blog has only 1 category so twentysixteen_categorized_blog should return false.
+			return false;
+		}
 	}
-}
 endif;
 
 /**
@@ -239,16 +241,16 @@
 add_action( 'save_post',     'twentysixteen_category_transient_flusher' );
 
 if ( ! function_exists( 'twentysixteen_the_custom_logo' ) ) :
-/**
+	/**
  * Displays the optional custom logo.
  *
  * Does nothing if the custom logo is not available.
  *
  * @since Twenty Sixteen 1.2
  */
-function twentysixteen_the_custom_logo() {
-	if ( function_exists( 'the_custom_logo' ) ) {
-		the_custom_logo();
+	function twentysixteen_the_custom_logo() {
+		if ( function_exists( 'the_custom_logo' ) ) {
+			the_custom_logo();
+		}
 	}
-}
 endif;
Index: src/wp-content/themes/twentysixteen/index.php
===================================================================
--- src/wp-content/themes/twentysixteen/index.php	(revision 40901)
+++ src/wp-content/themes/twentysixteen/index.php	(working copy)
@@ -38,7 +38,7 @@
 				 */
 				get_template_part( 'template-parts/content', get_post_format() );
 
-			// End the loop.
+				// End the loop.
 			endwhile;
 
 			// Previous/next page navigation.
@@ -48,7 +48,7 @@
 				'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>',
 			) );
 
-		// If no content, include the "No posts found" template.
+			// If no content, include the "No posts found" template.
 		else :
 			get_template_part( 'template-parts/content', 'none' );
 
Index: src/wp-content/themes/twentysixteen/search.php
===================================================================
--- src/wp-content/themes/twentysixteen/search.php	(revision 40901)
+++ src/wp-content/themes/twentysixteen/search.php	(working copy)
@@ -29,7 +29,7 @@
 				 */
 				get_template_part( 'template-parts/content', 'search' );
 
-			// End the loop.
+				// End the loop.
 			endwhile;
 
 			// Previous/next page navigation.
@@ -39,7 +39,7 @@
 				'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>',
 			) );
 
-		// If no content, include the "No posts found" template.
+			// If no content, include the "No posts found" template.
 		else :
 			get_template_part( 'template-parts/content', 'none' );
 
Index: src/wp-content/themes/twentysixteen/sidebar.php
===================================================================
--- src/wp-content/themes/twentysixteen/sidebar.php	(revision 40901)
+++ src/wp-content/themes/twentysixteen/sidebar.php	(working copy)
@@ -8,7 +8,7 @@
  */
 ?>
 
-<?php if ( is_active_sidebar( 'sidebar-1' )  ) : ?>
+<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
 	<aside id="secondary" class="sidebar widget-area" role="complementary">
 		<?php dynamic_sidebar( 'sidebar-1' ); ?>
 	</aside><!-- .sidebar .widget-area -->
Index: src/wp-content/themes/twentyten/404.php
===================================================================
--- src/wp-content/themes/twentyten/404.php	(revision 40901)
+++ src/wp-content/themes/twentyten/404.php	(working copy)
@@ -27,4 +27,4 @@
 		document.getElementById('s') && document.getElementById('s').focus();
 	</script>
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: src/wp-content/themes/twentyten/archive.php
===================================================================
--- src/wp-content/themes/twentyten/archive.php	(revision 40901)
+++ src/wp-content/themes/twentyten/archive.php	(working copy)
@@ -25,8 +25,9 @@
 	 * We reset this later so we can run the loop
 	 * properly with a call to rewind_posts().
 	 */
-	if ( have_posts() )
-		the_post();
+if ( have_posts() ) {
+	the_post();
+}
 ?>
 
 			<h1 class="page-title">
Index: src/wp-content/themes/twentyten/author.php
===================================================================
--- src/wp-content/themes/twentyten/author.php	(revision 40901)
+++ src/wp-content/themes/twentyten/author.php	(working copy)
@@ -21,8 +21,9 @@
 	 * We reset this later so we can run the loop
 	 * properly with a call to rewind_posts().
 	 */
-	if ( have_posts() )
-		the_post();
+if ( have_posts() ) {
+	the_post();
+}
 ?>
 
 				<h1 class="page-title author"><?php printf( __( 'Author Archives: %s', 'twentyten' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
Index: src/wp-content/themes/twentyten/category.php
===================================================================
--- src/wp-content/themes/twentyten/category.php	(revision 40901)
+++ src/wp-content/themes/twentyten/category.php	(working copy)
@@ -17,8 +17,9 @@
 				?></h1>
 				<?php
 					$category_description = category_description();
-					if ( ! empty( $category_description ) )
-						echo '<div class="archive-meta">' . $category_description . '</div>';
+				if ( ! empty( $category_description ) ) {
+					echo '<div class="archive-meta">' . $category_description . '</div>';
+				}
 
 				/*
 				 * Run the loop for the category page to output the posts.
Index: src/wp-content/themes/twentyten/functions.php
===================================================================
--- src/wp-content/themes/twentyten/functions.php	(revision 40901)
+++ src/wp-content/themes/twentyten/functions.php	(working copy)
@@ -44,14 +44,15 @@
  * Used to set the width of images and content. Should be equal to the width the theme
  * is designed for, generally via the style.css stylesheet.
  */
-if ( ! isset( $content_width ) )
+if ( ! isset( $content_width ) ) {
 	$content_width = 640;
+}
 
 /* Tell WordPress to run twentyten_setup() when the 'after_setup_theme' hook is run. */
 add_action( 'after_setup_theme', 'twentyten_setup' );
 
-if ( ! function_exists( 'twentyten_setup' ) ):
-/**
+if ( ! function_exists( 'twentyten_setup' ) ) :
+	/**
  * Set up theme defaults and registers support for various WordPress features.
  *
  * Note that this function is hooked into the after_setup_theme hook, which runs
@@ -70,169 +71,169 @@
  *
  * @since Twenty Ten 1.0
  */
-function twentyten_setup() {
-
-	// This theme styles the visual editor with editor-style.css to match the theme style.
-	add_editor_style();
+	function twentyten_setup() {
 
-	// Post Format support. You can also use the legacy "gallery" or "asides" (note the plural) categories.
-	add_theme_support( 'post-formats', array( 'aside', 'gallery' ) );
+		// This theme styles the visual editor with editor-style.css to match the theme style.
+		add_editor_style();
 
-	// This theme uses post thumbnails
-	add_theme_support( 'post-thumbnails' );
+		// Post Format support. You can also use the legacy "gallery" or "asides" (note the plural) categories.
+		add_theme_support( 'post-formats', array( 'aside', 'gallery' ) );
 
-	// Add default posts and comments RSS feed links to head
-	add_theme_support( 'automatic-feed-links' );
+		// This theme uses post thumbnails
+		add_theme_support( 'post-thumbnails' );
 
-	/*
-	 * Make theme available for translation.
-	 * Translations can be filed in the /languages/ directory
-	 */
-	load_theme_textdomain( 'twentyten', get_template_directory() . '/languages' );
-
-	// This theme uses wp_nav_menu() in one location.
-	register_nav_menus( array(
-		'primary' => __( 'Primary Navigation', 'twentyten' ),
-	) );
+		// Add default posts and comments RSS feed links to head
+		add_theme_support( 'automatic-feed-links' );
 
-	// This theme allows users to set a custom background.
-	add_theme_support( 'custom-background', array(
-		// Let WordPress know what our default background color is.
-		'default-color' => 'f1f1f1',
-	) );
-
-	// The custom header business starts here.
-
-	$custom_header_support = array(
 		/*
-		 * The default image to use.
-		 * The %s is a placeholder for the theme template directory URI.
+		 * Make theme available for translation.
+		 * Translations can be filed in the /languages/ directory
 		 */
-		'default-image' => '%s/images/headers/path.jpg',
-		// The height and width of our custom header.
-		/**
+		load_theme_textdomain( 'twentyten', get_template_directory() . '/languages' );
+
+		// This theme uses wp_nav_menu() in one location.
+		register_nav_menus( array(
+			'primary' => __( 'Primary Navigation', 'twentyten' ),
+		) );
+
+			// This theme allows users to set a custom background.
+			add_theme_support( 'custom-background', array(
+				// Let WordPress know what our default background color is.
+				'default-color' => 'f1f1f1',
+			) );
+
+			// The custom header business starts here.
+
+			$custom_header_support = array(
+			/*
+			 * The default image to use.
+			 * The %s is a placeholder for the theme template directory URI.
+			 */
+			'default-image' => '%s/images/headers/path.jpg',
+			// The height and width of our custom header.
+			/**
 		 * Filter the Twenty Ten default header image width.
 		 *
 		 * @since Twenty Ten 1.0
 		 *
 		 * @param int The default header image width in pixels. Default 940.
 		 */
-		'width' => apply_filters( 'twentyten_header_image_width', 940 ),
-		/**
+			'width' => apply_filters( 'twentyten_header_image_width', 940 ),
+			/**
 		 * Filter the Twenty Ten defaul header image height.
 		 *
 		 * @since Twenty Ten 1.0
 		 *
 		 * @param int The default header image height in pixels. Default 198.
 		 */
-		'height' => apply_filters( 'twentyten_header_image_height', 198 ),
-		// Support flexible heights.
-		'flex-height' => true,
-		// Don't support text inside the header image.
-		'header-text' => false,
-		// Callback for styling the header preview in the admin.
-		'admin-head-callback' => 'twentyten_admin_header_style',
-	);
-
-	add_theme_support( 'custom-header', $custom_header_support );
-
-	if ( ! function_exists( 'get_custom_header' ) ) {
-		// This is all for compatibility with versions of WordPress prior to 3.4.
-		define( 'HEADER_TEXTCOLOR', '' );
-		define( 'NO_HEADER_TEXT', true );
-		define( 'HEADER_IMAGE', $custom_header_support['default-image'] );
-		define( 'HEADER_IMAGE_WIDTH', $custom_header_support['width'] );
-		define( 'HEADER_IMAGE_HEIGHT', $custom_header_support['height'] );
-		add_custom_image_header( '', $custom_header_support['admin-head-callback'] );
-		add_custom_background();
-	}
-
-	/*
-	 * We'll be using post thumbnails for custom header images on posts and pages.
-	 * We want them to be 940 pixels wide by 198 pixels tall.
-	 * Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
-	 */
-	set_post_thumbnail_size( $custom_header_support['width'], $custom_header_support['height'], true );
-
-	// ... and thus ends the custom header business.
-
-	// Default custom headers packaged with the theme. %s is a placeholder for the theme template directory URI.
-	register_default_headers( array(
-		'berries' => array(
-			'url' => '%s/images/headers/berries.jpg',
-			'thumbnail_url' => '%s/images/headers/berries-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Berries', 'twentyten' )
-		),
-		'cherryblossom' => array(
-			'url' => '%s/images/headers/cherryblossoms.jpg',
-			'thumbnail_url' => '%s/images/headers/cherryblossoms-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Cherry Blossoms', 'twentyten' )
-		),
-		'concave' => array(
-			'url' => '%s/images/headers/concave.jpg',
-			'thumbnail_url' => '%s/images/headers/concave-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Concave', 'twentyten' )
-		),
-		'fern' => array(
-			'url' => '%s/images/headers/fern.jpg',
-			'thumbnail_url' => '%s/images/headers/fern-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Fern', 'twentyten' )
-		),
-		'forestfloor' => array(
-			'url' => '%s/images/headers/forestfloor.jpg',
-			'thumbnail_url' => '%s/images/headers/forestfloor-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Forest Floor', 'twentyten' )
-		),
-		'inkwell' => array(
-			'url' => '%s/images/headers/inkwell.jpg',
-			'thumbnail_url' => '%s/images/headers/inkwell-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Inkwell', 'twentyten' )
-		),
-		'path' => array(
-			'url' => '%s/images/headers/path.jpg',
-			'thumbnail_url' => '%s/images/headers/path-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Path', 'twentyten' )
-		),
-		'sunset' => array(
-			'url' => '%s/images/headers/sunset.jpg',
-			'thumbnail_url' => '%s/images/headers/sunset-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Sunset', 'twentyten' )
-		)
-	) );
-}
+			'height' => apply_filters( 'twentyten_header_image_height', 198 ),
+			// Support flexible heights.
+			'flex-height' => true,
+			// Don't support text inside the header image.
+			'header-text' => false,
+			// Callback for styling the header preview in the admin.
+			'admin-head-callback' => 'twentyten_admin_header_style',
+			);
+
+			add_theme_support( 'custom-header', $custom_header_support );
+
+		if ( ! function_exists( 'get_custom_header' ) ) {
+			// This is all for compatibility with versions of WordPress prior to 3.4.
+			define( 'HEADER_TEXTCOLOR', '' );
+			define( 'NO_HEADER_TEXT', true );
+			define( 'HEADER_IMAGE', $custom_header_support['default-image'] );
+			define( 'HEADER_IMAGE_WIDTH', $custom_header_support['width'] );
+			define( 'HEADER_IMAGE_HEIGHT', $custom_header_support['height'] );
+			add_custom_image_header( '', $custom_header_support['admin-head-callback'] );
+			add_custom_background();
+		}
+
+			/*
+			 * We'll be using post thumbnails for custom header images on posts and pages.
+			 * We want them to be 940 pixels wide by 198 pixels tall.
+			 * Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
+			 */
+			set_post_thumbnail_size( $custom_header_support['width'], $custom_header_support['height'], true );
+
+			// ... and thus ends the custom header business.
+
+			// Default custom headers packaged with the theme. %s is a placeholder for the theme template directory URI.
+			register_default_headers( array(
+				'berries' => array(
+				'url' => '%s/images/headers/berries.jpg',
+				'thumbnail_url' => '%s/images/headers/berries-thumbnail.jpg',
+				/* translators: header image description */
+				'description' => __( 'Berries', 'twentyten' ),
+				),
+				'cherryblossom' => array(
+				'url' => '%s/images/headers/cherryblossoms.jpg',
+				'thumbnail_url' => '%s/images/headers/cherryblossoms-thumbnail.jpg',
+				/* translators: header image description */
+				'description' => __( 'Cherry Blossoms', 'twentyten' ),
+				),
+				'concave' => array(
+				'url' => '%s/images/headers/concave.jpg',
+				'thumbnail_url' => '%s/images/headers/concave-thumbnail.jpg',
+				/* translators: header image description */
+				'description' => __( 'Concave', 'twentyten' ),
+				),
+				'fern' => array(
+				'url' => '%s/images/headers/fern.jpg',
+				'thumbnail_url' => '%s/images/headers/fern-thumbnail.jpg',
+				/* translators: header image description */
+				'description' => __( 'Fern', 'twentyten' ),
+				),
+				'forestfloor' => array(
+				'url' => '%s/images/headers/forestfloor.jpg',
+				'thumbnail_url' => '%s/images/headers/forestfloor-thumbnail.jpg',
+				/* translators: header image description */
+				'description' => __( 'Forest Floor', 'twentyten' ),
+				),
+				'inkwell' => array(
+				'url' => '%s/images/headers/inkwell.jpg',
+				'thumbnail_url' => '%s/images/headers/inkwell-thumbnail.jpg',
+				/* translators: header image description */
+				'description' => __( 'Inkwell', 'twentyten' ),
+				),
+				'path' => array(
+				'url' => '%s/images/headers/path.jpg',
+				'thumbnail_url' => '%s/images/headers/path-thumbnail.jpg',
+				/* translators: header image description */
+				'description' => __( 'Path', 'twentyten' ),
+				),
+				'sunset' => array(
+				'url' => '%s/images/headers/sunset.jpg',
+				'thumbnail_url' => '%s/images/headers/sunset-thumbnail.jpg',
+				/* translators: header image description */
+				'description' => __( 'Sunset', 'twentyten' ),
+				),
+			) );
+	}
 endif;
 
 if ( ! function_exists( 'twentyten_admin_header_style' ) ) :
-/**
+	/**
  * Style the header image displayed on the Appearance > Header admin panel.
  *
  * Referenced via add_custom_image_header() in twentyten_setup().
  *
  * @since Twenty Ten 1.0
  */
-function twentyten_admin_header_style() {
-?>
-<style type="text/css" id="twentyten-admin-header-css">
-/* Shows the same border as on front end */
-#headimg {
-	border-bottom: 1px solid #000;
-	border-top: 4px solid #000;
-}
-/* If header-text was supported, you would style the text with these selectors:
-	#headimg #name { }
-	#headimg #desc { }
-*/
-</style>
-<?php
-}
+	function twentyten_admin_header_style() {
+		?>
+		<style type="text/css" id="twentyten-admin-header-css">
+		/* Shows the same border as on front end */
+		#headimg {
+		border-bottom: 1px solid #000;
+		border-top: 4px solid #000;
+		}
+		/* If header-text was supported, you would style the text with these selectors:
+		#headimg #name { }
+		#headimg #desc { }
+		*/
+		</style>
+		<?php
+	}
 endif;
 
 /**
@@ -246,8 +247,9 @@
  * @param array $args An optional array of arguments. @see wp_page_menu()
  */
 function twentyten_page_menu_args( $args ) {
-	if ( ! isset( $args['show_home'] ) )
+	if ( ! isset( $args['show_home'] ) ) {
 		$args['show_home'] = true;
+	}
 	return $args;
 }
 add_filter( 'wp_page_menu_args', 'twentyten_page_menu_args' );
@@ -269,16 +271,16 @@
 add_filter( 'excerpt_length', 'twentyten_excerpt_length' );
 
 if ( ! function_exists( 'twentyten_continue_reading_link' ) ) :
-/**
+	/**
  * Return a "Continue Reading" link for excerpts.
  *
  * @since Twenty Ten 1.0
  *
  * @return string "Continue Reading" link.
  */
-function twentyten_continue_reading_link() {
-	return ' <a href="'. get_permalink() . '">' . __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) . '</a>';
-}
+	function twentyten_continue_reading_link() {
+		return ' <a href="' . get_permalink() . '">' . __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) . '</a>';
+	}
 endif;
 
 /**
@@ -346,11 +348,12 @@
 	return preg_replace( "#<style type='text/css'>(.*?)</style>#s", '', $css );
 }
 // Backwards compatibility with WordPress 3.0.
-if ( version_compare( $GLOBALS['wp_version'], '3.1', '<' ) )
+if ( version_compare( $GLOBALS['wp_version'], '3.1', '<' ) ) {
 	add_filter( 'gallery_style', 'twentyten_remove_gallery_css' );
+}
 
 if ( ! function_exists( 'twentyten_comment' ) ) :
-/**
+	/**
  * Template for comments and pingbacks.
  *
  * To override this walker in a child theme without modifying the comments template
@@ -364,12 +367,12 @@
  * @param array  $args    An array of arguments. @see get_comment_reply_link()
  * @param int    $depth   The depth of the comment.
  */
-function twentyten_comment( $comment, $args, $depth ) {
-	$GLOBALS['comment'] = $comment;
-	switch ( $comment->comment_type ) :
-		case '' :
-	?>
-	<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
+	function twentyten_comment( $comment, $args, $depth ) {
+		$GLOBALS['comment'] = $comment;
+		switch ( $comment->comment_type ) :
+			case '' :
+		?>
+		<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
 		<div id="comment-<?php comment_ID(); ?>">
 			<div class="comment-author vcard">
 				<?php echo get_avatar( $comment, 40 ); ?>
@@ -385,26 +388,29 @@
 					/* translators: 1: date, 2: time */
 					printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(),  get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' );
 				?>
-			</div><!-- .comment-meta .commentmetadata -->
+				</div><!-- .comment-meta .commentmetadata -->
 
-			<div class="comment-body"><?php comment_text(); ?></div>
+				<div class="comment-body"><?php comment_text(); ?></div>
 
-			<div class="reply">
-				<?php comment_reply_link( array_merge( $args, array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
-			</div><!-- .reply -->
-		</div><!-- #comment-##  -->
+				<div class="reply">
+				<?php comment_reply_link( array_merge( $args, array(
+					'depth' => $depth,
+					'max_depth' => $args['max_depth'],
+				) ) ); ?>
+				</div><!-- .reply -->
+			</div><!-- #comment-##  -->
 
-	<?php
+		<?php
 			break;
-		case 'pingback'  :
-		case 'trackback' :
-	?>
-	<li class="post pingback">
+			case 'pingback'  :
+			case 'trackback' :
+		?>
+		<li class="post pingback">
 		<p><?php _e( 'Pingback:', 'twentyten' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' ); ?></p>
 	<?php
 			break;
-	endswitch;
-}
+			endswitch;
+	}
 endif;
 
 /**
@@ -505,53 +511,53 @@
 add_action( 'widgets_init', 'twentyten_remove_recent_comments_style' );
 
 if ( ! function_exists( 'twentyten_posted_on' ) ) :
-/**
+	/**
  * Print HTML with meta information for the current post-date/time and author.
  *
  * @since Twenty Ten 1.0
  */
-function twentyten_posted_on() {
-	printf( __( '<span class="%1$s">Posted on</span> %2$s <span class="meta-sep">by</span> %3$s', 'twentyten' ),
-		'meta-prep meta-prep-author',
-		sprintf( '<a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a>',
-			get_permalink(),
-			esc_attr( get_the_time() ),
-			get_the_date()
-		),
-		sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
-			get_author_posts_url( get_the_author_meta( 'ID' ) ),
-			esc_attr( sprintf( __( 'View all posts by %s', 'twentyten' ), get_the_author() ) ),
-			get_the_author()
-		)
-	);
-}
+	function twentyten_posted_on() {
+		printf( __( '<span class="%1$s">Posted on</span> %2$s <span class="meta-sep">by</span> %3$s', 'twentyten' ),
+			'meta-prep meta-prep-author',
+			sprintf( '<a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a>',
+				get_permalink(),
+				esc_attr( get_the_time() ),
+				get_the_date()
+			),
+			sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
+				get_author_posts_url( get_the_author_meta( 'ID' ) ),
+				esc_attr( sprintf( __( 'View all posts by %s', 'twentyten' ), get_the_author() ) ),
+				get_the_author()
+			)
+		);
+	}
 endif;
 
 if ( ! function_exists( 'twentyten_posted_in' ) ) :
-/**
+	/**
  * Print HTML with meta information for the current post (category, tags and permalink).
  *
  * @since Twenty Ten 1.0
  */
-function twentyten_posted_in() {
-	// Retrieves tag list of current post, separated by commas.
-	$tag_list = get_the_tag_list( '', ', ' );
-	if ( $tag_list ) {
-		$posted_in = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
-	} elseif ( is_object_in_taxonomy( get_post_type(), 'category' ) ) {
-		$posted_in = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
-	} else {
-		$posted_in = __( 'Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
+	function twentyten_posted_in() {
+		// Retrieves tag list of current post, separated by commas.
+		$tag_list = get_the_tag_list( '', ', ' );
+		if ( $tag_list ) {
+			$posted_in = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
+		} elseif ( is_object_in_taxonomy( get_post_type(), 'category' ) ) {
+			$posted_in = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
+		} else {
+			$posted_in = __( 'Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
+		}
+			// Prints the string, replacing the placeholders.
+			printf(
+				$posted_in,
+				get_the_category_list( ', ' ),
+				$tag_list,
+				get_permalink(),
+				the_title_attribute( 'echo=0' )
+			);
 	}
-	// Prints the string, replacing the placeholders.
-	printf(
-		$posted_in,
-		get_the_category_list( ', ' ),
-		$tag_list,
-		get_permalink(),
-		the_title_attribute( 'echo=0' )
-	);
-}
 endif;
 
 /**
@@ -569,14 +575,16 @@
 
 	if ( function_exists( 'get_post_galleries' ) ) {
 		$galleries = get_post_galleries( get_the_ID(), false );
-		if ( isset( $galleries[0]['ids'] ) )
+		if ( isset( $galleries[0]['ids'] ) ) {
 			$images = explode( ',', $galleries[0]['ids'] );
+		}
 	} else {
 		$pattern = get_shortcode_regex();
 		preg_match( "/$pattern/s", get_the_content(), $match );
 		$atts = shortcode_parse_atts( $match[3] );
-		if ( isset( $atts['ids'] ) )
+		if ( isset( $atts['ids'] ) ) {
 			$images = explode( ',', $atts['ids'] );
+		}
 	}
 
 	if ( ! $images ) {
Index: src/wp-content/themes/twentyten/header.php
===================================================================
--- src/wp-content/themes/twentyten/header.php	(revision 40901)
+++ src/wp-content/themes/twentyten/header.php	(working copy)
@@ -25,12 +25,14 @@
 
 	// Add the blog description for the home/front page.
 	$site_description = get_bloginfo( 'description', 'display' );
-	if ( $site_description && ( is_home() || is_front_page() ) )
-		echo " | $site_description";
+if ( $site_description && ( is_home() || is_front_page() ) ) {
+	echo " | $site_description";
+}
 
 	// Add a page number if necessary:
-	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() )
-		echo esc_html( ' | ' . sprintf( __( 'Page %s', 'twentyten' ), max( $paged, $page ) ) );
+if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
+	echo esc_html( ' | ' . sprintf( __( 'Page %s', 'twentyten' ), max( $paged, $page ) ) );
+}
 
 	?></title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
@@ -41,8 +43,9 @@
 	 * We add some JavaScript to pages with the comment form
 	 * to support sites with threaded comments (when in use).
 	 */
-	if ( is_singular() && get_option( 'thread_comments' ) )
-		wp_enqueue_script( 'comment-reply' );
+if ( is_singular() && get_option( 'thread_comments' ) ) {
+	wp_enqueue_script( 'comment-reply' );
+}
 
 	/*
 	 * Always have wp_head() just before the closing </head>
@@ -69,23 +72,23 @@
 
 				<?php
 					// Compatibility with versions of WordPress prior to 3.4.
-					if ( function_exists( 'get_custom_header' ) ) {
-						/*
-						 * We need to figure out what the minimum width should be for our featured image.
-						 * This result would be the suggested width if the theme were to implement flexible widths.
-						 */
-						$header_image_width = get_theme_support( 'custom-header', 'width' );
-					} else {
-						$header_image_width = HEADER_IMAGE_WIDTH;
-					}
+				if ( function_exists( 'get_custom_header' ) ) {
+					/*
+					* We need to figure out what the minimum width should be for our featured image.
+					* This result would be the suggested width if the theme were to implement flexible widths.
+					*/
+					$header_image_width = get_theme_support( 'custom-header', 'width' );
+				} else {
+					$header_image_width = HEADER_IMAGE_WIDTH;
+				}
 
 					// Check if this is a post or page, if it has a thumbnail, and if it's a big one
-					if ( is_singular() && current_theme_supports( 'post-thumbnails' ) &&
+				if ( is_singular() && current_theme_supports( 'post-thumbnails' ) &&
 							has_post_thumbnail( $post->ID ) &&
 							( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'post-thumbnail' ) ) &&
 							$image[1] >= $header_image_width ) :
-						// Houston, we have a new header image!
-						echo get_the_post_thumbnail( $post->ID );
+					// Houston, we have a new header image!
+					echo get_the_post_thumbnail( $post->ID );
 					elseif ( get_header_image() ) :
 						// Compatibility with versions of WordPress prior to 3.4.
 						if ( function_exists( 'get_custom_header' ) ) {
@@ -101,7 +104,7 @@
 			</div><!-- #branding -->
 
 			<div id="access" role="navigation">
-			  <?php /* Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff */ ?>
+				<?php /* Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff */ ?>
 				<div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyten' ); ?>"><?php _e( 'Skip to content', 'twentyten' ); ?></a></div>
 				<?php /* Our navigation menu. If one isn't filled out, wp_nav_menu falls back to wp_page_menu. The menu assiged to the primary position is the one used. If none is assigned, the menu with the lowest ID is used. */ ?>
 				<?php wp_nav_menu( array( 'container_class' => 'menu-header', 'theme_location' => 'primary' ) ); ?>
Index: src/wp-content/themes/twentyten/loop-attachment.php
===================================================================
--- src/wp-content/themes/twentyten/loop-attachment.php	(revision 40901)
+++ src/wp-content/themes/twentyten/loop-attachment.php	(working copy)
@@ -15,7 +15,7 @@
  */
 ?>
 
-<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+<?php if ( have_posts() ) { while ( have_posts() ) : the_post(); ?>
 
 				<?php if ( ! empty( $post->post_parent ) ) : ?>
 					<p class="page-title"><a href="<?php echo esc_url( get_permalink( $post->post_parent ) ); ?>" title="<?php echo esc_attr( sprintf( __( 'Return to %s', 'twentyten' ), strip_tags( get_the_title( $post->post_parent ) ) ) ); ?>" rel="gallery"><?php
@@ -47,18 +47,18 @@
 									get_the_date()
 								)
 							);
-							if ( wp_attachment_is_image() ) {
-								echo ' <span class="meta-sep">|</span> ';
-								$metadata = wp_get_attachment_metadata();
-								printf( __( 'Full size is %s pixels', 'twentyten' ),
-									sprintf( '<a href="%1$s" title="%2$s">%3$s &times; %4$s</a>',
-										esc_url( wp_get_attachment_url() ),
-										esc_attr( __( 'Link to full-size image', 'twentyten' ) ),
-										$metadata['width'],
-										$metadata['height']
-									)
-								);
-							}
+						if ( wp_attachment_is_image() ) {
+							echo ' <span class="meta-sep">|</span> ';
+							$metadata = wp_get_attachment_metadata();
+							printf( __( 'Full size is %s pixels', 'twentyten' ),
+								sprintf( '<a href="%1$s" title="%2$s">%3$s &times; %4$s</a>',
+									esc_url( wp_get_attachment_url() ),
+									esc_attr( __( 'Link to full-size image', 'twentyten' ) ),
+									$metadata['width'],
+									$metadata['height']
+								)
+							);
+						}
 						?>
 						<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
 					</div><!-- .entry-meta -->
@@ -66,21 +66,29 @@
 					<div class="entry-content">
 						<div class="entry-attachment">
 <?php if ( wp_attachment_is_image() ) :
-	$attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
+	$attachments = array_values( get_children( array(
+		'post_parent' => $post->post_parent,
+		'post_status' => 'inherit',
+		'post_type' => 'attachment',
+		'post_mime_type' => 'image',
+		'order' => 'ASC',
+		'orderby' => 'menu_order ID',
+	) ) );
 	foreach ( $attachments as $k => $attachment ) {
-		if ( $attachment->ID == $post->ID )
+		if ( $attachment->ID == $post->ID ) {
 			break;
+		}
 	}
 
 	// If there is more than 1 image attachment in a gallery
 	if ( count( $attachments ) > 1 ) {
 		$k++;
-		if ( isset( $attachments[ $k ] ) )
+		if ( isset( $attachments[ $k ] ) ) {
 			// get the URL of the next image attachment
 			$next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
-		else
-			// or get the URL of the first image attachment
+		} else { // End if().
 			$next_attachment_url = get_attachment_link( $attachments[0]->ID );
+		}
 	} else {
 		// or, if there's only 1 image attachment, get the URL of the image
 		$next_attachment_url = wp_get_attachment_url();
@@ -114,10 +122,13 @@
 						<a href="<?php echo esc_url( wp_get_attachment_url() ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php echo esc_html( basename( get_permalink() ) ); ?></a>
 <?php endif; ?>
 						</div><!-- .entry-attachment -->
-						<div class="entry-caption"><?php if ( ! empty( $post->post_excerpt ) ) the_excerpt(); ?></div>
+						<div class="entry-caption"><?php if ( ! empty( $post->post_excerpt ) ) { the_excerpt();} ?></div>
 
 <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+<?php wp_link_pages( array(
+	'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ),
+	'after' => '</div>',
+) ); ?>
 
 					</div><!-- .entry-content -->
 
@@ -129,4 +140,6 @@
 
 <?php comments_template(); ?>
 
-<?php endwhile; // end of the loop. ?>
+<?php endwhile;
+}; // End if().
+?>
Index: src/wp-content/themes/twentyten/loop-page.php
===================================================================
--- src/wp-content/themes/twentyten/loop-page.php	(revision 40901)
+++ src/wp-content/themes/twentyten/loop-page.php	(working copy)
@@ -15,7 +15,7 @@
  */
 ?>
 
-<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+<?php if ( have_posts() ) { while ( have_posts() ) : the_post(); ?>
 
 				<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 					<?php if ( is_front_page() ) { ?>
@@ -26,11 +26,16 @@
 
 					<div class="entry-content">
 						<?php the_content(); ?>
-						<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+						<?php wp_link_pages( array(
+							'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ),
+							'after' => '</div>',
+						) ); ?>
 						<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
 					</div><!-- .entry-content -->
 				</div><!-- #post-## -->
 
 				<?php comments_template( '', true ); ?>
 
-<?php endwhile; // end of the loop. ?>
+<?php endwhile;
+}; // End if().
+?>
Index: src/wp-content/themes/twentyten/loop-single.php
===================================================================
--- src/wp-content/themes/twentyten/loop-single.php	(revision 40901)
+++ src/wp-content/themes/twentyten/loop-single.php	(working copy)
@@ -15,7 +15,7 @@
  */
 ?>
 
-<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+<?php if ( have_posts() ) { while ( have_posts() ) : the_post(); ?>
 
 				<div id="nav-above" class="navigation">
 					<div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '&larr;', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
@@ -31,7 +31,10 @@
 
 					<div class="entry-content">
 						<?php the_content(); ?>
-						<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+						<?php wp_link_pages( array(
+							'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ),
+							'after' => '</div>',
+						) ); ?>
 					</div><!-- .entry-content -->
 
 <?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries  ?>
@@ -67,4 +70,6 @@
 
 				<?php comments_template( '', true ); ?>
 
-<?php endwhile; // end of the loop. ?>
+<?php endwhile;
+}; // End if().
+?>
Index: src/wp-content/themes/twentyten/loop.php
===================================================================
--- src/wp-content/themes/twentyten/loop.php	(revision 40901)
+++ src/wp-content/themes/twentyten/loop.php	(working copy)
@@ -73,17 +73,17 @@
 <?php else : ?>
 				<?php
 					$images = twentyten_get_gallery_images();
-					if ( $images ) :
-						$total_images = count( $images );
-						$image = reset( $images );
+				if ( $images ) :
+					$total_images = count( $images );
+					$image = reset( $images );
 				?>
-						<div class="gallery-thumb">
-							<a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo wp_get_attachment_image( $image, 'thumbnail' ); ?></a>
-						</div><!-- .gallery-thumb -->
-						<p><em><?php printf( _n( 'This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'twentyten' ),
-								'href="' . esc_url( get_permalink() ) . '" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) ) . '" rel="bookmark"',
-								number_format_i18n( $total_images )
-							); ?></em></p>
+				<div class="gallery-thumb">
+					<a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo wp_get_attachment_image( $image, 'thumbnail' ); ?></a>
+				</div><!-- .gallery-thumb -->
+				<p><em><?php printf( _n( 'This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'twentyten' ),
+					'href="' . esc_url( get_permalink() ) . '" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) ) . '" rel="bookmark"',
+					number_format_i18n( $total_images )
+					   ); ?></em></p>
 				<?php endif; // end twentyten_get_gallery_images() check ?>
 						<?php the_excerpt(); ?>
 <?php endif; ?>
@@ -104,7 +104,7 @@
 
 <?php /* How to display posts of the Aside format. The asides category is the old way. */ ?>
 
-	<?php elseif ( ( function_exists( 'get_post_format' ) && 'aside' == get_post_format( $post->ID ) ) || in_category( _x( 'asides', 'asides category slug', 'twentyten' ) )  ) : ?>
+	<?php elseif ( ( function_exists( 'get_post_format' ) && 'aside' == get_post_format( $post->ID ) ) || in_category( _x( 'asides', 'asides category slug', 'twentyten' ) ) ) : ?>
 		<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
 		<?php if ( is_archive() || is_search() ) : // Display excerpts for archives and search. ?>
@@ -142,7 +142,10 @@
 	<?php else : ?>
 			<div class="entry-content">
 				<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-				<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+				<?php wp_link_pages( array(
+					'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ),
+					'after' => '</div>',
+				) ); ?>
 			</div><!-- .entry-content -->
 	<?php endif; ?>
 
@@ -155,12 +158,12 @@
 				<?php endif; ?>
 				<?php
 					$tags_list = get_the_tag_list( '', ', ' );
-					if ( $tags_list ):
+				if ( $tags_list ) :
 				?>
-					<span class="tag-links">
-						<?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyten' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
-					</span>
-					<span class="meta-sep">|</span>
+				<span class="tag-links">
+				<?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyten' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
+				</span>
+				<span class="meta-sep">|</span>
 				<?php endif; ?>
 				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
 				<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
@@ -174,7 +177,7 @@
 <?php endwhile; // End the loop. Whew. ?>
 
 <?php /* Display navigation to next/previous pages when applicable */ ?>
-<?php if (  $wp_query->max_num_pages > 1 ) : ?>
+<?php if ( $wp_query->max_num_pages > 1 ) : ?>
 				<div id="nav-below" class="navigation">
 					<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' ) ); ?></div>
 					<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>
Index: src/wp-content/themes/twentyten/sidebar-footer.php
===================================================================
--- src/wp-content/themes/twentyten/sidebar-footer.php	(revision 40901)
+++ src/wp-content/themes/twentyten/sidebar-footer.php	(working copy)
@@ -15,12 +15,13 @@
 	 *
 	 * If none of the sidebars have widgets, then let's bail early.
 	 */
-	if (   ! is_active_sidebar( 'first-footer-widget-area'  )
+if ( ! is_active_sidebar( 'first-footer-widget-area' )
 		&& ! is_active_sidebar( 'second-footer-widget-area' )
-		&& ! is_active_sidebar( 'third-footer-widget-area'  )
+		&& ! is_active_sidebar( 'third-footer-widget-area' )
 		&& ! is_active_sidebar( 'fourth-footer-widget-area' )
-	)
-		return;
+	) {
+	return;
+}
 	// If we get this far, we have widgets. Let do this.
 ?>
 
Index: src/wp-content/themes/twentyten/sidebar.php
===================================================================
--- src/wp-content/themes/twentyten/sidebar.php	(revision 40901)
+++ src/wp-content/themes/twentyten/sidebar.php	(working copy)
@@ -18,7 +18,7 @@
 	 * then the sidebar simply doesn't exist, so we'll hard-code in
 	 * some default sidebar stuff just in case.
 	 */
-	if ( ! dynamic_sidebar( 'primary-widget-area' ) ) : ?>
+if ( ! dynamic_sidebar( 'primary-widget-area' ) ) : ?>
 
 			<li id="search" class="widget-container widget_search">
 				<?php get_search_form(); ?>
@@ -46,7 +46,7 @@
 
 <?php
 	// A second sidebar for widgets, just because.
-	if ( is_active_sidebar( 'secondary-widget-area' ) ) : ?>
+if ( is_active_sidebar( 'secondary-widget-area' ) ) : ?>
 
 		<div id="secondary" class="widget-area" role="complementary">
 			<ul class="xoxo">
Index: src/wp-content/themes/twentythirteen/404.php
===================================================================
--- src/wp-content/themes/twentythirteen/404.php	(revision 40901)
+++ src/wp-content/themes/twentythirteen/404.php	(working copy)
@@ -28,4 +28,4 @@
 		</div><!-- #content -->
 	</div><!-- #primary -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: src/wp-content/themes/twentythirteen/archive.php
===================================================================
--- src/wp-content/themes/twentythirteen/archive.php	(revision 40901)
+++ src/wp-content/themes/twentythirteen/archive.php	(working copy)
@@ -25,8 +25,8 @@
 		<?php if ( have_posts() ) : ?>
 			<header class="archive-header">
 				<h1 class="archive-title"><?php
-					if ( is_day() ) :
-						printf( __( 'Daily Archives: %s', 'twentythirteen' ), get_the_date() );
+				if ( is_day() ) :
+					printf( __( 'Daily Archives: %s', 'twentythirteen' ), get_the_date() );
 					elseif ( is_month() ) :
 						printf( __( 'Monthly Archives: %s', 'twentythirteen' ), get_the_date( _x( 'F Y', 'monthly archives date format', 'twentythirteen' ) ) );
 					elseif ( is_year() ) :
Index: src/wp-content/themes/twentythirteen/author-bio.php
===================================================================
--- src/wp-content/themes/twentythirteen/author-bio.php	(revision 40901)
+++ src/wp-content/themes/twentythirteen/author-bio.php	(working copy)
@@ -31,4 +31,4 @@
 			</a>
 		</p>
 	</div><!-- .author-description -->
-</div><!-- .author-info -->
\ No newline at end of file
+</div><!-- .author-info -->
Index: src/wp-content/themes/twentythirteen/comments.php
===================================================================
--- src/wp-content/themes/twentythirteen/comments.php	(revision 40901)
+++ src/wp-content/themes/twentythirteen/comments.php	(working copy)
@@ -13,8 +13,9 @@
  * If the current post is protected by a password and the visitor has not yet
  * entered the password we will return early without loading the comments.
  */
-if ( post_password_required() )
+if ( post_password_required() ) {
 	return;
+}
 ?>
 
 <div id="comments" class="comments-area">
@@ -23,7 +24,7 @@
 		<h2 class="comments-title">
 			<?php
 				printf( _nx( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title', 'twentythirteen' ),
-					number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
+				number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
 			?>
 		</h2>
 
@@ -39,12 +40,12 @@
 
 		<?php
 			// Are there comments to navigate through?
-			if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
+		if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
 		?>
 		<nav class="navigation comment-navigation" role="navigation">
-			<h1 class="screen-reader-text section-heading"><?php _e( 'Comment navigation', 'twentythirteen' ); ?></h1>
-			<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentythirteen' ) ); ?></div>
-			<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentythirteen' ) ); ?></div>
+		<h1 class="screen-reader-text section-heading"><?php _e( 'Comment navigation', 'twentythirteen' ); ?></h1>
+		<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentythirteen' ) ); ?></div>
+		<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentythirteen' ) ); ?></div>
 		</nav><!-- .comment-navigation -->
 		<?php endif; // Check for comment navigation ?>
 
@@ -56,4 +57,4 @@
 
 	<?php comment_form(); ?>
 
-</div><!-- #comments -->
\ No newline at end of file
+</div><!-- #comments -->
Index: src/wp-content/themes/twentythirteen/content.php
===================================================================
--- src/wp-content/themes/twentythirteen/content.php	(revision 40901)
+++ src/wp-content/themes/twentythirteen/content.php	(working copy)
@@ -45,7 +45,12 @@
 				the_title( '<span class="screen-reader-text">', '</span>', false )
 			) );
 
-			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+			wp_link_pages( array(
+				'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>',
+				'after' => '</div>',
+				'link_before' => '<span>',
+				'link_after' => '</span>',
+			) );
 		?>
 	</div><!-- .entry-content -->
 	<?php endif; ?>
Index: src/wp-content/themes/twentythirteen/footer.php
===================================================================
--- src/wp-content/themes/twentythirteen/footer.php	(revision 40901)
+++ src/wp-content/themes/twentythirteen/footer.php	(working copy)
@@ -23,4 +23,4 @@
 
 	<?php wp_footer(); ?>
 </body>
-</html>
\ No newline at end of file
+</html>
Index: src/wp-content/themes/twentythirteen/functions.php
===================================================================
--- src/wp-content/themes/twentythirteen/functions.php	(revision 40901)
+++ src/wp-content/themes/twentythirteen/functions.php	(working copy)
@@ -28,8 +28,9 @@
  *
  * @see twentythirteen_content_width() for template-specific adjustments.
  */
-if ( ! isset( $content_width ) )
+if ( ! isset( $content_width ) ) {
 	$content_width = 604;
+}
 
 /**
  * Add support for a custom header image.
@@ -39,8 +40,9 @@
 /**
  * Twenty Thirteen only works in WordPress 3.6 or later.
  */
-if ( version_compare( $GLOBALS['wp_version'], '3.6-alpha', '<' ) )
+if ( version_compare( $GLOBALS['wp_version'], '3.6-alpha', '<' ) ) {
 	require get_template_directory() . '/inc/back-compat.php';
+}
 
 /**
  * Twenty Thirteen setup.
@@ -82,7 +84,11 @@
 	 * and comments to output valid HTML5.
 	 */
 	add_theme_support( 'html5', array(
-		'search-form', 'comment-form', 'comment-list', 'gallery', 'caption'
+		'search-form',
+		'comment-form',
+		'comment-list',
+		'gallery',
+		'caption',
 	) );
 
 	/*
@@ -90,7 +96,15 @@
 	 * See https://codex.wordpress.org/Post_Formats
 	 */
 	add_theme_support( 'post-formats', array(
-		'aside', 'audio', 'chat', 'gallery', 'image', 'link', 'quote', 'status', 'video'
+		'aside',
+		'audio',
+		'chat',
+		'gallery',
+		'image',
+		'link',
+		'quote',
+		'status',
+		'video',
 	) );
 
 	// This theme uses wp_nav_menu() in one location.
@@ -139,11 +153,13 @@
 	if ( 'off' !== $source_sans_pro || 'off' !== $bitter ) {
 		$font_families = array();
 
-		if ( 'off' !== $source_sans_pro )
+		if ( 'off' !== $source_sans_pro ) {
 			$font_families[] = 'Source Sans Pro:300,400,700,300italic,400italic,700italic';
+		}
 
-		if ( 'off' !== $bitter )
+		if ( 'off' !== $bitter ) {
 			$font_families[] = 'Bitter:400,700';
+		}
 
 		$query_args = array(
 			'family' => urlencode( implode( '|', $font_families ) ),
@@ -165,12 +181,14 @@
 	 * Adds JavaScript to pages with the comment form to support
 	 * sites with threaded comments (when in use).
 	 */
-	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
+	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
 		wp_enqueue_script( 'comment-reply' );
+	}
 
 	// Adds Masonry to handle vertical alignment of footer widgets.
-	if ( is_active_sidebar( 'sidebar-1' ) )
+	if ( is_active_sidebar( 'sidebar-1' ) ) {
 		wp_enqueue_script( 'jquery-masonry' );
+	}
 
 	// Loads JavaScript file with functionality specific to Twenty Thirteen.
 	wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20160717', true );
@@ -230,20 +248,23 @@
 function twentythirteen_wp_title( $title, $sep ) {
 	global $paged, $page;
 
-	if ( is_feed() )
+	if ( is_feed() ) {
 		return $title;
+	}
 
 	// Add the site name.
 	$title .= get_bloginfo( 'name', 'display' );
 
 	// Add the site description for the home/front page.
 	$site_description = get_bloginfo( 'description', 'display' );
-	if ( $site_description && ( is_home() || is_front_page() ) )
+	if ( $site_description && ( is_home() || is_front_page() ) ) {
 		$title = "$title $sep $site_description";
+	}
 
 	// Add a page number if necessary.
-	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() )
+	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
 		$title = "$title $sep " . sprintf( __( 'Page %s', 'twentythirteen' ), max( $paged, $page ) );
+	}
 
 	return $title;
 }
@@ -278,19 +299,20 @@
 add_action( 'widgets_init', 'twentythirteen_widgets_init' );
 
 if ( ! function_exists( 'twentythirteen_paging_nav' ) ) :
-/**
+	/**
  * Display navigation to next/previous set of posts when applicable.
  *
  * @since Twenty Thirteen 1.0
  */
-function twentythirteen_paging_nav() {
-	global $wp_query;
+	function twentythirteen_paging_nav() {
+		global $wp_query;
 
-	// Don't print empty markup if there's only one page.
-	if ( $wp_query->max_num_pages < 2 )
-		return;
-	?>
-	<nav class="navigation paging-navigation" role="navigation">
+		// Don't print empty markup if there's only one page.
+		if ( $wp_query->max_num_pages < 2 ) {
+			return;
+		}
+		?>
+		<nav class="navigation paging-navigation" role="navigation">
 		<h1 class="screen-reader-text"><?php _e( 'Posts navigation', 'twentythirteen' ); ?></h1>
 		<div class="nav-links">
 
@@ -303,28 +325,29 @@
 			<?php endif; ?>
 
 		</div><!-- .nav-links -->
-	</nav><!-- .navigation -->
-	<?php
-}
+		</nav><!-- .navigation -->
+		<?php
+	}
 endif;
 
 if ( ! function_exists( 'twentythirteen_post_nav' ) ) :
-/**
+	/**
  * Display navigation to next/previous post when applicable.
  *
  * @since Twenty Thirteen 1.0
  */
-function twentythirteen_post_nav() {
-	global $post;
+	function twentythirteen_post_nav() {
+		global $post;
 
-	// Don't print empty markup if there's nowhere to navigate.
-	$previous = ( is_attachment() ) ? get_post( $post->post_parent ) : get_adjacent_post( false, '', true );
-	$next     = get_adjacent_post( false, '', false );
-
-	if ( ! $next && ! $previous )
-		return;
-	?>
-	<nav class="navigation post-navigation" role="navigation">
+		// Don't print empty markup if there's nowhere to navigate.
+		$previous = ( is_attachment() ) ? get_post( $post->post_parent ) : get_adjacent_post( false, '', true );
+		$next     = get_adjacent_post( false, '', false );
+
+		if ( ! $next && ! $previous ) {
+			return;
+		}
+		?>
+		<nav class="navigation post-navigation" role="navigation">
 		<h1 class="screen-reader-text"><?php _e( 'Post navigation', 'twentythirteen' ); ?></h1>
 		<div class="nav-links">
 
@@ -332,51 +355,53 @@
 			<?php next_post_link( '%link', _x( '%title <span class="meta-nav">&rarr;</span>', 'Next post link', 'twentythirteen' ) ); ?>
 
 		</div><!-- .nav-links -->
-	</nav><!-- .navigation -->
-	<?php
-}
+		</nav><!-- .navigation -->
+		<?php
+	}
 endif;
 
 if ( ! function_exists( 'twentythirteen_entry_meta' ) ) :
-/**
+	/**
  * Print HTML with meta information for current post: categories, tags, permalink, author, and date.
  *
  * Create your own twentythirteen_entry_meta() to override in a child theme.
  *
  * @since Twenty Thirteen 1.0
  */
-function twentythirteen_entry_meta() {
-	if ( is_sticky() && is_home() && ! is_paged() )
-		echo '<span class="featured-post">' . esc_html__( 'Sticky', 'twentythirteen' ) . '</span>';
-
-	if ( ! has_post_format( 'link' ) && 'post' == get_post_type() )
-		twentythirteen_entry_date();
-
-	// Translators: used between list items, there is a space after the comma.
-	$categories_list = get_the_category_list( __( ', ', 'twentythirteen' ) );
-	if ( $categories_list ) {
-		echo '<span class="categories-links">' . $categories_list . '</span>';
-	}
-
-	// Translators: used between list items, there is a space after the comma.
-	$tag_list = get_the_tag_list( '', __( ', ', 'twentythirteen' ) );
-	if ( $tag_list ) {
-		echo '<span class="tags-links">' . $tag_list . '</span>';
-	}
-
-	// Post author
-	if ( 'post' == get_post_type() ) {
-		printf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
-			esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-			esc_attr( sprintf( __( 'View all posts by %s', 'twentythirteen' ), get_the_author() ) ),
-			get_the_author()
-		);
+	function twentythirteen_entry_meta() {
+		if ( is_sticky() && is_home() && ! is_paged() ) {
+			echo '<span class="featured-post">' . esc_html__( 'Sticky', 'twentythirteen' ) . '</span>';
+		}
+
+		if ( ! has_post_format( 'link' ) && 'post' == get_post_type() ) {
+			twentythirteen_entry_date();
+		}
+
+		// Translators: used between list items, there is a space after the comma.
+		$categories_list = get_the_category_list( __( ', ', 'twentythirteen' ) );
+		if ( $categories_list ) {
+			echo '<span class="categories-links">' . $categories_list . '</span>';
+		}
+
+		// Translators: used between list items, there is a space after the comma.
+		$tag_list = get_the_tag_list( '', __( ', ', 'twentythirteen' ) );
+		if ( $tag_list ) {
+			echo '<span class="tags-links">' . $tag_list . '</span>';
+		}
+
+		// Post author
+		if ( 'post' == get_post_type() ) {
+			printf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
+				esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+				esc_attr( sprintf( __( 'View all posts by %s', 'twentythirteen' ), get_the_author() ) ),
+				get_the_author()
+			);
+		}
 	}
-}
 endif;
 
 if ( ! function_exists( 'twentythirteen_entry_date' ) ) :
-/**
+	/**
  * Print HTML with date information for current post.
  *
  * Create your own twentythirteen_entry_date() to override in a child theme.
@@ -386,34 +411,35 @@
  * @param boolean $echo (optional) Whether to echo the date. Default true.
  * @return string The HTML-formatted post date.
  */
-function twentythirteen_entry_date( $echo = true ) {
-	if ( has_post_format( array( 'chat', 'status' ) ) )
-		$format_prefix = _x( '%1$s on %2$s', '1: post format name. 2: date', 'twentythirteen' );
-	else
-		$format_prefix = '%2$s';
-
-	$date = sprintf( '<span class="date"><a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a></span>',
-		esc_url( get_permalink() ),
-		esc_attr( sprintf( __( 'Permalink to %s', 'twentythirteen' ), the_title_attribute( 'echo=0' ) ) ),
-		esc_attr( get_the_date( 'c' ) ),
-		esc_html( sprintf( $format_prefix, get_post_format_string( get_post_format() ), get_the_date() ) )
-	);
+	function twentythirteen_entry_date( $echo = true ) {
+		if ( has_post_format( array( 'chat', 'status' ) ) ) {
+			$format_prefix = _x( '%1$s on %2$s', '1: post format name. 2: date', 'twentythirteen' );
+		} else { $format_prefix = '%2$s';
+		}
 
-	if ( $echo )
-		echo $date;
+		$date = sprintf( '<span class="date"><a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a></span>',
+			esc_url( get_permalink() ),
+			esc_attr( sprintf( __( 'Permalink to %s', 'twentythirteen' ), the_title_attribute( 'echo=0' ) ) ),
+			esc_attr( get_the_date( 'c' ) ),
+			esc_html( sprintf( $format_prefix, get_post_format_string( get_post_format() ), get_the_date() ) )
+		);
 
-	return $date;
-}
+		if ( $echo ) {
+			echo $date;
+		}
+
+			return $date;
+	}
 endif;
 
 if ( ! function_exists( 'twentythirteen_the_attached_image' ) ) :
-/**
+	/**
  * Print the attached image with a link to the next attached image.
  *
  * @since Twenty Thirteen 1.0
  */
-function twentythirteen_the_attached_image() {
-	/**
+	function twentythirteen_the_attached_image() {
+		/**
 	 * Filter the image attachment size to use.
 	 *
 	 * @since Twenty thirteen 1.0
@@ -423,51 +449,52 @@
 	 *     @type int The attachment width in pixels.
 	 * }
 	 */
-	$attachment_size     = apply_filters( 'twentythirteen_attachment_size', array( 724, 724 ) );
-	$next_attachment_url = wp_get_attachment_url();
-	$post                = get_post();
+		$attachment_size     = apply_filters( 'twentythirteen_attachment_size', array( 724, 724 ) );
+		$next_attachment_url = wp_get_attachment_url();
+		$post                = get_post();
+
+		/*
+		 * Grab the IDs of all the image attachments in a gallery so we can get the URL
+		 * of the next adjacent image in a gallery, or the first image (if we're
+		 * looking at the last image in a gallery), or, in a gallery of one, just the
+		 * link to that image file.
+		 */
+		$attachment_ids = get_posts( array(
+			'post_parent'    => $post->post_parent,
+			'fields'         => 'ids',
+			'numberposts'    => -1,
+			'post_status'    => 'inherit',
+			'post_type'      => 'attachment',
+			'post_mime_type' => 'image',
+			'order'          => 'ASC',
+			'orderby'        => 'menu_order ID',
+		) );
 
-	/*
-	 * Grab the IDs of all the image attachments in a gallery so we can get the URL
-	 * of the next adjacent image in a gallery, or the first image (if we're
-	 * looking at the last image in a gallery), or, in a gallery of one, just the
-	 * link to that image file.
-	 */
-	$attachment_ids = get_posts( array(
-		'post_parent'    => $post->post_parent,
-		'fields'         => 'ids',
-		'numberposts'    => -1,
-		'post_status'    => 'inherit',
-		'post_type'      => 'attachment',
-		'post_mime_type' => 'image',
-		'order'          => 'ASC',
-		'orderby'        => 'menu_order ID',
-	) );
+			// If there is more than 1 attachment in a gallery...
+		if ( count( $attachment_ids ) > 1 ) {
+			foreach ( $attachment_ids as $idx => $attachment_id ) {
+				if ( $attachment_id == $post->ID ) {
+					$next_id = $attachment_ids[ ( $idx + 1 ) % count( $attachment_ids ) ];
+					break;
+				}
+			}
 
-	// If there is more than 1 attachment in a gallery...
-	if ( count( $attachment_ids ) > 1 ) {
-		foreach ( $attachment_ids as $idx => $attachment_id ) {
-			if ( $attachment_id == $post->ID ) {
-				$next_id = $attachment_ids[ ( $idx + 1 ) % count( $attachment_ids ) ];
-				break;
+			// get the URL of the next image attachment...
+			if ( $next_id ) {
+				$next_attachment_url = get_attachment_link( $next_id );
+			} // End if().
+			else { 					$next_attachment_url = get_attachment_link( reset( $attachment_ids ) );
 			}
 		}
 
-		// get the URL of the next image attachment...
-		if ( $next_id )
-			$next_attachment_url = get_attachment_link( $next_id );
-
-		// or get the URL of the first image attachment.
-		else
-			$next_attachment_url = get_attachment_link( reset( $attachment_ids ) );
+			printf( '<a href="%1$s" title="%2$s" rel="attachment">%3$s</a>',
+				esc_url( $next_attachment_url ),
+				the_title_attribute( array(
+					'echo' => false,
+				) ),
+				wp_get_attachment_image( $post->ID, $attachment_size )
+			);
 	}
-
-	printf( '<a href="%1$s" title="%2$s" rel="attachment">%3$s</a>',
-		esc_url( $next_attachment_url ),
-		the_title_attribute( array( 'echo' => false ) ),
-		wp_get_attachment_image( $post->ID, $attachment_size )
-	);
-}
 endif;
 
 /**
@@ -490,7 +517,7 @@
 }
 
 if ( ! function_exists( 'twentythirteen_excerpt_more' ) && ! is_admin() ) :
-/**
+	/**
  * Replaces "[...]" (appended to automatically generated excerpts) with ...
  * and a Continue reading link.
  *
@@ -499,15 +526,15 @@
  * @param string $more Default Read More excerpt link.
  * @return string Filtered Read More excerpt link.
  */
-function twentythirteen_excerpt_more( $more ) {
-	$link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
-		esc_url( get_permalink( get_the_ID() ) ),
+	function twentythirteen_excerpt_more( $more ) {
+		$link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
+			esc_url( get_permalink( get_the_ID() ) ),
 			/* translators: %s: Name of current post */
 			sprintf( __( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ), '<span class="screen-reader-text">' . get_the_title( get_the_ID() ) . '</span>' )
 		);
-	return ' &hellip; ' . $link;
-}
-add_filter( 'excerpt_more', 'twentythirteen_excerpt_more' );
+			return ' &hellip; ' . $link;
+	}
+	add_filter( 'excerpt_more', 'twentythirteen_excerpt_more' );
 endif;
 
 /**
@@ -524,14 +551,17 @@
  * @return array The filtered body class list.
  */
 function twentythirteen_body_class( $classes ) {
-	if ( ! is_multi_author() )
+	if ( ! is_multi_author() ) {
 		$classes[] = 'single-author';
+	}
 
-	if ( is_active_sidebar( 'sidebar-2' ) && ! is_attachment() && ! is_404() )
+	if ( is_active_sidebar( 'sidebar-2' ) && ! is_attachment() && ! is_404() ) {
 		$classes[] = 'sidebar';
+	}
 
-	if ( ! get_option( 'show_avatars' ) )
+	if ( ! get_option( 'show_avatars' ) ) {
 		$classes[] = 'no-avatars';
+	}
 
 	return $classes;
 }
@@ -545,10 +575,11 @@
 function twentythirteen_content_width() {
 	global $content_width;
 
-	if ( is_attachment() )
+	if ( is_attachment() ) {
 		$content_width = 724;
-	elseif ( has_post_format( 'audio' ) )
+	} elseif ( has_post_format( 'audio' ) ) {
 		$content_width = 484;
+	}
 }
 add_action( 'template_redirect', 'twentythirteen_content_width' );
 
Index: src/wp-content/themes/twentythirteen/image.php
===================================================================
--- src/wp-content/themes/twentythirteen/image.php	(revision 40901)
+++ src/wp-content/themes/twentythirteen/image.php	(working copy)
@@ -16,64 +16,68 @@
 
 			<?php
 				// Start the Loop.
-				while ( have_posts() ) : the_post();
+			while ( have_posts() ) : the_post();
 			?>
 
 			<article id="post-<?php the_ID(); ?>" <?php post_class( 'image-attachment' ); ?>>
-				<header class="entry-header">
-					<h1 class="entry-title"><?php the_title(); ?></h1>
+			<header class="entry-header">
+			<h1 class="entry-title"><?php the_title(); ?></h1>
 
-					<div class="entry-meta">
-						<?php
-							$published_text = __( '<span class="attachment-meta">Published on <time class="entry-date" datetime="%1$s">%2$s</time> in <a href="%3$s" title="Return to %4$s" rel="gallery">%5$s</a></span>', 'twentythirteen' );
-							$post_title = get_the_title( $post->post_parent );
-							if ( empty( $post_title ) || 0 == $post->post_parent )
-								$published_text = '<span class="attachment-meta"><time class="entry-date" datetime="%1$s">%2$s</time></span>';
-
-							printf( $published_text,
-								esc_attr( get_the_date( 'c' ) ),
-								esc_html( get_the_date() ),
-								esc_url( get_permalink( $post->post_parent ) ),
-								esc_attr( strip_tags( $post_title ) ),
-								$post_title
-							);
-
-							$metadata = wp_get_attachment_metadata();
-							printf( '<span class="attachment-meta full-size-link"><a href="%1$s" title="%2$s">%3$s (%4$s &times; %5$s)</a></span>',
-								esc_url( wp_get_attachment_url() ),
-								esc_attr__( 'Link to full-size image', 'twentythirteen' ),
-								__( 'Full resolution', 'twentythirteen' ),
-								$metadata['width'],
-								$metadata['height']
-							);
-
-							edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' );
-						?>
-					</div><!-- .entry-meta -->
+			<div class="entry-meta">
+				<?php
+					$published_text = __( '<span class="attachment-meta">Published on <time class="entry-date" datetime="%1$s">%2$s</time> in <a href="%3$s" title="Return to %4$s" rel="gallery">%5$s</a></span>', 'twentythirteen' );
+					$post_title = get_the_title( $post->post_parent );
+				if ( empty( $post_title ) || 0 == $post->post_parent ) {
+					$published_text = '<span class="attachment-meta"><time class="entry-date" datetime="%1$s">%2$s</time></span>';
+				}
+
+					printf( $published_text,
+						esc_attr( get_the_date( 'c' ) ),
+						esc_html( get_the_date() ),
+						esc_url( get_permalink( $post->post_parent ) ),
+						esc_attr( strip_tags( $post_title ) ),
+						$post_title
+					);
+
+					$metadata = wp_get_attachment_metadata();
+					printf( '<span class="attachment-meta full-size-link"><a href="%1$s" title="%2$s">%3$s (%4$s &times; %5$s)</a></span>',
+						esc_url( wp_get_attachment_url() ),
+						esc_attr__( 'Link to full-size image', 'twentythirteen' ),
+						__( 'Full resolution', 'twentythirteen' ),
+						$metadata['width'],
+						$metadata['height']
+					);
+
+					edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' );
+				?>
+				</div><!-- .entry-meta -->
 				</header><!-- .entry-header -->
 
 				<div class="entry-content">
-					<nav id="image-navigation" class="navigation image-navigation" role="navigation">
-						<span class="nav-previous"><?php previous_image_link( false, __( '<span class="meta-nav">&larr;</span> Previous', 'twentythirteen' ) ); ?></span>
-						<span class="nav-next"><?php next_image_link( false, __( 'Next <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?></span>
+				<nav id="image-navigation" class="navigation image-navigation" role="navigation">
+				<span class="nav-previous"><?php previous_image_link( false, __( '<span class="meta-nav">&larr;</span> Previous', 'twentythirteen' ) ); ?></span>
+					<span class="nav-next"><?php next_image_link( false, __( 'Next <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?></span>
 					</nav><!-- #image-navigation -->
 
 					<div class="entry-attachment">
-						<div class="attachment">
-							<?php twentythirteen_the_attached_image(); ?>
+					<div class="attachment">
+					<?php twentythirteen_the_attached_image(); ?>
 
-							<?php if ( has_excerpt() ) : ?>
+					<?php if ( has_excerpt() ) : ?>
 							<div class="entry-caption">
 								<?php the_excerpt(); ?>
 							</div>
 							<?php endif; ?>
-						</div><!-- .attachment -->
+					</div><!-- .attachment -->
 					</div><!-- .entry-attachment -->
 
 					<?php if ( ! empty( $post->post_content ) ) : ?>
 					<div class="entry-description">
 						<?php the_content(); ?>
-						<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentythirteen' ), 'after' => '</div>' ) ); ?>
+						<?php wp_link_pages( array(
+							'before' => '<div class="page-links">' . __( 'Pages:', 'twentythirteen' ),
+							'after' => '</div>',
+						) ); ?>
 					</div><!-- .entry-description -->
 					<?php endif; ?>
 
Index: src/wp-content/themes/twentythirteen/inc/custom-header.php
===================================================================
--- src/wp-content/themes/twentythirteen/inc/custom-header.php	(revision 40901)
+++ src/wp-content/themes/twentythirteen/inc/custom-header.php	(working copy)
@@ -46,17 +46,17 @@
 		'circle' => array(
 			'url'           => '%s/images/headers/circle.png',
 			'thumbnail_url' => '%s/images/headers/circle-thumbnail.png',
-			'description'   => _x( 'Circle', 'header image description', 'twentythirteen' )
+			'description'   => _x( 'Circle', 'header image description', 'twentythirteen' ),
 		),
 		'diamond' => array(
 			'url'           => '%s/images/headers/diamond.png',
 			'thumbnail_url' => '%s/images/headers/diamond-thumbnail.png',
-			'description'   => _x( 'Diamond', 'header image description', 'twentythirteen' )
+			'description'   => _x( 'Diamond', 'header image description', 'twentythirteen' ),
 		),
 		'star' => array(
 			'url'           => '%s/images/headers/star.png',
 			'thumbnail_url' => '%s/images/headers/star-thumbnail.png',
-			'description'   => _x( 'Star', 'header image description', 'twentythirteen' )
+			'description'   => _x( 'Star', 'header image description', 'twentythirteen' ),
 		),
 	) );
 }
@@ -88,51 +88,52 @@
 	$text_color   = get_header_textcolor();
 
 	// If no custom options for text are set, let's bail.
-	if ( empty( $header_image ) && $text_color == get_theme_support( 'custom-header', 'default-text-color' ) )
+	if ( empty( $header_image ) && $text_color == get_theme_support( 'custom-header', 'default-text-color' ) ) {
 		return;
+	}
 
 	// If we get this far, we have custom styles.
 	?>
 	<style type="text/css" id="twentythirteen-header-css">
 	<?php
-		if ( ! empty( $header_image ) ) :
+	if ( ! empty( $header_image ) ) :
 	?>
-		.site-header {
-			background: url(<?php header_image(); ?>) no-repeat scroll top;
-			background-size: 1600px auto;
-		}
-		@media (max-width: 767px) {
-			.site-header {
-				background-size: 768px auto;
-			}
-		}
-		@media (max-width: 359px) {
-			.site-header {
-				background-size: 360px auto;
-			}
-		}
+	.site-header {
+	background: url(<?php header_image(); ?>) no-repeat scroll top;
+	background-size: 1600px auto;
+	}
+	@media (max-width: 767px) {
+	.site-header {
+		background-size: 768px auto;
+	}
+	}
+	@media (max-width: 359px) {
+	.site-header {
+		background-size: 360px auto;
+	}
+	}
 	<?php
 		endif;
 
 		// Has the text been hidden?
-		if ( ! display_header_text() ) :
+	if ( ! display_header_text() ) :
 	?>
-		.site-title,
-		.site-description {
-			position: absolute;
-			clip: rect(1px 1px 1px 1px); /* IE7 */
-			clip: rect(1px, 1px, 1px, 1px);
-		}
+	.site-title,
+	.site-description {
+	position: absolute;
+	clip: rect(1px 1px 1px 1px); /* IE7 */
+	clip: rect(1px, 1px, 1px, 1px);
+	}
 	<?php
-			if ( empty( $header_image ) ) :
+	if ( empty( $header_image ) ) :
 	?>
-		.site-header .home-link {
-			min-height: 0;
-		}
+.site-header .home-link {
+	min-height: 0;
+}
 	<?php
-			endif;
+	endif;
 
-		// If the user has set a custom color for the text, use that.
+	// If the user has set a custom color for the text, use that.
 		elseif ( $text_color != get_theme_support( 'custom-header', 'default-text-color' ) ) :
 	?>
 		.site-title,
Index: src/wp-content/themes/twentythirteen/page.php
===================================================================
--- src/wp-content/themes/twentythirteen/page.php	(revision 40901)
+++ src/wp-content/themes/twentythirteen/page.php	(working copy)
@@ -32,7 +32,12 @@
 
 					<div class="entry-content">
 						<?php the_content(); ?>
-						<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
+						<?php wp_link_pages( array(
+							'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>',
+							'after' => '</div>',
+							'link_before' => '<span>',
+							'link_after' => '</span>',
+						) ); ?>
 					</div><!-- .entry-content -->
 
 					<footer class="entry-meta">
@@ -47,4 +52,4 @@
 	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: src/wp-content/themes/twentythirteen/search.php
===================================================================
--- src/wp-content/themes/twentythirteen/search.php	(revision 40901)
+++ src/wp-content/themes/twentythirteen/search.php	(working copy)
@@ -33,4 +33,4 @@
 	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: src/wp-content/themes/twentythirteen/sidebar-main.php
===================================================================
--- src/wp-content/themes/twentythirteen/sidebar-main.php	(revision 40901)
+++ src/wp-content/themes/twentythirteen/sidebar-main.php	(working copy)
@@ -15,4 +15,4 @@
 			<?php dynamic_sidebar( 'sidebar-1' ); ?>
 		</div><!-- .widget-area -->
 	</div><!-- #secondary -->
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
Index: src/wp-content/themes/twentythirteen/sidebar.php
===================================================================
--- src/wp-content/themes/twentythirteen/sidebar.php	(revision 40901)
+++ src/wp-content/themes/twentythirteen/sidebar.php	(working copy)
@@ -19,4 +19,4 @@
 			</div><!-- .widget-area -->
 		</div><!-- .sidebar-inner -->
 	</div><!-- #tertiary -->
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
Index: src/wp-content/themes/twentythirteen/single.php
===================================================================
--- src/wp-content/themes/twentythirteen/single.php	(revision 40901)
+++ src/wp-content/themes/twentythirteen/single.php	(working copy)
@@ -25,4 +25,4 @@
 	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: src/wp-content/themes/twentytwelve/404.php
===================================================================
--- src/wp-content/themes/twentytwelve/404.php	(revision 40901)
+++ src/wp-content/themes/twentytwelve/404.php	(working copy)
@@ -26,4 +26,4 @@
 		</div><!-- #content -->
 	</div><!-- #primary -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: src/wp-content/themes/twentytwelve/archive.php
===================================================================
--- src/wp-content/themes/twentytwelve/archive.php	(revision 40901)
+++ src/wp-content/themes/twentytwelve/archive.php	(working copy)
@@ -25,8 +25,8 @@
 		<?php if ( have_posts() ) : ?>
 			<header class="archive-header">
 				<h1 class="archive-title"><?php
-					if ( is_day() ) :
-						printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' );
+				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() ) :
Index: src/wp-content/themes/twentytwelve/comments.php
===================================================================
--- src/wp-content/themes/twentytwelve/comments.php	(revision 40901)
+++ src/wp-content/themes/twentytwelve/comments.php	(working copy)
@@ -17,8 +17,9 @@
  * the visitor has not yet entered the password we will
  * return early without loading the comments.
  */
-if ( post_password_required() )
+if ( post_password_required() ) {
 	return;
+}
 ?>
 
 <div id="comments" class="comments-area">
@@ -29,12 +30,15 @@
 		<h2 class="comments-title">
 			<?php
 				printf( _n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentytwelve' ),
-					number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
+				number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
 			?>
 		</h2>
 
 		<ol class="commentlist">
-			<?php wp_list_comments( array( 'callback' => 'twentytwelve_comment', 'style' => 'ol' ) ); ?>
+			<?php wp_list_comments( array(
+				'callback' => 'twentytwelve_comment',
+				'style' => 'ol',
+			) ); ?>
 		</ol><!-- .commentlist -->
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
@@ -57,4 +61,4 @@
 
 	<?php comment_form(); ?>
 
-</div><!-- #comments .comments-area -->
\ No newline at end of file
+</div><!-- #comments .comments-area -->
Index: src/wp-content/themes/twentytwelve/footer.php
===================================================================
--- src/wp-content/themes/twentytwelve/footer.php	(revision 40901)
+++ src/wp-content/themes/twentytwelve/footer.php	(working copy)
@@ -20,4 +20,4 @@
 
 <?php wp_footer(); ?>
 </body>
-</html>
\ No newline at end of file
+</html>
Index: src/wp-content/themes/twentytwelve/functions.php
===================================================================
--- src/wp-content/themes/twentytwelve/functions.php	(revision 40901)
+++ src/wp-content/themes/twentytwelve/functions.php	(working copy)
@@ -23,8 +23,9 @@
  */
 
 // Set up the content width value based on the theme's design and stylesheet.
-if ( ! isset( $content_width ) )
+if ( ! isset( $content_width ) ) {
 	$content_width = 625;
+}
 
 /**
  * Twenty Twelve setup.
@@ -109,12 +110,13 @@
 		 */
 		$subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' );
 
-		if ( 'cyrillic' == $subset )
+		if ( 'cyrillic' == $subset ) {
 			$subsets .= ',cyrillic,cyrillic-ext';
-		elseif ( 'greek' == $subset )
+		} elseif ( 'greek' == $subset ) {
 			$subsets .= ',greek,greek-ext';
-		elseif ( 'vietnamese' == $subset )
+		} elseif ( 'vietnamese' == $subset ) {
 			$subsets .= ',vietnamese';
+		}
 
 		$query_args = array(
 			'family' => 'Open+Sans:400italic,700italic,400,700',
@@ -138,15 +140,17 @@
 	 * Adds JavaScript to pages with the comment form to support
 	 * sites with threaded comments (when in use).
 	 */
-	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
+	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
 		wp_enqueue_script( 'comment-reply' );
+	}
 
 	// Adds JavaScript for handling the navigation menu hide-and-show behavior.
 	wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'jquery' ), '20140711', true );
 
 	$font_url = twentytwelve_get_font_url();
-	if ( ! empty( $font_url ) )
+	if ( ! empty( $font_url ) ) {
 		wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), null );
+	}
 
 	// Loads our main stylesheet.
 	wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
@@ -197,11 +201,13 @@
 function twentytwelve_mce_css( $mce_css ) {
 	$font_url = twentytwelve_get_font_url();
 
-	if ( empty( $font_url ) )
+	if ( empty( $font_url ) ) {
 		return $mce_css;
+	}
 
-	if ( ! empty( $mce_css ) )
+	if ( ! empty( $mce_css ) ) {
 		$mce_css .= ',';
+	}
 
 	$mce_css .= esc_url_raw( str_replace( ',', '%2C', $font_url ) );
 
@@ -224,20 +230,23 @@
 function twentytwelve_wp_title( $title, $sep ) {
 	global $paged, $page;
 
-	if ( is_feed() )
+	if ( is_feed() ) {
 		return $title;
+	}
 
 	// Add the site name.
 	$title .= get_bloginfo( 'name', 'display' );
 
 	// Add the site description for the home/front page.
 	$site_description = get_bloginfo( 'description', 'display' );
-	if ( $site_description && ( is_home() || is_front_page() ) )
+	if ( $site_description && ( is_home() || is_front_page() ) ) {
 		$title = "$title $sep $site_description";
+	}
 
 	// Add a page number if necessary.
-	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() )
+	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
 		$title = "$title $sep " . sprintf( __( 'Page %s', 'twentytwelve' ), max( $paged, $page ) );
+	}
 
 	return $title;
 }
@@ -251,8 +260,9 @@
  * @since Twenty Twelve 1.0
  */
 function twentytwelve_page_menu_args( $args ) {
-	if ( ! isset( $args['show_home'] ) )
+	if ( ! isset( $args['show_home'] ) ) {
 		$args['show_home'] = true;
+	}
 	return $args;
 }
 add_filter( 'wp_page_menu_args', 'twentytwelve_page_menu_args' );
@@ -298,26 +308,26 @@
 add_action( 'widgets_init', 'twentytwelve_widgets_init' );
 
 if ( ! function_exists( 'twentytwelve_content_nav' ) ) :
-/**
+	/**
  * Displays navigation to next/previous pages when applicable.
  *
  * @since Twenty Twelve 1.0
  */
-function twentytwelve_content_nav( $html_id ) {
-	global $wp_query;
+	function twentytwelve_content_nav( $html_id ) {
+		global $wp_query;
 
-	if ( $wp_query->max_num_pages > 1 ) : ?>
-		<nav id="<?php echo esc_attr( $html_id ); ?>" class="navigation" role="navigation">
-			<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>
-		</nav><!-- .navigation -->
-	<?php endif;
-}
+		if ( $wp_query->max_num_pages > 1 ) : ?>
+			<nav id="<?php echo esc_attr( $html_id ); ?>" class="navigation" role="navigation">
+				<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>
+			</nav><!-- .navigation -->
+		<?php endif;
+	}
 endif;
 
 if ( ! function_exists( 'twentytwelve_comment' ) ) :
-/**
+	/**
  * Template for comments and pingbacks.
  *
  * To override this walker in a child theme without modifying the comments template
@@ -327,22 +337,22 @@
  *
  * @since Twenty Twelve 1.0
  */
-function twentytwelve_comment( $comment, $args, $depth ) {
-	$GLOBALS['comment'] = $comment;
-	switch ( $comment->comment_type ) :
-		case 'pingback' :
-		case 'trackback' :
-		// Display trackbacks differently than normal comments.
-	?>
-	<li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>">
+	function twentytwelve_comment( $comment, $args, $depth ) {
+		$GLOBALS['comment'] = $comment;
+		switch ( $comment->comment_type ) :
+			case 'pingback' :
+			case 'trackback' :
+				// Display trackbacks differently than normal comments.
+		?>
+		<li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>">
 		<p><?php _e( 'Pingback:', 'twentytwelve' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( '(Edit)', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?></p>
 	<?php
 			break;
-		default :
-		// Proceed with normal comments.
-		global $post;
-	?>
-	<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
+			default :
+				// Proceed with normal comments.
+				global $post;
+		?>
+		<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
 		<article id="comment-<?php comment_ID(); ?>" class="comment">
 			<header class="comment-meta comment-author vcard">
 				<?php
@@ -358,30 +368,35 @@
 						/* translators: 1: date, 2: time */
 						sprintf( __( '%1$s at %2$s', 'twentytwelve' ), get_comment_date(), get_comment_time() )
 					);
-				?>
-			</header><!-- .comment-meta -->
+					?>
+				</header><!-- .comment-meta -->
 
-			<?php if ( '0' == $comment->comment_approved ) : ?>
+				<?php if ( '0' == $comment->comment_approved ) : ?>
 				<p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentytwelve' ); ?></p>
 			<?php endif; ?>
 
-			<section class="comment-content comment">
+				<section class="comment-content comment">
 				<?php comment_text(); ?>
 				<?php edit_comment_link( __( 'Edit', 'twentytwelve' ), '<p class="edit-link">', '</p>' ); ?>
-			</section><!-- .comment-content -->
+				</section><!-- .comment-content -->
 
-			<div class="reply">
-				<?php comment_reply_link( array_merge( $args, array( 'reply_text' => __( 'Reply', 'twentytwelve' ), 'after' => ' <span>&darr;</span>', 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
-			</div><!-- .reply -->
-		</article><!-- #comment-## -->
-	<?php
+				<div class="reply">
+				<?php comment_reply_link( array_merge( $args, array(
+					'reply_text' => __( 'Reply', 'twentytwelve' ),
+					'after' => ' <span>&darr;</span>',
+					'depth' => $depth,
+					'max_depth' => $args['max_depth'],
+				) ) ); ?>
+				</div><!-- .reply -->
+			</article><!-- #comment-## -->
+		<?php
 		break;
-	endswitch; // end comment_type check
-}
+			endswitch; // end comment_type check
+	}
 endif;
 
 if ( ! function_exists( 'twentytwelve_entry_meta' ) ) :
-/**
+	/**
  * Set up post entry meta.
  *
  * Prints HTML with meta information for current post: categories, tags, permalink, author, and date.
@@ -390,43 +405,43 @@
  *
  * @since Twenty Twelve 1.0
  */
-function twentytwelve_entry_meta() {
-	// 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' ) );
-
-	$date = sprintf( '<a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a>',
-		esc_url( get_permalink() ),
-		esc_attr( get_the_time() ),
-		esc_attr( get_the_date( 'c' ) ),
-		esc_html( get_the_date() )
-	);
-
-	$author = sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
-		esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-		esc_attr( sprintf( __( 'View all posts by %s', 'twentytwelve' ), get_the_author() ) ),
-		get_the_author()
-	);
-
-	// Translators: 1 is category, 2 is tag, 3 is the date and 4 is the author's name.
-	if ( $tag_list ) {
-		$utility_text = __( 'This entry was posted in %1$s and tagged %2$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
-	} elseif ( $categories_list ) {
-		$utility_text = __( 'This entry was posted in %1$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
-	} else {
-		$utility_text = __( 'This entry was posted on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
-	}
-
-	printf(
-		$utility_text,
-		$categories_list,
-		$tag_list,
-		$date,
-		$author
-	);
-}
+	function twentytwelve_entry_meta() {
+		// 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' ) );
+
+		$date = sprintf( '<a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a>',
+			esc_url( get_permalink() ),
+			esc_attr( get_the_time() ),
+			esc_attr( get_the_date( 'c' ) ),
+			esc_html( get_the_date() )
+		);
+
+			$author = sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
+				esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+				esc_attr( sprintf( __( 'View all posts by %s', 'twentytwelve' ), get_the_author() ) ),
+				get_the_author()
+			);
+
+			// Translators: 1 is category, 2 is tag, 3 is the date and 4 is the author's name.
+		if ( $tag_list ) {
+			$utility_text = __( 'This entry was posted in %1$s and tagged %2$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
+		} elseif ( $categories_list ) {
+			$utility_text = __( 'This entry was posted in %1$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
+		} else {
+			$utility_text = __( 'This entry was posted on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
+		}
+
+			printf(
+				$utility_text,
+				$categories_list,
+				$tag_list,
+				$date,
+				$author
+			);
+	}
 endif;
 
 /**
@@ -450,30 +465,36 @@
 	$background_color = get_background_color();
 	$background_image = get_background_image();
 
-	if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'page-templates/full-width.php' ) )
+	if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'page-templates/full-width.php' ) ) {
 		$classes[] = 'full-width';
+	}
 
 	if ( is_page_template( 'page-templates/front-page.php' ) ) {
 		$classes[] = 'template-front-page';
-		if ( has_post_thumbnail() )
+		if ( has_post_thumbnail() ) {
 			$classes[] = 'has-post-thumbnail';
-		if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) )
+		}
+		if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) ) {
 			$classes[] = 'two-sidebars';
+		}
 	}
 
 	if ( empty( $background_image ) ) {
-		if ( empty( $background_color ) )
+		if ( empty( $background_color ) ) {
 			$classes[] = 'custom-background-empty';
-		elseif ( in_array( $background_color, array( 'fff', 'ffffff' ) ) )
+		} elseif ( in_array( $background_color, array( 'fff', 'ffffff' ) ) ) {
 			$classes[] = 'custom-background-white';
+		}
 	}
 
 	// Enable custom font class only if the font CSS is queued to load.
-	if ( wp_style_is( 'twentytwelve-fonts', 'queue' ) )
+	if ( wp_style_is( 'twentytwelve-fonts', 'queue' ) ) {
 		$classes[] = 'custom-font-enabled';
+	}
 
-	if ( ! is_multi_author() )
+	if ( ! is_multi_author() ) {
 		$classes[] = 'single-author';
+	}
 
 	return $classes;
 }
Index: src/wp-content/themes/twentytwelve/header.php
===================================================================
--- src/wp-content/themes/twentytwelve/header.php	(revision 40901)
+++ src/wp-content/themes/twentytwelve/header.php	(working copy)
@@ -50,4 +50,4 @@
 		<?php endif; ?>
 	</header><!-- #masthead -->
 
-	<div id="main" class="wrapper">
\ No newline at end of file
+	<div id="main" class="wrapper">
Index: src/wp-content/themes/twentytwelve/image.php
===================================================================
--- src/wp-content/themes/twentytwelve/image.php	(revision 40901)
+++ src/wp-content/themes/twentytwelve/image.php	(working copy)
@@ -54,8 +54,9 @@
  */
 $attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
 foreach ( $attachments as $k => $attachment ) :
-	if ( $attachment->ID == $post->ID )
+	if ( $attachment->ID == $post->ID ) {
 		break;
+	}
 endforeach;
 
 // If there is more than 1 attachment in a gallery
@@ -75,7 +76,7 @@
 ?>
 								<a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
 								/**
- 								 * Filter the image attachment size to use.
+								  * Filter the image attachment size to use.
 								 *
 								 * @since Twenty Twelve 1.0
 								 *
Index: src/wp-content/themes/twentytwelve/inc/custom-header.php
===================================================================
--- src/wp-content/themes/twentytwelve/inc/custom-header.php	(revision 40901)
+++ src/wp-content/themes/twentytwelve/inc/custom-header.php	(working copy)
@@ -54,8 +54,9 @@
  */
 function twentytwelve_custom_header_fonts() {
 	$font_url = twentytwelve_get_font_url();
-	if ( ! empty( $font_url ) )
+	if ( ! empty( $font_url ) ) {
 		wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), null );
+	}
 }
 add_action( 'admin_print_styles-appearance_page_custom-header', 'twentytwelve_custom_header_fonts' );
 
@@ -70,24 +71,25 @@
 	$text_color = get_header_textcolor();
 
 	// If no custom options for text are set, let's bail
-	if ( $text_color == get_theme_support( 'custom-header', 'default-text-color' ) )
+	if ( $text_color == get_theme_support( 'custom-header', 'default-text-color' ) ) {
 		return;
+	}
 
 	// If we get this far, we have custom styles.
 	?>
 	<style type="text/css" id="twentytwelve-header-css">
 	<?php
 		// Has the text been hidden?
-		if ( ! display_header_text() ) :
+	if ( ! display_header_text() ) :
 	?>
-		.site-title,
-		.site-description {
-			position: absolute;
-			clip: rect(1px 1px 1px 1px); /* IE7 */
-			clip: rect(1px, 1px, 1px, 1px);
-		}
+	.site-title,
+	.site-description {
+	position: absolute;
+	clip: rect(1px 1px 1px 1px); /* IE7 */
+	clip: rect(1px, 1px, 1px, 1px);
+	}
 	<?php
-		// If the user has set a custom color for the text, use that.
+	// If the user has set a custom color for the text, use that.
 		else :
 	?>
 		.site-header h1 a,
Index: src/wp-content/themes/twentytwelve/page-templates/front-page.php
===================================================================
--- src/wp-content/themes/twentytwelve/page-templates/front-page.php	(revision 40901)
+++ src/wp-content/themes/twentytwelve/page-templates/front-page.php	(working copy)
@@ -32,4 +32,4 @@
 	</div><!-- #primary -->
 
 <?php get_sidebar( 'front' ); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: src/wp-content/themes/twentytwelve/page-templates/full-width.php
===================================================================
--- src/wp-content/themes/twentytwelve/page-templates/full-width.php	(revision 40901)
+++ src/wp-content/themes/twentytwelve/page-templates/full-width.php	(working copy)
@@ -27,4 +27,4 @@
 		</div><!-- #content -->
 	</div><!-- #primary -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: src/wp-content/themes/twentytwelve/page.php
===================================================================
--- src/wp-content/themes/twentytwelve/page.php	(revision 40901)
+++ src/wp-content/themes/twentytwelve/page.php	(working copy)
@@ -26,4 +26,4 @@
 	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: src/wp-content/themes/twentytwelve/search.php
===================================================================
--- src/wp-content/themes/twentytwelve/search.php	(revision 40901)
+++ src/wp-content/themes/twentytwelve/search.php	(working copy)
@@ -46,4 +46,4 @@
 	</section><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
Index: src/wp-content/themes/twentytwelve/sidebar-front.php
===================================================================
--- src/wp-content/themes/twentytwelve/sidebar-front.php	(revision 40901)
+++ src/wp-content/themes/twentytwelve/sidebar-front.php	(working copy)
@@ -15,8 +15,9 @@
  *
  * If none of the sidebars have widgets, then let's bail early.
  */
-if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) )
+if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) ) {
 	return;
+}
 
 // If we get this far, we have widgets. Let do this.
 ?>
@@ -32,4 +33,4 @@
 		<?php dynamic_sidebar( 'sidebar-3' ); ?>
 	</div><!-- .second -->
 	<?php endif; ?>
-</div><!-- #secondary -->
\ No newline at end of file
+</div><!-- #secondary -->
Index: src/wp-content/themes/twentytwelve/sidebar.php
===================================================================
--- src/wp-content/themes/twentytwelve/sidebar.php	(revision 40901)
+++ src/wp-content/themes/twentytwelve/sidebar.php	(working copy)
@@ -14,4 +14,4 @@
 		<div id="secondary" class="widget-area" role="complementary">
 			<?php dynamic_sidebar( 'sidebar-1' ); ?>
 		</div><!-- #secondary -->
-	<?php endif; ?>
\ No newline at end of file
+	<?php endif; ?>
Index: src/wp-content/themes/twentytwelve/single.php
===================================================================
--- src/wp-content/themes/twentytwelve/single.php	(revision 40901)
+++ src/wp-content/themes/twentytwelve/single.php	(working copy)
@@ -30,4 +30,4 @@
 	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>